From 31573d6180d15ef65ed0df9c2732495f40b12663 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 21 二月 2025 18:50:16 +0800
Subject: [PATCH] 提交花城代码
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBpActivityDAO.java | 111
flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java | 128
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/AutomessageSysUser.java | 263
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderGoodsDO.java | 115
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActIntegralRuleService.java | 55
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyWorkerApi.java | 98
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventGridDataApi.java | 155
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthStatisticsDTO.java | 74
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsMerchantMapper.xml | 167
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComAreaTownCommunityService.java | 24
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/dos/LoginBody.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/api/UnionStoreApi.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerOrgTeam.java | 53
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyApi.java | 87
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/DoubleRegistrationData.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiReseauServiceImpl.java | 70
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/ComSanShuoIndustryCenterDTO.java | 83
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyAlarmServiceImpl.java | 91
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/LcCompareMemberCodeMapper.xml | 20
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/resources/mapper/UnionOpenDoorMapper.xml | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/area/StreetAndBuildVO.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiComConvenientServiceCategoriesVO.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java | 513
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java | 514
flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java | 291
flower_city/src/main/java/com/dg/core/service/impl/IRoleMenuImpl.java | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyExcelVO.java | 123
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsMerchantDTO.java | 54
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleFabulousWestService.java | 13
springcloud_k8s_panzhihuazhihuishequ/auth/.gitignore | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/VolunteerOrgRelationVO.java | 28
flower_city/src/main/resources/mapper/GuideEvolveMapper.xml | 181
springcloud_demo_on_k8s-master/service-tp/.mvn/wrapper/maven-wrapper.properties | 1
flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysUserRecord.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DisablePersonApi.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/GridBuildRelationService.java | 26
flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java | 91
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectMemberServiceImpl.java | 181
springcloud_demo_on_k8s-master/service-zuul/src/main/java/com/springcloudme/servicezuul/api/apiController.java | 14
flower_city/src/main/java/com/dg/core/util/presence/Year2014.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/helper/encrypt/ResultInterceptor.java | 78
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComOrderRefundDTO.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/ComActEasyPhotoService.java | 135
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActPictureServiceImpl.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightShoppingDao.java | 55
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiComActWorkGuideClassifyServiceImpl.java | 137
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEventTransferRecord.java | 110
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderPayDO.java | 133
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiComActWorkGuide.java | 101
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberGpsLogApi.java | 91
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsEvaluateMapper.xml | 66
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActWorkGuideDO.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAccRuleDO.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCommunityDiscountServiceImpl.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiMicroVolunteeringVO.java | 67
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireSubDetailsDTO.java | 20
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventVisitListQuery.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoMemberMapper.xml | 30
flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java | 71
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WXMessageUtil.java | 57
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaExcelVO.java | 46
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbOrgMapper.xml | 165
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/PublicityEventApi.java | 147
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngProvinceVO.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComChangeCarBrandMapper.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComActProjectMapper.xml | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceVO.java | 104
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/api/UnionOutdoorSiteApi.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiCharityApi.java | 89
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsAdvPosDAO.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthHistoryRecordMapper.xml | 155
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/EventGridMemberCascadeAddDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventLcGridAdminVO.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentReplyDO.java | 86
flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java | 78
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComAreaCounty.java | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/StringUtils.java | 428
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWarnLogEditDTO.java | 65
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/UnionpayCarWashDao.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRaffle.java | 134
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/54.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IndexUserStreetVo.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerIntegralMerchantServiceImpl.java | 49
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderCollageTeamPeopleMapper.xml | 105
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsAdvDAO.java | 55
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionReportDto.java | 113
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveListAdminVO.java | 64
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiComActWorkGuideClassifyDao.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightIntegratingTaskDao.java | 62
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/45.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderOperateVO.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiExperienceActivity.java | 96
flower_city/src/main/java/com/dg/core/util/PermissionUtil.java | 102
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryTradeOrderService.java | 108
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActSignMapper.xml | 214
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/EncryptDecryptField.java | 14
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoActivityVO.java | 55
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionIntegralRecordApi.java | 70
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWarehouseBaseDao.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/aop/OperLogAspect.java | 189
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientProductSpecificationMapper.xml | 46
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamMemberImportMistakeExcelVO.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/PageClusterMemberAdminVo.java | 52
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityInviteService.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbCheckUserDTO.java | 13
springcloud_k8s_panzhihuazhihuishequ/zuul/mvnw | 310
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/resources/mapper/UnionIntegralRecordMapper.xml | 131
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/AddNeighborCircleAdminVO.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHoursePayingOrderMapper.xml | 14
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiShopping.java | 67
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/McsEvaluateService.java | 44
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/ComPbCheckUnitController.java | 207
flower_city/src/main/java/com/dg/core/controller/BaseController.java | 127
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComPbCheckUnitDto.java | 120
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/laydate.js | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/IComEventTransferRecordService.java | 60
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryCommodityOrderApi.java | 86
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/EventInfo.java | 84
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveRecordMapper.xml | 338
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/AppletesBackstageConfigVO.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComChangeCarModelController.java | 117
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java | 178
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/PartiesBody.java | 20
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthFeedbackDeleteDTO.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiCharityServiceImpl.java | 68
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysConfMapper.xml | 135
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseVO.java | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireAnswerDTO.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionShippingAddressDto.java | 72
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidUpdateRecordVO.java | 59
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgHatchAuditMapper.xml | 89
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java | 55
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseReturnOrderService.java | 22
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/java/com/springcloudme/serviceinfluxdbapp/controller/ApiController.java | 14
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActEnterpriseApi.java | 86
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserAgreementDO.java | 61
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopStoreDO.java | 149
springcloud_demo_on_k8s-master/config-server/pom.xml | 108
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbActivityDTO.java | 89
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/ReturnMsgConstants.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComExServicemanDTO.java | 111
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/resources/bootstrap.yml | 35
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyWestDAO.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishOperationRecordDO.java | 90
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientServiceCategoryServiceImpl.java | 126
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IndexDataKanbanVO.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageFeedBackDTO.java | 44
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryStoreServiceImpl.java | 180
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EditFmsClassroomAdminDTO.java | 44
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/5.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiComActWorkGuideMaterialDao.java | 11
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserManagementApi.java | 59
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java | 140
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwRotaDO.java | 89
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/config/MybatisPlusConfig.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComChangeCarModelSpecsChildrenService.java | 78
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java | 114
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml | 41
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/RentingHousesContractConfigApi.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java | 254
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComCvtBusinessDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/AuthApplication.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActReserveDangerArea.java | 82
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComPropertyPublicityDTO.java | 61
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/validated/PutGroup.java | 9
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthStatisticsDO.java | 59
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialWorkerServiceService.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionStoreApi.java | 76
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComChangeCarModelMapper.xml | 123
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/config/SwaggerConfig.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventTransferRecordController.java | 149
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComMngVolunteerSkillDto.java | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java | 65
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComFmsClassroomService.java | 89
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/UserJobHandler.java | 82
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/resources/bootstrap.yml | 35
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/RentingHoursePreOrderApi.java | 95
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStaticsReserve.java | 38
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/JWTTokenUtil.java | 173
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageMemberForInviteDTO.java | 35
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java | 815
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopUserAddressDO.java | 116
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealCompanyTotalVO.java | 20
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventLeftStatisticsVO.java | 17
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderPreviewDTO.java | 62
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComRehabilitationPopulationServiceImpl.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/config/ParamOutAspect.java | 128
springcloud_demo_on_k8s-master/service-api/pom.xml | 102
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/CapitalPageVO.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiQuestnaireUserAnswerServiceImpl.java | 83
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubSelectionVO.java | 24
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussUserDTO.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/EditDpcDTO.java | 60
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/UnionpayCarWashService.java | 12
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiInterspaceServiceImpl.java | 63
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserRateAnalysisVO.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/ComActIntegralUserChange.java | 193
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/StatisticsApi.java | 81
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java | 680
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/test/java/com/panzhihua/service_grid/service/impl/EventServiceImplTest.java | 38
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiComConvenientServiceCategoriesDao.java | 54
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightResourceSharingApi.java | 55
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerMngDOMapper.xml | 232
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/aop/OperLogAspect.java | 308
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsLabelServiceImpl.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberExcelVO.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/resources/logback-spring.xml | 51
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectScheduleApi.java | 91
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgHatchAuditDAO.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/AddBuildingUnitDto.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenStatisticAgeGenderDTO.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingActivityVO.java | 109
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerUserAddressDO.java | 117
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeEditDTO.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidCheckRecordServiceImpl.java | 36
springcloud_demo_on_k8s-master/service-zuul/.gitignore | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilPopulationStatisticsVO.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/GridBuildRelationDO.java | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventType.java | 20
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageProjectDTO.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/MostBeautifulVolunteerVO.java | 60
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexReserve.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComFmsServiceRecord.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleCommentReplyWestService.java | 13
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageTeamMemberDTO.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComActIntegralUserTradeMapper.xml | 22
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionReportApi.java | 61
flower_city/src/main/java/com/dg/core/service/IAutomessageCommonProblemService.java | 59
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberRelationVO.java | 47
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerMerchantEvaluateService.java | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamMemberVO.java | 50
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderListDTO.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructHouseUserDO.java | 51
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoIndustryCenterDao.xml | 49
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/BaseException.java | 84
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/KeyPersonInfoServiceImpl.java | 121
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComPensionAuthHistoryRecordService.java | 38
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 502
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseContractConfig.java | 90
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DetailNeighborAllCommentByAdminDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMessageDO.java | 89
flower_city/src/main/java/com/dg/core/api/AgreementAppletsController.java | 36
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/GridsGovernanceStatisticsVO.java | 110
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussCommentDOMapper.xml | 61
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComLowSecurityPopulationService.java | 13
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/config/SwaggerConfig.java | 33
springcloud_k8s_panzhihuazhihuishequ/eureka_server/.mvn/wrapper/maven-wrapper.jar | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsEventAdminDTO.java | 43
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSanShuoApi.java | 182
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_grid/config/MybatisPlusConfig.class | 0
flower_city/src/main/java/com/dg/core/service/impl/RoleManagementImpl.java | 38
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java | 597
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/PageComMngVillagePopulationHouseDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/timejob/mvnw.cmd | 182
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsClassroomVO.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java | 434
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiReseauDao.java | 56
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/QRCodeUtil.java | 205
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerActivityService.java | 51
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/ServiceGridApplication.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventApplicationAppReleaseMapper.java | 36
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventApplicationUserNoticeDTO.java | 73
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComChangeCarModelSpecsChildrenMapper.xml | 67
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsAttrDAO.java | 21
flower_city/src/main/java/com/dg/core/api/AreaCodeAppletsController.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerCreditsExchangeMapper.xml | 280
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/ZuulApplication.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventApplicationUserNoticeServiceImpl.java | 118
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserInputDAO.xml | 166
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVaccinesEnrollRecordDO.java | 103
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbServiceTeamDAO.java | 51
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java | 560
flower_city/src/main/java/com/dg/core/util/DateUtils.java | 222
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishHandleVO.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberGpsLogEditDTO.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/discuss/ComActDiscussPublishResultDTO.java | 36
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiMerchantTypeVO.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActEnterpriseTypeApi.java | 95
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java | 694
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageSocialOrgHatchAuditDTO.java | 35
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/63.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserNoticeDAO.java | 20
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyAppVO.java | 57
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 469
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyDyn.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderCreateGoodsDTO.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/config/RabbitmqConfig.java | 100
flower_city/pom.xml | 189
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngRealAssetsService.java | 61
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/EditComActReserveStatusDTO.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventTransferRecordDO.java | 82
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightProjectJoinDAO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveOperationRecordDO.java | 123
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenStatisticPartyActivityDTO.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopSysConfDO.java | 61
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ComActEasyPhotoMapper.java | 72
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentByAdminVO.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComMngVolunteerOrgTeamDto.java | 67
flower_city/src/main/resources/mapper/AutomessageCommonProblemMapper.xml | 54
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java | 920
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysTemplateConfigServiceImpl.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveDO.java | 180
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopFlowerGoodsVO.java | 98
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BasicScreenApi.java | 166
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java | 162
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectService.java | 77
flower_city/src/main/java/com/dg/core/db/gen/entity/PieChartAll.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComLowIncomePeopleCopyDO.java | 138
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java | 160
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserNoticeDAO.xml | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComEldersAuthHistoryExcelVO.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java | 546
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaCityVO.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java | 63
springcloud_k8s_panzhihuazhihuishequ/eureka_server/.gitignore | 33
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/ComPropertyAlarmSettingService.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventResourceServiceImpl.java | 80
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml | 1294
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiMicroVolunteeringTypeDao.java | 41
springcloud_k8s_panzhihuazhihuishequ/service_grid/.gitignore | 33
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 564
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryUserAddressDto.java | 116
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiSnapshotService.java | 43
springcloud_demo_on_k8s-master/service-api/src/main/java/com/springcloud/serviceapi/ServiceApiApplication.java | 15
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/36.gif | 0
flower_city/src/main/java/com/dg/core/service/ISysUserRecordService.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientServiceCategoryDAO.java | 78
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoActivityDO.java | 112
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/config/KaptchaConfig.java | 45
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationRelationHouseDTO.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerSkillVo.java | 74
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionShippingAddressApi.java | 70
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComChangeCarInquiryServiceImpl.java | 122
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoUserDAO.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/ComPbCheckUnitTypeEnum.java | 41
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireAnswerContentDOMapper.xml | 48
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/logback-spring.xml | 51
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarModelRelationFeign.java | 98
springcloud_k8s_panzhihuazhihuishequ/service_user/.mvn/wrapper/maven-wrapper.properties | 2
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/LogApi.java | 59
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyEquipmentServiceImpl.java | 46
springcloud_demo_on_k8s-master/service-api/mvnw.cmd | 161
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopStoreDTO.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java | 346
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthDOMapper.xml | 113
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/mobile.js | 2
springcloud_k8s_panzhihuazhihuishequ/auth/mvnw | 310
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenDiscussListDTO.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectScheduleService.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyActivityStatics.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BcRegionServiceImpl.java | 106
flower_city/src/main/java/com/dg/core/util/workday/Data.java | 19
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngDistrictVO.java | 17
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/EditReserveAdminDTO.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/UnionStoreService.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopSysConfServiceImpl.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidDangerMemberMapper.xml | 112
springcloud_demo_on_k8s-master/eureka-server/src/main/java/com/springcloudme/eurekaserver/EurekaServerApplication.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiCoinGeneralTableDao.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcVisitRecordKeyPersonLabelEnum.java | 56
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightConfigVO.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiReseauPeopleVO.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiArticleManagementServiceImpl.java | 63
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoEditAdminDTO.java | 30
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/config/JacksonConfig.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java | 112
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComEldersAuthHistoryVO.java | 41
flower_city/src/main/java/com/dg/core/exception/GlobalException.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/ComMngVaccinesInoculationExcelVo.java | 47
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/config/XxlJobConfig.java | 71
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMainMemberVO.java | 116
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealCompanyBelongsVO.java | 47
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationSentenceExcelListen.java | 519
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleTopicWestDO.java | 86
springcloud_demo_on_k8s-master/config-server-bak/src/test/java/com/springcloudme/configserver/ConfigServerApplicationTests.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberWestDO.java | 149
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserFeedbackDAO.xml | 76
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveSubSelectionService.java | 13
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/GridBuildRelationServiceImpl.java | 61
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderOperateVO.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiShoppingServiceImpl.java | 68
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/1.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVolunteerServiceTypeApi.java | 91
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemUnitTaskServiceImpl.java | 128
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventAddDTO.java | 111
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/UnionDoorUtil.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoUserDO.java | 42
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordEditDTO.java | 124
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/templates/forestFire.html | 68
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerServiceTypeServiceImpl.java | 122
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/PageComActIntegralRuleDTO.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/RabbitmqConfig.java | 263
springcloud_k8s_panzhihuazhihuishequ/service_property/pom.xml | 169
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberGpsLogMapper.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberGpsLogServiceImpl.java | 146
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryStoreApi.java | 137
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/18.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComPropertyPublicityService.java | 75
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComAreaTownCommunityApi.java | 149
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRafflePrizeServiceImpl.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealCompanyVO.java | 64
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiSnapshotApi.java | 151
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/layui.mobile.css | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java | 135
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComFmsTeamMemberImportExcelListen.java | 188
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthFeedbackDTO.java | 72
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/config/SFTPConfig.java | 31
springcloud_k8s_panzhihuazhihuishequ/community_backstage/.gitignore | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleCommentReplyServiceImpl.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActFourMemberVO.java | 103
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/jinhuiCoinTableApi.java | 73
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridTodoDataDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActPrizeServiceImpl.java | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenAlarmStatisticsInfo.java | 57
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoMemberService.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityCodeMapper.xml | 13
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberWestDAO.java | 184
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubSelectionServiceImpl.java | 19
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/BuildingVO.java | 9
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/Close.java | 147
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/UnionpayCarWash.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java | 200
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionIntegralSummarizeServiceImpl.java | 69
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightShoppingOrderVO.java | 104
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/AutomessageSysUserDao.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/elder/PageElderAuthStatisticDTO.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActIntegralUserChangeMapper.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java | 327
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/mapper/UnionExchangeRecordMapper.xml | 241
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyHelpApi.java | 98
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/CommunityBackstageApplication.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopOperLogVO.java | 85
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEventTransferRecordMapper.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java | 168
springcloud_demo_on_k8s-master/mvnw.cmd | 161
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseFileServiceImpl.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/dao/UsersMapper.java | 11
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyAlarm.java | 122
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiLargeScreenAppi.java | 75
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEldersAuthHistoryRecordMapper.java | 47
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventMainMemberDO.java | 147
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComEldersAuthStatisticHeaderVO.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventCommunityDTO.java | 57
.gitignore | 6
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommoditySpecsDto.java | 92
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java | 126
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/LoginApi.java | 117
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/excel/CustomSheetWriteHandler.java | 49
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarModelDto.java | 99
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComElderAuthElderliesMapper.xml | 82
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java | 167
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/PageClusterMemberDto.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopSysConfDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenServiceData.java | 41
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderBargainRecordMapper.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventTransferRecordVO.java | 94
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngUserTagDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/listen/DisablePersonExcelListen.java | 83
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventApplicationAppReleaseDTO.java | 76
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoActivityMapper.java | 57
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiInterspaceVO.java | 71
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComChangeCarModelSpecsChildrenController.java | 106
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAnnouncement.java | 74
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthElderlyMapper.xml | 110
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComOpsHouseDTO.java | 70
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVO.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserRoleDAO.java | 17
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectMemberApi.java | 91
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/ApplyFmsServiceDTO.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialWorker.java | 166
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java | 72
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordReportMapper.xml | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexBackReserve.java | 19
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryTradeOrderDto.java | 128
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEnterpriseTypeService.java | 59
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComDrugPopulationVO.java | 169
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComMngVolunteerOrgTeamDto.java | 71
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/49.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/GridEventStatisticsDTO.java | 19
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActProceedings.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerCreditsExchangeVO.java | 110
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseReturnOrderApi.java | 86
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientGoodsCategoryDTO.java | 46
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEnterpriseDAO.java | 79
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActNeighborCircleScreenVO.java | 41
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerEvaluateDO.java | 74
flower_city/src/main/java/com/dg/core/service/impl/SlideshowServiceImpl.java | 82
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/BcRegionApi.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/BcDictionaryDO.java | 88
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxMessagePushApi.java | 156
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventResourceDeleteDTO.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveDangerAreaMapper.xml | 38
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentWestDO.java | 83
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActPictureLibraryService.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IPUtil.java | 170
flower_city/src/main/java/com/dg/core/service/IHuaChengSysUserService.java | 14
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMaterialMapper.xml | 12
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightProjectPlanService.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/DictionaryVO.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthHistoryRecordServiceImpl.java | 71
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryStoreMapper.xml | 122
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/SocialOrgHatchAuditDTO.java | 64
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaiteSubSelectionVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditOrderAddressDto.java | 40
flower_city/src/main/java/com/dg/core/util/presence/Year2003.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenFmsStatisticsInfo.java | 72
flower_city/src/main/java/com/dg/core/exception/UtilException.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/TypeDict.java | 64
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubSelectionDO.java | 61
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/32.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationHouseTotalVO.java | 35
flower_city/src/main/java/com/dg/core/AliyunConfig.java | 91
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightProjectPlanMapper.xml | 152
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/logback.xml | 29
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java | 229
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/IntegralUserVO.java | 56
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryTradeOrderMapper.java | 58
flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java | 156
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ExcelSelectObject.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryStoreClass.java | 56
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiCoinGeneralTableServiceImpl.java | 85
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoActivityRecordDOMapper.xml | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActWarehouseDonatesService.java | 89
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditAdminDTO.java | 71
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/HuachengUnionAppletsApplication.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDpcMapper.xml | 155
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightCommunityConstructionServiceImpl.java | 158
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActUserWalletTradeMapper.java | 67
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml | 447
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleCommentReplyService.java | 13
flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java | 83
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthStatisticsDO.java | 78
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActPictureLibraryServiceImpl.java | 38
flower_city/src/main/java/com/dg/core/util/presence/Year2007.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerActivityVO.java | 140
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommoditySpecsFeign.java | 87
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPbMemberDAO.java | 89
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/CorsConfig.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiReseauPeopleDao.java | 57
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletAdminVO.java | 36
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/DynamicWorkVO.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/AppletUserInfoVO.java | 133
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyByAdminVO.java | 46
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleWestServiceImpl.java | 930
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/config/MyAESUtil.java | 52
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysAppConfigVO.java | 50
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/sensitive/SensitiveStrategy.java | 51
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActWorkScreenVO.java | 38
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/EventGridMemberBuildingRelationDO.java | 60
flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java | 209
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileNameLengthLimitExceededException.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialMemberService.java | 49
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbDynUserDO.java | 43
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java | 326
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/UnionStoreService.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/dao/UnionAccessMapper.class | 0
flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageTransactionEventInterview.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ProvinceCityReturnVO.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiMicroVolunteering.java | 66
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsTeamMemberMapper.xml | 122
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/InvalidExtensionException.java | 82
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/HttpConstant.java | 44
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsTeamMemberServiceImpl.java | 378
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysRoleMenuDAO.xml | 19
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVaccinesInoculationRecordDO.java | 112
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComAreaTownCommunity.java | 56
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVaccinesEnrollRecordServiceImpl.java | 197
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrg.java | 293
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/RentingHousesApi.java | 210
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireSubSelectionDAO.java | 13
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxPayUtils.java | 161
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityOrderService.java | 141
springcloud_k8s_panzhihuazhihuishequ/timejob/mvnw | 310
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveSubSelectionMapper.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/Snowflake.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActPrizeService.java | 14
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenEventDTO.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataAreaVO.java | 87
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/dao/UnionShippingAddressMapper.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActWorkGuideMaterialDO.java | 29
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/StreetBigApi.java | 139
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/resources/mapper/UnionIntegralRuleRecordMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java | 614
springcloud_k8s_panzhihuazhihuishequ/deploy-file/config-server.yaml | 63
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsOrgVo.java | 122
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderCollageTeamServiceImpl.java | 382
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java | 660
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialWorkerApi.java | 162
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/OrderApi.java | 206
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightProjectEvaluateMapper.xml | 137
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralRecordApi.java | 83
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationElderExcelListen.java | 470
flower_city/README.md | 3
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiConvenientMerchant.java | 100
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java | 87
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/McsOrderApi.java | 111
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCvtCategoryDO.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dtos/DataKanbanDTO.java | 17
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/EquipmentPointMapDataVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComKeyPopulationService.java | 13
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWorkGuideDAO.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationExcelVo.java | 61
springcloud_k8s_panzhihuazhihuishequ/eureka_server/src/main/resources/logback-spring.xml | 51
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrgHatchAuditSchedule.java | 48
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderBargainServiceImpl.java | 433
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java | 232
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberGpsLogVO.java | 53
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiApplyExperienceVO.java | 60
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryStoreClassServiceImpl.java | 167
flower_city/src/main/java/com/dg/core/file/SFTPUtil.java | 374
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/PartyBuildingMemberException.java | 57
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComAreaTownCommunityDao.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/EditDangerBatchDTO.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseFileDao.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsTeamTypeServiceImpl.java | 127
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/OnShelfOrOffShelfProductDTO.java | 32
flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysSettings.java | 90
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ClusterApi.java | 291
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComDataStatisticsMemberDto.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java | 141
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventResourceDO.java | 67
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAcidCheckRecordDao.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerOrderService.java | 186
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/DateVO.java | 19
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemClaimApi.java | 91
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SpringUtils.java | 137
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/IdDTO.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActUserWalletChangeService.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml | 320
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/layer.css | 2
springcloud_k8s_panzhihuazhihuishequ/applets/.mvn/wrapper/maven-wrapper.properties | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComMngVolunteerSkillDto.java | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/PreOrderStatics.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiApplyExperienceServiceImpl.java | 209
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventArchiveVO.java | 38
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDisabilityMistakeExcelVO.java | 85
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java | 79
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComActEasyPhotoHandlerDto.java | 56
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexReserveSub.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java | 241
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/PageComOpsAdvDTO.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityInviteDAO.java | 51
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/SetShelfForInfoDTO.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerCommunityConfigService.java | 29
springcloud_demo_on_k8s-master/service-influxdb-app/.mvn/wrapper/MavenWrapperDownloader.java | 114
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/BatchCheckAcidRecordDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientProductCategoryDTO.java | 46
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingOrderVO.java | 93
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiArticleManagementService.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderCollageTeamPeopleServiceImpl.java | 119
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarInquiryVo.java | 70
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComPensionAuthPensionerService.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventSpecialPopulationVO.java | 47
springcloud_k8s_panzhihuazhihuishequ/applets/mvnw.cmd | 182
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthPensionerDO.java | 144
flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java | 138
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComActEasyPhotoHandlerDto.java | 67
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerCommunityConfigMapper.xml | 153
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemUnitTaskService.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActQuestnaireDTO.java | 8
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinghuiMerchantEvaluateApi.java | 83
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientConsultationStatisticsMapper.xml | 44
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/bootstrap.yml | 43
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyHelpApi.java | 98
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/SysUserVo.java | 217
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/ServiceCommunityApplication.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsLabel.java | 55
springcloud_k8s_panzhihuazhihuishequ/zuul/.mvn/wrapper/MavenWrapperDownloader.java | 118
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMainMemberMapper.xml | 160
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveDangerAreaDao.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IndexUserCommunityVo.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyEquipment.java | 104
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/config/WxH5Properties.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapGridVO.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveSubSelectionDO.java | 109
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAdvServiceImpl.java | 267
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderGoodsService.java | 13
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderMapper.xml | 289
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/IndexDateDTO.java | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulPersonTypeEnum.java | 41
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/laypage.js | 2
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/RealNamedConfig.java | 17
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderDeliverDTO.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilStatisticsVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireStatisticsSummaryAdminVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/AdvertisementApi.java | 143
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActWarehouseApplyApi.java | 126
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserFeedbackDO.java | 80
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventVisitingTasksApi.java | 188
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoActivityRecordMapper.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemClaimDTO.java | 54
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/HomeQuarantineRegisterStatisticsVO.java | 46
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityOrderBargain.java | 69
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarExcelVO.java | 61
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/mapper/UnionReportMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/DeleteConvenientProductDTO.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubVO.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiComConvenientServiceCategories.java | 52
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/util/HtmlToPdfUtil.java | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientServiceCategoryVO.java | 43
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyVO.java | 179
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActActivityCodeApi.java | 128
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/Middlelist.java | 18
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java | 300
flower_city/src/main/java/com/dg/core/db/manual/pojo/LargeScreen.java | 56
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/ServiceEquipmentApplication.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddTeamMemberDTO.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/NettyServer.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/BcRegionDao.java | 49
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingServiceImpl.java | 63
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderOperateDO.java | 76
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/BcRegion.java | 113
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialOrgHatchAuditService.java | 73
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationUserNoticeDeleteDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComEldersAuthStatisticVO.java | 93
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/dos/UnionUser.java | 182
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerRefundOrderService.java | 60
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java | 381
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/PreOrderMessage.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml | 698
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngCarDO.java | 67
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComActIntegralUserTradeDaoService.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComDrugPopulationServiceImpl.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventLeftDownStatisticsVO.java | 53
springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml | 52
flower_city/src/main/java/com/dg/core/controller/AgreementController.java | 62
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/RoomckWebApi.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/model/dos/ComActDO.java | 122
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/dos/UnionOpenDoor.java | 59
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/dao/ComPropertyEquipmentDao.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComChangeCarModelRelation.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyAlarmMapper.xml | 71
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HomeQuarantineUtil.java | 220
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwPatrolRecordService.java | 62
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java | 97
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventTransferRecordEditDTO.java | 70
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BcRegionService.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderPayServiceImpl.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComActIntegralUserChangeDAOServiceImpl.java | 127
springcloud_k8s_panzhihuazhihuishequ/community_backstage/mvnw | 310
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderDeliveryServiceImpl.java | 180
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-auth.yaml | 47
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionUserApi.java | 70
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/QueryEntiy.java | 80
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidMemberApi.java | 106
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoHandlerServiceImpl.java | 156
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderPayDAO.xml | 42
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/MyActivityEvaluateVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java | 200
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseFileService.java | 22
flower_city/src/main/java/com/dg/core/service/impl/SysSettingsServiceImpl.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSanShuoIndustryCenterService.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleFabulousServiceImpl.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java | 176
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/StreetBigScreenMapper.xml | 478
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiMicroVolunteeringServiceImpl.java | 68
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiCharity.java | 54
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleFabulousDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectPublicityApi.java | 118
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerMerchantWithdrawDao.java | 60
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java | 342
flower_city/src/main/java/com/dg/core/util/presence/Year2011.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmSettingVO.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/resolvers/CurrentUserMethodArgumentResolver.java | 56
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventApplicationUserNoticeDO.java | 54
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/switchs/StreetAllAppletsVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/IntegratingTask.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/OrderMessage.java | 42
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenServiceUser.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialOrgService.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiLargeScreenService.java | 137
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.java | 79
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/union/StructuredVO.java | 89
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java | 104
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/BcDictionaryDAO.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/resources/mapper/UnionExchangeRecordMapper.xml | 269
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerUserAddressServiceImpl.java | 132
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ReservePdfExportVO.java | 13
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryUserAddressDto.java | 108
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/model/vos/PutmessageDataInfo.java | 93
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexBasicsStatisticsVO.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/JsoupUtil.java | 95
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenActivityTop.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentingHouses/RentingHousesConfigVO.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHousesContractConfigApi.java | 61
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthUserDO.java | 89
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/IndexDataDTO.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/PageEnterpriseTypeDTO.java | 36
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserNoticeVO.java | 69
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderCollageTeamMapper.java | 67
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/dao/UnionOpenDoorMapper.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityCodeServiceImpl.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordTimeVO.java | 182
springcloud_k8s_panzhihuazhihuishequ/service_user/.mvn/wrapper/maven-wrapper.jar | 0
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngUserTagDO.java | 49
flower_city/src/main/java/com/dg/core/db/gen/entity/KeywordEntity.java | 38
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java | 233
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/23.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/PartyDataVO.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberRelationDTO.java | 70
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java | 317
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsTeamServiceImpl.java | 225
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/ServicePropertyApplication.java | 29
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenApi.java | 159
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/SysUserService.java | 78
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/loading-1.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComEldersAuthUserService.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/switchs/CommunitySwitchAllAppletsVO.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/LoginStoreUserInfoVO.java | 169
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidMemberServiceImpl.java | 57
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructOtherBuildDO.java | 66
springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/bootstrap.properties | 10
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoMapper.xml | 202
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiGoldCoinRecord.java | 56
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussOptionUserDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderBargainController.java | 106
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoHandlerFeign.java | 77
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiInterspaceType.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveOperationRecordMapper.xml | 48
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyRepairMapper.xml | 109
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/PageBuildingListDto.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesEnrollUserByAppDTO.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActIntegralUserChangeService.java | 83
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComActEasyPhotoHandlerDto.java | 83
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/api/UnionReportApi.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/jinhuiApi.java | 60
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishFeedbackDO.java | 62
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComActIntegralUserChangeDAOService.java | 83
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtServeVO.java | 56
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ExcelShopOrderDTO.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 1525
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerEditDTO.java | 114
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugExcelVO.java | 138
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/sensitive/Sensitive.java | 12
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsInformationVO.java | 57
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeStatisticsAdminVO.java | 18
flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java | 143
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComMngVolunteerSkillDto.java | 76
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidRecordDTO.java | 70
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiCoinGeneralTableMapper.xml | 100
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/VerifiedReturnVO.java | 46
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java | 267
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiInterspaceTypeServiceImpl.java | 64
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiMicroVolunteeringTypeMapper.xml | 89
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 977
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/validated/AddGroup.java | 9
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenApi.java | 108
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/ISysMenuServiceImpl.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcRequestEnum.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPensionAuthRecordMapper.xml | 348
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientConsultationStatisticsDO.java | 42
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventManageDTO.java | 75
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComBatteryCommodityOrderApi.java | 109
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActUserWalletService.java | 70
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsConfigVO.java | 29
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/.mvn/wrapper/MavenWrapperDownloader.java | 118
springcloud_demo_on_k8s-master/eureka-server/src/main/resources/application.yml | 14
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/SpecialPeopleVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyAlarmApi.java | 114
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/LcCompareCodeDO.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComChangeCarBrand.java | 66
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiShoppingMapper.xml | 147
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkProjectTypeInfo.java | 19
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/PopulationApi.java | 51
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryStoreFeign.java | 96
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPopulationActVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopUserAddressService.java | 52
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/AppletsBackstageApplication.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerOrderDeliveryDTO.java | 62
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthUserServiceImpl.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComExServicemanService.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideClassifyMapper.xml | 60
springcloud_demo_on_k8s-master/service-api/src/main/resources/bootstrap.properties | 17
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexDynamic.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/UnAuthorizationException.java | 57
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishUserDO.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/StreetBigScreenServiceImpl.java | 800
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseRegisterService.java | 79
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialOrgHatchAuditApi.java | 72
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java | 168
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleCommentReplyWestDOMapper.xml | 78
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VillageApi.java | 150
springcloud_demo_on_k8s-master/eureka-server/.mvn/wrapper/maven-wrapper.jar | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyPublicityDAO.java | 59
flower_city/src/main/java/com/dg/core/service/impl/MenuImpl.java | 38
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IdCard.java | 64
flower_city/src/main/java/com/dg/core/db/gen/entity/RoleManagementEntity.java | 76
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerCommunityDiscountService.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/HanyuPinyinHelper.java | 128
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WalletApi.java | 63
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComElderAuthRecordsDO.java | 168
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantWithdrawServiceImpl.java | 108
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoTypeVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityCodeDao.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_api/pom.xml | 123
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationStreetVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/DynamicVO.java | 26
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/layedit.js | 2
springcloud_k8s_panzhihuazhihuishequ/auth/.mvn/wrapper/maven-wrapper.properties | 2
flower_city/src/main/java/com/dg/core/db/manual/pojo/MsgLocal.java | 32
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/14.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComFmsTeamMemberService.java | 79
flower_city/src/main/resources/mapper/GuideRepairOrderImageMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java | 651
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectPublicityMapper.xml | 35
springcloud_k8s_panzhihuazhihuishequ/auth/pom.xml | 161
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideClassifyServiceImpl.java | 143
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java | 92
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilConvenienceStatisticsVO.java | 34
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageActivityInviteDTO.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesEnrollByAppDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingWestApi.java | 1136
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActCommitteeApi.java | 75
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComDataStatisticsOrgDto.java | 38
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/MessageUtils.java | 25
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/config/SwaggerConfig.java | 33
flower_city/src/main/java/com/dg/core/db/gen/entity/ReplyTemplateEntity.java | 158
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/vos/SelfUserEntity.java | 150
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoTypeRelationDO.java | 43
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthElderlyVO.java | 72
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborReplyAppDTO.java | 41
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthRecordsApi.java | 142
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordImportMistakeExcelVO.java | 42
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml | 33
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/42.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerCreditsExchangeService.java | 81
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/mvnw.cmd | 182
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml | 31
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseBaseMapper.xml | 15
flower_city/src/main/resources/mapper/ElseAccessoryMapper.xml | 126
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComConvenientServiceCategoriesMapper.xml | 170
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml | 221
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveSubDO.java | 92
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightProjectJoinDTO.java | 38
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidDangerMemberDTO.java | 67
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/AddClusterMemberAdminDto.java | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleTopicAdminDTO.java | 40
flower_city/src/main/java/com/dg/core/api/GuideDoAppletsController.java | 56
springcloud_demo_on_k8s-master/service-api/src/test/java/com/springcloud/serviceapi/ServiceApiApplicationTests.java | 17
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenQuestionnaireStatisticsInfo.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventCommunityAddDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightProjectPlanServiceImpl.java | 114
flower_city/src/main/java/com/dg/core/api/ElseAccessoryAppletsController.java | 116
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarModelRelationDto.java | 64
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRegisterDetailedVO.java | 36
flower_city/src/main/java/com/dg/core/annotation/Authorization.java | 14
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialWorkerApi.java | 106
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsProductDTO.java | 42
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryTradeOrderDto.java | 119
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVolunteerServiceTypeService.java | 61
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerMerchantEvaluateMapper.xml | 174
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsTeamTypeMapper.xml | 38
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/StreetApi.java | 98
springcloud_k8s_panzhihuazhihuishequ/config_server/pom.xml | 111
flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessagePolicyDocumentsMapper.java | 53
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java | 240
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiInterspaceApplyForMapper.xml | 206
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiSnapshotClassifyDao.java | 51
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenDrawEventListDTO.java | 44
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityOrderBargainService.java | 99
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopCartStoreVO.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseLabelMapper.xml | 19
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionIntegralRecordDto.java | 76
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsMerchantDTO.java | 91
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/EexcelUserDTO.java | 146
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/9.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/LocalEventToLangChaoEventTypeEnum.java | 42
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexPopulationSexStatisticsVO.java | 20
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialMemberApi.java | 103
springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/java/com/panzhihua/service_bracelet/service/BraceletUserDataService.java | 70
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/DelComMngHousePopulationDTO.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiReseauPeopleServiceImpl.java | 72
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleWestDAO.java | 145
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsConfigMapper.xml | 39
flower_city/src/main/java/com/dg/core/db/manual/mapper/util/PageUtils.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComFmsServiceRecordService.java | 14
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/IComEventService.java | 109
flower_city/src/main/resources/mapper/SlideshowMapper.xml | 14
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java | 143
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActMicroWishOperationRecordService.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FeignHystrixConcurrencyStrategy.java | 128
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/redis/RedisUtils.java | 247
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/DisabledPersonsServiceImpl.java | 93
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/StrFormatter.java | 76
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java | 443
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActPasswordVo.java | 20
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EventDetailWorkVO.java | 68
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiConvenientMerchantDao.java | 62
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrgHatchAudit.java | 81
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialOrgApi.java | 97
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiSnapshotServiceImpl.java | 63
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarInquiryDto.java | 78
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwDangerReportEditDTO.java | 221
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/OrderDeliverAdminDto.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActIntegralUserChangeDOMapper.xml | 44
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwRotaMapper.xml | 60
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiCharityMapper.xml | 166
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientGoodsCategoryDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/resources/bootstrap.yml | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditAdminDTO.java | 83
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthElderlyApi.java | 90
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityAuthMethodEnum.java | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerVO.java | 119
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenCommunityStatisticsVO.java | 32
flower_city/src/main/java/com/dg/core/db/gen/entity/CountList.java | 20
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopUserAddressVO.java | 88
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseBaseApi.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/dos/UnionInspection.java | 121
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionStoreDto.java | 108
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaPersonVO.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseApply.java | 144
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridCascadeListDTO.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberWarnLogAdminVO.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java | 247
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventStatisticsMemberAdminVO.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryUserAddressDto.java | 118
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComVeteransPopulationVO.java | 356
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveService.java | 137
springcloud_demo_on_k8s-master/service-tp/src/main/resources/application.yml | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EvaluationFmsServiceDTO.java | 36
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenResidentActStatisticsInfo.java | 36
flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java | 164
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngDistrictDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/model/dto/LcFlowPersonVisitRecordDTO.java | 121
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicNewMapper.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientGoodsCategoryDO.java | 68
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysOperLogDAO.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientMerchantDTO.java | 140
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/Threads.java | 69
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleCommentService.java | 13
springcloud_k8s_panzhihuazhihuishequ/deploy-file/eurekaserver.yaml | 64
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerGoodsService.java | 97
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiOldManVO.java | 52
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRafflePrize.java | 66
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiExperienceActivityMapper.xml | 270
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentWestDAO.java | 44
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComClusterOrganizationService.java | 59
flower_city/src/main/java/com/dg/core/service/impl/ElseAccessoryImpl.java | 47
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarModelRelationVo.java | 63
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPensionAuthPensionerMapper.xml | 82
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java | 195
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/51.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActRafflePrizeService.java | 24
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/EditUserInfoPassAppDTO.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseDonatesServiceImpl.java | 354
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectScheduleServiceImpl.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/bracelet/CommunityBraceletService.java | 133
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoApi.java | 73
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 312
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActWarehouseOperationApi.java | 86
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleBrowseService.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveOperationRecordServiceImpl.java | 90
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyActivityTopUser.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActUserWalletTradeDO.java | 103
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/27.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerIntegralRecord.java | 47
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerEvaluateService.java | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/LogUtils.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageVolunteerDTO.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationBasicsStatisticsVO.java | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ChangePasswordVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActUserWalletTradeDOMapper.xml | 273
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationAppReleaseVO.java | 47
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComPensionAuthStatisticVO.java | 90
flower_city/src/main/java/com/dg/core/ResultData.java | 85
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderDto.java | 191
flower_city/src/main/java/com/dg/core/service/IMenuService.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerActivitiesPeople.java | 86
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveAnswerContentService.java | 56
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java | 337
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/PbWorkVO.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberAdminVO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerSkillDao.xml | 122
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/ComActFourMemberMapper.xml | 14
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserRoleDAO.xml | 14
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidDangerMemberServiceImpl.java | 49
flower_city/src/main/java/com/dg/core/db/gen/entity/PieChart.java | 19
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComKeyPopulationDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActRegistMapper.xml | 205
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/mvnw.cmd | 182
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMapGridEventVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanRequestVO.java | 47
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiComActWorkGuideMaterial.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/SetShelfForProductDTO.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java | 194
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/model/request/LoginRequest.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseFileApi.java | 86
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseOperationVO.java | 90
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java | 1365
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/RentingHouseRegisterDTO.java | 175
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyActivityTypeChart.java | 19
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/WxPayNotifyOrderVO.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/MostBeautifulVolunteerDao.java | 37
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/66.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/RaffleMessage.java | 97
flower_city/src/main/java/com/dg/core/service/IClassifyAdministrationService.java | 85
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActEvaluateDAO.java | 54
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java | 193
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/mapper/UnionAccessMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActWarehouseBaseService.java | 15
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java | 312
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DetailNeighborCommentReplyByAdminDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/FtpConfig.java | 20
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructBuildTypeVO.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/SysUserServiceImpl.java | 119
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/PieElementVO.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideClassifyVO.java | 49
springcloud_demo_on_k8s-master/service-influxdb-app/mvnw | 286
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/model/vos/LoginBody.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopGoodsAttrVO.java | 77
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/BaseDO.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/NoticeReadDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsInformation.java | 88
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthRecordServiceImpl.java | 585
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationHouseUserDOMapper.xml | 35
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/ComActIntegralUser.java | 135
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserDOMapper.xml | 124
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActFourMember.java | 75
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseBaseServiceImpl.java | 22
flower_city/src/main/java/com/dg/core/db/gen/entity/OrganizationChartEntity.java | 142
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComKeyPopulationVO.java | 101
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/SafeboxRequestWrapper.java | 76
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductShelfVO.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComAreaTownCommunityMapper.xml | 29
flower_city/src/main/resources/mapper/KeywordMapper.xml | 104
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleDetailAppDTO.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopHiddenConfVO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoHandlerMapper.java | 66
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/logback-spring.xml | 51
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientProductCategoryDO.java | 65
flower_city/src/main/resources/mapper/MenuMapper.xml | 90
flower_city/src/main/java/com/dg/core/util/SmsUtil.java | 441
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/PopulationStatisticsVO.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageTotalVO.java | 30
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml | 38
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/test/java/com/panzhihua/service_grid/service/impl/LcCompareCodeServiceImplTest.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoIndustryCenterApi.java | 89
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryCommodityActivityApi.java | 106
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenDrawLngLatDTO.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityActivityServiceImpl.java | 177
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngBuildingDAO.java | 102
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectMemberDao.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/McsVerifiedRecordService.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/ComMediateTypeDTO.java | 98
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationExportDTO.java | 55
springcloud_demo_on_k8s-master/service-api/src/main/java/com/springcloud/serviceapi/controller/ApiController.java | 29
flower_city/src/main/java/com/dg/core/task/SwaggerConfig.java | 51
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/StreetBigScreenDAO.java | 380
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/laydate/default/laydate.css | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthElderlyDetailsVO.java | 76
flower_city/src/main/java/com/dg/core/controller/WeixinApiController.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AES.java | 174
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComVeteransPopulationMapper.xml | 68
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientProductCategoryDTO.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAppVO.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeDetailedExcelAdminVO.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/GlobalExceptionCapture.java | 145
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComLowSecurityPopulationApi.java | 15
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/KaptchaConfig.java | 45
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportUserDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/ConvenientApi.java | 392
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidCheckRecordApi.java | 91
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EventResourceMapper.java | 19
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EventWorkVO.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectSignDAO.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/IntegratingTaskVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxUtil.java | 839
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/easyexcel/UploadEexcelUserDTOListener.java | 180
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/SwaggerConfig.java | 60
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/10.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/config/MyMetaObjectHandler.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/Constant.java | 82
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbDynMapper.xml | 120
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynTypeMapper.java | 46
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerOrderPayService.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectScheduleVO.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/config/MybatisPlusConfig.java | 38
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseInsertAdminDTO.java | 132
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/BatteryJobHandler.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/dao/ComPropertyAlarmSettingDao.java | 16
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 613
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemApi.java | 93
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/CancelReserveRecordDTO.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/StatisticsPhotoVO.java | 29
flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysSettingsMapper.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/RentingHoursePreOrderVO.java | 102
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderBargainRecordController.java | 106
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventApplicationUserNoticeMapper.xml | 59
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/FundsApi.java | 159
springcloud_k8s_panzhihuazhihuishequ/zuul/.mvn/wrapper/maven-wrapper.properties | 2
flower_city/src/main/java/com/dg/core/service/IGuideEvolveService.java | 51
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/LcCompareCodeMemberDO.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberVO.java | 103
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/KeyPersonLabelEnum.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientServiceCategoryService.java | 65
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsTeamMemberRelationMapper.xml | 20
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComChangeCarModel.java | 75
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java | 82
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java | 224
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionReportServiceImpl.java | 86
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IndexUserStatisticsVo.java | 19
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarModelSpecsChildrenFeign.java | 87
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionShippingAddressServiceImpl.java | 96
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/EventDO.java | 230
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventResourceServiceImpl.java | 120
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/QRCodeVO.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComDisabilityPopulationService.java | 13
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseDonatesApi.java | 126
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPbServiceTeamMapper.xml | 19
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvJumpVO.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/KeyPersonInfoService.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java | 67
flower_city/.gitkeep | 0
flower_city/src/main/java/com/dg/core/db/gen/mapper/ReplyTemplateMapper.java | 60
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseOrder.java | 287
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApplicationUserNoticeApi.java | 91
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java | 282
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java | 123
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComChangeCarInquiry.java | 59
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ScreenDrawEventVO.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOperLogDAO.java | 16
flower_city/src/main/java/com/dg/core/util/presence/YearMap.java | 84
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/GridBuildRelationDAO.java | 14
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java | 153
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/api/UnionOutdoorLaborDynamicApi.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/logback-spring.xml | 78
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseUserDO.java | 101
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsEvaluateServiceImpl.java | 96
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwSafetyWorkRecordDO.java | 60
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/model/dto/ExcelExportDto.java | 75
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridStatisticsDataDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/InputUserTagsDTO.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActCommitteeService.java | 45
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentingHouses/RentingHouseRegisterVO.java | 157
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComActIntegralUsersMapper.xml | 141
springcloud_k8s_panzhihuazhihuishequ/service_community/.mvn/wrapper/MavenWrapperDownloader.java | 118
flower_city/.gitignore | 35
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java | 115
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComReserveApi.java | 87
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightConvenientMerchantVO.java | 86
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/.gitignore | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java | 75
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridEventStatisticsDetailVO.java | 71
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/helper/encrypt/ParammeterInterceptor.java | 118
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComPbCheckUnitDto.java | 115
flower_city/src/main/java/com/dg/core/util/IdUtils.java | 49
springcloud_k8s_panzhihuazhihuishequ/service_dlz/src/main/resources/bootstrap.yml | 38
flower_city/src/main/java/com/dg/core/db/gen/entity/MenuEntity.java | 59
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/large/SumAreaStreetResp.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActIntegralRuleMapper.java | 50
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/mvnw | 310
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/SignactivityVO.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiGoldCoinRecordMapper.xml | 142
flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSmartConsulting.java | 57
flower_city/src/main/java/com/dg/core/WMApplication.java | 19
springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/java/com/panzhihua/service_bracelet/config/ParamOutAspect.java | 125
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComChangeCarModelRelationController.java | 119
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationTempFilledExcelListen.java | 238
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVisitingTasksDetailsVO.java | 135
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/AddComMngHousePopulationDTO.java | 38
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventMainMemberAddDTO.java | 127
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVillageDO.java | 94
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RSAUtils.java | 153
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccUserVO.java | 38
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComOpsHouseDTO.java | 128
springcloud_demo_on_k8s-master/config-server/.mvn/wrapper/maven-wrapper.jar | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActProceedings.java | 81
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventMainMemberDTO.java | 148
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/QuestnaireAnswersDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/RentingHourseOrderVO.java | 252
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/VolunteerCommunityConfigMapper.xml | 131
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java | 1222
flower_city/src/main/java/com/dg/core/db/gen/entity/TimeWorkOrder.java | 35
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwRotaPageDTO.java | 47
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java | 642
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml | 103
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/IndexDataAnalysisVO.java | 70
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerIntegralRecordService.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynUserDAO.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishFeedbackVO.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialOrgHatchService.java | 45
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarModelSpecsChildrenDto.java | 44
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComRehabilitationPopulationDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderPayDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/EventFile.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvDO.java | 72
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddTeamTypeDTO.java | 34
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java | 197
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysAppConfigMapper.xml | 12
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleBrowseWestService.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/DisableOrEnableMcsMerchantDTO.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulCultureLevelEnum.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidCheckRecordDTO.java | 59
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletTradeAdminDTO.java | 57
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgHatchAuditServiceImpl.java | 231
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarModelSpecsDto.java | 71
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopCartDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicService.java | 67
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/resources/mapper/UnionIntegralSummarizeMapper.xml | 134
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/SecurityConstants.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridMemberWarnLogDO.java | 74
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComChangeCarInquiryMapper.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordDO.java | 139
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveSubMapper.xml | 32
flower_city/src/main/resources/mapper/HuaChengSysUserMapper.xml | 123
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComChangeCarModelSpecsChildrenServiceImpl.java | 136
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComEldersAuthHistoryExcelVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/CommunityUserInfoVO.java | 110
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/PartyMemberListExcelVO.java | 48
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/ComActIntegralCountDTO.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/QuestnaireState.java | 20
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbServiceTeamWishVO.java | 23
flower_city/src/main/java/com/dg/core/db/manual/pojo/AppletUserCount.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsAttrVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/JinhuiPageConvenientMerchantDTO.java | 49
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/AddIdentityAuthDTO.java | 77
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoRewardVO.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComElderAuthRecordsDAO.java | 64
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionOutdoorSiteDto.java | 184
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoEvaluateService.java | 94
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageUserAppletsBackstageDTO.java | 71
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComLowSecurityPopulationVO.java | 285
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/config/WebSocketClient.java | 166
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectDao.java | 120
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopStoreService.java | 101
flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java | 107
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAdminVO.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPensionAuthHistoryRecordMapper.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHoursePreOrderMapper.xml | 48
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsServiceMapper.xml | 365
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/EditUserInfoAppDTO.java | 17
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationSentenceMistakeExcelVO.java | 91
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/39.gif | 0
flower_city/src/main/resources/mapper/AutomessageTransactionEventInterviewMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/R.java | 110
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberRoleDOMapper.xml | 109
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComFmsTeamTypeService.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralUserDO.java | 136
flower_city/src/main/resources/mapper/AutomessageSmartConsultingMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/model/dto/LcKeyPersonVisitRecordDTO.java | 85
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPensionAuthHistoryRecordDOMapper.xml | 120
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/dao/UnionOutdoorServiceRangeMapper.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarBrandDto.java | 86
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityOrderCollageTeamPeople.java | 48
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiMicroVolunteeringService.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussUserDAO.java | 26
flower_city/src/main/resources/application.properties | 56
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/UnionReportService.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComChangeCarModelSpecsService.java | 78
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComVeteransPopulationDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComFmsTeam.java | 62
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java | 114
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/DiscussVoteOptionDTO.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java | 204
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComCultPopulationApi.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopGoodsDTO.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActColumnService.java | 52
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVaccinesInoculationRecordServiceImpl.java | 70
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ResetComActMessageVO.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActRegistDO.java | 90
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/ServiceJinHuiCommunityApplication.java | 26
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/font/iconfont.svg | 473
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/PageClusterAdminVo.java | 36
springcloud_k8s_panzhihuazhihuishequ/zuul/mvnw.cmd | 182
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActPictureVO.java | 50
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileType.java | 91
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/CommediateTypeService.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwPatrolRecordDAO.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/DateScreenVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngWestApi.java | 779
flower_city/src/main/java/com/dg/core/db/manual/pojo/Search.java | 38
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiConvenientMerchantServiceImpl.java | 68
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarBrandFeign.java | 87
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/MostBeautifulVolunteerService.java | 54
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoAdminVO.java | 80
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCorrectPopulationDO.java | 258
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/ComMngFamilyInfoDAO.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemClaimServiceImpl.java | 272
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml | 794
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventApi.java | 104
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java | 140
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerIntegralRecordServiceImpl.java | 63
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityActivityDto.java | 142
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/HatchAuditProcessDTO.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightShoppingOrderApi.java | 107
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityActivityFeign.java | 136
springcloud_k8s_panzhihuazhihuishequ/config_server/mvnw | 310
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderDeliveryDAO.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComMngPopulationAgeVO.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberRelationMapper.xml | 651
springcloud_demo_on_k8s-master/config-server-bak/src/main/java/com/springcloudme/configserver/ConfigServerApplication.java | 16
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyEquipmentApi.java | 86
springcloud_demo_on_k8s-master/service-zuul/mvnw.cmd | 161
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ListUtils.java | 14
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/config/MybatisHmkInterceptor.java | 24
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsMemberVo.java | 108
flower_city/src/main/java/com/dg/core/service/ISysUserService.java | 94
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerType.java | 58
flower_city/src/main/java/com/dg/core/MvcConfig.java | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealAssetsExcelVO.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidDangerMember.java | 115
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/ScreenStatics.java | 64
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerGoodsAttrService.java | 13
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/SanShuoMessageVO.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 2847
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiLargeScreenDao.java | 140
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryStoreMapper.java | 78
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationCommunityTagsServiceImpl.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ExportDonatesVO.java | 79
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java | 955
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityActivityVo.java | 166
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductCategoryVO.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComRehabilitationPopulationApi.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthElderlyDO.java | 99
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynTypeVO.java | 48
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PagePartyOrganizationVO.java | 84
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiComActQuestnaireSubDao.java | 12
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderDeliveryNoListVO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/SysConfApi.java | 126
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/ConvenientResetPasswordDTO.java | 31
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/64.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordStatisticsVO.java | 105
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngCarExcelListen.java | 57
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynUserDO.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightConfigServiceImpl.java | 68
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EasyPhotoApi.java | 85
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/AddEnterpriseDTO.java | 65
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java | 176
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventApplicationUserNoticeService.java | 65
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/44.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/McsVerifiedRecordDAO.java | 49
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyAlarmSettingMapper.xml | 17
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java | 496
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/FmsServiceTopStatisticsVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSanShuoExpertService.java | 63
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructOtherBuildDAO.java | 48
flower_city/src/main/java/com/dg/core/controller/CommonController.java | 178
flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysSettingsRecord.java | 50
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesByAdminDTO.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFundsVO.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEasyAppDTO.java | 56
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/UnionOutdoorSiteService.class | 0
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/.gitignore | 33
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/model/vos/LoginBody.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDTO.java | 41
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSentencePopulationDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishDO.java | 167
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireAnswerContentServiceImpl.java | 17
springcloud_demo_on_k8s-master/.mvn/wrapper/maven-wrapper.jar | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/MathUtils.java | 24
flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageCommonProblem.java | 84
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventPublicDTO.java | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PhotoMicroWishData.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventApplicationAppReleaseServiceImpl.java | 128
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java | 464
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngBuildingExcelListen.java | 202
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitListVO.java | 82
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerActivity.java | 157
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicWestService.java | 60
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EventWorkScreenVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComFmsServiceEvaluations.java | 49
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSentencePopulationServiceImpl.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActSignExcelNewVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleCommentWestService.java | 13
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePopulationListDTO.java | 47
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectSchedule.java | 60
flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java | 97
springcloud_k8s_panzhihuazhihuishequ/eureka_server/mvnw.cmd | 182
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComCorrectPopulationApi.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCvtBusinessAreaDO.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderDeliveryVO.java | 121
springcloud_demo_on_k8s-master/pom.xml | 52
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComFmsTeamType.java | 49
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFundsOrderVO.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsProductMapper.xml | 71
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthGetResultDTO.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerTypeService.java | 28
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/java/com/springcloudme/serviceinfluxdbapp/controller/InfluxdbController.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityOrderCollageTeam.java | 55
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthRecordDTO.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyBuild.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IpUtils.java | 165
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/LcCompareCodeApi.java | 55
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java | 43
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/8.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/McsMerchantService.java | 119
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseLabelDao.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveOperationRecordService.java | 41
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComClusterOrganizationMemberDOMapper.xml | 139
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComDynamicWorkScreenVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientProductDTO.java | 66
springcloud_k8s_panzhihuazhihuishequ/zuul/.gitignore | 33
springcloud_demo_on_k8s-master/config-server-bak/.gitignore | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/DiscussListVO.java | 54
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActEasyPhotoEvaluateController.java | 111
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthFeedbackDAO.java | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerGoodsDTO.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireDOMapper.xml | 259
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActEnterpriseApi.java | 93
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoFeedbackServiceImpl.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java | 877
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComActIntegralUsersService.java | 11
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/57.gif | 0
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/ISysRoleServiceImpl.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopUserAddressDAO.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridCommunityAdminVO.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/ServiceUserApplication.java | 20
flower_city/src/main/java/com/dg/core/db/gen/mapper/KeywordMapper.java | 61
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/ComActDAO.java | 177
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComPensionAuthRecordService.java | 141
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivityServiceImpl.java | 157
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/LoginWithPhoneDTO.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/ComActProject.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityBigScreenVO.java | 59
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/DictionaryApi.java | 93
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActUserWalletDOMapper.xml | 92
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveSubMapper.java | 29
flower_city/src/main/java/com/dg/core/api/SlideshowAppletsController.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysTemplateConfigMapper.xml | 12
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiConfigService.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActUserWalletDO.java | 77
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiConfigServiceImpl.java | 55
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyMemberDetailExcelVO.java | 43
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsGameVO.java | 92
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommoditySpecsService.java | 78
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/config/SecurityConfig.java | 103
flower_city/src/main/resources/mapper/RoleManagementMapper.xml | 101
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngUserTagDO.java | 46
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexGridEventStatisticsVO.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborWestApi.java | 367
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionUserServiceImpl.java | 311
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/UnionIntegralSummarizeService.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/SysUserFeedbackDTO.java | 69
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java | 137
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityDto.java | 112
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NeighborApi.java | 229
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVillageServeExcelListen.java | 83
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynUserDAO.java | 19
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActEnterpriseApi.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActPopulationScreenVO.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PageComActMessageVO.java | 73
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsCouponVO.java | 64
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderGoodsVO.java | 75
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VaccinesApi.java | 213
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWorkGuideClassifyDAO.java | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordVO.java | 206
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActUserWalletMapper.java | 52
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComChangeCarModelRelationServiceImpl.java | 158
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationListDTO.java | 62
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComActProjectMapper.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommunityRepublishEventDTO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsConfig.java | 53
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeHandleExcelAdminVO.java | 49
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/helper/sensitive/SensitiveInterceptor.java | 73
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSanShuoEventController.java | 256
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/ExportEasyPhotoDTO.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/java/com/panzhihua/service_bracelet/dao/BraceletUserDataDao.java | 81
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseOperationMapper.xml | 46
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActWorkGuideService.java | 70
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/OpsHouseStatus.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/EditClusterMemberAdminDto.java | 47
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightConfigService.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyMemeber.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/ExcelListener.java | 54
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EasyPhotoApi.java | 151
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionUserFeign.java | 46
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCvtServeDO.java | 75
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoCommentDAO.java | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/EasyExcel.java | 84
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/AdvertisingManagementApi.java | 178
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientProductCategoryService.java | 60
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/StreetApi.java | 38
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComChangeCarModelSpecsController.java | 106
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java | 559
springcloud_k8s_panzhihuazhihuishequ/service_user/mvnw.cmd | 182
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/MediateTypeVO.java | 18
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/template/53461_.key.p8 | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/RentingHousesConfigDTO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerActivitiesPeopleDao.java | 60
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationCommunityTagsService.java | 13
flower_city/src/main/java/com/dg/core/exception/file/SpringUtils.java | 136
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VaccinesApi.java | 176
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiReseauPeopleApi.java | 182
flower_city/src/main/java/com/dg/core/file/FileTypeUploadUtils.java | 94
springcloud_demo_on_k8s-master/eureka-server/.gitignore | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComChangeCarBrandMapper.xml | 114
springcloud_demo_on_k8s-master/service-zuul/src/main/java/com/springcloudme/servicezuul/ServiceZuulApplication.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseContractConfigServiceImpl.java | 104
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthRecordExcelVO.java | 36
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAnalysisVO.java | 43
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignInRecordVO.java | 42
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/SystemmanagementConfigVO.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/resources/mapper/UnionUserMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/config/MinioUtil.java | 125
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerDetailsVO.java | 115
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/BigScreenDAO.java | 163
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentReplyWestDO.java | 86
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActEasyPhotoCommentDTO.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveAnswerContentMapper.java | 79
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ServiceStaticBackstageDTO.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActEvaluateExcelVO.java | 41
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java | 159
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/SysUserEditTipsDTO.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRecordListVO.java | 98
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarModelSpecsVo.java | 77
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java | 243
springcloud_k8s_panzhihuazhihuishequ/common/.gitignore | 33
springcloud_k8s_panzhihuazhihuishequ/applets/.gitignore | 33
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/EasyPhotoActivityJobHandler.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/ComPropertyRepairService.java | 44
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseOrderServiceImpl.java | 182
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructAreaDistrictDO.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EastPhotoVO.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationMistakeExcelVO.java | 139
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEnterpriseServiceImpl.java | 106
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/PayCpmstant.java | 54
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComMngVillageDTO.java | 36
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActFeedBackApi.java | 68
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BuildingApi.java | 343
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseDetailVO.java | 56
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructBuildTypeDO.java | 36
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityVo.java | 123
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java | 80
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityOrderCollageTeamPeopleService.java | 78
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/35.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActColumnApi.java | 96
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseOrderDao.java | 35
flower_city/src/main/java/com/dg/core/db/gen/entity/Agreement.java | 91
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/area/AreaInfoVo.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java | 150
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/loading-0.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilGovernmentStatisticsVO.java | 34
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityActivityDto.java | 129
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSanshuoIndustryCenterDao.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/SysUserInputService.java | 124
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthAddByFamilyDTO.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageSysConfDTO.java | 79
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventReportDTO.java | 49
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditDTO.java | 87
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyWorkerDAO.java | 50
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStaticsReserveMonth.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationHouseAdminVO.java | 63
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComDisabilityPopulationServiceImpl.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ProjectVO.java | 51
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java | 228
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActBuildingServiceImpl.java | 654
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEnterpriseTypeDAO.java | 64
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireDetailAdminVO.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UsersAnswerVO.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsAttrDAO.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthElderliesServiceImpl.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/TokenException.java | 57
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberGpsLogAddDTO.java | 61
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExcelElderAuthDTO.java | 48
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugMistakeExcelVO.java | 106
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRegisterServiceImpl.java | 459
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleCommentWestServiceImpl.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentReplyDAO.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml | 1525
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridIncidentStatisticsVO.java | 47
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java | 485
flower_city/src/main/java/com/dg/core/exception/ServiceException.java | 73
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireUserAnswerServiceImpl.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAccRuleServiceImpl.java | 14
flower_city/src/main/java/com/dg/core/task/SendWsListener.java | 116
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticAgeGender.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDaoMapper.xml | 417
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidCheckRecordMapper.xml | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyMemberDetailVO.java | 46
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActUserWalletTradeService.java | 75
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActIntegralUserRuleAdminVO.java | 43
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/mvnw.cmd | 205
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSentencePopulationService.java | 13
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarModelSpecsChildrenApi.java | 51
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventRepublishDTO.java | 32
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialMemberApi.java | 92
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/Refund.java | 217
flower_city/src/main/java/com/dg/core/controller/AutomessagePolicyDocumentsController.java | 152
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java | 552
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/McsProductLabelDAO.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/PageClusterMemberVo.java | 41
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActRaffleRecordApi.java | 105
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/impl/UnionReportServiceImpl.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunitySanShuoService.java | 191
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActIntegralUserApi.java | 61
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/17.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProject.java | 151
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/0.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityAuthTypeEnum.java | 28
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarBrandApi.java | 129
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesEnrollUserByAppVO.java | 55
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/dao/UnionAccessMapper.java | 19
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCorrectExcelListen.java | 672
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java | 237
springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/logback-spring.xml | 51
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComActEasyPhotoEvaluateVo.java | 68
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopSysConfVO.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthRecordForCommunityVO.java | 79
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialMemberServiceImpl.java | 119
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/WxPayOrderVO.java | 17
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPropertyVO.java | 100
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/TopStatisticsVO.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/ComActWalletDetailDTO.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightConvenientMerchantDao.java | 80
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPayVO.java | 101
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoDO.java | 126
flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java | 180
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java | 356
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java | 464
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/resources/logback-spring.xml | 51
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightShoppingOrderService.java | 33
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/layer.js | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationHouseService.java | 140
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComExServicemanServiceImpl.java | 45
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletAdminDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/wx/TemplateData.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BcRegionApi.java | 64
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComScreenMapper.xml | 104
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventMainMemberDeleteDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java | 314
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiShoppingApi.java | 177
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/IndexApi.java | 91
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgDao.java | 86
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/AutomessageSysUserServiceImpl.java | 27
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/LBJobHandler.java | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventEditDTO.java | 114
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationKeyMistakeExcelVO.java | 76
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java | 270
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java | 55
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/PayUtil.java | 202
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceServiceImpl.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/resources/mapper/UnionInspectionMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionOutdoorLaborDynamicFeign.java | 33
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/60.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/PageDonatesDTO.java | 60
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventResourceDTO.java | 76
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/StartSeckillOrderDto.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java | 303
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiQuestnaireUserAnswerVO.java | 68
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridDataDO.java | 105
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionReportApi.java | 49
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOperLogServiceImpl.java | 120
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidCheckRecordApi.java | 82
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarModelSpecsDto.java | 74
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/ComActIntegralUserTrade.java | 109
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NewStriveApi.java | 665
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenStatisticsService.java | 349
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiAllOldManVO.java | 52
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemUnitTaskApi.java | 53
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java | 345
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEventResourceMapper.java | 42
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/config/SwaggerConfig.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWarehouseDonatesDao.java | 97
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java | 258
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ServletUtils.java | 118
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_grid/model/helper/sensitive/SensitiveInterceptor.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComElderAuthRecordImportExcelListen.java | 229
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenActActivityListDTO.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/PartyBuildingMemberVO.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationHouseDOMapper.xml | 57
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/MemberStatisticsAdminDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/GridMemberLcListVO.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVaccinesInoculationRecordService.java | 42
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireListAdminVO.java | 77
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulHousePurposeEnum.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComMediateType.java | 189
springcloud_k8s_panzhihuazhihuishequ/service_dlz/src/main/java/com/panzhihua/service_dlz/ServiceDlzApplication.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMediaTypeMapper.xml | 16
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WalletApi.java | 74
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientProductDTO.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java | 389
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopSysConfDTO.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthRecordVO.java | 38
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarModelApi.java | 141
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerActivityDao.java | 53
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenCourtyardStatisticsInfo.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActColumnServiceImpl.java | 161
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyPublicityApi.java | 71
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComVeteransPopulationServiceImpl.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopGoodsAttrService.java | 13
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiApplyExperienceDao.java | 63
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java | 857
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveSubService.java | 31
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/4.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComElderAuthElderliesService.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectSignMapper.xml | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventConciliationVO.java | 45
flower_city/src/main/java/com/dg/core/exception/file/FileNameLengthLimitExceededException.java | 16
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/config/KaptchaConfig.java | 45
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java | 417
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EventMapper.java | 195
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComDisabilityPopulationDO.java | 112
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/dao/UnionIntegralRuleRecordMapper.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyRepair.java | 141
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java | 830
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthPensionerServiceImpl.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarModelDto.java | 92
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/RoleDAO.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/ExcelUtils.java | 85
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/48.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoActivityRecordDO.java | 77
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborAddBrowseAppDTO.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentStatusByAdminVO.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyAlarmSettingServiceImpl.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserChangeServiceImpl.java | 129
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyWorkerApi.java | 53
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventSpecialCrowdRecordDO.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComLowSecurityPeopleDO.java | 149
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java | 54
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageBackVO.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseVO.java | 162
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderCollageTeamPeopleFeign.java | 87
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialWorkerServiceDao.java | 36
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerOrgTeamVo.java | 76
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/carousel.js | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComChangeCarBrandService.java | 78
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/SafeWordDangerLevelEnum.java | 40
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionStoreApi.java | 116
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiCoinGeneralTableVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/pom.xml | 134
flower_city/src/main/java/com/dg/core/util/presence/Year2010.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/model/dos/UnionOutdoorLaborDynamic.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/impl/UnionOutdoorLaborDynamicServiceImpl.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/api/RoomckWebApi.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveDetailVO.java | 134
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java | 142
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommoditySpecsMapper.xml | 105
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseUserServiceImpl.java | 143
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/model/dos/UnionUser.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java | 145
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/EncryptQueryClass.java | 14
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiSnapshotClassifyVO.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngRealAssetsExcelListen.java | 57
springcloud_demo_on_k8s-master/service-tp/src/main/java/com/springcloudme/servicetp/UserClient.java | 13
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCommentReplyAppDTO.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewStriveForMapper.xml | 108
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/EasyPhotoClassifyApi.java | 56
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActCommittee.java | 78
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralCommunityTradeVO.java | 43
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveDetailAdminVO.java | 67
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyRepairApi.java | 119
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/GetIdentityEidTokenDTO.java | 43
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarModelVo.java | 97
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientElevatingPointDTO.java | 75
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/model/dos/Structured.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletTradeStatisticsAdminVO.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleFabulousService.java | 13
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishDOMapper.xml | 317
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/PageClusterVo.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventDetailVO.java | 140
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarModelSpecsDto.java | 80
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventTasksVisitorTypeEnum.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/AddReserveAdminDTO.java | 49
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java | 367
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyWorkerServiceImpl.java | 96
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngRealAssetsDO.java | 63
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsServiceRecordMapper.xml | 83
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/31.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/mapper/UnionOutdoorServiceRangeMapper.xml | 5
flower_city/src/main/java/com/dg/core/db/gen/mapper/AreaCode2022Mapper.java | 24
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PageComMngVillageVO.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComSanshuoIndustryCenter.java | 144
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/model/dos/UnionIntegralRecord.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/UnionExchangeRecordService.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComMngVillageListAppDTO.java | 66
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventTasksStatusEnum.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseRegister.java | 355
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMapGridDetailVO.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbDynDO.java | 94
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectPublicityService.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialWorkerMapper.xml | 149
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsClassroomMapper.xml | 126
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActQuestnaireUserAnswerMapper.xml | 196
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemInventoryService.java | 55
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActRaffleApi.java | 97
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicWestServiceImpl.java | 144
springcloud_k8s_panzhihuazhihuishequ/auth/.mvn/wrapper/MavenWrapperDownloader.java | 118
springcloud_k8s_panzhihuazhihuishequ/zuul/.mvn/wrapper/maven-wrapper.jar | 0
springcloud_demo_on_k8s-master/deploy-file/service-api.yaml | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaiteSubVO.java | 46
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AreaVO.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderCollageTeamDto.java | 64
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenEventListDTO.java | 61
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java | 290
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussDOMapper.xml | 377
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/IComEventResourceService.java | 70
springcloud_k8s_panzhihuazhihuishequ/service_user/pom.xml | 134
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/logback-spring.xml | 78
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 1291
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ComActWarehouseDonatesDTO.java | 72
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComDisabilityPopulationVO.java | 119
flower_city/src/main/java/com/dg/core/exception/file/InvalidExtensionException.java | 84
flower_city/src/main/java/com/dg/core/service/impl/HuaChengSysUserImpl.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/McsOrderService.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/model/dos/UnionOutdoorServiceRange.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeRightExcelAdminVO.java | 25
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/laytpl.js | 2
flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml | 127
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiInterspaceTypeVO.java | 49
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/DisablePersonApi.java | 89
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberWarnLogDTO.java | 89
flower_city/src/main/java/com/dg/core/util/presence/Year2002.java | 31
flower_city/src/main/resources/mapper/AutomessageSysSettingsRecordMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComChangeCarModelSpecsMapper.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/AcidMessage.java | 132
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynDO.java | 110
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewStriveIntegratingTaskMapper.xml | 219
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/config/SFTPConfig.java | 31
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxH5Properties.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWarehouseApplyDao.java | 51
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightProjectEvaluateServiceImpl.java | 74
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructAreaDAO.java | 47
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml | 519
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SFTPUtil.java | 376
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/NearbyDTO.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityActivityController.java | 175
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectPublicityServiceImpl.java | 48
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java | 68
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComPropertyWorker.java | 56
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVaccinesEnrollRecordService.java | 51
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainVo.java | 107
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordImportExcelVO.java | 63
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/DonatesStatisticsVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/service_equipment/pom.xml | 145
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiLargeScreenApi.java | 165
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireSubServiceImpl.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerActivitiesPeopleVO.java | 74
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ActWorkCountVO.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/model/dto/ComMngPopulationDTO.java | 160
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerUserAddressDAO.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientViewStatisticsVO.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/SysConfService.java | 69
flower_city/src/main/java/com/dg/core/db/gen/mapper/RoleManagementMapper.java | 56
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComDrugPopulationDO.java | 155
springcloud_k8s_panzhihuazhihuishequ/community_backstage/.mvn/wrapper/maven-wrapper.properties | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseFileMapper.xml | 19
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationHouseUserAdminVO.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComPropertyService.java | 64
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddFmsServiceAdminDTO.java | 61
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthStatisticsVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideAppletsVO.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java | 153
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/UserCreateOrderDto.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ApplicationAppReleaseMapper.xml | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/NoticeUnReadVO.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderOperateServiceImpl.java | 22
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 367
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/icon-ext.png | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UuLoginVO.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireUserAnswerDOMapper.xml | 19
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorMistakeExcelVO.java | 109
flower_city/src/main/java/com/dg/core/controller/AreaCodeController.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderOperateService.java | 13
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java | 67
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialExportVO.java | 70
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopCartListVO.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerMerchantMapper.xml | 374
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/layui.js | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComStreetDAO.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleTopicDO.java | 99
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireStatisticsSummaryExcelAdminVO.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/dos/UnionIntegralRecord.java | 95
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComActEasyPhotoEvaluateDto.java | 78
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridDataApi.java | 160
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventResourceMapper.java | 38
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiComActWorkGuideClassifyService.java | 53
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/FmsEventVO.java | 55
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/ComSanShuoEventController.java | 251
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityOrderApi.java | 81
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileException.java | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiShoppingOrderService.java | 31
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/22.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventMainMemberServiceImpl.java | 115
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopStoreVO.java | 80
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/HouseApi.java | 162
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanShuoEventVO.java | 56
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiConvenientMerchantService.java | 48
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ScreenWorkService.java | 103
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VillageVO.java | 12
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderCollageTeamFeign.java | 87
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCorrectPopulationVO.java | 286
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoCountVO.java | 9
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarBrandDto.java | 81
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComCultPopulationService.java | 13
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCorrectPopulationServiceImpl.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoTypeRelationServiceImpl.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemInventoryMapper.xml | 482
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/java/com/springcloudme/serviceinfluxdbapp/utils/InfluxDBUtils.java | 135
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/BcDictionaryVO.java | 27
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/dos/SysLogininforDO.java | 46
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComClusterOrganizationMapper.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityActivityDto.java | 141
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActEvaluateService.java | 46
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/PageRentingHouseRegisterDTO.java | 91
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSentencePopulationApi.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPensionAuthRecordDAO.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/NeighborCircleConstants.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientGoodsCategoryService.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngJobSetVO.java | 24
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthElderlyExcelVO.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAcidRecordDao.java | 146
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseRefundOrderService.java | 22
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialOrgApi.java | 107
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveMapper.java | 133
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDynTypeService.java | 64
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventSpecialPopulationDetailsVO.java | 52
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientProductSpecificationDO.java | 66
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComChangeCarBrandServiceImpl.java | 136
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActIntegralUserTradeAdminVO.java | 55
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/dos/SysOperLogDO.java | 70
springcloud_k8s_panzhihuazhihuishequ/auth/.mvn/wrapper/maven-wrapper.jar | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComFmsTeamMemberRelation.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkProjectInfo.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComOperationDetailVO.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerStoreDTO.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiConfig.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveDangerAreaApi.java | 101
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinghuiMerchantEvaluateService.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngProvinceDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngAppletsVO.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/FourMemberOrgRelationVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerIntegralMerchantDao.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/dos/UnionExchangeRecord.java | 107
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderDAO.java | 125
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarModelSpecsChildrenDto.java | 45
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthHistoryDTO.java | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWarnLogDeleteDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionExchangeRecordServiceImpl.java | 158
flower_city/src/main/java/com/dg/core/controller/SysSettingsController.java | 57
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComElderAuthRecordsMapper.xml | 483
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComVeteransPopulationApi.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryStore.java | 98
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngProvinceService.java | 54
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/dos/UnionIntegralSummarize.java | 63
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java | 274
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarBrandApi.java | 81
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VaccinesApi.java | 77
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ExportMerchantVO.java | 85
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ComActEasyPhotoTypeRelationMapper.java | 38
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/PopulationApi.java | 155
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/WeiXinException.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java | 206
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/ExcelDO.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthUserVO.java | 42
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComDataStatisticsFeign.java | 38
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java | 206
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantWithdrawVO.java | 54
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectMemberApi.java | 96
flower_city/src/main/resources/mapper/RoleMenuMapper.xml | 76
flower_city/src/main/java/com/dg/core/db/gen/entity/OrganizationEntity.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventDTO.java | 197
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialMemberMapper.xml | 54
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/api/UnionInspectionApi.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerGoodsViewStatisticsMapper.xml | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralUserVO.java | 43
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/TimejobApplication.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialMember.java | 109
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java | 201
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngRealCompanyBelongsDTO.java | 19
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActAcidRecordService.java | 127
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/13.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/SetShelfForGameDTO.java | 30
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-zuul.yaml | 50
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiComActQuestnaireSubSelectionDao.java | 12
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiLargeScreenMapper.xml | 240
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/YardVO.java | 19
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComPbServiceTeam.java | 80
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java | 847
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java | 169
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComPbServiceTeamDTO.java | 45
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthElderlyApi.java | 115
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActRegistServiceImpl.java | 69
flower_city/src/main/resources/mapper/AgreementMapper.xml | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/ComMngPopulationExportExcelVO.java | 84
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java | 207
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java | 426
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/UserIntegral.java | 75
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionExchangeRecordApi.java | 68
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ExcelUtil.java | 177
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderPayDO.java | 90
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/TencentUtils.java | 88
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/ComMngUserTagDAO.xml | 33
flower_city/src/main/java/com/dg/core/service/IElseAccessoryService.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComFmsServiceImportExcelListen.java | 176
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoClassifyMapper.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCultPopulationDO.java | 112
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoFeedbackDO.java | 65
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/McsProductLabelService.java | 14
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordExcleVO.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventResourceEditDTO.java | 50
flower_city/src/main/java/com/dg/core/exception/DemoModeException.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/CommunityPublicityVO.java | 45
flower_city/src/main/java/com/dg/core/util/workday/WorkdayGen.java | 74
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyHelpVO.java | 53
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComPropertyApi.java | 91
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberAdminVO.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopCartDO.java | 93
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActPictureDAO.java | 18
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java | 197
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComConvenientMerchantsMapper.xml | 282
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ActDynTypeApi.java | 86
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseContractConfigMapper.xml | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActIntegralUserTradeMapper.java | 63
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridEventStatisticsVO.java | 47
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/RefundQuery.java | 164
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/41.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/UploadFilesVO.java | 20
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/excel/CustemSecondhandler.java | 73
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionReportApi.java | 71
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/resources/mapper/UnionOutdoorServiceRangeMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionDoorApi.java | 34
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportSpecialUserDTO.java | 24
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityDto.java | 123
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java | 75
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/BcRegionMapper.xml | 70
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/resources/logback-spring.xml | 51
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/HouseApi.java | 77
springcloud_k8s_panzhihuazhihuishequ/service_community/.gitignore | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActPictureLibrary.xml | 10
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComFmsTeamMember.java | 66
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SensitiveUtil.java | 56
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/SpringSecurityConfig.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActUserWalletApi.java | 92
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/UnionIntegralRecordService.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java | 116
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexPopulationStatisticsVO.java | 22
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/MyAESUtil.java | 61
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamVO.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerIntegralMerchantService.java | 42
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java | 79
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/volunteer/ComMngVolunteerErrorExcelVO.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java | 366
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/bootstrap.yml | 38
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java | 46
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VisitingTasksApi.java | 68
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/util/MyTools.java | 72
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActWarehouseDonatesApi.java | 198
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyHelpServiceImpl.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingComPbDynVO.java | 107
springcloud_k8s_panzhihuazhihuishequ/common/pom.xml | 209
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActAnnouncementService.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EventTypeWorkVO.java | 38
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java | 434
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderBargainRecordServiceImpl.java | 119
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/util.js | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaVO.java | 85
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleBrowseDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/dao/UnionInspectionMapper.class | 0
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/58.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/test/java/com/panzhihua/service_community/ServiceCommunityApplicationTests.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidMemberMapper.xml | 36
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinghuiMerchantEvaluateDao.java | 38
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/manager/RoleAccessDecisionManager.java | 57
springcloud_demo_on_k8s-master/service-influxdb-app/src/test/java/com/springcloudme/serviceinfluxdbapp/ServiceInfluxdbAppApplicationTests.java | 17
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationElderExcelVO.java | 132
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/dao/ComPropertyAlarmDao.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoMemberDao.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DictionaryApi.java | 92
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVolunteerOrgTeamApi.java | 101
springcloud_k8s_panzhihuazhihuishequ/service_user/.gitignore | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerEvaluateDAO.xml | 51
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/InputUserInfoVO.java | 146
springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/resources/mapper/BraceletUserDataMapper.xml | 641
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderCollageTeamPeopleDto.java | 66
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialMemberApi.java | 87
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsAttrServiceImpl.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseRefundOrderMapper.xml | 14
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventComprehensiveGovernanceStatisticsVO.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComExServicemanDO.java | 143
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/helper/sensitive/SensitiveInterceptor.java | 73
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/MerchantBusinessPeriod.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsGameMapper.xml | 183
flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSmartConsultingMapper.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionOutdoorSiteFeign.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/ServerChannelInitializer.java | 18
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java | 158
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwRotaDAO.java | 43
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/PageBigScreenStatisticPartyOrg.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComAreaTownCommunityVO.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComClusterOrganizationMemberService.java | 92
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsVerifiedRecordServiceImpl.java | 38
flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java | 54
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/UnitActivityAnalysisVO.java | 43
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActColumnApi.java | 103
springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/resources/bootstrap.yml | 38
springcloud_demo_on_k8s-master/deploy-file/config-server.yaml | 42
flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java | 79
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiIndexInfoVO.java | 50
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/ComActReserveRegisterStatisticsDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java | 791
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/Convert.java | 918
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java | 207
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFundsExportDTO.java | 34
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/ComSanShuoApi.java | 174
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/handles/FileUploadExceptionAdvice.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderCollageTeamPeopleVo.java | 68
springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/java/com/panzhihua/service_bracelet/model/dos/SysUser.java | 274
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/GrantIntegral.java | 35
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/templates/simsun.ttc | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EasyPhotoDataVO.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RealNameUtil.java | 65
flower_city/src/main/java/com/dg/core/db/gen/entity/RangeStatistics.java | 19
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthUserDTO.java | 77
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/26.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiQuestnaireUserAnswerDao.java | 56
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussOptionService.java | 12
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAccUserDO.java | 47
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComFmsServiceEvaluationsService.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseFile.java | 117
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentUserDAO.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/admin/BuildingListHeaderStatisticsAdminVo.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/RoomckWebApi.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/McsInformationService.java | 82
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordStatisticExcleVO.java | 68
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/50.gif | 0
flower_city/src/main/java/com/dg/core/manager/TokenConstant.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerEvaluateDTO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java | 169
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComElderAuthElderliesDAO.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientGoodsCategoryServiceImpl.java | 127
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActProceedingsDao.xml | 168
springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/DictionValueData.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/MostBeautifulVolunteerApi.java | 122
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerActivityApi.java | 117
flower_city/src/main/java/com/dg/core/db/gen/mapper/SlideshowMapper.java | 16
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActEasyPhotoMemberApi.java | 97
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoHandlerService.java | 99
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java | 134
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BcRegionApi.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ApplicationAppReleaseMapper.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/TeamMemberTopStatisticsVO.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialProjectVO.java | 172
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsEvaluateDTO.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/resources/logback-spring.xml | 51
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java | 595
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoTypeMapper.xml | 47
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java | 136
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialOrgHatchVO.java | 64
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/ComSanshuoEventDTO.java | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComAcidStaticVO.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccRuleVO.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java | 378
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightIntegratingTaskServiceImpl.java | 149
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopCartVO.java | 71
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PudaScreenApi.java | 56
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialWorkerServiceMapper.xml | 38
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/CommonApi.java | 135
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventSpecialCrowdRecordMapper.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultExcelVO.java | 126
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishOperationRecordMapper.java | 31
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java | 183
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCorrectPopulationDAO.java | 16
flower_city/src/main/java/com/dg/core/service/impl/AutomessageCommonProblemServiceImpl.java | 87
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventBatchRevokeDTO.java | 45
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussVoteOptionDTO.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealCompanyServiceImpl.java | 161
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarModelApi.java | 91
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/BcDictionaryConstants.java | 55
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/dos/UnionStore.java | 109
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVeteransExcelVO.java | 240
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSentencePopulationDO.java | 117
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngBuildingMapper.xml | 218
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiApplyExperienceMapper.xml | 177
springcloud_k8s_panzhihuazhihuishequ/service_user/src/test/java/com/panzhihua/service_user/dao/UserDaoTest.java | 47
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductSpecificationVO.java | 38
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComChangeCarModelMapper.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngCityDO.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PageActivityMembersVO.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveMapper.xml | 234
flower_city/src/main/java/com/dg/core/util/TestDate.java | 179
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveAdminDTO.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java | 70
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulIsOksEnum.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesInoculationByAdminVO.java | 56
flower_city/src/main/java/com/dg/core/service/IAreaCodeService.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderBargainRecordFeign.java | 87
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCvtBusinessIntroduceDAO.java | 9
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerEvaluateServiceImpl.java | 74
flower_city/src/main/java/com/dg/core/util/presence/Year20xx.java | 7
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightConfigApi.java | 49
flower_city/src/main/java/com/dg/core/util/presence/Year2008.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationLowSecurityExcelVO.java | 193
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/WeatherVO.java | 22
flower_city/src/main/java/com/dg/core/file/MimeTypeUtils.java | 59
springcloud_demo_on_k8s-master/service-tp/src/main/java/com/springcloudme/servicetp/UserClientFallback.java | 12
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVaccinesService.java | 65
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/dao/UnionOutdoorSiteMapper.java | 18
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/NettyServerHandler.java | 134
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionShippingAddressApi.java | 74
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainRecordVo.java | 69
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussCommentDTO.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVisitingTasksVO.java | 135
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserAgreementVO.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComAreaTownCommunityServiceImpl.java | 35
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRegisterStatisticsAdminVO.java | 25
flower_city/src/main/java/com/dg/core/controller/MenuController.java | 73
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAnnouncementApi.java | 96
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsVerifiedRecordMapper.xml | 60
springcloud_k8s_panzhihuazhihuishequ/zuul/pom.xml | 109
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WxMaProperties.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightCommunityConstructionMapper.xml | 241
flower_city/src/main/java/com/dg/core/db/gen/entity/HuaChengSysUser.java | 285
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java | 477
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/McsOrderApi.java | 191
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerCommunityConfigVO.java | 63
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml | 202
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java | 186
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/AddEasyPhotoActivityDTO.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiArticleManagementMapper.xml | 133
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelReturn.java | 149
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiBraceletApi.java | 287
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/LatLngVO.java | 13
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRaffleRecord.java | 74
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberGpsLogMapper.xml | 98
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PagePartyOrganizationVO.java | 69
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentReplyStatusByAdminVO.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/McsLabelDAO.java | 46
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/dao/UnionOutdoorLaborDynamicMapper.java | 18
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/RentingHousesApi.java | 110
springcloud_k8s_panzhihuazhihuishequ/deploy-file/applets.yaml | 47
flower_city/src/main/java/com/dg/core/db/gen/mapper/MenuMapper.java | 47
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/SetPopularForGameDTO.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/PagePartyOrganizationMemberVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionIntegralSummarizeApi.java | 67
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulMarriageEnum.java | 42
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthHistoryRecordDetailsVO.java | 50
flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java | 435
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UserSubAnswerSelectionStatVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java | 87
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/table.js | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsHouseDO.java | 156
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwDangerReportDO.java | 166
flower_city/src/main/java/com/dg/core/util/Snowflake.java | 17
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryTradeOrderDto.java | 131
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyHelp.java | 73
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopGoodsVO.java | 121
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiCoinGeneralTable.java | 49
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ExpertShowVO.java | 29
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java | 321
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComMngVolunteerServiceTypeDto.java | 45
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/MicroCommercialStreetApi.java | 171
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/McsInformationDAO.java | 66
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComEldersAuthElderlyService.java | 61
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderStoreIdCountVO.java | 29
flower_city/src/main/resources/mapper/AutomessagePolicyDocumentsMapper.xml | 89
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleDO.java | 98
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionOutdoorSiteApi.java | 48
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientProductMapper.xml | 84
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java | 108
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHoursePreOrderApi.java | 99
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerRefundOrderVO.java | 166
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderCollageTeamPeopleDto.java | 73
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java | 1410
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActRaffleApi.java | 97
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsOrderVO.java | 110
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationConfirmServeExcelListen.java | 582
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseBase.java | 82
flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java | 96
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/UnionReportService.java | 26
springcloud_demo_on_k8s-master/service-tp/src/test/java/com/springcloudme/servicetp/ServiceTpApplicationTests.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderOperateDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/EldersAuthFeedbackDO.java | 54
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComClusterMemberExcelListen.java | 215
springcloud_k8s_panzhihuazhihuishequ/community_backstage/.mvn/wrapper/MavenWrapperDownloader.java | 118
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventVisitingTasksMapper.java | 123
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyCommitteeVO.java | 112
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileUtil.java | 115
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsInfoDTO.java | 57
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthRecordExcelListen.java | 85
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComLowSecurityPopulationServiceImpl.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleWestDO.java | 207
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserLoginSuccessHandler.java | 47
flower_city/src/main/java/com/dg/core/service/IKeywordService.java | 48
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthFeedbackServiceImpl.java | 103
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComCultPopulationMapper.xml | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantEvaluateVO.java | 95
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleBrowseWestDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActActivityCodeApi.java | 56
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComActIntegralUserChangeDAO.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/resources/mapper/UnionStoreMapper.xml | 235
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/ActActivityPeopleListVO.java | 31
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java | 214
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiInterspaceTypeService.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/GameStatisticsVO.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishUserDAO.java | 18
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/KaphtchaApi.java | 80
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java | 55
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/resources/logback-spring.xml | 51
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiExperienceActivityService.java | 34
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/.mvn/wrapper/maven-wrapper.properties | 2
springcloud_k8s_panzhihuazhihuishequ/eureka_server/src/main/java/com/panzhihua/eureka_server/EurekaServerApplication.java | 17
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenVolunteerStatisticsInfo.java | 45
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/67.gif | 0
springcloud_demo_on_k8s-master/config-server/mvnw | 286
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml | 47
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/PagePropertyWorkerDTO.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java | 79
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/StatisticsApi.java | 48
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseLabelServiceImpl.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActIntegralUserDOMapper.xml | 140
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComMngVolunteerOrgTeamDto.java | 62
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderVo.java | 231
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActActivityPeopleVO.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightCommunityConstructionApi.java | 206
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysMenuDAO.xml | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/PbCheckUnitStatisticsVo.java | 41
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngProvinceDO.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_grid/config/MyMetaObjectHandler.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderFeign.java | 152
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiInterspaceTypeMapper.xml | 89
flower_city/src/main/java/com/dg/core/db/manual/pojo/WordUser.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderExportDTO.java | 47
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseRefundOrderDao.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngPopulationListVO.java | 72
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ClusterApi.java | 184
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/layui.all.js | 5
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/LcCompareCodeService.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodity.java | 91
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerEvaluateDTO.java | 65
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityOrderBargainRecordService.java | 78
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationHouseDetailAdminVO.java | 59
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/lib/UMF_SDK_V01.jar | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java | 123
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthHistoryRecordVO.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActIntegralUserTradeService.java | 88
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java | 325
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwDangerReportService.java | 84
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/JacksonConfig.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiShoppingService.java | 30
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComPropertyApi.java | 72
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsDAO.java | 55
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryStoreClassController.java | 127
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 1305
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussOptionUserDAO.java | 77
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActRafflePrizeDao.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCultPopulationServiceImpl.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/UnionUserService.java | 54
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/KeyPersonInfoDTO.java | 156
flower_city/src/main/resources/mapper/OrganizationChartMapper.xml | 185
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWorkGuideClassifyMapper.xml | 50
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFundsSearchDTO.java | 35
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexInfo.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMajorPopulationServiceImpl.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/entity/SysAppConfig.java | 54
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/ComMngUserTagDAO.java | 38
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/dtos/ComPbMemberCertificationDTO.java | 40
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActFourMemberApi.java | 103
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/BatchhouseVO.java | 47
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/LcCompareCodeMapper.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerTypeApi.java | 67
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderGoodsDO.java | 92
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDynService.java | 69
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCommentAppDTO.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderBargainFeign.java | 87
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/logback-spring.xml | 51
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/RoleVO.java | 66
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMemberMapper.xml | 26
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/logback-spring.xml | 78
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectScheduleDao.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysUserMapper.xml | 315
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCommunityTagsVo.java | 38
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/application.yml | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationAppReleaseDeleteDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ActivitySignUpDTO.java | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsMerchantVO.java | 76
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComBatteryCommodityApi.java | 140
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgHatchAuditScheduleMapper.xml | 34
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbServiceTeamService.java | 65
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComActIntegralUserChangeMapper.xml | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/CascadeHouseDTO.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionIntegralRecordApi.java | 63
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/NewFightNeedProblemInventory.java | 57
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectPublicity.java | 79
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityWestService.java | 9858 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComChangeCarInquiryController.java | 106
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireUserAnswerDO.java | 55
flower_city/src/main/java/com/dg/core/util/workday/WorkUtils.java | 699
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageBackDAO.java | 14
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/jinhuiRecordApi.java | 73
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java | 274
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseOperationServiceImpl.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoActivityService.java | 77
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java | 376
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/UserTrade.java | 53
flower_city/src/main/java/com/dg/core/util/presence/Year2015.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/DoEncrytDecrypt.java | 81
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActFourMemberApi.java | 164
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/js/jquery.min.js | 5
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealAssetsDAO.java | 54
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityUnionService.java | 297
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/EditEasyPhotoActivityDTO.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityMemberDO.java | 57
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java | 126
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java | 177
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/EventGridMemberBuildingRelationMapper.xml | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventStatusEnum.java | 40
springcloud_demo_on_k8s-master/config-server-bak/mvnw | 286
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiApplyExperience.java | 64
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/helper/encrypt/ParammeterInterceptor.java | 118
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCvtBusinessAreaDAO.java | 11
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsInformationMapper.xml | 100
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommonDataApi.java | 118
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComSanshuoExpert.java | 137
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbServiceTeamVO.java | 54
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/config/JacksonConfig.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiSnapshot.java | 71
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComConvenientElevatingPointMapper.xml | 85
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/BcDictionaryItemVO.java | 30
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/70.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActPictureLibraryVO.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/McsConfigService.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/MybatisPlusConfig.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileSizeLimitExceededException.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectPublicityDao.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEnterpriseService.java | 52
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComPbMemberRoleExcelVo.java | 42
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventPageRequestVO.java | 64
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/elder/SignElderAuthStatisticDTO.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/BcDictionaryItemDO.java | 93
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/38.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActEasyPhotoScreenVO.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/UnionShippingAddressService.java | 27
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseApplyApi.java | 135
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseLabelApi.java | 86
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderStoreIdNumVO.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderBargainRecordMapper.xml | 105
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActEasyPhotoCommentUserDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewStriveForDAO.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityOrder.java | 244
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComDrugPopulationMapper.xml | 37
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/config/KaptchaConfig.java | 45
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/LoginMerchantUserInfoVO.java | 22
springcloud_k8s_panzhihuazhihuishequ/eureka_server/.mvn/wrapper/MavenWrapperDownloader.java | 118
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserNoticeDO.java | 92
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsGameDTO.java | 85
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActDiscussScreenVO.java | 38
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/SysAppConfigApi.java | 112
springcloud_k8s_panzhihuazhihuishequ/eureka_server/pom.xml | 97
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/PageBuildingUnitHouseListDto.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleMenuDO.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/DisabledPersonsDO.java | 115
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysOperLogDAO.xml | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java | 106
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulHouseStatusEnum.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityActivityService.java | 89
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java | 220
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralCommunityRankVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventTransferRecordApi.java | 90
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataDetailsVO.java | 75
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngVillagePopulationListVO.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionOutdoorSiteServiceImpl.java | 64
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPensionAuthPensionerDAO.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwSafetyWorkRecordService.java | 54
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSentencePopulationMapper.xml | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenActivityLine.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/MyAESUtil.java | 61
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComCvtServeDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComDrugPopulationApi.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/resources/mapper/UnionOutdoorLaborDynamicMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysTemplateConfigDao.java | 16
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/vos/LoginRequest.java | 38
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationKeyExcelListen.java | 487
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigscreenGridsGovernanceStatisticsVO.java | 55
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightIntegratingTaskApi.java | 87
flower_city/src/main/resources/mapper/AutomessageSysUserRecordMapper.xml | 174
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiQuestnaireUserAnswer.java | 72
flower_city/src/main/java/com/dg/core/db/gen/entity/Guidance.java | 19
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AddressUtils.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java | 292
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java | 226
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightCommunityConfigMapper.xml | 130
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/PageClusterMemberAdminDto.java | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/large/AreaStreetDetailResp.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerGoodsViewStatisticsDAO.java | 65
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtCategoryServiceImpl.java | 124
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityMapper.xml | 232
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthVO.java | 85
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerIntegralMerchantVO.java | 105
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventTransferRecordService.java | 65
flower_city/src/main/resources/application-sms.properties | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderShipDTO.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewStriveForApi.java | 46
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/EditClusterAdminDto.java | 41
flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageCommonProblemMapper.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerExcelVO.java | 84
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java | 125
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiInterspaceApplyForDao.java | 47
springcloud_demo_on_k8s-master/config-server-bak/mvnw.cmd | 161
springcloud_k8s_panzhihuazhihuishequ/service_community/mvnw.cmd | 182
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/McsOrderApi.java | 112
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussOptionDOMapper.xml | 33
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/ComMngStructHouseDAO.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryTradeOrderVo.java | 118
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/61.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageElderAuthRecordsDTO.java | 57
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireVO.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderGoodsServiceImpl.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleFabulousWestServiceImpl.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarVO.java | 75
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerRefundOrderDO.java | 161
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/SysTemplateConfigDao.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/ShopOrderMessage.java | 48
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerMngDO.java | 126
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAnswerContentVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/McsCouponService.java | 45
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationPensionMistakeExcelVO.java | 99
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderSearchVO.java | 103
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityQuestnaireApi.java | 312
flower_city/src/main/java/com/dg/core/db/gen/entity/Slideshow.java | 72
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ApplyStatistics.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/ComPropertyAlarmService.java | 31
flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java | 194
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComChangeCarInquiryMapper.xml | 109
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussOptionServiceImpl.java | 18
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerTypeDao.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/PageEasyPhotoActivityDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoTypeRelationMapper.xml | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComActEasyPhotoDTO.java | 127
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-timejob.yaml | 47
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthRecordDO.java | 133
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComChangeCarModelServiceImpl.java | 153
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/config/MybatisPlusConfig.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActCommitteeServiceImpl.java | 105
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiComActWorkGuideClassify.java | 54
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActVillageDAO.java | 111
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/StreetBigScreenApi.java | 84
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventTransferRecordAddDTO.java | 66
springcloud_k8s_panzhihuazhihuishequ/community_backstage/.mvn/wrapper/maven-wrapper.jar | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryUserAddressFeign.java | 95
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/LcGridMember.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/area/AreaAddressVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ServiceStaticsVO.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 1381
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructBuildTypeDAO.java | 17
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActQuestnaireAnswerContentDTO.java | 8
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPropertyPublicityVO.java | 68
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightConvenientMerchantApi.java | 105
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventTransferRecordServiceImpl.java | 79
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngBuildingExcelVO.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/ComMngVillageExportExcelVO.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageActWorkGuideDTO.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/SysConfServiceImpl.java | 111
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRafflePrizeCount.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/api/UnionUserApi.class | 0
springcloud_demo_on_k8s-master/config-server-bak/pom.xml | 74
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/mapper/UnionOutdoorLaborDynamicMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/config/MyMetaObjectHandler.java | 41
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/SysConfDO.java | 59
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsProductLabelServiceImpl.java | 19
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialOrgApi.java | 105
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/DictionItemConstants.java | 19
flower_city/src/main/java/com/dg/core/db/gen/mapper/ElseAccessoryMapper.java | 70
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationDetailVO.java | 103
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPensionAuthStatisticsServiceImpl.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemClaimService.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtCategoryVO.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/McsEvaluateDAO.java | 57
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyHelpMapper.xml | 30
flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java | 118
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityAuthStatusEnum.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComActEasyPhotoEvaluateDto.java | 72
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectPublicityVO.java | 80
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IdCardUtil.java | 168
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerCommunityDiscount.java | 57
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/7.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiExperienceActivityApi.java | 169
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActUserWalletChangeDOMapper.xml | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComMediaTypeVO.java | 97
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamWishVO.java | 23
flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysSettingsRecordMapper.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/MenuVO.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/RSAUtils.java | 164
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthElderlyDTO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/ServiceDangjianApplication.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java | 69
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComStreetDTO.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenEasyPhotoStatisticsInfo.java | 51
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMajorPopulationApi.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightProjectPlanDAO.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/config/WebSocketConfig.java | 136
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/PageDpcDTO.java | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventCalculateVO.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewStriveForServiceImpl.java | 60
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java | 259
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthStatisticsDetailsVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IndexUserStreetExcelExportVo.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbDynUserVO.java | 33
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/aop/CheckMcsMerchantExpiration.java | 21
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/56.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/AddDpcDTO.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiMicroVolunteeringTypeVO.java | 45
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComDataStatisticsHeaderOrgVo.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/helper/sensitive/SensitiveInterceptor.java | 73
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientViewStatisticsDO.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerOrgTeamMapper.java | 71
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/dao/UnionOutdoorServiceRangeMapper.java | 18
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/api/VideoManageApi.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightShoppingMapper.xml | 166
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/ComSanshuoExpertDTO.java | 142
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/CopyUtil.java | 299
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/model/dos/UnionExchangeRecord.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialWorkerServiceVO.java | 84
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/WorkGuideApi.java | 123
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleCommentReplyWestServiceImpl.java | 23
flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java | 245
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/CascadeCommVO.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/TokenApi.java | 50
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyActivityLine.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/model/helper/encrypt/ParammeterInterceptor.class | 0
springcloud_demo_on_k8s-master/service-influxdb-app/.gitignore | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/CancelRecordDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesInoculationByAdminDTO.java | 42
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/MinioConfig.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/NewFightNeedProblemClaim.java | 28
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VillageApi.java | 71
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantVO.java | 154
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngRealCompanyDAO.java | 74
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/NewFightConfig.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthFeedbackVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditOrderLogisticsDto.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java | 144
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopSysConfService.java | 13
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/mapper/UnionInspectionMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexEventListStatisticsVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserServiceImpl.java | 225
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/DangerAreaStatics.java | 17
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthElderliesVO.java | 86
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientServiceCategoryDTO.java | 50
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderDeliveryDTO.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IPageVO.java | 225
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/ComMngVaccinesEnrollExcelVo.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEventResource.java | 60
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComStreetDO.java | 78
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BcDictionaryService.java | 76
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/config/AccessConfig.java | 20
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActPopulationCultureVO.java | 23
flower_city/src/main/java/com/dg/core/annotation/CurrentUser.java | 14
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/MostBeautifulVolunteerMapper.xml | 155
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectMemberApi.java | 104
springcloud_demo_on_k8s-master/service-tp/.mvn/wrapper/maven-wrapper.jar | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngCarService.java | 70
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComElderAuthUserDetailVO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiGoldCoinRecordServiceImpl.java | 63
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/KeyPersonInfoDAO.java | 14
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/config/WxMaConfiguration.java | 69
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/OperationDetailDTO.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryStoreClassService.java | 93
springcloud_k8s_panzhihuazhihuishequ/auth/mvnw.cmd | 182
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsClassroomServiceImpl.java | 232
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicDOMapper.xml | 59
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComMngRealAssetsDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/config/SwaggerConfig.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActWarehouseDonatesApi.java | 182
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/EldersAuthApi.java | 235
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComClusterOrganizationMemberMapper.java | 64
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleCommentDO.java | 83
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionRePortFeign.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPbDynDAO.java | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java | 329
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComChangeCarModelSpecs.java | 58
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/29.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHatchStatisticsInfo.java | 39
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/aop/OperLogAspect.java | 235
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionOutdoorSiteApi.java | 45
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/QuestnaireSubType.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/NearbyUtil.java | 18
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemUnitTaskMapper.xml | 182
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/43.gif | 0
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActWarehouseApplyApi.java | 224
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/FtpConstants.java | 38
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPbMemberMapper.xml | 83
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActColumnApi.java | 134
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/config/ResourcesConfig.java | 64
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientMerchantDTO.java | 47
springcloud_k8s_panzhihuazhihuishequ/config_server/.gitignore | 33
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/helper/encrypt/ResultInterceptor.java | 78
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/resources/mapper/UnionShippingAddressMapper.xml | 198
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngVillageListExportAdminDTO.java | 68
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComSanshuoEvent.java | 114
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/DataKanBansDto.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java | 129
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 713
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActAcidDangerMemberService.java | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ClusterDetailAdminVo.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwPatrolRecordReportDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryStoreDto.java | 134
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseLabelService.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyAlarmSettingApi.java | 59
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-partybuilding.yaml | 47
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComSwRotaExcelListen.java | 63
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComGridActVO.java | 92
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/LcCompareCodeServiceImpl.java | 62
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngUserTagVO.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java | 550
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActColumnDao.java | 37
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/.gitignore | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComChangeCarModelRelationService.java | 87
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/dos/Structured.java | 89
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageBaseDTO.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComPbMemberRoleExcelListen.java | 198
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComFmsServiceEvaluationsDAO.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/SysUserDao.java | 20
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireDTO.java | 42
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDpcVO.java | 47
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ActivityManagerVO.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoIndustryCenterServiceImpl.java | 101
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ScreenWorkApi.java | 293
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerTypeMapper.xml | 87
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/discuss/ComActDiscussDetailDTO.java | 24
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java | 111
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordMapper.xml | 100
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerMerchantWithdrawService.java | 46
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleCommentWestDOMapper.xml | 75
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/FourMemberDetailVO.java | 19
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoCommentUserDO.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMapper.xml | 105
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java | 1263
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java | 624
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddFmsClassroomAdminDTO.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCommunityConfigServiceImpl.java | 54
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructHouseDO.java | 66
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarModelSpecsFeign.java | 87
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EditComMngPopulationVO.java | 153
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEasyPhotoEvaluate.java | 64
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerServiceTypeDao.xml | 103
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/upload.js | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityStatisticsVO.java | 91
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectSign.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerIntegralRecordDao.java | 49
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireUserAnswerMapper.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ComClusterMemberExcelExportAdminVO.java | 26
springcloud_demo_on_k8s-master/service-zuul/src/main/java/com/springcloudme/servicezuul/util/Utils.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java | 150
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/UserStatus.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleServiceImpl.java | 141
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComPbCheckUnitExcelVO.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwDangerReportRectifyDTO.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAcidMemberDao.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarModelSpecsChildrenVo.java | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamTypeVO.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarBrandDto.java | 92
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityConvenientApi.java | 362
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/GisPointUtil.java | 123
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/dao/UnionStoreMapper.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyAlarmSetting.java | 54
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopCartServiceImpl.java | 247
springcloud_demo_on_k8s-master/deploy-file/service-tp.yaml | 42
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngCarAppletDTO.java | 63
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/model/vos/PutmessageBody.java | 55
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EastPhotoTypeVO.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/FmsClassroomTopStatisticsVO.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/model/dos/UnionReport.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightResourceSharingService.java | 27
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActRaffleRecordApi.java | 133
flower_city/src/main/java/com/dg/core/util/presence/Year2016.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationPensionExcelVO.java | 132
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarModelSpecsChildrenDto.java | 54
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java | 65
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsProduct.java | 77
springcloud_k8s_panzhihuazhihuishequ/timejob/.mvn/wrapper/maven-wrapper.properties | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsEvaluateVO.java | 48
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActPictureLibraryApi.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerGoodsAttrMapper.xml | 30
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml | 546
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiComActWorkGuideService.java | 70
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveMakeHandleAdminDTO.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberGpsLogDetailsVO.java | 53
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java | 142
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityServiceImpl.java | 166
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityController.java | 126
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionUserApi.java | 96
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java | 80
springcloud_demo_on_k8s-master/config-server/mvnw.cmd | 161
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryStoreService.java | 86
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopUserAddressServiceImpl.java | 131
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserAgreementDAO.xml | 19
springcloud_demo_on_k8s-master/service-tp/.gitignore | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerSkillServiceImpl.java | 122
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightProjectJoinServiceImpl.java | 71
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapGridCascadeVO.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCvtBusinessIntroduceDO.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComKeyPopulationMapper.xml | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightIntegral.java | 53
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java | 1227
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRegiterNatureEnum.java | 46
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtBusinessDTO.java | 77
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerCreditsExchange.java | 152
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPbActivityDO.java | 104
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/MostBeautifulVolunteer.java | 69
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComCvtBusinessService.java | 72
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/annotation/CurrentUser.java | 14
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationUserNoticeVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberWarnLogVO.java | 53
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveAnswerContentDO.java | 101
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulSexEnum.java | 40
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/mvnw.cmd | 182
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dtos/UsersStatisticsDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussOptionUserDOMapper.xml | 60
springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java | 268
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAppVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveDangerAreaService.java | 38
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ActDynTypeApi.java | 87
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/until/MonitorUtil.java | 48
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java | 212
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageIdentityAuthRecordDTO.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpClientFactory.java | 116
springcloud_demo_on_k8s-master/config-server-bak/.mvn/wrapper/maven-wrapper.properties | 1
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessIntroduceServiceImpl.java | 53
flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java | 101
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActColumnMapper.xml | 77
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberWarnLogApi.java | 100
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventTransferRecordServiceImpl.java | 115
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java | 170
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletRankingVO.java | 31
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActActivityCodeApi.java | 57
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistExcelNewVO.java | 42
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/.mvn/wrapper/maven-wrapper.jar | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvVO.java | 63
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/RentingHoursePreOrderApi.java | 104
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightCommunityConstructionDTO.java | 75
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberWarnLogMapper.java | 47
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/PageComActIntegralTradeDTO.java | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ExcelShopFundsDTO.java | 34
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/MapApi.java | 84
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerMerchantWithdraw.java | 57
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectPublicityApi.java | 107
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyMapper.xml | 249
springcloud_k8s_panzhihuazhihuishequ/applets/.mvn/wrapper/maven-wrapper.jar | 0
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/flow.js | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseDonates.java | 135
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryUserAddressMapper.xml | 107
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngCarSaveDTO.java | 69
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeDeleteDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngDistrictDO.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEnterprise.java | 89
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java | 325
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsHeaderOrgVo.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientGoodsCategoryMapper.xml | 55
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveDangerAreaVO.java | 76
springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/resources/mapper/BraceletEarlyWarning.xml | 250
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryTradeOrderMapper.xml | 156
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/MostBeautifulApi.java | 160
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/impl/UnionIntegralSummarizeServiceImpl.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingMemberVO.java | 94
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComBatteryCommodityActivityApi.java | 144
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/UnionpayCarWashApi.java | 39
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/config/MinioConfig.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiComActQuestnaireSubSelection.java | 73
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageSearchDTO.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtServeExcelVO.java | 47
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/McsLabelService.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWarnLogAddDTO.java | 61
springcloud_k8s_panzhihuazhihuishequ/pom.xml | 252
flower_city/src/main/java/com/dg/core/annotation/RoleAdmin.java | 11
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopCartDTO.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkSocialOrgInfo.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryUserAddressVo.java | 107
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/java/com/springcloudme/serviceinfluxdbapp/ServiceInfluxdbAppApplication.java | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/excel/CustomSheetWriteHandler.java | 59
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/mapper/UnionIntegralSummarizeMapper.xml | 109
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/dao/UnionOutdoorLaborDynamicMapper.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComActIntegralUserTradeDaoServiceImpl.java | 70
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExcelQuestnaireAnswersDTO.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsProductServiceImpl.java | 209
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/admin/BuildingUnitHouseListAdminVo.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/logback-spring.xml | 78
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryStoreClassApi.java | 82
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductVO.java | 57
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/34.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/Base64File.java | 11
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ParamRegularUtil.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveOperationRecordMapper.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwRotaSaveDTO.java | 77
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMessageBackDO.java | 86
springcloud_k8s_panzhihuazhihuishequ/eureka_server/src/main/resources/application.yml | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/elder/PagePensionAuthStatisticDTO.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/wx/UnionpayCarWash.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridDataDTO.java | 113
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidUpdateRecordMapper.xml | 17
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionInspectionApi.java | 65
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEldersAuthUserMapper.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientProductSpecificationDTO.java | 48
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageProjectSignListDTO.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml | 628
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java | 101
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeLeftStatisticsAdminVO.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EasyPhotoActivityApi.java | 84
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionIntegralSummarizeDto.java | 52
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkBaseInfo.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComVeteransPopulationService.java | 13
springcloud_k8s_panzhihuazhihuishequ/community_backstage/mvnw.cmd | 182
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerGoodsViewStatisticsDO.java | 41
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml | 338
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageInputUserDTO.java | 41
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralRuleDO.java | 123
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiShoppingOrderServiceImpl.java | 179
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysDeptDO.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthElderlyDTO.java | 101
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoClassifyServiceImpl.java | 135
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiShoppingDao.java | 54
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/OrderPayDTO.java | 21
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/aop/OperLogAspect.java | 329
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java | 580
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiInterspaceService.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsInformationServiceImpl.java | 252
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java | 113
springcloud_k8s_panzhihuazhihuishequ/service_dlz/pom.xml | 90
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/excel/Custemhandler.java | 75
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/redis/TokenManager.java | 36
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/BindUserPhoneDTO.java | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarModelDto.java | 101
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/VillageApi.java | 181
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthHistoryApi.java | 134
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/UnionOutdoorSiteService.java | 26
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/3.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java | 285
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvJumpDO.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialOrgHatchAuditScheduleService.java | 14
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EditComActDynTypeDTO.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseRegisterApi.java | 118
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsGame.java | 130
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCunDao.java | 18
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsAttrDO.java | 93
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryUserAddressApi.java | 135
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/AppletesBackstageConfigDTO.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoRewardService.java | 13
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoTypeDetailsVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrgHatch.java | 81
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/dos/Users.java | 222
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActUserWalletTradeServiceImpl.java | 135
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiCharityDao.java | 59
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructHouseDAO.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityDto.java | 121
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ActivityInviteDTO.java | 39
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/form.js | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComElderAuthUserAppVO.java | 46
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EasyPhotoActivityApi.java | 67
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActUserWalletApi.java | 183
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleBrowseDO.java | 49
flower_city/src/main/java/com/dg/core/db/gen/mapper/HuaChengSysUserMapper.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComLowSecurityPopulationDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiGoldCoinRecordService.java | 30
flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderImageMapper.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructHouseUserDAO.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/dao/UnionReportMapper.java | 17
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenActActivityPeopleListDTO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberWarnLogServiceImpl.java | 217
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActQuestnaireSubDTO.java | 8
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/mvnw | 308
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructAreaDistrictDAO.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WxMaConfiguration.java | 70
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiShoppingOrderMapper.xml | 197
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/LangChaoEventUploadJobHandler.java | 66
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCityDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/mapper/UnionUserMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/MapApi.java | 109
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderBargainRecordDto.java | 74
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexPopulationAgeStatisticsVO.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PhotoMicroWish.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightCommunityConstructionService.java | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IdentityAuthRecordDetailVO.java | 60
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoHandleDTO.java | 46
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/IdentityAuthApi.java | 206
flower_city/src/main/java/com/dg/core/api/AutomessageCommonProblemAppletsController.java | 52
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml | 43
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/EventGridMemberBuildingRelationService.java | 13
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActUserWalletTradeExcelVO.java | 49
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActUserWalletChangeDO.java | 94
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java | 229
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ExportEasyPhotoVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireStatisticsSummaryHeaderAdminVO.java | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwDangerReportHandleDTO.java | 69
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActEvaluateMapper.xml | 131
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinghuiMerchantEvaluateServiceImpl.java | 63
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventVerifyDTO.java | 38
springcloud_k8s_panzhihuazhihuishequ/deploy-file/busybox.yaml | 14
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveSubListVO.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiComActQuestnaireSubSelectionServiceImpl.java | 16
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/manager/AsyncFactoryNew.java | 95
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleRecordVO.java | 99
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ShopFlowerApi.java | 197
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/EldersAuthFeedbackService.java | 64
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActRaffleDao.java | 37
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/47.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComRehabilitationPopulationDO.java | 203
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/UnionOutdoorLaborDynamicService.java | 26
springcloud_demo_on_k8s-master/config-server/src/main/resources/bootstrap.properties | 10
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/UnifiedOrder.java | 334
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/DeleteBuildingHousePopulationDto.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsLabelMapper.xml | 47
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructAreaService.java | 109
springcloud_k8s_panzhihuazhihuishequ/eureka_server/.mvn/wrapper/maven-wrapper.properties | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/UnAuthenticationException.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/ResidentAutonomyStatisticsVO.java | 147
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientGoodsCategoryVO.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiGoldCoinRecordVO.java | 53
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/config/ResourcesConfig.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynTypeDO.java | 92
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDisabilityExcelVO.java | 115
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialWorkerService.java | 77
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseOperationApi.java | 46
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordImportExcelVO.java | 62
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridMemberVO.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionStoreServiceImpl.java | 63
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightShoppingService.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwSafetyWorkEditDTO.java | 122
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommoditySpecsServiceImpl.java | 122
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientConsultationStatisticsDAO.java | 65
springcloud_k8s_panzhihuazhihuishequ/deploy-file/community-backstage.yaml | 47
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryUserAddressService.java | 85
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicNewMapper.xml | 14
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceImportExcelVO.java | 34
flower_city/src/main/java/com/dg/core/HttpStatus.java | 89
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVaccinesInoculationRecordDAO.java | 80
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionInspectionServiceImpl.java | 84
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysTemplateConfigVO.java | 48
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/PublicityEventApi.java | 105
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComPbCheckUnitErrorExcelVO.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserFeedbackVO.java | 70
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BraceletApi.java | 377
springcloud_demo_on_k8s-master/service-zuul/src/main/java/com/springcloudme/servicezuul/filter/MyFilter.java | 55
springcloud_k8s_panzhihuazhihuishequ/deploy-file/applets-backstage.yaml | 47
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/logback-spring.xml | 51
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EasyPhotoPointVO.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSanshuoExpertDao.java | 78
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/UmfPayUtil.java | 98
flower_city/src/main/java/com/dg/core/db/manual/mapper/util/ExcelHandlerAdapter.java | 19
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopAddressDTO.java | 52
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderDto.java | 217
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenPartyBuildIngStatisticsInfo.java | 114
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommoditySpecsDto.java | 103
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientGoodsCategoryDAO.java | 73
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-user.yaml | 47
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/MimeTypeUtils.java | 59
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAnnouncementApi.java | 87
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoFeedbackDOMapper.xml | 60
flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java | 284
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/volunteer/ComMngVolunteerExcelVO.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageDTO.java | 37
flower_city/src/main/java/com/dg/core/util/WxSubscribeDTO.java | 61
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/SercuritFilter.java | 118
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilPartyStatisticsVO.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSanShuoEventService.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComBasicDataVo.java | 30
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/util/ExcelUtils.java | 84
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java | 230
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java | 245
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsProductVO.java | 53
flower_city/src/main/java/com/dg/core/db/manual/pojo/QueryResults.java | 42
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireListVo.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/impl/UnionUserServiceImpl.class | 0
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserLogoutSuccessHandler.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialPopulationDTO.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveDangerAreaServiceImpl.java | 46
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopGoodsVO.java | 84
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComFmsApi.java | 518
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussCommentDTO.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComDataStatisticsOrgVo.java | 122
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComFmsApi.java | 667
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbCheckUnitMapper.java | 122
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/StartBargainOrderDto.java | 35
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java | 144
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java | 88
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHoursePayingOrderDao.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeDetailAdminVO.java | 47
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/logback-spring.xml | 51
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComAreaTownCommunityApi.java | 43
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/PageVO.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComClusterOrganizationMemberDO.java | 121
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientProductCategoryDAO.java | 38
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/RealAssetsFloorType.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/config/MybatisHmkInterceptor.java | 24
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbMemberExcelVO.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructOtherBuildVO.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java | 281
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngVillagePopulationHouseListVO.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/config/MybatisHmkInterceptor.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsCoupon.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopGoodsDTO.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberRelationMapper.java | 97
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/font/iconfont.ttf | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationAppReleaseAddDTO.java | 46
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/QRActivityCodeVO.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/FmsEventTopStatisticsVO.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryStoreController.java | 116
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationAppReleaseDetailsVO.java | 47
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiInterspaceApplyForService.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightResourceSharingMapper.xml | 162
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java | 112
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/ReleaseOrCancelHouseDTO.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionUserVO.java | 60
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysMenuDAO.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/LngLatUtils.java | 74
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActColumn.java | 91
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageUserReserveDTO.java | 12
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyAlarmSettingApi.java | 48
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventMainMemberEditDTO.java | 131
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCultPopulationDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/api/UnionIntegralSummarizeApi.class | 0
flower_city/src/main/java/com/dg/core/db/manual/mapper/util/ConstantPropertiesUtil.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/dos/UnionReport.java | 117
flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrderImage.java | 72
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseLabel.java | 100
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/util/PdfBase64ImgReplacedElementFactory.java | 108
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComPbCheckUnitExcelListen.java | 181
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java | 995
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/interfaces/OperLog.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridMemberGpsLogDO.java | 79
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java | 28
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java | 244
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderCollageTeamController.java | 106
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiInterspace.java | 70
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWarehouseOperationDao.java | 44
flower_city/src/main/java/com/dg/core/util/UUID.java | 486
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageSysUserDto.java | 227
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/OrderStatisticsVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/config/MyMetaObjectHandler.java | 41
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/config/SFTPConfig.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectScheduleMapper.xml | 14
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BuildingApi.java | 133
springcloud_k8s_panzhihuazhihuishequ/timejob/pom.xml | 111
flower_city/src/main/java/com/dg/core/service/IRoleManagementService.java | 45
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryStoreClassDto.java | 85
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/wx/WXPayUtil.java | 297
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComFmsTeamMemberRelationDAO.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportRealAssetsExcelDTO.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationLowSecurityMistakeExcelVO.java | 160
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoService.java | 252
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHoursePreOrderService.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRaffleMapper.xml | 59
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerSkillMapper.java | 64
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordReportDO.java | 66
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityInviteMapper.xml | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryStoreDto.java | 125
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoClassifyService.java | 67
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiComConvenientServiceCategoriesServiceImpl.java | 63
springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/java/com/panzhihua/service_bracelet/service/impl/BraceletUserDataImpl.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamMemberImportExcelVO.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRafflePrizeApi.java | 88
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventTransferRecordMapper.xml | 78
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordStatisticExcleVO.java | 55
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidDangerMemberApi.java | 51
flower_city/src/main/java/com/dg/core/util/presence/Year2009.java | 31
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/pom.xml | 126
flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml | 336
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngRealCompanyDO.java | 64
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseRegisterDao.java | 51
springcloud_k8s_panzhihuazhihuishequ/timejob/.mvn/wrapper/MavenWrapperDownloader.java | 118
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComDisabilityPopulationMapper.xml | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideMaterialVO.java | 18
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoRewardDOMapper.xml | 25
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/UserApi.java | 67
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientElevatingPointDO.java | 106
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwRotaService.java | 84
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysRoleMenuDAO.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityMapper.java | 72
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCultPopulationVO.java | 121
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/40.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbMemberVO.java | 97
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsServiceRecordServiceImpl.java | 19
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngBuildingDO.java | 124
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcApiConstants.java | 106
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbCheckUnitService.java | 141
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java | 87
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/util/JPushUtil.java | 158
springcloud_demo_on_k8s-master/service-api/src/main/resources/application.yml | 19
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/MyDecoder.java | 25
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 323
flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessagePolicyDocuments.java | 124
springcloud_k8s_panzhihuazhihuishequ/eureka_server/mvnw | 310
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddTeamDTO.java | 46
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpClientUtil.java | 580
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcReturnObject.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BcDictionaryServiceImpl.java | 114
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceImportMistakeExcelVO.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java | 508
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/LcCompareMemberCodeMapper.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsAttrVO.java | 47
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/pom.xml | 129
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComDrugPopulationDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java | 137
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberRelationDetailsVO.java | 47
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/resources/logback-spring.xml | 51
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/pom.xml | 169
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComChangeCarModelSpecsChildrenMapper.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderCollageTeamDto.java | 73
springcloud_k8s_panzhihuazhihuishequ/config_server/.mvn/wrapper/MavenWrapperDownloader.java | 118
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightProjectPlanDTO.java | 46
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyOrganizationVO.java | 78
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireAnswerStatVO.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java | 206
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtBusinessCategoryServeVO.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiCoinGeneralTableService.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/model/dos/UnionIntegralSummarize.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPensionAuthStatisticsDAO.java | 17
springcloud_k8s_panzhihuazhihuishequ/timejob/.mvn/wrapper/maven-wrapper.jar | 0
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberRelationApi.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiShoppingOrderDao.java | 61
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVOStr.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/bootstrap.yml | 48
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/AddBuildingHouseDto.java | 31
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/21.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/dao/UnionIntegralSummarizeMapper.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageClassifyMerchantDTO.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/java/com/panzhihua/service_bracelet/api/BraceletUserDataApi.java | 450
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleApi.java | 89
flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java | 262
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/helper/encrypt/ResultInterceptor.java | 78
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvJumpDTO.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/EnrollUserByAppDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarModelSpecsApi.java | 129
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeAddDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/McsGameDAO.java | 107
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActQuestnaireService.java | 188
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/element.js | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActDpc.java | 85
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsGameDTO.java | 54
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java | 345
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventApplicationAppReleaseDO.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiReseauMapper.xml | 192
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/59.gif | 0
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/aop/OperLogAspect.java | 237
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationTagDTO.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddDTO.java | 83
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonApi.java | 206
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/GridBackstageApplication.java | 24
springcloud_demo_on_k8s-master/config-server-bak/.mvn/wrapper/maven-wrapper.jar | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml | 186
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanshuoExpertVO.java | 149
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java | 191
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 11951 +
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/16.gif | 0
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 353
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoDetailsVO.java | 88
springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/DictionData.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActPictureDO.java | 66
flower_city/src/main/java/com/dg/core/util/presence/Year2019.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 1653
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightShoppingOrderMapper.xml | 255
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java | 161
flower_city/src/main/java/com/dg/core/util/presence/Year2001.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderDO.java | 277
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiLargeScreenImpl.java | 136
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityApprovalStatusEnum.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightShoppingOrderDao.java | 62
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComDisabilityPopulationDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWorkGuideDOMapper.xml | 35
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/manager/ShutdownManager.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicWestDOMapper.xml | 68
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPropertyPublicityDO.java | 90
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseUserVO.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidCheckRecordVO.java | 68
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/HttpStatus.java | 104
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/GoodsApi.java | 158
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java | 48
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoActivityVO.java | 57
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActMicroWishOperationRecordApi.java | 34
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDetailVO.java | 187
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserRateVO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseOrderService.java | 53
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightResourceSharingServiceImpl.java | 71
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/BasicDataVO.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/RealUser.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiConfigApi.java | 55
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsProductDTO.java | 48
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionIntegralSummarizeApi.java | 73
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/resources/bootstrap.yml | 43
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/RealUserAnalysisVO.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComKeyPopulationDO.java | 88
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVillageDOMapper.xml | 68
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComCvtServeService.java | 73
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PutUserInfoDTO.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationCommunityTagsDAO.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ExpertRangeVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussOptionDO.java | 52
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRafflePrizeVO.java | 59
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/VaccinesApi.java | 52
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoMemberServiceImpl.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialWorkerDao.java | 73
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComClusterOrganizationDOMapper.xml | 58
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectApi.java | 135
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java | 180
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/aop/OperLogAspect.java | 235
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidMember.java | 71
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseEditDTO.java | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidColorChartsVO.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionIntegralRecordServiceImpl.java | 64
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenEventDetailDTO.java | 19
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderCollageTeamPeopleMapper.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AgeUtils.java | 159
flower_city/src/main/java/com/dg/core/db/gen/entity/ClassifyAdministration.java | 85
springcloud_demo_on_k8s-master/eureka-server/.mvn/wrapper/maven-wrapper.properties | 1
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SmsUtil.java | 44
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActUserWalletChangeServiceImpl.java | 69
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComDataStatisticsMemberVo.java | 108
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/config/MybatisPlusConfig.java | 34
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionStoreLDD.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseContractConfigDao.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeRightStatisticsAdminVO.java | 28
springcloud_demo_on_k8s-master/service-zuul/.mvn/wrapper/maven-wrapper.properties | 1
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgHatchMapper.xml | 193
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActCommitteeMapper.xml | 48
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationAppReleaseEditDTO.java | 50
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComExServicemanVO.java | 34
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMajorPopulationVO.java | 173
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseOrderApi.java | 116
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/util/MyAESUtil.java | 61
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEnterpriseTypeVO.java | 47
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenGridStaticsReturn.java | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationNoSecretVO.java | 253
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryTradeOrder.java | 120
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/aop/RenheAssemblyUtils.java | 275
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientViewStatisticsDAO.java | 65
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComPbCheckUnit.java | 174
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/IndexDateVO.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridAdminVO.java | 51
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java | 114
flower_city/src/main/java/com/dg/core/service/impl/IAutomessageSmartConsultingServiceImpl.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java | 530
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java | 73
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/config/MinioConfig.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComLowSecurityPopulationMapper.xml | 56
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingWestService.java | 605
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/SysUserMapper.java | 67
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbDynUserVO.java | 33
flower_city/src/main/java/com/dg/core/db/gen/entity/EfficiencyEntity.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/model/dto/GridMemberPageListDTO.java | 48
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/model/vos/LoginBody.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/EditComActReserveInfoDTO.java | 49
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportRealCompanyExcelDTO.java | 24
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/BuildingVO.java | 9
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderGoodsDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynTypeDOMapper.xml | 167
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserActivityAnalysisVO.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderMapper.java | 63
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/ComActFourMemberDao.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/helper/encrypt/ParammeterInterceptor.java | 118
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java | 396
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WxDataUtil.java | 62
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderDto.java | 212
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberGpsLogDTO.java | 89
springcloud_k8s_panzhihuazhihuishequ/community_backstage/pom.xml | 145
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/UnionDoorUtil.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/FeedbackFmsServiceDTO.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoFeedbackVO.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDAO.xml | 326
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/listen/PartyBuildingMemberExcelListen.java | 59
springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/java/com/panzhihua/config_server/ConfigServerApplication.java | 19
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/PartyBuildingJobHandler.java | 140
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberPassResetDTO.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientServiceCategoryDO.java | 70
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml | 863
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java | 280
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishOperationRecordMapper.xml | 36
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVaccinesDAO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventApplicationAppReleaseMapper.xml | 70
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiMicroVolunteeringTypeServiceImpl.java | 64
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCarVO.java | 34
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyHelpApi.java | 98
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthHistoryVO.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMajorPopulationDO.java | 161
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComAcidAreaVO.java | 12
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVillageDAO.java | 16
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/slider.js | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/MostBeautifulVolunteerServiceImpl.java | 45
flower_city/src/main/java/com/dg/core/db/manual/pojo/RecommendResult.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopEditNubCartDTO.java | 21
flower_city/src/main/java/com/dg/core/db/gen/AjaxResult.java | 163
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderPayDAO.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/StatisticsCommVO.java | 35
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAnnouncementApi.java | 133
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsClassroomAdminDTO.java | 45
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiArticleManagementVO.java | 49
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMajorPopulationDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerCommunityDiscountMapper.xml | 87
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComMngCarDTO.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoCommentUserDAO.java | 27
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java | 1540
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComActEasyPhotoEvaluateDto.java | 69
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComAreaTownCommunityApi.java | 36
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PagePopularMerchantDTO.java | 38
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComActDTO.java | 143
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHoursePayingOrderService.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/NewFightConvenientMerchant.java | 100
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java | 53
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthDetailsVO.java | 86
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ServiceStaticDTO.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/unionpay_car_wash.xml | 40
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/resources/logback-spring.xml | 51
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingWestApi.java | 284
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/WxPayNotifyOrderDTO.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerCommunityDiscountDao.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAcidDangerMemberDao.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java | 220
springcloud_k8s_panzhihuazhihuishequ/service_community/mvnw | 310
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java | 658
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceEvaluateVO.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ScreenPopulationApi.java | 36
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionInspectionDto.java | 109
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActNeighborCircleTopicNew.java | 90
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComActFourMember.java | 74
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinghuiMerchantEvaluateMapper.xml | 116
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/dao/UnionIntegralSummarizeMapper.java | 43
flower_city/src/main/resources/mapper/SysUserMapper.xml | 362
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthFeedbackAddDTO.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenVolunteerActStatisticsInfo.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActBuildingService.java | 83
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsVerifyRecordVO.java | 43
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PagePartyBuildingMemberVO.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiArticleManagement.java | 51
springcloud_demo_on_k8s-master/service-zuul/pom.xml | 91
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/listen/KeyPersonInfoExcelListen.java | 102
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/config/MinioUtil.java | 135
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventRequestImageVO.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActActivityCode.java | 70
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserRoleDO.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwSafetyWorkRecordDAO.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPbMemberDO.java | 93
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/until/MvcConfig.java | 34
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectScheduleApi.java | 93
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleRecordServiceImpl.java | 67
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerActivitiesPeopleApi.java | 164
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiArticleManagementDao.java | 53
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WxRequestEntity.java | 13
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiReseau.java | 61
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventStatisticsVO.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleCommentServiceImpl.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesByAppVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActWarehouseOperationService.java | 16
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/code.js | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthPageDTO.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActSignDO.java | 72
springcloud_k8s_panzhihuazhihuishequ/grid_app/.gitignore | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageServeExcelVO.java | 57
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/EncryptDecryptClass.java | 12
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridStatisticsVO.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/EldersAuthService.java | 219
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioUtil.java | 255
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/EventMapper.xml | 1509
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java | 174
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/CommediateTypeServiceImpl.java | 82
springcloud_k8s_panzhihuazhihuishequ/service_user/mvnw | 310
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/visit/EventVisitCompleteDTO.java | 60
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComFmsTeamDAO.java | 57
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/EventGridMemberBuildingRelationDOMapper.xml | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealCompanyExcelVO.java | 38
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/12.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionUserDto.java | 170
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/Highlist.java | 18
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventTransferRecordMapper.java | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistVO.java | 104
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 1339
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java | 393
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/MinioUtil.java | 125
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCascadeHouseVO.java | 56
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeOperationAdminVO.java | 50
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/code.css | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderBargainRecordDto.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationUserNoticeEditDTO.java | 46
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EvaluateEasyDto.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAnnouncementServiceImpl.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_property/.gitignore | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemUnitTaskDTO.java | 103
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/dao/ComPropertyRepairDao.java | 26
springcloud_demo_on_k8s-master/eureka-server/pom.xml | 82
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilVillageStatisticsVO.java | 75
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/dao/UnionIntegralRecordMapper.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExcelHouseDTO.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java | 85
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/dos/UnionOutdoorLaborDynamic.java | 94
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsAccRuleFuncDAO.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordExcleVO.java | 73
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/CharsetKit.java | 84
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleBrowseServiceImpl.java | 38
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java | 575
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComFmsClassroomDAO.java | 86
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryCommodityApi.java | 105
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java | 77
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAdminDTO.java | 48
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportExcelVO.java | 88
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysMenuDO.java | 118
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/MicroListVO.java | 72
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerRefundOrderDAO.xml | 80
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEnterpriseType.java | 61
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralUserListVO.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberWestService.java | 249
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridDataAdminDTO.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoActivityUserVO.java | 43
springcloud_demo_on_k8s-master/service-zuul/mvnw | 286
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/SecureComplete.java | 150
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/resources/mapper/UnionIntegralRuleMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiInterspaceApi.java | 232
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/model/dos/UnionStore.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationCommunityTagsDO.java | 78
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCvtServeDAO.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgHatchAuditScheduleServiceImpl.java | 20
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/ComActSocialMemberVO.java | 98
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaRHProperties.java | 57
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEnterpriseVO.java | 61
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerIntegralRecordVO.java | 48
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java | 1221
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java | 159
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComMngVolunteerServiceTypeDto.java | 76
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberWestMapper.xml | 645
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActWarehouseBaseApi.java | 82
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComMngVillageBuildHouseAppDTO.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenMicroWishStatisticsInfo.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberGpsLogService.java | 85
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/SysTemplateConfigService.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventTransferRecordDeleteDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidMemberVO.java | 66
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordVO.java | 122
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/config/JacksonConfig.java | 31
springcloud_demo_on_k8s-master/service-tp/mvnw | 286
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulOutOrLocalEnum.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderDeliveryMapper.xml | 41
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java | 79
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/model/dos/UnionInspection.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/PropertyVO.java | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationSubordinateDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComStreetMapper.xml | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientConsultationStatisticsVO.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerIntegralRecordMapper.xml | 136
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationStatisticsVO.java | 35
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderQueryDTO.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationTotalVO.java | 123
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionInspectionApi.java | 52
flower_city/src/main/java/com/dg/core/service/impl/SysUserRecordServiceImpl.java | 66
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/config/MyAESUtil.java | 52
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginReturnVO.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/CarouselInfoVO.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiConfigDao.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDO.java | 123
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActQuestnaireUserAnswerService.java | 13
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/CommunityVO.java | 18
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsAdvService.java | 95
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngVillageStatisticsVO.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiReseauService.java | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideDetailAppletsVO.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComFmsTeamMemberDAO.java | 89
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoActivityRecordService.java | 13
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwDangerReportMapper.xml | 182
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryStoreApi.java | 49
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngSubordinateVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComCorrectPopulationMapper.xml | 56
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/interfaces/ShopOperLog.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/BcDictionaryItemDAO.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventApplicationUserNoticeMapper.java | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/UserEventGridDataVO.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventTransferRecordVO.java | 80
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialOrgHatchAuditApi.java | 114
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulHouseControlStatusEnum.java | 40
flower_city/src/main/java/com/dg/core/exception/file/FileException.java | 19
flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java | 75
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/LcEventVisitingTasksListDTO.java | 198
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemInventoryDTO.java | 116
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FeignConfig.java | 47
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventMainMemberApi.java | 90
springcloud_demo_on_k8s-master/eureka-server/mvnw | 286
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java | 380
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseRegisterMapper.xml | 196
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/logback-spring.xml | 51
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerIntegralMerchantMapper.xml | 205
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyAlarmApi.java | 88
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/ComPropertyEquipmentService.java | 17
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberRelationDeleteDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoTypeServiceImpl.java | 130
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthEditDTO.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerCommunityDiscountVO.java | 47
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiCharityVO.java | 53
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserProportion.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/PartyMemberAnalysisVO.java | 43
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserArchivesVO.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHoursePayingOrder.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/large/AreaStreetDetail.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexStatisticsVO.java | 35
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoAddDTO.java | 112
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHoursePayingOrderServiceImpl.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/UserConstants.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionExchangeRecordDto.java | 86
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/mapper/UnionOutdoorSiteMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbServiceTeamDO.java | 78
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarModelRelationApi.java | 121
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsServiceAppletsDTO.java | 46
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralUserRuleVO.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComChangeCarModelSpecsMapper.xml | 65
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/ComActEasyPhotoTypeRelationService.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultMistakeExcelVO.java | 94
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryStoreClassFeign.java | 104
flower_city/src/main/java/com/dg/core/CorsConfig.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/ServiceApiApplication.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/NewFightNeedProblemClaimMapper.java | 9
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsServiceAdminDTO.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActCommitteeDao.java | 37
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/dtos/IDTO.java | 8
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/53.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEasyPhotoHandler.java | 83
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberWarnLogDetailsVO.java | 53
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightConfigDao.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberWestServiceImpl.java | 1086
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ValidateUtils.java | 19
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsGameServiceImpl.java | 562
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/KaphtchaApi.java | 81
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComHouseMemberVo.java | 48
springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/java/com/panzhihua/service_bracelet/service/impl/BraceletEarlyWarningImpl.java | 54
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java | 1183
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComChangeCarModelRelationMapper.java | 77
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/AutomessageSysUserService.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/SysConfVO.java | 47
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/config/SwaggerConfig.java | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtBusinessDetailVO.java | 46
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java | 371
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightComConvenientMerchantsMapper.xml | 342
springcloud_k8s_panzhihuazhihuishequ/applets/.mvn/wrapper/MavenWrapperDownloader.java | 118
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginReturnsVO.java | 24
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/validated/PageGroup.java | 9
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ScreenPudaApi.java | 83
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemInventoryDAO.java | 60
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/McsProductService.java | 60
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDynTypeDTO.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/.mvn/wrapper/maven-wrapper.properties | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActWorkGuideDTO.java | 67
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageSocialOrgHatchDTO.java | 35
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarInquiryDto.java | 72
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderCountVO.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryUserAddress.java | 90
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UserAnswerContentVO.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/SysTemplateConfig.java | 52
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/ResultEntity.java | 12
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java | 187
flower_city/src/main/java/com/dg/core/exception/file/FileSizeLimitExceededException.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRelationEnum.java | 66
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommoditySpecsVo.java | 96
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoCommentDO.java | 48
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/25.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ProjectRelationVO.java | 23
flower_city/src/main/java/com/dg/core/db/manual/pojo/MUser.java | 40
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/68.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditSysUserDto.java | 218
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/model/dto/LcGridData.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComScreenDao.java | 63
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerMerchantWithdrawMapper.xml | 145
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/font/iconfont.woff | 0
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComActIntegralUserTradeDAO.java | 62
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java | 334
springcloud_demo_on_k8s-master/service-influxdb-app/.mvn/wrapper/maven-wrapper.jar | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeListAdminVO.java | 46
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComCun.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderCollageTeamMapper.xml | 127
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UsersAnswerQuestnaireVO.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsOrder.java | 109
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSanshuoExpertTwoDO.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/WxSubscribeConstants.java | 80
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/GridMemberPageListDTO.java | 48
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComPbMemberRoleErrorExcelVo.java | 43
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActEvaluateVO.java | 89
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoFeedbackService.java | 13
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerActivityApi.java | 100
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseBaseVO.java | 66
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaConfiguration.java | 90
springcloud_k8s_panzhihuazhihuishequ/service_community/pom.xml | 169
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/mvnw | 310
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActCommiteeVO.java | 73
springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/java/com/panzhihua/service_bracelet/ServiceBraceletApplication.java | 21
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/SwaggerConfig.java | 34
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ForEachUtils.java | 52
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActProceedingsDao.java | 35
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java | 501
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/resources/bootstrap.yml | 40
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventResourceMapper.xml | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaDistrictVO.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsServiceServiceImpl.java | 423
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/McsOrderMessage.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectMember.java | 80
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/46.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderCollageTeamVo.java | 81
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataDeleteDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActWarehouseApplyService.java | 54
flower_city/src/main/java/com/dg/core/db/manual/mapper/util/MapperGenerator.java | 52
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRegisterDetailedAnswerVO.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/dao/UnionIntegralRecordMapper.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiExperienceActivityVO.java | 89
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilGridStatisticsVO.java | 34
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventApi.java | 118
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsAttrServiceImpl.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationVeteransExcelListen.java | 716
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVolunteerSkillService.java | 61
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventSpecialCrowdRecordServiceImpl.java | 22
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionOutdoorLaborDynamicApi.java | 55
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenService.java | 88
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/pom.xml | 129
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientProductDAO.java | 79
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVolunteerMngService.java | 136
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/PopulationApi.java | 3707
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java | 139
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightConvenientMerchantServiceImpl.java | 93
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/CodDataService.java | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/PageDangerMemberDTO.java | 39
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/AppletWebSecurityConfigurationAdapter.java | 27
flower_city/src/main/java/com/dg/core/controller/SlideshowController.java | 82
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoEventDao.xml | 24
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngFamilyInfoDO.java | 92
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/62.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamMemberExportExcelVO.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmDetailVO.java | 10
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/resources/mapper/UnionAccessMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java | 64
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/MakeHandleAdminDTO.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoEvaluateMapper.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectScheduleApi.java | 95
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryStoreClassDto.java | 76
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberGpsLogDeleteDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ClazzUtils.java | 53
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialOrgHatchAuditVO.java | 70
springcloud_k8s_panzhihuazhihuishequ/config_server/mvnw.cmd | 182
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActEasyPhotoMemberApi.java | 94
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectMemberService.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/RoleDAO.xml | 47
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EditTeamMemberDTO.java | 52
springcloud_demo_on_k8s-master/.mvn/wrapper/maven-wrapper.properties | 1
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComChangeCarBrandController.java | 106
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActWorkGuideMaterialDAO.java | 12
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectMemberVO.java | 82
springcloud_k8s_panzhihuazhihuishequ/applets/mvnw | 310
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java | 87
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtCategoryDTO.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/model/dos/UnionOutdoorSite.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityFeign.java | 104
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/CommunityJobHandler.java | 327
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/EventRateVO.java | 20
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComBatteryCommoditySpecsApi.java | 130
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoRewardMapper.java | 21
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java | 147
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerOrgTeamServiceImpl.java | 158
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHoursePreOrderServiceImpl.java | 69
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionUserApi.java | 65
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventResourceController.java | 166
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventRevokeDTO.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComDrugPopulationService.java | 13
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/SecureCancel.java | 146
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventTransferRecordDetailsVO.java | 57
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerTypeServiceImpl.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexSpecialStatisticsVO.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngPopulationVillageVO.java | 21
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/6.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java | 64
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiInterspaceMapper.xml | 192
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoClassifyVO.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/IndexTopStatisticsVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerIntegralMerchant.java | 104
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerMerchantEvaluateDao.java | 50
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml | 45
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDirectReportDTO.java | 135
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/RentingHourseOrderApi.java | 123
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenNeighborStatisticsInfo.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/MyMetaObjectHandler.java | 44
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityActivityMapper.xml | 199
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidCheckRecord.java | 69
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventResourceMapper.xml | 72
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiSnapshotMapper.xml | 188
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/MainMemberApi.java | 50
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/biz/KeyPersonBizServiceImpl.java | 104
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAnnouncementDao.java | 27
flower_city/src/main/java/com/dg/core/db/gen/entity/WorkOrder.java | 78
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerApi.java | 306
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/dao/UnionUserMapper.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopSysConfDTO.java | 19
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java | 154
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/55.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/McsOrderDao.java | 41
flower_city/src/main/java/com/dg/core/service/IAgreementService.java | 23
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java | 245
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidMemberDTO.java | 31
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActEnterpriseTypeApi.java | 97
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishOperationRecordServiceImpl.java | 53
flower_city/src/main/java/com/dg/core/db/gen/entity/AreaCode2022.java | 63
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAcidUpdateRecordDao.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryStoreClassDto.java | 80
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngRealCompanyExcelListen.java | 69
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiExperienceActivityServiceImpl.java | 167
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveAnswerContentMapper.xml | 235
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiMerchantApi.java | 147
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserInputDAO.java | 55
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComChangeCarModelSpecsServiceImpl.java | 158
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserPhoneVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwSafetyWorkRecordMapper.xml | 83
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseAdminDTO.java | 134
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesEnrollByAdminVO.java | 47
flower_city/src/main/java/com/dg/core/service/IReplyTemplateService.java | 51
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/OrderNoUtils.java | 76
flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml | 313
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/mapper/UnionIntegralRecordMapper.xml | 120
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsEvaluateDTO.java | 41
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubDO.java | 62
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCvtBusinessDO.java | 80
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/ServiceEquipmentApplication.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComPbCheckUnitVo.java | 134
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/UnionpayCarWashServiceImpl.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/impl/UnionInspectionServiceImpl.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerActivitiesPeopleInvolvedMapper.xml | 160
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerEvaluateVO.java | 82
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActRaffleService.java | 54
springcloud_demo_on_k8s-master/config-server/.mvn/wrapper/maven-wrapper.properties | 1
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActFourMemberApi.java | 103
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionOutdoorSiteApi.java | 52
springcloud_demo_on_k8s-master/service-tp/pom.xml | 109
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientElevatingPointDTO.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerRefundOrderDTO.java | 86
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessAreaServiceImpl.java | 47
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/ResultData.java | 95
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ActDynTypeApi.java | 135
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgHatchDAO.java | 96
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthFeedbackEditDTO.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussUserDOMapper.xml | 18
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiShoppingOrder.java | 92
springcloud_demo_on_k8s-master/service-api/mvnw | 286
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsTeamMemberRelationServiceImpl.java | 19
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapTrajectoryVO.java | 20
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/GridMemberWorkExportExcelVO.java | 70
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRefundOrderServiceImpl.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/AddComActDynTypeDTO.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseReturnOrderServiceImpl.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/wx/WXPayConstants.java | 59
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/EventGridMemberBuildingRelationServiceImpl.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccRuleFuncVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientMerchantDAO.java | 179
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveAppletsVO.java | 147
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderGoodsDAO.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPensionAuthHistoryRecordDO.java | 176
springcloud_demo_on_k8s-master/service-zuul/.mvn/wrapper/maven-wrapper.jar | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActProceedingsApi.java | 50
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventListVO.java | 84
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyWorkerVO.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/EditComActIntegralRuleDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionOutdoorLaborDynamicDto.java | 92
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ValidableList.java | 132
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/LcCompareMemberCodeMapper.java | 16
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/28.gif | 0
flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysUserRecordMapper.java | 49
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/entity/SysTemplateConfig.java | 51
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/colorpicker.js | 2
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/dao/UnionOutdoorSiteMapper.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/SysConfMapper.java | 43
flower_city/src/main/java/com/dg/core/util/TableDataInfo.java | 87
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileTypeUploadUtils.java | 94
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiReseauPeopleMapper.xml | 144
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerEvaluateDAO.java | 52
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseReturnOrderMapper.xml | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsTeamDTO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveRecordMapper.java | 125
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ScreenDrawEventPopulationTotalVO.java | 98
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/Query.java | 162
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleFabulousWestDO.java | 88
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyOrganizationVO.java | 78
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.java | 229
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionInspectionFeign.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsProductLabelMapper.xml | 32
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiInterspaceApplyForServiceImpl.java | 69
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityInviteServiceImpl.java | 95
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridMemberRelationDO.java | 70
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiOldManUserDateVO.java | 38
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyActivity.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java | 64
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/icon.png | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComOperationListVO.java | 68
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActEvaluateServiceImpl.java | 191
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationSpecialExcelVo.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicWestMapper.java | 55
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussOptionDTO.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVolunteerExcelListen.java | 196
springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/java/com/panzhihua/service_bracelet/dao/BraceletEarlyWarningDao.java | 77
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/DisabledPersonsDTO.java | 122
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDpcServiceImpl.java | 152
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActIntegralRuleDOMapper.xml | 37
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiMicroVolunteeringMapper.xml | 184
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVaccinesDO.java | 65
springcloud_demo_on_k8s-master/service-influxdb-app/pom.xml | 101
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComFmsTeamService.java | 66
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnLevelVO.java | 69
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComFmsServiceRecordDAO.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthElderlyDTO.java | 55
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageRegionVO.java | 28
springcloud_demo_on_k8s-master/service-influxdb-app/.mvn/wrapper/maven-wrapper.properties | 1
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthHistoryRecordDTO.java | 82
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/NewFightShopping.java | 71
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/PageComActSocialWorkerDTO.java | 145
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityOrderBargainRecord.java | 49
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletTradeDTO.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/impl/UnionStoreServiceImpl.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentAppVO.java | 66
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveRecordService.java | 91
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/RentingHourseContractConfigService.java | 45
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/ReserveRecordStatusEnum.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java | 59
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActWorkGuideClassifyService.java | 57
flower_city/src/main/java/com/dg/core/service/IAutomessagePolicyDocumentsService.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerOrderPayDTO.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexGridStatisticsVO.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiSnapshotClassifyServiceImpl.java | 63
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/McsMerchantDAO.java | 100
flower_city/src/main/java/com/dg/core/controller/UserController.java | 440
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PagePbCheckUnitCommonDto.java | 46
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerRefundOrderServiceImpl.java | 343
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerGoodsDTO.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPbCheckUnitDao.java | 10
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderCreateDTO.java | 59
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysAppConfigDao.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EditTeamTypeDTO.java | 36
flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java | 150
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java | 186
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/StreetBigScreenService.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/resolvers/AuthorizationInterceptor.java | 83
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiMicroVolunteeringApi.java | 154
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java | 650
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/71.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/dos/UnionAccess.java | 86
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/test/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImplTest.java | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoDeleteDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java | 163
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiSnapshotClassify.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComFmsClassroom.java | 66
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/UnionIntegralSummarizeService.java | 27
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/weixin/CheckService.java | 131
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityApi.java | 89
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleFabulousDO.java | 88
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 4438
flower_city/src/main/java/com/dg/core/db/gen/entity/RoleMenuEntity.java | 60
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/37.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsMerchant.java | 104
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/UnionIntegralRecordService.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiInterspaceApplyForVO.java | 76
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberWarnLogService.java | 78
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/sensitive/Desensitizer.java | 7
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java | 167
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComFmsApi.java | 216
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletTradeAdminVO.java | 53
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarInquiryFeign.java | 87
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserAgreementDAO.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerAddDTO.java | 124
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/BaseDO.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightShoppingVO.java | 70
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComLowSecurityPopulationDO.java | 240
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/GridMemberBuildingVO.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_user/.mvn/wrapper/MavenWrapperDownloader.java | 118
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/dao/UnionStoreMapper.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationServiceImpl.java | 145
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java | 250
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/model/helper/encrypt/ResultInterceptor.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsAdvJumpDAO.java | 26
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/GridMemberJobHandler.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMainMemberMapper.java | 33
flower_city/src/main/java/com/dg/core/util/presence/Year2006.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthPensionerVO.java | 84
flower_city/src/main/java/com/dg/core/db/gen/entity/CountListNum.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightProjectEvaluateService.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDpcService.java | 52
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComChangeCarModelRelationMapper.xml | 169
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/TokenConstant.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActPrizeDAO.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersRecordsDTO.java | 50
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/pom.xml | 130
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWainDTO.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java | 214
springcloud_demo_on_k8s-master/config-server-bak/src/main/resources/application.yml | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddSysUserDto.java | 255
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddAdminDTO.java | 69
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderGoodsDAO.xml | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java | 76
flower_city/src/main/java/com/dg/core/db/manual/mapper/util/HttpClientUtils.java | 294
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishFeedbackMapper.java | 23
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java | 428
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseRefundOrder.java | 65
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivitiesPeopleServiceImpl.java | 123
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/ServiceException.java | 67
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructHouseService.java | 117
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysMenuVO.java | 76
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DifferentLongListUtil.java | 50
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java | 53
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleTopicMapper.java | 53
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/switchs/SearchCommunityDTO.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightProjectJoinMapper.xml | 116
flower_city/src/main/java/com/dg/core/Constant.java | 76
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/UserRankDTO.java | 38
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerStatisticsVo.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwDangerReportDAO.java | 51
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussOptionUserDO.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/dao/UnionUserMapper.java | 17
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/util/BaseUtils.java | 24
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRegisterExcelAdminVO.java | 23
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyApi.java | 77
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussCommentUserDTO.java | 29
flower_city/src/main/java/com/dg/core/util/WxUtil.java | 297
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/PageRentingHousesConfigDTO.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/ParamOutAspect.java | 143
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/QRCodeUtils.java | 264
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/config/AuthConfig.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/AddEasyPhotoClassifyDTO.java | 33
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IdentityAuthApi.java | 87
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderBargainRecordDto.java | 67
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/rate.js | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java | 275
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerCreditsExchangeDao.java | 69
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java | 222
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderOperateDO.java | 71
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemClaimDAO.java | 80
springcloud_demo_on_k8s-master/service-tp/mvnw.cmd | 161
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityActivityMapper.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityTypeVO.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAnnouncementMapper.xml | 34
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/model/dto/KeyPersonExcelExportDto.java | 123
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserElectronicFileVO.java | 34
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/AESUtil.java | 169
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishOperationRecordVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/config/JacksonConfig.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenDynStatisticsInfo.java | 33
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java | 1076
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletTradeVO.java | 37
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/AjaxAuthenticationEntryPoint.java | 34
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/GridAppApplication.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEnterpriseTypeMapper.xml | 75
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussCommentDO.java | 80
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/aop/CheckExpirationInterceptor.java | 76
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ResultUtil.java | 29
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UpDataApi.java | 4
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiReseauPeople.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/ComMngFamilyInfoDAO.xml | 26
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/model/dto/LcKeyPersonVisitRecordQueryDTO.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComFmsService.java | 97
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsProductLabel.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActPictureService.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditDTO.java | 74
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHoursePayingOrderApi.java | 86
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoClassifyDOMapper.xml | 46
springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/java/com/panzhihua/service_bracelet/config/MybatisPlusConfig.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/model/dos/UnionAccess.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActUserWalletTradeRewardExcelVO.java | 55
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopStoreVO.java | 73
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEventMapper.java | 126
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthHistoryRecordDO.java | 143
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventApplicationAppReleaseService.java | 72
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEnterpriseTypeServiceImpl.java | 142
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComPropertyPublicityDTO.java | 48
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java | 383
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/CommonDTO.java | 14
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesUserInoculationByAppVO.java | 41
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java | 354
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/ComActWalletSettlementAdminDTO.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/resources/mapper/UnionOutdoorSiteMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderBargainDto.java | 97
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventSpecialCrowdRecordService.java | 13
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/wx/WXPayXmlUtil.java | 30
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VillageApi.java | 52
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoEvaluateMapper.xml | 93
flower_city/src/main/java/com/dg/core/api/AutomessagePolicyDocumentsAppletsController.java | 63
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEasyPhotoMember.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/IEncryptDecrypt.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightCommunityConstructionDAO.java | 41
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActIntegralUserApi.java | 98
flower_city/src/main/java/com/dg/core/util/presence/Year2004.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVeteransMistakeExcelVO.java | 208
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComBatteryStoreApi.java | 61
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActPorceedingsApi.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductLevelInfoVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHourseReturnOrder.java | 173
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionExchangeRecordApi.java | 105
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/PartyOrganizationServiceImpl.java | 345
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiCharityService.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/WeatherVO.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/IntegralUserRankVO.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComPbWorkScreenVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventApi.java | 152
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventResourceVO.java | 55
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/JinhuiCoinGeneralTable.java | 49
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientProductServiceImpl.java | 302
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/manager/AsyncManagerNew.java | 53
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleFabulousWestDAO.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventVisitingTasksDO.java | 233
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 364
springcloud_demo_on_k8s-master/LICENSE | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyOrg.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java | 82
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/until/AccessUtil.java | 110
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/config/QRCodeUtil.java | 108
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ClusterApi.java | 47
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngAreaVO.java | 41
springcloud_demo_on_k8s-master/config-server/src/test/java/com/springcloudme/configserver/ConfigServerApplicationTests.java | 17
flower_city/src/test/java/com/dg/core/WMApplicationTests.java | 13
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsHouseService.java | 78
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 1922
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiOldManBrokenLineVO.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPensionAuthStatisticsMapper.xml | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulPoliticalOutlookEnum.java | 44
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java | 219
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComFmsTeamMemberRelationService.java | 14
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComCvtBusinessAppletsDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActWarehouseBaseApi.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEldersAuthStatisticsMapper.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientProductService.java | 90
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoCommentVO.java | 53
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerDeleteDTO.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ComClusterMemberExcelVO.java | 35
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexEventGridStatisticsVO.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberPositionDTO.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyWorkerMapper.xml | 50
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java | 690
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingMemberExcelVO.java | 46
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java | 246
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/dto/DeviceDto.java | 35
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationKeyExcelVO.java | 106
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/CapitalDetailVO.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/config/MybatisPlusConfig.java | 38
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/ComMngStructHouseDAO.xml | 14
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/LcCompareCodeMemberDO.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComDataStatisticsMemberExcelVo.java | 77
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/dao/UnionExchangeRecordMapper.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventNewStatisticsVO.java | 84
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientElevatingPointDAO.java | 54
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/model/vos/LoginBody.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityCodeService.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActCommitteeApi.java | 87
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbServiceTeamMapper.xml | 74
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 489
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java | 188
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/AddEnterpriseTypeDTO.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxXCXTempSend.java | 328
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventBatchRepublishDTO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryTradeOrderServiceImpl.java | 187
springcloud_k8s_panzhihuazhihuishequ/config_server/.mvn/wrapper/maven-wrapper.properties | 2
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiWorkGuideApi.java | 233
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemInventoryServiceImpl.java | 224
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java | 719
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberAddDTO.java | 88
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComChangeCarInquiryService.java | 78
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerActivityMapper.xml | 360
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientProductCategoryServiceImpl.java | 115
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ApplicationAppRelease.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussCommentUserDOMapper.xml | 18
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRafflePrizeMapper.xml | 22
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightResourceSharingDAO.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActMicroWishService.java | 123
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerRefundOrderDAO.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthStatisticsMapper.xml | 43
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComPensionAuthStatisticsService.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistExcelVO.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidRecord.java | 200
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkSocialWorkerInfo.java | 19
flower_city/src/main/java/com/dg/core/db/gen/mapper/AgreementMapper.java | 25
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/filter/StoreValidFilter.java | 103
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 684
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApplicationAppReleaseApi.java | 101
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewStriveForService.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyRepairVO.java | 134
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationHouseUserService.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructOtherBuildService.java | 83
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/dos/UnionIntegralRule.java | 73
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/DiscussJobHandler.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/DataCount.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/dao/UnionInspectionMapper.java | 18
flower_city/src/main/java/com/dg/core/util/presence/Year2017.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanShuoIndustryCenterVO.java | 80
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAccRuleFuncDO.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexDynamicStatisticsVO.java | 35
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseEditAdminDTO.java | 51
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationElderMistakeExcelVO.java | 101
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussUserDO.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiMicroVolunteeringDao.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionOutdoorLaborDynamicServiceImpl.java | 65
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/config/MyMetaObjectHandler.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComCvtCategoryDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/wx/WxSubscribeDTO.java | 61
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerUserAddressService.java | 53
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PartyExcelDO.java | 41
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEnterpriseMapper.xml | 125
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActPrizeDO.java | 52
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActQuestnaireSubSelectionDTO.java | 10
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/McsGameService.java | 113
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/admin/BuildingDetailAdminVo.java | 49
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveSubSelectionMapper.xml | 27
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/KaphtchaApi.java | 80
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComProperty.java | 101
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java | 163
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 8890 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActPictureMapper.xml | 20
flower_city/src/main/java/com/dg/core/exception/file/MessageUtils.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/SysUser.java | 284
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/dos/UnionIntegralRuleRecord.java | 59
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsOrderMapper.xml | 54
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientProductSpecificationDAO.java | 41
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActAcidCheckRecordService.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityActivity.java | 123
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpUtils.java | 160
springcloud_k8s_panzhihuazhihuishequ/service_api/.gitignore | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventTransferRecordMapper.xml | 223
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/UserApi.java | 84
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/LoginApi.java | 78
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/EventResourceDO.java | 66
flower_city/src/main/resources/mapper/TransactionEventMapper.xml | 502
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseDO.java | 149
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/33.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActPictureLibraryDAO.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceDetailsVO.java | 47
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java | 157
flower_city/src/main/java/com/dg/core/util/presence/Year2013.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsAttrVO.java | 89
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightConvenientMerchantService.java | 67
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborFabulousAppDTO.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/ComPropertyHelpService.java | 21
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/query.html | 69
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActProceedingsService.java | 24
springcloud_demo_on_k8s-master/README.md | 75
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageCommunityQuestnaireDTO.java | 20
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/MyCouponVO.java | 34
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventLeftTopStatisticsVO.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PresetPictureType.java | 19
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoTypeDO.java | 38
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoStatisticsVO.java | 57
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComActIntegralUsersMapper.java | 72
flower_city/src/main/java/com/dg/core/util/presence/Year2020.java | 42
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/EncryptQuery.java | 14
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussCommentUserDO.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java | 988
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/EventResourceService.java | 16
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerTypeApi.java | 147
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/WestScreenStatics.java | 37
springcloud_k8s_panzhihuazhihuishequ/timejob/.gitignore | 33
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/.gitignore | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/RentingHourseRefundOrderApi.java | 86
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyEquipmentVO.java | 79
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryStoreVo.java | 122
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructAreaDistrictService.java | 21
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/config/MinioConfig.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridNearbyDTO.java | 53
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaProvinceVO.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComKeyPopulationServiceImpl.java | 22
flower_city/src/main/java/com/dg/core/exception/file/BaseException.java | 83
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/handles/UserAuthAccessDeniedHandler.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ExcelSelectListUtil.java | 64
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/UnionOutdoorLaborDynamicService.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysOperLogVO.java | 93
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/ShopBackstageApplication.java | 24
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarInquiryApi.java | 55
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java | 207
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinghuiMerchantEvaluateVO.java | 57
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActPrizeVO.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRaffleRecordMapper.xml | 90
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordVO.java | 131
flower_city/src/main/java/com/dg/core/db/gen/entity/GuidePlate.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoHandlerMapper.xml | 83
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerServiceType.java | 57
springcloud_k8s_panzhihuazhihuishequ/service_dlz/target/classes/com/panzhihua/service_dlz/ServiceDlzApplication.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerMerchantService.java | 49
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventSpecialPopulationDTO.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiSnapshotDao.java | 51
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/layui.css | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoClassifyDO.java | 80
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java | 350
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/GrantRewardDTO.java | 34
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/EditComActQuestnaireVo.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpHelper.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java | 67
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoVO.java | 94
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngStructHouseDO.java | 62
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/2.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EasyPhotoClassifyApi.java | 90
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/TestApi.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComVeteransPopulationDO.java | 323
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditStatusDTO.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoFeedbackMapper.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerMerchantDao.java | 68
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/MicroCommercialStreetApi.java | 569
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoRewardDO.java | 74
flower_city/src/main/java/com/dg/core/service/impl/KeywordImpl.java | 48
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtBusinessVO.java | 64
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActDpcApi.java | 85
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientProductCategoryMapper.xml | 38
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVOS.java | 20
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceRecordVO.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/MapDistance.java | 127
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleWestDOMapper.xml | 208
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/PageEnterpriseDTO.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/dao/UnionExchangeRecordMapper.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingVO.java | 67
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysTemplateConfigMapper.xml | 12
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordDetailVO.java | 18
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActIntegralUserMapper.java | 73
springcloud_k8s_panzhihuazhihuishequ/service_bracelet/pom.xml | 169
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionOutdoorLaborDynamicApi.java | 58
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/StatisticsApi.java | 152
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseDonatesMapper.xml | 132
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopAddressDTO.java | 24
springcloud_demo_on_k8s-master/config-server/src/main/resources/application.yml | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/McsProductDAO.java | 50
springcloud_demo_on_k8s-master/service-api/.mvn/wrapper/maven-wrapper.properties | 1
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HTMLFilter.java | 499
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActActivityInvite.java | 56
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/19.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarInquiryDto.java | 69
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/CommunityGovernanceTrendsVO.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsAccRuleService.java | 9
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserLoginFailureHandler.java | 48
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerGoodsDO.java | 163
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/excel/PEXCustomSheetWriteHandler.java | 49
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/SystemApi.java | 36
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ThreeNumData.java | 47
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingVO.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/.mvn/wrapper/maven-wrapper.properties | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComChangeCarModelService.java | 86
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientMerchantService.java | 163
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderDeliveryDO.java | 125
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 753
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerOrderDeliveryService.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleWestService.java | 222
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/config/SwaggerConfig.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventResourceService.java | 65
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwSafetyWorkRecordServiceImpl.java | 228
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java | 592
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidCharts.java | 22
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveDangerAreaApi.java | 105
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/UnionUserService.class | 0
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPbCheckUnitApi.java | 91
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborWestApi.java | 283
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialOrgHatchAuditScheduleVO.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVolunteerOrgTeamService.java | 68
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/PartyOrganizationService.java | 79
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/impl/UnionOutdoorSiteServiceImpl.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java | 212
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralRuleServiceImpl.java | 203
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/annotation/Authorization.java | 14
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java | 59
flower_city/src/main/java/com/dg/core/service/ISysSettingsService.java | 22
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaProperties.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationEditDTO.java | 115
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/69.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java | 235
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IndexDataVO.java | 38
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysOperLogDO.java | 116
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCvtBusinessDAO.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComDisabilityPopulationApi.java | 15
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPbCheckUnitApi.java | 378
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/ActActivityListVO.java | 80
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiInterspaceApplyFor.java | 79
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthApi.java | 987
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsHouseDAO.java | 70
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/UnionInspectionService.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberWarnLogMapper.xml | 91
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/DeleteProductDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/model/vos/LCArguments.java | 59
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsEvaluate.java | 51
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentReplyAppVO.java | 57
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/PageEasyPhotoActivityUserDTO.java | 19
flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageTransactionEventInterviewMapper.java | 16
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidDangerMemberApi.java | 51
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserInputDO.java | 168
springcloud_k8s_panzhihuazhihuishequ/service_dlz/src/main/java/com/panzhihua/service_dlz/controller/CommonController.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActReserveIndexVo.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ResetPasswordConvenientMerchantDTO.java | 36
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventManageApi.java | 208
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenFourMemberStatisticsInfo.java | 70
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDeleteDTO.java | 25
flower_city/src/main/resources/mapper/ReplyTemplateMapper.xml | 177
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/CodDataServiceImpl.java | 325
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealAssetsServiceImpl.java | 147
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/LoginApi.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveRegisterDetailedAdminDTO.java | 46
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientMerchantDO.java | 150
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/30.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComMngVolunteerServiceTypeDto.java | 73
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/GridMemberCascadeVO.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ConvenientProductDO.java | 77
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerOrderOperateDAO.xml | 19
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenMicroListDTO.java | 32
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/JinhuiJobHandler.java | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerServiceTypeVo.java | 74
springcloud_demo_on_k8s-master/adminConfig/custom-config-dev.yml | 13
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerMerchant.java | 165
flower_city/src/main/java/com/dg/core/controller/KeywordController.java | 108
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java | 363
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryUserAddressServiceImpl.java | 158
springcloud_demo_on_k8s-master/deploy-file/deploy-eurekaserver.yaml | 60
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ComClusterMemberExcelErrorVO.java | 38
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthElderlyExcelListen.java | 116
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java | 316
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunitySwitchApi.java | 45
flower_city/src/main/java/com/dg/core/manager/JWTTokenUtil.java | 170
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSanshuoEventDao.java | 34
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ServiceDetailStaticsVO.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVaccinesEnrollRecordDAO.java | 79
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/config/AccessConfig.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderController.java | 187
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiComActWorkGuideServiceImpl.java | 334
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsTeamMapper.xml | 61
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/loading-2.gif | 0
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EasyPhotoApi.java | 75
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ExportDonatesDTO.java | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/bracelet/BraceletUserDataDO.java | 223
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderCollageTeamPeopleDto.java | 64
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsConfigServiceImpl.java | 68
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderGoodsVO.java | 75
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComPropertyPublicityApi.java | 113
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenMerchantStatisticsInfo.java | 45
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/model/dto/PartyBuildingMemberDTO.java | 26
flower_city/src/main/java/com/dg/core/db/gen/mapper/ClassifyAdministrationMapper.java | 85
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActRegistDAO.java | 84
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerCommunityConfig.java | 63
flower_city/src/main/resources/mapper/AutomessageSysSettingsMapper.xml | 5
flower_city/src/main/java/com/dg/core/db/gen/entity/ElseAccessoryEntity.java | 91
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidChartsVO.java | 23
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComBatteryStoreClassApi.java | 141
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActFourMemberMapper.xml | 171
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseDonatesVO.java | 85
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPreviewVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/AllData.java | 38
springcloud_k8s_panzhihuazhihuishequ/service_grid/pom.xml | 135
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantEvaluateImpl.java | 87
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RichTextUtil.java | 55
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarBrandVo.java | 82
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvPosDO.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/EditBuildingHouseDto.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMapper.xml | 202
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiSnapshotVO.java | 67
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyDao.java | 110
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiReseauVO.java | 60
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComElderAuthRecordsService.java | 133
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientServiceCategoryDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHourseReturnOrderDao.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoActivityRecordServiceImpl.java | 23
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidMemberApi.java | 93
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComStreetService.java | 107
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/FiveCount.java | 17
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComListPartyDTO.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsCouponMapper.xml | 87
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ReturnData.java | 17
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java | 91
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java | 435
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyEquipmentMapper.xml | 41
springcloud_demo_on_k8s-master/service-api/.gitignore | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMainMemberDetailsVO.java | 116
springcloud_k8s_panzhihuazhihuishequ/config_server/.mvn/wrapper/maven-wrapper.jar | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulIsRentEnum.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PagePartyBuildingMemberVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityOrderCollageTeamService.java | 85
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java | 316
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActWorkGuideClassifyDO.java | 52
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/EditEnterpriseDTO.java | 67
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 280
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/TodoEventsVO.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActFourMemberService.java | 53
flower_city/src/main/java/com/dg/core/util/presence/Year2018.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActProceedingsDTO.java | 76
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenFiveAssociationsStatisticsInfo.java | 48
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/RentingHourseOrderApi.java | 114
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionInspectionApi.java | 72
flower_city/src/main/java/com/dg/core/manager/TokenManager.java | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventVisitingTasksDTO.java | 168
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComChangeCarModelSpecsChildren.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderCollageTeamDto.java | 66
springcloud_demo_on_k8s-master/deploy-file/service-zuul.yaml | 43
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/StartUserBargainOrderDto.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleBrowseWestDO.java | 49
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LiveVO.java | 24
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderPageVO.java | 93
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComRehabilitationPopulationMapper.xml | 46
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightShoppingApi.java | 68
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageVerifyRecordDTO.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgHatchServiceImpl.java | 95
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationUserNoticeDetailsVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMajorPopulationMapper.xml | 38
springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/java/com/panzhihua/service_bracelet/config/MyMetaObjectHandler.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComActEasyPhotoHandlerVo.java | 83
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActUserWalletServiceImpl.java | 325
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiComConvenientServiceCategoriesService.java | 50
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AreaVOS.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiReseauPeopleService.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/QryReportResp.java | 17
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/NewFightHandler.java | 66
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderPayServiceImpl.java | 22
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialOrgHatchApi.java | 74
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventDeleteSingleDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderBargainMapper.xml | 144
springcloud_k8s_panzhihuazhihuishequ/deploy-file/service-community.yaml | 47
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeHandleListAdminVO.java | 52
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerSkill.java | 55
flower_city/src/main/java/com/dg/core/util/TemplateParam.java | 19
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataVO.java | 78
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UsersSubAnswerVO.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerGoodsMapper.xml | 101
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ExportMerchantDTO.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommoditySpecsMapper.java | 65
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/PayOrderVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/.mvn/wrapper/maven-wrapper.jar | 0
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserApi.java | 170
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgServiceImpl.java | 135
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiSnapshotClassifyService.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealAssetsVO.java | 68
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiExperienceActivityDao.java | 60
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/bracelet/SetSOS.java | 14
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryStoreClassMapper.java | 58
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/jquery.js | 5
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsInformationDTO.java | 51
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberRoleDO.java | 137
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/McsConfigDAO.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComActEasyPhotoTypeDTO.java | 61
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussOptionDAO.java | 32
springcloud_demo_on_k8s-master/.gitignore | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/LabelUtils.java | 35
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEasyAdminDTO.java | 46
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActRegistService.java | 19
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/mvnw | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActEasyPhotoHandlerController.java | 106
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOperLogDO.java | 118
flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java | 160
flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideEvolveMapper.java | 60
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynDOMapper.xml | 335
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulIsOkEnum.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/IntegralTradeVO.java | 55
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java | 171
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordImportMistakeExcelVO.java | 45
flower_city/src/main/java/com/dg/core/db/manual/mapper/MUserMapper.java | 9
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActProceedingsVO.java | 81
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/TestApi.java | 160
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialMemberDao.java | 41
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoEvaluateServiceImpl.java | 178
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/config/AccessUtil.class | 0
flower_city/src/main/java/com/dg/core/service/IAutomessageSmartConsultingService.java | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/WarehouseDonatesExcelVO.java | 71
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyPublicityServiceImpl.java | 185
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComStreetVO.java | 66
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarModelSpecsChildrenApi.java | 121
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ActivityManagerVO.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComPensionAuthRecordImportExcelListen.java | 241
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamVO.java | 55
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/MybatisHmkInterceptor.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationUserNoticeAddDTO.java | 42
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightResourceSharingDTO.java | 53
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActReserveCommitVO.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidCheckRecordApi.java | 108
flower_city/src/main/java/com/dg/core/db/gen/mapper/RoleMenuEntityMapper.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventTransferRecordDTO.java | 88
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_grid/config/MybatisHmkInterceptor.class | 0
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java | 146
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/dao/ComPropertyHelpDao.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/ComActReserveMakeStatisticsDTO.java | 19
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/elder/ElderAuthStatisticHeaderDTO.java | 20
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/dos/UnionShippingAddress.java | 77
flower_city/src/main/java/com/dg/core/service/impl/ClassifyAdministrationImpl.java | 102
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMajorPopulationService.java | 13
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWorkTrajectoryDTO.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComFmsServiceService.java | 123
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/dao/UnionIntegralRuleMapper.java | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireWriteListAdminVO.java | 42
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/MainMemberApi.java | 89
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/logback-spring.xml | 51
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderBargainMapper.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsAccRuleDAO.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/KeyPersonInfoDO.java | 149
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComMngPopulationDTO.java | 33
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/resources/bootstrap.yml | 35
flower_city/src/main/java/com/dg/core/service/IRoleMenuService.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/HomeQuarantineRegisterExportVO.java | 27
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/PropertyWorkerDTO.java | 46
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksDeleteDTO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryUserAddressMapper.java | 65
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerMerchantEvaluate.java | 101
flower_city/src/main/java/com/dg/core/service/impl/AgreementServiceImpl.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/ComPbCheckUnit.java | 107
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/config/MinioUtil.java | 125
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoRewardServiceImpl.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComPbCheckUnitDto.java | 108
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderCollageTeamPeopleController.java | 106
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActFourMemberDao.java | 78
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/20.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/.mvn/wrapper/MavenWrapperDownloader.java | 118
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthTypeQueryDTO.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerServiceTypeMapper.java | 64
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 2970
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireSubSelectionServiceImpl.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ScreenWorkApi.java | 150
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActAcidMemberService.java | 40
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderStoreListVO.java | 73
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComMngRealCompanyDTO.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientElevatingPointService.java | 68
springcloud_demo_on_k8s-master/compile.lihan.md | 1
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/AppletAuthenticationFilter.java | 147
flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java | 113
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryActivityTeamVo.java | 24
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PageActivityMembersVO.java | 32
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/15.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynTypeServiceImpl.java | 152
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/NeighborApi.java | 68
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/dao/UnionReportMapper.class | 0
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyEquipmentApi.java | 91
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/dos/UnionOutdoorSite.java | 191
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/EventGridMemberBuildingRelationMapper.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbOrgDAO.java | 47
flower_city/src/main/java/com/dg/core/file/FtpConstants.java | 38
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java | 109
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightProjectEvaluateDTO.java | 45
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/ISysMenuService.java | 13
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/.mvn/wrapper/maven-wrapper.jar | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/GridMemberTrajectoryVo.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialWorkerServiceApi.java | 92
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java | 403
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerUserAddressDAO.xml | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEldersAuthElderlyMapper.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseOperation.java | 73
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberTypeVO.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsCouponServiceImpl.java | 154
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireAnswerContentDAO.java | 85
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationTagCardNoDTO.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ExcelUtils.java | 79
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseUndercarriageVO.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComCunMapper.xml | 14
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivityInviteVO.java | 49
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java | 225
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulHouseUseEnum.java | 46
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommoditySpecsDto.java | 99
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/AppletsApplication.java | 24
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java | 333
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java | 133
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActDpcApi.java | 83
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleRecordExcelVO.java | 63
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/11.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/SanShuoEventStatusEnum.java | 40
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/KaphtchaApi.java | 80
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EditTeamDTO.java | 47
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComClusterOrganizationDO.java | 107
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryStoreDto.java | 116
springcloud_k8s_panzhihuazhihuishequ/service_user/src/test/java/com/panzhihua/service_user/ServiceUserApplicationTests.java | 12
springcloud_demo_on_k8s-master/service-tp/src/main/java/com/springcloudme/servicetp/controller/ApiController.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightProjectEvaluateDAO.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/SerializerBigDecimal.java | 72
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/TreeListVO.java | 14
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderPreviewVO.java | 48
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/schedule/AcidSchedule.java | 51
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java | 1037
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbOrgDO.java | 129
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationCommunityTagsMapper.xml | 46
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectMistakeExcelVO.java | 163
flower_city/src/main/java/com/dg/core/service/ISlideshowService.java | 55
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingOrderServiceImpl.java | 236
flower_city/src/main/java/com/dg/core/manager/RedisTokenManager.java | 123
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/AddClusterAdminDto.java | 38
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/SFTPConfig.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksEditDTO.java | 154
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveMakeAdminDTO.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerGoodsAttrDO.java | 114
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMediateTypeDao.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVaccinesServiceImpl.java | 142
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/VideoManageApi.java | 4
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/UnionInspectionService.class | 0
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActDpcApi.java | 126
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/DisableOrEnableConvenientMerchantDTO.java | 36
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/templates/gasSafety.html | 67
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageVoteSituationDTO.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/wx/TemplateParam.java | 20
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/65.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/ComMngUserTagDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageVO.java | 74
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActIntegralUserService.java | 90
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActMessageService.java | 85
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java | 410
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java | 143
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesEnrollByAdminDTO.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_dlz/target/classes/com/panzhihua/service_dlz/controller/CommonController.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderBargainDto.java | 99
flower_city/src/main/java/com/dg/core/api/ClassifyAdministrationAppletsController.java | 62
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationImportErrorVO.java | 60
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActActivityScreenVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/RentingHourseOrderMapper.xml | 73
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/model/dos/UnionOutdoorServiceRange.java | 72
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventSpecialCrowdRecordDOMapper.xml | 36
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/MicroCommercialStreetApi.java | 617
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComExServicemanDAO.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopGoodsService.java | 77
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/ApprovalFmsServiceAdminDTO.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComActIntegralUsersServiceImpl.java | 312
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOperLogService.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPageVO.java | 138
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiApplyExperienceService.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityDO.java | 105
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerOrgTeamDao.xml | 135
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageVO.java | 70
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/redis/RedisTokenManager.java | 170
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgHatchAuditScheduleDAO.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCityVO.java | 18
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComKeyPopulationApi.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EldersAuthLevelEnum.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoActivityServiceImpl.java | 227
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/BannerVO.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/RentingHoursePreOrderDao.java | 35
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/StreetCoreData.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActEvaluateDO.java | 71
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidUpdateRecord.java | 56
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAppDTO.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunitySwitchApi.java | 54
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/SpecialPopulationEventApi.java | 158
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksAddDTO.java | 150
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderPayService.java | 13
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructAreaDO.java | 71
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderBargainDto.java | 90
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComOpsAccUserDAO.java | 15
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerServiceApi.java | 70
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidDangerMemberApi.java | 100
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/DisabledPersonsService.java | 28
springcloud_demo_on_k8s-master/service-zuul/src/main/resources/application.yml | 23
springcloud_demo_on_k8s-master/service-zuul/src/test/java/com/springcloudme/servicezuul/ServiceZuulApplicationTests.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsServiceEvaluationsMapper.xml | 38
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiArticleManagementApi.java | 82
springcloud_demo_on_k8s-master/eureka-server/mvnw.cmd | 161
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarModelRelationDto.java | 44
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComFmsTeamTypeDAO.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireAnswerContentDO.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java | 213
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EventResourceServiceImpl.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityService.java | 93
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java | 234
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemClaimMapper.xml | 546
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventStatisticsAllAdminVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NeighborWestApi.java | 218
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 494
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtServeDTO.java | 56
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ScreenPopulationApi.java | 42
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarInquiryApi.java | 80
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml | 980
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientServiceCategoryMapper.xml | 58
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemUnitTaskDAO.java | 41
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActUserWalletChangeMapper.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommoditySpecsController.java | 106
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopGoodsDO.java | 163
springcloud_demo_on_k8s-master/config-server/src/main/java/com/springcloudme/configserver/ConfigServerApplication.java | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComOrderListDTO.java | 26
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/DiscussApi.java | 226
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerActivitiesPeopleService.java | 56
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiQuestnaireUserAnswerService.java | 29
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/WarehouseDonatesExcelListen.java | 83
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java | 424
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComActSocialWorkerExcelListen.java | 61
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/SysAppConfigService.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthElderlyDAO.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexHomeQuarantine.java | 19
flower_city/src/main/java/META-INF/MANIFEST.MF | 3
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoMemberVO.java | 60
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/LcGridMemberDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ActDynTypeApi.java | 42
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ComActWarehouseApplyDTO.java | 54
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerActivitiesPeopleApi.java | 122
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java | 792
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishFeedbackMapper.xml | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveRecordDO.java | 157
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventMainMemberService.java | 65
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java | 66
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/ISysRoleService.java | 14
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComCorrectPopulationService.java | 13
flower_city/src/main/java/com/dg/core/util/MyUtil.java | 8
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java | 383
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiMicroVolunteeringType.java | 45
flower_city/src/main/java/com/dg/core/util/presence/Year2012.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderOperateDAO.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/StartFightOrderDto.java | 49
flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java | 103
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ClusterMemberNationVo.java | 21
flower_city/src/main/java/com/dg/core/util/MyBatisPlusConfig.java | 22
springcloud_k8s_panzhihuazhihuishequ/grid_app/pom.xml | 124
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarModelRelationDto.java | 45
springcloud_k8s_panzhihuazhihuishequ/service_equipment/target/classes/com/panzhihua/service_equipment/service/impl/UnionIntegralRecordServiceImpl.class | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/DeleteTeamMemberDTO.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiComActQuestnaireSub.java | 72
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDpcDAO.java | 70
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportComMngCarExcelDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActSignExcelVO.java | 59
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/NewFightShoppingOrder.java | 102
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java | 123
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsServiceEvaluationsServiceImpl.java | 54
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoActivityDOMapper.xml | 94
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoEditDTO.java | 116
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleBrowseWestServiceImpl.java | 38
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthDeleteDTO.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiConfigVO.java | 58
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/UserApi.java | 133
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopCartService.java | 63
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/config/SFTPConfig.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyPublicityMapper.xml | 69
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthUserAddAppDTO.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiMicroVolunteeringTypeService.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinghuiMerchantEvaluate.java | 60
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/52.gif | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/test/java/com/panzhihua/service_community/service/impl/ComEventServiceImplTest.java | 114
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java | 373
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DeleteNeighborCircleAppDTO.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseApplyServiceImpl.java | 92
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UsersSubAnswerStatVO.java | 25
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysAppConfigServiceImpl.java | 26
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/SwaggerConfig.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthUserMapper.xml | 53
springcloud_demo_on_k8s-master/deploy-file/busybox.yaml | 14
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComPropertyWorkerService.java | 51
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordVO.java | 48
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectPublicityApi.java | 114
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralUserTradeDO.java | 110
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComCvtCategoryService.java | 59
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/UnionpayContent.java | 17
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/font/iconfont.eot | 0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialWorkerService.java | 92
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java | 133
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoEventServiceImpl.java | 61
springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/java/com/panzhihua/service_bracelet/service/BraceletEarlyWarningService.java | 58
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionOutdoorLaborDynamicApi.java | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/BuildingDto.java | 14
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComPropertyWorkerApi.java | 83
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCvtCategoryDAO.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/resources/mapper/UnionReportMapper.xml | 5
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerTypeVO.java | 48
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarModelFeign.java | 96
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/StreetVO.java | 11
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java | 557
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/RealAssetsCategoryType.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/SysTemplateConfigApi.java | 99
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngTagVO.java | 41
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaDistrictServiceImpl.java | 71
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActIntegralUserTradeDOMapper.xml | 123
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/EventResourceDTO.java | 22
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UpdateUserArchivesVO.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseApplyMapper.xml | 70
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/24.gif | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComRehabilitationPopulationVO.java | 229
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/redis/CacheConfig.java | 79
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationSpecialStatisticsVO.java | 63
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventResourceApi.java | 90
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/EditEnterpriseTypeDTO.java | 41
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ComActEasyPhotoTypeMapper.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsLabelVO.java | 26
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/config/AuthConfig.java | 25
springcloud_demo_on_k8s-master/service-tp/src/main/java/com/springcloudme/servicetp/ServiceTpApplication.java | 20
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/questnaire/StatisticsSummaryDTO.java | 20
springcloud_demo_on_k8s-master/service-influxdb-app/mvnw.cmd | 161
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActRaffleRecordDao.java | 64
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiSnapshotClassifyMapper.xml | 80
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryStoreClassVo.java | 78
springcloud_demo_on_k8s-master/config-server/.gitignore | 25
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantServiceImpl.java | 193
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientViewStatisticsMapper.xml | 44
springcloud_demo_on_k8s-master/eureka-server/src/test/java/com/springcloudme/eurekaserver/EurekaServerApplicationTests.java | 17
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/OrderStatics.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationSentenceExcelVO.java | 122
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComCvtServeExcelListen.java | 77
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/McsCouponDAO.java | 74
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommoditySpecs.java | 75
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageJoinGameListDTO.java | 36
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventResourceAddDTO.java | 42
flower_city/src/main/resources/mapper/AreaCode2022Mapper.xml | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngRealCompanyService.java | 79
springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/tree.js | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiCommunityServicesVO.java | 70
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerMerchantApi.java | 354
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/RentingHoursePreOrder.java | 136
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/EscapeUtil.java | 133
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActEasyPhotoCommentDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoEvaluateFeign.java | 85
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidDangerMemberVO.java | 118
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsVerifiedRecord.java | 51
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseUserDAO.java | 83
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActMicroWishScreenVO.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActIntegralUserApi.java | 195
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActIntegralUserChangeDO.java | 194
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightProjectJoinService.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/DisablePersonDAO.java | 14
springcloud_demo_on_k8s-master/service-api/.mvn/wrapper/maven-wrapper.jar | 0
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/SafeWordStatusEnum.java | 40
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiGoldCoinRecordDao.java | 41
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioConfig.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/PageComMngVillagePopulationDTO.java | 34
springcloud_k8s_panzhihuazhihuishequ/applets/pom.xml | 146
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java | 1776
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/EldersAuthDO.java | 94
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java | 89
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsLoginUserInfoVO.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryUserAddressController.java | 116
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerCommunityConfigDao.java | 33
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborForwardAppDTO.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiComActWorkGuideDAO.java | 39
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java | 100
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/ComActEasyPhotoTypeService.java | 72
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/bracelet/BraceletEarlyWarningDO.java | 73
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectApi.java | 135
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComCvtBusinessIntroduceService.java | 30
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/NeighborCircleJobHandler.java | 41
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/CitizenInfoVO.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenDpcStatisticsInfo.java | 30
springcloud_demo_on_k8s-master/mvnw | 286
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/CommunityActivitiesVO.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiInterspaceTypeDao.java | 39
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/ComPbMemberRoleTypeEnum.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/NewFightNeedProblemInventoryMapper.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActRaffleRecordService.java | 54
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java | 1156
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComCvtBusinessAreaService.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BaseInfo.java | 32
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyPublicityApi.java | 104
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComRehabilitationPopulationService.java | 13
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthFeedbackDetailsVO.java | 44
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventDeleteDTO.java | 30
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointOrderVO.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/RealUserVO.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialOrgHatchApi.java | 74
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiInterspaceDao.java | 41
flower_city/src/main/java/com/dg/core/util/presence/Year2005.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthAddDTO.java | 61
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVolunteerSkillApi.java | 91
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitCountVO.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryStoreClassMapper.xml | 72
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPbServiceTeamDao.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireSubDAO.java | 13
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AreaVOStr.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/LargeScreenApi.java | 118
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/EditBuildingUnitDto.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightIntegratingTaskService.java | 66
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComFmsServiceDAO.java | 172
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/admin/PageBuildingListAdminVo.java | 49
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialOrgHatchAuditApi.java | 85
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/PageClusterAdminDto.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComElderAuthElderliesDO.java | 141
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationPensionExcelListen.java | 468
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/model/vos/LoginBody.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/ComActIntegralCommunityRankDTO.java | 51
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java | 92
5,037 files changed, 514,644 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e5e634c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+/springcloud_k8s_panzhihuazhihuishequ/common/LOG_HOME_IS_UNDEFINED/
+
+
+.idea
+*.iml
+*.log
\ No newline at end of file
diff --git a/flower_city/.gitignore b/flower_city/.gitignore
new file mode 100644
index 0000000..513e7e2
--- /dev/null
+++ b/flower_city/.gitignore
@@ -0,0 +1,35 @@
+.DS_Store
+
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/flower_city/.gitkeep b/flower_city/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/flower_city/.gitkeep
diff --git a/flower_city/README.md b/flower_city/README.md
new file mode 100644
index 0000000..53d57d8
--- /dev/null
+++ b/flower_city/README.md
@@ -0,0 +1,3 @@
+# 花城e+自公告系统 后端
+# 不参与花城后台 完全独立
+# 只是用户表只做查询花城数据
\ No newline at end of file
diff --git a/flower_city/pom.xml b/flower_city/pom.xml
new file mode 100644
index 0000000..5ed6e6a
--- /dev/null
+++ b/flower_city/pom.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>2.3.6.RELEASE</version>
+
+ <relativePath/> <!-- lookup parent from repository -->
+ </parent>
+ <groupId>com.dg</groupId>
+ <artifactId>flower_city_automessage</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>flower_city_automessage</name>
+ <description>flower_city_automessage-backend</description>
+ <properties>
+ <java.version>8</java.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-devtools</artifactId>
+ <scope>runtime</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>8.0.13</version>
+ </dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>3.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-generator</artifactId>
+ <version>3.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-redis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.30</version>
+ </dependency>
+
+ <!-- 阿里短信 -->
+ <dependency>
+ <groupId>com.aliyun</groupId>
+ <artifactId>aliyun-java-sdk-core</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>1.2.74</version>
+ </dependency>
+
+ <!-- okhttp -->
+ <dependency>
+ <groupId>com.squareup.okhttp</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>2.7.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>4.1.1</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>4.1.1</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>com.icexxx</groupId>
+ <artifactId>iceworkday</artifactId>
+ <version>2.0.2.0</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>cn.afterturn</groupId>
+ <artifactId>easypoi-annotation</artifactId>
+ <version>4.1.0</version>
+ </dependency>
+
+ <!-- hutool工具类 -->
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-core</artifactId>
+ <version>5.6.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.python</groupId>
+ <artifactId>jython-standalone</artifactId>
+ <version>2.7.0</version>
+ </dependency>
+
+
+ <!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger2 -->
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger2</artifactId>
+ <version>2.9.2</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger-ui -->
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger-ui</artifactId>
+ <version>2.9.2</version>
+ </dependency>
+
+
+ <!-- io常用工具类 -->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.11.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+
+
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>0.1.53</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt</artifactId>
+ <version>0.9.1</version>
+ </dependency>
+
+
+ </dependencies>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/flower_city/src/main/java/META-INF/MANIFEST.MF b/flower_city/src/main/java/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..7d4ddab
--- /dev/null
+++ b/flower_city/src/main/java/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: com.dg.core
+
diff --git a/flower_city/src/main/java/com/dg/core/AliyunConfig.java b/flower_city/src/main/java/com/dg/core/AliyunConfig.java
new file mode 100644
index 0000000..68e3a1f
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/AliyunConfig.java
@@ -0,0 +1,91 @@
+package com.dg.core;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+/**
+ * 阿里云短信配置
+ */
+@Component
+@PropertySource(value = "classpath:application-sms.properties",encoding = "UTF-8")
+public class AliyunConfig {
+
+ @Value("${aliyun.key}")
+ private String key;
+
+ @Value("${aliyun.screct}")
+
+ private String screct;
+ @Value("${aliyun.SignName}")
+ private String SignName;
+
+ @Value("${aliyun.TemplateCode}")
+ private String TemplateCode;
+
+ @Value("${aliyun.TemplateCodeOvertime}")
+ private String TemplateCodeOvertime;
+
+ @Value("${aliyun.TemplateCodeComplete}")
+ private String TemplateCodeComplete;
+
+
+ @Value("${aliyun.TemplateCodeSubmit}")
+ private String TemplateCodeSubmit;
+
+ public String getTemplateCodeSubmit() {
+ return TemplateCodeSubmit;
+ }
+
+ public void setTemplateCodeSubmit(String templateCodeSubmit) {
+ TemplateCodeSubmit = templateCodeSubmit;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public String getTemplateCodeComplete() {
+ return TemplateCodeComplete;
+ }
+
+ public void setTemplateCodeComplete(String templateCodeComplete) {
+ TemplateCodeComplete = templateCodeComplete;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getTemplateCodeOvertime() {
+ return TemplateCodeOvertime;
+ }
+
+ public void setTemplateCodeOvertime(String templateCodeOvertime) {
+ TemplateCodeOvertime = templateCodeOvertime;
+ }
+
+ public String getScrect() {
+ return screct;
+ }
+
+ public void setScrect(String screct) {
+ this.screct = screct;
+ }
+
+ public String getSignName() {
+ return SignName;
+ }
+
+ public void setSignName(String signName) {
+ SignName = signName;
+ }
+
+ public String getTemplateCode() {
+ return TemplateCode;
+ }
+
+ public void setTemplateCode(String templateCode) {
+ TemplateCode = templateCode;
+ }
+}
\ No newline at end of file
diff --git a/flower_city/src/main/java/com/dg/core/Constant.java b/flower_city/src/main/java/com/dg/core/Constant.java
new file mode 100644
index 0000000..9bd365d
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/Constant.java
@@ -0,0 +1,76 @@
+package com.dg.core;
+
+public class Constant {
+
+ /**
+ * 存储当前登录用户id的字段名
+ */
+ public static final String CURRENT_USER_ID = "CURRENT_USER_ID";
+
+ /**
+ * 存储当前登录用户id的字段名
+ */
+ public static final String CURRENT_USER_NAME = "CURRENT_USER_NAME";
+
+ /**
+ * 存储当前登录用户的角色
+ */
+ public static final String CURRENT_USER_ROLE = "CURRENT_USER_ROLE";
+
+ /**
+ * 存储当前登录用户的deptId
+ */
+ public static final String CURRENT_USER_DEPT_ID = "CURRENT_USER_DEPT_Id";
+ public static final String CURRENT_USER_ORG_ID = "CURRENT_USER_ORG_Id";
+ public static final String CURRENT_USER_PHONE = "CURRENT_USER_PHONE";
+ /**
+ * 存放OpLogContent的header字段
+ */
+ public static final String OP_LOG_CONTENT = "OP_LOG_CONTENT";
+
+ /**
+ * token有效期（小时）
+ */
+ public static final int TOKEN_EXPIRES_HOUR = 168;
+
+ /**
+ * redis存储手机验证码过期时间(10分钟)
+ */
+ public static final long AUTH_CODE_EXPIRED_SECONDS = 60 * 10;
+
+ /**
+ * 验证码长度
+ */
+ public static final int AUTH_CODE_LENGTH = 6;
+
+
+ /**
+ * 登录用户 redis key
+ */
+ public static final String LOGIN_TOKEN_KEY = "login_tokens:";
+ /**
+ * 令牌
+ */
+ public static final String TOKEN = "token";
+
+ /**
+ * 令牌前缀
+ */
+ public static final String TOKEN_PREFIX = "admin:";
+
+ /**
+ * 令牌前缀
+ */
+ public static final String LOGIN_USER_KEY = "login_user_key";
+
+ /**
+ * 存放Authorization的header字段
+ */
+ public static final String AUTHORIZATION = "Authorization";
+
+ /**
+ * 小程序 花城e+token
+ */
+ public static final String HCAUTHORIZATION = "HCAuthorization";
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/CorsConfig.java b/flower_city/src/main/java/com/dg/core/CorsConfig.java
new file mode 100644
index 0000000..6593760
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/CorsConfig.java
@@ -0,0 +1,25 @@
+package com.dg.core;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Configuration
+public class CorsConfig implements WebMvcConfigurer {
+ @Override
+ public void addCorsMappings(CorsRegistry registry) {
+ registry.addMapping("/**")
+ // 设置允许跨域请求的域名
+// .allowedOriginPatterns("*")
+ .allowedOrigins("*")
+ // 是否允许证书（cookies）
+ .allowCredentials(true)
+ // 设置允许的方法
+ .allowedMethods("*")
+ // 跨域允许时间
+ .maxAge(3600);
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/HttpStatus.java b/flower_city/src/main/java/com/dg/core/HttpStatus.java
new file mode 100644
index 0000000..223674a
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/HttpStatus.java
@@ -0,0 +1,89 @@
+package com.dg.core;
+
+/**
+ * 返回状态码
+ *
+ * @author ruoyi
+ */
+public class HttpStatus
+{
+ /**
+ * 操作成功
+ */
+ public static final int SUCCESS = 200;
+
+ /**
+ * 对象创建成功
+ */
+ public static final int CREATED = 201;
+
+ /**
+ * 请求已经被接受
+ */
+ public static final int ACCEPTED = 202;
+
+ /**
+ * 操作已经执行成功，但是没有返回数据
+ */
+ public static final int NO_CONTENT = 204;
+
+ /**
+ * 资源已被移除
+ */
+ public static final int MOVED_PERM = 301;
+
+ /**
+ * 重定向
+ */
+ public static final int SEE_OTHER = 303;
+
+ /**
+ * 资源没有被修改
+ */
+ public static final int NOT_MODIFIED = 304;
+
+ /**
+ * 参数列表错误（缺少，格式不匹配）
+ */
+ public static final int BAD_REQUEST = 400;
+
+ /**
+ * 未授权
+ */
+ public static final int UNAUTHORIZED = 401;
+
+ /**
+ * 访问受限，授权过期
+ */
+ public static final int FORBIDDEN = 403;
+
+ /**
+ * 资源，服务未找到
+ */
+ public static final int NOT_FOUND = 404;
+
+ /**
+ * 不允许的http方法
+ */
+ public static final int BAD_METHOD = 405;
+
+ /**
+ * 资源冲突，或者资源被锁
+ */
+ public static final int CONFLICT = 409;
+
+ /**
+ * 不支持的数据，媒体类型
+ */
+ public static final int UNSUPPORTED_TYPE = 415;
+
+ /**
+ * 系统内部错误
+ */
+ public static final int ERROR = 500;
+
+ /**
+ * 接口未实现
+ */
+ public static final int NOT_IMPLEMENTED = 501;
+}
diff --git a/flower_city/src/main/java/com/dg/core/MvcConfig.java b/flower_city/src/main/java/com/dg/core/MvcConfig.java
new file mode 100644
index 0000000..a7c2bcc
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/MvcConfig.java
@@ -0,0 +1,33 @@
+package com.dg.core;
+
+import com.dg.core.interceptor.AuthorizationInterceptor;
+import com.dg.core.resolvers.CurrentUserMethodArgumentResolver;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.List;
+
+/**
+ * 配置类，增加自定义拦截器和解析器
+ */
+@Configuration
+public class MvcConfig implements WebMvcConfigurer {
+
+ @Autowired
+ private AuthorizationInterceptor authorizationInterceptor;
+ @Autowired
+ private CurrentUserMethodArgumentResolver currentUserMethodArgumentResolver;
+
+ @Override
+ public void addInterceptors(InterceptorRegistry registry) {
+ registry.addInterceptor(authorizationInterceptor);
+ }
+
+ @Override
+ public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+ argumentResolvers.add(currentUserMethodArgumentResolver);
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/ResultData.java b/flower_city/src/main/java/com/dg/core/ResultData.java
new file mode 100644
index 0000000..1c35bb1
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/ResultData.java
@@ -0,0 +1,85 @@
+package com.dg.core;
+
+public class ResultData<T> {
+ //返回状态码
+ private Integer result;
+ //返回消息
+ private String message;
+ //返回数据
+ private T data;
+
+ public Integer getResult() {
+ return result;
+ }
+
+ public void setResult(Integer result) {
+ this.result = result;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public T getData() {
+ return data;
+ }
+
+ public void setData(T data) {
+ this.data = data;
+ }
+
+ //Success结果
+ public static <T> ResultData<T> success(T data) {
+ ResultData<T> resultData = new ResultData<>();
+ resultData.setResult(HttpStatus.SUCCESS);
+ resultData.setMessage("操作成功");
+ resultData.setData(data);
+ return resultData;
+ }
+
+ //Success结果
+ public static <T> ResultData<T> success(T data,String msg) {
+ ResultData<T> resultData = new ResultData<>();
+ resultData.setResult(HttpStatus.SUCCESS);
+ resultData.setMessage(msg);
+ resultData.setData(data);
+ return resultData;
+ }
+
+ //Success结果
+ public static <T> ResultData<T> success() {
+ ResultData<T> resultData = new ResultData<>();
+ resultData.setResult(HttpStatus.SUCCESS);
+ resultData.setMessage("操作成功");
+ return resultData;
+ }
+
+
+ //Fail结果
+ public static <T> ResultData<T> fail(int code, String message) {
+ ResultData<T> resultData = new ResultData<>();
+ resultData.setResult(code);
+ resultData.setMessage(message);
+ return resultData;
+ }
+
+ //Fail结果
+ public static <T> ResultData<T> error(String message) {
+ ResultData<T> resultData = new ResultData<>();
+ resultData.setResult(HttpStatus.ERROR);
+ resultData.setMessage(message);
+ return resultData;
+ }
+
+ //Fail结果
+ public static <T> ResultData<T> error() {
+ ResultData<T> resultData = new ResultData<>();
+ resultData.setResult(HttpStatus.ERROR);
+ resultData.setMessage("操作失败");
+ return resultData;
+ }
+}
\ No newline at end of file
diff --git a/flower_city/src/main/java/com/dg/core/WMApplication.java b/flower_city/src/main/java/com/dg/core/WMApplication.java
new file mode 100644
index 0000000..8cb9a82
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/WMApplication.java
@@ -0,0 +1,19 @@
+package com.dg.core;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+
+@ServletComponentScan("com.dg.core.task") //定时任务启动开关
+@SpringBootApplication
+@MapperScan("com.dg.core.db")
+public class WMApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(WMApplication.class, args);
+ System.out.println(" swagger地址= http://localhost:8181/swagger-ui.html");
+ System.out.println(" 启动完成");
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/annotation/Authorization.java b/flower_city/src/main/java/com/dg/core/annotation/Authorization.java
new file mode 100644
index 0000000..cde129b
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/annotation/Authorization.java
@@ -0,0 +1,14 @@
+package com.dg.core.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 在Controller的方法上使用此注解，该方法在映射时会检查用户是否登录，未登录返回401错误
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Authorization {
+}
diff --git a/flower_city/src/main/java/com/dg/core/annotation/CurrentUser.java b/flower_city/src/main/java/com/dg/core/annotation/CurrentUser.java
new file mode 100644
index 0000000..7935fa8
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/annotation/CurrentUser.java
@@ -0,0 +1,14 @@
+package com.dg.core.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 在Controller的方法参数中使用此注解，该方法在映射时会注入当前登录的User对象
+ */
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface CurrentUser {
+}
diff --git a/flower_city/src/main/java/com/dg/core/annotation/RoleAdmin.java b/flower_city/src/main/java/com/dg/core/annotation/RoleAdmin.java
new file mode 100644
index 0000000..33ec0be
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/annotation/RoleAdmin.java
@@ -0,0 +1,11 @@
+package com.dg.core.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RoleAdmin {
+}
diff --git a/flower_city/src/main/java/com/dg/core/api/AgreementAppletsController.java b/flower_city/src/main/java/com/dg/core/api/AgreementAppletsController.java
new file mode 100644
index 0000000..61c30f3
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/AgreementAppletsController.java
@@ -0,0 +1,36 @@
+package com.dg.core.api;
+
+
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.db.gen.entity.Agreement;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IAgreementService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Api(tags = {"相关协议小程序接口"})
+@RestController
+@RequestMapping("/applets/agreement")
+public class AgreementAppletsController {
+
+ @Resource
+ private IAgreementService agreementService;
+
+ /**
+ * 通过协议名获取相关协议
+ * @return
+ */
+ @ApiOperation(value = "通过协议名获取相关协议",response = Agreement.class)
+ @GetMapping(value = "/queryByAgreement")
+ public ResultData queryByAgreement(@RequestParam("agreement") String agreement) {
+ return ResultData.success(agreementService.queryByAgreement(agreement));
+ }
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/api/AreaCodeAppletsController.java b/flower_city/src/main/java/com/dg/core/api/AreaCodeAppletsController.java
new file mode 100644
index 0000000..fc49866
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/AreaCodeAppletsController.java
@@ -0,0 +1,33 @@
+package com.dg.core.api;
+
+import com.dg.core.controller.BaseController;
+import com.dg.core.db.gen.entity.AreaCode2022;
+import com.dg.core.service.IAreaCodeService;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Api(tags = {"所属地区小程序接口"})
+@RestController
+@RequestMapping("/applet/areaCode")
+public class AreaCodeAppletsController extends BaseController {
+
+ @Resource
+ private IAreaCodeService iAreaCodeService;
+
+ /**
+ * 根据指南id获取所属地区
+ * @return
+ */
+ @ApiOperation(value = "根据指南id获取所属地区",response = AreaCode2022.class)
+ @GetMapping("/getAreaCodeByTransactionId")
+ public TableDataInfo getAreaCodeByTransactionId(@RequestParam("transactionId") Integer transactionId){
+ return getDataTable(iAreaCodeService.getAreaCodeByTransactionId(transactionId));
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/api/AutomessageCommonProblemAppletsController.java b/flower_city/src/main/java/com/dg/core/api/AutomessageCommonProblemAppletsController.java
new file mode 100644
index 0000000..81dd5c2
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/AutomessageCommonProblemAppletsController.java
@@ -0,0 +1,52 @@
+package com.dg.core.api;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.controller.BaseController;
+import com.dg.core.db.gen.entity.AutomessageCommonProblem;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IAutomessageCommonProblemService;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Api(tags = {"常见问题小程序接口"})
+@RestController
+@RequestMapping("/applets/automessageCommonProblem")
+public class AutomessageCommonProblemAppletsController extends BaseController {
+
+ @Resource
+ private IAutomessageCommonProblemService iAutomessageCommonProblemService;
+
+
+ /**
+ * 获取常见问题列表(不分页)
+ * @return
+ */
+ @ApiOperation(value = "获取常见问题列表(不分页)",response = AutomessageCommonProblem.class)
+ @GetMapping("/selectList")
+ public ResultData selectList(){
+ return ResultData.success(iAutomessageCommonProblemService.selectList());
+ }
+
+
+ /**
+ * 获取常见问题列表（不分页查找）
+ * @return
+ */
+ @ApiOperation(value = "获取常见问题列表（不分页查找）",response = AutomessageCommonProblem.class)
+ @GetMapping("/queryList")
+ public ResultData queryList(@RequestParam(value = "title",required = false) String title){
+ return ResultData.success(iAutomessageCommonProblemService.selectConfigList(title,null));
+ }
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/api/AutomessagePolicyDocumentsAppletsController.java b/flower_city/src/main/java/com/dg/core/api/AutomessagePolicyDocumentsAppletsController.java
new file mode 100644
index 0000000..f97f9c4
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/AutomessagePolicyDocumentsAppletsController.java
@@ -0,0 +1,63 @@
+package com.dg.core.api;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.controller.BaseController;
+import com.dg.core.db.gen.entity.AutomessagePolicyDocuments;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IAutomessagePolicyDocumentsService;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Api(tags = {"获取法律法规政策文件小程序接口"})
+@RestController
+@RequestMapping("/applets/AutomessagePolicyDocumentsController")
+public class AutomessagePolicyDocumentsAppletsController extends BaseController {
+
+ @Resource
+ private IAutomessagePolicyDocumentsService iAutomessagePolicyDocumentsService;
+
+
+ /**
+ * 获取法律法规政策文件列表（不分页）
+ * @param name
+ * @param type
+ * @return
+ */
+ @ApiOperation(value = "获取法律法规政策文件列表（不分页）",response = AutomessagePolicyDocuments.class)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "type", value = "类型（1.法律法规2.政策文件）", required = true, dataType = "String", paramType = "query")
+ })
+ @GetMapping("/selectList")
+ public ResultData selectConfigList(@RequestParam(value = "name",required = false) String name,
+ @RequestParam(value = "type",required = false) String type,
+ @RequestParam(value = "departmentId",required = false) Integer departmentId){
+ List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(name,type,departmentId,null);
+ return ResultData.success(list);
+ }
+
+
+ /**
+ * 根据id获取法律法规政策文件数据
+ * @return
+ */
+ @ApiOperation(value = " 根据id获取法律法规政策文件数据 ",response = AutomessagePolicyDocuments.class)
+ @GetMapping("/selectAutomessagePolicyDocumentById")
+ public ResultData selectAutomessagePolicyDocumentById(@RequestParam(value = "id") Integer id){
+ AutomessagePolicyDocuments automessagePolicyDocuments = iAutomessagePolicyDocumentsService.selectAutomessagePolicyDocumentById(id);
+ if (automessagePolicyDocuments!=null){
+ return ResultData.success(automessagePolicyDocuments);
+ }else {
+ return ResultData.error("查找失败");
+ }
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/api/ClassifyAdministrationAppletsController.java b/flower_city/src/main/java/com/dg/core/api/ClassifyAdministrationAppletsController.java
new file mode 100644
index 0000000..2abeba9
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/ClassifyAdministrationAppletsController.java
@@ -0,0 +1,62 @@
+package com.dg.core.api;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.controller.BaseController;
+import com.dg.core.db.gen.entity.ClassifyAdministration;
+import com.dg.core.service.IClassifyAdministrationService;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * 分类管理
+ */
+@Api(tags = {"分类管理小程序接口"})
+@RestController
+@RequestMapping("/applets/classify")
+public class ClassifyAdministrationAppletsController extends BaseController
+{
+
+ @Autowired(required = true)
+ IClassifyAdministrationService iClassifyAdministrationService;
+
+
+ /**
+ * 获取管理菜单列表(无分页已分级)
+ * @return
+ */
+ @ApiOperation(value = " 获取管理菜单列表(无分页已分级))",response = ClassifyAdministration.class)
+ @GetMapping("/selectListByParentId")
+ public TableDataInfo selectListByParentId(@RequestParam(value = "parentId",required = false) String parentId,
+ @RequestParam(value = "departmentId",required = false) Integer departmentId){
+ int num=iClassifyAdministrationService.countNum("",null);
+ if (parentId==null)
+ parentId="0";
+ return getDataTable(iClassifyAdministrationService.selectConfigListByParentId(parentId, departmentId),num);
+ }
+
+
+
+
+ /**
+ * 获取分类根据id 如果是二级id则获取的是办事指南
+ * @return
+ */
+ @ApiOperation("获取分类根据id 如果是二级id则获取的是办事指南,不传参默认是0")
+ @GetMapping("/queryListById")
+ ResultData queryListById(@RequestParam(value = "id",required = false) Integer id){
+ if(id==null)
+ id=0;
+ return iClassifyAdministrationService.queryListById(id);
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/api/ElseAccessoryAppletsController.java b/flower_city/src/main/java/com/dg/core/api/ElseAccessoryAppletsController.java
new file mode 100644
index 0000000..d6541bd
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/ElseAccessoryAppletsController.java
@@ -0,0 +1,116 @@
+package com.dg.core.api;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.controller.BaseController;
+import com.dg.core.db.gen.entity.ElseAccessoryEntity;
+import com.dg.core.db.gen.entity.GuideRepairOrder;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IElseAccessoryService;
+import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.util.PermissionUtil;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = {"其他附件小程序接口"})
+@RestController
+@RequestMapping("/applets/else")
+public class ElseAccessoryAppletsController extends BaseController
+{
+
+ @Autowired
+ IElseAccessoryService iElseAccessoryService;
+
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
+
+ /**
+ * 获取附件列表
+ * @param Name
+ * @return
+ */
+ @ApiOperation(value = "获取附件列表接口(全部)",response = ElseAccessoryEntity.class)
+ @GetMapping(path = "/getAllList")
+ @Authorization
+ public TableDataInfo selectConfigListAll(@RequestParam(value = "Name",required = false) String Name,
+ @CurrentUser SysUser sysUser)
+ {
+ List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ if(ids==null || ids.size()<1)
+ {
+ return getDataTable("您没有权限查看该数据");
+ }
+ List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids,sysUser.getUserId());
+ int num=iElseAccessoryService.countNum(Name,ids);
+ return getDataTable(list,num);
+ }
+
+
+ /**
+ * 新增列表
+ * @param entity
+ * @return
+ */
+ @ApiOperation(value = "新增附件",response = ElseAccessoryEntity.class)
+ @PostMapping(path = "/add")
+ @Authorization
+ public ResultData insertConfig(@RequestBody ElseAccessoryEntity entity)
+ {
+ if(entity==null)
+ {
+ return ResultData.error("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getName()))
+ {
+ return ResultData.error("事项名称不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getUrl()))
+ {
+ return ResultData.error("文件url不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getDepartmentId()))
+ {
+ return ResultData.error("部门不能为空");
+ }
+
+ return toAjax(iElseAccessoryService.insertConfig(entity));
+ }
+
+ /**
+ * 更新附件
+ * @param entity
+ * @return
+ */
+ @ApiOperation(value = "更新附件",response = ElseAccessoryEntity.class)
+ @PostMapping(path = "/update")
+ @Authorization
+ public ResultData updateConfig(@RequestBody ElseAccessoryEntity entity)
+ {
+ return toAjax(iElseAccessoryService.updateConfig(entity));
+ }
+
+ /**
+ * 删除
+ * @param Id
+ * @return
+ */
+ @ApiOperation(value = "删除附件",response = ElseAccessoryEntity.class)
+ @DeleteMapping(path = "/delete")
+ @Authorization
+ public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
+ {
+ return toAjax(iElseAccessoryService.deleteConfigById(Id));
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/api/GuideDoAppletsController.java b/flower_city/src/main/java/com/dg/core/api/GuideDoAppletsController.java
new file mode 100644
index 0000000..958b338
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/GuideDoAppletsController.java
@@ -0,0 +1,56 @@
+package com.dg.core.api;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.controller.BaseController;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.ISysUserService;
+import com.dg.core.util.Snowflake;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+
+@Api(tags = {"导办用户小程序接口"})
+@RestController
+@RequestMapping("/applets/guidedo")
+public class GuideDoAppletsController extends BaseController
+{
+
+ @Autowired
+ ISysUserService IUserService;
+
+
+
+ /**
+ * 根据部门id及分类id获取导办用户
+ *
+ * @return 结果
+ */
+ @ApiOperation(value = "根据部门id及分类id获取导办用户",response = SysUser.class)
+ @GetMapping("/selectListByDepartmentId")
+ @Authorization
+ public ResultData selectListByDepartmentId(@RequestParam("departmentId") String departmentId,
+ @RequestParam(value = "classifyId",required = false) String classifyId){
+ return ResultData.success(IUserService.selectListByDepartmentId(departmentId,classifyId));
+ }
+
+ /**
+ * 查询导办用户列表（不分页）
+ * @return 结果
+ */
+ @ApiOperation(value = " 查询导办用户列表（不分页）",response = SysUser.class)
+ @GetMapping("/queryList")
+ public ResultData queryList(@RequestParam(value = "keyWord",required = false) String keyWord){
+ return ResultData.success(IUserService.queryList(2,keyWord));
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
new file mode 100644
index 0000000..33eb40a
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
@@ -0,0 +1,367 @@
+package com.dg.core.api;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.controller.BaseController;
+import com.dg.core.db.gen.entity.GuideEvolveEntity;
+import com.dg.core.db.gen.entity.GuideRepairOrder;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.db.manual.mapper.util.ConstantPropertiesUtil;
+import com.dg.core.service.IGuideEvolveService;
+import com.dg.core.service.IGuideRepairOrderService;
+import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.util.PermissionUtil;
+import com.dg.core.util.SmsUtil;
+import com.dg.core.util.TableDataInfo;
+import com.dg.core.util.WxUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 工单管理
+ */
+@Api(tags = {"工单管理小程序接口"})
+@RestController
+@RequestMapping("/applets/guideRepairOrder")
+public class GuideRepairOrderAppletsController extends BaseController {
+
+ @Resource
+ private IGuideRepairOrderService iGuideRepairOrderService;
+
+ @Autowired
+ private IGuideEvolveService iGuideEvolveService;
+
+ @Resource
+ IOrganizationChartService iOrganizationChartService;
+
+ @Resource(name = "stringRedisTemplate")
+ private StringRedisTemplate stringRedisTemplate;
+
+ private static String guideRepairOrderCompleteTemplateId = "7ZCHHii87rWPwVkdhZnvNiYbYi_Buq0NXO10cmUhAFk";
+
+ @Resource
+ SmsUtil smsUtil;
+
+ /**
+ * 提交导办订单
+ * @return
+ */
+ @ApiOperation(value = "提交导办订单",response = GuideRepairOrder.class)
+ @PostMapping("/addOrder")
+ @Authorization
+ public ResultData addOrder(@RequestBody GuideRepairOrder guideRepairOrder,@CurrentUser SysUser sysUser) {
+ guideRepairOrder.setSubmitUserId(sysUser.getUserId().toString());
+ guideRepairOrder.setSubmitUserPhone(sysUser.getPhonenumber());
+ guideRepairOrder.setSubmitType(1);
+ int i = iGuideRepairOrderService.addOrder(guideRepairOrder);
+ if (i>0){
+ iGuideEvolveService.updateGuid();
+ return ResultData.success();
+ }
+ else
+ return ResultData.error("提交失败,请检查你是否有相同的咨询内容在处理中");
+ }
+
+
+ /**
+ * 获取详情
+ * @param Id
+ * @param orderNum
+ * @return
+ */
+ @ApiOperation(value = "获取订单详情",response = GuideRepairOrder.class)
+ @GetMapping("/orderdata")
+ @Authorization
+ public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id,
+ @RequestParam(value = "orderNum",required = false) String orderNum,
+ @CurrentUser SysUser sysUser)
+ {
+ if(StringUtils.isEmpty(Id) && StringUtils.isEmpty(orderNum))
+ {
+ return ResultData.error("id或者订单号不能都为空");
+ }
+
+ GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(Id,orderNum);
+ order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id,sysUser));
+
+ return ResultData.success(order);
+ }
+
+
+
+
+
+ /**
+ * 转派人员
+ * @param order
+ * @return
+ */
+ @ApiOperation(value = "转派人员",response = GuideRepairOrder.class)
+ @PostMapping("/redeploy")
+ @Authorization
+ public ResultData redeploy(@RequestBody GuideRepairOrder order, @CurrentUser SysUser sysUser)
+ {
+ if(order==null)
+ {
+ return ResultData.error("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(order.getGuideDepartmentId()))
+ {
+ return ResultData.error("导办部门id不能为空");
+ }
+
+ if(StringUtils.isEmpty(order.getGuideUserId()))
+ {
+ return ResultData.error("导办人员id不能为空");
+ }
+
+
+ //已分配
+ order.setState("2");
+
+ //新增转派记录
+ GuideEvolveEntity entity=new GuideEvolveEntity();
+ entity.setCreateTime(LocalDateTime.now());
+ entity.setUpdateTime(LocalDateTime.now());
+ entity.setState("10");
+ entity.setDepartmentalId(order.getGuideDepartmentId());
+ entity.setToUserId(order.getGuideUserId());
+ entity.setFromUserId(sysUser.getUserId()+"");
+ entity.setFromDepartmentalId(sysUser.getDepartmentId());
+ entity.setGuideId(order.getId().toString());
+ iGuideEvolveService.insertConfig(entity);
+ iGuideRepairOrderService.updateSysUserOrderNum(entity);
+ return toAjax(iGuideRepairOrderService.updateConfig(order));
+ }
+
+
+
+ /**
+ * 去处理
+ * @param entity
+ * @return
+ */
+ @ApiOperation(value = "去处理",response = GuideRepairOrder.class)
+ @PostMapping("/dispose")
+ @Authorization
+ public ResultData dispose(@RequestBody GuideEvolveEntity entity, @CurrentUser SysUser sysUser)
+ {
+ if(entity==null)
+ {
+ return ResultData.error("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getGuideId()))
+ {
+ return ResultData.error("工单id不能为空");
+ }
+
+ GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(entity.getGuideId(),"");
+ if(order==null)
+ {
+ return ResultData.error("该工单不存在!");
+ }
+
+ if(StringUtils.equals(order.getState(),"3"))
+ {
+ return ResultData.error("该工单已办结!");
+ }
+ if(StringUtils.equals(entity.getState(),"2")){//如果用户选择未解决则状态改为待办
+ order.setState("2");
+ entity.setState("9");
+ }
+ else if(StringUtils.equals(entity.getState(),"4")){
+ if (order.getSubmitType().equals(1))//小程序提交
+ {
+ WxUtil wxUtil=new WxUtil();
+ String accessToken="0";
+ try {
+ accessToken= stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ SysUser submitUser = iGuideRepairOrderService.getSubmitUser(order);
+ wxUtil.sendGuideRepairOrderComplete(submitUser.getOpenid(),accessToken,guideRepairOrderCompleteTemplateId,entity);
+ }
+ else if (order.getSubmitType().equals(2)){
+ smsUtil.sendSmsCompleteNew(order.getConsultUserPhone(),order.getMatterName());
+ }
+ //待评价
+ order.setState("4");
+ entity.setState("7");
+ }
+ //新增已办结记录
+ entity.setCreateTime(LocalDateTime.now());
+ entity.setUpdateTime(LocalDateTime.now());
+ entity.setFromDepartmentalId(sysUser.getDepartmentId());
+ entity.setFromUserId(sysUser.getUserId()+"");
+ entity.setGuideId(order.getId().toString());
+ iGuideEvolveService.insertConfig(entity);
+ iGuideRepairOrderService.updateSysUserOrderNum(entity);
+ return toAjax(iGuideRepairOrderService.updateConfig(order));
+ }
+
+
+ /**
+ * 取消导办工单
+ * @param entity
+ * @return
+ */
+ @ApiOperation(value = "取消导办工单",response = GuideRepairOrder.class)
+ @PostMapping("/cancel")
+ @Authorization
+ public ResultData cancel(@RequestBody GuideEvolveEntity entity, @CurrentUser SysUser sysUser)
+ {
+ if(entity==null)
+ {
+ return ResultData.error("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getGuideId()))
+ {
+ return ResultData.error("工单id不能为空");
+ }
+
+ GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(entity.getGuideId(),"");
+ if(order==null)
+ {
+ return ResultData.error("该工单不存在!");
+ }
+
+ if(!StringUtils.equals(order.getState(),"1"))
+ {
+ return ResultData.error("该工单不能取消！");
+ }
+ //取消状态
+ order.setState("5");
+
+ //新增已取消记录
+ entity.setCreateTime(LocalDateTime.now());
+ entity.setUpdateTime(LocalDateTime.now());
+ entity.setState("5");
+ entity.setFromDepartmentalId(sysUser.getDepartmentId());
+ entity.setFromUserId(sysUser.getUserId()+"");
+ entity.setGuideId(order.getId().toString());
+ iGuideEvolveService.insertConfig(entity);
+ return toAjax(iGuideRepairOrderService.updateConfig(order));
+ }
+
+
+
+ /**
+ * 工单评价
+ * @param entity
+ * @return
+ */
+ @ApiOperation(value = "工单评价",response = GuideRepairOrder.class)
+ @PostMapping("/evaluate")
+ @Authorization
+ public ResultData evaluate(@RequestBody GuideRepairOrder entity, @CurrentUser SysUser sysUser)
+ {
+ if(entity==null)
+ {
+ return ResultData.error("参数不能为空");
+ }
+
+ if(entity.getId()<=0)
+ {
+ return ResultData.error("工单id不能为空");
+ }
+ if(StringUtils.isEmpty(entity.getEvaluateState()))
+ {
+ return ResultData.error("满意程度不能为空！");
+ }
+
+ //已办结
+ entity.setState("3");
+ //新增已办结记录
+ GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity();
+ guideEvolveEntity.setCreateTime(LocalDateTime.now());
+ guideEvolveEntity.setUpdateTime(LocalDateTime.now());
+ guideEvolveEntity.setState("13");
+ guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
+ guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
+ guideEvolveEntity.setGuideId(entity.getId().toString());
+ int i = iGuideRepairOrderService.updateConfig(entity);
+ if (i>0)
+ return toAjax( iGuideEvolveService.insertConfig(guideEvolveEntity));
+ else
+ return ResultData.error();
+ }
+
+ /**
+ * 获取个人中心工单数据
+ * @param sysUser 当前登录人员信息
+ * @return
+ */
+ @ApiOperation(value = "获取个人中心工单数据",response = GuideRepairOrder.class)
+ @GetMapping("/personalCenter")
+ @Authorization
+ public ResultData selectBySubmitId(@CurrentUser SysUser sysUser){
+ return ResultData.success(iGuideRepairOrderService.selectBySubmitId(sysUser.getUserId().toString()));
+ }
+
+
+ /**
+ * 小程序获取导办工单管理列表
+ * @return
+ */
+ @ApiOperation(value = "小程序获取导办工单管理列表",response = GuideRepairOrder.class)
+ @GetMapping("/getList")
+ @Authorization
+ public TableDataInfo selectConfigList(@RequestParam(value = "state",required = false) String status,
+ @CurrentUser SysUser sysUser)
+ {
+ List<String> ids=null;
+ String userId=null;
+ if( StringUtils.equals("2",sysUser.getRoleIds()))
+ {
+ if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ {
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ }
+ else
+ {
+ userId=sysUser.getUserId()+"";
+ ids=new ArrayList<>();
+ ids.add(sysUser.getDepartmentId());
+ }
+ }
+ else
+ {
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ }
+ List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(null,ids,status,userId,null,null,null);
+ int num=iGuideRepairOrderService.countConfigList(null,ids,status,userId);
+ return getDataTable(list,num);
+ }
+
+
+ /**
+ * 删除评论
+ * @return
+ */
+ @ApiOperation(value = "删除评论",response = GuideRepairOrder.class)
+ @GetMapping("/deleteComment")
+ @Authorization
+ public ResultData deleteComment(@RequestParam(value = "id",required = false) Integer id,@CurrentUser SysUser sysUser){
+ return iGuideRepairOrderService.deleteComment(id,sysUser);
+ }
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java b/flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java
new file mode 100644
index 0000000..0b1388c
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java
@@ -0,0 +1,54 @@
+package com.dg.core.api;
+
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.controller.BaseController;
+import com.dg.core.db.gen.entity.OrganizationChartEntity;
+import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+@Api(tags = {"组织架构小程序接口"})
+@RestController
+@RequestMapping("/applets/organization")
+public class OrganizationAppletsController extends BaseController
+{
+
+ @Autowired(required = true)
+ IOrganizationChartService iOrganizationChartService;
+
+ /**
+ * 查询机构列表
+ */
+ @ApiOperation("查询机构列表")
+ @GetMapping("/getList")
+ public TableDataInfo selectConfigList()
+ {
+ return getDataTable(iOrganizationChartService.selectConfigList("","" ,null));
+ }
+
+
+
+ /**
+ * 查询机构列表(不分级不分页按等级排序)
+ */
+ @ApiOperation(value = "查询机构列表(不分级不分页按等级排序)",response = OrganizationChartEntity.class)
+ @GetMapping("/selectList")
+ public TableDataInfo selectList(){
+ return getDataTable(iOrganizationChartService.selectList());
+ }
+
+ /**
+ * 根据id查组织机构
+ */
+ @ApiOperation(value = "根据id查取消组织机构",response = OrganizationChartEntity.class)
+ @GetMapping("/selectById")
+ ResultData selectConfigById(@RequestParam("id") String id){
+ return ResultData.success(iOrganizationChartService.selectConfigById(id));
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java b/flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java
new file mode 100644
index 0000000..3eb24a8
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java
@@ -0,0 +1,164 @@
+package com.dg.core.api;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.controller.BaseController;
+import com.dg.core.db.gen.entity.ReplyTemplateEntity;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.service.IReplyTemplateService;
+import com.dg.core.util.PermissionUtil;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = {"回复模板小程序接口"})
+@RestController
+@RequestMapping("/applets/reply")
+public class ReplyTemplateAppletsController extends BaseController
+{
+
+ @Autowired
+ IReplyTemplateService iReplyTemplateService;
+
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
+
+
+ /**
+ * 获取模板列表
+ * @return
+ */
+ @ApiOperation(value = "获取模板列表",response = ReplyTemplateEntity.class)
+ @GetMapping("/getlist")
+ @Authorization
+ public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "Name",required = false) String Name,
+ @CurrentUser SysUser sysUser)
+ {
+ Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
+ List<String> ids= PermissionUtil.getStairDepartment(sysUser,iOrganizationChartService);
+ if(ids==null || ids.size()<1)
+ {
+ return getDataTable("您没有权限查看该数据");
+ }
+ List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);
+ int num=iReplyTemplateService.countNum(Name,ids);
+ return getDataTable(list,num);
+ }
+
+ /**
+ * 获取详情
+ * @param Id
+ * @return
+ */
+ @ApiOperation(value = "获取详情",response = ReplyTemplateEntity.class)
+ @GetMapping("/getdata")
+ @Authorization
+ public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id)
+ {
+ if(StringUtils.isEmpty(Id))
+ {
+ return ResultData.error("Id不能为空");
+ }
+ return ResultData.success(iReplyTemplateService.selectConfigData(Id));
+ }
+
+ /**
+ * 新增模板
+ * @param entity
+ * @return
+ */
+ @ApiOperation(value = "新增模板",response = ReplyTemplateEntity.class)
+ @PostMapping("/add")
+ @Authorization
+ public ResultData insertConfig(@RequestBody ReplyTemplateEntity entity,@CurrentUser SysUser sysUser)
+ {
+ if(entity==null)
+ {
+ return ResultData.error("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getName()))
+ {
+ return ResultData.error("模板名称不能为空");
+ }
+
+ entity.setId(null);
+ entity.setDepartmentId(sysUser.getDepartmentId());
+ entity.setCreateUserId(sysUser.getUserId()+"");
+
+ return toAjax(iReplyTemplateService.insertConfig(entity));
+ }
+
+ /**
+ * 更新模板
+ * @param entity
+ * @return
+ */
+ @ApiOperation(value = "更新模板",response = ReplyTemplateEntity.class)
+ @PostMapping("/update")
+ @Authorization
+ public ResultData updateConfig(@RequestBody ReplyTemplateEntity entity)
+ {
+ if(entity==null)
+ {
+ return ResultData.error("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getName()))
+ {
+ return ResultData.error("模板名称不能为空");
+ }
+ return toAjax(iReplyTemplateService.updateConfig(entity));
+ }
+
+ /**
+ * 删除模板
+ * @param Id
+ * @return
+ */
+ @ApiOperation(value = "删除模板",response = ReplyTemplateEntity.class)
+ @DeleteMapping("/delete")
+ @Authorization
+ public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
+ {
+ return toAjax(iReplyTemplateService.deleteConfigById(Id));
+ }
+
+
+ /**
+ * 复制模板
+ * @param Id
+ * @return
+ */
+ @ApiOperation(value = "复制模板",response = ReplyTemplateEntity.class)
+ @PostMapping("/copy")
+ @Authorization
+ public ResultData copy(@RequestParam(value = "Id",required = false) String Id)
+ {
+ if(StringUtils.isEmpty(Id))
+ {
+ return ResultData.error("Id不能为空");
+ }
+
+ ReplyTemplateEntity entity=iReplyTemplateService.selectConfigData(Id);
+
+ if(entity==null)
+ {
+ return ResultData.error("模板不存在！");
+ }
+ entity.setId(null);
+ return toAjax(iReplyTemplateService.insertConfig(entity));
+ }
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/api/SlideshowAppletsController.java b/flower_city/src/main/java/com/dg/core/api/SlideshowAppletsController.java
new file mode 100644
index 0000000..52f38d2
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/SlideshowAppletsController.java
@@ -0,0 +1,45 @@
+package com.dg.core.api;
+
+import com.dg.core.ResultData;
+import com.dg.core.controller.BaseController;
+import com.dg.core.db.gen.entity.Slideshow;
+import com.dg.core.service.ISlideshowService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = {"轮播图小程序接口"})
+@RestController
+@RequestMapping("/applets/slideshow")
+public class SlideshowAppletsController extends BaseController {
+
+ @Autowired(required = true)
+ ISlideshowService iSlideshowService;
+
+ /**
+ * 查询轮播图列表(不分页)
+ * @return
+ */
+ @ApiOperation(value = "查询轮播图列表(不分页)",response = Slideshow.class)
+ @GetMapping("/selectList")
+ public ResultData selectList(){
+ return ResultData.success(iSlideshowService.selectList());
+
+ }
+
+ /**
+ * 根据id 查询轮播图数据
+ *
+ * @return 参数配置信息
+ */
+ @ApiOperation(value = "根据id 查询轮播图数据",response = Slideshow.class)
+ @GetMapping("/selectById")
+ public ResultData queryById(Integer id){
+ return ResultData.success(iSlideshowService.queryById(id));
+ }
+
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java b/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java
new file mode 100644
index 0000000..e8da662
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java
@@ -0,0 +1,128 @@
+package com.dg.core.api;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.controller.BaseController;
+import com.dg.core.db.gen.entity.AutomessageSmartConsulting;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.db.gen.entity.TransactionEvent;
+import com.dg.core.db.manual.pojo.QueryResults;
+import com.dg.core.db.manual.pojo.RecommendResult;
+import com.dg.core.db.manual.pojo.Search;
+import com.dg.core.service.IAutomessageSmartConsultingService;
+import com.dg.core.service.ITransactionEventService;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Api(tags = {"导办事项管理(及办事指南)小程序接口"})
+@RestController
+@RequestMapping("/applets/transaction")
+public class TransactionEventAppletsController extends BaseController {
+
+ @Autowired(required = true)
+ ITransactionEventService iTransactionEventService;
+
+ @Autowired(required = true)
+ IAutomessageSmartConsultingService iAutomessageSmartConsultingService;
+
+ /**
+ * 查询导办事务详情
+ *
+ * @param Id
+ * @return
+ */
+ @ApiOperation("查询导办事务详情")
+ @GetMapping("/getData")
+ public ResultData selectConfigData(@RequestParam("Id") String Id, @CurrentUser SysUser sysUser) {
+ Assert.notNull(Id, "Id 不能为空");
+ return ResultData.success(iTransactionEventService.selectConfigData(Id, sysUser));
+ }
+
+
+ /**
+ * 导办事物列表(不分页)
+ *
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "导办事物列表(不分页)", response = TransactionEvent.class)
+ @GetMapping("/selectList")
+ public TableDataInfo selectList(@RequestParam(value = "keyWord", required = false) String keyWord) {
+ return getDataTable(iTransactionEventService.selectList(keyWord));
+ }
+
+
+ /**
+ * 导办事务搜索(无分页用于小程序)
+ *
+ * @param keyWord
+ * @return
+ */
+ @ApiOperation(value = "导办事务搜索(无分页用于小程序)", response = QueryResults.class)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "isSmartConsulting", value = "是否是智能咨询（1.是 2.否）", required = true, dataType = "String", paramType = "query")
+ })
+ @GetMapping("/queryKeyWord")
+ public QueryResults queryKeyWord(@RequestParam(value = "keyWord", required = false) String keyWord, @RequestParam(value = "isSmartConsulting", required = false) String isSmartConsulting, @CurrentUser SysUser sysUser) {
+ QueryResults queryResults = iTransactionEventService.queryMatterNameList(keyWord);
+ if (isSmartConsulting != null && isSmartConsulting.equals("1")) {
+ AutomessageSmartConsulting automessageSmartConsulting = new AutomessageSmartConsulting();
+ if (sysUser != null) {
+ automessageSmartConsulting.setCreateUserId(sysUser.getUserId());
+ }
+ automessageSmartConsulting.setType(1);
+ automessageSmartConsulting.setCreateTime(LocalDateTime.now());
+ iAutomessageSmartConsultingService.add(automessageSmartConsulting);
+ }
+ return queryResults;
+ }
+
+
+ /**
+ * 根据分类查询导办事务
+ *
+ * @param classifyId
+ * @return
+ */
+ @ApiOperation(value = "根据分类查询导办事务", response = TransactionEvent.class)
+ @GetMapping("/queryByClassifyIdList")
+ public TableDataInfo queryByClassifyIdList(@RequestParam("classifyId") String classifyId, @RequestParam(required = false, name = "departmentId") Integer departmentId) {
+ return getDataTable(iTransactionEventService.queryByClassifyIdList(classifyId, departmentId), iTransactionEventService.countNumByClassifyIdList(classifyId, departmentId));
+ }
+
+
+ /**
+ * 查询导办事务求和
+ *
+ * @return
+ */
+ @ApiOperation(value = "查询导办事务求和", response = TransactionEvent.class)
+ @GetMapping("/sumTransactionNum")
+ public ResultData sumTransactionNum() {
+ return ResultData.success(iTransactionEventService.sumTransactionNum());
+ }
+
+ /**
+ * 智能咨询
+ *
+ * @return
+ */
+ @ApiOperation(value = "智能咨询", response = RecommendResult.class)
+ @GetMapping("/smartConsulting")
+ public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord) {
+ return iTransactionEventService.smartConsulting(keyWord);
+
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/AgreementController.java b/flower_city/src/main/java/com/dg/core/controller/AgreementController.java
new file mode 100644
index 0000000..9999a16
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/AgreementController.java
@@ -0,0 +1,62 @@
+package com.dg.core.controller;
+
+
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.db.gen.entity.Agreement;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IAgreementService;
+import com.dg.core.service.IAreaCodeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Api(tags = {"相关协议接口"})
+@RestController
+@RequestMapping("/agreement")
+public class AgreementController {
+
+ @Resource
+ private IAgreementService agreementService;
+
+ /**
+ * 通过协议名获取相关协议
+ * @return
+ */
+ @ApiOperation(value = "通过协议名获取相关协议",response = Agreement.class)
+ @GetMapping(value = "/queryByAgreement")
+ public ResultData queryByAgreement(@RequestParam("agreement") String agreement) {
+ return ResultData.success(agreementService.queryByAgreement(agreement));
+ }
+
+ /**
+ * 获取相关附件列表（不分页）
+ * @return
+ */
+ @ApiOperation(value = "获取相关附件列表（不分页）",response = Agreement.class)
+ @GetMapping(value = "/getList")
+ @Authorization
+ public ResultData selectConfigList(){
+ return ResultData.success(agreementService.selectConfigList());
+ }
+
+ /**
+ * 修改相关附件
+ * @return
+ */
+ @ApiOperation(value = "修改相关附件",response = Agreement.class)
+ @PostMapping(value = "/update")
+ @Authorization
+ public ResultData update(@RequestBody Agreement agreement,@CurrentUser SysUser sysUse)
+ {
+ agreement.setUpdateTime(LocalDateTime.now());
+ agreement.setUpdateUserId(sysUse.getUserId().toString());
+ return agreementService.update(agreement);
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/AreaCodeController.java b/flower_city/src/main/java/com/dg/core/controller/AreaCodeController.java
new file mode 100644
index 0000000..6c522bc
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/AreaCodeController.java
@@ -0,0 +1,42 @@
+package com.dg.core.controller;
+
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.AreaCode2022;
+import com.dg.core.db.gen.entity.OrganizationChartEntity;
+import com.dg.core.service.IAreaCodeService;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Api(tags = {"所属地区接口"})
+@RestController
+@RequestMapping("/areaCode")
+public class AreaCodeController extends BaseController{
+
+ @Resource
+ private IAreaCodeService iAreaCodeService;
+
+ /**
+ * 根据指南id获取所属地区
+ * @return
+ */
+ @ApiOperation(value = "根据指南id获取所属地区",response = AreaCode2022.class)
+ @GetMapping("/getAreaCodeByTransactionId")
+ public TableDataInfo getAreaCodeByTransactionId(@RequestParam("transactionId") Integer transactionId){
+ return getDataTable(iAreaCodeService.getAreaCodeByTransactionId(transactionId));
+ }
+
+ /**
+ * 获取攀枝花所有所属地区
+ * @return
+ */
+ @ApiOperation(value = "获取攀枝花所有所属地区",response = AreaCode2022.class)
+ @GetMapping("/getListByPCode")
+ public TableDataInfo getListByPCode(){
+ return getDataTable(iAreaCodeService.getListByPCode("510400000000"));
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java b/flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java
new file mode 100644
index 0000000..fbc1609
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java
@@ -0,0 +1,107 @@
+package com.dg.core.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.db.gen.entity.AreaCode2022;
+import com.dg.core.db.gen.entity.AutomessageCommonProblem;
+import com.dg.core.db.gen.entity.ElseAccessoryEntity;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IAutomessageCommonProblemService;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Api(tags = {"常见问题接口"})
+@RestController
+@RequestMapping("/automessageCommonProblem")
+public class AutomessageCommonProblemController extends BaseController{
+
+ @Resource
+ private IAutomessageCommonProblemService iAutomessageCommonProblemService;
+
+
+
+ /**
+ * 获取常见问题列表（分页）
+ * @param title
+ * @param content
+ * @return
+ */
+ @ApiOperation(value = "获取常见问题列表（分页）",response = AutomessageCommonProblem.class)
+ @GetMapping("/selectConfigList")
+ @Authorization
+ public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "title",required = false) String title,
+ @RequestParam(value = "content",required = false) String content){
+ Page<AutomessageCommonProblem> pageParam = new Page<>(pageNum,pageSize);
+ List<AutomessageCommonProblem> list = iAutomessageCommonProblemService.selectConfigList(pageParam,pageSize,title,content);
+ int num=iAutomessageCommonProblemService.countAutomessageCommonProblem(title,content);
+ return getDataTable(list,num);
+ }
+
+ /**
+ * 添加常见问题数据
+ * @return
+ */
+ @ApiOperation(value = "添加常见问题数据）",response = AutomessageCommonProblem.class)
+ @PostMapping("/add")
+ @Authorization
+ ResultData add(@RequestBody AutomessageCommonProblem automessageCommonProblem,@CurrentUser SysUser sysUser){
+ automessageCommonProblem.setCreateUserId(sysUser.getUserId().toString());
+ automessageCommonProblem.setUpdateUserId(sysUser.getUserId().toString());
+ return iAutomessageCommonProblemService.add(automessageCommonProblem);
+ }
+
+ /**
+ * 修改常见问题数据
+ * @return
+ */
+ @ApiOperation(value = "修改常见问题数据）",response = AutomessageCommonProblem.class)
+ @PostMapping("/update")
+ @Authorization
+ ResultData update(@RequestBody AutomessageCommonProblem automessageCommonProblem,@CurrentUser SysUser sysUser){
+ automessageCommonProblem.setUpdateUserId(sysUser.getUserId().toString());
+ return iAutomessageCommonProblemService.update(automessageCommonProblem);
+ }
+
+ /**
+ * 删除常见问题数据
+ * @return
+ */
+ @ApiOperation(value = "删除常见问题数据）",response = AutomessageCommonProblem.class)
+ @GetMapping("/delete")
+ @Authorization
+ ResultData delete( @RequestParam(value = "id") Integer id){
+ return iAutomessageCommonProblemService.delete(id);
+ }
+
+
+
+ /**
+ * 获取常见问题列表（分页）
+ * @param title
+ * @param content
+ * @return
+ */
+ @ApiOperation(value = "获取常见问题列表（分页）(不加token)",response = AutomessageCommonProblem.class)
+ @GetMapping("/selectConfigListNoToken")
+ public TableDataInfo selectConfigListNoToken(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "title",required = false) String title,
+ @RequestParam(value = "content",required = false) String content){
+ Page<AutomessageCommonProblem> pageParam = new Page<>(pageNum,pageSize);
+ List<AutomessageCommonProblem> list = iAutomessageCommonProblemService.selectConfigList(pageParam,pageSize,title,content);
+ int num=iAutomessageCommonProblemService.countAutomessageCommonProblem(title,content);
+ return getDataTable(list,num);
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/AutomessagePolicyDocumentsController.java b/flower_city/src/main/java/com/dg/core/controller/AutomessagePolicyDocumentsController.java
new file mode 100644
index 0000000..ffb6bd2
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/AutomessagePolicyDocumentsController.java
@@ -0,0 +1,152 @@
+package com.dg.core.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.db.gen.entity.AutomessagePolicyDocuments;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IAutomessagePolicyDocumentsService;
+import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Api(tags = {"获取法律法规政策文件接口"})
+@RestController
+@RequestMapping("/AutomessagePolicyDocumentsController")
+public class AutomessagePolicyDocumentsController extends BaseController {
+
+ @Resource
+ private IAutomessagePolicyDocumentsService iAutomessagePolicyDocumentsService;
+
+ @Resource
+ private IOrganizationChartService iOrganizationChartService;
+
+ /**
+ * 获取法律法规政策文件列表（分页）
+ * @param name
+ * @param type
+ * @return
+ */
+ @ApiOperation(value = "获取法律法规政策文件列表（分页）",response = AutomessagePolicyDocuments.class)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "type", value = "类型（1.法律法规2.政策文件）", required = true, dataType = "String", paramType = "query"),
+ @ApiImplicitParam(name = "isPortal", value = "是否门户网（1.是 2.否） 不传则是门户网", required = true, dataType = "String", paramType = "query")
+
+ })
+ @GetMapping("/selectConfigList")
+ public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "name",required = false) String name,
+ @RequestParam(value = "type",required = false) String type,
+ @RequestParam(value = "departmentId",required = false) Integer departmentId,
+ @RequestParam(value = "isPortal",required = false) String isPortal,
+ @CurrentUser SysUser sysUser){
+ Page<AutomessagePolicyDocuments> pageParam = new Page<>(pageNum,pageSize);
+ List<String> ids=null;
+ if ( (isPortal != null && isPortal.equals("2"))&&sysUser!=null&&(sysUser.getUserType().equals("2")||sysUser.getIsDivisionHead().equals("1"))){
+ if (sysUser.getDepartmentId()!=null)
+ ids=iOrganizationChartService.getDepartmentId(sysUser.getDepartmentId());
+ }
+ List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(pageParam,pageSize,name,type,sysUser,departmentId,ids);
+ return getDataTable(list,iAutomessagePolicyDocumentsService.selectCountList(name,type,departmentId,ids));
+ }
+
+ /**
+ * 获取法律法规政策文件列表（不分页）
+ * @param name
+ * @param type
+ * @return
+ */
+ @ApiOperation(value = "获取法律法规政策文件列表（不分页）",response = AutomessagePolicyDocuments.class)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "type", value = "类型（1.法律法规2.政策文件）", required = true, dataType = "String", paramType = "query")
+ })
+ @GetMapping("/selectList")
+ public ResultData selectConfigList(@RequestParam(value = "name",required = false) String name,
+ @RequestParam(value = "type",required = false) String type,
+ @RequestParam(value = "departmentId",required = false) Integer departmentId){
+ List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(name,type,departmentId,null);
+ return ResultData.success(list);
+ }
+
+
+ /**
+ * 新增法律法规政策文件
+ * @return
+ */
+ @ApiOperation(value = " 新增法律法规政策文件 ",response = AutomessagePolicyDocuments.class)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "type", value = "类型（1.法律法规2.政策文件）传参中的type 传入1则是新增的法律规范2则是政策文件", required = true, dataType = "String", paramType = "query")
+ })
+ @PostMapping("/add")
+ @Authorization
+ public ResultData add(@RequestBody AutomessagePolicyDocuments automessagePolicyDocuments,@CurrentUser SysUser sysUser){
+ automessagePolicyDocuments.setCreateUserId(sysUser.getUserId());
+ automessagePolicyDocuments.setUpdateUserId(sysUser.getUserId());
+ int add = iAutomessagePolicyDocumentsService.add(automessagePolicyDocuments);
+ if (add>0){
+ return ResultData.success("新增成功");
+ }else {
+ return ResultData.error("新增失败");
+ }
+ }
+
+
+ /**
+ * 修改法律法规政策文件
+ * @return
+ */
+ @ApiOperation(value = " 新增法律法规政策文件 ",response = AutomessagePolicyDocuments.class)
+ @PostMapping("/update")
+ @Authorization
+ public ResultData update(@RequestBody AutomessagePolicyDocuments automessagePolicyDocuments,@CurrentUser SysUser sysUser){
+ automessagePolicyDocuments.setUpdateUserId(sysUser.getUserId());
+ int update = iAutomessagePolicyDocumentsService.update(automessagePolicyDocuments);
+ if (update>0){
+ return ResultData.success("修改成功");
+ }else {
+ return ResultData.error("修改失败");
+ }
+ }
+
+ /**
+ * 删除法律法规政策文件
+ * @return
+ */
+ @ApiOperation(value = " 删除法律法规政策文件 ",response = AutomessagePolicyDocuments.class)
+ @DeleteMapping("/delete")
+ @Authorization
+ public ResultData delete(@RequestParam(value = "id") Integer id){
+ int delete = iAutomessagePolicyDocumentsService.delete(id);
+ if (delete>0){
+ return ResultData.success("删除成功");
+ }else {
+ return ResultData.error("删除失败");
+ }
+ }
+
+ /**
+ * 根据id获取法律法规政策文件数据
+ * @return
+ */
+ @ApiOperation(value = " 根据id获取法律法规政策文件数据 ",response = AutomessagePolicyDocuments.class)
+ @GetMapping("/selectAutomessagePolicyDocumentById")
+ public ResultData selectAutomessagePolicyDocumentById(@RequestParam(value = "id") Integer id){
+ AutomessagePolicyDocuments automessagePolicyDocuments = iAutomessagePolicyDocumentsService.selectAutomessagePolicyDocumentById(id);
+ if (automessagePolicyDocuments!=null){
+ return ResultData.success(automessagePolicyDocuments);
+ }else {
+ return ResultData.error("查找失败");
+ }
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/BaseController.java b/flower_city/src/main/java/com/dg/core/controller/BaseController.java
new file mode 100644
index 0000000..db5f8dd
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/BaseController.java
@@ -0,0 +1,127 @@
+package com.dg.core.controller;
+
+import com.dg.core.HttpStatus;
+import com.dg.core.ResultData;
+import com.dg.core.util.TableDataInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * web层通用数据处理
+ *
+ * @author ruoyi
+ */
+public class BaseController
+{
+ protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+ /**
+ * 响应请求分页数据
+ */
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ protected TableDataInfo getDataTable(List<?> list)
+ {
+ TableDataInfo rspData = new TableDataInfo();
+ rspData.setResult(HttpStatus.SUCCESS);
+ rspData.setMsg("查询成功");
+ if(list!=null)
+ {
+ rspData.setRows(list);
+// rspData.setTotal(new PageInfo(list).getTotal());
+ }
+ else
+ {
+ rspData.setRows(new ArrayList<>());
+ rspData.setTotal(0);
+ }
+ return rspData;
+ }
+
+ /**
+ * 响应请求分页数据
+ */
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ protected TableDataInfo getDataTable(List<?> list,long num)
+ {
+ TableDataInfo rspData = new TableDataInfo();
+ rspData.setResult(HttpStatus.SUCCESS);
+ rspData.setMsg("查询成功");
+ rspData.setRows(list);
+ rspData.setTotal(num);
+ return rspData;
+ }
+
+
+ /**
+ * 响应请求分页数据 报错内容
+ */
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ protected TableDataInfo getDataTable(String msg)
+ {
+ TableDataInfo rspData = new TableDataInfo();
+ rspData.setResult(HttpStatus.ERROR);
+ rspData.setMsg(msg);
+ rspData.setRows(new ArrayList<>());
+ rspData.setTotal(0);
+ return rspData;
+ }
+
+ /**
+ * 返回成功
+ * <T> ResultData<T> success(T data) {
+ */
+ public ResultData success()
+ {
+ return ResultData.success();
+ }
+
+
+ /**
+ * 返回失败消息
+ */
+ public ResultData error()
+ {
+ return ResultData.error();
+ }
+
+ /**
+ * 返回成功消息
+ */
+ public ResultData success(String message)
+ {
+ return ResultData.success(message);
+ }
+
+ /**
+ * 返回失败消息
+ */
+ public ResultData error(String message)
+ {
+ return ResultData.error(message);
+ }
+
+ /**
+ * 响应返回结果
+ *
+ * @param rows 影响行数
+ * @return 操作结果
+ */
+ protected ResultData toAjax(int rows)
+ {
+ return rows > 0 ? ResultData.success() : ResultData.error();
+ }
+
+ /**
+ * 响应返回结果
+ *
+ * @param result 结果
+ * @return 操作结果
+ */
+ protected ResultData toAjax(boolean result)
+ {
+ return result ? success() : error();
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java b/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java
new file mode 100644
index 0000000..470680f
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java
@@ -0,0 +1,194 @@
+package com.dg.core.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.db.gen.entity.ClassifyAdministration;
+import com.dg.core.db.gen.entity.OrganizationChartEntity;
+import com.dg.core.db.gen.entity.TransactionEvent;
+import com.dg.core.service.IClassifyAdministrationService;
+import com.dg.core.service.ITransactionEventService;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 分类管理
+ */
+@Api(tags = {"分类管理接口"})
+@RestController
+@RequestMapping("/classify")
+public class ClassifyAdministrationController extends BaseController
+{
+
+ @Autowired(required = true)
+ IClassifyAdministrationService iClassifyAdministrationService;
+
+ @Autowired(required = true)
+ ITransactionEventService iTransactionEventService;
+
+ /**
+ * 获取管理菜单列表
+ * @return
+ */
+ @ApiOperation(value = "获取管理菜单列表(无分页)",response = ClassifyAdministration.class)
+ @GetMapping("/getList")
+ @Authorization
+ public TableDataInfo selectConfigList(@RequestParam(value = "classifyGrade",required = false) String classifyGrade)
+ {
+ int num=iClassifyAdministrationService.countNum("",classifyGrade);
+ return getDataTable(iClassifyAdministrationService.selectConfigList("",classifyGrade),num);
+ }
+
+ /**
+ * 获取管理菜单列表(已分级)
+ * @return
+ */
+ @ApiOperation(value = " 获取管理菜单列表(已分级)",response = ClassifyAdministration.class)
+ @GetMapping("/getListByParentId")
+ public TableDataInfo selectConfigListByParentId(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "parentId",required = false) String parentId,
+ @RequestParam(value = "departmentId",required = false) Integer departmentId){
+ Assert.notNull(pageNum, "pageNum can not be empty");
+ Assert.notNull(pageSize, "pageSize can not be empty");
+ int num=iClassifyAdministrationService.countNum("",null);
+ Page<ClassifyAdministration> pageParam = new Page<>(pageNum,pageSize);
+ return getDataTable(iClassifyAdministrationService.selectRootList(pageParam,pageSize,parentId,departmentId),num);
+ }
+
+
+
+ /**
+ * 获取管理菜单列表
+ * @return
+ */
+ @ApiOperation(value = "获取管理菜单列表",response = ClassifyAdministration.class)
+ @GetMapping("/getListPage")
+ @Authorization
+ public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "name",required = false) String name,
+ @RequestParam(value = "classifyGrade",required = false) String classifyGrade)
+ {
+ Assert.notNull(pageNum, "pageNum can not be empty");
+ Assert.notNull(pageSize, "pageSize can not be empty");
+ Page<ClassifyAdministration> pageParam = new Page<>(pageNum,pageSize);
+ List<ClassifyAdministration> list = iClassifyAdministrationService.selectConfigList(pageParam,pageSize,name,classifyGrade);
+ int num=iClassifyAdministrationService.countNum(name,classifyGrade);
+ return getDataTable(list,num);
+ }
+
+
+ /**
+ * 新增分类
+ * @param entity
+ * @return
+ */
+ @ApiOperation(value = "新增分类",response = ClassifyAdministration.class)
+ @PostMapping("/add")
+ @Authorization
+ public ResultData insertConfig(@RequestBody ClassifyAdministration entity) {
+ Assert.notNull(entity, "参数不能为空");
+ Assert.notNull(entity.getClassifyName(), "分类名称不能为空");
+ Assert.notNull(entity.getClassifyGrade(), "分类等级不能为空");
+ if(StringUtils.equals(entity.getClassifyGrade(),"2"))
+ {
+ Assert.notNull(entity.getParentId(), "上级分类不能为空");
+ }
+ return toAjax(iClassifyAdministrationService.insertConfig(entity));
+ }
+
+ /**
+ * 更新分类
+ * @param entity
+ * @return
+ */
+ @ApiOperation("编辑分类")
+ @PostMapping("/update")
+ @Authorization
+ public ResultData updateConfig(@RequestBody ClassifyAdministration entity)
+ {
+ return toAjax(iClassifyAdministrationService.updateConfig(entity));
+ }
+
+ /**
+ * 删除分类
+ * @param Id
+ * @return
+ */
+ @ApiOperation("删除分类")
+ @DeleteMapping("/delete/{Id}")
+ @Authorization
+ public ResultData deleteConfigById(@PathVariable("Id") String Id)
+ {
+ if(StringUtils.isEmpty(Id))
+ {
+ return ResultData.error("id 不能为空");
+ }
+
+ /**
+ * 根据上级id查询子分类
+ * @param parentId
+ * @return
+ */
+ List<String> list=iClassifyAdministrationService.selectParent(Id);
+ if(list!=null && list.size()>0)
+ {
+ return ResultData.error("请先删除其下的二级分类");
+ }
+
+ List<String> listIds=iTransactionEventService.selectclassifyId(Id);
+ if(listIds!=null && listIds.size()>0)
+ {
+ return ResultData.error("分类下有办事指南！不能删除");
+ }
+
+ return toAjax(iClassifyAdministrationService.deleteConfigById(Id));
+ }
+
+ /**
+ * 获取分类根据id 如果是二级id则获取的是办事指南
+ * @return
+ */
+ @ApiOperation("获取分类根据id 如果是二级id则获取的是办事指南,不传参默认是0")
+ @GetMapping("/queryListById")
+ ResultData queryListById(@RequestParam(value = "id",required = false) Integer id){
+ if(id==null)
+ id=0;
+ return iClassifyAdministrationService.queryListById(id);
+ }
+
+
+
+ /**
+ * 树状分类选择列表
+ * @return
+ */
+ @ApiOperation("树状分类选择列表")
+ @GetMapping("/getClassifyList")
+ public TableDataInfo getClassifyList()
+ {
+ List<ClassifyAdministration> list=iClassifyAdministrationService.selectConfigList("","1");
+
+ for(ClassifyAdministration entity:list)
+ {
+ entity.setClassifyAdministrationEntityList(iClassifyAdministrationService.selectParentData(entity.getId()+""));
+ }
+ return getDataTable(list);
+ }
+
+
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/CommonController.java b/flower_city/src/main/java/com/dg/core/controller/CommonController.java
new file mode 100644
index 0000000..df34391
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/CommonController.java
@@ -0,0 +1,178 @@
+package com.dg.core.controller;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.dg.core.CorsConfig;
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.AjaxResult;
+import com.dg.core.file.FtpConstants;
+import com.dg.core.file.MimeTypeUtils;
+import com.dg.core.file.SFTPUtil;
+import com.dg.core.util.TestDate;
+import com.iceyyy.workday.WorkUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.InputStream;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import static com.dg.core.file.FileTypeUploadUtils.assertAllowed;
+
+
+@Api(tags = {"通用接口"})
+@RestController
+@RequestMapping("/common")
+public class CommonController extends BaseController {
+
+ private static final String FILE_DELIMETER = ",";
+
+ @Autowired
+ private CorsConfig corsConfig;
+
+
+ // FTP 登录用户名
+ @Value("${ftp.username}")
+ private String userName;
+ // FTP 登录密码
+ @Value("${ftp.password}")
+ private String password;
+ // FTP 服务器地址IP地址
+ @Value("${ftp.host}")
+ private String host;
+ // FTP 端口
+ @Value("${ftp.port}")
+ private int port;
+ @Value("${ftp.url}")
+ private String url;
+
+ @Resource
+ RedisTemplate<String, Object> redisTemplate;
+
+
+ @RequestMapping("/hello")
+// @Authorization
+ public ResponseEntity<String> hello() {
+ return ResponseEntity.ok("hello world");
+ }
+
+
+ /**
+ * 通用上传请求（多个）
+ */
+ @ApiOperation("文件上传接口（通用）")
+ @PostMapping("/uploads")
+ public ResultData uploadFiles(List<MultipartFile> files) throws Exception {
+ List<String> urls = new ArrayList<String>();
+ List<String> fileNames = new ArrayList<String>();
+ List<String> originalFilenames = new ArrayList<String>();
+ for (MultipartFile file : files) {
+ String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+ String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
+ try {
+ assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+ SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+ sftp.login();
+ InputStream is = file.getInputStream();
+ sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
+ sftp.logout();
+
+ urls.add(url + "/idcard/" + name);
+ fileNames.add(name);
+ originalFilenames.add(file.getOriginalFilename());
+
+ } catch (Exception e) {
+ return ResultData.error("上传文件失败 " + e.getMessage());
+ }
+ }
+ AjaxResult ajax = new AjaxResult();
+ ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
+ ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
+ ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
+ return ResultData.success(ajax);
+
+ }
+
+
+
+ /**
+ * 通用上传请求（单个）
+ */
+ @ApiOperation("文件上传接口（通用）")
+ @PostMapping("/upload")
+ public ResultData uploadFile(MultipartFile file) throws Exception {
+ List<String> urls = new ArrayList<String>();
+ List<String> fileNames = new ArrayList<String>();
+ List<String> originalFilenames = new ArrayList<String>();
+
+ String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+ String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
+ try {
+ assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+ SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+ sftp.login();
+ InputStream is = file.getInputStream();
+ sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
+ sftp.logout();
+
+// urls.add(url + "/idcard/" + name);
+// fileNames.add(name);
+// originalFilenames.add(file.getOriginalFilename());
+ return ResultData.success(url + "/idcard/" + name);
+ } catch (Exception e) {
+ return ResultData.error("上传文件失败 " + e.getMessage());
+ }
+
+// AjaxResult ajax = new AjaxResult();
+// ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
+// ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
+// ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
+ }
+
+ /**
+ * 判断当前时间是否是工作日,格式为“2022-10-16”,不传默认为今天
+ */
+ @ApiOperation("判断当前时间是否是工作日,格式为“20221016”,不传默认为今天")
+ @GetMapping("/isWeekday")
+ public ResultData isWeekday(@RequestParam(value = "dateTime", required = false) String dateTime) {
+ if (dateTime == null) {
+ Date date = new Date();
+ SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMdd");
+ dateTime = fmt.format(date);
+ }
+ if (WorkUtils.isWorkendDay(dateTime))
+ return success("休息日或者周末");
+ else
+ return success("工作日");
+ }
+
+ /**
+ * 获取天气默认为攀枝花
+ */
+ @ApiOperation("获取天气默认为攀枝花")
+ @GetMapping("/getWeather")
+ public ResultData getWeather(@RequestParam(value = "code", required = false) String code) {
+ TestDate td = new TestDate();
+ Map weather;
+ if (code == null) {//默认为攀枝花 则从redis上获取redis上定时任务15分钟获取一次天气
+ HashMap weather1 = (HashMap) redisTemplate.opsForValue().get("weather");
+ return ResultData.success(weather1.get("lives"));
+ } else {
+ return ResultData.success(td.getWeather(code));
+ }
+ }
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java b/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
new file mode 100644
index 0000000..7a38d744
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
@@ -0,0 +1,138 @@
+package com.dg.core.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.db.gen.entity.ElseAccessoryEntity;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IElseAccessoryService;
+import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.util.PermissionUtil;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = {"其他附件接口"})
+@RestController
+@RequestMapping("/else")
+public class ElseAccessoryController extends BaseController
+{
+
+ @Autowired
+ IElseAccessoryService iElseAccessoryService;
+
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
+
+ /**
+ * 获取附件列表
+ * @param pageNum
+ * @param pageSize
+ * @param name
+ * @return
+ */
+ @ApiOperation("获取附件列表接口")
+ @GetMapping(path = "/getList")
+ @Authorization
+ public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "name",required = false) String name,
+ @CurrentUser SysUser sysUser)
+ {
+ Page<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
+ List<String> ids= PermissionUtil.getStairDepartment(sysUser,iOrganizationChartService);
+ List<ElseAccessoryEntity> list;
+ if (sysUser.getUserType().equals("1")||sysUser.getIsDivisionHead().equals("1")){
+ list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,null);
+ }
+ else {
+ list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,sysUser.getUserId());
+ }
+ int num=iElseAccessoryService.countNum(name,ids);
+ return getDataTable(list,num);
+ }
+
+ /**
+ * 获取附件列表
+ * @param Name
+ * @return
+ */
+ @ApiOperation("获取附件列表接口(全部)")
+ @GetMapping(path = "/getAllList")
+ @Authorization
+ public TableDataInfo selectConfigListAll(@RequestParam(value = "Name",required = false) String Name,
+ @CurrentUser SysUser sysUser)
+ {
+ List<String> ids= PermissionUtil.getStairDepartment(sysUser,iOrganizationChartService);
+ List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids,sysUser.getUserId());
+ int num=iElseAccessoryService.countNum(Name,ids);
+ return getDataTable(list,num);
+ }
+
+
+ /**
+ * 新增列表
+ * @param entity
+ * @return
+ */
+ @ApiOperation("新增附件")
+ @PostMapping(path = "/add")
+ @Authorization
+ public ResultData insertConfig(@RequestBody ElseAccessoryEntity entity,@CurrentUser SysUser sysUser)
+ {
+ if(entity==null)
+ {
+ return ResultData.error("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getName()))
+ {
+ return ResultData.error("事项名称不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getUrl()))
+ {
+ return ResultData.error("文件url不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getDepartmentId()))
+ {
+ return ResultData.error("部门不能为空");
+ }
+ entity.setCreateUserId(sysUser.getUserId());
+ return toAjax(iElseAccessoryService.insertConfig(entity));
+ }
+
+ /**
+ * 更新附件
+ * @param entity
+ * @return
+ */
+ @ApiOperation("更新附件")
+ @PostMapping(path = "/update")
+ @Authorization
+ public ResultData updateConfig(@RequestBody ElseAccessoryEntity entity)
+ {
+ return toAjax(iElseAccessoryService.updateConfig(entity));
+ }
+
+ /**
+ * 删除
+ * @param Id
+ * @return
+ */
+ @ApiOperation("删除附件")
+ @DeleteMapping(path = "/delete")
+ @Authorization
+ public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
+ {
+ return toAjax(iElseAccessoryService.deleteConfigById(Id));
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
new file mode 100644
index 0000000..293b1c6
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
@@ -0,0 +1,312 @@
+package com.dg.core.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IGuideRepairOrderService;
+import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.service.ISysUserService;
+import com.dg.core.util.PermissionUtil;
+import com.dg.core.util.Snowflake;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.repository.query.Param;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+
+@Api(tags = {"导办用户接口"})
+@RestController
+@RequestMapping("/guidedo")
+public class GuideDoController extends BaseController
+{
+
+ @Autowired
+ ISysUserService IUserService;
+
+
+ @Autowired
+ IGuideRepairOrderService iGuideRepairOrderService;
+
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
+
+ /**
+ * 查询列表
+ *
+ * @return 参数配置信息
+ */
+ @ApiOperation("用户列表接口")
+ @GetMapping("/getlist")
+ @Authorization
+ public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "keyword",required = false) String keyword,
+ @RequestParam(value = "isDivisionHead",required = false) String isDivisionHead,
+ @CurrentUser SysUser sysUser)
+ {
+ Assert.notNull(pageNum, "pageNum can not be empty");
+ Assert.notNull(pageSize, "pageSize can not be empty");
+ Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
+ List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ List<SysUser> list ;
+ int num;
+ if (isDivisionHead!=null&&!isDivisionHead.equals("")){
+ list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,isDivisionHead);
+ num=IUserService.selectNum("2",keyword,ids,isDivisionHead);
+ }
+ else{
+ list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,null);
+ num=IUserService.selectNum("2",keyword,ids,null);
+ }
+ return getDataTable(list,num);
+ }
+
+
+ /**
+ * 新增用户
+ *
+ * @param config 参数配置信息-
+ * @return 结果
+ */
+ @ApiOperation("新增导办用户接口")
+ @PostMapping("/add")
+ @Authorization
+ public ResultData insertConfig(@RequestBody SysUser config,@CurrentUser SysUser sysUser)
+ {
+ Assert.notNull(config, "parameter can not be empty");
+
+ if(StringUtils.isEmpty(config.getLoginName()))
+ {
+ return error("账户不能为空");
+ }
+
+ if(StringUtils.isEmpty(config.getPassword()))
+ {
+ return error("密码不能为空");
+ }
+
+ if(StringUtils.isEmpty(config.getPhonenumber()))
+ {
+ return error("手机号不能为空");
+ }
+
+ if(StringUtils.isEmpty(config.getUserName()))
+ {
+ return error("昵称不能为空");
+ }
+
+ if(StringUtils.isEmpty(config.getDepartmentId()))
+ {
+ return error("部门不能为空");
+ }
+
+ config.setUserType("2");
+
+ SysUser user=IUserService.selectData(null,config.getPhonenumber(),null);
+ if (user != null)
+ {
+ user.setPassword(config.getPassword());
+ user.setDepartmentId(config.getDepartmentId());
+ user.setUserName(config.getUserName());
+ user.setPhonenumber(config.getPhonenumber());
+ user.setLoginName(config.getLoginName());
+ user.setMasterIds(config.getMasterIds());
+ //是否是部门领导（1是 2不是）
+ if(StringUtils.equals("1",config.getIsDivisionHead()))
+ {
+ user.setRoleIds("13");
+ if(StringUtils.isEmpty(config.getDataPermission())) {
+ user.setDataPermission(config.getMoreDepartmentIds());
+ }
+ }
+ else
+ {
+ if(StringUtils.isEmpty(config.getDataPermission())) {
+ user.setDataPermission(config.getDepartmentId());
+ }
+ user.setRoleIds("2");
+ }
+ user.setUserType("2");
+ user.setIsDivisionHead(config.getIsDivisionHead());
+ user.setStatus(config.getStatus());
+ user.setUpdateTime(LocalDateTime.now());
+ user.setDepartmentIds(config.getDepartmentIds());
+ user.setDepartmentIdStr(config.getDepartmentIdStr());
+ user.setMoreDepartmentIds(config.getMoreDepartmentIds());
+ user.setMattersIds(config.getMattersIds());
+ user.setMasterNames(config.getMasterNames());
+ user.setMattersNames(config.getMattersNames());
+ if (config.getMoreDepartmentIds()!=null&&config.getMoreDepartmentIds().indexOf(",")>0)
+ user.setDataPermission(config.getMoreDepartmentIds().substring(config.getMoreDepartmentIds().indexOf(",")+1));
+ //提示用户名或密码错误
+ return toAjax(IUserService.updateConfig(user));
+ }
+ //是否是部门领导（1是 2不是）
+ if(StringUtils.equals("1",config.getIsDivisionHead()))
+ {
+ config.setRoleIds("13");
+ if(StringUtils.isEmpty(config.getDataPermission())) {
+ config.setDataPermission(config.getMoreDepartmentIds());
+ }
+ }
+ else
+ {
+ if(StringUtils.isEmpty(config.getDataPermission())) {
+ config.setDataPermission(config.getDepartmentId());
+ }
+ config.setRoleIds("2");
+ }
+ config.setCreateBy(sysUser.getUserId());
+ config.setCreateTime(LocalDateTime.now());
+ config.setUpdateTime(LocalDateTime.now());
+ config.setUserId(Snowflake.getId()+"");
+ if (config.getMoreDepartmentIds()!=null&&config.getMoreDepartmentIds().indexOf(",")>0)
+ config.setDataPermission(config.getMoreDepartmentIds().substring(config.getMoreDepartmentIds().indexOf(",")+1));
+ config.setIsDivisionHead(config.getIsDivisionHead());
+ return toAjax(IUserService.insertConfig(config));
+ }
+
+ /**
+ * 更新导办用户
+ *
+ * @param config 参数配置信息
+ * @return 结果
+ */
+ @ApiOperation("修改导办用户接口")
+ @PostMapping("/update")
+ @Authorization
+ public ResultData updateConfig(@RequestBody SysUser config)
+ {
+ if(config.getUserId()==null)
+ {
+ return error("userId不能为空");
+ }
+
+ if(StringUtils.isEmpty(config.getPhonenumber()))
+ {
+ return error("手机号不能为空");
+ }
+
+
+ if(StringUtils.isEmpty(config.getLoginName()))
+ {
+ return error("账户不能为空");
+ }
+
+ config.setUserType("2");
+
+ //是否是部门领导（1是 2不是）
+ if(StringUtils.equals("1",config.getIsDivisionHead()))
+ {
+ if (config.getMoreDepartmentIds()!=null&&config.getMoreDepartmentIds().indexOf(",")>0)
+ config.setDataPermission(config.getMoreDepartmentIds().substring(config.getMoreDepartmentIds().indexOf(",")+1));
+ else
+ {
+ config.setDataPermission("0");
+ }
+
+ config.setRoleIds("13");
+ }
+ else
+ {
+ if(StringUtils.isEmpty(config.getDataPermission())) {
+ config.setDataPermission(config.getDepartmentId());
+ }
+ config.setRoleIds("2");
+ }
+
+ SysUser user=IUserService.selectData(null,config.getPhonenumber(),null);
+ if (user != null && !(user.getUserId().equals(config.getUserId())))
+ {
+ //提示用户名或密码错误
+ return ResultData.error("该手机账户已存在！请更换手机号");
+ }
+ return toAjax(IUserService.updateConfig(config));
+ }
+
+ /**
+ * 删除导办用户接口
+ *
+ * @return 结果
+ */
+ @ApiOperation("删除导办用户接口")
+ @DeleteMapping("/delete/{userId}")
+ @Authorization
+ public ResultData deleteConfigById(@PathVariable("userId") String userId)
+ {
+ if(StringUtils.isEmpty(userId))
+ {
+ return error("userId不能为空");
+ }
+
+ int a=iGuideRepairOrderService.countUser(userId,"2");
+ if(a>0)
+ {
+ return error("该人员有工单未处理完不能删除");
+ }
+ SysUser user=IUserService.selectData(userId,null,null);
+ user.setUserType("4");
+ user.setRoleIds("4");
+ user.setIsDivisionHead("2");
+ return toAjax(IUserService.updateConfig(user));
+ }
+
+ /**
+ * 修改导办用户空闲状态接口
+ *
+ * @param config 参数配置信息
+ * @return 结果
+ */
+ @ApiOperation("修改导办用户空闲状态接口")
+ @PostMapping("/idlestate")
+ @Authorization
+ public ResultData idleState(@RequestBody SysUser config)
+ {
+ if(config.getUserId()==null)
+ {
+ return error("userId不能为空");
+ }
+
+ if(StringUtils.isEmpty(config.getLeisureState()))
+ {
+ return error("空闲状态不能为空");
+ }
+
+ return toAjax(IUserService.updateConfig(config));
+ }
+
+ /**
+ * 根据部门id及分类id获取导办用户
+ *
+ * @return 结果
+ */
+ @ApiOperation("根据部门id及分类id获取导办用户")
+ @GetMapping("/selectListByDepartmentId")
+ @Authorization
+ public ResultData selectListByDepartmentId(@RequestParam("departmentId") String departmentId,
+ @RequestParam(value = "classifyId",required = false) String classifyId)
+ {
+ return ResultData.success(IUserService.selectListByDepartmentId(departmentId,classifyId));
+ }
+
+ /**
+ * 查询导办用户列表（不分页）
+ * @return 结果
+ */
+ @ApiOperation(" 查询导办用户列表（不分页）")
+ @GetMapping("/queryList")
+ @Authorization
+ public ResultData queryList(@RequestParam(value = "keyWord",required = false) String keyWord){
+ return ResultData.success(IUserService.queryList(2,keyWord));
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
new file mode 100644
index 0000000..8270408
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
@@ -0,0 +1,489 @@
+package com.dg.core.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.db.gen.entity.*;
+import com.dg.core.db.manual.mapper.util.ConstantPropertiesUtil;
+import com.dg.core.service.IGuideEvolveService;
+import com.dg.core.service.IGuideRepairOrderService;
+import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.util.PermissionUtil;
+import com.dg.core.util.SmsUtil;
+import com.dg.core.util.TableDataInfo;
+import com.dg.core.util.WxUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 工单管理
+ */
+@Api(tags = {"工单管理接口"})
+@RestController
+@RequestMapping("/guideRepairOrder")
+public class GuideRepairOrderController extends BaseController {
+
+ @Resource
+ private IGuideRepairOrderService iGuideRepairOrderService;
+
+ @Autowired
+ private IGuideEvolveService iGuideEvolveService;
+
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
+
+ @Resource(name = "stringRedisTemplate")
+ private StringRedisTemplate stringRedisTemplate;
+
+ private static String guideRepairOrderCompleteTemplateId = "7ZCHHii87rWPwVkdhZnvNiYbYi_Buq0NXO10cmUhAFk";
+
+
+ @Resource
+ SmsUtil smsUtil;
+
+
+ /**
+ * 提交导办订单
+ * @return
+ */
+ @ApiOperation(value = "提交导办订单",response = GuideRepairOrder.class)
+ @PostMapping("/addOrder")
+ @Authorization
+ public ResultData addOrder(@RequestBody GuideRepairOrder guideRepairOrder,@CurrentUser SysUser sysUser) {
+ guideRepairOrder.setSubmitUserId(sysUser.getUserId().toString());
+ guideRepairOrder.setSubmitUserPhone(sysUser.getPhonenumber());
+ guideRepairOrder.setSubmitUserPhone(sysUser.getPhonenumber());
+ guideRepairOrder.setSubmitType(2);
+ int i = iGuideRepairOrderService.addOrder(guideRepairOrder);
+ if (i>0){
+ iGuideEvolveService.updateGuid();
+ return ResultData.success();
+ }
+ else
+ return ResultData.error("提交失败,请检查你是否有相同的咨询内容在处理中");
+ }
+
+
+ /**
+ * 获取详情
+ * @param Id
+ * @param orderNum
+ * @return
+ */
+ @ApiOperation("获取订单详情")
+ @GetMapping("/orderdata")
+ @Authorization
+ public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id,
+ @RequestParam(value = "orderNum",required = false) String orderNum,
+ @CurrentUser SysUser sysUser)
+ {
+ if(StringUtils.isEmpty(Id) && StringUtils.isEmpty(orderNum))
+ {
+ return ResultData.error("id或者订单号不能都为空");
+ }
+
+ GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(Id,orderNum);
+ order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id,sysUser));
+
+ return ResultData.success(order);
+ }
+
+
+ /**
+ * 分配人员
+ * @param order
+ * @return
+ */
+ @ApiOperation("分配人员")
+ @PostMapping("/allocation")
+ @Authorization
+ public ResultData allocation(@RequestBody GuideRepairOrder order, @CurrentUser SysUser sysUser)
+ {
+ if(order==null)
+ {
+ return ResultData.error("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(order.getGuideDepartmentId()))
+ {
+ return ResultData.error("导办部门id不能为空");
+ }
+
+ if(StringUtils.isEmpty(order.getGuideUserId()))
+ {
+ return ResultData.error("导办人员id不能为空");
+ }
+
+
+
+ //已分配
+ order.setState("2");
+
+ //新增分配记录
+ GuideEvolveEntity entity=new GuideEvolveEntity();
+ entity.setCreateTime(LocalDateTime.now());
+ entity.setUpdateTime(LocalDateTime.now());
+ entity.setState("11");
+ entity.setDepartmentalId(order.getGuideDepartmentId());
+ entity.setToUserId(order.getGuideUserId());
+ entity.setFromUserId(sysUser.getUserId().toString());
+ entity.setFromDepartmentalId(sysUser.getDepartmentId());
+ entity.setGuideId(order.getId().toString());
+ iGuideRepairOrderService.updateSysUserOrderNum(entity);
+ iGuideEvolveService.insertConfig(entity);
+ order=iGuideRepairOrderService.setTimeoutTim(order);
+ return toAjax(iGuideRepairOrderService.updateConfig(order));
+ }
+
+
+ /**
+ * 转派人员
+ * @param order
+ * @return
+ */
+ @ApiOperation("转派人员")
+ @PostMapping("/redeploy")
+ @Authorization
+ public ResultData redeploy(@RequestBody GuideRepairOrder order, @CurrentUser SysUser sysUser)
+ {
+ if(order==null)
+ {
+ return ResultData.error("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(order.getGuideDepartmentId()))
+ {
+ return ResultData.error("导办部门id不能为空");
+ }
+
+ if(StringUtils.isEmpty(order.getGuideUserId()))
+ {
+ return ResultData.error("导办人员id不能为空");
+ }
+
+ //已分配
+ order.setState("2");
+
+ //新增转派记录
+ GuideEvolveEntity entity=new GuideEvolveEntity();
+ entity.setCreateTime(LocalDateTime.now());
+ entity.setUpdateTime(LocalDateTime.now());
+ entity.setState("10");
+ entity.setDepartmentalId(order.getGuideDepartmentId());
+ entity.setToUserId(order.getGuideUserId());
+ entity.setFromUserId(sysUser.getUserId()+"");
+ entity.setFromDepartmentalId(sysUser.getDepartmentId());
+ entity.setGuideId(order.getId().toString());
+
+ iGuideEvolveService.insertConfig(entity);
+ iGuideRepairOrderService.updateSysUserOrderNum(entity);
+
+ return toAjax(iGuideRepairOrderService.updateConfig(order));
+ }
+
+
+
+ /**
+ * 去处理
+ * @param entity
+ * @return
+ */
+ @ApiOperation("去处理")
+ @PostMapping("/dispose")
+ @Authorization
+ public ResultData dispose(@RequestBody GuideEvolveEntity entity, @CurrentUser SysUser sysUser)
+ {
+ if(entity==null)
+ {
+ return ResultData.error("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getGuideId()))
+ {
+ return ResultData.error("工单id不能为空");
+ }
+
+ GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(entity.getGuideId(),"");
+ if(order==null)
+ {
+ return ResultData.error("该工单不存在!");
+ }
+
+ if(StringUtils.equals(order.getState(),"3"))
+ {
+ return ResultData.error("该工单已办结!");
+ }
+ if(StringUtils.equals(entity.getState(),"2")){//如果用户选择未解决则状态改为待办
+ order.setState("2");
+ entity.setState("9");
+ }
+ else if(StringUtils.equals(entity.getState(),"4")){
+ //待评价
+ if (order.getSubmitType().equals(1))//小程序提交
+ {
+ WxUtil wxUtil=new WxUtil();
+ String accessToken="0";
+ try {
+ accessToken= stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ SysUser submitUser = iGuideRepairOrderService.getSubmitUser(order);
+ wxUtil.sendGuideRepairOrderComplete(submitUser.getOpenid(),accessToken,guideRepairOrderCompleteTemplateId,entity);
+ smsUtil.sendSmsCompleteNew(order.getConsultUserPhone(),order.getMatterName());
+ }
+ else if (order.getSubmitType().equals(2)){
+ smsUtil.sendSmsCompleteNew(order.getConsultUserPhone(),order.getMatterName());
+ }
+ order.setState("4");
+ entity.setState("7");
+ }
+ //新增已办结记录
+ entity.setCreateTime(LocalDateTime.now());
+ entity.setUpdateTime(LocalDateTime.now());
+ entity.setFromDepartmentalId(sysUser.getDepartmentId());
+ entity.setFromUserId(sysUser.getUserId()+"");
+ entity.setGuideId(order.getId().toString());
+ iGuideEvolveService.insertConfig(entity);
+ iGuideRepairOrderService.updateSysUserOrderNum(entity);
+ return toAjax(iGuideRepairOrderService.updateConfig(order));
+ }
+
+
+ /**
+ * 取消导办工单
+ * @param entity
+ * @return
+ */
+ @ApiOperation("取消导办工单")
+ @PostMapping("/cancel")
+ @Authorization
+ public ResultData cancel(@RequestBody GuideEvolveEntity entity, @CurrentUser SysUser sysUser)
+ {
+ if(entity==null)
+ {
+ return ResultData.error("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getGuideId()))
+ {
+ return ResultData.error("工单id不能为空");
+ }
+
+ GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(entity.getGuideId(),"");
+ if(order==null)
+ {
+ return ResultData.error("该工单不存在!");
+ }
+
+ if(!StringUtils.equals(order.getState(),"1"))
+ {
+ return ResultData.error("该工单不能取消！");
+ }
+ //取消状态
+ order.setState("5");
+
+ //新增已取消记录
+ entity.setCreateTime(LocalDateTime.now());
+ entity.setUpdateTime(LocalDateTime.now());
+ entity.setState("5");
+ entity.setFromDepartmentalId(sysUser.getDepartmentId());
+ entity.setFromUserId(sysUser.getUserId()+"");
+ entity.setGuideId(order.getId().toString());
+ iGuideEvolveService.insertConfig(entity);
+ return toAjax(iGuideRepairOrderService.updateConfig(order));
+ }
+
+
+
+ /**
+ * 工单评价
+ * @param entity
+ * @return
+ */
+ @ApiOperation("工单评价")
+ @PostMapping("/evaluate")
+ @Authorization
+ public ResultData evaluate(@RequestBody GuideRepairOrder entity, @CurrentUser SysUser sysUser)
+ {
+ if(entity==null)
+ {
+ return ResultData.error("参数不能为空");
+ }
+
+ if(entity.getId()<=0)
+ {
+ return ResultData.error("工单id不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getEvaluateState()))
+ {
+ return ResultData.error("满意程度不能为空！");
+ }
+ //已办结
+ entity.setState("3");
+ //新增已办结记录
+ GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity();
+ guideEvolveEntity.setCreateTime(LocalDateTime.now());
+ guideEvolveEntity.setUpdateTime(LocalDateTime.now());
+ guideEvolveEntity.setState("13");
+ guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
+ guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
+ guideEvolveEntity.setGuideId(entity.getId().toString());
+ int i = iGuideRepairOrderService.updateConfig(entity);
+ if (i>0)
+ return toAjax( iGuideEvolveService.insertConfig(guideEvolveEntity));
+ else
+ return ResultData.error();
+ }
+
+ /**
+ * 获取个人中心工单数据
+ * @param sysUser 当前登录人员信息
+ * @return
+ */
+ @ApiOperation(value = "获取个人中心工单数据",response = GuideRepairOrder.class)
+ @GetMapping("/personalCenter")
+ @Authorization
+ public ResultData selectBySubmitId(@CurrentUser SysUser sysUser){
+ return ResultData.success(iGuideRepairOrderService.selectBySubmitId(sysUser.getUserId().toString()));
+ }
+
+
+ /**
+ * 获取工单列表(分页)
+ * @param matterName
+ * @return
+ */
+ @ApiOperation(value = "获取工单列表(分页)",response = GuideRepairOrder.class)
+ @GetMapping("/getList")
+ @Authorization
+ public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "matterName",required = false) String matterName,
+ @RequestParam(value = "status",required = false) String status,
+ @RequestParam(value = "createTimeStartTime",required = false) String createTimeStartTime,
+ @RequestParam(value = "createTimeTimeEndTime",required = false) String createTimeTimeEndTime,
+ @RequestParam(value = "classifyId",required = false)String classifyId,
+ @CurrentUser SysUser sysUser)
+ {
+ Assert.notNull(pageNum, "pageNum 不能为空");
+ Assert.notNull(pageSize, "pageSize 不能为空");
+ Page<GuideRepairOrder> pageParam = new Page<>(pageNum,pageSize);
+
+ List<String> ids=null;
+ String userId=null;
+ if( StringUtils.equals("2",sysUser.getRoleIds()))
+ {
+ if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ {
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ }
+ else
+ {
+ userId=sysUser.getUserId()+"";
+ ids=new ArrayList<>();
+ ids.add(sysUser.getDepartmentId());
+ }
+ }
+ else
+ {
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ }
+
+ List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,
+ matterName,ids,status,userId,createTimeStartTime,createTimeTimeEndTime,classifyId);
+ int num=iGuideRepairOrderService.countConfigList(matterName,ids,status,userId);
+ return getDataTable(list,num);
+ }
+
+
+ @ApiOperation("导办工单统计不同状态工单数")
+ @GetMapping("/getWorkOrder")
+ @Authorization
+ public ResultData getWorkOrder(@CurrentUser SysUser sysUser)
+ {
+ WorkOrder workOrder=new WorkOrder();
+ List<String> ids=null;
+ String userId=null;
+ if( StringUtils.equals("2",sysUser.getRoleIds()))
+ {
+ if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+ {
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ }
+ else
+ {
+ userId=sysUser.getUserId()+"";
+ ids=new ArrayList<>();
+ ids.add(sysUser.getDepartmentId());
+ }
+ }
+ else
+ {
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ }
+
+ //状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 ）
+ workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",ids,null,null,null,null,null,userId));
+ workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",ids,null,null,null,null,null,userId));
+ workOrder.setWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",ids,null,null,null,null,null,userId));
+ workOrder.setHaveDealWith(iGuideRepairOrderService.countStatisticsNum("3",ids,null,null,null,null,null,userId));
+ workOrder.setRemainEvaluated(iGuideRepairOrderService.countStatisticsNum("4",ids,null,null,null,null,null,userId));
+ workOrder.setCanceled(iGuideRepairOrderService.countStatisticsNum("5",ids,null,null,null,null,null,userId));
+
+ //服务状态(1.已解决 2.未解决)
+ workOrder.setUnsolved(iGuideRepairOrderService.countStatisticsNum(null,ids,null,null,null,null,"2",userId));
+ workOrder.setResolved(iGuideRepairOrderService.countStatisticsNum(null,ids,null,null,null,null,"1",userId));
+
+ //是否超时 （1 未超时 2已超时） 超时未办结
+ workOrder.setOvertime(iGuideRepairOrderService.countStatisticsNum(null,ids,null,"2",null,null,null,userId));
+ workOrder.setOvertimeWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",ids,null,"2",null,null,null,userId));
+ return ResultData.success(workOrder);
+ }
+
+
+ /**
+ * 删除工单
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "删除工单",response = GuideRepairOrder.class)
+ @DeleteMapping("/delete/{id}")
+ @Authorization
+ public ResultData deleteConfigById(@PathVariable("id") String id,@CurrentUser SysUser sysUser)
+ {
+ if(StringUtils.equals("1",sysUser.getUserType()) || StringUtils.equals("1",sysUser.getIsDivisionHead()) )
+ {
+ return toAjax(iGuideRepairOrderService.deleteConfigById(id));
+ }
+ return error("只有超管或者部门领导才能删除");
+ }
+
+
+ /**
+ * 删除评论
+ * @return
+ */
+ @ApiOperation(value = "删除评论",response = GuideRepairOrder.class)
+ @GetMapping("/deleteComment")
+ @Authorization
+ public ResultData deleteComment(@RequestParam(value = "id",required = false) Integer id,@CurrentUser SysUser sysUser){
+ return iGuideRepairOrderService.deleteComment(id,sysUser);
+ }
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java b/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java
new file mode 100644
index 0000000..a1a61b8
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java
@@ -0,0 +1,680 @@
+package com.dg.core.controller;
+
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.*;
+import com.dg.core.db.manual.pojo.AppletUserCount;
+import com.dg.core.service.*;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+
+@Api(tags = {"首页统计接口"})
+@RestController
+@RequestMapping("/Home")
+public class HomeStatisticsController extends BaseController
+{
+ //导办工单接口
+ @Autowired
+ IGuideRepairOrderService iGuideRepairOrderService;
+
+ //导办进展
+ @Autowired
+ IGuideEvolveService iGuideEvolveService;
+
+
+ @Autowired
+ HomeStatisticsService homeStatisticsService;
+
+
+ @Autowired
+ com.dg.core.service.ISysUserService IUserService;
+
+
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
+
+
+ @Autowired
+ IAreaCodeService iAreaCodeService;
+
+ @Autowired
+ private ISysUserRecordService iSysUserRecordService;
+
+ @Autowired(required = true)
+ IAutomessageSmartConsultingService iAutomessageSmartConsultingService;
+
+
+ @ApiOperation("首页统计不同状态工单数")
+ @GetMapping("/getWorkOrder")
+ public ResultData<WorkOrder> getWorkOrder()
+ {
+ WorkOrder workOrder=new WorkOrder();
+ //状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消）
+ workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",null,null,null,null,null,null,null));
+ workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",null,null,null,null,null,null,null));
+ workOrder.setWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",null,null,null,null,null,null,null));
+ workOrder.setHaveDealWith(iGuideRepairOrderService.countStatisticsNum("3",null,null,null,null,null,null,null));
+ workOrder.setRemainEvaluated(iGuideRepairOrderService.countStatisticsNum("4",null,null,null,null,null,null,null));
+ workOrder.setCanceled(iGuideRepairOrderService.countStatisticsNum("5",null,null,null,null,null,null,null));
+ // //服务状态(1.已解决 2.未解决)
+ workOrder.setUnsolved(iGuideRepairOrderService.countStatisticsNum(null,null,null,null,null,null,"2",null));
+ workOrder.setResolved(iGuideRepairOrderService.countStatisticsNum(null,null,null,null,null,null,"1",null));
+
+ //是否超时 （1 未超时 2已超时） 超时未办结
+ workOrder.setOvertime(iGuideRepairOrderService.countStatisticsNum(null,null,null,"2",null,null,null,null));
+// 超时未办结
+ workOrder.setOvertimeWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",null,null,"2",null,null,null,null));
+ return ResultData.success(workOrder);
+ }
+
+
+ @ApiOperation("首页统计不同时间段的工单数量")
+ @GetMapping("/getTimeWorkOrder")
+ public ResultData<TimeWorkOrder> getTimeWorkOrder()
+ {
+ //1 今天 2昨天 3本月 4本年度
+ //累计全部 本年 本月 今日 昨日
+ TimeWorkOrder timeWorkOrder=new TimeWorkOrder();
+ timeWorkOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum(null,null,null,null,null,null,null,null));
+ timeWorkOrder.setYearNum(iGuideRepairOrderService.countStatisticsNum(null,null,"4",null,null,null,null,null));
+ timeWorkOrder.setMonthNum(iGuideRepairOrderService.countStatisticsNum(null,null,"3",null,null,null,null,null));
+ timeWorkOrder.setTodayNum(iGuideRepairOrderService.countStatisticsNum(null,null,"1",null,null,null,null,null));
+ timeWorkOrder.setYesterdayNum(iGuideRepairOrderService.countStatisticsNum(null,null,"2",null,null,null,null,null));
+ return ResultData.success(timeWorkOrder);
+ }
+
+
+ @ApiOperation("根据选择的时间段 筛选导办工单数 timeType：1 本年度 15 近15天的 30 近30天的")
+ @GetMapping("/getSelectionTimeOrder")
+ public ResultData<CountList> getSelectionTimeOrder(@RequestParam("timeType") Integer timeType)
+ {
+ if(timeType<1)
+ {
+ return ResultData.error("请输入时间");
+ }
+
+ if(timeType==1)
+ {
+ Calendar calendar=Calendar.getInstance();
+ timeType=calendar.get(Calendar.DAY_OF_YEAR);
+ }
+// System.out.println(timeType);
+ //1 本年度 15 近15天的 30 近30天的
+ List<CountListNum> listOne=iGuideRepairOrderService.countListNum("2",null,timeType);
+ List<CountListNum> listTwo=iGuideRepairOrderService.countListNum("3",null,timeType);
+ CountList countList=new CountList();
+ countList.setWaitDealWithList(listOne);
+ countList.setHaveDealWith(listTwo);
+ return ResultData.success(countList);
+ }
+
+
+
+ @ApiOperation("获取效率比值")
+ @GetMapping("/getEfficiency")
+ public ResultData<EfficiencyEntity> getEfficiency()
+ {
+ EfficiencyEntity entity=new EfficiencyEntity();
+ //总工单数
+ int allNum=iGuideRepairOrderService.countStatisticsNum("",null,null,null,null,null,null,null);
+
+ java.text.DecimalFormat weekDf=new java.text.DecimalFormat("##.##%");//传入格式模板
+
+ int bj=iGuideRepairOrderService.countStatisticsNum("3",null,null,null,null,null,null,null);
+ if(bj!=0)
+ {
+ // 好评率=评价为满意的导办工单数量/已办结状态工单数量
+ String goodReputationEfficiency=weekDf.format((float)(iGuideRepairOrderService.countStatisticsNum(null,null,null,null,"1",null,null,null)
+ /(float)bj));
+ entity.setGoodReputationEfficiency(goodReputationEfficiency);
+
+ // 解决率=已解决状态的导办工单数量/已办结状态工单数量
+ String resolveEfficiency=weekDf.format((float)(iGuideRepairOrderService.countStatisticsNum(null,null,null,null,null,null,"1",null)
+ /(float)bj));
+ entity.setResolveEfficiency(resolveEfficiency);
+
+ if(allNum!=0)
+ {
+// 办结率=待评价+已办结状态的导办工单数量/总工单数量
+ String workEfficiency=weekDf.format((float)((iGuideRepairOrderService.countStatisticsNum("4",null,null,null,null,null,null,null)
+ +bj)/(float)allNum));
+ entity.setWorkEfficiency(workEfficiency);
+ }
+ }
+
+ int cs=iGuideRepairOrderService.countStatisticsNum(null,null,null,"2",null,null,null,null);
+ if(cs!=0)
+ {
+ // 超时办结率=超时状态下的待评价+已办结状态的导办工单数量/超时状态的导办工单数量
+ String timeoutEfficiency=weekDf.format((float)((iGuideRepairOrderService.countStatisticsNum("4",null,null,"2",null,null,null,null)
+ +iGuideRepairOrderService.countStatisticsNum("3",null,null,"2",null,null,null,null))
+ /(float)cs));
+ entity.setTimeoutEfficiency(timeoutEfficiency);
+
+ }
+
+ if(allNum!=0)
+ {
+ // 回复率=最新进展里大于0条回复的导办工单数量/总工单数量
+ //状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 6未解决 7已解决 8 系统自动分配 9 回复 10转派 11手动分配）
+
+ String num=(homeStatisticsService.reversionRate("9",null));
+ if(!StringUtils.isEmpty(num))
+ {
+ String reversionRate=weekDf.format(Float.valueOf(num)/(float)allNum);
+ entity.setReversionRate(reversionRate);
+ }
+
+
+ }
+
+ return ResultData.success(entity);
+ }
+
+ @ApiOperation("工单 办事指南饼状图数据")
+ @GetMapping("/getPieChart")
+ public ResultData<PieChartAll> getPieChart()
+ {
+ PieChartAll pieChartAll=new PieChartAll();
+ pieChartAll.setWorkOrderNum(iGuideRepairOrderService.countStatisticsNum("",null,null,null,null,null,null,null)+"");
+ pieChartAll.setFingerpostNum(homeStatisticsService.countStatisticsNum(null,null)+"");
+ List<PieChart> workOrderList=new ArrayList<>();
+ List<PieChart> fingerpostList=new ArrayList<>();
+ List<ClassifyAdministration> oneIds=homeStatisticsService.getClassify(null,"1");
+ for (ClassifyAdministration oneClassify:oneIds)
+ {
+ PieChart workOrder=new PieChart();
+ PieChart fingerpost=new PieChart();
+ workOrder.setName(oneClassify.getClassifyName());
+ fingerpost.setName(oneClassify.getClassifyName());
+ List<ClassifyAdministration> twoIds = homeStatisticsService.getClassify(oneClassify.getId()+"",null);
+
+ List clasIds=new ArrayList();
+
+ clasIds.add(oneClassify.getId());
+ for (ClassifyAdministration classify:twoIds)
+ {
+ clasIds.add(classify.getId());
+ }
+ int workOrderNum=0;
+ int fingerpostNum=0;
+ if(clasIds.size()>0)
+ {
+ workOrderNum=iGuideRepairOrderService.countStatisticsNum(null,null,null,null,null,clasIds,null,null);
+ fingerpostNum=homeStatisticsService.countStatisticsNum(clasIds,null);
+ }
+ workOrder.setNum(workOrderNum+"");
+ fingerpost.setNum(fingerpostNum+"");
+ workOrderList.add(workOrder);
+ fingerpostList.add(fingerpost);
+ }
+
+ pieChartAll.setWorkOrderList(workOrderList);
+ pieChartAll.setFingerpostList(fingerpostList);
+
+ return ResultData.success(pieChartAll);
+ }
+
+
+
+
+
+ @ApiOperation("组织排行榜 type 1 安评价 2 按办结量")
+ @GetMapping("/getOrganization")
+ public TableDataInfo<OrganizationEntity> getOrganization(@RequestParam("type") String type)
+ {
+ List<OrganizationEntity> guidePlates=homeStatisticsService.getDepartment();
+
+ if(StringUtils.equals("1",type))
+ {
+ for (OrganizationEntity bean:guidePlates)
+ {
+ bean.setNum(0+"");
+ List<String> ids=iOrganizationChartService.getIds(bean.getId()+"");
+
+ //总评分
+ String scoreNum=homeStatisticsService.organizationScore(ids)+"";
+ int score=0;
+ if(!StringUtils.isEmpty(scoreNum) && !StringUtils.equals("null",scoreNum))
+ {
+ score=Integer.valueOf(scoreNum);
+ }
+
+ //总数量
+ int allNum=homeStatisticsService.organizationNum(ids);
+
+ if(allNum>0 && score>0)
+ {
+ java.text.DecimalFormat weekDf=new java.text.DecimalFormat("##.#");//传入格式模板
+ String workEfficiency=weekDf.format((float)score/(float)allNum);
+ bean.setNum(workEfficiency);
+ }
+ }
+ }
+ else
+ {
+ for (OrganizationEntity bean:guidePlates)
+ {
+ bean.setNum(0+"");
+ List<String> ids=iOrganizationChartService.getIds(bean.getId()+"");
+ //总数量
+ int allNum=homeStatisticsService.organizationNum(ids);
+ if(allNum>0)
+ {
+ bean.setNum(allNum+"");
+ }
+ }
+ }
+
+ OrganizationEntity entity=null;
+ for(int i = 0 ;i< guidePlates.size() -1; i++) {
+ for (int j = 0; j < guidePlates.size() - 1 - i; j++) {
+
+ if(Float.valueOf(guidePlates.get(j).getNum())>Float.valueOf(guidePlates.get(j+1).getNum()))
+ {
+ entity=guidePlates.get(j);
+ guidePlates.set(j,guidePlates.get(j+1));
+ guidePlates.set(j+1,entity);
+ }
+ }
+ }
+
+ Collections.reverse(guidePlates);
+
+ return getDataTable(guidePlates,guidePlates.size());
+ }
+
+
+
+ @ApiOperation("导办人员排行榜 type 1 安评价 2 按办结量 3 按超时")
+ @GetMapping("/getGuidePlate")
+ public TableDataInfo<GuidePlate> getGuidePlate(@RequestParam("type") String type)
+ {
+ int allNum=homeStatisticsService.staffNum(null);
+
+ if(StringUtils.equals("1",type))
+ {
+ //安评价
+ return getDataTable(homeStatisticsService.score(null),allNum);
+ }
+ else if(StringUtils.equals("2",type))
+ {
+ //2 按办结量
+ return getDataTable(homeStatisticsService.guidePlatePeople(null),allNum);
+ }
+ else
+ {
+ //3 按超时
+ return getDataTable(homeStatisticsService.timeout(null),allNum);
+ }
+ }
+
+
+ @ApiOperation("办事指南排行榜 type 1 按浏览量 2 按办结量")
+ @GetMapping("/getGuidance")
+ public TableDataInfo<Guidance> getGuidance(@RequestParam("type") String type)
+ {
+ int allNum=homeStatisticsService.countWork(null);
+ if(StringUtils.equals("1",type))
+ {
+ return getDataTable(homeStatisticsService.guidanceBrowse(null),allNum);
+ }
+ else
+ {
+ return getDataTable(homeStatisticsService.guidanceTransaction(null),allNum);
+ }
+
+ }
+
+
+
+ @ApiOperation("导办工单按区域统计")
+ @GetMapping("/getRangeStatistics")
+ public TableDataInfo<RangeStatistics> getRangeStatistics()
+ {
+ List<AreaCode2022> code2022s=iAreaCodeService.getListByPCode("510400000000");
+
+ List<RangeStatistics> rangeStatistics=new ArrayList<>();
+
+ for (AreaCode2022 bean:code2022s)
+ {
+ RangeStatistics range=new RangeStatistics();
+ range.setName(bean.getName());
+
+ List<String> ids;
+
+ if(bean.getCode()==510401000000L)
+ {
+ ids=homeStatisticsService.countId("");
+ }
+ else
+ {
+ ids=homeStatisticsService.countId(bean.getCode()+"");
+ }
+ int num=0;
+ if(ids!=null&&ids.size()>0)
+ {
+ num=homeStatisticsService.rangeStatistics(ids);
+ }
+ range.setNum(num+"");
+ rangeStatistics.add(range);
+ }
+
+
+ return getDataTable(rangeStatistics);
+ }
+
+
+ /**
+ * 小程序用户访问量统计1.累计访问量2.本年访问量 3.本月访问量 4.今日访问量 5.昨日访问
+ * @return
+ */
+ @ApiOperation(value = "小程序用户访问量统计1.累计访问量2.本年访问量 3.本月访问量 4.今日访问量 5.昨日访问",response = AppletUserCount.class)
+ @GetMapping("/selectUserRecordCount")
+ public ResultData selectUserRecordCount(){
+ return iSysUserRecordService.selectUserRecordCount();
+ }
+
+ /**
+ * 小程序用户访问量统计1.近15天 2.近30天 3.近一年
+ * @return
+ */
+ @ApiOperation(value = "小程序用户访问量统计1.近15天 2.近30天 3.近一年",response = AppletUserCount.class)
+ @GetMapping("/selectByDateType")
+ public ResultData selectByDateType(@RequestParam("dateType") Integer dateType){
+ return iSysUserRecordService.selectByDateType(dateType);
+ }
+
+
+
+
+ /*************************************************** 部门数据统计 start **********************************************************/
+
+
+ @ApiOperation("部门数据根据选择的时间段 筛选导办工单数 timeType：1 本年度 15 近15天的 30 近30天的")
+ @GetMapping("/department/getSelectionTimeOrder")
+ public ResultData<CountList> getDepartmentOrder(@RequestParam("timeType") Integer timeType,@RequestParam("ids") List<String> ids)
+ {
+ if(ids==null || ids.size()<1)
+ {
+ return ResultData.success();
+ }
+
+ if(timeType<1)
+ {
+ return ResultData.error("请输入时间");
+ }
+
+ if(timeType==1)
+ {
+ Calendar calendar=Calendar.getInstance();
+ timeType=calendar.get(Calendar.DAY_OF_YEAR);
+ }
+// System.out.println(timeType);
+ //1 本年度 15 近15天的 30 近30天的
+ List<CountListNum> listOne=iGuideRepairOrderService.countListNum("2",ids,timeType);
+ List<CountListNum> listTwo=iGuideRepairOrderService.countListNum("3",ids,timeType);
+ CountList countList=new CountList();
+ countList.setWaitDealWithList(listOne);
+ countList.setHaveDealWith(listTwo);
+ return ResultData.success(countList);
+ }
+
+ @ApiOperation("部门数据首页统计不同时间段的工单数量")
+ @GetMapping("/department/getTimeWorkOrder")
+ public ResultData<TimeWorkOrder> getDepartmentTimeWorkOrder(@RequestParam("ids") List<String> ids)
+ {
+ if(ids==null || ids.size()<1)
+ {
+ return ResultData.success();
+ }
+
+
+ //1 今天 2昨天 3本月 4本年度
+ //累计全部 本年 本月 今日 昨日
+ TimeWorkOrder timeWorkOrder=new TimeWorkOrder();
+ timeWorkOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum(null,ids,null,null,null,null,null,null));
+ timeWorkOrder.setYearNum(iGuideRepairOrderService.countStatisticsNum(null,ids,"4",null,null,null,null,null));
+ timeWorkOrder.setMonthNum(iGuideRepairOrderService.countStatisticsNum(null,ids,"3",null,null,null,null,null));
+ timeWorkOrder.setTodayNum(iGuideRepairOrderService.countStatisticsNum(null,ids,"1",null,null,null,null,null));
+ timeWorkOrder.setYesterdayNum(iGuideRepairOrderService.countStatisticsNum(null,ids,"2",null,null,null,null,null));
+ return ResultData.success(timeWorkOrder);
+ }
+
+
+ @ApiOperation("部门数据首页统计不同状态工单数")
+ @GetMapping("/department/getWorkOrder")
+ public ResultData<WorkOrder> getDepartmentWorkOrder(@RequestParam("ids") List<String> ids)
+ {
+ if(ids==null || ids.size()<1)
+ {
+ return ResultData.success();
+ }
+ WorkOrder workOrder=new WorkOrder();
+ //状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消）
+ workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",ids,null,null,null,null,null,null));
+ workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",ids,null,null,null,null,null,null));
+ workOrder.setWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",ids,null,null,null,null,null,null));
+ workOrder.setHaveDealWith(iGuideRepairOrderService.countStatisticsNum("3",ids,null,null,null,null,null,null));
+ workOrder.setRemainEvaluated(iGuideRepairOrderService.countStatisticsNum("4",ids,null,null,null,null,null,null));
+ workOrder.setCanceled(iGuideRepairOrderService.countStatisticsNum("5",ids,null,null,null,null,null,null));
+ // //服务状态(1.已解决 2.未解决)
+ workOrder.setUnsolved(iGuideRepairOrderService.countStatisticsNum(null,ids,null,null,null,null,"2",null));
+ workOrder.setResolved(iGuideRepairOrderService.countStatisticsNum(null,ids,null,null,null,null,"1",null));
+
+ //是否超时 （1 未超时 2已超时） 超时未办结
+ workOrder.setOvertime(iGuideRepairOrderService.countStatisticsNum(null,ids,null,"2",null,null,null,null));
+// 超时未办结
+ workOrder.setOvertimeWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",ids,null,"2",null,null,null,null));
+ return ResultData.success(workOrder);
+ }
+
+ @ApiOperation("部门数据获取效率比值")
+ @GetMapping("/department/getEfficiency")
+ public ResultData<EfficiencyEntity> getDepartmentEfficiency(@RequestParam("ids") List<String> ids)
+ {
+
+ if(ids==null || ids.size()<1)
+ {
+ return ResultData.success();
+ }
+
+ EfficiencyEntity entity=new EfficiencyEntity();
+ //总工单数
+ int allNum=iGuideRepairOrderService.countStatisticsNum("",ids,null,null,null,null,null,null);
+
+ java.text.DecimalFormat weekDf=new java.text.DecimalFormat("##.##%");//传入格式模板
+
+ int bj=iGuideRepairOrderService.countStatisticsNum("3",ids,null,null,null,null,null,null);
+ if(bj!=0)
+ {
+ // 好评率=评价为满意的导办工单数量/已办结状态工单数量
+ String goodReputationEfficiency=weekDf.format((float)(iGuideRepairOrderService.countStatisticsNum(null,ids,null,null,"1",null,null,null)
+ /(float)bj));
+ entity.setGoodReputationEfficiency(goodReputationEfficiency);
+
+ // 解决率=已解决状态的导办工单数量/已办结状态工单数量
+ String resolveEfficiency=weekDf.format((float)(iGuideRepairOrderService.countStatisticsNum(null,ids,null,null,null,null,"1",null)
+ /(float)bj));
+ entity.setResolveEfficiency(resolveEfficiency);
+
+ if(allNum!=0)
+ {
+// 办结率=待评价+已办结状态的导办工单数量/总工单数量
+ String workEfficiency=weekDf.format((float)((iGuideRepairOrderService.countStatisticsNum("4",ids,null,null,null,null,null,null)
+ +bj)/(float)allNum));
+ entity.setWorkEfficiency(workEfficiency);
+ }
+ }
+
+ int cs=iGuideRepairOrderService.countStatisticsNum(null,ids,null,"2",null,null,null,null);
+ if(cs!=0)
+ {
+ // 超时办结率=超时状态下的待评价+已办结状态的导办工单数量/超时状态的导办工单数量
+ String timeoutEfficiency=weekDf.format((float)((iGuideRepairOrderService.countStatisticsNum("4",ids,null,"2",null,null,null,null)
+ +iGuideRepairOrderService.countStatisticsNum("3",ids,null,"2",null,null,null,null))
+ /(float)cs));
+ entity.setTimeoutEfficiency(timeoutEfficiency);
+
+ }
+
+ if(allNum!=0)
+ {
+ // 回复率=最新进展里大于0条回复的导办工单数量/总工单数量
+ //状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 6未解决 7已解决 8 系统自动分配 9 回复 10转派 11手动分配）
+
+ String num=(homeStatisticsService.reversionRate("9",null));
+ if(!StringUtils.isEmpty(num))
+ {
+ String reversionRate=weekDf.format(Float.valueOf(num)/(float)allNum);
+ entity.setReversionRate(reversionRate);
+ }
+
+
+ }
+
+ return ResultData.success(entity);
+ }
+
+
+ @ApiOperation("部门数据 工单 办事指南饼状图数据")
+ @GetMapping("/department/getPieChart")
+ public ResultData<PieChartAll> getDepartmentPieChart(@RequestParam("ids") List<String> ids)
+ {
+ if(ids==null || ids.size()<1)
+ {
+ return ResultData.success();
+ }
+
+ PieChartAll pieChartAll=new PieChartAll();
+ pieChartAll.setWorkOrderNum(iGuideRepairOrderService.countStatisticsNum("",ids,null,null,null,null,null,null)+"");
+ pieChartAll.setFingerpostNum(homeStatisticsService.countStatisticsNum(null,ids)+"");
+ List<PieChart> workOrderList=new ArrayList<>();
+ List<PieChart> fingerpostList=new ArrayList<>();
+ List<ClassifyAdministration> oneIds=homeStatisticsService.getClassify(null,"1");
+ for (ClassifyAdministration oneClassify:oneIds)
+ {
+ PieChart workOrder=new PieChart();
+ PieChart fingerpost=new PieChart();
+ workOrder.setName(oneClassify.getClassifyName());
+ fingerpost.setName(oneClassify.getClassifyName());
+ List<ClassifyAdministration> twoIds = homeStatisticsService.getClassify(oneClassify.getId()+"",null);
+
+ List clasIds=new ArrayList();
+
+ clasIds.add(oneClassify.getId());
+ for (ClassifyAdministration classify:twoIds)
+ {
+ clasIds.add(classify.getId());
+ }
+ int workOrderNum=0;
+ int fingerpostNum=0;
+ if(clasIds.size()>0)
+ {
+ workOrderNum=iGuideRepairOrderService.countStatisticsNum(null,ids,null,null,null,clasIds,null,null);
+ fingerpostNum=homeStatisticsService.countStatisticsNum(clasIds,ids);
+ }
+ workOrder.setNum(workOrderNum+"");
+ fingerpost.setNum(fingerpostNum+"");
+ workOrderList.add(workOrder);
+ fingerpostList.add(fingerpost);
+ }
+
+ pieChartAll.setWorkOrderList(workOrderList);
+ pieChartAll.setFingerpostList(fingerpostList);
+
+ return ResultData.success(pieChartAll);
+ }
+
+
+ @ApiOperation("部门数据导办人员排行榜 type 1 安评价 2按工单量 3按办结量 4 按未办结量 5 按超时")
+ @GetMapping("/department/getGuidePlate")
+ public TableDataInfo<GuidePlate> getDepartmentGuidePlate(@RequestParam("type") String type,@RequestParam("ids") List<String> ids)
+ {
+ if(ids==null || ids.size()<1)
+ {
+ return getDataTable(new ArrayList<>());
+ }
+
+ int allNum=homeStatisticsService.staffNum(ids);
+
+ if(StringUtils.equals("1",type))
+ {
+ //安评价
+ return getDataTable(homeStatisticsService.score(ids),allNum);
+ }
+ else if(StringUtils.equals("2",type))
+ {
+ //2按工单量
+ return getDataTable(homeStatisticsService.workunit(ids),allNum);
+ }
+ else if(StringUtils.equals("3",type))
+ {
+ //3 按办结量
+ return getDataTable(homeStatisticsService.guidePlatePeople(ids),allNum);
+ }
+ else if(StringUtils.equals("4",type))
+ {
+ //4按未办结量
+ return getDataTable(homeStatisticsService.tosettled(ids),allNum);
+ }
+ else
+ {
+ //5 按超时
+ return getDataTable(homeStatisticsService.timeout(ids),allNum);
+ }
+
+ }
+
+
+ @ApiOperation("部门数据办事指南排行榜 type 1 按浏览量 2 按办结量")
+ @GetMapping("/department/getGuidance")
+ public TableDataInfo<Guidance> getDepartmentGuidance(@RequestParam("type") String type,@RequestParam("ids") List<String> ids)
+ {
+ if(ids==null || ids.size()<1)
+ {
+ return getDataTable(new ArrayList<>());
+ }
+
+ int allNum=homeStatisticsService.countWork(ids);
+ if(StringUtils.equals("1",type))
+ {
+ return getDataTable(homeStatisticsService.guidanceBrowse(ids),allNum);
+ }
+ else
+ {
+ return getDataTable(homeStatisticsService.guidanceTransaction(ids),allNum);
+ }
+
+ }
+
+
+
+ /*************************************************** 部门数据统计 end **********************************************************/
+
+
+ /**
+ * 统计访问量
+ * @return
+ */
+ @ApiOperation("统计访问量")
+ @GetMapping("/countSmartConsulting")
+ public ResultData countSmartConsulting(){
+ return ResultData.success(iAutomessageSmartConsultingService.countSmartConsulting()) ;
+ }
+
+
+
+
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/KeywordController.java b/flower_city/src/main/java/com/dg/core/controller/KeywordController.java
new file mode 100644
index 0000000..85d365a
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/KeywordController.java
@@ -0,0 +1,108 @@
+package com.dg.core.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.db.gen.entity.KeywordEntity;
+import com.dg.core.service.IKeywordService;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = {"关键词接口"})
+@RestController
+@RequestMapping("/keyword")
+public class KeywordController extends BaseController
+{
+ @Autowired(required = true)
+ IKeywordService iKeywordService;
+
+ /**
+ * 查询关键词列表
+ * @return
+ */
+ @ApiOperation("关键词列表接口")
+ @GetMapping("/getlist")
+ @Authorization
+ public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize)
+ {
+ Assert.notNull(pageNum, "pageNum can not be empty");
+ Assert.notNull(pageSize, "pageSize can not be empty");
+ Page<KeywordEntity> pageParam = new Page<>(pageNum,pageSize);
+ List<KeywordEntity> list = iKeywordService.selectConfigList(pageParam,pageSize);
+
+ int num=iKeywordService.countNum();
+ return getDataTable(list,num);
+ }
+
+ /**
+ * 查询详情
+ * @return
+ */
+ @ApiOperation("关键词详情接口")
+ @GetMapping("/getData")
+ @Authorization
+ public ResultData selectConfigData(@RequestParam(value = "id",required = false) String id,
+ @RequestParam(value = "name",required = false) String name)
+ {
+ return ResultData.success(iKeywordService.selectConfigData(id,name));
+ }
+
+
+ /**
+ * 添加关键词
+ * @return
+ */
+ @ApiOperation("关键词添加接口")
+ @PostMapping("/add")
+ @Authorization
+ public ResultData insertConfig(@RequestBody KeywordEntity entity)
+ {
+ KeywordEntity enti=iKeywordService.selectConfigData("",entity.getName());
+ if(enti==null)
+ {
+ if(iKeywordService.insertConfig(entity)>0)
+ {
+ enti=iKeywordService.selectConfigData("",entity.getName());
+ return ResultData.success(enti);
+ }
+ }
+ else
+ {
+ return ResultData.success(enti);
+ }
+ return ResultData.error("创建数据失败");
+ }
+
+ /**
+ * 编辑关键词
+ * @return
+ */
+ @ApiOperation("关键词编辑接口")
+ @PostMapping("/update")
+ @Authorization
+ public ResultData updateConfig(@RequestBody KeywordEntity entity)
+ {
+ return toAjax(iKeywordService.updateConfig(entity));
+ }
+
+ /**
+ * 删除关键词
+ * @param Id
+ * @return
+ */
+ @ApiOperation("关键词删除接口")
+ @DeleteMapping("/delete")
+ @Authorization
+ public ResultData deleteConfigById(String Id)
+ {
+ return toAjax(iKeywordService.deleteConfigById(Id));
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/MenuController.java b/flower_city/src/main/java/com/dg/core/controller/MenuController.java
new file mode 100644
index 0000000..f1a3736
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/MenuController.java
@@ -0,0 +1,73 @@
+package com.dg.core.controller;
+
+
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.MenuEntity;
+import com.dg.core.service.IMenuService;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 菜单接口
+ */
+@Api(tags = {"菜单接口"})
+@RestController
+@RequestMapping("/menu")
+public class MenuController extends BaseController
+{
+
+ @Autowired(required = true)
+ IMenuService iMenuService;
+
+
+ /**
+ * 获取菜单列表
+ * @return
+ */
+ @ApiOperation("获取菜单列表")
+ @GetMapping("/getMenuList")
+ public TableDataInfo selectConfigList()
+ {
+ int num=iMenuService.countNum();
+ return getDataTable(iMenuService.selectConfigList(),num);
+ }
+
+
+ /**
+ * 添加新菜单
+ * @return
+ */
+ @ApiOperation("添加新菜单")
+ @PostMapping("/addMenu")
+ public ResultData insertConfig(@RequestBody MenuEntity entity)
+ {
+ return toAjax(iMenuService.insertConfig(entity));
+ }
+
+ /**
+ * 更新菜单
+ * @param entity
+ * @return
+ */
+ @ApiOperation("更新菜单")
+ @PostMapping("/updateMenu")
+ public ResultData updateConfig(@RequestBody MenuEntity entity)
+ {
+ return toAjax(iMenuService.updateConfig(entity));
+ }
+
+ /**
+ * 删除菜单
+ * @param id
+ * @return
+ */
+ @ApiOperation("删除菜单")
+ @DeleteMapping("/deleteMenu")
+ public ResultData deleteConfigById(@RequestParam("id") Long id)
+ {
+ return toAjax(iMenuService.deleteConfigById(id));
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
new file mode 100644
index 0000000..44cdb75
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
@@ -0,0 +1,280 @@
+package com.dg.core.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.db.gen.entity.OrganizationChartEntity;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.db.gen.entity.TransactionEvent;
+import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.service.ITransactionEventService;
+import com.dg.core.util.PermissionUtil;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Api(tags = {"组织架构接口"})
+@RestController
+@RequestMapping("/organization")
+public class OrganizationController extends BaseController
+{
+
+ @Autowired(required = true)
+ IOrganizationChartService iOrganizationChartService;
+
+ @Autowired(required = true)
+ ITransactionEventService iTransactionEventService;
+
+ /**
+ * 查询机构列表
+ */
+ @ApiOperation(value = "查询机构列表",response = OrganizationChartEntity.class)
+ @GetMapping("/getList")
+ public TableDataInfo selectConfigList()
+ {
+ return getDataTable(iOrganizationChartService.selectConfigList("","",null));
+ }
+
+
+ /**
+ * 查询机构列表(权限)
+ */
+ @ApiOperation(value = "查询机构列表(权限 选择用 ) ",response = OrganizationChartEntity.class)
+ @GetMapping("/selectJurisdiction")
+ @Authorization
+ public TableDataInfo selectJurisdiction(@CurrentUser SysUser sysUser)
+ {
+ return getDataTable(iOrganizationChartService.selectConfigList(sysUser.getDepartmentId(),"",null));
+ }
+
+ /**
+ * 新增机构
+ */
+ @ApiOperation(value = "新增机构",response = OrganizationChartEntity.class)
+ @PostMapping("/add")
+ @Authorization
+ public ResultData insertConfig(@RequestBody OrganizationChartEntity entity)
+ {
+ Assert.notNull(entity.getGrade(), "等级 grade 不能为空");
+
+ if (StringUtils.equals("1",entity.getGrade()))
+ {
+ if(!StringUtils.isEmpty(entity.getParentId()))
+ {
+ return ResultData.error("一级部门不能有父级部门");
+ }
+ }
+ else
+ {
+ if(StringUtils.isEmpty(entity.getParentId()))
+ {
+ return ResultData.error("非一级部门父级部门不能为空");
+ }
+ }
+ return toAjax(iOrganizationChartService.insertConfig(entity));
+ }
+
+ /**
+ * 更新机构
+ */
+ @ApiOperation(value = "更新机构",response = OrganizationChartEntity.class)
+ @PostMapping("/update")
+ @Authorization
+ public ResultData updateConfig(@RequestBody OrganizationChartEntity entity,@CurrentUser SysUser sysUser)
+ {
+ entity.setUpdateTime(LocalDateTime.now());
+ entity.setUpdateUserId(sysUser.getUserId());
+ return toAjax(iOrganizationChartService.updateConfig(entity));
+ }
+
+ /**
+ * 删除机构
+ */
+ @ApiOperation("删除机构")
+ @DeleteMapping("/delete")
+ @Authorization
+ public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
+ {
+ Assert.notNull(Id, "Id 不能为空");
+ List<OrganizationChartEntity> list=iOrganizationChartService.selectParentList(Id,"");
+
+ if(list!=null && list.size()>0)
+ {
+ return ResultData.error("该机构下存在其他部门！请先删除子部门");
+ }
+
+ List<String> ids=new ArrayList<>();
+ ids.add(Id);
+ List<TransactionEvent> transactionEvents=iTransactionEventService.selectConfigList(null,null,ids);
+
+ if(transactionEvents!=null && transactionEvents.size()>0)
+ {
+ return ResultData.error("该机构下已绑定办事指南！请解绑办事指南");
+ }
+ return toAjax(iOrganizationChartService.deleteConfigById(Id));
+ }
+
+ /**
+ * 查询机构列表(不分级不分页按等级排序)
+ */
+ @ApiOperation(value = "查询机构列表(不分级不分页按等级排序)",response = OrganizationChartEntity.class)
+ @GetMapping("/selectList")
+ public TableDataInfo selectList(){
+ return getDataTable(iOrganizationChartService.selectList());
+ }
+
+ /**
+ * 根据id查取消组织机构
+ */
+ @ApiOperation(value = "根据id查取消组织机构",response = OrganizationChartEntity.class)
+ @GetMapping("/selectById")
+ ResultData selectConfigById(@RequestParam("id") String id){
+ return ResultData.success(iOrganizationChartService.selectConfigById(id));
+ }
+
+
+ /**
+ * 查询机构列表(分页)
+ */
+ @ApiOperation(value = "查询机构列表(分页)(部门应用)",response = OrganizationChartEntity.class)
+ @GetMapping("/queryList")
+ @Authorization
+ public TableDataInfo queryList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "organizationName",required = false)String organizationName,
+ @CurrentUser SysUser sysUser){
+ Assert.notNull(pageNum, "pageNum can not be empty");
+ Assert.notNull(pageSize, "pageSize can not be empty");
+ Page<OrganizationChartEntity> pageParam = new Page<>(pageNum,pageSize);
+ List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ return getDataTable(iOrganizationChartService.queryList(pageParam,pageSize,organizationName,ids),
+ iOrganizationChartService.countList(organizationName,ids));
+ }
+
+
+
+
+ /**
+ * 通过父级id查询对应机构下的全部部门id
+ * @param departmentId
+ * @return
+ */
+ @ApiOperation(value = "通过父级id查询对应机构下的全部部门")
+ @GetMapping("/getdepartment/id")
+ public TableDataInfo getOrganizationIds(@RequestParam(value = "department",required = false) String departmentId)
+ {
+ if(StringUtils.isEmpty(departmentId))
+ {
+ return getDataTable("departmentId 不能为空");
+ }
+
+ List<String> ids=new ArrayList<>();
+ List<String> getId=iOrganizationChartService.getIds(departmentId);
+ ids.addAll(getId);
+ return getDataTable(ids);
+ }
+
+
+
+
+
+ /**
+ * 通过父级id查询对应机构下的全部部门
+ * @param departmentId
+ * @return
+ */
+ @ApiOperation(value = "通过父级id查询对应机构下的全部部门",response = OrganizationChartEntity.class)
+ @GetMapping("/getdepartment")
+ public TableDataInfo getOrganizations(@RequestParam(value = "department",required = false) String departmentId)
+ {
+ List<OrganizationChartEntity> ids=new ArrayList<>();
+ List<OrganizationChartEntity> lists=null;
+ if(StringUtils.isEmpty(departmentId))
+ {
+ lists= iOrganizationChartService.selectParentList(null,"1");
+
+ }
+ else
+ {
+ lists= iOrganizationChartService.selectParentList(departmentId,null);
+ }
+
+ if(lists.size()<1)
+ {
+ lists.add(iOrganizationChartService.selectConfigById(departmentId));
+ }
+ ids=disposestreet(lists);
+ if(ids.size()<1)
+ {
+ return null;
+ }
+
+ if(!StringUtils.isEmpty(departmentId))
+ {
+ ids.add(iOrganizationChartService.selectConfigById(departmentId));
+ }
+
+ return getDataTable(ids);
+ }
+
+ //递归取id
+ private List<OrganizationChartEntity> disposestreet(List<OrganizationChartEntity> lists)
+ {
+ List<OrganizationChartEntity> ids=new ArrayList<>();
+ for (OrganizationChartEntity sysStreet:lists)
+ {
+ if(sysStreet.getChild()!=null && sysStreet.getChild().size()>0)
+ {
+ ids.addAll(disposestreet(sysStreet.getChild()));
+ }
+ else
+ {
+ ids.add(sysStreet);
+ }
+ }
+ return ids;
+ }
+
+
+ /**
+ * 查询机构列表
+ */
+ @ApiOperation(value = "查询可切换机构列表",response = OrganizationChartEntity.class)
+ @GetMapping("switch/getList")
+ @Authorization
+ public TableDataInfo switchGetList(@CurrentUser SysUser sysUser)
+ {
+ List<String> ids=new ArrayList<>();
+ if(!StringUtils.isEmpty(sysUser.getMoreDepartmentIds()))
+ {
+ if(sysUser.getMoreDepartmentIds().indexOf(",")==-1)
+ {
+ ids.add(sysUser.getDepartmentId());
+ }
+ else
+ {
+ String[] list=sysUser.getMoreDepartmentIds().split(",");
+ for (String id:list)
+ {
+ ids.add(id);
+ }
+ }
+ }
+ else
+ {
+ ids.add(sysUser.getDepartmentId());
+ }
+
+ return getDataTable(iOrganizationChartService.selectConfigList(ids));
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java b/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
new file mode 100644
index 0000000..e8e2838
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
@@ -0,0 +1,180 @@
+package com.dg.core.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.db.gen.entity.ReplyTemplateEntity;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.service.IReplyTemplateService;
+import com.dg.core.util.PermissionUtil;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = {"回复模板接口"})
+@RestController
+@RequestMapping("/reply")
+public class ReplyTemplateController extends BaseController
+{
+
+ @Autowired
+ IReplyTemplateService iReplyTemplateService;
+
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
+
+
+ /**
+ * 获取模板列表
+ * @return
+ */
+ @ApiOperation("获取模板列表")
+ @GetMapping("/getlist")
+ @Authorization
+ public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "name",required = false) String Name,
+ @CurrentUser SysUser sysUser)
+ {
+ Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
+ List<String> ids=PermissionUtil.getStairDepartment(sysUser,iOrganizationChartService);
+ List<ReplyTemplateEntity> list;
+ if (sysUser.getUserType().equals("1")||sysUser.getIsDivisionHead().equals("1")){
+ list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);
+ }
+ else {
+ list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,sysUser.getUserId());
+ }
+ int num=iReplyTemplateService.countNum(Name,ids);
+ return getDataTable(list,num);
+ }
+
+ /**
+ * 获取详情
+ * @param Id
+ * @return
+ */
+ @ApiOperation("获取详情")
+ @GetMapping("/getdata")
+ @Authorization
+ public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id)
+ {
+ if(StringUtils.isEmpty(Id))
+ {
+ return ResultData.error("Id不能为空");
+ }
+ return ResultData.success(iReplyTemplateService.selectConfigData(Id));
+ }
+
+ /**
+ * 新增模板
+ * @param entity
+ * @return
+ */
+ @ApiOperation("新增模板")
+ @PostMapping("/add")
+ @Authorization
+ public ResultData insertConfig(@RequestBody ReplyTemplateEntity entity,@CurrentUser SysUser sysUser)
+ {
+ if(entity==null)
+ {
+ return ResultData.error("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getName()))
+ {
+ return ResultData.error("模板名称不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getDepartmentId()))
+ {
+ return ResultData.error("部门id不能为空 请分配部门id");
+ }
+
+ List<String> ids=iOrganizationChartService.getIds(entity.getDepartmentId());
+ int num=iReplyTemplateService.countNum(entity.getName(),ids);
+
+ if(num>0)
+ {
+ return ResultData.error("部门里办事名称重复！");
+ }
+
+ entity.setId(null);
+ entity.setDepartmentId(entity.getDepartmentId());
+ entity.setCreateUserId(sysUser.getUserId()+"");
+
+ return toAjax(iReplyTemplateService.insertConfig(entity));
+ }
+
+ /**
+ * 更新模板
+ * @param entity
+ * @return
+ */
+ @ApiOperation("更新模板")
+ @PostMapping("/update")
+ @Authorization
+ public ResultData updateConfig(@RequestBody ReplyTemplateEntity entity)
+ {
+ if(entity==null)
+ {
+ return ResultData.error("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getName()))
+ {
+ return ResultData.error("模板名称不能为空");
+ }
+ return toAjax(iReplyTemplateService.updateConfig(entity));
+ }
+
+ /**
+ * 删除模板
+ * @param Id
+ * @return
+ */
+ @ApiOperation("删除模板")
+ @DeleteMapping("/delete")
+ @Authorization
+ public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
+ {
+ return toAjax(iReplyTemplateService.deleteConfigById(Id));
+ }
+
+
+ /**
+ * 复制模板
+ * @param Id
+ * @return
+ */
+ @ApiOperation("复制模板")
+ @PostMapping("/copy")
+ @Authorization
+ public ResultData copy(@RequestParam(value = "Id",required = false) String Id,@CurrentUser SysUser sysUser)
+ {
+ if(StringUtils.isEmpty(Id))
+ {
+ return ResultData.error("Id不能为空");
+ }
+
+ ReplyTemplateEntity entity=iReplyTemplateService.selectConfigData(Id);
+
+ if(entity==null)
+ {
+ return ResultData.error("模板不存在！");
+ }
+ entity.setCreateUserId(sysUser.getUserId());
+ entity.setName(entity.getName()+"(副本)");
+ entity.setId(null);
+ return toAjax(iReplyTemplateService.insertConfig(entity));
+ }
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java b/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
new file mode 100644
index 0000000..bcc1744
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
@@ -0,0 +1,101 @@
+package com.dg.core.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.db.gen.entity.RoleManagementEntity;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IRoleManagementService;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = {"角色管理接口"})
+@RestController
+@RequestMapping("/role")
+public class RoleManagementController extends BaseController
+{
+
+ @Autowired
+ IRoleManagementService iRoleManagementService;
+
+ /**
+ * 查询角色列表
+ * @param pageNum
+ * @param pageSize
+ * @return
+ */
+ @ApiOperation("查询角色列表")
+ @GetMapping("/getList")
+ @Authorization
+ public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "name",required = false) String name)
+ {
+ if(pageNum==null)
+ {
+ return getDataTable("分页不能为空");
+ }
+ if(pageSize==null)
+ {
+ return getDataTable("分页条数不能为空");
+ }
+
+ Page<RoleManagementEntity> pageParam = new Page<>(pageNum,pageSize);
+ List<RoleManagementEntity> list = iRoleManagementService.selectConfigList(pageParam,pageSize,name);
+
+ int num=iRoleManagementService.countNum(name);
+ return getDataTable(list,num);
+ }
+
+ /**
+ * 新增角色
+ * @param entity
+ * @return
+ */
+ @ApiOperation("新增角色")
+ @PostMapping("/add")
+ @Authorization
+ public ResultData insertConfig(@RequestBody RoleManagementEntity entity, @CurrentUser SysUser sysUser)
+ {
+ entity.setCreateUserId(sysUser.getUserId()+"");
+ return toAjax(iRoleManagementService.insertConfig(entity));
+ }
+
+ /**
+ * 编辑角色
+ * @param entity
+ * @return
+ */
+ @ApiOperation("编辑角色")
+ @PostMapping("/update")
+ @Authorization
+ public ResultData updateConfig(@RequestBody RoleManagementEntity entity,@CurrentUser SysUser sysUser)
+ {
+ entity.setUpdateUserId(sysUser.getUserId()+"");
+ return toAjax(iRoleManagementService.updateConfig(entity));
+ }
+
+ /**
+ * 删除角色
+ * @param Id
+ * @return
+ */
+ @DeleteMapping("/delete")
+ @Authorization
+ public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
+ {
+ if(StringUtils.isEmpty(Id))
+ {
+ return ResultData.error("Id 不能为空");
+ }
+ return toAjax(iRoleManagementService.deleteConfigById(Id));
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/SlideshowController.java b/flower_city/src/main/java/com/dg/core/controller/SlideshowController.java
new file mode 100644
index 0000000..ced81f0
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/SlideshowController.java
@@ -0,0 +1,82 @@
+package com.dg.core.controller;
+
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.db.gen.entity.Agreement;
+import com.dg.core.db.gen.entity.OrganizationChartEntity;
+import com.dg.core.db.gen.entity.Slideshow;
+import com.dg.core.service.ISlideshowService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = {"轮播图接口"})
+@RestController
+@RequestMapping("/slideshow")
+public class SlideshowController extends BaseController{
+
+ @Autowired(required = true)
+ ISlideshowService iSlideshowService;
+
+ /**
+ * 查询轮播图列表(不分页)
+ * @return
+ */
+ @ApiOperation(value = "查询轮播图列表(不分页)",response = Slideshow.class)
+ @GetMapping("/selectList")
+ public ResultData selectList(){
+ return ResultData.success(iSlideshowService.selectList());
+
+ }
+
+ /**
+ * 根据id 查询轮播图数据
+ *
+ * @return 参数配置信息
+ */
+ @ApiOperation(value = "根据id 查询轮播图数据",response = Slideshow.class)
+ @GetMapping("/selectById")
+ public ResultData queryById(Integer id){
+ return ResultData.success(iSlideshowService.queryById(id));
+ }
+
+
+ /**
+ * 根据id 新增轮播图数据
+ *
+ * @return 参数配置信息
+ */
+ @ApiOperation(value = "新增轮播图数据",response = Slideshow.class)
+ @PostMapping("/add")
+ public ResultData add(@RequestBody Slideshow slideshow){
+ return iSlideshowService.add(slideshow);
+ }
+
+ /**
+ * 修改轮播图数据
+ *
+ * @return 参数配置信息
+ */
+ @ApiOperation(value = "修改轮播图数据",response = Slideshow.class)
+ @PostMapping("/update")
+ @Authorization
+ public ResultData update(@RequestBody Slideshow slideshow){
+ return iSlideshowService.update(slideshow);
+ }
+
+ /**
+ * 删除轮播图数据
+ *
+ * @return 参数配置信息
+ */
+ @ApiOperation(value = "删除轮播图数据",response = Slideshow.class)
+ @GetMapping("/delete")
+ @Authorization
+ public ResultData delete(@RequestParam("id") Integer id){
+ return iSlideshowService.delete(id);
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/SysSettingsController.java b/flower_city/src/main/java/com/dg/core/controller/SysSettingsController.java
new file mode 100644
index 0000000..e5caf6b
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/SysSettingsController.java
@@ -0,0 +1,57 @@
+package com.dg.core.controller;
+
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.db.gen.entity.AutomessageSysSettings;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.ISysSettingsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+
+@Api(tags = {"系统设置接口"})
+@RestController
+@RequestMapping("/sysSettings")
+public class SysSettingsController {
+
+ @Resource
+ private ISysSettingsService sysSettingsService;
+
+ /**
+ * 按设置名称查找设置信息
+ *
+ * @return 参数配置信息
+ */
+ @ApiOperation(value = "按设置名称查找设置信息",response = AutomessageSysSettings.class)
+ @GetMapping("/selectByName")
+ @Authorization
+ public ResultData selectByName(@RequestParam(value = "settingName",required = false) String settingName){
+ if (settingName==null)
+ settingName="系统超时基础设置";
+ return sysSettingsService.selectByName(settingName);
+ }
+
+
+ /**
+ * 修改设置信息
+ *
+ * @return 参数配置信息
+ */
+ @ApiOperation(value = "修改设置信息",response = AutomessageSysSettings.class)
+ @PostMapping("/update")
+ @Authorization
+ public ResultData update(@RequestBody AutomessageSysSettings automessageSysSettings,@CurrentUser SysUser sysUser){
+ automessageSysSettings.setUpdateUserId(sysUser.getUserId());
+ automessageSysSettings.setUpdateTime(LocalDateTime.now());
+ if (automessageSysSettings.getTimeoutRemindNum()>(automessageSysSettings.getTimeoutNotificationNum()*60)){
+ return ResultData.error("系统提醒时间不能大于系统通知时间*60");
+ }
+ return sysSettingsService.update(automessageSysSettings);
+ }
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
new file mode 100644
index 0000000..f58bfe8
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -0,0 +1,364 @@
+package com.dg.core.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.db.gen.AjaxResult;
+import com.dg.core.db.gen.entity.AutomessageSmartConsulting;
+import com.dg.core.db.gen.entity.Slideshow;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.db.gen.entity.TransactionEvent;
+import com.dg.core.db.manual.pojo.QueryResults;
+import com.dg.core.db.manual.pojo.RecommendResult;
+import com.dg.core.db.manual.pojo.Search;
+import com.dg.core.file.FtpConstants;
+import com.dg.core.file.MimeTypeUtils;
+import com.dg.core.file.SFTPUtil;
+import com.dg.core.service.IAutomessageSmartConsultingService;
+import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.service.ITransactionEventService;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.InputStream;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import static com.dg.core.file.FileTypeUploadUtils.assertAllowed;
+
+@Api(tags = {"导办事项管理接口"})
+@RestController
+@RequestMapping("/transaction")
+public class TransactionEventController extends BaseController
+{
+
+ @Autowired(required = true)
+ ITransactionEventService iTransactionEventService;
+
+
+ @Autowired(required = true)
+ IOrganizationChartService iOrganizationChartService;
+
+ @Autowired(required = true)
+ IAutomessageSmartConsultingService iAutomessageSmartConsultingService;
+
+ /**
+ * 查询导办事务详情
+ * @param Id
+ * @return
+ */
+ @ApiOperation("查询导办事务详情")
+ @GetMapping("/getData")
+
+ public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
+ {
+ Assert.notNull(Id, "Id 不能为空");
+ return ResultData.success(iTransactionEventService.selectConfigData(Id,sysUser));
+ }
+
+ /**
+ * 导办事物列表
+ * @param
+ * @return
+ */
+ @ApiOperation("导办事物列表")
+ @GetMapping("/getList")
+ @Authorization
+ public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "keyword",required = false) String keyword,
+ @RequestParam(value = "classifyGrade",required = false) String classifyGrade,
+ @RequestParam(value = "departmentId",required = false) String departmentId,
+ @CurrentUser SysUser sysUser)
+ {
+ Assert.notNull(pageNum, "pageNum 不能为空");
+ Assert.notNull(pageSize, "pageSize 不能为空");
+ Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
+ List<TransactionEvent> list;
+ int num;
+ if (departmentId!=null&&departmentId.length()>0){
+ List<String> ids=iOrganizationChartService.getDepartmentId(departmentId);
+ list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
+ classifyGrade,ids);
+ num=iTransactionEventService.countNum(keyword,classifyGrade,ids);
+
+ }else {
+ list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
+ classifyGrade,null);
+ num=iTransactionEventService.countNum(keyword,classifyGrade,null);
+ }
+ return getDataTable(list,num);
+ }
+
+ /**
+ * 导办事物列表
+ * @param
+ * @return
+ */
+ @ApiOperation("根据部门id获取导办事物列表")
+ @PostMapping("/department/getList")
+ @Authorization
+ public TableDataInfo<TransactionEvent> selectConfigList(@RequestBody List<String> DepartmentId,
+ @CurrentUser SysUser sysUser)
+ {
+ if(DepartmentId==null||DepartmentId.size()<1)
+ {
+ DepartmentId=null;
+ }
+ List<TransactionEvent> list = iTransactionEventService.selectConfigList(null,null,DepartmentId);
+ int num=iTransactionEventService.countNum(null,null,DepartmentId);
+ return getDataTable(list,num);
+ }
+
+ /**
+ * 导办事物列表(不分页)
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "导办事物列表(不分页)",response = TransactionEvent.class)
+ @GetMapping("/selectList")
+ public TableDataInfo selectList(@RequestParam(value = "keyWord",required = false) String keyWord)
+ {
+ return getDataTable(iTransactionEventService.selectList(keyWord));
+ }
+
+ /**
+ * 新增导办事务
+ * @param entity
+ * @return
+ */
+ @ApiOperation("新增导办事务")
+ @PostMapping("/add")
+ @Authorization
+ public ResultData insertConfig(@RequestBody TransactionEvent entity)
+ {
+ if(StringUtils.isEmpty(entity.getDepartmentId()))
+ {
+ return ResultData.error("部门id不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getMatterName()))
+ {
+ return ResultData.error("事件名称不能为空");
+ }
+
+ String id=iTransactionEventService.selectDataIfExist(entity.getDepartmentId(),entity.getMatterName());
+ if(!StringUtils.isEmpty(id))
+ {
+ return ResultData.error("事件名称已存在");
+ }
+
+ return toAjax(iTransactionEventService.insertConfig(entity));
+ }
+
+ /**
+ * 修改导办事务
+ * @param entity
+ * @return
+ */
+ @ApiOperation("修改导办事务")
+ @PostMapping("/update")
+ @Authorization
+ public ResultData updateConfig(@RequestBody TransactionEvent entity)
+ {
+ if(StringUtils.isEmpty(entity.getDepartmentId()))
+ {
+ return ResultData.error("部门id不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getMatterName()))
+ {
+ return ResultData.error("事件名称不能为空");
+ }
+
+
+
+ return toAjax(iTransactionEventService.updateConfig(entity));
+ }
+
+ /**
+ * 删除接口
+ * @param Id
+ * @return
+ */
+ @ApiOperation("删除导办事务")
+ @DeleteMapping("/delete")
+ @Authorization
+ public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
+ {
+
+ Assert.notNull(Id, "Id 不能为空");
+ int i = iTransactionEventService.deleteConfigById(Id);
+ if (i>0)
+ return ResultData.success("删除成功");
+ else
+ return ResultData.error("删除失败可能该工单有单据");
+ }
+
+ /**
+ * 导办事务搜索
+ * @param keyWord
+ * @return
+ */
+ @ApiOperation(value = "导办事务搜索",response = QueryResults.class)
+ @GetMapping("/queryKeyWordList")
+ public QueryResults queryMatterNameList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "recommendSize",required = false) Integer recommendSize,
+ @RequestParam(value = "keyWord",required = false) String keyWord)
+ {
+ Assert.notNull(pageNum, "pageNum 不能为空");
+ Assert.notNull(pageSize, "pageSize 不能为空");
+ Assert.notNull(keyWord, "keyWord 不能为空");
+ Assert.notNull(keyWord, "recommendSize 不能为空");
+ Page<Search> pageParam = new Page<>(pageNum,pageSize);
+ QueryResults queryResults = iTransactionEventService.queryMatterNameList(pageParam, pageSize,recommendSize, keyWord);
+ return queryResults;
+ }
+
+
+
+
+ /**
+ * 根据分类id查询导办事务(分页)
+ * @param classifyId
+ * @return
+ */
+ @ApiOperation(value = "根据分类id查询导办事务(分页)",response = TransactionEvent.class)
+ @GetMapping("/queryByClassifyIdConfigList")
+ public TableDataInfo queryByClassifyIdConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "classifyId",required = false) String classifyId,
+ @RequestParam(required = false,name="departmentId") Integer departmentId){
+ Assert.notNull(pageNum, "pageNum 不能为空");
+ Assert.notNull(pageSize, "pageSize 不能为空");
+ Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
+ return getDataTable(iTransactionEventService.queryByClassifyIdList(pageParam,pageSize,classifyId,departmentId),iTransactionEventService.countNumByClassifyIdList(classifyId,departmentId));
+ }
+
+ /**
+ * 根据查询时间查询导办事务
+ * @return
+ */
+ @ApiOperation(value = "根据查询时间查询导办事务",response = TransactionEvent.class)
+ @GetMapping("/queryByQueryTime")
+ public TableDataInfo queryByQueryTime() {
+ List<TransactionEvent> transactionEvents = iTransactionEventService.queryByQueryTime( );
+ return getDataTable(transactionEvents);
+ }
+
+ /**
+ * 根据浏览次数查询导办事务
+ * @return
+ */
+ @ApiOperation(value = "根据浏览次数查询导办事务",response = TransactionEvent.class)
+ @GetMapping("/queryByBrowseNum")
+ public TableDataInfo queryByBrowseNum() {
+ List<TransactionEvent> transactionEvents = iTransactionEventService.queryByBrowseNum( );
+ return getDataTable(transactionEvents);
+ }
+
+ /**
+ * 查询导办事务求和
+ * @return
+ */
+ @ApiOperation(value = "查询导办事务求和",response = TransactionEvent.class)
+ @GetMapping("/sumTransactionNum")
+ public ResultData sumTransactionNum(){
+ return ResultData.success(iTransactionEventService.sumTransactionNum());
+ }
+
+ /**
+ * 智能咨询
+ * @return
+ */
+ @ApiOperation(value = "智能咨询",response = RecommendResult.class)
+ @GetMapping("/smartConsulting")
+ public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord,@CurrentUser SysUser sysUser){
+ AutomessageSmartConsulting automessageSmartConsulting = new AutomessageSmartConsulting();
+ if (sysUser!=null){
+ automessageSmartConsulting.setCreateUserId(sysUser.getUserId());
+ }
+ automessageSmartConsulting.setType(2);
+ automessageSmartConsulting.setCreateTime(LocalDateTime.now());
+ iAutomessageSmartConsultingService.add(automessageSmartConsulting);
+ return iTransactionEventService.smartConsulting(keyWord);
+ }
+
+
+ /**
+ * 办事指南复制
+ * @return
+ */
+ @ApiOperation(value = "办事指南复制",response = ResultData.class)
+ @GetMapping("/copy")
+ @Authorization
+ public ResultData copy(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
+ {
+ if(StringUtils.isEmpty(Id))
+ {
+ return ResultData.error("Id不能为空");
+ }
+
+ TransactionEvent transactionEvent=iTransactionEventService.selectConfigData(Id,null);
+ if(transactionEvent==null)
+ {
+ return ResultData.error("复制项不存在");
+ }
+
+ transactionEvent.setDepartmentId(sysUser.getDepartmentId());
+ transactionEvent.setMatterName(transactionEvent.getMatterName()+"(副本)");
+
+ transactionEvent.setId(null);
+ return toAjax(iTransactionEventService.insertConfig(transactionEvent));
+ }
+
+
+ /**
+ * 办事指南根据分类id筛选
+ * @return
+ */
+ @ApiOperation(value = "办事指南根据分类id筛选",response = ResultData.class)
+ @GetMapping("/selectClassifyList")
+ @Authorization
+ public TableDataInfo<TransactionEvent> selectClassifyList(@RequestParam("ids") List<String> ids)
+ {
+ if(ids==null || ids.size()<1)
+ {
+ ids=null;
+ }
+ return getDataTable(iTransactionEventService.selectClassifyList(ids));
+ }
+
+ @ApiOperation("文件导入")
+ @PostMapping("/import")
+ public ResultData uploadFiles(MultipartFile file) throws Exception
+ {
+ boolean a = false;
+ String fileName = file.getOriginalFilename();
+ Integer b = iTransactionEventService.batchImport(fileName, file);
+ if (b == 3) {//
+ return ResultData.success("全部导入成功");//全部导入成功
+ } else if (b == 2) {
+ return ResultData.success("部分导入成功");//部分导入成功
+ } else if (b == 0) {
+ return ResultData.error("部分失败");//导入失败
+ }
+ return ResultData.error("部分失败");//导入失败
+ }
+
+
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
new file mode 100644
index 0000000..b831eec
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -0,0 +1,440 @@
+package com.dg.core.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dg.core.HttpStatus;
+import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.db.gen.entity.HuaChengSysUser;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.manager.TokenManager;
+import com.dg.core.service.IHuaChengSysUserService;
+import com.dg.core.util.SmsUtil;
+import com.dg.core.util.Snowflake;
+import com.dg.core.util.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = {"用户接口"})
+@RestController
+@RequestMapping("/user")
+public class UserController extends BaseController {
+ @Autowired
+ com.dg.core.service.ISysUserService IUserService;
+
+ @Autowired
+ SmsUtil smsUtil;
+
+ @Autowired
+ TokenManager tokenManager;
+
+ /**
+ * 花城e+用户接口
+ */
+ @Autowired
+ IHuaChengSysUserService iHuaChengSysUserService;
+
+ @ApiOperation("登录接口")
+ @PostMapping(path = "/login")
+ public ResultData login(@RequestParam String account, @RequestParam String password, HttpServletRequest request) {
+ Assert.notNull(account, "username can not be empty");
+ Assert.notNull(password, "password can not be empty");
+
+ SysUser user=null;
+ //管理员登录
+ user= IUserService.getUserByAccount(account);
+
+ if(user==null)
+ {
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("",account,"");
+ HuaChengSysUser huaChengSysUser=null;
+
+ if(list!=null && list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
+ if(huaChengSysUser==null || !password.equals(huaChengSysUser.getPassword()))
+ {
+ //提示用户名或密码错误
+ return ResultData.fail(HttpStatus.UNAUTHORIZED, "用户名或密码错误");
+ }
+
+ //本地表查询用户
+ user = IUserService.selectData(huaChengSysUser.getUserId()+"",null,null);
+ if (user == null) {
+ //本地没有此用户 新用户
+ SysUser newSysUser=new SysUser();
+ //默认 1系统后台用户
+ newSysUser.setUserType("3");
+ newSysUser.setPhonenumber(huaChengSysUser.getPhone());
+ newSysUser.setUserId(huaChengSysUser.getUserId());
+ newSysUser.setUserName(huaChengSysUser.getNickName());
+ newSysUser.setSex(huaChengSysUser.getSex());
+ newSysUser.setAvatar(huaChengSysUser.getImageUrl());
+ newSysUser.setCreateTime(LocalDateTime.now());
+ newSysUser.setUpdateTime(LocalDateTime.now());
+ newSysUser.setOpenid(huaChengSysUser.getOpenid());
+ IUserService.insertConfig(newSysUser);
+ }
+
+ user = IUserService.selectData(huaChengSysUser.getUserId()+"",null,null);
+
+ if (user == null) {
+ return ResultData.error("用户不存在！请联系管理员");
+ }
+
+ String token = tokenManager.getTokenByUserId(user.getUserId());
+ System.out.println("token "+token);
+ if (token == null) {
+ //生成一个token，保存用户登录状态
+ token = tokenManager.createToken(user.getUserId(), user.getUserId());
+ }
+
+ user.setLoginDate(LocalDateTime.now());
+ //更新登录时间
+ IUserService.updateConfig(user);
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("token", token);
+ map.put("userId", user.getUserId());
+ map.put("userName", user.getUserName());
+ map.put("permission", user.getPermission());
+ map.put("userType", user.getUserType());
+ map.put("departmentId", user.getDepartmentId());
+ map.put("departmentName", user.getDepartmentName());
+ map.put("moreDepartmentIds", user.getMoreDepartmentIds());
+
+ return ResultData.success(map);
+ }
+ else
+ {
+ if(StringUtils.equals("4",user.getUserType()))
+ {
+ //提示用户名或密码错误
+ return ResultData.fail(HttpStatus.UNAUTHORIZED, "账户不存在");
+ }
+
+ if(!password.equals(user.getPassword()))
+ {
+ //提示用户名或密码错误
+ return ResultData.fail(HttpStatus.UNAUTHORIZED, "用户名或密码错误");
+ }
+ String token = tokenManager.getTokenByUserId(user.getUserId());
+ System.out.println("token "+token);
+ if (token == null) {
+ //生成一个token，保存用户登录状态
+ token = tokenManager.createToken(user.getUserId(), user.getUserId());
+ }
+
+ user.setLoginDate(LocalDateTime.now());
+ //更新登录时间
+ IUserService.updateConfig(user);
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("token", token);
+ map.put("userId", user.getUserId());
+ map.put("userName", user.getUserName());
+ map.put("permission", user.getPermission());
+ map.put("userType", user.getUserType());
+ map.put("departmentId", user.getDepartmentId());
+ map.put("departmentName", user.getDepartmentName());
+ map.put("moreDepartmentIds", user.getMoreDepartmentIds());
+
+ return ResultData.success(map);
+ }
+
+ }
+
+
+ @ApiOperation("发送登录短信验证码")
+ @PostMapping(value = "/sendSms", consumes = "application/json")
+ public ResultData smsSend(@RequestBody SysUser user) {
+ return IUserService.smsSend(user);
+ }
+
+
+ @ApiOperation("账号密码验证登录")
+ @GetMapping(value = "/loginByAccount")
+ public ResultData loginByAccount(@RequestParam String phonenumber,@RequestParam String code) {
+ return IUserService.loginByAccount(phonenumber,code);
+ }
+
+
+ @ApiOperation("通过手机号获取用户信息 登录")
+ @PostMapping(value = "/loginPhionne")
+ public ResultData loginPhionne(@RequestParam String phonenumber)
+ {
+ if(StringUtils.isEmpty(phonenumber))
+ {
+ return ResultData.error("请输入手机号");
+ }
+ return IUserService.loginByPhonenumber(phonenumber);
+ }
+
+ /**
+ * 查询列表
+ *
+ * @return 参数配置信息
+ */
+ @ApiOperation("用户列表接口")
+ @GetMapping("/getlist")
+ @Authorization
+ public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "keyword",required = false) String keyword)
+ {
+ Assert.notNull(pageNum, "pageNum can not be empty");
+ Assert.notNull(pageSize, "pageSize can not be empty");
+ Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,null,keyword,null,"1");
+
+ int num=IUserService.selectNum(null,keyword,null,"1");
+ return getDataTable(list,num);
+ }
+
+
+ /**
+ * 新增用户
+ *
+ * @param config 参数配置信息
+ * @return 结果
+ */
+ @ApiOperation("新增用户接口")
+ @PostMapping("/add")
+ @Authorization
+ public ResultData insertConfig(@RequestBody SysUser config, @CurrentUser SysUser sysUser)
+ {
+ Assert.notNull(config, "parameter can not be empty");
+
+ if(StringUtils.isEmpty(config.getLoginName()))
+ {
+ return error("账户不能为空");
+ }
+
+ if(StringUtils.isEmpty(config.getPassword()))
+ {
+ return error("密码不能为空");
+ }
+
+ if(StringUtils.isEmpty(config.getUserName()))
+ {
+ return error("昵称不能为空");
+ }
+
+ if(StringUtils.isEmpty(config.getPhonenumber()))
+ {
+ return error("手机号不能为空");
+ }
+
+
+
+
+ SysUser user = IUserService.selectData("",config.getPhonenumber(),"");
+ SysUser user2 = IUserService.selectData("","",config.getLoginName());
+ if (user != null) {
+ if(StringUtils.equals("4",user.getUserType()))
+ {
+ config.setUserId(user.getUserId());
+ config.setCreateBy(user.getUserId()+"");
+ config.setUserType("3");
+ config.setIsDivisionHead("1");
+ config.setUpdateTime(LocalDateTime.now());
+ config.setMasterIds(user2.getMasterIds());
+ config.setDepartmentIds(config.getDepartmentIds());
+ config.setDepartmentIdStr(config.getDepartmentIdStr());
+ config.setMattersIds(config.getMattersIds());
+ config.setMasterNames(config.getMasterNames());
+ config.setMattersNames(config.getMattersNames());
+ return toAjax(IUserService.updateConfig(config));
+ }
+ else
+ {
+ //提示用户名或密码错误
+ return error("该用户已存在！");
+ }
+ }
+
+ if(user2 != null)
+ {
+ if(StringUtils.equals("4",user2.getUserType()))
+ {
+ config.setUserId(user2.getUserId());
+ config.setCreateBy(user2.getUserId()+"");
+ config.setUserType("3");
+ config.setIsDivisionHead("1");
+ config.setUpdateTime(LocalDateTime.now());
+ config.setMasterIds(user2.getMasterIds());
+ config.setDepartmentIds(config.getDepartmentIds());
+ config.setDepartmentIdStr(config.getDepartmentIdStr());
+ config.setMattersIds(config.getMattersIds());
+ config.setMasterNames(config.getMasterNames());
+ config.setMattersNames(config.getMattersNames());
+ return toAjax(IUserService.updateConfig(config));
+ }
+ else
+ {
+ //提示用户名或密码错误
+ return error("该用户已存在！");
+ }
+ }
+
+ config.setCreateBy(sysUser.getUserId()+"");
+ config.setUserId(Snowflake.getId()+"");
+ config.setUserType("3");
+ config.setIsDivisionHead("1");
+ config.setMoreDepartmentIds(config.getDepartmentId());
+ config.setCreateTime(LocalDateTime.now());
+ config.setUpdateTime(LocalDateTime.now());
+
+ return toAjax(IUserService.insertConfig(config));
+ }
+
+ /**
+ * 更新聊天记录
+ *
+ * @param config 参数配置信息
+ * @return 结果
+ */
+ @ApiOperation("修改用户接口")
+ @PostMapping("/update")
+ @Authorization
+ public ResultData updateConfig(@RequestBody SysUser config,@CurrentUser SysUser sys)
+ {
+ if(config.getId()==null)
+ {
+ return error("Id不能为空");
+ }
+
+ if(StringUtils.isEmpty(config.getLoginName()))
+ {
+ return error("账户不能为空");
+ }
+
+ if(StringUtils.isEmpty(config.getDepartmentId()))
+ {
+ return error("请选择部门");
+ }
+
+ config.setMoreDepartmentIds(config.getDepartmentId());
+ config.setPassword(null);
+ config.setUpdateBy(sys.getUserId()+"");
+
+ return toAjax(IUserService.updateConfig(config));
+ }
+
+ /**
+ * 删除用户记录
+ *
+ * @return 结果
+ */
+ @ApiOperation("删除用户接口(真删除)")
+ @DeleteMapping("/delete/{userId}")
+ @Authorization
+ public ResultData deleteConfigById(@PathVariable("userId") String userId)
+ {
+ if(StringUtils.isEmpty(userId))
+ {
+ return error("userId不能为空");
+ }
+ return toAjax(IUserService.deleteConfigById(userId));
+ }
+
+
+
+ /**
+ * 删除用户记录
+ *
+ * @return 结果
+ */
+ @ApiOperation("删除用户接口(修改状态 设置成已删除)")
+ @DeleteMapping("/deleteflag/{userId}")
+ @Authorization
+ public ResultData delete(@PathVariable("userId") String userId)
+ {
+ if(StringUtils.isEmpty(userId))
+ {
+ return error("userId不能为空");
+ }
+
+ SysUser sysUser=IUserService.selectData(userId,null,null);
+ //删除标志（0代表存在 2代表删除）
+ sysUser.setDelFlag("2");
+ return toAjax(IUserService.updateConfig(sysUser));
+ }
+
+
+ /**
+ * 修改用户密码接口
+ *
+ * @param config 参数配置信息
+ * @return 结果
+ */
+ @ApiOperation("修改用户密码接口")
+ @PostMapping("/updatepws")
+ @Authorization
+ public ResultData updatePws(@RequestBody SysUser config)
+ {
+ if(config.getUserId()==null)
+ {
+ return error("userId不能为空");
+ }
+
+ if(StringUtils.isEmpty(config.getPassword()))
+ {
+ return error("密码不能为空");
+ }
+
+ SysUser sysUser=IUserService.selectData(config.getUserId()+"",null,null);
+ if(sysUser==null)
+ {
+ return error("用户不存在");
+ }
+
+ if(StringUtils.equals(sysUser.getPassword(),config.getPassword()))
+ {
+ return error("输入密码与原密码不能相同！");
+ }
+
+ return toAjax(IUserService.updateConfig(config));
+ }
+
+
+ /**
+ * 获取登录人员信息
+ *
+ * @return 结果
+ */
+ @ApiOperation(value = "获取登录人员信息,userType=1 为超级管理员 isDivisionHead=1 为部门领导",response = SysUser.class)
+ @PostMapping("/getLoginInformation")
+ @Authorization
+ public ResultData getLoginInformation(@CurrentUser SysUser sysUse)
+ {
+ return ResultData.success(sysUse);
+ }
+
+
+
+
+ @ApiOperation("切换部门接口")
+ @GetMapping(value = "/switch/department")
+ public ResultData switchDepartment(@RequestParam(value = "departmentId",required = false) String departmentId,
+ @CurrentUser SysUser sysUse)
+ {
+ sysUse.setDepartmentId(departmentId);
+ return toAjax(IUserService.updateConfig(sysUse));
+ }
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/controller/WeixinApiController.java b/flower_city/src/main/java/com/dg/core/controller/WeixinApiController.java
new file mode 100644
index 0000000..69cf49c
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/controller/WeixinApiController.java
@@ -0,0 +1,41 @@
+package com.dg.core.controller;
+
+import com.dg.core.ResultData;
+import com.dg.core.db.manual.mapper.util.ConstantPropertiesUtil;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpSession;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/ucenter/wx")
+public class WeixinApiController {
+
+// @Resource
+// private UserInfoService userInfoService;
+ @Resource
+ private RedisTemplate redisTemplate;
+
+ /**
+ * 获取微信登录参数
+ */
+ @GetMapping("/getLoginParam")
+ @ResponseBody
+ public ResultData genQrConnect(HttpSession session) throws UnsupportedEncodingException {
+ String redirectUri = URLEncoder.encode(ConstantPropertiesUtil.WX_OPEN_REDIRECT_URL, "UTF-8");
+ Map<String, Object> map = new HashMap<>();
+ map.put("appid", ConstantPropertiesUtil.WX_OPEN_APP_ID);
+ map.put("redirectUri", redirectUri);
+ map.put("scope", "snsapi_login");
+ map.put("state", System.currentTimeMillis()+"");//System.currentTimeMillis()+""
+ return ResultData.success(map);
+ }
+}
\ No newline at end of file
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/AjaxResult.java b/flower_city/src/main/java/com/dg/core/db/gen/AjaxResult.java
new file mode 100644
index 0000000..e199de4
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/AjaxResult.java
@@ -0,0 +1,163 @@
+package com.dg.core.db.gen;
+
+import com.dg.core.HttpStatus;
+import io.swagger.annotations.ApiModel;
+
+import java.util.HashMap;
+
+/**
+ * 操作消息提醒
+ *
+ * @author ruoyi
+ */
+@ApiModel(value = "返回对象")
+public class AjaxResult<T> extends HashMap<String, Object>
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 状态码 */
+ public static final String CODE_TAG = "code";
+
+ /** 返回内容 */
+ public static final String MSG_TAG = "msg";
+
+ /** 数据对象 */
+ public static final String DATA_TAG = "data";
+
+ /**
+ * 初始化一个新创建的 AjaxResult 对象，使其表示一个空消息。
+ */
+ public AjaxResult()
+ {
+ }
+
+ /**
+ * 初始化一个新创建的 AjaxResult 对象
+ *
+ * @param code 状态码
+ * @param msg 返回内容
+ */
+ public AjaxResult(int code, String msg)
+ {
+ super.put(CODE_TAG, code);
+ super.put(MSG_TAG, msg);
+ }
+
+ /**
+ * 初始化一个新创建的 AjaxResult 对象
+ *
+ * @param code 状态码
+ * @param msg 返回内容
+ * @param data 数据对象
+ */
+ public AjaxResult(int code, String msg, Object data)
+ {
+ super.put(CODE_TAG, code);
+ super.put(MSG_TAG, msg);
+ super.put(DATA_TAG, data);
+ }
+
+ /**
+ * 返回成功消息
+ *
+ * @return 成功消息
+ */
+ public static AjaxResult success()
+ {
+ return AjaxResult.success("操作成功");
+ }
+
+ /**
+ * 返回成功数据
+ *
+ * @return 成功消息
+ */
+ public static AjaxResult success(Object data)
+ {
+
+
+ return AjaxResult.success("操作成功", data);
+ }
+
+ /**
+ * 返回成功消息
+ *
+ * @param msg 返回内容
+ * @return 成功消息
+ */
+ public static AjaxResult success(String msg)
+ {
+ return AjaxResult.success(msg, null);
+ }
+
+ /**
+ * 返回成功消息
+ *
+ * @param msg 返回内容
+ * @param data 数据对象
+ * @return 成功消息
+ */
+ public static AjaxResult success(String msg, Object data)
+ {
+ return new AjaxResult(HttpStatus.SUCCESS, msg, data);
+ }
+
+ /**
+ * 返回错误消息
+ *
+ * @return
+ */
+ public static AjaxResult error()
+ {
+ return AjaxResult.error("操作失败");
+ }
+
+ /**
+ * 返回错误消息
+ *
+ * @param msg 返回内容
+ * @return 警告消息
+ */
+ public static AjaxResult error(String msg)
+ {
+ return AjaxResult.error(msg, null);
+ }
+
+ /**
+ * 返回错误消息
+ *
+ * @param msg 返回内容
+ * @param data 数据对象
+ * @return 警告消息
+ */
+ public static AjaxResult error(String msg, Object data)
+ {
+ return new AjaxResult(HttpStatus.ERROR, msg, data);
+ }
+
+ /**
+ * 返回错误消息
+ *
+ * @param code 状态码
+ * @param msg 返回内容
+ * @return 警告消息
+ */
+ public static AjaxResult error(int code, String msg)
+ {
+ return new AjaxResult(code, msg, null);
+ }
+
+ /**
+ * 方便链式调用
+ *
+ * @param key 键
+ * @param value 值
+ * @return 数据对象
+ */
+ @Override
+ public AjaxResult put(String key, Object value)
+ {
+ super.put(key, value);
+ return this;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/Agreement.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/Agreement.java
new file mode 100644
index 0000000..cb6f473
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/Agreement.java
@@ -0,0 +1,91 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 相关协议
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-09-22
+ */
+@TableName("automessage_agreement")
+@Data
+@ApiModel("相关协议实体类")
+public class Agreement implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty("主键id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 协议名称
+ */
+ @ApiModelProperty("协议名称")
+ private String agreement;
+
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty("修改人id")
+ private String updateUserId;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty("创建人id")
+ private String createUserId;
+
+ /**
+ * 协议内容
+ */
+ @ApiModelProperty("协议内容")
+ private String agreementContent;
+
+ /**
+ * 上次修改人名称
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("上次修改人名称")
+ private String updateUserName;
+
+ /**
+ * 创建人名称
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("创建人名称")
+ private String createUserName;
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/AreaCode2022.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/AreaCode2022.java
new file mode 100644
index 0000000..4482778
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/AreaCode2022.java
@@ -0,0 +1,63 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-09-20
+ */
+@TableName("automessage_area_code_2022")
+@Data
+@ApiModel("所属地区实体类")
+public class AreaCode2022 implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 区划代码
+ */
+ @ApiModelProperty("区划代码")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long code;
+
+ /**
+ * 名称
+ */
+ @ApiModelProperty("name")
+ private String name;
+
+ /**
+ * 级别1-5,省市县镇村
+ */
+ @ApiModelProperty("级别1-5,省市县镇村")
+ private Integer level;
+
+ /**
+ * 父级区划代码
+ */
+ @ApiModelProperty("父级区划代码")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long pcode;
+
+ /**
+ * 子节点
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("子节点")
+ private List<AreaCode2022> child;
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageCommonProblem.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageCommonProblem.java
new file mode 100644
index 0000000..4d47261
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageCommonProblem.java
@@ -0,0 +1,84 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 常见问题表
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-09-23
+ */
+@TableName("automessage_common_problem")
+@Data
+@ApiModel("常见问题实体类")
+public class AutomessageCommonProblem implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty("主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 常见问题标题
+ */
+ @ApiModelProperty("常见问题标题")
+ private String title;
+
+ /**
+ * 常见问题解答内容
+ */
+ @ApiModelProperty("常见问题解答内容")
+ private String content;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty("修改人id")
+ private String updateUserId;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty("创建人id")
+ private String createUserId;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "updateUserName", value = "上次修改人")
+ private String updateUserName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "createUserName", value = "创建人")
+ private String createUserName;
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessagePolicyDocuments.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessagePolicyDocuments.java
new file mode 100644
index 0000000..c8ac4a2
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessagePolicyDocuments.java
@@ -0,0 +1,124 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 法律法规政策文件实体类
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-11-10
+ */
+@TableName("automessage_policy_documents")
+@Data
+@ApiModel("法律法规政策文件实体类")
+public class AutomessagePolicyDocuments implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 部门id
+ */
+ @ApiModelProperty("部门id")
+ private Integer departmentId;
+
+ /**
+ * 名称
+ */
+ @ApiModelProperty("名称")
+ private String name;
+
+ /**
+ * 跳转链接类型（1.富文本2.微信文章）
+ */
+ @ApiModelProperty(" 跳转链接类型（1.富文本2.微信文章）")
+ private String linkType;
+
+ /**
+ * 文章链接
+ */
+ @ApiModelProperty("文章链接")
+ private String articleLink;
+
+ /**
+ * 文章富文本
+ */
+ @ApiModelProperty("文章富文本")
+ private String richText;
+
+ /**
+ * 类型（1.法律法规2.政策文件）
+ */
+ @ApiModelProperty("类型（1.法律法规2.政策文件）")
+ private Integer type;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty("创建人")
+ private String createUserId;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+
+ /**
+ * 修改人
+ */
+ @ApiModelProperty("修改人")
+ private String updateUserId;
+
+ /**
+ * 部门名称
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("部门名称")
+ private String departmentName;
+
+ /**
+ * 修改人名称
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("修改人名称")
+ private String updateUserName;
+
+ /**
+ * 创建人名称
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("创建人名称")
+ private String createUserName;
+
+ @TableField(exist = false)
+ @ApiModelProperty("是否能够删除1.可以删除修改 2.不能删除修改")
+ private Integer isDelete;
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSmartConsulting.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSmartConsulting.java
new file mode 100644
index 0000000..508a08b
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSmartConsulting.java
@@ -0,0 +1,57 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-11-16
+ */
+@TableName("automessage_smart_consulting")
+@Data
+@ApiModel("智能咨询访问类")
+public class AutomessageSmartConsulting implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("主键id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ /**
+ * 咨询类型：1.小程序访问 2.门户网访问
+ */
+ @ApiModelProperty("咨询类型：1.小程序访问 2.门户网访问")
+ private Integer type;
+
+ /**
+ * 咨询人id 可以为 空
+ */
+ @ApiModelProperty("咨询人id 可以为 空")
+ private String createUserId;
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysSettings.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysSettings.java
new file mode 100644
index 0000000..92c6f9f
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysSettings.java
@@ -0,0 +1,90 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 系统设置表
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-10-14
+ */
+@TableName("automessage_sys_settings")
+@Data
+@ApiModel("系统设置类")
+public class AutomessageSysSettings implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 设置名称
+ */
+ @ApiModelProperty("设置名称")
+ private String settingName;
+
+ /**
+ * 系统通知时间
+ */
+ @ApiModelProperty("系统通知时间")
+ private Integer timeoutNotificationNum;
+
+
+ /**
+ * 系统提醒时间
+ */
+ @ApiModelProperty("系统提醒时间")
+ private Integer timeoutRemindNum;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ private LocalDateTime createTime;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty("创建人id")
+ private Integer createUserId;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty("更新时间")
+ private LocalDateTime updateTime;
+
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty("修改人id")
+ private String updateUserId;
+
+ /**
+ * 小程序二维码
+ */
+ @ApiModelProperty("小程序二维码")
+ private String appletsUrl;
+
+ /**
+ * 官网二维码
+ */
+ @ApiModelProperty("小程序二维码")
+ private String websiteUrl;
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysSettingsRecord.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysSettingsRecord.java
new file mode 100644
index 0000000..7a3678a
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysSettingsRecord.java
@@ -0,0 +1,50 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 系统设置记录表
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-10-14
+ */
+@TableName("automessage_sys_settings_record")
+@Data
+@ApiModel("系统设置类")
+public class AutomessageSysSettingsRecord implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 设置id
+ */
+ private Integer settingId;
+
+ /**
+ * 创建时间
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * 创建人id（及修改设置的人员）
+ */
+ private String createUserId;
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysUserRecord.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysUserRecord.java
new file mode 100644
index 0000000..1e575a0
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysUserRecord.java
@@ -0,0 +1,58 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 用户访问记录
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-10-15
+ */
+@TableName("automessage_sys_user_record")
+@Data
+@ApiModel("用户访问记录类")
+public class AutomessageSysUserRecord implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty("用户id")
+ private String userId;
+
+ /**
+ * 访问时间
+ */
+ @ApiModelProperty("访问时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ /**
+ * 进入方式(1.扫码进入 2.花城进入 3.分享进入)
+ */
+ @ApiModelProperty("进入方式(1.扫码进入 2.花城进入 3.分享进入)")
+ private Integer joinType;
+
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageTransactionEventInterview.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageTransactionEventInterview.java
new file mode 100644
index 0000000..12d098a
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageTransactionEventInterview.java
@@ -0,0 +1,58 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 办事指南访问表
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-09-26
+ */
+@TableName("automessage_transaction_event_interview")
+@Data
+@ApiModel("办事指南访问表实体类")
+public class AutomessageTransactionEventInterview implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 办事指南id
+ */
+ @ApiModelProperty("办事指南id")
+ private Integer transactionEventId;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty("用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+
+ /**
+ * 访问时间
+ */
+ @ApiModelProperty("访问时间")
+ private LocalDateTime interviewTime;
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/ClassifyAdministration.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/ClassifyAdministration.java
new file mode 100644
index 0000000..4779476
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/ClassifyAdministration.java
@@ -0,0 +1,85 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@ApiModel("分类管理实体类")
+@Data
+@TableName("automessage_classify_administration")
+public class ClassifyAdministration implements Serializable
+{
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(name = "id", value = "主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 分类级别 1 一级 2 二级
+ */
+ @ApiModelProperty(name = "classifyGrade", value = "分类级别 1 一级 2 二级 ")
+ private String classifyGrade;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(name = "createTime", value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(name = "updateTime", value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ /**
+ * 分类图片地址
+ */
+ @ApiModelProperty(name = "classifyIcon", value = "分类图片地址")
+ private String classifyIcon;
+
+ /**
+ * 上级分类
+ */
+ @ApiModelProperty(name = "parentId", value = "上级分类")
+ private String parentId;
+
+ /**
+ * 分类名字
+ */
+ @ApiModelProperty(name = "classifyName", value = "分类名字")
+ private String classifyName;
+
+ /**
+ * 父级分类名字
+ */
+ @TableField(exist = false)
+ @ApiModelProperty(name = "parentName", value = "父级分类名字")
+ private String parentName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "ClassifyAdministrationEntityList", value = "下级分类")
+ private List<ClassifyAdministration> ClassifyAdministrationEntityList;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "transactNum", value = "办理事项数量")
+ private String transactNum;
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/CountList.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/CountList.java
new file mode 100644
index 0000000..4cdf78c
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/CountList.java
@@ -0,0 +1,20 @@
+package com.dg.core.db.gen.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@ApiModel("时间筛选列表实体类")
+@Data
+public class CountList implements Serializable
+{
+
+ @ApiModelProperty("待办结列表")
+ private List<CountListNum> waitDealWithList;
+
+ @ApiModelProperty("已办结列表")
+ private List<CountListNum> haveDealWith;
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/CountListNum.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/CountListNum.java
new file mode 100644
index 0000000..f3f403e
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/CountListNum.java
@@ -0,0 +1,22 @@
+package com.dg.core.db.gen.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@ApiModel("时间筛选实体类")
+@Data
+public class CountListNum implements Serializable
+{
+ @ApiModelProperty("时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("数量")
+ private Integer num;
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/EfficiencyEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/EfficiencyEntity.java
new file mode 100644
index 0000000..ca5a006
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/EfficiencyEntity.java
@@ -0,0 +1,45 @@
+package com.dg.core.db.gen.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel("首页效率实体类")
+public class EfficiencyEntity implements Serializable
+{
+ /**
+ * 回复率
+ */
+ @ApiModelProperty("回复率")
+ private String reversionRate="0%";
+
+ /**
+ * 办结率
+ */
+ @ApiModelProperty("办结率")
+ private String workEfficiency="0%";
+
+ /**
+ * 解决率
+ */
+ @ApiModelProperty("解决率")
+ private String resolveEfficiency="0%";
+
+ /**
+ * 好评率
+ */
+ @ApiModelProperty("好评率")
+ private String goodReputationEfficiency="0%";
+
+
+ /**
+ * 超时办结率
+ */
+ @ApiModelProperty("超时办结率")
+ private String timeoutEfficiency="0%";
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/ElseAccessoryEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/ElseAccessoryEntity.java
new file mode 100644
index 0000000..9b8c94c
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/ElseAccessoryEntity.java
@@ -0,0 +1,91 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@ApiModel("其他附件管理实体类")
+@TableName("automessage_else_accessory")
+public class ElseAccessoryEntity implements Serializable
+{
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(name = "id", value = "主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 部门id
+ */
+ @ApiModelProperty(name = "departmentId", value = "部门id")
+ private String departmentId;
+
+ /**
+ * 部门id
+ */
+ @TableField(exist = false)
+ @ApiModelProperty(name = "departmentName", value = "部门名称")
+ private String departmentName;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(name = "createTime", value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(name = "updateTime", value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ /**
+ * 事项名称
+ */
+ @ApiModelProperty(name = "name", value = "事项名称")
+ private String name;
+
+ /**
+ * 文件地址
+ */
+ @ApiModelProperty(name = "url", value = "文件地址")
+ private String url;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(name = "createUserId", value = "创建人id")
+ private String createUserId;
+
+ /**
+ * 是否能删除修改
+ */
+ @TableField(exist = false)
+ @ApiModelProperty(name = "isDelete", value = "是否能删除修改")
+ private Integer isDelete;
+
+ /**
+ * 创建人
+ */
+ @TableField(exist = false)
+ @ApiModelProperty(name = "createUserName", value = "创建人")
+ private String createUserName;
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/Guidance.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/Guidance.java
new file mode 100644
index 0000000..82defe2
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/Guidance.java
@@ -0,0 +1,19 @@
+package com.dg.core.db.gen.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel("办事指南表")
+@Data
+public class Guidance implements Serializable
+{
+
+ @ApiModelProperty(name = "name", value = "名称")
+ private String name;
+
+ @ApiModelProperty(name = "num", value = "内容")
+ private String num;
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java
new file mode 100644
index 0000000..a39f196
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java
@@ -0,0 +1,160 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@ApiModel("导办工单进展记录表")
+@TableName("automessage_guide_evolve")
+public class GuideEvolveEntity implements Serializable
+{
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(name = "id", value = "主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+
+ /**
+ * 发起人部门id
+ */
+ @ApiModelProperty(name = "departmentalId", value = "发起人部门id")
+ private String departmentalId;
+
+ /**
+ * 接收人部门id
+ */
+ @ApiModelProperty(name = "fromDepartmentalId", value = "接收人部门id")
+ private String fromDepartmentalId;
+
+ /**
+ * 发起人
+ */
+ @ApiModelProperty(name = "toUserId", value = "发起人")
+ private String toUserId;
+
+ /**
+ * 接收人
+ */
+ @ApiModelProperty(name = "fromUserId", value = "接收人")
+ private String fromUserId;
+
+ /**
+ * state", value = "状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 6未解决 7已解决 8 系统自动分配 9 回复 10转派 11手动分配12默认好评13评价14.删除评论）
+ */
+ @ApiModelProperty(name = "state", value = "状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 6未解决 7已解决 8 系统自动分配 9 回复 10转派 11手动分配 12默认好评 13用户评价14.删除评论）")
+ private String state;
+
+
+ /**
+ * 工单号
+ */
+ @ApiModelProperty(name = "guideOrderNum", value = "工单号")
+ private String guideOrderNum;
+ /**
+ * 超时状态 是否超时 （1未超时 2超时）
+ */
+ @ApiModelProperty(name = "isTimeout", value = "超时状态 是否超时 （1未超时 2超时）")
+ private String isTimeout;
+
+ /**
+ * 备注内容
+ */
+ @ApiModelProperty(name = "remark", value = "备注内容")
+ private String remark;
+
+ /**
+ * 工单id
+ */
+ @ApiModelProperty(name = "guideId", value = "工单id")
+ private String guideId;
+
+ /**
+ * 办事指南id
+ */
+ @ApiModelProperty(name = "transactionId", value = "办事指南id")
+ private String transactionId;
+
+ /**
+ * 附件id（系统列表选择）
+ */
+ @ApiModelProperty(name = "accessoryId", value = "附件id（系统列表选择）")
+ private String accessoryId;
+
+ /**
+ * 用户手动上传附件名称
+ */
+ @ApiModelProperty(name = "accessoryName", value = "用户手动上传附件名称")
+ private String accessoryName;
+
+ /**
+ * 用户手动上传附件url
+ */
+ @ApiModelProperty(name = "accessoryUrl", value = "用户手动上传附件url")
+ private String accessoryUrl;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(name = "updateTime", value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(name = "updateTime", value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(name = "guidOrderNum", value = "工单号")
+ private String guidOrderNum;
+
+
+ /**
+ * 视频url
+ */
+ @ApiModelProperty(name = "videoUrl", value = "视频url")
+ private String videoUrl;
+
+ /**
+ * 图片url
+ */
+ @ApiModelProperty(name = "pictureUrl", value = "图片url")
+ private String pictureUrl;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "toUserName", value = "发起人名字")
+ private String toUserName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "toUserName", value = "接收人名字")
+ private String fromUserName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "elseAccessoryEntities", value = "其他附件列表")
+ private List<ElseAccessoryEntity> elseAccessoryEntities;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "transactionEvents", value = "推荐办事指南列表")
+ private List<TransactionEvent> transactionEvents;
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuidePlate.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuidePlate.java
new file mode 100644
index 0000000..2207971
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuidePlate.java
@@ -0,0 +1,24 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel("导办工单进展记录表")
+@Data
+public class GuidePlate implements Serializable
+{
+
+ @ApiModelProperty(name = "userName", value = "用户名")
+ private String userName;
+
+ @ApiModelProperty(name = "departmentNmae", value = "部门")
+ private String departmentNmae;
+
+ @ApiModelProperty(name = "num", value = "内容")
+ private String num;
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java
new file mode 100644
index 0000000..eabd2c6
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java
@@ -0,0 +1,262 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 导办工单管理
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-09-19
+ */
+@TableName("automessage_guide_repair_order")
+@Data
+@ApiModel("导办工单管理实体类")
+public class GuideRepairOrder implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 工单号
+ */
+ @ApiModelProperty("工单号")
+ private String orderNum;
+
+ /**
+ * 事项id
+ */
+ @ApiModelProperty("事项id")
+ private Integer matterId;
+
+ /**
+ * 事项名称
+ */
+ @ApiModelProperty("事项名称")
+ private String matterName;
+
+ /**
+ * 创建部门id
+ */
+ @ApiModelProperty("创建部门id")
+ private String departmentId;
+
+ /**
+ * 分类id
+ */
+ @ApiModelProperty("分类id")
+ private String classifyId;
+
+ /**
+ * 咨询内容
+ */
+ @ApiModelProperty("咨询内容")
+ private String consultContent;
+
+ /**
+ * 咨询人姓名
+ */
+ @ApiModelProperty("咨询人姓名")
+ private String consultUserName;
+
+ /**
+ * 提交用户
+ */
+ @ApiModelProperty("提交用户")
+ private String submitUserId;
+
+ /**
+ * 导办人员
+ */
+ @ApiModelProperty("导办人员")
+ private String guideUserId;
+
+ /**
+ * 导办部门
+ */
+ @ApiModelProperty("导办部门")
+ private String guideDepartmentId;
+
+ /**
+ * 状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消）
+ */
+ @ApiModelProperty("状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消）")
+ private String state;
+
+ /**
+ * 咨询人电话
+ */
+ @ApiModelProperty("咨询人电话")
+ private String consultUserPhone;
+
+ /**
+ * 提交用户电话
+ */
+ @ApiModelProperty("提交用户电话")
+ private String submitUserPhone;
+
+ /**
+ * 导办人员电话
+ */
+ @ApiModelProperty("导办人员电话")
+ private String guideUserPhone;
+
+ /**
+ * 所属地区
+ */
+ @ApiModelProperty("所属地区")
+ private String areaCode;
+
+ /**
+ * 详情地址
+ */
+ @ApiModelProperty("详情地址")
+ private String detailedAddress;
+
+ /**
+ * 提交方式（1 小程序 2.门户网)
+ */
+ @ApiModelProperty("提交方式（1 小程序 2.门户网）")
+ private Integer submitType;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty(name = "images", value = "图片地址(用逗号分隔)")
+ private String images;
+
+ @ApiModelProperty(name = "video", value = "视频地址")
+ private String video;
+
+ @ApiModelProperty(name = "isTimeout", value = "是否超时 （1 未超时 2已超时）")
+ private String isTimeout;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "guideRepairOrderList", value = "工单处理进度")
+ List<GuideEvolveEntity> guideEvolveEntities;
+
+
+ @ApiModelProperty(name = "evaluateContent", value = "评价内容")
+ private String evaluateContent;
+
+ @ApiModelProperty(name = "suggest", value = "建议")
+ private String suggest;
+
+ @ApiModelProperty(name = "evaluateState", value = "评价状态（1 满意 2不满意）")
+ private String evaluateState;
+
+ @ApiModelProperty(name = "serviceState", value = "服务状态(1.已解决 2.未解决)")
+ private Integer serviceState;
+
+ /**
+ * 超时时间
+ */
+ @ApiModelProperty("超时时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime timeoutTime;
+
+ /**
+ * 是否推送过（1 是 2 否）
+ */
+ @ApiModelProperty("是否推送过（1 是 2 否）")
+ private Integer isPush;
+
+
+ /**
+ * 是否提醒推送过（1 是 2 否）
+ */
+ @ApiModelProperty("是否提醒推送过（1 是 2 否）")
+ private Integer isRemindPush;
+
+ /**
+ * 是否隐藏评论（1 是 2 否）
+ */
+ @ApiModelProperty("是否隐藏评论（1 是 2 否）")
+ private Integer isHideComments;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "sumClassifyName", value = "完整分类名称")
+ private String sumClassifyName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "consultUser", value = "咨询人姓名+电话")
+ private String consultUser;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "submitUser", value = "提交人姓名+电话")
+ private String submitUser;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "guideUser", value = "导办人姓名+电话")
+ private String guideUser;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "organizationName", value = "创建部门")
+ private String organizationName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "guideDepartmentName", value = "导办部门")
+ private String guideDepartmentName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "areaName", value = "所属地区名字")
+ private String areaName;
+
+ @Override
+ public String toString() {
+ return "GuideRepairOrder{" +
+ "id=" + id +
+ ", orderNum=" + orderNum +
+ ", matterId=" + matterId +
+ ", matterName=" + matterName +
+ ", departmentId=" + departmentId +
+ ", classifyId=" + classifyId +
+ ", consultContent=" + consultContent +
+ ", consultUserId=" + consultUserName +
+ ", submitUserId=" + submitUserId +
+ ", guideUserId=" + guideUserId +
+ ", guideDepartmentId=" + guideDepartmentId +
+ ", state=" + state +
+ ", consultUserPhone=" + consultUserPhone +
+ ", submitUserPhone=" + submitUserPhone +
+ ", guideUserPhone=" + guideUserPhone +
+ "}";
+ }
+
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrderImage.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrderImage.java
new file mode 100644
index 0000000..0a0573d
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrderImage.java
@@ -0,0 +1,72 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 导办功能图片表
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-09-19
+ */
+@TableName("automessage_guide_repair_order_image")
+@ApiModel("导办工单图片管理实体类")
+@Data
+public class GuideRepairOrderImage implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 导办工单id
+ */
+ @ApiModelProperty("导办工单id")
+ private String guideRepairOrderId;
+
+ /**
+ * 路径
+ */
+ @ApiModelProperty("路径")
+ private String url;
+
+
+ /**
+ * 路径
+ */
+ @ApiModelProperty("类型1,视频 2.图片")
+ private Integer type;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+
+
+ @Override
+ public String toString() {
+ return "GuideRepairOrderImg{" +
+ "id=" + id +
+ ", guideRepairOrderId=" + guideRepairOrderId +
+ ", url=" + url +
+ "}";
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/HuaChengSysUser.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/HuaChengSysUser.java
new file mode 100644
index 0000000..bcd42fa
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/HuaChengSysUser.java
@@ -0,0 +1,285 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 此类为花城e+主体类
+ * 不可修改 切记！！！！！！！！！！！！！！！！！！
+ * 不可修改 切记！！！！！！！！！！！！！！！！！！
+ * 不可修改 切记！！！！！！！！！！！！！！！！！！
+ * 不可修改 切记！！！！！！！！！！！！！！！！！！
+ * 不可修改 切记！！！！！！！！！！！！！！！！！！
+ * 不可修改 切记！！！！！！！！！！！！！！！！！！
+ */
+@ApiModel("花城用户信息实体类")
+@Data
+@TableName("sys_user")
+public class HuaChengSysUser implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 用户ID
+ */
+ @ApiModelProperty(name = "userId", value = "主键用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @TableId(value = "user_id", type = IdType.AUTO)
+ private String userId;
+
+ /**
+ * 登录账户
+ */
+ @ApiModelProperty(name = "account", value = "登录账户")
+ private String account;
+
+ /**
+ * 登录密码
+ */
+ @ApiModelProperty(name = "password", value = "登录密码")
+ private String password;
+
+ /**
+ * 微信小程序唯一标识
+ */
+ @ApiModelProperty(name = "openid", value = "微信小程序唯一标识")
+ private String openid;
+
+ /**
+ * 会话密钥
+ */
+ @ApiModelProperty(name = "sessionKey", value = "会话密钥")
+ private String sessionKey;
+
+ /**
+ * 用户在开放平台的唯一标识符
+ */
+ @ApiModelProperty(name = "unionid", value = "用户在开放平台的唯一标识符")
+ private String unionid;
+
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(name = "phone", value = "手机号")
+ private String phone;
+
+ /**
+ * 昵称
+ */
+ @ApiModelProperty(name = "nickName", value = "昵称")
+ private String nickName;
+
+ /**
+ * 真实名字
+ */
+ @ApiModelProperty(name = "name", value = "真实名字")
+ private String name;
+
+ /**
+ * 社区ID
+ */
+ @ApiModelProperty(name = "communityId", value = "社区ID")
+ private String communityId;
+
+ /**
+ * 性别 1 男 2 女
+ */
+ @ApiModelProperty(name = "sex", value = "性别 1 男 2 女")
+ private String sex;
+
+ /**
+ * 身份证号
+ */
+ @ApiModelProperty(name = "idCard", value = "身份证号")
+ private String idCard;
+
+ /**
+ * 生日
+ */
+ @ApiModelProperty(name = "birthday", value = "生日")
+ private String birthday;
+
+ /**
+ * 头像
+ */
+ @ApiModelProperty(name = "imageUrl", value = "头像")
+ private String imageUrl;
+
+ /**
+ * 用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10 便民服务商家后台 11三说会堂后台 12行业分中心后台
+ */
+ @ApiModelProperty(name = "type", value = "用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10 便民服务商家后台 11三说会堂后台 12行业分中心后台")
+ private String type;
+
+ /**
+ * 职业
+ */
+ @ApiModelProperty(name = "job", value = "职业")
+ private String job;
+
+ /**
+ * 是否志愿者 0 否 1 是
+ */
+ @ApiModelProperty(name = "isVolunteer", value = "是否志愿者 0 否 1 是")
+ private String isVolunteer;
+
+ /**
+ * 是否党员 0 否 1 是
+ */
+ @ApiModelProperty(name = "isPartymember", value = "是否党员 0 否 1 是")
+ private String isPartymember;
+
+ /**
+ * 1 启用 2 禁用
+ */
+ @ApiModelProperty(name = "status", value = "1 启用 2 禁用")
+ private String status;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(name = "createAt", value = "创建时间")
+ private String createAt;
+
+ /**
+ * 最后登录时间
+ */
+ @ApiModelProperty(name = "lastLoginTime", value = "最后登录时间")
+ private String lastLoginTime;
+
+ /**
+ * 标签多个用,隔开
+ */
+ @ApiModelProperty(name = "tags", value = "标签多个用,隔开")
+ private String tags;
+
+ /**
+ * 家庭id
+ */
+ @ApiModelProperty(name = "familyId", value = "家庭id")
+ private String familyId;
+
+ /**
+ * 人脸采集照片url
+ */
+ @ApiModelProperty(name = "faceUrl", value = "人脸采集照片url")
+ private String faceUrl;
+
+ /**
+ * 人脸采集审核状态 0 待审核 1 审核通过 2驳回
+ */
+ @ApiModelProperty(name = "faceState", value = "人脸采集审核状态 0 待审核 1 审核通过 2驳回")
+ private String faceState;
+
+ /**
+ * 驳回原因
+ */
+ @ApiModelProperty(name = "rejectReson", value = "驳回原因")
+ private String rejectReson;
+
+ /**
+ * 小区id
+ */
+ @ApiModelProperty(name = "areaId", value = "小区id")
+ private String areaId;
+
+ /**
+ * 证件照（人相面）照片
+ */
+ @ApiModelProperty(name = "cardPhotoFront", value = "证件照（人相面）照片")
+ private String cardPhotoFront;
+
+ /**
+ * 证件照（国徽面）照片
+ */
+ @ApiModelProperty(name = "cardPhotoBack", value = "证件照（国徽面）照片")
+ private String cardPhotoBack;
+
+ /**
+ * 户口本
+ */
+ @ApiModelProperty(name = "familyBook", value = "户口本")
+ private String familyBook;
+
+ /**
+ * 连续登陆天数 每天凌晨定时任务更新
+ */
+ @ApiModelProperty(name = "continuousLandingDays", value = "连续登陆天数 每天凌晨定时任务更新")
+ private String continuousLandingDays;
+
+ /**
+ * 小程序首页是否显示公告(1.是 2.否)
+ */
+ @ApiModelProperty(name = "isTips", value = "小程序首页是否显示公告(1.是 2.否)")
+ private String isTips;
+
+ /**
+ * 网格员工作状态(1.在岗 2.脱岗 3.已下班)
+ */
+ @ApiModelProperty(name = "workStatus", value = "网格员工作状态(1.在岗 2.脱岗 3.已下班)")
+ private String workStatus;
+
+ /**
+ * 网格员上班开始时间
+ */
+ @ApiModelProperty(name = "workStartTime", value = "网格员上班开始时间")
+ private String workStartTime;
+
+ /**
+ * 网格员上班结束时间
+ */
+ @ApiModelProperty(name = "workEndTime", value = "网格员上班结束时间")
+ private String workEndTime;
+
+ /**
+ * 高龄认证显示提示(1.是 2.否)
+ */
+ @ApiModelProperty(name = "bigAgeTips", value = "高龄认证显示提示(1.是 2.否)")
+ private String bigAgeTips;
+
+ /**
+ * 明文密码
+ */
+ @ApiModelProperty(name = "plaintextPassword", value = "明文密码")
+ private String plaintextPassword;
+
+ /**
+ * 街道id
+ */
+ @ApiModelProperty(name = "streetId", value = "街道id")
+ private String streetId;
+
+ /**
+ * 绑定单位
+ */
+ @ApiModelProperty(name = "relationName", value = "绑定单位")
+ private String relationName;
+
+ /**
+ *
+ */
+ @ApiModelProperty(name = "appId", value = "")
+ private String appId;
+
+ /**
+ * 是否接收推送
+ */
+ @ApiModelProperty(name = "isAccept", value = "是否接收推送")
+ private String isAccept;
+
+ /**
+ * 报到单位id
+ */
+ @ApiModelProperty(name = "bindingCheckUnitId", value = "报到单位id")
+ private String bindingCheckUnitId;
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/KeywordEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/KeywordEntity.java
new file mode 100644
index 0000000..811ead1
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/KeywordEntity.java
@@ -0,0 +1,38 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@ApiModel("关键词实体类")
+@Data
+@TableName("automessage_keyword")
+public class KeywordEntity implements Serializable
+{
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("关键词")
+ private String name;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+ @ApiModelProperty("关键词关联ids")
+ private String transactionId;
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/MenuEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/MenuEntity.java
new file mode 100644
index 0000000..51bae5a
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/MenuEntity.java
@@ -0,0 +1,59 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@ApiModel("菜单实体类")
+@Data
+@TableName("automessage_menu")
+public class MenuEntity implements Serializable
+{
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 标题
+ */
+ @ApiModelProperty("标题")
+ private String title;
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+ /**
+ * 备注
+ */
+ @ApiModelProperty("备注")
+ private String remark;
+ /**
+ * 父节点id
+ */
+ @ApiModelProperty("父节点id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long parentId;
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/OrganizationChartEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/OrganizationChartEntity.java
new file mode 100644
index 0000000..1ad2caf
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/OrganizationChartEntity.java
@@ -0,0 +1,142 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@ApiModel("组织架构实体类")
+@Data
+@TableName("automessage_organization_chart")
+public class OrganizationChartEntity implements Serializable
+{
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 单位名称
+ */
+ @ApiModelProperty("单位名称")
+ private String organizationName;
+
+ /**
+ * 办理区域（市）
+ */
+ @ApiModelProperty("办理区域（市）")
+ private String city;
+
+
+ /**
+ * 办理区域（区）
+ */
+ @ApiModelProperty("办理区域（区）")
+ private String district;
+
+ /**
+ * 办理区域（乡）
+ */
+ @ApiModelProperty("办理区域（乡）")
+ private String village;
+
+ /**
+ * 详细地址
+ */
+ @ApiModelProperty("详细地址")
+ private String detailedAddress;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+
+ /**
+ * 父级单位id
+ */
+ @ApiModelProperty("父级单位id")
+ private String parentId;
+
+ /**
+ * 机构等级
+ */
+ @ApiModelProperty("机构等级")
+ private String grade;
+
+ /**
+ * 机构等级
+ */
+ @ApiModelProperty("部门简历")
+ private String resume;
+
+ /**
+ * 机构等级
+ */
+ @ApiModelProperty("联系电话")
+ private String contactNumber;
+
+ /**
+ * areaList
+ */
+ @ApiModelProperty("areaList")
+ private String areaList;
+
+ /**
+ * 机构等级
+ */
+ @ApiModelProperty("部门应用")
+ private String departmentalApplication;
+
+ /**
+ * 修改人
+ */
+ @ApiModelProperty("修改人")
+ private String updateUserId;
+
+ /**
+ * 修改人
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("修改人姓名")
+ private String updateUserName;
+
+
+ /**
+ * 下属机构
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("下属机构")
+ private List<OrganizationChartEntity> child;
+
+ /**
+ * 父级部门名称
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("下属机构")
+ private String parentName;
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/OrganizationEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/OrganizationEntity.java
new file mode 100644
index 0000000..9b211ca
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/OrganizationEntity.java
@@ -0,0 +1,27 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel("组织排行榜")
+@Data
+public class OrganizationEntity implements Serializable {
+ @ApiModelProperty("id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+
+ @ApiModelProperty(name = "departmentNmae", value = "部门")
+ private String departmentNmae;
+
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "num", value = "内容")
+ private String num="0";
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/PieChart.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/PieChart.java
new file mode 100644
index 0000000..a3c12f9
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/PieChart.java
@@ -0,0 +1,19 @@
+package com.dg.core.db.gen.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel("饼状图子类实体类")
+@Data
+public class PieChart implements Serializable
+{
+ @ApiModelProperty("一级分类名称")
+ private String name;
+
+
+ @ApiModelProperty("一级分类数量")
+ private String num;
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/PieChartAll.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/PieChartAll.java
new file mode 100644
index 0000000..3c5b08d
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/PieChartAll.java
@@ -0,0 +1,27 @@
+package com.dg.core.db.gen.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@ApiModel("饼状图实体类")
+@Data
+public class PieChartAll implements Serializable
+{
+ @ApiModelProperty("工单总数")
+ private String workOrderNum;
+
+ @ApiModelProperty("办事指南总数")
+ private String fingerpostNum;
+
+ @ApiModelProperty("工单统计图数据")
+ private List<PieChart> workOrderList;
+
+ @ApiModelProperty("办事指南统计图数据")
+ private List<PieChart> fingerpostList;
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/RangeStatistics.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/RangeStatistics.java
new file mode 100644
index 0000000..eb01ea6
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/RangeStatistics.java
@@ -0,0 +1,19 @@
+package com.dg.core.db.gen.entity;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel("导办工单根据地区统计")
+@Data
+public class RangeStatistics implements Serializable
+{
+ @ApiModelProperty("区域名")
+ private String name;
+
+ @ApiModelProperty("数量")
+ private String num;
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/ReplyTemplateEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/ReplyTemplateEntity.java
new file mode 100644
index 0000000..b9a3ce1
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/ReplyTemplateEntity.java
@@ -0,0 +1,158 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@ApiModel("回复模板实体类")
+@Data
+@TableName
+public class ReplyTemplateEntity implements Serializable
+{
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 模板名称
+ */
+ @ApiModelProperty("模板名称")
+ private String name;
+
+ /**
+ * 办结状态（1已办结 0未办结）
+ */
+ @ApiModelProperty("办结状态（1已办结 0未办结）")
+ private String handleState;
+
+ /**
+ * 回复内容
+ */
+ @ApiModelProperty("回复内容")
+ private String response;
+
+ /**
+ * 办事指南
+ */
+ @ApiModelProperty("办事指南 ")
+ private String guidance;
+
+ /**
+ * 上传附件url
+ */
+ @ApiModelProperty("上传附件url")
+ private String accessoryUrl;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ /**
+ * 单位名称
+ */
+ @ApiModelProperty("上传附件名字")
+ private String accessoryName;
+ /**
+ * 单位名称
+ */
+ @ApiModelProperty("视频url")
+ private String videoUrl;
+ /**
+ * 单位名称
+ */
+ @ApiModelProperty("视频名字")
+ private String videoName;
+
+ /**
+ * 单位名称
+ */
+ @ApiModelProperty("图片url")
+ private String pictureUrl;
+ /**
+ * 单位名称
+ */
+ @ApiModelProperty("图片名字")
+ private String pictureName;
+
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty("创建人id")
+ private String createUserId;
+
+
+ /**
+ * 创建人姓名
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("创建人姓名")
+ private String createUser;
+
+ /**
+ * 创建人部门id
+ */
+ @ApiModelProperty("创建人部门id")
+ private String departmentId;
+
+ /**
+ * 创建人部门名称
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("创建人部门名称")
+ private String departmentName;
+
+ /**
+ * 附件id
+ */
+ @ApiModelProperty("附件id")
+ private String accessoryId;
+
+ /**
+ * 附件列表
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("附件列表")
+ private List<ElseAccessoryEntity> elseAccessoryEntityList;
+
+ /**
+ * 推荐办事指南列表
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("推荐办事指南列表")
+ private List<TransactionEvent> transactionEventList;
+
+
+ /**
+ * 是否能够删除修改
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("是否能够删除修改")
+ private Integer isDelete;
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/RoleManagementEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/RoleManagementEntity.java
new file mode 100644
index 0000000..c68821e
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/RoleManagementEntity.java
@@ -0,0 +1,76 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@ApiModel("角色管理实体类")
+@Data
+@TableName("automessage_role_management")
+public class RoleManagementEntity implements Serializable
+{
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ *
+ */
+ @ApiModelProperty("角色名称")
+ private String roleName;
+
+ /**
+ * 创建者id
+ */
+ @ApiModelProperty("创建者id")
+ private String createUserId;
+
+ /**
+ *
+ */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ /**
+ * 修改人员id
+ */
+ @ApiModelProperty("修改人员id")
+ private String updateUserId;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+
+ /**
+ * 权限
+ */
+ @ApiModelProperty("权限")
+ private String permission;
+
+ @TableField(exist = false)
+ @ApiModelProperty("创建者名称")
+ private String createName;
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/RoleMenuEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/RoleMenuEntity.java
new file mode 100644
index 0000000..5cf008f
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/RoleMenuEntity.java
@@ -0,0 +1,60 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@ApiModel("角色菜单关系实体类")
+@Data
+@TableName("automessage_role_menu")
+public class RoleMenuEntity implements Serializable
+{
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 角色id
+ */
+ @ApiModelProperty("角色id")
+ private String roleId;
+
+ /**
+ * 菜单id
+ */
+ @ApiModelProperty("菜单id")
+ private String menuId;
+
+ /**
+ *
+ */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/Slideshow.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/Slideshow.java
new file mode 100644
index 0000000..bd3382e
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/Slideshow.java
@@ -0,0 +1,72 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 轮播图
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-09-19
+ */
+@ApiModel("轮播图实体类")
+@Data
+@TableName("automessage_slideshow")
+public class Slideshow implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("主键id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 图片地址
+ */
+ @ApiModelProperty("图片地址")
+ private String url;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ private LocalDateTime createTime;
+
+ /**
+ * 链接类型（1.暂不设置2.富文本3.微信文章）
+ */
+ @ApiModelProperty("链接类型（1.暂不设置2.富文本3.微信文章）")
+ private Integer linkType;
+
+ /**
+ * 文章链接
+ */
+ @ApiModelProperty("文章链接")
+ private String link;
+
+ /**
+ * 文章标题
+ */
+ @ApiModelProperty("文章标题")
+ private String title;
+
+ /**
+ * 文章内容
+ */
+ @ApiModelProperty("文章内容")
+ private String content;
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
new file mode 100644
index 0000000..54f3e05
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
@@ -0,0 +1,291 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 用户信息表
+ * </p>
+ *
+ * @author xiang
+ * @since 2022-07-05
+ */
+@ApiModel("用户信息实体类")
+@Data
+@TableName("automessage_sys_user")
+public class SysUser implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty("用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private String userId;
+
+
+ /**
+ * 登录账号
+ */
+ @ApiModelProperty("登录账号")
+ private String loginName;
+
+ /**
+ * 用户昵称
+ */
+ @ApiModelProperty("用户昵称")
+ private String userName;
+
+ /**
+ * 用户类型（1系统后台用户 2导办人员用户）
+ */
+ @ApiModelProperty("用户类型（1系统后台用户 2导办人员用户 3.普通用户 4.小程序用户")
+ private String userType;
+
+
+ /**
+ * 手机号码
+ */
+ @ApiModelProperty("手机号码")
+ private String phonenumber;
+
+ /**
+ * 性别 1 男 2 女
+ */
+ @ApiModelProperty("性别 1 男 2 女")
+ private String sex;
+
+ /**
+ * 头像路径
+ */
+ @ApiModelProperty("头像路径")
+ private String avatar;
+
+ /**
+ * 密码
+ */
+ @ApiModelProperty("密码")
+ private String password;
+
+ /**
+ * 盐加密
+ */
+ @ApiModelProperty("加密")
+ private String salt;
+
+ /**
+ * 帐号状态（0正常 1停用）
+ */
+ @ApiModelProperty("帐号状态（0正常 1停用）")
+ private String status;
+
+ /**
+ * 删除标志（0代表存在 2代表删除）
+ */
+ @ApiModelProperty("删除标志（0代表存在 2代表删除）")
+ private String delFlag;
+
+ /**
+ * 最后登录IP
+ */
+ @ApiModelProperty("最后登录IP")
+ private String loginIp;
+
+ /**
+ * 最后登录时间
+ */
+ @ApiModelProperty("最后登录时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime loginDate;
+
+ /**
+ * 密码最后更新时间
+ */
+ @ApiModelProperty("密码最后更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime pwdUpdateDate;
+
+ /**
+ * 创建者
+ */
+ @ApiModelProperty("创建者")
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ /**
+ * 更新者
+ */
+ @ApiModelProperty("更新者")
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty("备注")
+ private String remark;
+
+ /**
+ * 角色ids
+ */
+ @ApiModelProperty("角色id")
+ private String roleIds;
+
+ /**
+ * 前端使用
+ */
+ @ApiModelProperty("前端使用")
+ private String departmentIdStr;
+
+ /**
+ * 数据权限
+ */
+ @ApiModelProperty("数据权限")
+ private String dataPermission;
+
+ /**
+ * 部门id
+ */
+ @ApiModelProperty("部门id")
+ private String departmentId;
+
+
+ /**
+ * 一级id
+ */
+ @ApiModelProperty("一级id")
+ private String stairId;
+
+ /**
+ * 二级id
+ */
+ @ApiModelProperty("二级id")
+ private String secondLevelId;
+
+ /**
+ * 所属部门名称
+ */
+ @ApiModelProperty("所属部门名称")
+ private String departmentName;
+
+ /**
+ * 部门所属区域
+ */
+ @ApiModelProperty("部门所属区域")
+ private String departmentArea;
+
+ /**
+ * 空闲状态（0 空闲 1 忙碌）
+ */
+ @ApiModelProperty("空闲状态（0 空闲 1 忙碌）")
+ private String leisureState;
+
+ /**
+ * 擅长办理事务ids
+ */
+ @ApiModelProperty("擅长办理事务ids")
+ private String masterIds;
+
+ /**
+ * 擅长事务名称
+ */
+ @ApiModelProperty("擅长事务名称")
+ private String masterNames;
+
+ /**
+ * 办结事项ids
+ */
+ @ApiModelProperty("办结事项ids")
+ private String transactionIds;
+
+ /**
+ * 办结事项名称
+ */
+ @ApiModelProperty("办结事项名称")
+ private String transactionNames;
+
+ /**
+ * 微信小程序id
+ */
+ @ApiModelProperty("微信小程序id")
+ private String openid;
+
+ /**
+ * 待处理办事指南数量
+ */
+ @ApiModelProperty("待处理办事指南数量")
+ private Integer transactionNum;
+
+
+ @TableField(exist = false)
+ @ApiModelProperty("权限资格")
+ private String permission;
+
+ @TableField(exist = false)
+ @ApiModelProperty("角色名称")
+ private String roleName;
+
+
+ @TableField(exist = false)
+ @ApiModelProperty("创建人名称")
+ private String createName;
+
+ @ApiModelProperty("是否是部门领导（1是 2不是）")
+ private String isDivisionHead;
+
+ @ApiModelProperty("办理事项ids")
+ private String mattersIds;
+
+
+ @ApiModelProperty("部门ids")
+ private String departmentIds;
+
+
+ @ApiModelProperty("多部门ids")
+ private String moreDepartmentIds;
+
+
+ @TableField(exist = false)
+ @ApiModelProperty("办理事项名称")
+ private String mattersNames;
+
+
+
+ @TableField(exist = false)
+ @ApiModelProperty("办结事项数目")
+ private String transactionEndNum;
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/TimeWorkOrder.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/TimeWorkOrder.java
new file mode 100644
index 0000000..1e0a570
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/TimeWorkOrder.java
@@ -0,0 +1,35 @@
+package com.dg.core.db.gen.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 导办工单统计类
+ */
+
+@ApiModel("不同时间段的工单数量")
+@Data
+public class TimeWorkOrder implements Serializable
+{
+ //累计全部 本年 本月 今日 昨日
+ /**
+ * 总数量
+ */
+ @ApiModelProperty("累计总数量")
+ private Integer allNum=0;
+
+ @ApiModelProperty("本年")
+ private Integer yearNum;
+
+ @ApiModelProperty("本月")
+ private Integer monthNum;
+
+ @ApiModelProperty("今天")
+ private Integer todayNum;
+
+ @ApiModelProperty("昨天")
+ private Integer yesterdayNum;
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java
new file mode 100644
index 0000000..e2b6ee5
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java
@@ -0,0 +1,284 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@ApiModel("导办事项管理实体类")
+@Data
+@TableName("automessage_transaction_event")
+public class TransactionEvent implements Serializable
+{
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 所属部门id
+ */
+ @ApiModelProperty("所属部门id")
+ private String departmentId;
+
+ /**
+ * 部门所属区域
+ */
+ @ApiModelProperty("部门所属区域")
+ private String departmentArea;
+
+ /**
+ * 部门电话
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("部门电话")
+ private String contactNumber;
+
+ /**
+ * 分类id
+ */
+ @ApiModelProperty("分类id")
+ private String classifyId;
+
+ /**
+ * 所属分类等级
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("所属分类等级")
+ private String classifyName;
+
+ /**
+ * 部门名称
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("部门名称")
+ private String departmentName;
+ /**
+ * 事项名称
+ */
+ @ApiModelProperty("事项名称")
+ private String matterName;
+
+ /**
+ * 联想词ids
+ */
+ @ApiModelProperty("联想词ids")
+ private String associateIds;
+
+ /**
+ * 导办数量
+ */
+ @ApiModelProperty("导办数量")
+ private Integer transactionNum;
+
+ /**
+ * 浏览数量
+ */
+ @ApiModelProperty("浏览数量")
+ private Integer browseNum=0;
+
+ /**
+ * 基础信息
+ */
+ @ApiModelProperty("基础信息")
+ private String basicInformation;
+
+ /**
+ * 现场申报
+ */
+ @ApiModelProperty("现场申报")
+ private String acceptConditions;
+
+ /**
+ * 办理区域
+ */
+ @ApiModelProperty("办理区域")
+ private String applicationMaterial;
+
+ /**
+ * 办理流程
+ */
+ @ApiModelProperty("办理流程")
+ private String handlingProcedures;
+
+ /**
+ * 网上申报
+ */
+ @ApiModelProperty("网上申报")
+ private String rates;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ /**
+ * 联想词内容 , 连接
+ */
+ @ApiModelProperty("联想词内容 , 连接")
+ private String associateNames;
+ /**
+ * 查找时间
+ */
+ @ApiModelProperty("查找时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime queryTime;
+ /**
+ * 基础信息附件url
+ */
+ @ApiModelProperty("基础信息附件url")
+ private String basicInformationUrl;
+ /**
+ * 现场申报附件url
+ */
+ @ApiModelProperty("现场申报附件url")
+ private String acceptConditionsUrl;
+ /**
+ * 办理区域附件url
+ */
+ @ApiModelProperty("办理区域附件url")
+ private String applicationMaterialUrl;
+ /**
+ * 办理流程附件url
+ */
+ @ApiModelProperty("办理流程附件url")
+ private String handlingProceduresUrl;
+ /**
+ * 网上申报附件url
+ */
+ @ApiModelProperty("网上申报附件url")
+ private String ratesUrl;
+ /**
+ * 基础信息附件url
+ */
+ @ApiModelProperty("基础信息附件url")
+ private String basicInformationFileName;
+ /**
+ * 现场申报附件url
+ */
+ @ApiModelProperty("现场申报附件url")
+ private String acceptConditionsFileName;
+ /**
+ * 办理区域文件名称
+ */
+ @ApiModelProperty("办理区域文件名称")
+ private String applicationMaterialFileName;
+ /**
+ * 办理流程文件名称
+ */
+ @ApiModelProperty("办理流程文件名称")
+ private String handlingProceduresFileName;
+ /**
+ * 网上申报文件名称
+ */
+ @ApiModelProperty("网上申报文件名称")
+ private String ratesFileName;
+
+ /**
+ * 操作指引附件url
+ */
+ @ApiModelProperty("操作指引附件url")
+ private String operationalGuidelineUrl;
+
+ /**
+ * 操作指引视频url
+ */
+ @ApiModelProperty("操作指引视频url")
+ private String operationalGuidelineVideoUrl;
+
+ /**
+ * 设定依据
+ */
+ @ApiModelProperty("设定依据")
+ private String setGist;
+ /**
+ * 设定依据url
+ */
+ @ApiModelProperty("设定依据url")
+ private String setGistUrl;
+ /**
+ * 设定依据文件名称
+ */
+ @ApiModelProperty("设定依据文件名称")
+ private String setGistName;
+
+ /**
+ * 常见问题
+ */
+ @ApiModelProperty("常见问题")
+ private String commonProblem;
+
+ /**
+ * 常见问题附件url
+ */
+ @ApiModelProperty("常见问题附件url")
+ private String commonProblemUrl;
+
+ /**
+ * 常见问题文件名称
+ */
+ @ApiModelProperty("常见问题文件名称")
+ private String commonProblemName;
+
+
+ @ApiModelProperty("手机移动端申报")
+ private String transactionArea;
+
+ @ApiModelProperty("手机移动端申报url")
+ private String transactionAreaUrl;
+
+ @ApiModelProperty("手机移动端申报文件名称")
+ private String transactionAreaName;
+
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "sumTransactionNum", value = "导办服务数量")
+ private Integer sumTransactionNum;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "countTransaction", value = "导办服务指南数量")
+ private Integer countTransaction;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "sumClassifyName", value = "分类总名称")
+ String sumClassifyName;
+
+ @ApiModelProperty(name = "operationalGuidelineVideoName", value = "操作指南视频名称")
+ private String operationalGuidelineVideoName;
+
+ @ApiModelProperty(name = "operationalGuidelineName", value = "操作指南名称")
+ private String operationalGuidelineName;
+
+ @ApiModelProperty(name = "classifyIds", value = "前端使用")
+ private String classifyIds;
+
+
+ @ApiModelProperty(name = "departmentIds", value = "所属部门列")
+ private String departmentIds;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "departmentNames", value = "所属部门列名称集合")
+ private String departmentNames;
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/WorkOrder.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/WorkOrder.java
new file mode 100644
index 0000000..d758d99
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/WorkOrder.java
@@ -0,0 +1,78 @@
+package com.dg.core.db.gen.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 导办工单统计类
+ */
+@ApiModel("导办工单统计类")
+@Data
+public class WorkOrder implements Serializable
+{
+ /**
+ * 总数量
+ */
+ @ApiModelProperty("总数量")
+ private Integer allNum=0;
+
+
+ /**
+ * 待分配
+ */
+ @ApiModelProperty("待分配数量")
+ private Integer waitDistribution=0;
+
+ /**
+ * 待办结
+ */
+ @ApiModelProperty("待办结")
+ private Integer waitDealWith=0;
+
+ /**
+ * 已办结
+ */
+ @ApiModelProperty("已办结")
+ private Integer haveDealWith=0;
+
+
+ /**
+ * 待评价
+ */
+ @ApiModelProperty("待评价")
+ private Integer remainEvaluated=0;
+
+ /**
+ * 已取消
+ */
+ @ApiModelProperty("已取消")
+ private Integer canceled=0;
+
+ /**
+ * 已超时
+ */
+ @ApiModelProperty("已超时")
+ private Integer overtime=0;
+
+ /**
+ * 超时未办结
+ */
+ @ApiModelProperty("超时未办结")
+ private Integer overtimeWaitDealWith=0;
+
+ /**
+ * 未解决
+ */
+ @ApiModelProperty("未解决")
+ private Integer unsolved=0;
+
+ /**
+ * 已解决
+ */
+ @ApiModelProperty("已解决")
+ private Integer resolved=0;
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/AgreementMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AgreementMapper.java
new file mode 100644
index 0000000..50ffd89
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AgreementMapper.java
@@ -0,0 +1,25 @@
+package com.dg.core.db.gen.mapper;
+
+import com.dg.core.db.gen.entity.Agreement;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 相关协议 Mapper 接口
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-09-22
+ */
+public interface AgreementMapper extends BaseMapper<Agreement> {
+
+
+ /**
+ * 获取相关附件列表（不分页）
+ * @return
+ */
+ List<Agreement> selectConfigList();
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/AreaCode2022Mapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AreaCode2022Mapper.java
new file mode 100644
index 0000000..c3cb89a
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AreaCode2022Mapper.java
@@ -0,0 +1,24 @@
+package com.dg.core.db.gen.mapper;
+
+import com.dg.core.db.gen.entity.AreaCode2022;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-09-20
+ */
+public interface AreaCode2022Mapper extends BaseMapper<AreaCode2022> {
+
+ /**
+ * 根据指南id获取所属地区
+ * @return
+ */
+ List<AreaCode2022> selectByIdSet( List<String> areaCodes);
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageCommonProblemMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageCommonProblemMapper.java
new file mode 100644
index 0000000..31326e9
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageCommonProblemMapper.java
@@ -0,0 +1,40 @@
+package com.dg.core.db.gen.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.db.gen.entity.AutomessageCommonProblem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+ import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 常见问题表 Mapper 接口
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-09-23
+ */
+public interface AutomessageCommonProblemMapper extends BaseMapper<AutomessageCommonProblem> {
+
+ /**
+ * 获取常见问题列表（分页）
+ * @param page
+ * @param state
+ * @return
+ */
+ List<AutomessageCommonProblem> selectConfigList(IPage<AutomessageCommonProblem> page, Integer state, @Param("title") String title, @Param("content") String content);
+
+ /**
+ * 获取常见问题列表（不分页查找）
+ * @return
+ */
+ List<AutomessageCommonProblem> selectConfigList(@Param("title") String title, @Param("content") String content);
+
+ /**
+ * 获取常见问题列表统计数量
+ * @return
+ */
+ Integer countConfigList(@Param("title") String title, @Param("content") String content);
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessagePolicyDocumentsMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessagePolicyDocumentsMapper.java
new file mode 100644
index 0000000..6722750
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessagePolicyDocumentsMapper.java
@@ -0,0 +1,53 @@
+package com.dg.core.db.gen.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.db.gen.entity.AutomessageCommonProblem;
+import com.dg.core.db.gen.entity.AutomessagePolicyDocuments;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-11-10
+ */
+public interface AutomessagePolicyDocumentsMapper extends BaseMapper<AutomessagePolicyDocuments> {
+
+ /**
+ * 获取法律法规政策文件 （分页）
+ * @param page
+ * @param state
+ * @param name 名称
+ * @param type 类型
+ * @return
+ */
+ List<AutomessagePolicyDocuments> selectConfigList(IPage<AutomessagePolicyDocuments> page, Integer state, @Param("name") String name, @Param("type") String type, @Param("departmentId") Integer departmentId, @Param("ids") List<String> ids);
+
+
+ /**
+ * 获取法律法规政策文件 （不分页）
+ * @param name 名称
+ * @param type 类型
+ * @return
+ */
+ List<AutomessagePolicyDocuments> selectConfigList(@Param("name") String name, @Param("type") String type, @Param("departmentId") Integer departmentId, @Param("ids") List<String> ids);
+
+
+ /**
+ * 根据id获取法律法规政策文件数据
+ * @return
+ */
+ AutomessagePolicyDocuments selectAutomessagePolicyDocumentById(Integer id);
+
+ /**
+ * 获取法律法规政策文件 （统计）
+ * @return
+ */
+ Integer selectCountList(@Param("name") String name, @Param("type") String type,@Param("departmentId") Integer departmentId, @Param("ids") List<String> ids);
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSmartConsultingMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSmartConsultingMapper.java
new file mode 100644
index 0000000..d7ad7d5
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSmartConsultingMapper.java
@@ -0,0 +1,16 @@
+package com.dg.core.db.gen.mapper;
+
+import com.dg.core.db.gen.entity.AutomessageSmartConsulting;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-11-16
+ */
+public interface AutomessageSmartConsultingMapper extends BaseMapper<AutomessageSmartConsulting> {
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysSettingsMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysSettingsMapper.java
new file mode 100644
index 0000000..2d8aa18
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysSettingsMapper.java
@@ -0,0 +1,16 @@
+package com.dg.core.db.gen.mapper;
+
+import com.dg.core.db.gen.entity.AutomessageSysSettings;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 系统设置表 Mapper 接口
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-10-14
+ */
+public interface AutomessageSysSettingsMapper extends BaseMapper<AutomessageSysSettings> {
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysSettingsRecordMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysSettingsRecordMapper.java
new file mode 100644
index 0000000..68307c2
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysSettingsRecordMapper.java
@@ -0,0 +1,16 @@
+package com.dg.core.db.gen.mapper;
+
+import com.dg.core.db.gen.entity.AutomessageSysSettingsRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-10-14
+ */
+public interface AutomessageSysSettingsRecordMapper extends BaseMapper<AutomessageSysSettingsRecord> {
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysUserRecordMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysUserRecordMapper.java
new file mode 100644
index 0000000..97122a6
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysUserRecordMapper.java
@@ -0,0 +1,49 @@
+package com.dg.core.db.gen.mapper;
+
+import com.dg.core.db.gen.entity.AutomessageSysUserRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dg.core.db.manual.pojo.AppletUserCount;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-10-15
+ */
+public interface AutomessageSysUserRecordMapper extends BaseMapper<AutomessageSysUserRecord> {
+
+ /**
+ * 小程序用户访问量统计1.累计访问量2.本年访问量 3.本月访问量 4.今日访问量 5.昨日访问
+ * @return
+ */
+ List<AppletUserCount> selectUserRecordCount();
+
+ /**
+ * 小程序用户访问量统计近15天
+ * @return
+ */
+ List<AppletUserCount> selectByDay();
+
+ /**
+ * 小程序用户访问量统计近30天
+ * @return
+ */
+ List<AppletUserCount> selectByMonth();
+
+ /**
+ * 小程序用户访问量统计近一年
+ * @return
+ */
+ List<AppletUserCount> selectByYear();
+
+ /**
+ * 删除因为token问题产出的重复脏数据
+ * @return
+ */
+ Integer deleteDistinct();
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageTransactionEventInterviewMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageTransactionEventInterviewMapper.java
new file mode 100644
index 0000000..2650538
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageTransactionEventInterviewMapper.java
@@ -0,0 +1,16 @@
+package com.dg.core.db.gen.mapper;
+
+import com.dg.core.db.gen.entity.AutomessageTransactionEventInterview;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 办事指南访问表 Mapper 接口
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-09-26
+ */
+public interface AutomessageTransactionEventInterviewMapper extends BaseMapper<AutomessageTransactionEventInterview> {
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/ClassifyAdministrationMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/ClassifyAdministrationMapper.java
new file mode 100644
index 0000000..eaf8e4b
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/ClassifyAdministrationMapper.java
@@ -0,0 +1,85 @@
+package com.dg.core.db.gen.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.db.gen.entity.ClassifyAdministration;
+import com.dg.core.db.gen.entity.TransactionEvent;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface ClassifyAdministrationMapper extends BaseMapper<ClassifyAdministration>
+{
+ /**
+ * 获取管理菜单列表
+ * @return
+ */
+ public List<ClassifyAdministration> selectConfigList(@Param("classifyName") String classifyName,
+ @Param("classifyGrade") String classifyGrade);
+
+ /**
+ * 获取管理菜单列表
+ * @return
+ */
+ public List<ClassifyAdministration> selectConfigList(IPage<ClassifyAdministration> page,
+ Integer state,
+ @Param("classifyName") String classifyName,
+ @Param("classifyGrade") String classifyGrade);
+
+ /**
+ * 新增分类
+ * @param entity
+ * @return
+ */
+ public int insertConfig(ClassifyAdministration entity);
+
+ /**
+ * 更新分类
+ * @param entity
+ * @return
+ */
+ public int updateConfig(ClassifyAdministration entity);
+
+ /**
+ * 删除分类
+ * @param Id
+ * @return
+ */
+ public int deleteConfigById(String Id);
+
+
+ /**
+ * 统计数量
+ * @return
+ */
+ public int countNum(@Param("classifyName") String classifyName,
+ @Param("classifyGrade") String classifyGrade);
+
+
+ /**
+ * 获取管理菜单列表(根目录分页)
+ * @return
+ */
+ List<ClassifyAdministration> selectRootList (IPage<ClassifyAdministration> page, Integer state,@Param("parentId")String parentId,@Param("departmentId")Integer departmentId);
+
+ /**
+ * 获取管理菜单列表(根目录不分页)
+ * @return
+ */
+ List<ClassifyAdministration> selectRootList (@Param("parentId")String parentId,@Param("departmentId")Integer departmentId);
+
+
+ /**
+ * 根据上级id查询子分类
+ * @param parentId
+ * @return
+ */
+ List<String> selectParent(String parentId);
+
+
+ List<ClassifyAdministration> selectParentData(String parentId);
+
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/ElseAccessoryMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/ElseAccessoryMapper.java
new file mode 100644
index 0000000..23f456c
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/ElseAccessoryMapper.java
@@ -0,0 +1,70 @@
+package com.dg.core.db.gen.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.db.gen.entity.ElseAccessoryEntity;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface ElseAccessoryMapper extends BaseMapper<ElseAccessoryEntity>
+{
+
+ /**
+ * 获取附件列表
+ * @param page
+ * @param state
+ * @param Name
+ * @return
+ */
+ public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state,
+ @Param("Name") String Name,
+ @Param("ids") List<String> ids,
+ @Param("userId") String userId);
+
+ /**
+ * 获取附件列表全部
+ * @param Name
+ * @return
+ */
+ public List<ElseAccessoryEntity> selectConfigList(@Param("Name") String Name,
+ @Param("ids") List<String> ids,
+ @Param("userId") String userId);
+
+
+ /**
+ * 新增列表
+ * @param entity
+ * @return
+ */
+ public int insertConfig(ElseAccessoryEntity entity);
+
+ /**
+ * 更新列表
+ * @param entity
+ * @return
+ */
+ public int updateConfig(ElseAccessoryEntity entity);
+
+ /**
+ * 删除
+ * @param Id
+ * @return
+ */
+ public int deleteConfigById(String Id);
+
+ /**
+ * 统计数量
+ * @param Name
+ * @return
+ */
+ public int countNum(@Param("Name") String Name,@Param("ids") List<String> ids);
+
+ /**
+ * 按ids查找相关附件列表
+ * @param list
+ * @return
+ */
+ List<ElseAccessoryEntity> selectListByIds(String[] list);
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideEvolveMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideEvolveMapper.java
new file mode 100644
index 0000000..4e3b7d6
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideEvolveMapper.java
@@ -0,0 +1,60 @@
+package com.dg.core.db.gen.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dg.core.db.gen.entity.GuideEvolveEntity;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface GuideEvolveMapper extends BaseMapper<GuideEvolveEntity>
+{
+
+ /**
+ * 查询记录列表
+ * @return
+ */
+ public List<GuideEvolveEntity> selectConfigList(String guideId);
+
+ /**
+ * 查询记录列表(隐藏工单姓名)
+ * @return
+ */
+ public List<GuideEvolveEntity> selectHideList(String guideId);
+
+ /**
+ * 新增记录
+ * @param entity
+ * @return
+ */
+ public int insertConfig(GuideEvolveEntity entity);
+
+ /**
+ * 更新记录
+ * @param entity
+ * @return
+ */
+ public int updateConfig(GuideEvolveEntity entity);
+
+ /**
+ * 删除记录
+ * @param Id
+ * @return
+ */
+ public int deleteConfigById(String Id);
+
+ /**
+ * 统计数量
+ * @return
+ */
+ public int countNum();
+
+ /**
+ * 更新工单id为空的脏数据
+ * @return
+ */
+ int updateGuid();
+
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderImageMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderImageMapper.java
new file mode 100644
index 0000000..92eed60
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderImageMapper.java
@@ -0,0 +1,16 @@
+package com.dg.core.db.gen.mapper;
+
+import com.dg.core.db.gen.entity.GuideRepairOrderImage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 导办功能图片表 Mapper 接口
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-09-19
+ */
+public interface GuideRepairOrderImageMapper extends BaseMapper<GuideRepairOrderImage> {
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java
new file mode 100644
index 0000000..a5e2982
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java
@@ -0,0 +1,143 @@
+package com.dg.core.db.gen.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.db.gen.entity.AutomessageCommonProblem;
+import com.dg.core.db.gen.entity.CountListNum;
+import com.dg.core.db.gen.entity.GuideRepairOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.data.repository.query.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 导办工单管理 Mapper 接口
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-09-19
+ */
+public interface GuideRepairOrderMapper extends BaseMapper<GuideRepairOrder>
+{
+
+ /**
+ * 获取详情
+ * @param Id
+ * @param orderNum
+ * @return
+ */
+ public GuideRepairOrder selectConfigData(@Param("Id") String Id,
+ @Param("orderNum") String orderNum);
+
+
+ /**
+ * 分配人员
+ * @param order
+ * @return
+ */
+ public int updateConfig(GuideRepairOrder order);
+
+
+ /**
+ * 获取个人中心工单数据
+ * @param submitUserId
+ * @return
+ */
+ List<GuideRepairOrder> selectBySubmitId(String submitUserId);
+
+ /**
+ * 获取工单列表(分页)
+ * @param matterName
+ * @return
+ */
+ List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
+ @Param("matterName") String matterName,
+ @Param("ids") List<String> ids,
+ @Param("status") String status,
+ @Param("guideUserId") String guideUserId,
+ @Param("createTimeStartTime") String createTimeStartTime,
+ @Param("createTimeTimeEndTime") String createTimeTimeEndTime,
+ @Param("classifyId") String classifyId);
+
+
+ /**
+ * 获取工单列表(不分页用于小程序)
+ * @param matterName
+ * @return
+ */
+ List<GuideRepairOrder> selectConfigList(@Param("matterName") String matterName,
+ @Param("ids") List<String> ids,
+ @Param("status") String status,
+ @Param("guideUserId") String guideUserId,
+ @Param("createTimeStartTime") String createTimeStartTime,
+ @Param("createTimeTimeEndTime") String createTimeTimeEndTime,
+ @Param("classifyId") String classifyId
+ );
+
+ /**
+ * 获取工单列表(求和)
+ * @param matterName
+ * @return
+ */
+ int countConfigList(@Param("matterName") String matterName,
+ @Param("ids") List<String> ids,
+ @Param("status") String status,
+ @Param("guideUserId") String guideUserId);
+
+
+ /**
+ * 很具用户id查询是否有对应工单
+ * @return
+ */
+ int countUser(@Param("userId") String userId,@Param("state") String state);
+
+
+ /**
+ * 删除工单
+ * @param Id
+ * @return
+ */
+ int deleteConfigById(String Id);
+
+ /**
+ * 统计工单用 1 今天 2昨天 3本月 4本年度
+ * @return
+ */
+ int countStatisticsNum(@Param("state") String state,
+ @Param("ids") List<String> ids,
+ @Param("time") String time,
+ @Param("isTimeout") String isTimeout,
+ @Param("evaluateState") String evaluateState,
+ @Param("classifyIds") List<String> classifyIds,
+ @Param("serviceState") String serviceState,
+ @Param("guideUserId") String guideUserId);
+
+ /**
+ * 统计工单用
+ * @return
+ */
+ List<CountListNum> countListNum(@Param("state") String state,
+ @Param("ids") List<String> ids,
+ @Param("time") Integer time);
+ /**
+ * 获取超时工单
+ * @return
+ */
+ List<GuideRepairOrder> selectOvertime();
+
+ /**
+ * 更改状态为好评
+ * @return
+ */
+ List<GuideRepairOrder> selectEvaluate();
+
+
+ /**
+ * 获取需要通知的单据
+ * @return
+ */
+ List<GuideRepairOrder> selectNoticeTime(@Param("minute") Integer minute);
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java
new file mode 100644
index 0000000..d8305a5
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java
@@ -0,0 +1,118 @@
+package com.dg.core.db.gen.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dg.core.db.gen.entity.ClassifyAdministration;
+import com.dg.core.db.gen.entity.Guidance;
+import com.dg.core.db.gen.entity.GuidePlate;
+import com.dg.core.db.gen.entity.OrganizationEntity;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface HomeStatisticsMapper extends BaseMapper<GuidePlate>
+{
+ /**
+ * 按办结量排序
+ * @return
+ */
+ List<GuidePlate> guidePlatePeople(List<String> ids);
+
+ /**
+ *按评分排序
+ * @return
+ */
+ List<GuidePlate> score(List<String> ids);
+
+ /**
+ * 按超时
+ * @return
+ */
+ List<GuidePlate> timeout(List<String> ids);
+
+ /**
+ * 按未办结
+ * @param ids
+ * @return
+ */
+ List<GuidePlate> tosettled(List<String> ids);
+
+ /**
+ * 按工单量
+ * @param ids
+ * @return
+ */
+ List<GuidePlate> workunit(List<String> ids);
+
+ /**
+ * 导办人员统计数
+ * @return
+ */
+ Integer staffNum(List<String> ids);
+
+ /**
+ * 办事指南数量统计
+ * @return
+ */
+ Integer countWork(List<String> ids);
+
+ /**
+ * 获取一级部门
+ * @return
+ */
+ List<OrganizationEntity> getDepartment();
+
+ /**
+ * 评分
+ * @return
+ */
+ Integer organizationScore(List<String> ids);
+
+ /**
+ * 办结量
+ * @return
+ */
+ Integer organizationNum(List<String> ids);
+
+ /**
+ * 办事指南根据导办数量排序
+ * @return
+ */
+ List<Guidance> guidanceTransaction(List<String> ids);
+
+ /**
+ * 办事指南根据浏览数量排序
+ * @return
+ */
+ List<Guidance> guidanceBrowse(List<String> ids);
+
+ /**
+ * 获取统计数据 首页用 勿动
+ */
+ int countStatisticsNum(@Param("classifyIds") List<String> classifyIds,
+ @Param("ids") List<String> ids);
+
+
+ /**
+ * 首页统计用
+ * @param parentId
+ * @param classifyGrade
+ * @return
+ */
+ public List<ClassifyAdministration> getClassify(@Param("parentId") String parentId,
+ @Param("classifyGrade") String classifyGrade);
+
+
+ List<String> countId(String district);
+
+
+ int rangeStatistics(List<String> ids);
+
+
+ /**
+ * 首页统计用
+ * @return
+ */
+ String reversionRate(@Param("state") String state,@Param("isTimeout") String isTimeout);
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/HuaChengSysUserMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/HuaChengSysUserMapper.java
new file mode 100644
index 0000000..47e2e34
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/HuaChengSysUserMapper.java
@@ -0,0 +1,24 @@
+package com.dg.core.db.gen.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dg.core.db.gen.entity.HuaChengSysUser;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户信息表 Mapper 接口
+ * </p>
+ *
+ * @author xiang
+ * @since 2022-07-11
+ */
+public interface HuaChengSysUserMapper extends BaseMapper<HuaChengSysUser>
+{
+ public List<HuaChengSysUser> selectConfigList();
+
+ public List<HuaChengSysUser> selectData(@Param("userId") String userId,@Param("account") String account,@Param("phone") String phone);
+
+ public int selectNum();
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/KeywordMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/KeywordMapper.java
new file mode 100644
index 0000000..c08fc20
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/KeywordMapper.java
@@ -0,0 +1,61 @@
+package com.dg.core.db.gen.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.db.gen.entity.KeywordEntity;
+import com.dg.core.db.gen.entity.SysUser;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface KeywordMapper extends BaseMapper<KeywordEntity>
+{
+ /**
+ * 查询关键词列表
+ * @return
+ */
+ public List<KeywordEntity> selectConfigList(IPage<KeywordEntity> page, Integer state);
+
+ /**
+ * 查询详情
+ * @return
+ */
+ public KeywordEntity selectConfigData(@Param("Id") String Id,
+ @Param("name") String name);
+
+
+ /**
+ * 添加关键词
+ * @return
+ */
+ public int insertConfig(KeywordEntity entity);
+
+ /**
+ * 编辑关键词
+ * @return
+ */
+ public int updateConfig(KeywordEntity entity);
+
+ /**
+ * 删除关键词
+ * @param Id
+ * @return
+ */
+ public int deleteConfigById(String Id);
+
+ /**
+ * 统计数量
+ * @param
+ * @return
+ */
+ public int countNum();
+
+ /**
+ * 更具名字查询关键词列表(不分页)
+ * @return
+ */
+ List<KeywordEntity> selectByName(@Param("keyWord") String keyWord);
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/MenuMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/MenuMapper.java
new file mode 100644
index 0000000..7575604
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/MenuMapper.java
@@ -0,0 +1,47 @@
+package com.dg.core.db.gen.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dg.core.db.gen.entity.MenuEntity;
+
+import java.util.List;
+
+public interface MenuMapper extends BaseMapper<MenuEntity>
+{
+
+
+ /**
+ * 获取菜单列表
+ * @return
+ */
+ public List<MenuEntity> selectConfigList();
+
+
+ /**
+ * 添加新菜单
+ * @return
+ */
+ public int insertConfig(MenuEntity entity);
+
+ /**
+ * 更新菜单
+ * @param entity
+ * @return
+ */
+ public int updateConfig(MenuEntity entity);
+
+ /**
+ * 删除菜单
+ * @param Id
+ * @return
+ */
+ public int deleteConfigById(Long Id);
+
+ /**
+ * 统计数量
+ * @return
+ */
+ public int countNum();
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java
new file mode 100644
index 0000000..23fac86
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java
@@ -0,0 +1,71 @@
+package com.dg.core.db.gen.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.db.gen.entity.OrganizationChartEntity;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+
+public interface OrganizationChartMapper extends BaseMapper<OrganizationChartEntity>
+{
+ /**
+ * 查询机构列表
+ */
+ public List<OrganizationChartEntity> selectConfigList(@Param("parentId") String parentId,
+ @Param("grade") String grade,
+ @Param("ids") List<String> ids);
+
+ /**
+ * 新增机构
+ */
+ public int insertConfig(OrganizationChartEntity entity);
+
+ /**
+ * 更新机构
+ */
+ public int updateConfig(OrganizationChartEntity entity);
+
+ /**
+ * 删除机构
+ */
+ public int deleteConfigById(String Id);
+
+ /**
+ * 统计数量
+ */
+ public int countNum();
+
+ /**
+ * 根据关键词查取消组织机构
+ */
+ List<OrganizationChartEntity> selectByKeyWord(String keyWord);
+
+ /**
+ * 根据id查取消组织机构
+ */
+ OrganizationChartEntity selectConfigById(@Param("id") String id);
+
+
+ /**
+ * 查询机构列表(分页)
+ */
+ List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state,
+ @Param("organizationName") String organizationName,@Param("ids") List<String> ids);
+
+
+ /**
+ * 统计数量(部门应用)
+ */
+ int countList(@Param("organizationName") String organizationName,@Param("ids") List<String> ids);
+
+
+ /**
+ * 根据所属地区查找部门
+ */
+ List<OrganizationChartEntity> selectByCode(@Param("id")String id, @Param("areaCode") String areaCode,@Param("grade") Integer grade);
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/ReplyTemplateMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/ReplyTemplateMapper.java
new file mode 100644
index 0000000..0f5af52
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/ReplyTemplateMapper.java
@@ -0,0 +1,60 @@
+package com.dg.core.db.gen.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.db.gen.entity.ReplyTemplateEntity;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface ReplyTemplateMapper extends BaseMapper<ReplyTemplateEntity>
+{
+
+ /**
+ * 获取模板列表
+ * @return
+ */
+ public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, Integer state,
+ @Param("Name") String Name,
+ @Param("ids") List<String> ids,
+ @Param("userId") String userId);
+
+
+ /**
+ * 获取详情
+ * @param Id
+ * @return
+ */
+ public ReplyTemplateEntity selectConfigData(String Id);
+
+ /**
+ * 新增模板
+ * @param entity
+ * @return
+ */
+ public int insertConfig(ReplyTemplateEntity entity);
+
+ /**
+ * 更新模板
+ * @param entity
+ * @return
+ */
+ public int updateConfig(ReplyTemplateEntity entity);
+
+ /**
+ * 删除模板
+ * @param Id
+ * @return
+ */
+ public int deleteConfigById(String Id);
+
+ /**
+ * 获取数量
+ * @return
+ */
+ public int countNum(@Param("Name") String Name,@Param("ids") List<String> ids);
+
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/RoleManagementMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/RoleManagementMapper.java
new file mode 100644
index 0000000..4dc2576
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/RoleManagementMapper.java
@@ -0,0 +1,56 @@
+package com.dg.core.db.gen.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.db.gen.entity.RoleManagementEntity;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+
+public interface RoleManagementMapper extends BaseMapper<RoleManagementEntity>
+{
+
+
+ /**
+ * 查询角色列表
+ * @param page
+ * @param state
+ * @return
+ */
+ public List<RoleManagementEntity> selectConfigList(IPage<RoleManagementEntity> page, Integer state,
+ @Param("name") String name);
+
+ /**
+ * 新增角色
+ * @param entity
+ * @return
+ */
+ public int insertConfig(RoleManagementEntity entity);
+
+ /**
+ * 编辑角色
+ * @param entity
+ * @return
+ */
+ public int updateConfig(RoleManagementEntity entity);
+
+ /**
+ * 删除角色
+ * @param Id
+ * @return
+ */
+ public int deleteConfigById(String Id);
+
+ /**
+ * 统计条数
+ * @return
+ */
+ public int countNum(String name);
+
+
+
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/RoleMenuEntityMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/RoleMenuEntityMapper.java
new file mode 100644
index 0000000..553e231
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/RoleMenuEntityMapper.java
@@ -0,0 +1,41 @@
+package com.dg.core.db.gen.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dg.core.db.gen.entity.RoleMenuEntity;
+
+import java.util.List;
+
+public interface RoleMenuEntityMapper extends BaseMapper<RoleMenuEntity>
+{
+ /**
+ * 根据角色获取菜单id
+ * @param roleId
+ * @return
+ */
+ public List<RoleMenuEntity> selectConfigList(String roleId);
+
+ /**
+ * 新增
+ * @param entity
+ * @return
+ */
+ public int insertConfig(RoleMenuEntity entity);
+
+ /**
+ * 编辑
+ * @param entity
+ * @return
+ */
+ public int updateConfig(RoleMenuEntity entity);
+
+
+ /**
+ * 删除
+ * @param Id
+ * @return
+ */
+ public int deleteConfigById(String Id);
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/SlideshowMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/SlideshowMapper.java
new file mode 100644
index 0000000..5a2a314
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/SlideshowMapper.java
@@ -0,0 +1,16 @@
+package com.dg.core.db.gen.mapper;
+
+import com.dg.core.db.gen.entity.Slideshow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 轮播图 Mapper 接口
+ * </p>
+ *
+ * @author fengjin
+ * @since 2022-09-19
+ */
+public interface SlideshowMapper extends BaseMapper<Slideshow> {
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
new file mode 100644
index 0000000..86042d9
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
@@ -0,0 +1,96 @@
+package com.dg.core.db.gen.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.db.gen.entity.SysUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户信息表 Mapper 接口
+ * </p>
+ *
+ * @author xiang
+ * @since 2022-07-11
+ */
+public interface SysUserMapper extends BaseMapper<SysUser> {
+
+ SysUser getUserById(Long id);
+
+ SysUser getUserByAccount(String account);
+
+ /**
+ * 查询聊天列表
+ *
+ * @return 参数配置信息
+ */
+ public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,
+ @Param("userType") String userType,
+ @Param("userName") String userName,
+ @Param("ids") List<String> ids,
+ @Param("isDivisionHead") String isDivisionHead);
+
+
+
+ SysUser selectData(@Param("userId") String userId,
+ @Param("phonenumber") String phonenumber,
+ @Param("loginName") String loginName);
+
+
+ /**
+ * 新增聊天记录
+ *
+ * @param config 参数配置信息
+ * @return 结果
+ */
+ public int insertConfig(SysUser config);
+
+ /**
+ * 更新聊天记录
+ *
+ * @param config 参数配置信息
+ * @return 结果
+ */
+ public int updateConfig(SysUser config);
+
+ /**
+ * 删除聊天记录
+ *
+ * @param id 聊天记录主键id
+ * @return 结果
+ */
+ public int deleteConfigById(String id);
+
+
+ /**
+ * 获取数据库总条数（批量）
+ *
+ * @return 结果
+ */
+ public int selectNum(@Param("userType") String userType,
+ @Param("userName") String userName,
+ @Param("ids") List<String> ids,
+ @Param("isDivisionHead") String isDivisionHead);
+
+ /**
+ * 根据部门id及分类id获取导办用户
+ *
+ * @return 结果
+ */
+ List<SysUser> selectListByDepartmentId(@Param("list") List<String> list,@Param("classifyIdFront") String classifyIdFront,@Param("classifyIdAfter") String classifyIdAfter);
+
+
+ /**
+ * 查询用户列表（不分页）
+ * @param userType 用户类型
+ * @return 结果
+ */
+ List<SysUser> queryList(@Param("userType") Integer userType,@Param("keyWord") String keyWord);
+
+ /**
+ * 修改group 长度
+ */
+ void setGroup();
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java
new file mode 100644
index 0000000..02a63e6
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java
@@ -0,0 +1,209 @@
+package com.dg.core.db.gen.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.db.gen.entity.TransactionEvent;
+import com.dg.core.db.manual.pojo.Search;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface TransactionEventMapper extends BaseMapper<TransactionEvent>
+{
+
+ /**
+ * 查询导办事务详情
+ * @param Id
+ * @return
+ */
+ public TransactionEvent selectConfigData(String Id);
+
+ /**
+ * 导办事物列表
+ * @param
+ * @return
+ */
+ public List<TransactionEvent> selectConfigList(IPage<TransactionEvent> page, Integer state,
+ @Param("keyword") String keyword,
+ @Param("classifyGrade") String classifyGrade,
+ @Param("ids") List<String> ids);
+
+
+
+
+ /**
+ * 导办事物列表 (部分也)
+ * @param
+ * @return
+ */
+ public List<TransactionEvent> selectConfigList(@Param("keyword") String keyword,
+ @Param("classifyGrade") String classifyGrade,
+ @Param("ids") List<String> ids);
+
+ /**
+ * 新增导办事务
+ * @param entity
+ * @return
+ */
+ public int insertConfig(TransactionEvent entity);
+
+ /**
+ * 修改导办事务
+ * @param entity
+ * @return
+ */
+ public int updateConfig(TransactionEvent entity);
+
+ /**
+ * 删除接口
+ * @param Id
+ * @return
+ */
+ public int deleteConfigById(String Id);
+
+ /**
+ * 统计数量
+ * @param
+ * @return
+ */
+ public int countNum(@Param("keyword") String keyword,
+ @Param("classifyGrade") String classifyGrade,
+ @Param("ids") List<String> ids);
+
+ /**
+ * 导办事务搜索
+ * @param matterName
+ * @return
+ */
+ List<TransactionEvent> queryMatterNameList(IPage<TransactionEvent> page, Integer state, String matterName);
+
+ /**
+ * 导办事务搜索(不带分页)
+ * @param matterName
+ * @return
+ */
+ List<TransactionEvent> queryMatterNameList(@Param("matterName") String matterName,@Param("classifyId") String classifyId);
+
+ /**
+ * 导办事务搜索(不带分页)(关联词)
+ * @param associateNames
+ * @return
+ */
+ List<TransactionEvent> queryAssociateNamesList(@Param("associateNames") String associateNames,@Param("classifyId") String classifyId);
+
+ /**
+ * 导办事务搜索统计数量
+ * @param matterName
+ * @return
+ */
+ int countNumByMatterName(String matterName);
+
+ /**
+ * 根据分类ID事务搜索统计数量
+ * @param classifyId
+ * @return
+ */
+ int countNumByClassifyIdList(@Param("classifyId") String classifyId,@Param("departmentId") Integer departmentId);
+
+ /**
+ * 搜索后更新导办事务
+ * @param matterName
+ * @return
+ */
+ int updateConfigByMatterName(String matterName);
+
+ /**
+ * 根据分离查询导办事务
+ * @param classifyId
+ * @return
+ */
+ List<TransactionEvent> queryByClassifyIdList(@Param("classifyId") String classifyId,@Param("departmentId") Integer departmentId);
+
+
+ /**
+ * 根据分离查询导办事务(分页)
+ * @param classifyId
+ * @return
+ *
+ */
+ List<TransactionEvent> queryByClassifyIdList(IPage<TransactionEvent> page, Integer state,@Param("classifyId") String classifyId,@Param("departmentId") Integer departmentId);
+
+ /**
+ * 查询导办事务求和
+ * @return
+ */
+ TransactionEvent sumTransactionNum();
+
+ /**
+ * 根据关键词导办事务(部门也会统计进去)搜索(分页)
+ * @param keyWord
+ * @return
+ */
+ List<Search> selectSearch(IPage<Search> page, Integer state, String keyWord);
+
+
+ /**
+ * 根据关键词导办事务(部门也会统计进去)搜索(分页)(小程序)
+ * @param keyWord
+ * @return
+ */
+ List<Search> selectSearchList(String keyWord);
+
+ /**
+ * 根据关键词导办事务(部门也会统计进去)搜索(不分页)
+ * @param keyWord
+ * @return
+ */
+ List<Search> selectSearch( String keyWord);
+
+
+ /**
+ * 根据关联词导办事务搜索搜索(分页)
+ * @param keyWord
+ * @return
+ */
+ List<Search> selectSearchAssociate(IPage<Search> page, Integer state, String keyWord);
+
+ /**
+ * 根据关联词导办事务搜索搜索(不分页)
+ * @param keyWord
+ * @return
+ */
+ List<Search> selectSearchAssociate( String keyWord);
+
+ /**
+ * 按ids查找导办事务列表
+ * @param list
+ * @return
+ */
+ List<TransactionEvent> selectListByIds(String[] list);
+
+ /**
+ * 根据分类筛选数据
+ * @param ids
+ * @return
+ */
+ List<TransactionEvent> selectClassifyList(List<String> ids);
+
+ /**
+ * 根据部门判断是否有事项名称重复
+ */
+ String selectDataIfExist(@Param("departmentId") String departmentId,
+ @Param("matterName") String matterName);
+
+ /**
+ * 根据办事分类获取办事指南
+ */
+ List<String> selectclassifyId(String classifyId);
+
+
+ /**
+ * 根据关联词导办事务搜索搜索(不分页)(去重用于小程序)
+ * @param keyWord
+ * @return
+ */
+ List<Search> selectSearchAssociateDistinct( String keyWord);
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/manual/mapper/MUserMapper.java b/flower_city/src/main/java/com/dg/core/db/manual/mapper/MUserMapper.java
new file mode 100644
index 0000000..1739727
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/manual/mapper/MUserMapper.java
@@ -0,0 +1,9 @@
+package com.dg.core.db.manual.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dg.core.db.manual.pojo.MUser;
+import org.springframework.stereotype.Component;
+
+@Component
+public interface MUserMapper extends BaseMapper<MUser> {
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/manual/mapper/util/ConstantPropertiesUtil.java b/flower_city/src/main/java/com/dg/core/db/manual/mapper/util/ConstantPropertiesUtil.java
new file mode 100644
index 0000000..d25edb3
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/manual/mapper/util/ConstantPropertiesUtil.java
@@ -0,0 +1,34 @@
+package com.dg.core.db.manual.mapper.util;
+
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.stereotype.Component;
+import org.springframework.beans.factory.annotation.Value;
+@Component
+public class ConstantPropertiesUtil implements InitializingBean {
+
+ @Value("${wx.open.app_id}")
+ private String appId;
+
+ @Value("${wx.open.app_secret}")
+ private String appSecret;
+
+ @Value("${wx.open.redirect_url}")
+ private String redirectUrl;
+
+ @Value("${yygh.baseUrl}")
+ private String yyghBaseUrl;
+
+ public static String WX_OPEN_APP_ID;
+ public static String WX_OPEN_APP_SECRET;
+ public static String WX_OPEN_REDIRECT_URL;
+
+ public static String YYGH_BASE_URL;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ WX_OPEN_APP_ID = appId;
+ WX_OPEN_APP_SECRET = appSecret;
+ WX_OPEN_REDIRECT_URL = redirectUrl;
+ YYGH_BASE_URL = yyghBaseUrl;
+ }
+}
\ No newline at end of file
diff --git a/flower_city/src/main/java/com/dg/core/db/manual/mapper/util/ExcelHandlerAdapter.java b/flower_city/src/main/java/com/dg/core/db/manual/mapper/util/ExcelHandlerAdapter.java
new file mode 100644
index 0000000..87dffd5
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/manual/mapper/util/ExcelHandlerAdapter.java
@@ -0,0 +1,19 @@
+package com.dg.core.db.manual.mapper.util;
+
+/**
+ * Excel数据格式处理适配器
+ *
+ * @author ruoyi
+ */
+public interface ExcelHandlerAdapter
+{
+ /**
+ * 格式化
+ *
+ * @param value 单元格数据值
+ * @param args excel注解args参数组
+ *
+ * @return 处理后的值
+ */
+ Object format(Object value, String[] args);
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/manual/mapper/util/HttpClientUtils.java b/flower_city/src/main/java/com/dg/core/db/manual/mapper/util/HttpClientUtils.java
new file mode 100644
index 0000000..80af856
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/manual/mapper/util/HttpClientUtils.java
@@ -0,0 +1,294 @@
+package com.dg.core.db.manual.mapper.util;
+
+import io.netty.channel.ConnectTimeoutException;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.Consts;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.conn.ssl.X509HostnameVerifier;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.message.BasicNameValuePair;
+import java.util.Map.Entry;
+import org.apache.http.ssl.SSLContextBuilder;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocket;
+import java.io.IOException;
+import java.net.SocketTimeoutException;
+import java.security.GeneralSecurityException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class HttpClientUtils {
+
+ public static final int connTimeout=10000;
+ public static final int readTimeout=10000;
+ public static final String charset="UTF-8";
+ private static CloseableHttpClient client = null;
+
+ static {
+ PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager();
+ cm.setMaxTotal(128);
+ cm.setDefaultMaxPerRoute(128);
+ client = HttpClients.custom().setConnectionManager(cm).build();
+ }
+
+ public static String postParameters(String url, String parameterStr) throws ConnectTimeoutException, SocketTimeoutException, Exception{
+ return post(url,parameterStr,"application/x-www-form-urlencoded",charset,connTimeout,readTimeout);
+ }
+
+ public static String postParameters(String url, String parameterStr,String charset, Integer connTimeout, Integer readTimeout) throws ConnectTimeoutException, SocketTimeoutException, Exception{
+ return post(url,parameterStr,"application/x-www-form-urlencoded",charset,connTimeout,readTimeout);
+ }
+
+ public static String postParameters(String url, Map<String, String> params) throws ConnectTimeoutException,
+ SocketTimeoutException, Exception {
+ return postForm(url, params, null, connTimeout, readTimeout);
+ }
+
+ public static String postParameters(String url, Map<String, String> params, Integer connTimeout,Integer readTimeout) throws ConnectTimeoutException,
+ SocketTimeoutException, Exception {
+ return postForm(url, params, null, connTimeout, readTimeout);
+ }
+
+ public static String get(String url) throws Exception {
+ return get(url, charset, null, null);
+ }
+
+ public static String get(String url, String charset) throws Exception {
+ return get(url, charset, connTimeout, readTimeout);
+ }
+
+ /**
+ * 发送一个 Post 请求, 使用指定的字符集编码.
+ *
+ * @param url
+ * @param body RequestBody
+ * @param mimeType 例如 application/xml "application/x-www-form-urlencoded" a=1&b=2&c=3
+ * @param charset 编码
+ * @param connTimeout 建立链接超时时间,毫秒.
+ * @param readTimeout 响应超时时间,毫秒.
+ * @return ResponseBody, 使用指定的字符集编码.
+ * @throws ConnectTimeoutException 建立链接超时异常
+ * @throws SocketTimeoutException 响应超时
+ * @throws Exception
+ */
+ public static String post(String url, String body, String mimeType,String charset, Integer connTimeout, Integer readTimeout)
+ throws ConnectTimeoutException, SocketTimeoutException, Exception {
+ CloseableHttpClient client = null;
+ HttpPost post = new HttpPost(url);
+ String result = "";
+ try {
+ if (StringUtils.isNotBlank(body)) {
+ HttpEntity entity = new StringEntity(body, ContentType.create(mimeType, charset));
+ post.setEntity(entity);
+ }
+ // 设置参数
+ RequestConfig.Builder customReqConf = RequestConfig.custom();
+ if (connTimeout != null) {
+ customReqConf.setConnectTimeout(connTimeout);
+ }
+ if (readTimeout != null) {
+ customReqConf.setSocketTimeout(readTimeout);
+ }
+ post.setConfig(customReqConf.build());
+
+ HttpResponse res;
+ if (url.startsWith("https")) {
+ // 执行 Https 请求.
+ client = createSSLInsecureClient();
+ res = client.execute(post);
+ } else {
+ // 执行 Http 请求.
+ client = HttpClientUtils.client;
+ res = client.execute(post);
+ }
+ result = IOUtils.toString(res.getEntity().getContent(), charset);
+ } finally {
+ post.releaseConnection();
+ if (url.startsWith("https") && client != null&& client instanceof CloseableHttpClient) {
+ ((CloseableHttpClient) client).close();
+ }
+ }
+ return result;
+ }
+
+
+ /**
+ * 提交form表单
+ *
+ * @param url
+ * @param params
+ * @param connTimeout
+ * @param readTimeout
+ * @return
+ * @throws ConnectTimeoutException
+ * @throws SocketTimeoutException
+ * @throws Exception
+ */
+ public static String postForm(String url, Map<String, String> params, Map<String, String> headers, Integer connTimeout,Integer readTimeout) throws ConnectTimeoutException,
+ SocketTimeoutException, Exception {
+
+ CloseableHttpClient client = null;
+ HttpPost post = new HttpPost(url);
+ try {
+ if (params != null && !params.isEmpty()) {
+ List<NameValuePair> formParams = new ArrayList<NameValuePair>();
+ Set<Map.Entry<String, String>> entrySet = params.entrySet();
+ for (Entry<String, String> entry : entrySet) {
+ formParams.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
+ }
+ UrlEncodedFormEntity entity = new UrlEncodedFormEntity(formParams, Consts.UTF_8);
+ post.setEntity(entity);
+ }
+
+ if (headers != null && !headers.isEmpty()) {
+ for (Entry<String, String> entry : headers.entrySet()) {
+ post.addHeader(entry.getKey(), entry.getValue());
+ }
+ }
+ // 设置参数
+ RequestConfig.Builder customReqConf = RequestConfig.custom();
+ if (connTimeout != null) {
+ customReqConf.setConnectTimeout(connTimeout);
+ }
+ if (readTimeout != null) {
+ customReqConf.setSocketTimeout(readTimeout);
+ }
+ post.setConfig(customReqConf.build());
+ HttpResponse res = null;
+ if (url.startsWith("https")) {
+ // 执行 Https 请求.
+ client = createSSLInsecureClient();
+ res = client.execute(post);
+ } else {
+ // 执行 Http 请求.
+ client = HttpClientUtils.client;
+ res = client.execute(post);
+ }
+ return IOUtils.toString(res.getEntity().getContent(), "UTF-8");
+ } finally {
+ post.releaseConnection();
+ if (url.startsWith("https") && client != null
+ && client instanceof CloseableHttpClient) {
+ ((CloseableHttpClient) client).close();
+ }
+ }
+ }
+
+ /**
+ * 发送一个 GET 请求
+ */
+ public static String get(String url, String charset, Integer connTimeout,Integer readTimeout)
+ throws ConnectTimeoutException,SocketTimeoutException, Exception {
+
+ CloseableHttpClient client = null;
+ HttpGet get = new HttpGet(url);
+ String result = "";
+ try {
+ // 设置参数
+ RequestConfig.Builder customReqConf = RequestConfig.custom();
+ if (connTimeout != null) {
+ customReqConf.setConnectTimeout(connTimeout);
+ }
+ if (readTimeout != null) {
+ customReqConf.setSocketTimeout(readTimeout);
+ }
+ get.setConfig(customReqConf.build());
+
+ HttpResponse res = null;
+
+ if (url.startsWith("https")) {
+ // 执行 Https 请求.
+ client = createSSLInsecureClient();
+ res = client.execute(get);
+ } else {
+ // 执行 Http 请求.
+ client = HttpClientUtils.client;
+ res = client.execute(get);
+ }
+
+ result = IOUtils.toString(res.getEntity().getContent(), charset);
+ } finally {
+ get.releaseConnection();
+ if (url.startsWith("https") && client != null && client instanceof CloseableHttpClient) {
+ ((CloseableHttpClient) client).close();
+ }
+ }
+ return result;
+ }
+
+ /**
+ * 从 response 里获取 charset
+ */
+ @SuppressWarnings("unused")
+ private static String getCharsetFromResponse(HttpResponse ressponse) {
+ // Content-Type:text/html; charset=GBK
+ if (ressponse.getEntity() != null && ressponse.getEntity().getContentType() != null && ressponse.getEntity().getContentType().getValue() != null) {
+ String contentType = ressponse.getEntity().getContentType().getValue();
+ if (contentType.contains("charset=")) {
+ return contentType.substring(contentType.indexOf("charset=") + 8);
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 创建 SSL连接
+ * @return
+ * @throws GeneralSecurityException
+ */
+ private static CloseableHttpClient createSSLInsecureClient() throws GeneralSecurityException {
+ try {
+ SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() {
+ public boolean isTrusted(X509Certificate[] chain,String authType) throws CertificateException {
+ return true;
+ }
+ }).build();
+
+ SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, new X509HostnameVerifier() {
+
+ @Override
+ public boolean verify(String arg0, SSLSession arg1) {
+ return true;
+ }
+
+ @Override
+ public void verify(String host, SSLSocket ssl)
+ throws IOException {
+ }
+
+ @Override
+ public void verify(String host, X509Certificate cert)
+ throws SSLException {
+ }
+
+ @Override
+ public void verify(String host, String[] cns,
+ String[] subjectAlts) throws SSLException {
+ }
+ });
+ return HttpClients.custom().setSSLSocketFactory(sslsf).build();
+
+ } catch (GeneralSecurityException e) {
+ throw e;
+ }
+ }
+}
\ No newline at end of file
diff --git a/flower_city/src/main/java/com/dg/core/db/manual/mapper/util/MapperGenerator.java b/flower_city/src/main/java/com/dg/core/db/manual/mapper/util/MapperGenerator.java
new file mode 100644
index 0000000..686c5e3
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/manual/mapper/util/MapperGenerator.java
@@ -0,0 +1,52 @@
+package com.dg.core.db.manual.mapper.util;
+
+import com.baomidou.mybatisplus.generator.FastAutoGenerator;
+import com.baomidou.mybatisplus.generator.config.OutputFile;
+import org.springframework.beans.factory.annotation.Value;
+
+import java.io.File;
+import java.util.Collections;
+
+public class MapperGenerator {
+ @Value("spring.datasource.url")
+ String url = "jdbc:mysql://10.8.0.74:3306/huacheng_smart_life?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8";
+ @Value("spring.datasource.username")
+ String username = "root";
+ @Value("spring.datasource.password")
+ String password = "nahanMysqlPwd&&RemoteRemote2019nahan";
+
+ public void gen() {
+ String userdir = System.getProperty("user.dir");//获取当前工作目录
+ String outputDir = userdir + File.separator + "src" + File.separator + "main";
+
+ FastAutoGenerator.create(url, username, password)
+ .globalConfig(builder -> {
+ builder.author("fengjin") // 设置作者
+// .enableSwagger() // 开启 swagger 模式
+ .fileOverride() // 覆盖已生成文件
+ .outputDir(outputDir + File.separator + "java"); // 指定输出目录
+ })
+ .packageConfig(builder -> {
+ builder.parent("com.dg.core.db.gen") // 设置父包名
+// .moduleName("system") // 设置父包模块名
+ .pathInfo(Collections.singletonMap(OutputFile.mapperXml, outputDir +
+ File.separator + "resources" + File.separator + "mapper")); // 设置mapperXml生成路径
+ })
+ .strategyConfig(builder -> {
+// builder.addInclude("");
+ builder.addInclude("automessage_smart_consulting") // 设置需要生成的表名
+ .addTablePrefix("t_", "c_"); // 设置过滤表前缀
+ })
+ .templateConfig(builder -> {
+ builder.controller("");
+ builder.service("");
+ builder.serviceImpl("");
+ })
+ .execute();
+ }
+
+ public static void main(String[] args) {
+ MapperGenerator m = new MapperGenerator();
+ m.gen();
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/manual/mapper/util/PageUtils.java b/flower_city/src/main/java/com/dg/core/db/manual/mapper/util/PageUtils.java
new file mode 100644
index 0000000..587078b
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/manual/mapper/util/PageUtils.java
@@ -0,0 +1,28 @@
+package com.dg.core.db.manual.mapper.util;
+
+
+/**
+ * 分页工具类
+ *
+ * @author ruoyi
+ */
+public class PageUtils {}
+// extends PageHelper
+//{
+// /**
+// * 设置请求分页数据
+// */
+// public static void startPage()
+// {
+// PageDomain pageDomain = TableSupport.buildPageRequest();
+// Integer pageNum = pageDomain.getPageNum();
+// Integer pageSize = pageDomain.getPageSize();
+//
+// if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
+// {
+// String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+// Boolean reasonable = pageDomain.getReasonable();
+// PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(false);
+// }
+// }
+//}
diff --git a/flower_city/src/main/java/com/dg/core/db/manual/pojo/AppletUserCount.java b/flower_city/src/main/java/com/dg/core/db/manual/pojo/AppletUserCount.java
new file mode 100644
index 0000000..602dfb8
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/manual/pojo/AppletUserCount.java
@@ -0,0 +1,22 @@
+package com.dg.core.db.manual.pojo;
+
+import com.dg.core.annotation.Authorization;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel("小程序用户统计结果")
+@Data
+public class AppletUserCount {
+
+ @ApiModelProperty("日期,可以是月也可以是日")
+ private String date;
+
+ @ApiModelProperty("访问量")
+ private Long visits;
+
+ @ApiModelProperty("类型1.累计访问量2.本年访问量 3.本月访问量 4.今日访问量 5.昨日访问量")
+ private Integer type;
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/manual/pojo/LargeScreen.java b/flower_city/src/main/java/com/dg/core/db/manual/pojo/LargeScreen.java
new file mode 100644
index 0000000..5d36a74
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/manual/pojo/LargeScreen.java
@@ -0,0 +1,56 @@
+package com.dg.core.db.manual.pojo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class LargeScreen implements Serializable
+{
+
+
+
+ /**
+ * 微信群数
+ */
+ private int groupNum=0;
+
+ /**
+ * 关键词数
+ */
+ private int wordNum=0;
+
+ /**
+ * 覆盖家庭
+ */
+ private int homeNum=0;
+ /**
+ * 参与人员
+ */
+ private int staffNum=0;
+
+ //敏感词数量
+ private int mNum;
+ //抓取信息
+ private int zNum;
+ //匹配数量
+ private int pNum=0;
+
+
+ /**
+ * 检测信息
+ */
+ private int testingInformation=0;
+
+
+ /**
+ * 热门舆情
+ */
+ private int hotPublicOpinion=0;
+
+ /**
+ * 关注数量
+ */
+ private int attention=0;
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/manual/pojo/MUser.java b/flower_city/src/main/java/com/dg/core/db/manual/pojo/MUser.java
new file mode 100644
index 0000000..06dacbf
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/manual/pojo/MUser.java
@@ -0,0 +1,40 @@
+package com.dg.core.db.manual.pojo;
+
+public class MUser {
+ private Long id;
+ private String name;
+ private Integer age;
+ private String email;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getAge() {
+ return age;
+ }
+
+ public void setAge(Integer age) {
+ this.age = age;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/manual/pojo/MsgLocal.java b/flower_city/src/main/java/com/dg/core/db/manual/pojo/MsgLocal.java
new file mode 100644
index 0000000..7a4c58d
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/manual/pojo/MsgLocal.java
@@ -0,0 +1,32 @@
+package com.dg.core.db.manual.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+public class MsgLocal implements Serializable
+{
+ /**
+ * 主键
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+ private String msgTitle;
+ private String msgContent;
+ private String groups;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime creationTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime sendTime;
+ private Long userId;
+ private String userName;
+ private int msgType;
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/manual/pojo/QueryResults.java b/flower_city/src/main/java/com/dg/core/db/manual/pojo/QueryResults.java
new file mode 100644
index 0000000..a3ec3ab
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/manual/pojo/QueryResults.java
@@ -0,0 +1,42 @@
+package com.dg.core.db.manual.pojo;
+
+import com.dg.core.db.gen.entity.AutomessagePolicyDocuments;
+import com.dg.core.db.gen.entity.KeywordEntity;
+import com.dg.core.db.gen.entity.OrganizationChartEntity;
+import com.dg.core.db.gen.entity.TransactionEvent;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel("自公告门户网搜索结果")
+@Data
+public class QueryResults {
+
+
+ @ApiModelProperty("数量")
+ private long total;
+
+ @ApiModelProperty("办事指南列表或者部门")
+ private List<Search> searchList;
+
+ @ApiModelProperty("推荐办事指南列表")
+ private List<Search> transactionEventList;
+
+ @ApiModelProperty("联想词列表")
+ private List<KeywordEntity> keywordEntityList;
+
+ @ApiModelProperty("关联联想词列表")
+ private List<KeywordEntity> keywordAssociationList;
+
+ @ApiModelProperty("办事部门列表")
+ private List<OrganizationChartEntity> organizationChartEntityList;
+
+ @ApiModelProperty("政策文件列表")
+ private List<AutomessagePolicyDocuments> automessagePolicyDocuments;
+
+ @ApiModelProperty("法律法规列表")
+ private List<AutomessagePolicyDocuments> regulations;
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/manual/pojo/RecommendResult.java b/flower_city/src/main/java/com/dg/core/db/manual/pojo/RecommendResult.java
new file mode 100644
index 0000000..bc254ce
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/manual/pojo/RecommendResult.java
@@ -0,0 +1,31 @@
+package com.dg.core.db.manual.pojo;
+
+import com.dg.core.db.gen.entity.AutomessagePolicyDocuments;
+import com.dg.core.db.gen.entity.KeywordEntity;
+import com.dg.core.db.gen.entity.OrganizationChartEntity;
+import com.dg.core.db.gen.entity.TransactionEvent;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel("自公告门户网智能推荐结果")
+@Data
+public class RecommendResult {
+
+ @ApiModelProperty("办事指南列表")
+ private List<TransactionEvent> transactionEventList;
+
+ @ApiModelProperty("联想词列表")
+ private List<KeywordEntity> keywordEntityList;
+
+ @ApiModelProperty("办事部门列表")
+ private List<OrganizationChartEntity> organizationChartEntityList;
+
+ @ApiModelProperty("政策文件列表")
+ private List<AutomessagePolicyDocuments> automessagePolicyDocuments;
+
+ @ApiModelProperty("法律法规列表")
+ private List<AutomessagePolicyDocuments> regulations;
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/manual/pojo/Search.java b/flower_city/src/main/java/com/dg/core/db/manual/pojo/Search.java
new file mode 100644
index 0000000..b1b01a5
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/manual/pojo/Search.java
@@ -0,0 +1,38 @@
+package com.dg.core.db.manual.pojo;
+
+import com.dg.core.db.gen.entity.TransactionEvent;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel("自公告门户网搜索数据")
+@Data
+public class Search {
+
+ @ApiModelProperty("id")
+ private Integer id;
+
+ @ApiModelProperty("搜索结果标题")
+ private String title;
+
+ @ApiModelProperty("搜索结果内容(部门是简历,指南则是改指南的分级)")
+ private String content;
+
+ @ApiModelProperty("浏览次数")
+ private Integer views;
+
+ @ApiModelProperty("分类id")
+ private Integer classifyId;
+
+ @ApiModelProperty("分类id父id")
+ private Integer parentClassifyId;
+
+ @ApiModelProperty("搜索数据类型1.办事部门2.办事指南 3.推荐办事指南4.分类 5.政策文件 6.法律法规")
+ private Integer type;
+
+ @ApiModelProperty("办事指南")
+ private List<TransactionEvent> transactionEventList;
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/db/manual/pojo/WordUser.java b/flower_city/src/main/java/com/dg/core/db/manual/pojo/WordUser.java
new file mode 100644
index 0000000..d83f9da
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/manual/pojo/WordUser.java
@@ -0,0 +1,27 @@
+package com.dg.core.db.manual.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 群管理
+ * </p>
+ *
+ * @author xiang
+ * @since 2022-07-05
+ */
+@Data
+@TableName("word_user")
+public class WordUser implements Serializable
+{
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ private Long wordId;
+ private Long userId;
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/exception/DemoModeException.java b/flower_city/src/main/java/com/dg/core/exception/DemoModeException.java
new file mode 100644
index 0000000..7dde0e1
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/exception/DemoModeException.java
@@ -0,0 +1,15 @@
+package com.dg.core.exception;
+
+/**
+ * 演示模式异常
+ *
+ * @author ruoyi
+ */
+public class DemoModeException extends RuntimeException
+{
+ private static final long serialVersionUID = 1L;
+
+ public DemoModeException()
+ {
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/exception/GlobalException.java b/flower_city/src/main/java/com/dg/core/exception/GlobalException.java
new file mode 100644
index 0000000..6d525b5
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/exception/GlobalException.java
@@ -0,0 +1,58 @@
+package com.dg.core.exception;
+
+/**
+ * 全局异常
+ *
+ * @author ruoyi
+ */
+public class GlobalException extends RuntimeException
+{
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 错误提示
+ */
+ private String message;
+
+ /**
+ * 错误明细，内部调试错误
+ *
+ * 和 {@link CommonResult#getDetailMessage()} 一致的设计
+ */
+ private String detailMessage;
+
+ /**
+ * 空构造方法，避免反序列化问题
+ */
+ public GlobalException()
+ {
+ }
+
+ public GlobalException(String message)
+ {
+ this.message = message;
+ }
+
+ public String getDetailMessage()
+ {
+ return detailMessage;
+ }
+
+ public GlobalException setDetailMessage(String detailMessage)
+ {
+ this.detailMessage = detailMessage;
+ return this;
+ }
+
+ public String getMessage()
+ {
+ return message;
+ }
+
+ public GlobalException setMessage(String message)
+ {
+ this.message = message;
+ return this;
+ }
+}
\ No newline at end of file
diff --git a/flower_city/src/main/java/com/dg/core/exception/ServiceException.java b/flower_city/src/main/java/com/dg/core/exception/ServiceException.java
new file mode 100644
index 0000000..c017848
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/exception/ServiceException.java
@@ -0,0 +1,73 @@
+package com.dg.core.exception;
+
+/**
+ * 业务异常
+ *
+ * @author ruoyi
+ */
+public final class ServiceException extends RuntimeException
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 错误码
+ */
+ private Integer code;
+
+ /**
+ * 错误提示
+ */
+ private String message;
+
+ /**
+ * 错误明细，内部调试错误
+ *
+ * 和 {@link CommonResult#getDetailMessage()} 一致的设计
+ */
+ private String detailMessage;
+
+ /**
+ * 空构造方法，避免反序列化问题
+ */
+ public ServiceException()
+ {
+ }
+
+ public ServiceException(String message)
+ {
+ this.message = message;
+ }
+
+ public ServiceException(String message, Integer code)
+ {
+ this.message = message;
+ this.code = code;
+ }
+
+ public String getDetailMessage()
+ {
+ return detailMessage;
+ }
+
+ public String getMessage()
+ {
+ return message;
+ }
+
+ public Integer getCode()
+ {
+ return code;
+ }
+
+ public ServiceException setMessage(String message)
+ {
+ this.message = message;
+ return this;
+ }
+
+ public ServiceException setDetailMessage(String detailMessage)
+ {
+ this.detailMessage = detailMessage;
+ return this;
+ }
+}
\ No newline at end of file
diff --git a/flower_city/src/main/java/com/dg/core/exception/UtilException.java b/flower_city/src/main/java/com/dg/core/exception/UtilException.java
new file mode 100644
index 0000000..cac14d8
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/exception/UtilException.java
@@ -0,0 +1,26 @@
+package com.dg.core.exception;
+
+/**
+ * 工具类异常
+ *
+ * @author ruoyi
+ */
+public class UtilException extends RuntimeException
+{
+ private static final long serialVersionUID = 8247610319171014183L;
+
+ public UtilException(Throwable e)
+ {
+ super(e.getMessage(), e);
+ }
+
+ public UtilException(String message)
+ {
+ super(message);
+ }
+
+ public UtilException(String message, Throwable throwable)
+ {
+ super(message, throwable);
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/exception/file/BaseException.java b/flower_city/src/main/java/com/dg/core/exception/file/BaseException.java
new file mode 100644
index 0000000..af21660
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/exception/file/BaseException.java
@@ -0,0 +1,83 @@
+package com.dg.core.exception.file;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 基础异常
+ *
+ * @author
+ */
+public class BaseException extends RuntimeException {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 所属模块
+ */
+ private String module;
+
+ /**
+ * 错误码
+ */
+ private String code;
+
+ /**
+ * 错误码对应的参数
+ */
+ private Object[] args;
+
+ /**
+ * 错误消息
+ */
+ private String defaultMessage;
+
+ public BaseException(String module, String code, Object[] args, String defaultMessage) {
+ this.module = module;
+ this.code = code;
+ this.args = args;
+ this.defaultMessage = defaultMessage;
+ }
+
+ public BaseException(String module, String code, Object[] args) {
+ this(module, code, args, null);
+ }
+
+ public BaseException(String module, String defaultMessage) {
+ this(module, null, null, defaultMessage);
+ }
+
+ public BaseException(String code, Object[] args) {
+ this(null, code, args, null);
+ }
+
+ public BaseException(String defaultMessage) {
+ this(null, null, null, defaultMessage);
+ }
+
+ @Override
+ public String getMessage() {
+ String message = null;
+ if (!StringUtils.isEmpty(code)) {
+ message = MessageUtils.message(code, args);
+ }
+ if (message == null) {
+ message = defaultMessage;
+ }
+ return message;
+ }
+
+ public String getModule() {
+ return module;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public Object[] getArgs() {
+ return args;
+ }
+
+ public String getDefaultMessage() {
+ return defaultMessage;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/exception/file/FileException.java b/flower_city/src/main/java/com/dg/core/exception/file/FileException.java
new file mode 100644
index 0000000..82b7ff8
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/exception/file/FileException.java
@@ -0,0 +1,19 @@
+package com.dg.core.exception.file;
+
+
+
+/**
+ * 文件信息异常类
+ *
+ * @author ruoyi
+ */
+public class FileException extends BaseException
+{
+ private static final long serialVersionUID = 1L;
+
+ public FileException(String code, Object[] args)
+ {
+ super("file", code, args, null);
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/exception/file/FileNameLengthLimitExceededException.java b/flower_city/src/main/java/com/dg/core/exception/file/FileNameLengthLimitExceededException.java
new file mode 100644
index 0000000..8de8a2f
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/exception/file/FileNameLengthLimitExceededException.java
@@ -0,0 +1,16 @@
+package com.dg.core.exception.file;
+
+/**
+ * 文件名称超长限制异常类
+ *
+ * @author ruoyi
+ */
+public class FileNameLengthLimitExceededException extends FileException
+{
+ private static final long serialVersionUID = 1L;
+
+ public FileNameLengthLimitExceededException(int defaultFileNameLength)
+ {
+ super("upload.filename.exceed.length", new Object[] { defaultFileNameLength });
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/exception/file/FileSizeLimitExceededException.java b/flower_city/src/main/java/com/dg/core/exception/file/FileSizeLimitExceededException.java
new file mode 100644
index 0000000..1b536c3
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/exception/file/FileSizeLimitExceededException.java
@@ -0,0 +1,16 @@
+package com.dg.core.exception.file;
+
+/**
+ * 文件名大小限制异常类
+ *
+ * @author ruoyi
+ */
+public class FileSizeLimitExceededException extends FileException
+{
+ private static final long serialVersionUID = 1L;
+
+ public FileSizeLimitExceededException(long defaultMaxSize)
+ {
+ super("upload.exceed.maxSize", new Object[] { defaultMaxSize });
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/exception/file/InvalidExtensionException.java b/flower_city/src/main/java/com/dg/core/exception/file/InvalidExtensionException.java
new file mode 100644
index 0000000..6bd872b
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/exception/file/InvalidExtensionException.java
@@ -0,0 +1,84 @@
+package com.dg.core.exception.file;
+
+
+
+import org.apache.tomcat.util.http.fileupload.FileUploadException;
+
+import java.util.Arrays;
+
+/**
+ * 文件上传 误异常类
+ *
+ * @author ruoyi
+ */
+public class InvalidExtensionException extends FileUploadException
+{
+ private static final long serialVersionUID = 1L;
+
+ private String[] allowedExtension;
+ private String extension;
+ private String filename;
+
+ public InvalidExtensionException(String[] allowedExtension, String extension, String filename)
+ {
+ super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");
+ this.allowedExtension = allowedExtension;
+ this.extension = extension;
+ this.filename = filename;
+ }
+
+ public String[] getAllowedExtension()
+ {
+ return allowedExtension;
+ }
+
+ public String getExtension()
+ {
+ return extension;
+ }
+
+ public String getFilename()
+ {
+ return filename;
+ }
+
+ public static class InvalidImageExtensionException extends InvalidExtensionException
+ {
+ private static final long serialVersionUID = 1L;
+
+ public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename)
+ {
+ super(allowedExtension, extension, filename);
+ }
+ }
+
+ public static class InvalidFlashExtensionException extends InvalidExtensionException
+ {
+ private static final long serialVersionUID = 1L;
+
+ public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename)
+ {
+ super(allowedExtension, extension, filename);
+ }
+ }
+
+ public static class InvalidMediaExtensionException extends InvalidExtensionException
+ {
+ private static final long serialVersionUID = 1L;
+
+ public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename)
+ {
+ super(allowedExtension, extension, filename);
+ }
+ }
+
+ public static class InvalidVideoExtensionException extends InvalidExtensionException
+ {
+ private static final long serialVersionUID = 1L;
+
+ public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename)
+ {
+ super(allowedExtension, extension, filename);
+ }
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/exception/file/MessageUtils.java b/flower_city/src/main/java/com/dg/core/exception/file/MessageUtils.java
new file mode 100644
index 0000000..d3cf7ef
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/exception/file/MessageUtils.java
@@ -0,0 +1,25 @@
+package com.dg.core.exception.file;
+
+import org.springframework.context.MessageSource;
+import org.springframework.context.i18n.LocaleContextHolder;
+
+/**
+ * 获取i18n资源文件
+ *
+ * @author ruoyi
+ */
+public class MessageUtils {
+ /**
+ * 根据消息键和参数 获取消息 委托给spring messageSource
+ *
+ * @param code
+ * 消息键
+ * @param args
+ * 参数
+ * @return 获取国际化翻译值
+ */
+ public static String message(String code, Object... args) {
+ MessageSource messageSource = SpringUtils.getBean(MessageSource.class);
+ return messageSource.getMessage(code, args, LocaleContextHolder.getLocale());
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/exception/file/SpringUtils.java b/flower_city/src/main/java/com/dg/core/exception/file/SpringUtils.java
new file mode 100644
index 0000000..c3f449d
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/exception/file/SpringUtils.java
@@ -0,0 +1,136 @@
+package com.dg.core.exception.file;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.aop.framework.AopContext;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * spring工具类 方便在非spring管理环境中获取bean
+ *
+ * @author huanghongfa
+ */
+@Slf4j
+@Component
+public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware {
+ /** Spring应用上下文环境 */
+ private static ConfigurableListableBeanFactory beanFactory;
+
+ private static ApplicationContext applicationContext;
+
+ /**
+ * 获取对象
+ *
+ * @param name
+ * @return Object 一个以所给名字注册的bean的实例
+ * @throws BeansException
+ *
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> T getBean(String name) throws BeansException {
+ return (T)beanFactory.getBean(name);
+ }
+
+ /**
+ * 获取类型为requiredType的对象
+ *
+ * @param clz
+ * @return
+ * @throws BeansException
+ *
+ */
+ public static <T> T getBean(Class<T> clz) throws BeansException {
+ T result = beanFactory.getBean(clz);
+ return result;
+ }
+
+ /**
+ * 如果BeanFactory包含一个与所给名称匹配的bean定义，则返回true
+ *
+ * @param name
+ * @return boolean
+ */
+ public static boolean containsBean(String name) {
+ return beanFactory.containsBean(name);
+ }
+
+ /**
+ * 判断以给定名字注册的bean定义是一个singleton还是一个prototype。 如果与给定名字相应的bean定义没有被找到，将会抛出一个异常（NoSuchBeanDefinitionException）
+ *
+ * @param name
+ * @return boolean
+ * @throws NoSuchBeanDefinitionException
+ *
+ */
+ public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
+ return beanFactory.isSingleton(name);
+ }
+
+ /**
+ * @param name
+ * @return Class 注册对象的类型
+ * @throws NoSuchBeanDefinitionException
+ *
+ */
+ public static Class<?> getType(String name) throws NoSuchBeanDefinitionException {
+ return beanFactory.getType(name);
+ }
+
+ /**
+ * 如果给定的bean名字在bean定义中有别名，则返回这些别名
+ *
+ * @param name
+ * @return
+ * @throws NoSuchBeanDefinitionException
+ *
+ */
+ public static String[] getAliases(String name) throws NoSuchBeanDefinitionException {
+ return beanFactory.getAliases(name);
+ }
+
+ /**
+ * 获取aop代理对象
+ *
+ * @param invoker
+ * @return
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> T getAopProxy(T invoker) {
+ return (T)AopContext.currentProxy();
+ }
+
+ /**
+ * 获取当前的环境配置，无配置返回null
+ *
+ * @return 当前的环境配置
+ */
+ public static String[] getActiveProfiles() {
+ return applicationContext.getEnvironment().getActiveProfiles();
+ }
+
+ /**
+ * 获取当前的环境配置，当有多个环境配置时，只获取第一个
+ *
+ * @return 当前的环境配置
+ */
+ public static String getActiveProfile() {
+ final String[] activeProfiles = getActiveProfiles();
+ return !ObjectUtils.isEmpty(activeProfiles) ? activeProfiles[0] : null;
+ }
+
+ @Override
+ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
+ SpringUtils.beanFactory = beanFactory;
+ }
+
+ @Override
+ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+ SpringUtils.applicationContext = applicationContext;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/file/FileTypeUploadUtils.java b/flower_city/src/main/java/com/dg/core/file/FileTypeUploadUtils.java
new file mode 100644
index 0000000..0cfbbb5
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/file/FileTypeUploadUtils.java
@@ -0,0 +1,94 @@
+package com.dg.core.file;
+
+import com.dg.core.exception.file.FileSizeLimitExceededException;
+import com.dg.core.exception.file.InvalidExtensionException;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Objects;
+
+/**
+ * 文件上传工具类
+ *
+ * @author
+ */
+public class FileTypeUploadUtils {
+ /**
+ * 默认大小 50M
+ */
+ public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+
+ /**
+ * 默认的文件名最大长度 100
+ */
+ public static final int DEFAULT_FILE_NAME_LENGTH = 100;
+
+
+ /**
+ * 文件大小校验
+ *
+ * @param file 上传的文件
+ * @return
+ * @throws FileSizeLimitExceededException 如果超出最大大小
+ * @throws InvalidExtensionException
+ */
+ public static final void assertAllowed(MultipartFile file, String[] allowedExtension)
+ throws FileSizeLimitExceededException, InvalidExtensionException {
+ long size = file.getSize();
+ if (size > DEFAULT_MAX_SIZE) {
+ throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
+ }
+
+ String fileName = file.getOriginalFilename();
+ String extension = getExtension(file);
+ if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension)) {
+ if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION) {
+ throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension,
+ fileName);
+ } else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION) {
+ throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension,
+ fileName);
+ } else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION) {
+ throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension,
+ fileName);
+ } else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION) {
+ throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension,
+ fileName);
+ } else {
+ throw new InvalidExtensionException(allowedExtension, extension, fileName);
+ }
+ }
+
+ }
+
+ /**
+ * 判断MIME类型是否是允许的MIME类型
+ *
+ * @param extension
+ * @param allowedExtension
+ * @return
+ */
+ public static final boolean isAllowedExtension(String extension, String[] allowedExtension) {
+ for (String str : allowedExtension) {
+ if (str.equalsIgnoreCase(extension)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 获取文件名的后缀
+ *
+ * @param file 表单文件
+ * @return 后缀名
+ */
+ public static final String getExtension(MultipartFile file) {
+ String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+ if (StringUtils.isEmpty(extension)) {
+ extension = MimeTypeUtils.getExtension(Objects.requireNonNull(file.getContentType()));
+ }
+ return extension;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/file/FtpConstants.java b/flower_city/src/main/java/com/dg/core/file/FtpConstants.java
new file mode 100644
index 0000000..ef763ae
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/file/FtpConstants.java
@@ -0,0 +1,38 @@
+package com.dg.core.file;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: ftp
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-30 13:39
+ **/
+public class FtpConstants {
+ /**
+ * ftp站点
+ */
+ public static final String FTPHOST = "47.104.148.185";
+ /**
+ * 端口号
+ */
+ public static final Integer FTPPORT = 22;
+ /**
+ * ftp访问用户名
+ */
+ public static final String FTPUSERNAME = "root";
+ /**
+ * ftp访问密码
+ */
+ public static final String FTPPASSWORD = "evanN7F2K5M6";
+ /**
+ * excel模板
+ */
+ public static final String FTPFILEPATH_MUBAN = "/mnt/data/ftp/muban/";
+ /**
+ * 党员保存
+ */
+ public static final String FTPFILEPATH_IDCARD = "/mnt/data/ftp/idcard/";
+ /**
+ * http访问路径
+ */
+ public static final String HTTP_URL = "http://image.panzhihua.nhys.cdnhxx.com/";
+}
diff --git a/flower_city/src/main/java/com/dg/core/file/MimeTypeUtils.java b/flower_city/src/main/java/com/dg/core/file/MimeTypeUtils.java
new file mode 100644
index 0000000..c0145e7
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/file/MimeTypeUtils.java
@@ -0,0 +1,59 @@
+package com.dg.core.file;
+
+/**
+ * 媒体类型工具类
+ *
+ * @author
+ */
+public class MimeTypeUtils
+{
+ public static final String IMAGE_PNG = "image/png";
+
+ public static final String IMAGE_JPG = "image/jpg";
+
+ public static final String IMAGE_JPEG = "image/jpeg";
+
+ public static final String IMAGE_BMP = "image/bmp";
+
+ public static final String IMAGE_GIF = "image/gif";
+
+ public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" };
+
+ public static final String[] FLASH_EXTENSION = { "swf", "flv" };
+
+ public static final String[] MEDIA_EXTENSION = { "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg",
+ "asf", "rm", "rmvb" };
+
+ public static final String[] VIDEO_EXTENSION = { "mp4", "avi", "rmvb" };
+
+ public static final String[] DEFAULT_ALLOWED_EXTENSION = {
+ // 图片
+ "bmp", "gif", "jpg", "jpeg", "png",
+ // word excel powerpoint
+ "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
+ // 压缩文件
+ "rar", "zip", "gz", "bz2",
+ // 视频格式
+ "mp4", "avi", "rmvb",
+ // pdf
+ "pdf" };
+
+ public static String getExtension(String prefix)
+ {
+ switch (prefix)
+ {
+ case IMAGE_PNG:
+ return "png";
+ case IMAGE_JPG:
+ return "jpg";
+ case IMAGE_JPEG:
+ return "jpeg";
+ case IMAGE_BMP:
+ return "bmp";
+ case IMAGE_GIF:
+ return "gif";
+ default:
+ return "";
+ }
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/file/SFTPUtil.java b/flower_city/src/main/java/com/dg/core/file/SFTPUtil.java
new file mode 100644
index 0000000..b01e9d2
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/file/SFTPUtil.java
@@ -0,0 +1,374 @@
+package com.dg.core.file;
+
+import com.jcraft.jsch.*;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.util.Properties;
+import java.util.Vector;
+
+/**
+ * @version 1.0.0
+ * @ClassName: SFTPUtil
+ * @Description: sftp连接工具类
+ */
+public class SFTPUtil {
+ private transient Logger log = LoggerFactory.getLogger(this.getClass());
+
+ private ChannelSftp sftp;
+
+ private Session session;
+
+ // FTP 登录用户名
+ private String userName;
+ // FTP 登录密码
+ private String password;
+ // FTP 服务器地址IP地址
+ private String host;
+ // FTP 端口
+ private int port;
+
+ /**
+ * 构造基于密码认证的sftp对象
+ *
+ * @param userName
+ * @param password
+ * @param host
+ * @param port
+ */
+ public SFTPUtil(String userName, String password, String host, int port) {
+ this.userName = userName;
+ this.password = password;
+ this.host = host;
+ this.port = port;
+ }
+
+ public SFTPUtil() {
+ this.userName = FtpConstants.FTPUSERNAME;
+ this.password = FtpConstants.FTPPASSWORD;
+ this.host = FtpConstants.FTPHOST;
+ this.port = FtpConstants.FTPPORT;
+ }
+
+ public static void main(String[] args) throws SftpException, IOException {
+ SFTPUtil sftp = new SFTPUtil("root", "evanN7F2K5M6", "47.104.148.185", 22);
+ sftp.login();
+ File file = new File("F:\\settings.xml");
+ InputStream is = new FileInputStream(file);
+ // 多级目录创建并上传
+ sftp.uploadMore("/mnt/data/ftp/ss", "settings.xml", is);
+ sftp.logout();
+ }
+
+ /**
+ * 连接sftp服务器
+ *
+ * @throws Exception
+ */
+ public void login() {
+ try {
+ JSch jsch = new JSch();
+ log.info("sftp connect by host:{} username:{}", host, userName);
+
+ session = jsch.getSession(userName, host, port);
+ log.info("Session is build");
+ if (password != null) {
+ session.setPassword(password);
+ }
+ Properties config = new Properties();
+ config.put("StrictHostKeyChecking", "no");
+
+ session.setConfig(config);
+ session.connect();
+ log.info("Session is connected");
+
+ Channel channel = session.openChannel("sftp");
+ channel.connect();
+ log.info("channel is connected");
+
+ sftp = (ChannelSftp)channel;
+ log.info(String.format("sftp server host:[%s] port:[%s] is connect successfull", host, port));
+ } catch (JSchException e) {
+ log.error("Cannot connect to specified sftp server : {}:{} \n Exception message is: {}", host, port,
+ e.getMessage());
+ }
+ }
+
+ /**
+ * 关闭连接 server
+ */
+ public void logout() {
+ if (sftp != null) {
+ if (sftp.isConnected()) {
+ sftp.disconnect();
+ log.info("sftp is closed already");
+ }
+ }
+ if (session != null) {
+ if (session.isConnected()) {
+ session.disconnect();
+ log.info("sshSession is closed already");
+ }
+ }
+ }
+
+ /**
+ * 递归根据路径创建文件夹
+ *
+ * @param dirs
+ * 根据 / 分隔后的数组文件夹名称
+ * @param tempPath
+ * 拼接路径
+ * @param length
+ * 文件夹的格式
+ * @param index
+ * 数组下标
+ * @return
+ */
+ public void mkdirDir(String[] dirs, String tempPath, int length, int index) {
+ // 以"/a/b/c/d"为例按"/"分隔后,第0位是"";顾下标从1开始
+ index++;
+ if (index < length) {
+ // 目录不存在，则创建文件夹
+ tempPath += "/" + dirs[index];
+ }
+ try {
+ log.info("检测目录[" + tempPath + "]");
+ sftp.cd(tempPath);
+ if (index < length) {
+ mkdirDir(dirs, tempPath, length, index);
+ }
+ } catch (SftpException ex) {
+ log.warn("创建目录[" + tempPath + "]");
+ try {
+ sftp.mkdir(tempPath);
+ sftp.cd(tempPath);
+ } catch (SftpException e) {
+ e.printStackTrace();
+ log.error("创建目录[" + tempPath + "]失败,异常信息[" + e.getMessage() + "]");
+
+ }
+ log.info("进入目录[" + tempPath + "]");
+ mkdirDir(dirs, tempPath, length, index);
+ }
+ }
+
+ /**
+ * 将输入流的数据上传到sftp作为文件（多层目录）
+ *
+ * @param directory
+ * 上传到该目录(多层目录)
+ * @param sftpFileName
+ * sftp端文件名
+ * @param input
+ * 输入流
+ * @throws SftpException
+ * @throws Exception
+ */
+ public void uploadMore(String directory, String sftpFileName, InputStream input) throws SftpException {
+ try {
+ sftp.cd(directory);
+ } catch (SftpException e) {
+ // 目录不存在，则创建文件夹
+ String[] dirs = directory.split("/");
+ String tempPath = "";
+ int index = 0;
+ mkdirDir(dirs, tempPath, dirs.length, index);
+ }
+ sftp.put(input, sftpFileName);// 上传文件
+ }
+
+ /**
+ * 将输入流的数据上传到sftp作为文件
+ *
+ * @param directory
+ * 上传到该目录(单层目录)
+ * @param sftpFileName
+ * sftp端文件名
+ * @param input
+ * 输入流
+ * @throws SftpException
+ * @throws Exception
+ */
+ public void upload(String directory, String sftpFileName, InputStream input) throws SftpException {
+ try {
+ sftp.cd(directory);
+ } catch (SftpException e) {
+ log.warn("directory is not exist");
+ sftp.mkdir(directory);
+ sftp.cd(directory);
+ }
+ sftp.put(input, sftpFileName);
+ log.info("file:{} is upload successful", sftpFileName);
+ }
+
+ /**
+ * 上传单个文件
+ *
+ * @param directory
+ * 上传到sftp目录
+ * @param uploadFile
+ * 要上传的文件,包括路径
+ * @throws FileNotFoundException
+ * @throws SftpException
+ * @throws Exception
+ */
+ public void upload(String directory, String uploadFile) throws FileNotFoundException, SftpException {
+ File file = new File(uploadFile);
+ upload(directory, file.getName(), new FileInputStream(file));
+ }
+
+ /**
+ * 将byte[]上传到sftp，作为文件。注意:从String生成byte[]是，要指定字符集。
+ *
+ * @param directory
+ * 上传到sftp目录
+ * @param sftpFileName
+ * 文件在sftp端的命名
+ * @param byteArr
+ * 要上传的字节数组
+ * @throws SftpException
+ * @throws Exception
+ */
+ public void upload(String directory, String sftpFileName, byte[] byteArr) throws SftpException {
+ upload(directory, sftpFileName, new ByteArrayInputStream(byteArr));
+ }
+
+ /**
+ * 将字符串按照指定的字符编码上传到sftp
+ *
+ * @param directory
+ * 上传到sftp目录
+ * @param sftpFileName
+ * 文件在sftp端的命名
+ * @param dataStr
+ * 待上传的数据
+ * @param charsetName
+ * sftp上的文件，按该字符编码保存
+ * @throws UnsupportedEncodingException
+ * @throws SftpException
+ * @throws Exception
+ */
+ public void upload(String directory, String sftpFileName, String dataStr, String charsetName)
+ throws UnsupportedEncodingException, SftpException {
+ upload(directory, sftpFileName, new ByteArrayInputStream(dataStr.getBytes(charsetName)));
+ }
+
+ /**
+ * 下载文件
+ *
+ * @param directory
+ * 下载目录
+ * @param downloadFile
+ * 下载的文件
+ * @param saveFile
+ * 存在本地的路径
+ * @throws SftpException
+ * @throws FileNotFoundException
+ * @throws Exception
+ */
+ public void download(String directory, String downloadFile, String saveFile)
+ throws SftpException, FileNotFoundException {
+ if (directory != null && !"".equals(directory)) {
+ sftp.cd(directory);
+ }
+ File file = new File(saveFile);
+ sftp.get(downloadFile, new FileOutputStream(file));
+ log.info("file:{} is download successful", downloadFile);
+ }
+
+ /**
+ * 下载文件
+ *
+ * @param directory
+ * 下载目录
+ * @param downloadFile
+ * 下载的文件名
+ * @return 字节数组
+ * @throws SftpException
+ * @throws IOException
+ * @throws Exception
+ */
+ public byte[] download(String directory, String downloadFile) throws SftpException, IOException {
+ if (directory != null && !"".equals(directory)) {
+ sftp.cd(directory);
+ }
+ InputStream is = sftp.get(downloadFile);
+ byte[] fileData = IOUtils.toByteArray(is);
+ log.info("file:{} is download successful", downloadFile);
+ return fileData;
+ }
+
+ /**
+ * 下载文件
+ *
+ * @param directory
+ * 下载目录
+ * @param downloadFile
+ * 下载的文件名
+ * @return 字节数组
+ * @throws SftpException
+ * @throws IOException
+ * @throws Exception
+ */
+ public InputStream downloadInputStream(String directory, String downloadFile) throws SftpException, IOException {
+ if (directory != null && !"".equals(directory)) {
+ sftp.cd(directory);
+ }
+ InputStream is = sftp.get(downloadFile);
+ // byte[] fileData = IOUtils.toByteArray(is);
+ // log.info("file:{} is download successful", downloadFile);
+ return is;
+ }
+
+ /**
+ * 删除文件
+ *
+ * @param directory
+ * 要删除文件所在目录
+ * @param deleteFile
+ * 要删除的文件
+ * @throws SftpException
+ * @throws Exception
+ */
+ public void delete(String directory, String deleteFile) throws SftpException {
+ sftp.cd(directory);
+ sftp.rm(deleteFile);
+ }
+
+ /**
+ * 列出目录下的文件
+ *
+ * @param directory
+ * 要列出的目录
+ * @return
+ * @throws SftpException
+ */
+ public Vector<?> listFiles(String directory) throws SftpException {
+ return sftp.ls(directory);
+ }
+
+ /**
+ * 判断文件或者目录是否存在
+ *
+ * @param path
+ * 目录或者文件的路径
+ * @return 存在结果
+ */
+ public boolean isExistDir(String path) {
+ boolean isExist = false;
+ try {
+ SftpATTRS sftpATTRS = sftp.lstat(path);
+ isExist = true;
+ return sftpATTRS.isDir();
+ } catch (Exception e) {
+ if (e.getMessage().toLowerCase().equals("no such file")) {
+ isExist = false;
+ }
+ }
+ return isExist;
+
+ }
+}
\ No newline at end of file
diff --git a/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java b/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
new file mode 100644
index 0000000..70888b1
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
@@ -0,0 +1,143 @@
+package com.dg.core.interceptor;
+
+import com.dg.core.Constant;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.db.gen.entity.HuaChengSysUser;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.manager.TokenManager;
+import com.dg.core.service.IHuaChengSysUserService;
+import com.dg.core.service.ISysUserRecordService;
+import org.apache.catalina.connector.ResponseFacade;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 自定义拦截器，判断此次请求是否有权限
+ */
+/**
+ * 自定义拦截器，判断此次请求是否有权限
+ */
+@Component
+public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
+ @Autowired
+ private TokenManager manager;
+
+ @Autowired
+ com.dg.core.service.ISysUserService IUserService;
+
+ /**
+ * 花城e+用户接口
+ */
+ @Autowired
+ IHuaChengSysUserService iHuaChengSysUserService;
+
+ @Autowired
+ private ISysUserRecordService iSysUserRecordService;
+
+ @Override
+ public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+ //如果不是映射到方法直接通过
+ if (!(handler instanceof HandlerMethod)) {
+ return true;
+ }
+
+ HandlerMethod handlerMethod = (HandlerMethod) handler;
+ Method method = handlerMethod.getMethod();
+ Object bean = handlerMethod.getBean();
+
+ //从header中得到token
+ String token = request.getHeader(Constant.AUTHORIZATION);
+ //花城token
+ String HCtoken = request.getHeader(Constant.HCAUTHORIZATION);
+
+ if(StringUtils.isEmpty(token))
+ {
+ if (manager.checkHCToken(HCtoken)) {
+ //如果token验证成功，权限检查通过，将token对应的用户id存在request中，便于之后注入
+ request.setAttribute(Constant.CURRENT_USER_ID, manager.getHCUserId(HCtoken));
+ System.out.println("花城用户id："+manager.getHCUserId(HCtoken));
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData(manager.getHCUserId(HCtoken)+"","","");
+ HuaChengSysUser huaChengSysUser=null;
+
+ if(list!=null || list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
+ if(huaChengSysUser!=null && !StringUtils.isEmpty(huaChengSysUser.getUserId()) )
+ {
+ SysUser sysUser = IUserService.selectData(null,huaChengSysUser.getPhone(),null);
+ if(sysUser==null)
+ {
+ //本地没有此用户 新用户
+ SysUser newSysUser=new SysUser();
+ //默认 1系统后台用户
+ newSysUser.setUserType("4");
+ newSysUser.setRoleIds("4");
+ newSysUser.setIsDivisionHead("2");
+ newSysUser.setPhonenumber(huaChengSysUser.getPhone());
+ newSysUser.setUserId(huaChengSysUser.getUserId());
+ newSysUser.setUserName(huaChengSysUser.getNickName());
+ newSysUser.setSex(huaChengSysUser.getSex());
+ newSysUser.setAvatar(huaChengSysUser.getImageUrl());
+ newSysUser.setCreateTime(LocalDateTime.now());
+ newSysUser.setUpdateTime(LocalDateTime.now());
+ newSysUser.setOpenid(huaChengSysUser.getOpenid());
+ IUserService.insertConfig(newSysUser);
+ }
+ else
+ {
+ if(StringUtils.isEmpty(sysUser.getOpenid()))
+ {
+ sysUser.setOpenid(huaChengSysUser.getOpenid());
+ IUserService.updateConfig(sysUser);
+ }
+ }
+ //新增浏览记录
+ iSysUserRecordService.add(sysUser);
+ //删除因为token问题产出的重复脏数据
+ iSysUserRecordService.deleteDistinct();
+ }
+
+ return true;
+ }
+
+ }
+ else
+ {
+ if (manager.checkToken(token)) {
+ //如果token验证成功，权限检查通过，将token对应的用户id存在request中，便于之后注入
+ request.setAttribute(Constant.CURRENT_USER_ID, manager.getUserId(token));
+// SysUser ss = IUserService.selectData(manager.getUserId(token)+"");
+ return true;
+ }
+ }
+
+// if(!StringUtils.isEmpty(token))
+// {
+ //如果验证token失败，并且方法或类注明了Authorization，返回401错误
+ if (method.getAnnotation(Authorization.class) != null ||
+ bean.getClass().getAnnotation(Authorization.class) != null)
+ {
+ String reponse = "{\"result\": 449, \"message\": \"Overdue token\"}";
+ response.setStatus(200);
+ response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
+ ResponseFacade facade = (ResponseFacade) response;
+ facade.setContentLength(reponse.getBytes(StandardCharsets.UTF_8).length);
+ facade.getWriter().write(reponse);
+ return false;
+ }
+// }
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/flower_city/src/main/java/com/dg/core/manager/JWTTokenUtil.java b/flower_city/src/main/java/com/dg/core/manager/JWTTokenUtil.java
new file mode 100644
index 0000000..835fcf0
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/manager/JWTTokenUtil.java
@@ -0,0 +1,170 @@
+package com.dg.core.manager;
+
+import com.dg.core.db.gen.entity.HuaChengSysUser;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import org.springframework.stereotype.Component;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * token验证处理
+ *
+ * @author ruoyi
+ */
+@Component
+public class JWTTokenUtil implements Serializable {
+ /**
+ * 从数据声明生成令牌
+ *
+ * @param claims
+ * 数据声明
+ * @return 令牌
+ */
+ private static String generateToken(Map<String, Object> claims) {
+ Date expirationDate = new Date(System.currentTimeMillis() + TokenConstant.EXPIRETIME_LONG * 60 * 1000 * 72);
+ return Jwts.builder().setClaims(claims).setExpiration(expirationDate)
+ .signWith(SignatureAlgorithm.HS512, TokenConstant.SECRET).compact();
+ }
+
+ /**
+ * 生成刷新token
+ *
+ * @param claims
+ * tokenbody
+ * @return refreshtoken
+ */
+ private static String generateTokenRefreshToken(Map<String, Object> claims) {
+ Date expirationDate = new Date(System.currentTimeMillis() + TokenConstant.EXPIRETIME_REFRESH * 60 * 60 * 1000);
+ return Jwts.builder().setClaims(claims).setExpiration(expirationDate)
+ .signWith(SignatureAlgorithm.HS512, TokenConstant.SECRET).compact();
+ }
+
+ /**
+ * 从令牌中获取数据声明
+ *
+ * @param token
+ * 令牌
+ * @return 数据声明
+ */
+ public static Claims getClaimsFromToken(String token) {
+ Claims claims;
+ try {
+ claims = Jwts.parser().setSigningKey(TokenConstant.SECRET).parseClaimsJws(token).getBody();
+ } catch (Exception e) {
+ claims = null;
+ }
+ return claims;
+ }
+
+ /**
+ * 生成令牌
+ *
+ * @param loginUserInfoVO
+ * 用户
+ * @return 令牌
+ */
+ public static String generateToken(HuaChengSysUser loginUserInfoVO) {
+ Map<String, Object> claims = new HashMap<>(2);
+ claims.put("sub", loginUserInfoVO.getUserId());
+ claims.put("created", new Date());
+ claims.put("type", loginUserInfoVO.getType());
+ return generateToken(claims);
+ }
+
+ /**
+ * 从令牌中获取用户名
+ *
+ * @param token
+ * 令牌
+ * @return 用户名
+ */
+ public static String getUsernameFromToken(String token) {
+ String username;
+ try {
+ Claims claims = getClaimsFromToken(token);
+ username = claims.getSubject();
+ } catch (Exception e) {
+ username = null;
+ }
+ return username;
+ }
+
+ /**
+ * 判断令牌是否过期
+ *
+ * @param token
+ * 令牌
+ * @return 是否过期
+ */
+ public static Boolean isTokenExpired(String token) {
+ try {
+ Claims claims = getClaimsFromToken(token);
+ Date expiration = claims.getExpiration();
+ return expiration.before(new Date());
+ } catch (Exception e) {
+ return true;
+ }
+ }
+
+ /**
+ * 刷新令牌
+ *
+ * @param token
+ * 原令牌
+ * @return 新令牌
+ */
+ public static String refreshToken(String token) {
+ String refreshedToken;
+ try {
+ Claims claims = getClaimsFromToken(token);
+ claims.put("created", new Date());
+ refreshedToken = generateToken(claims);
+ } catch (Exception e) {
+ refreshedToken = null;
+ }
+ return refreshedToken;
+ }
+
+ /**
+ * 验证令牌
+ *
+ * @param token
+ * 令牌
+ * @param loginUserInfoVO
+ * 用户
+ * @return 是否有效
+ */
+ public static Boolean validateToken(String token, HuaChengSysUser loginUserInfoVO) {
+ String username = getUsernameFromToken(token);
+ return (username.equals(loginUserInfoVO.getUserId()) && !isTokenExpired(token));
+ }
+
+ public static void main(String[] args) {
+ Claims claims = JWTTokenUtil.getClaimsFromToken(
+ "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOjIsInR5cGUiOjEsImV4cCI6MTYwNjM1NzkzOSwiY3JlYXRlZCI6MTYwNjM1NjEzOTEzN30.zIj31TLHk4B9F45OszrJWfOlhZL5CWviP2RgsFP6LZuci6MlPn0iVbekioP01DRsu59mWd5FMyhd9WLvMtfxMg");
+ Boolean tokenExpired = JWTTokenUtil.isTokenExpired(
+ "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOjIsInR5cGUiOjEsImV4cCI6MTYwNjM2MDQzNSwiY3JlYXRlZCI6MTYwNjM1ODYzNTI3MX0.7R3SG6hu-sr_KiPpgepubl_1FdaooCNJ0URHWv6Jynr7m8JIar2kUAnhHfWOfHrNILQb5Q-nqxceXdavcuVOXg");
+ System.out.println(claims);
+ }
+
+ /**
+ * 生成刷新token
+ *
+ * @param loginUserInfoVO
+ * 登录用户基本信息
+ * @return refreshtoken
+ */
+ public static String generateRefeshToken(HuaChengSysUser loginUserInfoVO) {
+ Map<String, Object> claims = new HashMap<>(2);
+ claims.put("sub", loginUserInfoVO.getUserId());
+ claims.put("created", new Date());
+ claims.put("type", loginUserInfoVO.getType());
+ return generateTokenRefreshToken(claims);
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/manager/RedisTokenManager.java b/flower_city/src/main/java/com/dg/core/manager/RedisTokenManager.java
new file mode 100644
index 0000000..e5e39ef
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/manager/RedisTokenManager.java
@@ -0,0 +1,123 @@
+package com.dg.core.manager;
+
+import com.dg.core.Constant;
+import io.jsonwebtoken.Claims;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.script.DigestUtils;
+import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 通过Redis存储和验证token的实现类
+ */
+@Component
+public class RedisTokenManager implements TokenManager
+{
+ private RedisTemplate<String, String> redis;
+
+ @Qualifier("redisTemplate")
+ @Autowired
+ public void setRedis(RedisTemplate redis) {
+ this.redis = redis;
+ //泛型设置成Long后必须更改对应的序列化方案
+ redis.setKeySerializer(new JdkSerializationRedisSerializer());
+ }
+
+ @Override
+ public String createToken(String userId, String userRole) {
+ //使用uuid作为源token
+ String uuid = UUID.randomUUID().toString().replace("-", "");
+ String token = DigestUtils.sha1DigestAsHex(uuid + userId + "e23ktjsdf") + "-" + userRole;
+ //存储到redis并设置过期时间
+ redis.boundValueOps(token).set(String.valueOf(userId), Constant.TOKEN_EXPIRES_HOUR, TimeUnit.HOURS);
+ redis.boundValueOps(String.valueOf(userId)).set(token, Constant.TOKEN_EXPIRES_HOUR, TimeUnit.HOURS);
+ return token;
+ }
+
+ public boolean checkToken(String token) {
+ if (StringUtils.isEmpty(token)) {
+ return false;
+ }
+ String userId = redis.boundValueOps(token).get();
+ if (userId == null) {
+ return false;
+ }
+ //如果验证成功，说明此用户进行了一次有效操作，延长token的过期时间
+ redis.boundValueOps(token).expire(Constant.TOKEN_EXPIRES_HOUR, TimeUnit.HOURS);
+ return true;
+ }
+
+
+ /**
+ * 验证花城token
+ * @param token
+ * @return
+ */
+ @Override
+ public boolean checkHCToken(String token) {
+ if (StringUtils.isEmpty(token)) {
+ return false;
+ }
+ // token解析
+ Claims claims = JWTTokenUtil.getClaimsFromToken(token);
+ if (ObjectUtils.isEmpty(claims)) {
+ return false;
+ }
+ String userId = claims.getSubject();
+ if (ObjectUtils.isEmpty(userId))
+ {
+ return false;
+ }
+ return true;
+ }
+
+
+ @Override
+ public long getUserId(String token) {
+ if (token == null) {
+ return -1;
+ }
+ String userId = redis.boundValueOps(token).get();
+ return Long.parseLong(userId);
+ }
+
+ /**
+ * 获取花城e+的 UserId
+ * @param token
+ * @return
+ */
+ @Override
+ public long getHCUserId(String token) {
+ if (token == null) {
+ return -1;
+ }
+ // token解析
+ Claims claims = JWTTokenUtil.getClaimsFromToken(token);
+ if (ObjectUtils.isEmpty(claims)) {
+ return -1;
+ }
+ String userId = claims.getSubject();
+ if (ObjectUtils.isEmpty(userId))
+ {
+ return -1;
+ }
+ return Long.parseLong(userId);
+ }
+
+ public void deleteToken(String token) {
+ redis.delete(token);
+ }
+
+ @Override
+ public String getTokenByUserId(String userId) {
+ return redis.boundValueOps(userId).get();
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/manager/TokenConstant.java b/flower_city/src/main/java/com/dg/core/manager/TokenConstant.java
new file mode 100644
index 0000000..94ecc25
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/manager/TokenConstant.java
@@ -0,0 +1,25 @@
+package com.dg.core.manager;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: token
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 14:44
+ **/
+public class TokenConstant {
+
+ public static final String TOKEN_HEADER = "Authorization";
+ public static final String TOKEN_LOGOUT = "token_logout";
+ public static final String TOKEN_PRE = "Bearer ";
+ public static final String TOKEN_USERINFO = "token_userinfo";
+ /**
+ * 30分钟
+ */
+ public static final int EXPIRETIME = 300;
+ public static final Long EXPIRETIME_LONG = 300L;
+ public static final String SECRET = "UTivpbn%n9O!KnnL";
+ /**
+ * 24小时
+ */
+ public static final int EXPIRETIME_REFRESH = 24;
+}
diff --git a/flower_city/src/main/java/com/dg/core/manager/TokenManager.java b/flower_city/src/main/java/com/dg/core/manager/TokenManager.java
new file mode 100644
index 0000000..088e2e7
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/manager/TokenManager.java
@@ -0,0 +1,33 @@
+package com.dg.core.manager;
+
+public interface TokenManager {
+ /**
+ * 创建一个token关联上指定用户
+ *
+ * @param userId 指定用户的id
+ * @return 生成的token
+ */
+ public String createToken(String userId, String role);
+
+ /**
+ * 检查token是否有效
+ *
+ * @param token
+ * @return 是否有效
+ */
+ public boolean checkToken(String token);
+
+ /**
+ * 检查花城token是否有效
+ * @param token
+ * @return
+ */
+ public boolean checkHCToken(String token);
+
+ public long getUserId(String token);
+ public long getHCUserId(String token);
+
+ public void deleteToken(String token);
+
+ public String getTokenByUserId(String userId);
+}
diff --git a/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java b/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
new file mode 100644
index 0000000..c95f139
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
@@ -0,0 +1,78 @@
+package com.dg.core.resolvers;
+
+import com.dg.core.Constant;
+import com.dg.core.annotation.CurrentUser;
+import com.dg.core.db.gen.entity.HuaChengSysUser;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IHuaChengSysUserService;
+import com.dg.core.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.MethodParameter;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.ModelAndViewContainer;
+import org.springframework.web.multipart.support.MissingServletRequestPartException;
+
+import java.util.List;
+
+/**
+ * 增加方法注入，将含有CurrentUser注解的方法参数注入当前登录用户
+ */
+@Component
+public class CurrentUserMethodArgumentResolver implements HandlerMethodArgumentResolver {
+
+ @Autowired
+ private ISysUserService userService;
+
+ /**
+ * 花城e+用户接口
+ */
+ @Autowired
+ IHuaChengSysUserService iHuaChengSysUserService;
+
+ @Override
+ public boolean supportsParameter(MethodParameter parameter) {
+ //如果参数类型是User并且有CurrentUser注解则支持
+ if (parameter.getParameterType().isAssignableFrom(SysUser.class) &&
+ parameter.hasParameterAnnotation(CurrentUser.class)) {
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
+ //取出鉴权时存入的登录用户Id
+ Long currentUserId = (Long) webRequest.getAttribute(Constant.CURRENT_USER_ID, RequestAttributes.SCOPE_REQUEST);
+ if (currentUserId != null) {
+ //从数据库中查询并返回
+ SysUser sysUser=userService.selectData(currentUserId+"",null,null);
+ if(sysUser!=null)
+ {
+ return sysUser;
+ }
+
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData(currentUserId+"","","");
+ HuaChengSysUser huaChengSysUser=null;
+
+ if(list!=null || list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
+ if(huaChengSysUser!=null)
+ {
+ sysUser=userService.selectData(null,huaChengSysUser.getPhone(),null);
+ if(sysUser!=null)
+ {
+ return sysUser;
+ }
+ }
+ }
+ return null;
+// throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java b/flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java
new file mode 100644
index 0000000..201cfc5
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java
@@ -0,0 +1,113 @@
+package com.dg.core.service;
+
+import com.dg.core.db.gen.entity.ClassifyAdministration;
+import com.dg.core.db.gen.entity.Guidance;
+import com.dg.core.db.gen.entity.GuidePlate;
+import com.dg.core.db.gen.entity.OrganizationEntity;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface HomeStatisticsService
+{
+ /**
+ * 按办结量排序
+ * @return
+ */
+ List<GuidePlate> guidePlatePeople(List<String> ids);
+
+ /**
+ *按评分排序
+ * @return
+ */
+ List<GuidePlate> score(List<String> ids);
+
+ /**
+ * 按超时
+ * @return
+ */
+ List<GuidePlate> timeout(List<String> ids);
+
+ /**
+ * 按未办结
+ * @param ids
+ * @return
+ */
+ List<GuidePlate> tosettled(List<String> ids);
+
+ /**
+ * 按工单量
+ * @param ids
+ * @return
+ */
+ List<GuidePlate> workunit(List<String> ids);
+
+ /**
+ * 评分
+ * @return
+ */
+ Integer organizationScore(List<String> ids);
+
+ /**
+ * 办结量
+ * @return
+ */
+ Integer organizationNum(List<String> ids);
+ /**
+ * 获取一级部门
+ * @return
+ */
+ List<OrganizationEntity> getDepartment();
+
+ /**
+ * 办事指南根据导办数量排序
+ * @return
+ */
+ List<Guidance> guidanceTransaction(List<String> ids);
+
+ /**
+ * 办事指南根据浏览数量排序
+ * @return
+ */
+ List<Guidance> guidanceBrowse(List<String> ids);
+
+ /**
+ * 导办人员统计数
+ * @return
+ */
+ Integer staffNum(List<String> ids);
+
+ /**
+ * 办事指南数量统计
+ * @return
+ */
+ Integer countWork(List<String> ids);
+
+ /**
+ * 获取统计数据 首页用 勿动
+ */
+ int countStatisticsNum(List<String> classifyIds,List<String> ids);
+
+
+ /**
+ * 首页统计用
+ * @param parentId
+ * @param classifyGrade
+ * @return
+ */
+ public List<ClassifyAdministration> getClassify(String parentId,
+ String classifyGrade);
+
+
+ List<String> countId(String district);
+
+ /**
+ * 首页统计用
+ * @return
+ */
+ String reversionRate(String state,String isTimeout);
+
+
+ int rangeStatistics(List<String> ids);
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/IAgreementService.java b/flower_city/src/main/java/com/dg/core/service/IAgreementService.java
new file mode 100644
index 0000000..d9290bf
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/IAgreementService.java
@@ -0,0 +1,23 @@
+package com.dg.core.service;
+
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.Agreement;
+
+import java.util.List;
+
+public interface IAgreementService {
+
+ Agreement queryByAgreement(String agreement);
+
+ /**
+ * 获取相关附件列表（不分页）
+ * @return
+ */
+ List<Agreement> selectConfigList();
+
+ /**
+ * 修改相关附件
+ * @return
+ */
+ ResultData update(Agreement agreement);
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/IAreaCodeService.java b/flower_city/src/main/java/com/dg/core/service/IAreaCodeService.java
new file mode 100644
index 0000000..10497b2
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/IAreaCodeService.java
@@ -0,0 +1,21 @@
+package com.dg.core.service;
+
+import com.dg.core.db.gen.entity.AreaCode2022;
+import com.dg.core.db.gen.entity.OrganizationChartEntity;
+
+import java.util.List;
+
+public interface IAreaCodeService {
+
+ /**
+ * 根据指南id获取所属地区
+ * @return
+ */
+ List<AreaCode2022> getAreaCodeByTransactionId(Integer transactionId);
+
+ /**
+ * 根据pcode获取所属地区
+ * @return
+ */
+ List<AreaCode2022> getListByPCode(String id);
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/IAutomessageCommonProblemService.java b/flower_city/src/main/java/com/dg/core/service/IAutomessageCommonProblemService.java
new file mode 100644
index 0000000..27f53c2
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/IAutomessageCommonProblemService.java
@@ -0,0 +1,59 @@
+package com.dg.core.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.AutomessageCommonProblem;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface IAutomessageCommonProblemService {
+
+ /**
+ * 获取常见问题列表(不分页)
+ * @return
+ */
+ List<AutomessageCommonProblem> selectList();
+
+ /**
+ * 获取常见问题列表（分页）
+ * @param page
+ * @param state
+ * @return
+ */
+ List<AutomessageCommonProblem> selectConfigList(IPage<AutomessageCommonProblem> page, Integer state, String title, String content);
+
+ /**
+ * 获取常见问题列表（不分页查找）
+ * @return
+ */
+ List<AutomessageCommonProblem> selectConfigList(String title, String content);
+
+
+ /**
+ * 获取常见问题列表统计数量
+ * @return
+ */
+ Integer countAutomessageCommonProblem( String title, String content);
+
+
+ /**
+ * 添加常见问题数据
+ * @return
+ */
+ ResultData add(AutomessageCommonProblem automessageCommonProblem);
+
+ /**
+ * 修改常见问题数据
+ * @return
+ */
+ ResultData update(AutomessageCommonProblem automessageCommonProblem);
+
+ /**
+ * 删除常见问题数据
+ * @return
+ */
+ ResultData delete(Integer id);
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/IAutomessagePolicyDocumentsService.java b/flower_city/src/main/java/com/dg/core/service/IAutomessagePolicyDocumentsService.java
new file mode 100644
index 0000000..0b29435
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/IAutomessagePolicyDocumentsService.java
@@ -0,0 +1,58 @@
+package com.dg.core.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.db.gen.entity.AutomessagePolicyDocuments;
+import com.dg.core.db.gen.entity.SysUser;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface IAutomessagePolicyDocumentsService {
+
+ /**
+ * 获取法律法规政策文件 （分页）
+ * @param page
+ * @param state
+ * @return
+ */
+ List<AutomessagePolicyDocuments> selectConfigList(IPage<AutomessagePolicyDocuments> page, Integer state, String name, String type, SysUser sysUser,Integer departmentId, List<String> ids);
+
+ /**
+ * 获取法律法规政策文件 （不分页）
+ * @param name 名称
+ * @param type 类型
+ * @return
+ */
+ List<AutomessagePolicyDocuments> selectConfigList(String name, String type,Integer departmentId, List<String> ids);
+
+
+ /**
+ * 新增法律法规政策文件
+ * @return
+ */
+ int add(AutomessagePolicyDocuments automessagePolicyDocuments);
+
+ /**
+ * 修改法律法规政策文件
+ * @return
+ */
+ int update(AutomessagePolicyDocuments automessagePolicyDocuments);
+
+ /**
+ * 删除法律法规政策文件
+ * @return
+ */
+ int delete(Integer id);
+
+ /**
+ * 根据id获取法律法规政策文件数据
+ * @return
+ */
+ AutomessagePolicyDocuments selectAutomessagePolicyDocumentById(Integer id);
+
+ /**
+ * 获取法律法规政策文件 （统计）
+ * @return
+ */
+ Integer selectCountList(String name,String type,Integer departmentId,List<String> ids);
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/IAutomessageSmartConsultingService.java b/flower_city/src/main/java/com/dg/core/service/IAutomessageSmartConsultingService.java
new file mode 100644
index 0000000..4834737
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/IAutomessageSmartConsultingService.java
@@ -0,0 +1,18 @@
+package com.dg.core.service;
+
+import com.dg.core.db.gen.entity.AutomessageSmartConsulting;
+
+public interface IAutomessageSmartConsultingService {
+
+ /**
+ * 新增智能咨询访问记录
+ * @return
+ */
+ int add(AutomessageSmartConsulting automessageSmartConsulting);
+
+ /**
+ * 统计访问量
+ * @return
+ */
+ Long countSmartConsulting();
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/IClassifyAdministrationService.java b/flower_city/src/main/java/com/dg/core/service/IClassifyAdministrationService.java
new file mode 100644
index 0000000..8a16d23
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/IClassifyAdministrationService.java
@@ -0,0 +1,85 @@
+package com.dg.core.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.ClassifyAdministration;
+import com.dg.core.db.gen.entity.TransactionEvent;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface IClassifyAdministrationService {
+ /**
+ * 获取管理菜单列表
+ * @return
+ */
+ public List<ClassifyAdministration> selectConfigList(String classifyName, String classifyGrade);
+
+
+ /**
+ * 获取管理菜单列表
+ * @return
+ */
+ public List<ClassifyAdministration> selectConfigList(IPage<ClassifyAdministration> page,
+ Integer state,
+ String classifyName, String classifyGrade);
+
+ /**
+ * 新增分类
+ * @param entity
+ * @return
+ */
+ public int insertConfig(ClassifyAdministration entity);
+
+ /**
+ * 更新分类
+ * @param entity
+ * @return
+ */
+ public int updateConfig(ClassifyAdministration entity);
+
+ /**
+ * 删除分类
+ * @param Id
+ * @return
+ */
+ public int deleteConfigById(String Id);
+
+
+ /**
+ * 统计数量
+ * @return
+ */
+ public int countNum(String classifyName,String classifyGrade);
+
+
+ /**
+ * 获取管理菜单列表(已分级)
+ * @return
+ */
+ List<ClassifyAdministration> selectConfigListByParentId(String parentId,Integer departmentId);
+
+ /**
+ * 获取管理菜单列表(根目录分页)
+ * @return
+ */
+ List<ClassifyAdministration> selectRootList (IPage<ClassifyAdministration> page, Integer stat,String parentId,Integer departmentId);
+
+
+ /**
+ * 获取分类根据id 如果是二级id则获取的是办事指南
+ * @return
+ */
+ ResultData queryListById(Integer id);
+
+ /**
+ * 根据上级id查询子分类
+ * @param parentId
+ * @return
+ */
+ List<String> selectParent(String parentId);
+
+ List<ClassifyAdministration> selectParentData(String parentId);
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/IElseAccessoryService.java b/flower_city/src/main/java/com/dg/core/service/IElseAccessoryService.java
new file mode 100644
index 0000000..759eed6
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/IElseAccessoryService.java
@@ -0,0 +1,58 @@
+package com.dg.core.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.db.gen.entity.ElseAccessoryEntity;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface IElseAccessoryService {
+
+ /**
+ * 获取附件列表
+ * @param page
+ * @param state
+ * @param Name
+ * @return
+ */
+ public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state,
+ String Name,List<String> ids,String userId);
+
+ /**
+ * 获取附件列表全部
+ * @param Name
+ * @return
+ */
+ public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids,String userId);
+
+
+ /**
+ * 新增列表
+ * @param entity
+ * @return
+ */
+ public int insertConfig(ElseAccessoryEntity entity);
+
+ /**
+ * 更新列表
+ * @param entity
+ * @return
+ */
+ public int updateConfig(ElseAccessoryEntity entity);
+
+ /**
+ * 删除
+ * @param Id
+ * @return
+ */
+ public int deleteConfigById(String Id);
+
+ /**
+ * 统计数量
+ * @param Name
+ * @return
+ */
+ public int countNum(String Name,List<String> ids);
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/IGuideEvolveService.java b/flower_city/src/main/java/com/dg/core/service/IGuideEvolveService.java
new file mode 100644
index 0000000..c33e801
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/IGuideEvolveService.java
@@ -0,0 +1,51 @@
+package com.dg.core.service;
+
+
+import com.dg.core.db.gen.entity.GuideEvolveEntity;
+import com.dg.core.db.gen.entity.SysUser;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface IGuideEvolveService
+{
+ /**
+ * 查询记录列表
+ * @return
+ */
+ public List<GuideEvolveEntity> selectConfigList(String guideId, SysUser sysUser);
+
+ /**
+ * 新增记录
+ * @param entity
+ * @return
+ */
+ public int insertConfig(GuideEvolveEntity entity);
+
+ /**
+ * 更新记录
+ * @param entity
+ * @return
+ */
+ public int updateConfig(GuideEvolveEntity entity);
+
+ /**
+ * 删除记录
+ * @param Id
+ * @return
+ */
+ public int deleteConfigById(String Id);
+
+ /**
+ * 统计数量
+ * @return
+ */
+ public int countNum();
+
+ /**
+ * 更新工单id为空的脏数据
+ * @return
+ */
+ int updateGuid();
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java b/flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java
new file mode 100644
index 0000000..ced70b5
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java
@@ -0,0 +1,150 @@
+package com.dg.core.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.*;
+import org.springframework.data.repository.query.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+public interface IGuideRepairOrderService {
+
+ int addOrder(GuideRepairOrder guideRepairOrder);
+
+ /**
+ * 获取详情
+ * @param Id
+ * @param orderNum
+ * @return
+ */
+ public GuideRepairOrder selectConfigData(String Id,
+ String orderNum);
+
+
+ /**
+ * 分配人员
+ * @param order
+ * @return
+ */
+ public int updateConfig(GuideRepairOrder order);
+
+ /**
+ * 获取个人中心工单数据
+ * @param submitUserId
+ * @return
+ */
+ List<GuideRepairOrder> selectBySubmitId(String submitUserId);
+
+ /**
+ * 获取工单列表(分页)
+ * @param matterName
+ * @return
+ */
+ List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
+ String matterName, List<String> ids, String status, String guideUserId,
+ String createTimeStartTime, String createTimeTimeEndTime, String classifyId);
+
+ /**
+ * 获取工单列表(不分页用于小程序)
+ * @param matterName
+ * @return
+ */
+ List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids,String status,
+ String guideUserId, String createTimeStartTime,String createTimeTimeEndTime,String classifyId);
+
+
+ /**
+ * 获取工单列表(求和)
+ * @param matterName
+ * @return
+ */
+ int countConfigList(String matterName,List<String> ids,String status,String guideUserId);
+
+
+ /**
+ * 很具用户id查询是否有对应工单
+ * @return
+ */
+ int countUser(String userId,String state);
+
+ /**
+ * 根据进展类修改用户代办数量
+ * @param order
+ * @return
+ */
+ int updateSysUserOrderNum(GuideEvolveEntity order);
+
+ /**
+ * 统计工单用 1 今天 2昨天 3本月 4本年度 String time
+ * @return
+ */
+ int countStatisticsNum(String state,List<String> ids,String time,String isTimeout,
+ String evaluateState,List<String> classifyIds,
+ String serviceState,String guideUserId);
+
+ /**
+ * 统计数据
+ * @param state
+ * @param ids
+ * @param time
+ * @return
+ */
+ List<CountListNum> countListNum(String state,
+ List<String> ids,
+ Integer time);
+
+ /**
+ * 获取提工单提交交人员信息
+ * @return
+ */
+ SysUser getSubmitUser(GuideRepairOrder guideRepairOrder);
+
+
+ /**
+ * 设置超时时间
+ * @return
+ */
+ GuideRepairOrder setTimeoutTim(GuideRepairOrder guideRepairOrder);
+
+
+ /**
+ * 导办人员有新订单推送消息
+ * @return
+ */
+ void sendGuideRepairOrderSubmit (String openid,GuideRepairOrder guideRepairOrder);
+
+ /**
+ * 删除工单
+ * @param Id
+ * @return
+ */
+ int deleteConfigById(String Id);
+
+ /**
+ * 推送超时工单
+ * @return
+ */
+ ResultData pushOvertimeGuideRepairOrder();
+
+ /**
+ * 更改状态为好评
+ * @return
+ */
+ int updateEvaluate();
+
+
+ /**
+ * 删除评论
+ * @return
+ */
+ ResultData deleteComment(Integer id, SysUser sysUser);
+
+
+ /**
+ * 发送工单提醒信息
+ * @return
+ */
+ ResultData pushNoticeTimeRepairOrder();
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/IHuaChengSysUserService.java b/flower_city/src/main/java/com/dg/core/service/IHuaChengSysUserService.java
new file mode 100644
index 0000000..94172b4
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/IHuaChengSysUserService.java
@@ -0,0 +1,14 @@
+package com.dg.core.service;
+
+import com.dg.core.db.gen.entity.HuaChengSysUser;
+
+import java.util.List;
+
+public interface IHuaChengSysUserService
+{
+ public List<HuaChengSysUser> selectConfigList();
+
+ public List<HuaChengSysUser> selectData(String userId,String account,String phone);
+
+ public int selectNum();
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/IKeywordService.java b/flower_city/src/main/java/com/dg/core/service/IKeywordService.java
new file mode 100644
index 0000000..8c05e44
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/IKeywordService.java
@@ -0,0 +1,48 @@
+package com.dg.core.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.db.gen.entity.KeywordEntity;
+
+import java.util.List;
+
+public interface IKeywordService {
+ /**
+ * 查询关键词列表
+ * @return
+ */
+ public List<KeywordEntity> selectConfigList(IPage<KeywordEntity> page, Integer state);
+
+ /**
+ * 查询详情
+ * @return
+ */
+ public KeywordEntity selectConfigData(String Id,
+ String name);
+
+
+ /**
+ * 添加关键词
+ * @return
+ */
+ public int insertConfig(KeywordEntity entity);
+
+ /**
+ * 编辑关键词
+ * @return
+ */
+ public int updateConfig(KeywordEntity entity);
+
+ /**
+ * 删除关键词
+ * @param Id
+ * @return
+ */
+ public int deleteConfigById(String Id);
+
+ /**
+ * 统计数量
+ * @param Id
+ * @return
+ */
+ public int countNum();
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/IMenuService.java b/flower_city/src/main/java/com/dg/core/service/IMenuService.java
new file mode 100644
index 0000000..03dff9a
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/IMenuService.java
@@ -0,0 +1,42 @@
+package com.dg.core.service;
+
+import com.dg.core.db.gen.entity.MenuEntity;
+
+import java.util.List;
+
+public interface IMenuService
+{
+ /**
+ * 获取菜单列表
+ * @return
+ */
+ public List<MenuEntity> selectConfigList();
+
+
+ /**
+ * 添加新菜单
+ * @return
+ */
+ public int insertConfig(MenuEntity entity);
+
+ /**
+ * 更新菜单
+ * @param entity
+ * @return
+ */
+ public int updateConfig(MenuEntity entity);
+
+ /**
+ * 删除菜单
+ * @param Id
+ * @return
+ */
+ public int deleteConfigById(Long Id);
+
+
+ /**
+ * 统计数量
+ * @return
+ */
+ public int countNum();
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java b/flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java
new file mode 100644
index 0000000..41c801c
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java
@@ -0,0 +1,91 @@
+package com.dg.core.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.db.gen.entity.OrganizationChartEntity;
+
+import java.util.List;
+
+public interface IOrganizationChartService
+{
+ /**
+ * 查询机构列表
+ */
+ public List<OrganizationChartEntity> selectConfigList(String parentId,String grade,List<String> ids);
+
+
+ public List<OrganizationChartEntity> selectConfigList(List<String> ids);
+
+ /**
+ * 新增机构
+ */
+ public int insertConfig(OrganizationChartEntity entity);
+
+ /**
+ * 更新机构
+ */
+ public int updateConfig(OrganizationChartEntity entity);
+
+ /**
+ * 删除机构
+ */
+ public int deleteConfigById(String Id);
+
+ /**
+ * 统计数量
+ */
+ public int countNum();
+
+ /**
+ * 查询机构列表(不分级不分页按等级排序)
+ */
+ List<OrganizationChartEntity> selectList();
+
+
+ /**
+ * 根据id查取消组织机构
+ */
+ OrganizationChartEntity selectConfigById(String id);
+
+ /**
+ * 查询机构列表(分页)
+ */
+ List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state, String organizationName,List<String> ids);
+
+
+ /**
+ * 统计数量(部门应用)
+ */
+ int countList(String organizationName,List<String> ids);
+
+ /**
+ * 获取部门下子部门的全部id
+ * @param id
+ * @return
+ */
+ List<String> getIds(String id);
+
+
+ /**
+ * 根据id 查询是否有子部门
+ * @param parentId
+ * @param grade
+ * @return
+ */
+ public List<OrganizationChartEntity> selectParentList(String parentId,String grade);
+
+ /**
+ * 获取该部门所有上级部门及其所有下级部门
+ * @param id
+ * @return
+ */
+ List<String> getDepartmentId(String id);
+
+
+ /**
+ * 获取该部门的一级部门
+ * @param id
+ * @return
+ */
+ String getStairId(String id);
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/IReplyTemplateService.java b/flower_city/src/main/java/com/dg/core/service/IReplyTemplateService.java
new file mode 100644
index 0000000..91e5258
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/IReplyTemplateService.java
@@ -0,0 +1,51 @@
+package com.dg.core.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.db.gen.entity.ReplyTemplateEntity;
+
+import java.util.List;
+
+public interface IReplyTemplateService
+{
+ /**
+ * 获取模板列表
+ * @return
+ */
+ public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, Integer state,
+ String Name,List<String> ids,String userId);
+
+ /**
+ * 获取详情
+ * @param Id
+ * @return
+ */
+ public ReplyTemplateEntity selectConfigData(String Id);
+
+ /**
+ * 新增模板
+ * @param entity
+ * @return
+ */
+ public int insertConfig(ReplyTemplateEntity entity);
+
+ /**
+ * 更新模板
+ * @param entity
+ * @return
+ */
+ public int updateConfig(ReplyTemplateEntity entity);
+
+ /**
+ * 删除模板
+ * @param Id
+ * @return
+ */
+ public int deleteConfigById(String Id);
+
+ /**
+ * 获取数量
+ * @return
+ */
+ public int countNum(String Name,List<String> ids);
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/IRoleManagementService.java b/flower_city/src/main/java/com/dg/core/service/IRoleManagementService.java
new file mode 100644
index 0000000..3a0f311
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/IRoleManagementService.java
@@ -0,0 +1,45 @@
+package com.dg.core.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.db.gen.entity.RoleManagementEntity;
+
+import java.util.List;
+
+public interface IRoleManagementService
+{
+ /**
+ * 查询角色列表
+ * @param page
+ * @param state
+ * @return
+ */
+ public List<RoleManagementEntity> selectConfigList(IPage<RoleManagementEntity> page,
+ Integer state,String name);
+
+ /**
+ * 新增角色
+ * @param entity
+ * @return
+ */
+ public int insertConfig(RoleManagementEntity entity);
+
+ /**
+ * 编辑角色
+ * @param entity
+ * @return
+ */
+ public int updateConfig(RoleManagementEntity entity);
+
+ /**
+ * 删除角色
+ * @param Id
+ * @return
+ */
+ public int deleteConfigById(String Id);
+
+ /**
+ * 统计条数
+ * @return
+ */
+ public int countNum(String name);
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/IRoleMenuService.java b/flower_city/src/main/java/com/dg/core/service/IRoleMenuService.java
new file mode 100644
index 0000000..5dce8c9
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/IRoleMenuService.java
@@ -0,0 +1,37 @@
+package com.dg.core.service;
+
+import com.dg.core.db.gen.entity.RoleMenuEntity;
+
+import java.util.List;
+
+public interface IRoleMenuService
+{
+ /**
+ * 根据角色获取菜单id
+ * @param roleId
+ * @return
+ */
+ public List<RoleMenuEntity> selectConfigList(String roleId);
+
+ /**
+ * 新增
+ * @param entity
+ * @return
+ */
+ public int insertConfig(RoleMenuEntity entity);
+
+ /**
+ * 编辑
+ * @param entity
+ * @return
+ */
+ public int updateConfig(RoleMenuEntity entity);
+
+
+ /**
+ * 删除
+ * @param Id
+ * @return
+ */
+ public int deleteConfigById(String Id);
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/ISlideshowService.java b/flower_city/src/main/java/com/dg/core/service/ISlideshowService.java
new file mode 100644
index 0000000..c3a0ea2
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/ISlideshowService.java
@@ -0,0 +1,55 @@
+package com.dg.core.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.Slideshow;
+import com.dg.core.db.gen.entity.SysUser;
+
+import java.util.List;
+
+public interface ISlideshowService {
+
+ /**
+ * 查询轮播图列表(分页)
+ *
+ * @return 参数配置信息
+ */
+ List<Slideshow> selectConfigList(IPage<SysUser> page, Integer state);
+
+ /**
+ * 查询轮播图列表(不分页)
+ *
+ * @return 参数配置信息
+ */
+ List<Slideshow> selectList();
+
+ /**
+ * 根据id 查询轮播图数据
+ *
+ * @return 参数配置信息
+ */
+ Slideshow queryById(Integer id);
+
+ /**
+ * 新增轮播图数据
+ *
+ * @return 参数配置信息
+ */
+ ResultData add(Slideshow slideshow);
+
+ /**
+ * 修改轮播图数据
+ *
+ * @return 参数配置信息
+ */
+ ResultData update(Slideshow slideshow);
+
+
+ /**
+ * 删除轮播图数据
+ *
+ * @return 参数配置信息
+ */
+ ResultData delete(Integer id);
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/ISysSettingsService.java b/flower_city/src/main/java/com/dg/core/service/ISysSettingsService.java
new file mode 100644
index 0000000..80c1b8d
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/ISysSettingsService.java
@@ -0,0 +1,22 @@
+package com.dg.core.service;
+
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.AutomessageSysSettings;
+
+public interface ISysSettingsService {
+
+
+ /**
+ * 按设置名称查找设置信息
+ *
+ * @return 参数配置信息
+ */
+ ResultData selectByName(String settingName);
+
+ /**
+ * 修改设置信息
+ *
+ * @return 参数配置信息
+ */
+ ResultData update(AutomessageSysSettings automessageSysSettings);
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/ISysUserRecordService.java b/flower_city/src/main/java/com/dg/core/service/ISysUserRecordService.java
new file mode 100644
index 0000000..4423383
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/ISysUserRecordService.java
@@ -0,0 +1,34 @@
+package com.dg.core.service;
+
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.SysUser;
+
+
+public interface ISysUserRecordService {
+
+ /**
+ * 增加用户访问记录
+ *
+ * @return 参数配置信息
+ */
+ ResultData add(SysUser sysUser);
+
+
+ /**
+ * 小程序用户访问量统计1.累计访问量2.本年访问量 3.本月访问量 4.今日访问量 5.昨日访问
+ * @return
+ */
+ ResultData selectUserRecordCount();
+
+ /**
+ * 小程序用户访问量统计1.近15天 2.近30天 3.近一年
+ * @return
+ */
+ ResultData selectByDateType(Integer dateType);
+
+ /**
+ * 删除因为token问题产出的重复脏数据
+ * @return
+ */
+ Integer deleteDistinct();
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/ISysUserService.java b/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
new file mode 100644
index 0000000..9824e7a
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
@@ -0,0 +1,94 @@
+package com.dg.core.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.SysUser;
+
+import java.util.List;
+
+public interface ISysUserService
+{
+ SysUser getUserByAccount(String account);
+ /**
+ * 查询聊天列表
+ *
+ * @return 参数配置信息
+ */
+ public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,
+ String userName,List<String> ids,String isDivisionHead);
+
+
+ SysUser selectData(String userId,String phonenumber,String loginName);
+
+ /**
+ * 新增聊天记录
+ *
+ * @param config 参数配置信息
+ * @return 结果
+ */
+ public int insertConfig(SysUser config);
+
+ /**
+ * 更新聊天记录
+ *
+ * @param config 参数配置信息
+ * @return 结果
+ */
+ public int updateConfig(SysUser config);
+
+ /**
+ * 删除聊天记录
+ *
+ * @param id 聊天记录主键id
+ * @return 结果
+ */
+ public int deleteConfigById(String id);
+
+ /**
+ * 获取数据库总条数（批量）
+ *
+ * @return 结果
+ */
+ public int selectNum(String userType,String userName,List<String> ids,String isDivisionHead);
+
+ /**
+ * 发送验证码(如果没有该用户则新建用户)
+ *
+ * @return 结果
+ */
+ ResultData smsSend(SysUser user);
+
+ /**
+ * 验证码登录
+ *
+ * @return 结果
+ */
+ ResultData loginByAccount(String phonenumber, String code);
+
+ /**
+ * 根据部门id及分类id获取导办用户
+ *
+ * @return 结果
+ */
+ List<SysUser> selectListByDepartmentId(String departmentId,String classifyId);
+
+ /**
+ * 通过手机号获取用户信息
+ *
+ * @return 结果
+ */
+ ResultData loginByPhonenumber(String phonenumber);
+
+
+ /**
+ * 查询用户列表（不分页）
+ * @param userType 用户类型
+ * @return 结果
+ */
+ List<SysUser> queryList(Integer userType,String keyWor);
+
+ /**
+ * 修改group 长度
+ */
+ void setGroup();
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java b/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java
new file mode 100644
index 0000000..9aa31e6
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java
@@ -0,0 +1,156 @@
+package com.dg.core.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.db.gen.entity.TransactionEvent;
+import com.dg.core.db.manual.pojo.QueryResults;
+import com.dg.core.db.manual.pojo.RecommendResult;
+import com.dg.core.db.manual.pojo.Search;
+import org.springframework.data.repository.query.Param;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+public interface ITransactionEventService
+{
+ /**
+ * 查询导办事务详情
+ * @param Id
+ * @return
+ */
+ public TransactionEvent selectConfigData(String Id, SysUser sysUser);
+
+ /**
+ * 导办事物列表
+ * @return
+ */
+ public List<TransactionEvent> selectConfigList(IPage<TransactionEvent> page, Integer state,
+ String keyword, String classifyGrade,
+ List<String> ids);
+
+ /**
+ * 导办事物列表
+ * @return
+ */
+ public List<TransactionEvent> selectConfigList(String keyword, String classifyGrade,
+ List<String> ids);
+
+ /**
+ * 新增导办事务
+ * @param entity
+ * @return
+ */
+ public int insertConfig(TransactionEvent entity);
+
+ /**
+ * 修改导办事务
+ * @param entity
+ * @return
+ */
+ public int updateConfig(TransactionEvent entity);
+
+ /**
+ * 删除接口
+ * @param Id
+ * @return
+ */
+ public int deleteConfigById(String Id);
+
+ /**
+ * 统计数量
+ * @return
+ */
+ public int countNum(String keyword,String classifyGrade,List<String> ids);
+
+ /**
+ * 导办事务搜索
+ * @param keyWord
+ * @return
+ */
+ QueryResults queryMatterNameList(IPage<Search> page, Integer state,Integer recommendSize, String keyWord);
+
+
+ /**
+ * 导办事务搜索(无分页用于小程序)
+ * @param keyWord
+ * @return
+ */
+ QueryResults queryMatterNameList(String keyWord);
+
+ /**
+ * 导办事务搜索统计数量
+ * @param matterName
+ * @return
+ */
+ int countNumByMatterName(String matterName);
+
+ /**
+ * 根据分类id查询导办事务
+ * @param classifyId
+ * @return
+ */
+ List<TransactionEvent> queryByClassifyIdList(String classifyId,Integer departmentId);
+
+
+ /**
+ * 根据分类id查询导办事务(分页)
+ * @param classifyId
+ * @return
+ */
+ List<TransactionEvent> queryByClassifyIdList(IPage<TransactionEvent> page, Integer state,String classifyId,Integer departmentId);
+
+ /**
+ * 根据查询时间查询导办事务
+ * @return
+ */
+ List<TransactionEvent> queryByQueryTime();
+
+ /**
+ * 根据浏览次数查询导办事务
+ * @return
+ */
+ List<TransactionEvent> queryByBrowseNum();
+
+ /**
+ * 查询导办事务求和
+ * @return
+ */
+ TransactionEvent sumTransactionNum();
+
+ int countNumByClassifyIdList(String classifyId, Integer departmentId);
+
+ /**
+ * 导办事物列表(不分页)
+ * @return
+ */
+ List<TransactionEvent> selectList(String keyWord);
+
+ /**
+ * 智能咨询
+ * @return
+ */
+ RecommendResult smartConsulting(String keyWord);
+
+
+ /**
+ * 根据部门判断是否有事项名称重复
+ */
+ String selectDataIfExist(@Param("departmentId") String departmentId,
+ @Param("matterName") String matterName);
+
+
+ /**
+ * 根据办事分类获取办事指南
+ */
+ List<String> selectclassifyId(String classifyId);
+
+
+ /**
+ * 根据分类筛选数据
+ * @param ids
+ * @return
+ */
+ List<TransactionEvent> selectClassifyList(List<String> ids);
+ Integer batchImport(String fileName, MultipartFile file) ;
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/AgreementServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/AgreementServiceImpl.java
new file mode 100644
index 0000000..5af6558
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/AgreementServiceImpl.java
@@ -0,0 +1,37 @@
+package com.dg.core.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.Agreement;
+import com.dg.core.db.gen.mapper.AgreementMapper;
+import com.dg.core.service.IAgreementService;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+public class AgreementServiceImpl extends ServiceImpl<AgreementMapper, Agreement> implements IAgreementService {
+
+ @Override
+ public Agreement queryByAgreement(String agreement) {
+ return baseMapper.selectOne(new QueryWrapper<Agreement>().lambda().eq(Agreement::getAgreement, agreement));
+ }
+
+ @Override
+ public List<Agreement> selectConfigList() {
+ return baseMapper.selectConfigList();
+ }
+
+ @Override
+ public ResultData update(Agreement agreement){
+ agreement.setUpdateTime(LocalDateTime.now());
+ int i = baseMapper.updateById(agreement);
+ if(i>0)
+ return ResultData.success();
+ else
+ return ResultData.error();
+
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java
new file mode 100644
index 0000000..fb48c6d
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java
@@ -0,0 +1,83 @@
+package com.dg.core.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.db.gen.entity.AreaCode2022;
+import com.dg.core.db.gen.entity.OrganizationChartEntity;
+import com.dg.core.db.gen.entity.TransactionEvent;
+import com.dg.core.db.gen.mapper.AreaCode2022Mapper;
+import com.dg.core.db.gen.mapper.OrganizationChartMapper;
+import com.dg.core.db.gen.mapper.TransactionEventMapper;
+import com.dg.core.service.IAreaCodeService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+@Service
+public class AreaCodeServiceImpl extends ServiceImpl<AreaCode2022Mapper, AreaCode2022> implements IAreaCodeService {
+
+ @Resource
+ private OrganizationChartMapper organizationChartMapper;
+
+ @Resource
+ private TransactionEventMapper transactionEventMapper;
+
+ @Override
+ public List<AreaCode2022> getAreaCodeByTransactionId(Integer transactionId) {
+ List<String> areaCodes = new ArrayList<>();
+ TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().
+ eq(TransactionEvent::getId, transactionId));
+ List<String> departmentIds = new ArrayList<>();
+ if (transactionEvent.getDepartmentIds() != null) {
+ departmentIds = new ArrayList<>(Arrays.asList(transactionEvent.getDepartmentIds().split(",")));
+ }
+
+ departmentIds.add(transactionEvent.getDepartmentId());
+ for (String departmentId : departmentIds) {
+ OrganizationChartEntity organizationChartEntity = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda()
+ .eq(OrganizationChartEntity::getId, departmentId));
+ if (organizationChartEntity != null) {
+ if (organizationChartEntity.getCity() != null)
+ areaCodes.add(organizationChartEntity.getCity());
+ if (organizationChartEntity.getDistrict() != null)
+ areaCodes.add(organizationChartEntity.getDistrict());
+ if (organizationChartEntity.getVillage() != null)
+ areaCodes.add(organizationChartEntity.getVillage());
+ }
+
+ }
+ return baseMapper.selectByIdSet(areaCodes);
+ }
+
+
+ public List<String> getAreaCodeIds(List<String> areaCodes, OrganizationChartEntity organizationChartEntity) {
+ List<OrganizationChartEntity> organizationChartEntitys = organizationChartMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda()
+ .eq(OrganizationChartEntity::getParentId, organizationChartEntity.getId()));
+ for (OrganizationChartEntity organizationChart : organizationChartEntitys) {
+ if (organizationChart.getCity() != null)
+ areaCodes.add(organizationChart.getCity());
+ if (organizationChart.getDistrict() != null)
+ areaCodes.add(organizationChart.getDistrict());
+ if (organizationChart.getVillage() != null)
+ areaCodes.add(organizationChart.getVillage());
+ getAreaCodeIds(areaCodes, organizationChart);
+ }
+ return areaCodes;
+ }
+
+ @Override
+ public List<AreaCode2022> getListByPCode(String id) {
+ List<AreaCode2022> areaCode2022s = baseMapper.selectList(new QueryWrapper<AreaCode2022>().lambda().eq(AreaCode2022::getPcode, id));
+ for (AreaCode2022 areaCode2022 : areaCode2022s) {
+ if (areaCode2022.getLevel() != 3)
+ areaCode2022.setChild(this.getListByPCode(areaCode2022.getCode().toString()));
+ }
+ return areaCode2022s;
+ }
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/AutomessageCommonProblemServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/AutomessageCommonProblemServiceImpl.java
new file mode 100644
index 0000000..27b92a4
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/AutomessageCommonProblemServiceImpl.java
@@ -0,0 +1,87 @@
+package com.dg.core.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.AutomessageCommonProblem;
+import com.dg.core.db.gen.mapper.AutomessageCommonProblemMapper;
+import com.dg.core.service.IAutomessageCommonProblemService;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+public class AutomessageCommonProblemServiceImpl extends ServiceImpl<AutomessageCommonProblemMapper, AutomessageCommonProblem> implements IAutomessageCommonProblemService {
+
+ @Override
+ public List<AutomessageCommonProblem> selectList(){
+ return baseMapper.selectList(new QueryWrapper<AutomessageCommonProblem>().lambda());
+ }
+
+ @Override
+ public List<AutomessageCommonProblem> selectConfigList(IPage<AutomessageCommonProblem> page, Integer state, String title, String content) {
+ return baseMapper.selectConfigList(page,state,title,content);
+ }
+
+ @Override
+ public List<AutomessageCommonProblem> selectConfigList(String title, String content) {
+ return baseMapper.selectConfigList(title,content);
+ }
+
+ @Override
+ public Integer countAutomessageCommonProblem( String title, String content){
+ return baseMapper.countConfigList(title,content);
+ }
+
+ @Override
+ public ResultData add(AutomessageCommonProblem automessageCommonProblem){
+ if (automessageCommonProblem.getContent()==null){
+ return ResultData.error("常见问题不能空");
+ }
+ if (automessageCommonProblem.getTitle()==null){
+ return ResultData.error("回答内容题不能空");
+ }
+ automessageCommonProblem.setCreateTime(LocalDateTime.now());
+ automessageCommonProblem.setUpdateTime(LocalDateTime.now());
+ int insert = baseMapper.insert(automessageCommonProblem);
+ if (insert>0){
+ return ResultData.success();
+ }
+ else {
+ return ResultData.error("添加失败");
+ }
+
+ }
+
+ @Override
+ public ResultData update(AutomessageCommonProblem automessageCommonProblem){
+ if (automessageCommonProblem.getContent()==null){
+ return ResultData.error("常见问题不能空");
+ }
+ if (automessageCommonProblem.getTitle()==null){
+ return ResultData.error("回答内容题不能空");
+ }
+ automessageCommonProblem.setUpdateTime(LocalDateTime.now());
+ int i = baseMapper.updateById(automessageCommonProblem);
+ if (i>0){
+ return ResultData.success();
+ }
+ else {
+ return ResultData.error("修改失败");
+ }
+
+ }
+
+ @Override
+ public ResultData delete(Integer id){
+ int i = baseMapper.deleteById(id);
+ if (i>0){
+ return ResultData.success();
+ }
+ else {
+ return ResultData.error("删除失败");
+ }
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java
new file mode 100644
index 0000000..e06544e
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java
@@ -0,0 +1,79 @@
+package com.dg.core.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.db.gen.entity.AutomessagePolicyDocuments;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.db.gen.mapper.AutomessagePolicyDocumentsMapper;
+import com.dg.core.service.IAutomessagePolicyDocumentsService;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+public class AutomessagePolicyDocumentsServiceImpl extends ServiceImpl<AutomessagePolicyDocumentsMapper, AutomessagePolicyDocuments> implements IAutomessagePolicyDocumentsService {
+
+ @Override
+ public List<AutomessagePolicyDocuments> selectConfigList(IPage<AutomessagePolicyDocuments> page, Integer state, String name, String type, SysUser sysUser,Integer departmentId, List<String> ids) {
+ List<AutomessagePolicyDocuments> automessagePolicyDocumentsList = baseMapper.selectConfigList(page, state, name, type, departmentId, ids);
+ if (sysUser!=null){
+ for (AutomessagePolicyDocuments automessagePolicyDocuments:automessagePolicyDocumentsList) {
+ if(sysUser.getUserType().equals("1")){//超级管理员
+ automessagePolicyDocuments.setIsDelete(1);
+ }else if ( sysUser.getIsDivisionHead().equals("1")){//部门领导
+ if (sysUser.getDepartmentId().equals(automessagePolicyDocuments.getDepartmentId().toString())){//如果是一个部门则可以删除
+ automessagePolicyDocuments.setIsDelete(1);
+ }else {
+ automessagePolicyDocuments.setIsDelete(2);
+ }
+ }
+ else if (sysUser.getUserType().equals("2")){//导办人员
+ if(sysUser.getUserId().equals(automessagePolicyDocuments.getCreateUserId())){//如果它创建的则可以删除
+ automessagePolicyDocuments.setIsDelete(1);
+ }else {
+ automessagePolicyDocuments.setIsDelete(2);
+ }
+ }
+ }
+ }
+ return automessagePolicyDocumentsList;
+ }
+
+ @Override
+ public List<AutomessagePolicyDocuments> selectConfigList(String name, String type,Integer departmentId, List<String> ids) {
+ return baseMapper.selectConfigList(name,type,departmentId,ids);
+ }
+
+ @Override
+ public int add(AutomessagePolicyDocuments automessagePolicyDocuments) {
+ automessagePolicyDocuments.setCreateTime(LocalDateTime.now());
+ automessagePolicyDocuments.setUpdateTime(LocalDateTime.now());
+ return baseMapper.insert(automessagePolicyDocuments);
+ }
+
+ @Override
+ public int update(AutomessagePolicyDocuments automessagePolicyDocuments) {
+ automessagePolicyDocuments.setCreateTime(LocalDateTime.now());
+ automessagePolicyDocuments.setUpdateTime(LocalDateTime.now());
+ return baseMapper.updateById(automessagePolicyDocuments);
+ }
+
+ @Override
+ public int delete(Integer id) {
+ return baseMapper.deleteById(id);
+ }
+
+ @Override
+ public AutomessagePolicyDocuments selectAutomessagePolicyDocumentById(Integer id) {
+ return baseMapper.selectAutomessagePolicyDocumentById(id);
+ }
+
+ @Override
+ public Integer selectCountList(String name,String type,Integer departmentId,List<String> ids) {
+ return baseMapper.selectCountList(name,type,departmentId,ids);
+ }
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/ClassifyAdministrationImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/ClassifyAdministrationImpl.java
new file mode 100644
index 0000000..aaafd60
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/ClassifyAdministrationImpl.java
@@ -0,0 +1,102 @@
+package com.dg.core.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.ClassifyAdministration;
+import com.dg.core.db.gen.entity.TransactionEvent;
+import com.dg.core.db.gen.mapper.ClassifyAdministrationMapper;
+import com.dg.core.db.gen.mapper.TransactionEventMapper;
+import com.dg.core.service.IClassifyAdministrationService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class ClassifyAdministrationImpl extends ServiceImpl<ClassifyAdministrationMapper, ClassifyAdministration>
+ implements IClassifyAdministrationService
+{
+
+
+ @Resource
+ private TransactionEventMapper transactionEventMapper;
+
+ @Override
+ public List<ClassifyAdministration> selectConfigList(String classifyName, String classifyGrade) {
+ return baseMapper.selectConfigList( classifyName, classifyGrade);
+ }
+
+ @Override
+ public List<ClassifyAdministration> selectConfigList(IPage<ClassifyAdministration> page,
+ Integer state, String classifyName, String classifyGrade) {
+ return baseMapper.selectConfigList(page,state, classifyName, classifyGrade);
+ }
+
+ @Override
+ public List<ClassifyAdministration> selectConfigListByParentId(String parentId,Integer departmentId){
+ List<ClassifyAdministration> classifyAdministrationEntities = baseMapper.selectRootList(parentId ,departmentId);
+ for (ClassifyAdministration classifyAdministrationEntitie: classifyAdministrationEntities) {
+ classifyAdministrationEntitie.setClassifyAdministrationEntityList(selectConfigListByParentId(classifyAdministrationEntitie.getId().toString(),departmentId));
+ }
+ return classifyAdministrationEntities;
+ }
+
+ @Override
+ public List<ClassifyAdministration> selectRootList(IPage<ClassifyAdministration> page, Integer stat,String parentId,Integer departmentId) {
+ List<ClassifyAdministration> classifyAdministrations = baseMapper.selectRootList(page, stat,"0" ,departmentId);
+ for (ClassifyAdministration classifyAdministrationEntitie: classifyAdministrations) {
+ classifyAdministrationEntitie.setClassifyAdministrationEntityList(selectConfigListByParentId(classifyAdministrationEntitie.getId().toString(),departmentId));
+ }
+ return classifyAdministrations;
+ }
+
+ @Override
+ public ResultData queryListById(Integer id){
+ if (id.equals(0)){
+ return ResultData.success(baseMapper.selectList(new QueryWrapper<ClassifyAdministration>().lambda()
+ .eq(ClassifyAdministration::getParentId,0)));
+ }
+ ClassifyAdministration classifyAdministration = baseMapper.selectOne(new QueryWrapper<ClassifyAdministration>().lambda()
+ .eq(ClassifyAdministration::getId, id));
+ if (classifyAdministration.getClassifyGrade().equals("1")){
+ return ResultData.success(baseMapper.selectList(new QueryWrapper<ClassifyAdministration>().lambda()
+ .eq(ClassifyAdministration::getParentId,classifyAdministration.getId())));
+ }else if (classifyAdministration.getClassifyGrade().equals("2")){
+ return ResultData.success(transactionEventMapper.queryByClassifyIdList(id.toString(),null));
+ }
+ return ResultData.error();
+ }
+
+ @Override
+ public List<String> selectParent(String parentId) {
+ return baseMapper.selectParent(parentId);
+ }
+
+ @Override
+ public List<ClassifyAdministration> selectParentData(String parentId) {
+ return baseMapper.selectParentData(parentId);
+ }
+
+
+ @Override
+ public int insertConfig(ClassifyAdministration entity) {
+ return baseMapper.insertConfig(entity);
+ }
+
+ @Override
+ public int updateConfig(ClassifyAdministration entity) {
+ return baseMapper.updateConfig(entity);
+ }
+
+ @Override
+ public int deleteConfigById(String Id) {
+ return baseMapper.deleteConfigById(Id);
+ }
+
+ @Override
+ public int countNum(String classifyName,String classifyGrade) {
+ return baseMapper.countNum(classifyName,classifyGrade);
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/ElseAccessoryImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/ElseAccessoryImpl.java
new file mode 100644
index 0000000..e2644ea
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/ElseAccessoryImpl.java
@@ -0,0 +1,47 @@
+package com.dg.core.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.db.gen.entity.ElseAccessoryEntity;
+import com.dg.core.db.gen.mapper.ElseAccessoryMapper;
+import com.dg.core.service.IElseAccessoryService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ElseAccessoryImpl extends ServiceImpl<ElseAccessoryMapper, ElseAccessoryEntity>
+ implements IElseAccessoryService
+{
+
+ @Override
+ public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state,
+ String Name,List<String> ids,String userId) {
+ return baseMapper.selectConfigList(page,state,Name, ids,userId);
+ }
+
+ @Override
+ public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids,String userId) {
+ return baseMapper.selectConfigList(Name,ids,userId);
+ }
+
+ @Override
+ public int insertConfig(ElseAccessoryEntity entity) {
+ return baseMapper.insertConfig(entity);
+ }
+
+ @Override
+ public int updateConfig(ElseAccessoryEntity entity) {
+ return baseMapper.updateConfig(entity);
+ }
+
+ @Override
+ public int deleteConfigById(String Id) {
+ return baseMapper.deleteConfigById(Id);
+ }
+
+ @Override
+ public int countNum(String Name,List<String> ids) {
+ return baseMapper.countNum(Name,ids);
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java
new file mode 100644
index 0000000..a2d416b
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java
@@ -0,0 +1,75 @@
+package com.dg.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.db.gen.entity.GuideEvolveEntity;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.db.gen.mapper.ElseAccessoryMapper;
+import com.dg.core.db.gen.mapper.GuideEvolveMapper;
+import com.dg.core.db.gen.mapper.TransactionEventMapper;
+import com.dg.core.service.IGuideEvolveService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class GuideEvolveImpl extends ServiceImpl<GuideEvolveMapper, GuideEvolveEntity> implements IGuideEvolveService
+{
+
+
+ @Resource
+ private ElseAccessoryMapper elseAccessoryMapper;
+
+ @Resource
+ private TransactionEventMapper transactionEventMapper;
+
+ @Override
+ public List<GuideEvolveEntity> selectConfigList(String guideId,SysUser sysUser) {
+ List<GuideEvolveEntity> guideEvolveEntities;
+ if ((sysUser.getUserType().equals("3")&&sysUser.getIsDivisionHead().equals("2"))||(sysUser.getUserType().equals("4"))){
+ guideEvolveEntities=baseMapper.selectHideList(guideId);
+ }else {
+ guideEvolveEntities = baseMapper.selectConfigList(guideId);
+ }
+ for (GuideEvolveEntity guideEvolveEntity: guideEvolveEntities) {
+ String[] split;
+ if (guideEvolveEntity.getAccessoryId()!=null){
+ split = guideEvolveEntity.getAccessoryId().split(",");
+ guideEvolveEntity.setElseAccessoryEntities( elseAccessoryMapper.selectListByIds(split));
+ }
+ if (guideEvolveEntity.getTransactionId()!=null){
+ split=guideEvolveEntity.getTransactionId().split(",");
+ guideEvolveEntity.setTransactionEvents(transactionEventMapper.selectListByIds(split));
+ }
+ }
+ return guideEvolveEntities;
+ }
+
+ @Override
+ public int insertConfig(GuideEvolveEntity entity) {
+ return baseMapper.insertConfig(entity);
+ }
+
+ @Override
+ public int updateConfig(GuideEvolveEntity entity) {
+ return baseMapper.updateConfig(entity);
+ }
+
+ @Override
+ public int deleteConfigById(String Id) {
+ return baseMapper.deleteConfigById(Id);
+ }
+
+ @Override
+ public int countNum() {
+ return baseMapper.countNum();
+ }
+
+ @Override
+ public int updateGuid() {
+ return baseMapper.updateGuid();
+ }
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
new file mode 100644
index 0000000..cc2b165
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -0,0 +1,502 @@
+package com.dg.core.service.impl;
+
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.*;
+import com.dg.core.db.gen.mapper.*;
+import com.dg.core.db.manual.mapper.util.ConstantPropertiesUtil;
+import com.dg.core.service.IGuideRepairOrderService;
+import com.dg.core.service.ISysSettingsService;
+import com.dg.core.util.SmsUtil;
+import com.dg.core.util.Snowflake;
+import com.dg.core.util.TestDate;
+import com.dg.core.util.WxUtil;
+import com.iceyyy.workday.WorkUtils;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+@Service
+public class GuideRepairOrderServiceImpl extends ServiceImpl<GuideRepairOrderMapper, GuideRepairOrder>
+ implements IGuideRepairOrderService {
+
+ @Resource
+ private TransactionEventMapper transactionEventMapper;
+
+ @Resource
+ private GuideRepairOrderImageMapper guideRepairOrderImageMapper;
+
+ @Resource
+ private SysUserMapper sysUserMapper;
+
+ @Resource
+ private OrganizationChartMapper organizationChartMapper;
+
+ @Resource
+ private GuideEvolveMapper guideEvolveMapper;
+
+ @Resource
+ private AutomessageSysSettingsMapper iSysSettingsMapper;
+
+
+ @Resource
+ private AreaCode2022Mapper areaCode2022Mapper;
+
+
+ @Resource
+ SmsUtil smsUtil;
+
+ @Resource(name = "stringRedisTemplate")
+ private StringRedisTemplate stringRedisTemplate;
+
+ private static WxUtil wxUtil;
+
+
+ @Override
+ public int addOrder(GuideRepairOrder guideRepairOrder) {
+
+ TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().
+ eq(TransactionEvent::getId, guideRepairOrder.getMatterId()));
+ guideRepairOrder.setOrderNum(Long.toString(Snowflake.getId()));
+ guideRepairOrder.setMatterName(transactionEvent.getMatterName());
+ guideRepairOrder.setDepartmentId(transactionEvent.getDepartmentId());
+ guideRepairOrder.setClassifyId(transactionEvent.getClassifyId());
+ List<String> departmentIds = new ArrayList<>();
+ Boolean isAdd = true;//是否能够新建工单
+ List<GuideRepairOrder> guideRepairOrders = baseMapper.selectList(new QueryWrapper<GuideRepairOrder>().lambda()
+ .eq(GuideRepairOrder::getMatterId, guideRepairOrder.getMatterId())
+ .eq(GuideRepairOrder::getConsultContent, guideRepairOrder.getConsultContent()));
+ if (guideRepairOrders.size() == 0) {
+ isAdd = true;
+ } else {
+ for (GuideRepairOrder guideRepair : guideRepairOrders) {
+ if (guideRepair.getState().equals("1") || guideRepair.getState().equals("2") || guideRepair.getState().equals("6") || guideRepair.getState().equals("7")) {
+ isAdd = false;
+ break;
+ }
+ }
+ }
+ if (isAdd) {
+ AreaCode2022 areaCode2022 = areaCode2022Mapper.selectOne(new QueryWrapper<AreaCode2022>().lambda().eq(AreaCode2022::getCode, guideRepairOrder.getAreaCode()));
+ Integer grade=2;
+ if (areaCode2022.getLevel()==2){
+ grade=1;
+ }
+ //自动分配业务代码开始
+ List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByCode(transactionEvent.getDepartmentId(), guideRepairOrder.getAreaCode(),grade);
+ if (organizationChartEntities.size() > 0) {
+ for (OrganizationChartEntity organizationChart : organizationChartEntities) {
+ departmentIds.add(organizationChart.getId().toString());
+ }
+ List<SysUser> sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getId(), transactionEvent.getId() + ",");//获取导半人员
+ if (sysUsers.size() == 0) {//如果此所属地区部门没有导半人员则看其下级地区有没有相关分类导办人员
+ for (OrganizationChartEntity organizationChart : organizationChartEntities) {
+ //获取下级部门
+ List<OrganizationChartEntity> organizationChartEntitiesUser = organizationChartMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda()
+ .eq(OrganizationChartEntity::getParentId, organizationChart.getId().toString()));
+ if (organizationChartEntitiesUser != null)
+ departmentIds = this.getDepartmentIds(organizationChartEntitiesUser, departmentIds);
+ }
+ sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getId(), transactionEvent.getId() + ",");//获取导半人员
+ if (sysUsers.size() == 0) {//如果该所属地区没有导办人员则为获取其上級地区有没有相关分类导办人员
+ List<String> departmentIdsParent = new ArrayList<>();
+ departmentIdsParent.addAll(departmentIds);
+ for (String departmentId : departmentIdsParent) {
+ OrganizationChartEntity organizationChart = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getId, departmentId));
+ OrganizationChartEntity organizationChartParent = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getId, organizationChart.getParentId()));
+ if (organizationChartParent != null) {
+ departmentIds.add(organizationChartParent.getId().toString());
+ }
+ }
+ sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, "," + transactionEvent.getId(), transactionEvent.getId() + ",");//获取导半人员
+ if (sysUsers.size() == 0) {
+ sysUsers = sysUserMapper.selectListByDepartmentId(departmentIds, null, null);//获取导半人员
+ if (sysUsers.size() == 0) {
+ //如果该所属地区没有导办人员则为特殊单据需要手动分配
+ guideRepairOrder.setState("1");
+ }
+ }
+ }
+
+ }
+ if (sysUsers.size() > 0) {//系统分配导办人员
+ SysUser sysUser = sysUsers.get(0);//因为sql用了升序排序所以第一条就是待办结最少的人员之一
+ guideRepairOrder.setState("2");
+ sysUser.setTransactionNum(sysUser.getTransactionNum() + 1);
+ sysUserMapper.updateById(sysUser);
+ guideRepairOrder.setGuideUserId(sysUser.getUserId().toString());
+ guideRepairOrder.setGuideDepartmentId(sysUser.getDepartmentId());
+ guideRepairOrder.setGuideUserPhone(sysUser.getPhonenumber());
+ //新增分配记录
+ GuideEvolveEntity entity = new GuideEvolveEntity();
+ entity.setCreateTime(LocalDateTime.now());
+ entity.setUpdateTime(LocalDateTime.now());
+ entity.setState("8");
+ entity.setDepartmentalId(sysUser.getDepartmentId());
+ entity.setToUserId(guideRepairOrder.getGuideUserId() + "");
+// entity.setFromUserId(guideRepairOrder.getSubmitUserId());
+// entity.setFromDepartmentalId(guideRepairOrder.getGuideDepartmentId());
+ entity.setGuidOrderNum(guideRepairOrder.getOrderNum());
+ //超时时间设置业务开始
+ guideRepairOrder = this.setTimeoutTim(guideRepairOrder);
+ //超时时间设置业务结束
+ //消息推送
+ this.sendGuideRepairOrderSubmit(sysUser.getOpenid(), guideRepairOrder);
+ //短信发送
+ smsUtil.sendSmsSubmitNew(sysUser.getPhonenumber(), sysUser.getUserName());
+ guideEvolveMapper.insertConfig(entity);
+ }
+ } else {//如果该办事指南用户所选所属地区无导半部门则为特殊单据需要手动分配
+ guideRepairOrder.setState("1");
+ }
+ //自动分配业务代码结束
+
+ guideRepairOrder.setCreateTime(LocalDateTime.now());
+ guideRepairOrder.setUpdateTime(LocalDateTime.now());
+ guideRepairOrder.setIsPush(2);
+ transactionEvent.setTransactionNum(transactionEvent.getTransactionNum() + 1);
+ //保存图片地址
+ if (guideRepairOrder.getImages() != null) {
+ String[] images = guideRepairOrder.getImages().split(",");
+ for (String image : images) {
+ GuideRepairOrderImage guideRepairOrderImage = new GuideRepairOrderImage();
+ guideRepairOrderImage.setId(Snowflake.getId());
+ guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum());
+ guideRepairOrderImage.setUrl(image);
+ guideRepairOrderImage.setCreateTime(LocalDateTime.now());
+ guideRepairOrderImage.setType(1);
+ guideRepairOrderImageMapper.insert(guideRepairOrderImage);
+ }
+ }
+ //保存视频地址
+ if (guideRepairOrder.getVideo() != null) {
+ if (guideRepairOrder.getOrderNum() != null) {
+ GuideRepairOrderImage guideRepairOrderImage = new GuideRepairOrderImage();
+ guideRepairOrderImage.setId(Snowflake.getId());
+ guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum());
+ guideRepairOrderImage.setUrl(guideRepairOrder.getVideo());
+ guideRepairOrderImage.setCreateTime(LocalDateTime.now());
+ guideRepairOrderImage.setType(2);
+ guideRepairOrderImageMapper.insert(guideRepairOrderImage);
+ }
+ }
+
+ int ans = baseMapper.insert(guideRepairOrder);
+ int i = transactionEventMapper.updateById(transactionEvent);
+ if (ans > 0 && i > 0)
+ return 1;
+ else
+ return 0;
+ } else {
+ return 0;
+ }
+ }
+
+ public List<String> getDepartmentIds(List<OrganizationChartEntity> organizationChartEntities, List<String> departmentIds) {
+ for (OrganizationChartEntity organizationChart : organizationChartEntities) {
+ departmentIds.add(organizationChart.getId().toString());
+ List<OrganizationChartEntity> organizationChartEntitiesUser = organizationChartMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda()
+ .eq(OrganizationChartEntity::getParentId, organizationChart.getId().toString()));
+ if (organizationChartEntitiesUser != null)
+ departmentIds = this.getDepartmentIds(organizationChartEntitiesUser, departmentIds);
+
+ }
+ return departmentIds;
+ }
+
+ @Override
+ public GuideRepairOrder selectConfigData(String Id, String orderNum) {
+ return baseMapper.selectConfigData(Id, orderNum);
+ }
+
+ @Override
+ public int updateConfig(GuideRepairOrder order) {
+ if (order.getGuideUserId() != null && !order.getGuideUserId().equals("")) {
+ SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getGuideUserId()));
+ order.setGuideUserPhone(sysUser.getPhonenumber());
+ }
+ return baseMapper.updateConfig(order);
+ }
+
+ @Override
+ public List<GuideRepairOrder> selectBySubmitId(String submitUserId) {
+ return baseMapper.selectBySubmitId(submitUserId);
+ }
+
+ @Override
+ public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
+ String matterName, List<String> ids, String status,
+ String guideUserId, String createTimeStartTime,
+ String createTimeTimeEndTime, String classifyId) {
+ return baseMapper.selectConfigList(page, state, matterName, ids, status, guideUserId, createTimeStartTime, createTimeTimeEndTime, classifyId);
+ }
+
+ @Override
+ public List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids, String status,
+ String guideUserId, String createTimeStartTime, String createTimeTimeEndTime, String classifyId) {
+ return baseMapper.selectConfigList(matterName, ids, status, guideUserId, createTimeStartTime, createTimeTimeEndTime, classifyId);
+ }
+
+ @Override
+ public int countConfigList(String matterName, List<String> ids, String status, String guideUserId) {
+ return baseMapper.countConfigList(matterName, ids, status, guideUserId);
+ }
+
+ @Override
+ public int countUser(String userId, String state) {
+ return baseMapper.countUser(userId, state);
+ }
+
+ @Override
+ public int updateSysUserOrderNum(GuideEvolveEntity order) {
+ if (order.getState() != null) {
+ if (order.getState().equals("11")) {
+ SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getToUserId()));
+ GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda()
+ .eq(GuideRepairOrder::getId, order.getGuideId()));
+ if (guideRepairOrder != null) {
+ this.sendGuideRepairOrderSubmit(sysUser.getOpenid(), guideRepairOrder);
+ }
+ //短信发送
+ smsUtil.sendSmsSubmitNew(sysUser.getPhonenumber(), sysUser.getUserName());
+ sysUser.setTransactionNum(sysUser.getTransactionNum() + 1);
+ return sysUserMapper.updateById(sysUser);
+ } else if (order.getState().equals("10")) {
+ SysUser sysUserTo = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getToUserId()));
+ SysUser sysUserFrom = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getFromUserId()));
+ sysUserTo.setTransactionNum(sysUserTo.getTransactionNum() + 1);
+ if (sysUserFrom.getUserType().equals(2)) {
+ sysUserFrom.setTransactionNum(sysUserFrom.getTransactionNum() - 1);
+ sysUserMapper.updateById(sysUserFrom);
+ }
+ GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda()
+ .eq(GuideRepairOrder::getId, order.getGuideId()));
+ //短信发送
+ smsUtil.sendSmsSubmitNew(sysUserTo.getPhonenumber(), sysUserTo.getUserName());
+ if (guideRepairOrder != null) {
+ this.sendGuideRepairOrderSubmit(sysUserTo.getOpenid(), guideRepairOrder);
+ }
+ return sysUserMapper.updateById(sysUserTo);
+ } else if (order.getState().equals("7")) {
+ SysUser sysUserFrom = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getFromUserId()));
+ sysUserFrom.setTransactionNum(sysUserFrom.getTransactionNum() - 1);
+ return sysUserMapper.updateById(sysUserFrom);
+ }
+ }
+ return 0;
+ }
+
+ /**
+ * 1 今天 2昨天 3本月 4本年度 String time
+ *
+ * @param state
+ * @param ids
+ * @return
+ */
+ @Override
+ public int countStatisticsNum(String state, List<String> ids, String time,
+ String isTimeout, String evaluateState,
+ List<String> classifyIds, String serviceState,
+ String guideUserId) {
+ return baseMapper.countStatisticsNum(state, ids, time, isTimeout, evaluateState, classifyIds, serviceState, guideUserId);
+ }
+
+ @Override
+ public List<CountListNum> countListNum(String state, List<String> ids, Integer time) {
+ return baseMapper.countListNum(state, ids, time);
+ }
+
+ @Override
+ public SysUser getSubmitUser(GuideRepairOrder guideRepairOrder) {
+ return sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrder.getSubmitUserId()));
+ }
+
+ @Override
+ public GuideRepairOrder setTimeoutTim(GuideRepairOrder guideRepairOrder) {
+ AutomessageSysSettings automessageSysSettings = iSysSettingsMapper.selectOne(
+ new QueryWrapper<AutomessageSysSettings>().lambda()
+ .eq(AutomessageSysSettings::getSettingName, "系统超时基础设置"));
+ LocalDateTime startTime = LocalDate.now().atTime(0, 0, 0);//今天开始时间
+ LocalDateTime morningStartTime = LocalDate.now().atTime(9, 0, 0);//上午工作开始时间
+ LocalDateTime morningEndTime = LocalDate.now().atTime(12, 0, 0);//上午工作结束时间
+ LocalDateTime afternoonStartTime = LocalDate.now().atTime(13, 30, 0);//下午工作开始时间
+ LocalDateTime afternoonEndTime = LocalDate.now().atTime(17, 0, 0);//下午工作结束时间
+ LocalDateTime endTime = LocalDate.now().atTime(23, 59, 59);//今天结束时间
+ TestDate td = new TestDate();
+ DateTime dateTimeUser = DateTime.now();
+ String format = "YYYYMMdd";
+ String dateTimeToday = dateTimeUser.toString(format);
+ if (!WorkUtils.isWorkendDay(dateTimeToday)) {
+ if (LocalDateTime.now().isAfter(startTime) && LocalDateTime.now().isBefore(morningStartTime)) {//提交时间是上午上班前
+ guideRepairOrder.setTimeoutTime(LocalDate.now().
+ atTime(9 + automessageSysSettings.getTimeoutNotificationNum(), 0, 0));
+ } else if (LocalDateTime.now().isAfter(morningStartTime) && LocalDateTime.now().isBefore(morningEndTime)) {//提交时间在上午工作日内
+ guideRepairOrder.setTimeoutTime(LocalDateTime.now().plusHours(automessageSysSettings.getTimeoutNotificationNum()));
+ } else if (LocalDateTime.now().isAfter(morningEndTime) && LocalDateTime.now().isBefore(afternoonStartTime)) {//提交时间在工作日午休内
+ guideRepairOrder.setTimeoutTime(LocalDate.now().
+ atTime(13 + automessageSysSettings.getTimeoutNotificationNum(), 30, 0));
+ } else if (LocalDateTime.now().isAfter(afternoonStartTime) && LocalDateTime.now().isBefore(afternoonEndTime)) {//提交时间在下午工作日内
+ guideRepairOrder.setTimeoutTime(LocalDateTime.now().plusHours(automessageSysSettings.getTimeoutNotificationNum()));
+ } else if (LocalDateTime.now().isAfter(afternoonEndTime) && LocalDateTime.now().isBefore(endTime)) {//提交时间在下午下班后
+ DateTime dateTime = td.nextWeekDay(dateTimeUser);
+ Calendar calendar = dateTime.toCalendar();
+ LocalDateTime localDateTime = LocalDateTime.of(calendar.get(Calendar.YEAR),
+ calendar.get(Calendar.MONTH) + 1, calendar.get(Calendar.DATE),
+ 9 + automessageSysSettings.getTimeoutNotificationNum(), 0);//设置时间为下一个工作日时间的9点+设置超时时间
+ guideRepairOrder.setTimeoutTime(localDateTime);
+ }
+ } else//当前不是工作日则获取下一个工作日
+ {
+ DateTime dateTime = td.nextWeekDay(dateTimeUser);
+ Calendar calendar = dateTime.toCalendar();
+ LocalDateTime localDateTime = LocalDateTime.of(calendar.get(Calendar.YEAR),
+ calendar.get(Calendar.MONTH) + 1, calendar.get(Calendar.DATE),
+ 9 + automessageSysSettings.getTimeoutNotificationNum(), 0);//设置时间为下一个工作日时间的9点+设置超时时间
+ guideRepairOrder.setTimeoutTime(localDateTime);
+ }
+ return guideRepairOrder;
+ }
+
+ @Override
+ public void sendGuideRepairOrderSubmit(String openid, GuideRepairOrder guideRepairOrder) {
+ WxUtil wxUtil = new WxUtil();
+ String accessToken = "0";
+ try {
+ accessToken = stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ wxUtil.sendGuideRepairOrderSubmit(openid, accessToken, "WggWK_yG7_qfrTj8bQe-2co4ATgpXamLzT1xvrTu4K0", guideRepairOrder);
+// smsUtil.sendSmsOvertime(sysUser.getPhonenumber(),guideRepairOrder.getMatterName());
+ }
+
+ @Override
+ public int deleteConfigById(String Id) {
+ GuideRepairOrder guideRepairOrderDelete = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda().eq(GuideRepairOrder::getId, Id));
+ //删除进展记录
+ guideEvolveMapper.delete(new QueryWrapper<GuideEvolveEntity>().lambda().eq(GuideEvolveEntity::getGuideId, Id));
+ TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrderDelete.getMatterId()));
+ if (transactionEvent.getTransactionNum() > 0) {
+ transactionEvent.setTransactionNum(transactionEvent.getTransactionNum() - 1);
+ }
+ //对应办事指南减一
+ transactionEventMapper.updateById(transactionEvent);
+ SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrderDelete.getGuideUserId()));
+ if (sysUser != null) {
+ //对应导半人员待导半数量建议
+ sysUser.setTransactionNum(sysUser.getTransactionNum() - 1);
+ sysUserMapper.updateById(sysUser);
+ }
+ return baseMapper.deleteConfigById(Id);
+ }
+
+ @Override
+ public ResultData pushOvertimeGuideRepairOrder() {
+ List<GuideRepairOrder> guideRepairOrders = baseMapper.selectOvertime();
+ WxUtil wxUtil = new WxUtil();
+ String accessToken = "0";
+ try {
+ accessToken = stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ for (GuideRepairOrder guideRepairOrder : guideRepairOrders) {
+ List<SysUser> sysUsers = sysUserMapper.selectList(new QueryWrapper<SysUser>().lambda().eq(SysUser::getDepartmentId, guideRepairOrder.getGuideDepartmentId()).eq(SysUser::getIsDivisionHead, 1));
+ if (sysUsers != null && sysUsers.size() > 0) {
+ for (SysUser sysUser : sysUsers) {
+// transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrder.getMatterId()));
+ SysUser sysUserGuideUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrder.getGuideUserId()));
+ if (sysUser != null) {
+ smsUtil.sendSmsOvertimeNew(sysUser.getPhonenumber(), sysUserGuideUser.getUserName());
+ wxUtil.sendGuideRepairOrderOvertime(sysUser.getOpenid(), accessToken, "86JgWHhR8b1XxD72WYqMnndyfkiMtSSoCk9NFMwLEZ8", sysUser);
+ guideRepairOrder.setIsPush(1);
+ guideRepairOrder.setIsTimeout("2");
+ baseMapper.updateById(guideRepairOrder);
+ }
+ }
+ }
+
+ }
+ return ResultData.success();
+ }
+
+ @Override
+ public ResultData pushNoticeTimeRepairOrder(){
+ AutomessageSysSettings automessageSysSettings = iSysSettingsMapper.selectOne(
+ new QueryWrapper<AutomessageSysSettings>().lambda()
+ .eq(AutomessageSysSettings::getSettingName, "系统超时基础设置"));
+ Integer timeoutRemindNum = automessageSysSettings.getTimeoutRemindNum();
+ List<GuideRepairOrder> guideRepairOrders = baseMapper.selectNoticeTime(timeoutRemindNum);
+ for (GuideRepairOrder guideRepairOrder:guideRepairOrders){
+ SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrder.getGuideUserId()));
+ if (sysUser != null) {
+ smsUtil.sendSmsOvertimeRemind(sysUser.getPhonenumber(), sysUser.getUserName());
+ guideRepairOrder.setIsRemindPush(1);
+ baseMapper.updateById(guideRepairOrder);
+ }
+ }
+ return ResultData.success();
+ }
+
+ @Override
+ public int updateEvaluate() {
+ //查找一天没有评价的单据
+ List<GuideRepairOrder> guideRepairOrders = baseMapper.selectEvaluate();
+ for (GuideRepairOrder guideRepairOrder : guideRepairOrders) {
+ guideRepairOrder.setEvaluateState("1");
+ guideRepairOrder.setEvaluateContent("好评");
+ guideRepairOrder.setServiceState(1);
+ guideRepairOrder.setState("3");
+ baseMapper.updateById(guideRepairOrder);
+ //新增默认好评进展
+ GuideEvolveEntity entity = new GuideEvolveEntity();
+ entity.setCreateTime(LocalDateTime.now());
+ entity.setUpdateTime(LocalDateTime.now());
+ entity.setState("12");
+ entity.setFromUserId(guideRepairOrder.getSubmitUserId() + "");
+ entity.setGuideId(guideRepairOrder.getId().toString());
+ guideEvolveMapper.insertConfig(entity);
+
+ }
+ return 0;
+ }
+
+ @Override
+ public ResultData deleteComment(Integer id, SysUser sysUser) {
+ if (sysUser.getUserType().equals("1") || sysUser.getIsDivisionHead().equals("1")) {
+ GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda().eq(GuideRepairOrder::getId, id));
+ if (guideRepairOrder != null && guideRepairOrder.getState().equals("3")) {
+ guideRepairOrder.setIsHideComments(1);
+ baseMapper.updateById(guideRepairOrder);
+ //新增删除评论进展
+ GuideEvolveEntity entity = new GuideEvolveEntity();
+ entity.setCreateTime(LocalDateTime.now());
+ entity.setUpdateTime(LocalDateTime.now());
+ entity.setState("14");
+ entity.setFromUserId(sysUser.getUserId() + "");
+ entity.setGuideId(guideRepairOrder.getId().toString());
+ guideEvolveMapper.insertConfig(entity);
+ baseMapper.updateById(guideRepairOrder);
+ return ResultData.success("删除评论成功");
+ } else {
+ return ResultData.error("已办结的单据才能进行删除评论操作");
+ }
+ } else {
+ return ResultData.error("只能部门领导和超级管理员才能删除评论");
+ }
+
+ }
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java
new file mode 100644
index 0000000..a62f516
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java
@@ -0,0 +1,103 @@
+package com.dg.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.db.gen.entity.ClassifyAdministration;
+import com.dg.core.db.gen.entity.Guidance;
+import com.dg.core.db.gen.entity.GuidePlate;
+import com.dg.core.db.gen.entity.OrganizationEntity;
+import com.dg.core.db.gen.mapper.HomeStatisticsMapper;
+import com.dg.core.service.HomeStatisticsService;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+@Service
+public class HomeStatisticsImpl extends ServiceImpl<HomeStatisticsMapper, GuidePlate>
+ implements HomeStatisticsService
+{
+
+ @Override
+ public List<GuidePlate> guidePlatePeople(List<String> ids) {
+ return baseMapper.guidePlatePeople(ids);
+ }
+
+ @Override
+ public List<GuidePlate> score(List<String> ids) {
+ return baseMapper.score(ids);
+ }
+
+ @Override
+ public List<GuidePlate> timeout(List<String> ids) {
+ return baseMapper.timeout(ids);
+ }
+
+ @Override
+ public List<GuidePlate> tosettled(List<String> ids) {
+ return baseMapper.tosettled(ids);
+ }
+
+ @Override
+ public List<GuidePlate> workunit(List<String> ids) {
+ return baseMapper.workunit(ids);
+ }
+
+ @Override
+ public Integer organizationScore(List<String> ids) {
+ return baseMapper.organizationScore(ids);
+ }
+
+ @Override
+ public Integer organizationNum(List<String> ids) {
+ return baseMapper.organizationNum(ids);
+ }
+
+ @Override
+ public List<OrganizationEntity> getDepartment() {
+ return baseMapper.getDepartment();
+ }
+
+ @Override
+ public List<Guidance> guidanceTransaction(List<String> ids) {
+ return baseMapper.guidanceTransaction(ids);
+ }
+
+ @Override
+ public List<Guidance> guidanceBrowse(List<String> ids) {
+ return baseMapper.guidanceBrowse(ids);
+ }
+
+ @Override
+ public Integer staffNum(List<String> ids) {
+ return baseMapper.staffNum(ids);
+ }
+
+ @Override
+ public Integer countWork(List<String> ids) {
+ return baseMapper.countWork(ids);
+ }
+
+ @Override
+ public int countStatisticsNum(List<String> classifyIds,List<String> ids) {
+ return baseMapper.countStatisticsNum(classifyIds,ids);
+ }
+ @Override
+ public List<ClassifyAdministration> getClassify(String parentId, String classifyGrade) {
+ return baseMapper.getClassify(parentId,classifyGrade);
+ }
+
+ @Override
+ public List<String> countId(String district) {
+ return baseMapper.countId(district);
+ }
+
+ @Override
+ public String reversionRate(String state, String isTimeout) {
+ return baseMapper.reversionRate(state,isTimeout);
+ }
+
+ @Override
+ public int rangeStatistics(List<String> ids) {
+ return baseMapper.rangeStatistics(ids);
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/HuaChengSysUserImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/HuaChengSysUserImpl.java
new file mode 100644
index 0000000..0ee0e73
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/HuaChengSysUserImpl.java
@@ -0,0 +1,29 @@
+package com.dg.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.db.gen.entity.HuaChengSysUser;
+import com.dg.core.db.gen.mapper.HuaChengSysUserMapper;
+import com.dg.core.service.IHuaChengSysUserService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class HuaChengSysUserImpl extends ServiceImpl<HuaChengSysUserMapper, HuaChengSysUser> implements IHuaChengSysUserService
+{
+
+ @Override
+ public List<HuaChengSysUser> selectConfigList() {
+ return baseMapper.selectConfigList();
+ }
+
+ @Override
+ public List<HuaChengSysUser> selectData(String userId,String account,String phone) {
+ return baseMapper.selectData(userId,account,phone);
+ }
+
+ @Override
+ public int selectNum() {
+ return baseMapper.selectNum();
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/IAutomessageSmartConsultingServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/IAutomessageSmartConsultingServiceImpl.java
new file mode 100644
index 0000000..95fc399
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/IAutomessageSmartConsultingServiceImpl.java
@@ -0,0 +1,23 @@
+package com.dg.core.service.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.db.gen.entity.AutomessageSmartConsulting;
+import com.dg.core.db.gen.mapper.AutomessageSmartConsultingMapper;
+import com.dg.core.service.IAutomessageSmartConsultingService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class IAutomessageSmartConsultingServiceImpl extends ServiceImpl<AutomessageSmartConsultingMapper, AutomessageSmartConsulting> implements IAutomessageSmartConsultingService {
+
+ @Override
+ public int add(AutomessageSmartConsulting automessageSmartConsulting){
+ return baseMapper.insert(automessageSmartConsulting);
+ }
+
+ @Override
+ public Long countSmartConsulting(){
+ return baseMapper.selectCount(new QueryWrapper<AutomessageSmartConsulting>().lambda());
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/IRoleMenuImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/IRoleMenuImpl.java
new file mode 100644
index 0000000..ee7fb19
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/IRoleMenuImpl.java
@@ -0,0 +1,33 @@
+package com.dg.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.db.gen.entity.RoleMenuEntity;
+import com.dg.core.db.gen.mapper.RoleMenuEntityMapper;
+import com.dg.core.service.IRoleMenuService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class IRoleMenuImpl extends ServiceImpl<RoleMenuEntityMapper, RoleMenuEntity> implements IRoleMenuService {
+
+ @Override
+ public List<RoleMenuEntity> selectConfigList(String roleId) {
+ return baseMapper.selectConfigList(roleId);
+ }
+
+ @Override
+ public int insertConfig(RoleMenuEntity entity) {
+ return baseMapper.insertConfig(entity);
+ }
+
+ @Override
+ public int updateConfig(RoleMenuEntity entity) {
+ return baseMapper.updateConfig(entity);
+ }
+
+ @Override
+ public int deleteConfigById(String Id) {
+ return baseMapper.deleteConfigById(Id);
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/KeywordImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/KeywordImpl.java
new file mode 100644
index 0000000..23cc982
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/KeywordImpl.java
@@ -0,0 +1,48 @@
+package com.dg.core.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.KeywordEntity;
+import com.dg.core.db.gen.mapper.KeywordMapper;
+import com.dg.core.service.IKeywordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class KeywordImpl extends ServiceImpl<KeywordMapper, KeywordEntity> implements IKeywordService {
+
+
+ @Override
+ public List<KeywordEntity> selectConfigList(IPage<KeywordEntity> page, Integer state) {
+ return baseMapper.selectConfigList(page,state);
+ }
+
+ @Override
+ public KeywordEntity selectConfigData(String Id, String name) {
+ return baseMapper.selectConfigData(Id,name);
+ }
+
+ @Override
+ public int insertConfig(KeywordEntity entity)
+ {
+ return baseMapper.insertConfig(entity);
+ }
+
+ @Override
+ public int updateConfig(KeywordEntity entity) {
+ return baseMapper.updateConfig(entity);
+ }
+
+ @Override
+ public int deleteConfigById(String Id) {
+ return baseMapper.deleteConfigById(Id);
+ }
+
+ @Override
+ public int countNum() {
+ return baseMapper.countNum();
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/MenuImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/MenuImpl.java
new file mode 100644
index 0000000..10fe596
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/MenuImpl.java
@@ -0,0 +1,38 @@
+package com.dg.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.db.gen.entity.MenuEntity;
+import com.dg.core.db.gen.mapper.MenuMapper;
+import com.dg.core.service.IMenuService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class MenuImpl extends ServiceImpl<MenuMapper, MenuEntity> implements IMenuService
+{
+ @Override
+ public List<MenuEntity> selectConfigList() {
+ return baseMapper.selectConfigList();
+ }
+
+ @Override
+ public int insertConfig(MenuEntity entity) {
+ return baseMapper.insertConfig(entity);
+ }
+
+ @Override
+ public int updateConfig(MenuEntity entity) {
+ return baseMapper.updateConfig(entity);
+ }
+
+ @Override
+ public int deleteConfigById(Long Id) {
+ return baseMapper.deleteConfigById(Id);
+ }
+
+ @Override
+ public int countNum() {
+ return baseMapper.countNum();
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java
new file mode 100644
index 0000000..04f1d01
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java
@@ -0,0 +1,245 @@
+package com.dg.core.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.db.gen.entity.OrganizationChartEntity;
+import com.dg.core.db.gen.mapper.OrganizationChartMapper;
+import com.dg.core.service.IOrganizationChartService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class OrganizationChartImpl extends ServiceImpl<OrganizationChartMapper, OrganizationChartEntity>
+ implements IOrganizationChartService
+{
+
+ @Override
+ public List<OrganizationChartEntity> selectConfigList(String parentId,String grade,List<String> ids)
+ {
+ List<OrganizationChartEntity> ocList=baseMapper.selectConfigList(parentId,"1",ids);
+
+ if(ocList==null || ocList.size()<1)
+ {
+ List<String> id=new ArrayList<>();
+ id.add(parentId);
+ ocList=baseMapper.selectConfigList(null,null,id);
+ }
+
+ for (OrganizationChartEntity entity:ocList)
+ {
+ entity.setChild(baseMapper.selectConfigList(entity.getId()+"","",null));
+
+ if (entity.getChild()!=null)
+ {
+ entity.setChild(this.selectConfigList(entity.getId().toString()));
+ }
+ }
+ return ocList;
+ }
+
+ @Override
+ public List<OrganizationChartEntity> selectConfigList(List<String> ids) {
+ List<OrganizationChartEntity> ocList=baseMapper.selectConfigList(null,null,ids);
+ return ocList;
+ }
+
+ @Override
+ public int insertConfig(OrganizationChartEntity entity) {
+ return baseMapper.insertConfig(entity);
+ }
+
+ @Override
+ public int updateConfig(OrganizationChartEntity entity) {
+ return baseMapper.updateConfig(entity);
+ }
+
+ @Override
+ public int deleteConfigById(String Id) {
+ return baseMapper.deleteConfigById(Id);
+ }
+
+ @Override
+ public int countNum() {
+ return baseMapper.countNum();
+ }
+
+
+
+
+ public List<OrganizationChartEntity> selectConfigList(String parentsId) {
+ List<OrganizationChartEntity> list =baseMapper.selectConfigList(parentsId,"",null);
+ for (OrganizationChartEntity sysStreet:list) {
+ sysStreet.setChild(baseMapper.selectConfigList(sysStreet.getId().toString(),"",null));
+ if (sysStreet.getChild()!=null)
+ {
+ sysStreet.setChild(this.selectConfigList(sysStreet.getId().toString()));
+ }
+
+ }
+ return list;
+ }
+
+ @Override
+ public List<OrganizationChartEntity> selectList(){
+ return baseMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda().orderByAsc(OrganizationChartEntity::getGrade));
+ }
+
+ @Override
+ public OrganizationChartEntity selectConfigById(String id) {
+ return baseMapper.selectConfigById(id);
+ }
+
+ @Override
+ public List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state,
+ String organizationName,List<String> ids) {
+ return baseMapper.queryList(page,state,organizationName,ids);
+ }
+
+ @Override
+ public int countList(String organizationName,List<String> ids) {
+ return baseMapper.countList(organizationName,ids);
+ }
+
+
+ @Override
+ public List<OrganizationChartEntity> selectParentList(String parentId, String grade) {
+ return baseMapper.selectConfigList(parentId,grade,null);
+ }
+
+ /**
+ * 递归获取id 内部使用
+ * @param id
+ * @return
+ */
+
+ @Override
+ public List<String> getIds(String id)
+ {
+ List<String> ids=new ArrayList<>();
+ List<OrganizationChartEntity> lists = baseMapper.selectConfigList(id,"",null);
+ if(lists.size()<1)
+ {
+ lists.add(baseMapper.selectConfigById(id));
+ }
+ ids=disposestreetId(lists);
+ if(ids.size()<1)
+ {
+ return null;
+ }
+ ids.add(id);
+ return ids;
+ }
+
+ @Override
+ public List<String> getDepartmentId(String id){
+ String parentId = parentId(id);
+ List<String> departmentIds=new ArrayList<>();
+ departmentIds.add(parentId);
+ List<OrganizationChartEntity> organizationChartEntities = baseMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getParentId, parentId));
+ for (OrganizationChartEntity organizationChart :organizationChartEntities){
+ departmentIds.add(organizationChart.getId().toString());
+ departmentIds=getDepartmentIds(organizationChart.getId().toString(),departmentIds);
+ }
+ return departmentIds;
+ }
+
+ @Override
+ public String getStairId(String id)
+ {
+ OrganizationChartEntity entity= baseMapper.selectConfigById(id);
+ if(entity!=null && StringUtils.isEmpty(entity.getParentId()))
+ {
+ return entity.getId()+"";
+ }
+ else
+ {
+ return getParentId(entity.getParentId());
+ }
+ }
+
+
+ /**
+ * 根据id 获取一级部门id 递归
+ * @param id
+ * @return
+ */
+ public String getParentId(String id)
+ {
+ String ultimatelyId;
+ OrganizationChartEntity entity= baseMapper.selectConfigById(id);
+ if(entity==null)
+ {
+ return id;
+ }
+
+ if(!StringUtils.isEmpty(entity.getParentId()))
+ {
+ ultimatelyId= getParentId(entity.getParentId());
+ return ultimatelyId;
+ }
+ else
+ {
+ ultimatelyId=entity.getId()+"";
+ return ultimatelyId;
+ }
+ }
+
+
+
+ public String parentId(String id){
+ String parentId=id;
+ OrganizationChartEntity organizationChart = baseMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getId, id));
+ if (organizationChart.getParentId().length()>0){
+ parentId=parentId(organizationChart.getParentId());
+ }
+ return parentId;
+ }
+
+ public List<String> getDepartmentIds(String id,List<String> departmentIds){
+ List<OrganizationChartEntity> organizationChartEntities = baseMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getParentId, id));
+ if (organizationChartEntities.size()==0){
+ return departmentIds;
+ }
+ else {
+ for (OrganizationChartEntity organizationChart :organizationChartEntities){
+ departmentIds.add(organizationChart.getId().toString());
+ departmentIds=getDepartmentIds(organizationChart.getId().toString(),departmentIds);
+ }
+ }
+ return departmentIds;
+ }
+
+
+
+ //递归取id
+ private List<String> disposestreetId(List<OrganizationChartEntity> lists)
+ {
+ List<String> ids=new ArrayList<>();
+ if(lists==null || lists.size()<1)
+ {
+ return ids;
+ }
+
+ for (OrganizationChartEntity sysStreet:lists)
+ {
+ if(sysStreet!=null&&sysStreet.getId()!=null)
+ {
+ if(sysStreet.getChild()!=null && sysStreet.getChild().size()>0)
+ {
+ ids.addAll(disposestreetId(sysStreet.getChild()));
+ }
+ else
+ {
+ ids.add(sysStreet.getId()+"");
+ }
+ }
+ }
+ return ids;
+ }
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java
new file mode 100644
index 0000000..924cbe1
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java
@@ -0,0 +1,97 @@
+package com.dg.core.service.impl;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.db.gen.entity.GuideEvolveEntity;
+import com.dg.core.db.gen.entity.ReplyTemplateEntity;
+import com.dg.core.db.gen.mapper.ElseAccessoryMapper;
+import com.dg.core.db.gen.mapper.ReplyTemplateMapper;
+import com.dg.core.db.gen.mapper.TransactionEventMapper;
+import com.dg.core.service.IReplyTemplateService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class ReplyTemplateImpl extends ServiceImpl<ReplyTemplateMapper, ReplyTemplateEntity> implements IReplyTemplateService
+{
+
+ @Resource
+ private ElseAccessoryMapper elseAccessoryMapper;
+
+ @Resource
+ private TransactionEventMapper transactionEventMapper;
+
+ @Override
+ public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page,
+ Integer state,String Name,List<String> ids,String userId) {
+ return baseMapper.selectConfigList(page,state,Name,ids,userId);
+ }
+
+ @Override
+ public ReplyTemplateEntity selectConfigData(String Id) {
+ ReplyTemplateEntity replyTemplateEntity = baseMapper.selectConfigData(Id);
+ if (replyTemplateEntity!=null)
+ {
+ if(!StringUtils.isEmpty(replyTemplateEntity.getAccessoryId()))
+ {
+ if(replyTemplateEntity.getAccessoryId().indexOf(",")<0)
+ {
+ String[] split=new String[]{replyTemplateEntity.getAccessoryId()};
+ replyTemplateEntity.setElseAccessoryEntityList( elseAccessoryMapper.selectListByIds(split));
+ }
+ else
+ {
+ String[] split;
+ split = replyTemplateEntity.getAccessoryId().split(",");
+ replyTemplateEntity.setElseAccessoryEntityList( elseAccessoryMapper.selectListByIds(split));
+ }
+ }
+
+
+ if (!StringUtils.isEmpty(replyTemplateEntity.getGuidance())){
+
+ if(replyTemplateEntity.getGuidance().indexOf(",")<0)
+ {
+ String[] split=new String[]{replyTemplateEntity.getGuidance()};
+ replyTemplateEntity.setTransactionEventList(transactionEventMapper.selectListByIds(split));
+ }
+ else
+ {
+ String[] split;
+ split = replyTemplateEntity.getGuidance().split(",");
+ replyTemplateEntity.setTransactionEventList(transactionEventMapper.selectListByIds(split));
+ }
+
+
+ }
+ return replyTemplateEntity;
+ }
+ else {
+ return null;
+ }
+ }
+
+ @Override
+ public int insertConfig(ReplyTemplateEntity entity) {
+ return baseMapper.insertConfig(entity);
+ }
+
+ @Override
+ public int updateConfig(ReplyTemplateEntity entity) {
+ return baseMapper.updateConfig(entity);
+ }
+
+ @Override
+ public int deleteConfigById(String Id) {
+ return baseMapper.deleteConfigById(Id);
+ }
+
+ @Override
+ public int countNum(String Name,List<String> ids) {
+ return baseMapper.countNum(Name,ids);
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/RoleManagementImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/RoleManagementImpl.java
new file mode 100644
index 0000000..0a33994
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/RoleManagementImpl.java
@@ -0,0 +1,38 @@
+package com.dg.core.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.db.gen.entity.RoleManagementEntity;
+import com.dg.core.db.gen.mapper.RoleManagementMapper;
+import com.dg.core.service.IRoleManagementService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class RoleManagementImpl extends ServiceImpl<RoleManagementMapper, RoleManagementEntity> implements IRoleManagementService {
+ @Override
+ public List<RoleManagementEntity> selectConfigList(IPage<RoleManagementEntity> page, Integer state,String name) {
+ return baseMapper.selectConfigList(page,state,name);
+ }
+
+ @Override
+ public int insertConfig(RoleManagementEntity entity) {
+ return baseMapper.insertConfig(entity);
+ }
+
+ @Override
+ public int updateConfig(RoleManagementEntity entity) {
+ return baseMapper.updateConfig(entity);
+ }
+
+ @Override
+ public int deleteConfigById(String Id) {
+ return baseMapper.deleteConfigById(Id);
+ }
+
+ @Override
+ public int countNum(String name) {
+ return baseMapper.countNum(name);
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/SlideshowServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/SlideshowServiceImpl.java
new file mode 100644
index 0000000..df8cddb
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/SlideshowServiceImpl.java
@@ -0,0 +1,82 @@
+package com.dg.core.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.ClassifyAdministration;
+import com.dg.core.db.gen.entity.Slideshow;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.db.gen.mapper.SlideshowMapper;
+import com.dg.core.service.ISlideshowService;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class SlideshowServiceImpl extends ServiceImpl<SlideshowMapper, Slideshow> implements ISlideshowService {
+
+
+ @Override
+ public List<Slideshow> selectConfigList(IPage<SysUser> page, Integer state) {
+ return null;
+ }
+
+ @Override
+ public List<Slideshow> selectList() {
+ return baseMapper.selectList(new QueryWrapper<Slideshow>().lambda());
+ }
+
+ @Override
+ public Slideshow queryById(Integer id) {
+ return baseMapper.selectOne(new QueryWrapper<Slideshow>().lambda().eq(Slideshow::getId, id));
+ }
+
+ @Override
+ public ResultData add(Slideshow slideshow) {
+ if (slideshow.getUrl() == null || slideshow.getUrl() == "")
+ return ResultData.error("图片地址不能为空");
+ if (slideshow.getLinkType() == null)
+ return ResultData.error("跳转链接类型不能为空");
+ if (slideshow.getLinkType().equals(2)) {
+ if (slideshow.getTitle() == null || slideshow.getTitle() == "")
+ return ResultData.error("类型为富文本时,标题不能为空");
+ if (slideshow.getContent() == null || slideshow.getContent() == "")
+ return ResultData.error("类型为富文本时,富文本内容不能为空");
+ }
+ if (slideshow.getLinkType().equals(3) && (slideshow.getLink() == null || slideshow.getLink() == ""))
+ return ResultData.error("类型为微信文章时,文章链接容不能为空");
+ slideshow.setCreateTime(LocalDateTime.now());
+ return ResultData.success(baseMapper.insert(slideshow));
+ }
+
+ @Override
+ public ResultData update(Slideshow slideshow) {
+ if (slideshow.getUrl() == null || slideshow.getUrl() == "")
+ return ResultData.error("图片地址不能为空");
+ if (slideshow.getLinkType() == null)
+ return ResultData.error("跳转链接类型不能为空");
+ if (slideshow.getLinkType().equals(2)) {
+ if (slideshow.getTitle() == null || slideshow.getTitle() == "")
+ return ResultData.error("类型为富文本时,标题不能为空");
+ if (slideshow.getContent() == null || slideshow.getContent() == "")
+ return ResultData.error("类型为富文本时,富文本内容不能为空");
+ }
+ if (slideshow.getLinkType().equals(3) && (slideshow.getLink() == null || slideshow.getLink() == ""))
+ return ResultData.error("类型为微信文章时,文章链接容不能为空");
+ return ResultData.success(baseMapper.updateById(slideshow));
+
+ }
+
+ @Override
+ public ResultData delete(Integer id) {
+ int i = baseMapper.deleteById(id);
+ if (i > 0)
+ return ResultData.success();
+ else
+ return ResultData.error();
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/SysSettingsServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/SysSettingsServiceImpl.java
new file mode 100644
index 0000000..392a4a7
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/SysSettingsServiceImpl.java
@@ -0,0 +1,45 @@
+package com.dg.core.service.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.AutomessageSysSettings;
+import com.dg.core.db.gen.entity.AutomessageSysSettingsRecord;
+import com.dg.core.db.gen.mapper.AutomessageSysSettingsMapper;
+import com.dg.core.db.gen.mapper.AutomessageSysSettingsRecordMapper;
+import com.dg.core.service.ISysSettingsService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+
+@Service
+public class SysSettingsServiceImpl extends ServiceImpl<AutomessageSysSettingsMapper, AutomessageSysSettings> implements ISysSettingsService {
+
+ @Resource
+ private AutomessageSysSettingsRecordMapper automessageSysSettingsRecordMapper;
+
+ @Override
+ public ResultData selectByName(String settingName){
+ AutomessageSysSettings automessageSysSettings = baseMapper.selectOne(
+ new QueryWrapper<AutomessageSysSettings>().lambda()
+ .eq(AutomessageSysSettings::getSettingName,settingName));
+ return ResultData.success(automessageSysSettings);
+ }
+
+ @Override
+ public ResultData update(AutomessageSysSettings automessageSysSettings){
+ AutomessageSysSettingsRecord automessageSysSettingsRecord=new AutomessageSysSettingsRecord();
+ automessageSysSettingsRecord.setSettingId(automessageSysSettings.getId());
+ automessageSysSettingsRecord.setCreateUserId(automessageSysSettings.getUpdateUserId());
+ automessageSysSettingsRecord.setCreateTime(LocalDateTime.now());
+ int i = baseMapper.updateById(automessageSysSettings);
+ if (i>0){
+ return ResultData.success(automessageSysSettingsRecordMapper.insert(automessageSysSettingsRecord));
+ }else {
+ return ResultData.error();
+ }
+
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/SysUserRecordServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/SysUserRecordServiceImpl.java
new file mode 100644
index 0000000..c69de5f
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/SysUserRecordServiceImpl.java
@@ -0,0 +1,66 @@
+package com.dg.core.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.AutomessageSysUserRecord;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.db.gen.mapper.AutomessageSysUserRecordMapper;
+import com.dg.core.db.gen.mapper.SysUserMapper;
+import com.dg.core.service.ISysUserRecordService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Service
+public class SysUserRecordServiceImpl extends ServiceImpl<AutomessageSysUserRecordMapper, AutomessageSysUserRecord> implements ISysUserRecordService {
+
+ @Resource
+ private SysUserMapper sysUserMapper;
+
+ @Override
+ public ResultData add(SysUser sysUser){
+ if (sysUser!=null){
+ LocalDateTime startTime = LocalDate.now().atTime(0, 0, 0);
+ LocalDateTime endTime = LocalDate.now().atTime(23, 59, 59);
+ AutomessageSysUserRecord automessageSysUserRecord = baseMapper.selectOne(new QueryWrapper<AutomessageSysUserRecord>()
+ .lambda().eq(AutomessageSysUserRecord::getUserId, sysUser.getUserId())
+ .orderByDesc(AutomessageSysUserRecord::getCreateTime)
+ .last("limit 1"));
+ //判断上次访问时间是不是今天 如果是今天不增加浏览次数
+ if (automessageSysUserRecord==null||(!(automessageSysUserRecord.getCreateTime().isAfter(startTime)&&automessageSysUserRecord.getCreateTime().isBefore(endTime)))) {
+ AutomessageSysUserRecord automessageSysUserRecordNew = new AutomessageSysUserRecord();
+ automessageSysUserRecordNew.setUserId(sysUser.getUserId());
+ automessageSysUserRecordNew.setCreateTime(LocalDateTime.now());
+ sysUser.setLoginDate(LocalDateTime.now());
+ sysUserMapper.updateById(sysUser);
+ return ResultData.success(baseMapper.insert(automessageSysUserRecordNew));
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public ResultData selectUserRecordCount() {
+ return ResultData.success(baseMapper.selectUserRecordCount());
+ }
+
+ @Override
+ public ResultData selectByDateType(Integer dateType) {
+ if (dateType.equals(1))
+ return ResultData.success(baseMapper.selectByDay());
+ if (dateType.equals(2))
+ return ResultData.success(baseMapper.selectByMonth());
+ if (dateType.equals(3))
+ return ResultData.success(baseMapper.selectByYear());
+ return null;
+ }
+
+ @Override
+ public Integer deleteDistinct() {
+ return baseMapper.deleteDistinct();
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
new file mode 100644
index 0000000..41b3628
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
@@ -0,0 +1,326 @@
+package com.dg.core.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.ResultData;
+import com.dg.core.db.gen.entity.HuaChengSysUser;
+import com.dg.core.db.gen.entity.OrganizationChartEntity;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.db.gen.mapper.OrganizationChartMapper;
+import com.dg.core.db.gen.mapper.SysUserMapper;
+import com.dg.core.manager.TokenManager;
+import com.dg.core.service.IHuaChengSysUserService;
+import com.dg.core.service.ISysUserService;
+import com.dg.core.util.SmsUtil;
+import com.dg.core.util.Snowflake;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService
+{
+
+ @Resource
+ SmsUtil smsUtil;
+
+ @Resource
+ RedisTemplate<String, Object> redisTemplate;
+
+ @Autowired
+ TokenManager tokenManager;
+
+ @Resource
+ private OrganizationChartMapper organizationChartMapper;
+
+ /**
+ * 花城e+用户接口
+ */
+ @Autowired
+ IHuaChengSysUserService iHuaChengSysUserService;
+
+ @Override
+ public SysUser getUserByAccount(String account) {
+ baseMapper.setGroup();
+ SysUser sysUsers = baseMapper.getUserByAccount(account);
+ return sysUsers;
+ }
+
+ @Override
+ public ResultData smsSend(SysUser user){
+ baseMapper.setGroup();
+ return smsUtil.sendSmsNew(user.getPhonenumber());
+
+ }
+
+ @Override
+ public ResultData loginByAccount(String phonenumber, String code){
+ baseMapper.setGroup();
+ String code1 = redisTemplate.opsForValue().get(phonenumber) + "";
+
+ SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
+ if (sysUser==null){
+ //查询花城e+是否存在此用户
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("","",phonenumber);
+ HuaChengSysUser huaChengSysUser=null;
+
+ if( list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
+ if(huaChengSysUser==null)
+ {
+ SysUser newUser = new SysUser();
+ newUser.setUserId(Snowflake.getId()+"");
+ newUser.setLoginName(phonenumber);
+ newUser.setUserName(phonenumber.substring(0,3)+"xxxx"+phonenumber.substring(7,11)+"用户");
+ newUser.setUserType("3");
+ newUser.setPhonenumber(phonenumber);
+ newUser.setSex("1");
+ newUser.setCreateTime(LocalDateTime.now());
+ newUser.setUpdateTime(LocalDateTime.now());
+ baseMapper.insertConfig(newUser);
+ }
+ else
+ {
+ SysUser newUser = new SysUser();
+ newUser.setUserId(huaChengSysUser.getUserId()+"");
+ newUser.setLoginName(huaChengSysUser.getPhone());
+ newUser.setUserName(huaChengSysUser.getNickName());
+ newUser.setUserType("3");
+ newUser.setPhonenumber(huaChengSysUser.getPhone());
+ newUser.setSex(huaChengSysUser.getSex());
+ newUser.setAvatar(huaChengSysUser.getImageUrl());
+ newUser.setCreateTime(LocalDateTime.now());
+ newUser.setUpdateTime(LocalDateTime.now());
+ newUser.setOpenid(huaChengSysUser.getOpenid());
+ baseMapper.insertConfig(newUser);
+ }
+ }
+
+ if (code.equals(code1)) {
+ sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
+ if (sysUser!=null){
+ String token = tokenManager.getTokenByUserId(sysUser.getUserId());
+// String token = tokenManager.createToken(user.getUserId(), user.getRoleId());
+ System.out.println("token "+token);
+ if (token == null) {
+ //生成一个token，保存用户登录状态
+ token = tokenManager.createToken(sysUser.getUserId(), sysUser.getUserId());
+ }
+
+ sysUser.setLoginDate(LocalDateTime.now());
+ //更新登录时间
+ this.updateConfig(sysUser);
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("token", token);
+ map.put("userId", sysUser.getUserId());
+ map.put("userName", sysUser.getUserName());
+
+ return ResultData.success(map);
+ }
+ else {
+ return ResultData.error("验证码错误");
+ }
+
+ }
+ return ResultData.error("验证码错误");
+
+ }
+
+ @Override
+ public List<SysUser> selectListByDepartmentId(String departmentId, String classifyId) {
+ baseMapper.setGroup();
+ List<String> departmentIds=new ArrayList<>();
+ departmentIds.add(departmentId);
+ List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda()
+ .eq(OrganizationChartEntity::getParentId, departmentId));
+ if (organizationChartEntities!=null){
+ for (OrganizationChartEntity organizationChart:organizationChartEntities) {
+ departmentIds.add(organizationChart.getId().toString());
+ List<OrganizationChartEntity> organizationChartEntitiesUser = organizationChartMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda()
+ .eq(OrganizationChartEntity::getParentId, organizationChart.getId().toString()));
+ if (organizationChartEntitiesUser!=null)
+ departmentIds=this.getDepartmentIds(organizationChartEntitiesUser,departmentIds);
+ }
+ }
+ if (classifyId==null)
+ return baseMapper.selectListByDepartmentId(departmentIds,null,null);
+ else
+ return baseMapper.selectListByDepartmentId(departmentIds,","+classifyId,classifyId+",");
+ }
+
+ @Override
+ public ResultData loginByPhonenumber(String phonenumber)
+ {
+ baseMapper.setGroup();
+ SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
+ if (sysUser==null){
+ //查询花城e+是否存在此用户
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("","",phonenumber);
+ HuaChengSysUser huaChengSysUser=null;
+
+ if(list!=null || list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
+ SysUser newUser = new SysUser();
+ if(huaChengSysUser==null)
+ {
+ newUser.setUserId(Snowflake.getId()+"");
+ newUser.setLoginName(phonenumber);
+ newUser.setUserName(phonenumber.substring(0,3)+"xxxx"+phonenumber.substring(7,11)+"用户");
+ newUser.setUserType("3");
+ newUser.setPhonenumber(phonenumber);
+ newUser.setSex("1");
+ newUser.setCreateTime(LocalDateTime.now());
+ newUser.setUpdateTime(LocalDateTime.now());
+ baseMapper.insertConfig(newUser);
+ }
+ else
+ {
+ newUser.setUserId(huaChengSysUser.getUserId());
+ newUser.setLoginName(huaChengSysUser.getPhone());
+ newUser.setUserName(huaChengSysUser.getNickName());
+ newUser.setUserType("3");
+ newUser.setPhonenumber(huaChengSysUser.getPhone());
+ newUser.setSex(huaChengSysUser.getSex());
+ newUser.setAvatar(huaChengSysUser.getImageUrl());
+ newUser.setCreateTime(LocalDateTime.now());
+ newUser.setUpdateTime(LocalDateTime.now());
+ newUser.setOpenid(huaChengSysUser.getOpenid());
+ baseMapper.insertConfig(newUser);
+ }
+
+ String token = tokenManager.getTokenByUserId(newUser.getUserId());
+// String token = tokenManager.createToken(user.getUserId(), user.getRoleId());
+ System.out.println("token " + token);
+ if (token == null) {
+ //生成一个token，保存用户登录状态
+ token = tokenManager.createToken(newUser.getUserId(), newUser.getUserId());
+ }
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("token", token);
+ map.put("userId", newUser.getUserId());
+ map.put("userName", newUser.getUserName());
+
+ return ResultData.success(map);
+
+ }
+ else
+ {
+ String token = tokenManager.getTokenByUserId(sysUser.getUserId());
+// String token = tokenManager.createToken(user.getUserId(), user.getRoleId());
+ System.out.println("token " + token);
+ if (token == null) {
+ //生成一个token，保存用户登录状态
+ token = tokenManager.createToken(sysUser.getUserId(), sysUser.getUserId());
+ }
+
+ sysUser.setLoginDate(LocalDateTime.now());
+ //更新登录时间
+ this.updateConfig(sysUser);
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("token", token);
+ map.put("userId", sysUser.getUserId());
+ map.put("userName", sysUser.getUserName());
+
+ return ResultData.success(map);
+ }
+ }
+
+ @Override
+ public List<SysUser> queryList(Integer userType,String keyWord) {
+ baseMapper.setGroup();
+ return baseMapper.queryList(userType,keyWord);
+ }
+
+ @Override
+ public void setGroup() {
+ baseMapper.setGroup();
+ }
+
+ public List<String> getDepartmentIds( List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){
+ for (OrganizationChartEntity organizationChart:organizationChartEntities) {
+ departmentIds.add(organizationChart.getId().toString());
+ List<OrganizationChartEntity> organizationChartEntitiesUser = organizationChartMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda()
+ .eq(OrganizationChartEntity::getParentId, organizationChart.getId().toString()));
+ if (organizationChartEntitiesUser!=null)
+ departmentIds=this.getDepartmentIds(organizationChartEntitiesUser,departmentIds);
+
+ }
+ return departmentIds;
+ }
+
+ @Override
+ public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName,List<String> ids,String isDivisionHead) {
+ baseMapper.setGroup();
+ return baseMapper.selectConfigList(page, state,userType,userName,ids,isDivisionHead);
+ }
+
+ @Override
+ public SysUser selectData(String userId,String phonenumber,String loginName) {
+ baseMapper.setGroup();
+ return baseMapper.selectData(userId,phonenumber,loginName);
+ }
+
+
+ /**
+ * 新增聊天记录
+ *
+ * @param config 参数配置信息
+ * @return 结果
+ */
+ public int insertConfig(SysUser config)
+ {
+ return baseMapper.insertConfig(config);
+ }
+
+ /**
+ * 更新聊天记录
+ *
+ * @param config 参数配置信息
+ * @return 结果
+ */
+ public int updateConfig(SysUser config)
+ {
+ return baseMapper.updateConfig(config);
+ }
+
+ /**
+ * 删除聊天记录
+ *
+ * @param id 聊天记录主键id
+ * @return 结果
+ */
+ public int deleteConfigById(String id)
+ {
+ return baseMapper.deleteConfigById(id);
+ }
+
+ @Override
+ public int selectNum(String userType,String userName,List<String> ids,String isDivisionHead) {
+ return baseMapper.selectNum(userType,userName,ids,isDivisionHead);
+ }
+
+
+
+
+
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
new file mode 100644
index 0000000..d235426
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
@@ -0,0 +1,435 @@
+package com.dg.core.service.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.db.gen.entity.*;
+import com.dg.core.db.gen.mapper.*;
+import com.dg.core.db.manual.pojo.QueryResults;
+import com.dg.core.db.manual.pojo.RecommendResult;
+import com.dg.core.db.manual.pojo.Search;
+import com.dg.core.service.ITransactionEventService;
+
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.io.InputStream;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class TransactionEventImpl extends ServiceImpl<TransactionEventMapper, TransactionEvent> implements ITransactionEventService {
+
+ @Resource
+ private OrganizationChartMapper organizationChartMapper;
+
+ @Resource
+ private KeywordMapper keywordMapper;
+
+ @Resource
+ private AutomessageTransactionEventInterviewMapper automessageTransactionEventInterviewMapper;
+
+
+ @Resource
+ private GuideRepairOrderMapper guideRepairOrderMapper;
+
+
+ @Resource
+ private AutomessagePolicyDocumentsMapper automessagePolicyDocumentsMapper;
+
+ @Override
+ public TransactionEvent selectConfigData(String Id, SysUser sysUser) {
+ TransactionEvent transactionEvent = baseMapper.selectConfigData(Id);
+ //如果当前没有登录用户则不增加浏览次数
+ if (sysUser != null) {
+ LocalDateTime startTime = LocalDate.now().atTime(0, 0, 0);
+ LocalDateTime endTime = LocalDate.now().atTime(23, 59, 59);
+ AutomessageTransactionEventInterview automessageTransactionEventInterview = automessageTransactionEventInterviewMapper.selectOne(new QueryWrapper<AutomessageTransactionEventInterview>()
+ .lambda().eq(AutomessageTransactionEventInterview::getTransactionEventId, Id)
+ .eq(AutomessageTransactionEventInterview::getUserId, sysUser.getUserId())
+ .orderByDesc(AutomessageTransactionEventInterview::getInterviewTime)
+ .last("limit 1"));
+ transactionEvent.setQueryTime(LocalDateTime.now());
+ //判断上次访问时间是不是今天 如果是今天不增加浏览次数
+ if (automessageTransactionEventInterview == null || (!(transactionEvent.getQueryTime().isAfter(startTime) && transactionEvent.getQueryTime().isBefore(endTime)))) {
+ transactionEvent.setBrowseNum(transactionEvent.getBrowseNum() + 1);
+ baseMapper.updateById(transactionEvent);
+ AutomessageTransactionEventInterview automessageTransactionEventInterviewNew =
+ new AutomessageTransactionEventInterview();
+ automessageTransactionEventInterviewNew.setTransactionEventId(Integer.valueOf(Id));
+ automessageTransactionEventInterviewNew.setUserId(new Long(sysUser.getUserId()));
+ automessageTransactionEventInterviewNew.setInterviewTime(LocalDateTime.now());
+ automessageTransactionEventInterviewMapper.insert(automessageTransactionEventInterviewNew);
+ }
+ }
+ return transactionEvent;
+ }
+
+ @Override
+ public List<TransactionEvent> selectConfigList(IPage<TransactionEvent> page, Integer state,
+ String keyword, String classifyGrade, List<String> ids) {
+ return baseMapper.selectConfigList(page, state, keyword, classifyGrade, ids);
+ }
+
+ @Override
+ public List<TransactionEvent> selectConfigList(String keyword, String classifyGrade, List<String> ids) {
+ return baseMapper.selectConfigList(keyword, classifyGrade, ids);
+ }
+
+ @Override
+ public int insertConfig(TransactionEvent entity) {
+ return baseMapper.insertConfig(entity);
+ }
+
+ @Override
+ public int updateConfig(TransactionEvent entity) {
+ return baseMapper.updateConfig(entity);
+ }
+
+ @Override
+ public int deleteConfigById(String Id) {
+ List<GuideRepairOrder> guideRepairOrders = guideRepairOrderMapper
+ .selectList(new QueryWrapper<GuideRepairOrder>().lambda().eq(GuideRepairOrder::getMatterId, Id));
+ if (guideRepairOrders.size() == 0) {
+ return baseMapper.deleteConfigById(Id);
+ }
+ return 0;
+ }
+
+ @Override
+ public int countNum(String matterAndUser, String classifyGrade, List<String> ids) {
+ return baseMapper.countNum(matterAndUser, classifyGrade, ids);
+ }
+
+ @Override
+ public QueryResults queryMatterNameList(IPage<Search> page, Integer state, Integer recommendSize, String keyWord) {
+ QueryResults queryResults = new QueryResults();
+ List<Search> searches = baseMapper.selectSearch(page, state, keyWord);
+ queryResults.setSearchList(searches);
+ List<Search> searchesAssociate = baseMapper.selectSearchAssociate(page, recommendSize, keyWord);
+ queryResults.setTransactionEventList(searchesAssociate);
+ queryResults.setKeywordEntityList(keywordMapper.selectByName(keyWord));
+ queryResults.setTotal((baseMapper.selectSearch(keyWord).size()) + (baseMapper.selectSearchAssociate(keyWord).size()));
+ List<TransactionEvent> transactionEventEntities = baseMapper.queryMatterNameList(keyWord, null);
+ List<String> list = new ArrayList<>();
+ for (TransactionEvent transactionEvent : transactionEventEntities) {
+ if (transactionEvent.getAssociateNames() != null) {
+ String[] associateNames = transactionEvent.getAssociateNames().split(",");
+ for (String associateName : associateNames) {
+ list.add(associateName);
+ }
+ }
+ }
+ List<KeywordEntity> keywordEntityList = new ArrayList<>();
+
+ String[] keywords = list.stream().distinct().collect(Collectors.joining(",")).split(",");//去重
+ for (String keyword : keywords) {
+ if (keyword != null && !keyword.equals("")) {
+ KeywordEntity keywordEntity = new KeywordEntity();
+ keywordEntity.setName(keyword);
+ keywordEntityList.add(keywordEntity);
+ }
+ }
+ queryResults.setKeywordAssociationList(keywordEntityList);
+ return queryResults;
+ }
+
+ @Override
+ public QueryResults queryMatterNameList(String keyWord) {
+ QueryResults queryResults = new QueryResults();
+ List<Search> searches = baseMapper.selectSearchList(keyWord);
+ for (Search search : searches) {
+ search.setTransactionEventList(baseMapper.queryMatterNameList(keyWord, search.getClassifyId().toString()));
+ }
+ queryResults.setOrganizationChartEntityList(organizationChartMapper.selectByKeyWord(keyWord));
+ queryResults.setSearchList(searches);
+ List<Search> searchesAssociate = baseMapper.selectSearchAssociateDistinct(keyWord);
+ for (Search search : searchesAssociate) {
+ search.setTransactionEventList(baseMapper.queryAssociateNamesList(keyWord, search.getClassifyId().toString()));
+ }
+ queryResults.setTransactionEventList(searchesAssociate);
+ queryResults.setKeywordEntityList(keywordMapper.selectByName(keyWord));
+ queryResults.setAutomessagePolicyDocuments(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"2",null,null));
+ queryResults.setRegulations(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"1",null,null));
+ return queryResults;
+ }
+
+
+ @Override
+ public RecommendResult smartConsulting(String keyWord) {
+ RecommendResult recommendResult = new RecommendResult();
+ List<KeywordEntity> keywordEntityList = new ArrayList<>();
+ List<TransactionEvent> transactionEventEntities = baseMapper.queryMatterNameList(keyWord, null);
+ List<TransactionEvent> transactionEvents = baseMapper.queryAssociateNamesList(keyWord, null);
+ recommendResult.setTransactionEventList(transactionEventEntities);
+ List<String> list = new ArrayList<>();
+ for (TransactionEvent transactionEvent : transactionEvents) {
+// 直接返回办事指南名称
+ list.add(transactionEvent.getMatterName());
+// 遍历关键词列表 可能后面流程更改会遇到暂时保存代码;
+ /* if (transactionEvent.getAssociateNames() != null) {
+ String[] associateNames = transactionEvent.getAssociateNames().split(",");
+ for (String associateName : associateNames) {
+ list.add(associateName);
+ }
+ }*/
+ }
+ String[] keywords = list.stream().distinct().collect(Collectors.joining(",")).split(",");//去重
+ for (String keyword : keywords) {
+ if (keyword != null && !keyword.equals("")) {
+ KeywordEntity keywordEntity = new KeywordEntity();
+ keywordEntity.setName(keyword);
+ keywordEntityList.add(keywordEntity);
+ }
+ }
+ recommendResult.setKeywordEntityList(keywordEntityList);
+ List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByKeyWord(keyWord);
+ recommendResult.setAutomessagePolicyDocuments(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"2",null,null));
+ recommendResult.setRegulations(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"1",null,null));
+ recommendResult.setOrganizationChartEntityList(organizationChartEntities);
+ return recommendResult;
+ }
+
+ @Override
+ public String selectDataIfExist(String departmentId, String matterName) {
+ return baseMapper.selectDataIfExist(departmentId, matterName);
+ }
+
+ @Override
+ public List<String> selectclassifyId(String classifyId) {
+ return baseMapper.selectclassifyId(classifyId);
+ }
+
+ @Override
+ public List<TransactionEvent> selectClassifyList(List<String> ids) {
+ return baseMapper.selectClassifyList(ids);
+ }
+
+
+ @Override
+ public int countNumByMatterName(String matterName) {
+ return baseMapper.countNumByMatterName(matterName);
+ }
+
+ @Override
+ public List<TransactionEvent> queryByClassifyIdList(String classifyId, Integer departmentId) {
+ return baseMapper.queryByClassifyIdList(classifyId, departmentId);
+ }
+
+ @Override
+ public List<TransactionEvent> queryByClassifyIdList(IPage<TransactionEvent> page, Integer state, String classifyId, Integer departmentId) {
+ return baseMapper.queryByClassifyIdList(page, state, classifyId, departmentId);
+ }
+
+ @Override
+ public List<TransactionEvent> queryByQueryTime() {
+ List<TransactionEvent> transactionEvents = baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda().orderByDesc(TransactionEvent::getQueryTime));
+ return transactionEvents;
+ }
+
+ @Override
+ public List<TransactionEvent> queryByBrowseNum() {
+ List<TransactionEvent> transactionEvents = baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda().orderByDesc(TransactionEvent::getBrowseNum));
+ return transactionEvents;
+ }
+
+ @Override
+ public TransactionEvent sumTransactionNum() {
+ return baseMapper.sumTransactionNum();
+ }
+
+ @Override
+ public int countNumByClassifyIdList(String classifyId, Integer departmentId) {
+ return baseMapper.countNumByClassifyIdList(classifyId, departmentId);
+ }
+
+ @Override
+ public List<TransactionEvent> selectList(String keyWord) {
+ if (keyWord != null && keyWord != "") {
+ return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda().like(TransactionEvent::getMatterName, keyWord));
+ } else {
+ return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda());
+ }
+ }
+
+
+ @Override
+ public Integer batchImport(String fileName, MultipartFile file) {
+ boolean notNull = false;
+ if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
+ throw new RuntimeException("选择文件格式不正确，请下载模板上传");
+ }
+ boolean isExcel2003 = true;
+ if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
+ isExcel2003 = false;
+ }
+ InputStream is = null;
+ try {
+ is = file.getInputStream();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ Workbook wb = null;
+
+ if (isExcel2003) {
+ try {
+ wb = new HSSFWorkbook(is);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ try {
+ wb = new XSSFWorkbook(is);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ Integer failNum = 0;//失败数量
+ // 获取excel的sheet页数
+ int numberOfSheets = wb.getNumberOfSheets();
+ for (int j = 0; j < numberOfSheets; j++) {
+ int i = 2;
+ //获取excel字段名称进行比较
+ Sheet sheetAt = wb.getSheetAt(j);
+ if(sheetAt.getRow(2)!=null){
+ if (new DataFormatter().formatCellValue(sheetAt.getRow(1).getCell(1)).length()>=3){
+ i--;
+ }
+ Row row1 = sheetAt.getRow(i);
+ TransactionEvent transactionEvent = baseMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getMatterName, new DataFormatter().formatCellValue(row1.getCell(1))));
+ boolean isAdd = false;
+ if (transactionEvent == null) {
+ transactionEvent = new TransactionEvent();
+ isAdd = true;
+ }
+ transactionEvent.setMatterName(new DataFormatter().formatCellValue(row1.getCell(1)));
+ Row row2 = sheetAt.getRow(i+1);
+ transactionEvent.setSetGist("<p>" + new DataFormatter().formatCellValue(row2.getCell(1)) + "</p>");
+ Row row3 = sheetAt.getRow(i+2);
+ Row row4 = sheetAt.getRow(i+3);
+ transactionEvent.setBasicInformation("<p> 事项名称：" + new DataFormatter().formatCellValue(row1.getCell(1)) + "<br />"
+ + new DataFormatter().formatCellValue(row3.getCell(0)) + ":" + new DataFormatter().formatCellValue(row3.getCell(1))+ "<br />"
+ + new DataFormatter().formatCellValue(row3.getCell(3)) + ":" + new DataFormatter().formatCellValue(row3.getCell(4)) + "<br />"
+ + new DataFormatter().formatCellValue(row4.getCell(0)) + ":" + new DataFormatter().formatCellValue(row4.getCell(1)) + "</p>");
+ i = i+5;
+ String applicationMaterial = "<p>";
+ while (true) {
+ Row row = sheetAt.getRow(i);
+ if (new DataFormatter().formatCellValue(row.getCell(0)).equals("办理途径、条件和注意事项")) {
+ i = i + 2;
+ break;
+ }
+ applicationMaterial = applicationMaterial + "办理区域：" + new DataFormatter().formatCellValue(row.getCell(0)) + "<br />"
+ + "部门名称：" + new DataFormatter().formatCellValue(row.getCell(1)) + "<br />"
+ + "咨询电话：" + new DataFormatter().formatCellValue(row.getCell(2)) + "<br />"
+ + "办公地址：" + new DataFormatter().formatCellValue(row.getCell(3)) + "<br />"
+ + "办公时间：" + new DataFormatter().formatCellValue(row.getCell(4)) + "<br />";
+ applicationMaterial = applicationMaterial + "<br />";
+ i++;
+ }
+ applicationMaterial = applicationMaterial + "</p>";
+ transactionEvent.setApplicationMaterial(applicationMaterial);
+ String acceptConditions = "<p>";
+ while (true) {
+ Row row = sheetAt.getRow(i);
+ if (new DataFormatter().formatCellValue(row.getCell(0)).equals("（二）网上申报")) {
+ i = i + 1;
+ break;
+ }
+ acceptConditions = acceptConditions + new DataFormatter().formatCellValue(row.getCell(0)) + " "
+ +new DataFormatter().formatCellValue( row.getCell(1)) + " "
+ + new DataFormatter().formatCellValue(row.getCell(2)) + " "
+ +new DataFormatter().formatCellValue( row.getCell(3)) + " "
+ + new DataFormatter().formatCellValue(row.getCell(4)) + " ";
+ acceptConditions = acceptConditions + "<br />";
+ i++;
+ }
+ acceptConditions = acceptConditions + "</p>";
+ transactionEvent.setAcceptConditions(acceptConditions);
+ String rates = "<p>";
+ while (true) {
+ Row row = sheetAt.getRow(i);
+ if (new DataFormatter().formatCellValue(row.getCell(0)).equals("（三）手机移动申报")) {
+ i = i + 1;
+ break;
+ }
+ rates = rates + new DataFormatter().formatCellValue(row.getCell(0)) + " "
+ + new DataFormatter().formatCellValue(row.getCell(1)) + " "
+ + new DataFormatter().formatCellValue(row.getCell(2)) + " "
+ +new DataFormatter().formatCellValue( row.getCell(3)) + " "
+ + new DataFormatter().formatCellValue(row.getCell(4)) + " ";
+ rates = rates + "<br />";
+ i++;
+ }
+ rates = rates + "</p>";
+ transactionEvent.setRates(rates);
+ String transactionArea = "<p>";
+ while (true) {
+ Row row = sheetAt.getRow(i);
+ if (new DataFormatter().formatCellValue(row.getCell(0)).equals("（四）经营许可（备案）事项程序运行图谱（附电子版）")) {
+ i = i + 1;
+ break;
+ }
+ transactionArea = transactionArea + new DataFormatter().formatCellValue(row.getCell(0)) + " "
+ + new DataFormatter().formatCellValue(row.getCell(1)) + " "
+ + new DataFormatter().formatCellValue(row.getCell(2)) + " "
+ +new DataFormatter().formatCellValue( row.getCell(3)) + " "
+ + new DataFormatter().formatCellValue(row.getCell(4)) + " ";
+ transactionArea = transactionArea + "<br />";
+ i++;
+ }
+ transactionArea = transactionArea + "</p>";
+ transactionEvent.setTransactionArea(transactionArea);
+ String handlingProcedures = "<p>";
+ while (true) {
+ Row row = sheetAt.getRow(i);
+ if (new DataFormatter().formatCellValue(row.getCell(0)).equals("（五）经营许可（备案）事项实施内容一览表（附电子版）")) {
+ i = i + 1;
+ break;
+ }
+ handlingProcedures = handlingProcedures + new DataFormatter().formatCellValue(row.getCell(0)) + " "
+ + new DataFormatter().formatCellValue(row.getCell(1)) + " "
+ + new DataFormatter().formatCellValue(row.getCell(2)) + " "
+ +new DataFormatter().formatCellValue( row.getCell(3)) + " "
+ + new DataFormatter().formatCellValue(row.getCell(4)) + " ";
+ handlingProcedures = handlingProcedures + "<br />";
+ i++;
+ }
+ handlingProcedures = handlingProcedures + "</p>";
+ transactionEvent.setHandlingProcedures(handlingProcedures);
+ int ans;
+ if (isAdd) {
+ ans = baseMapper.insert(transactionEvent);
+ } else {
+ ans = baseMapper.updateById(transactionEvent);
+ }
+ if (ans <= 0) {
+ failNum++;
+ }
+ }
+
+ }
+ if (failNum == 0) {//
+ return 3;//全部导入成功
+ } else if (failNum < numberOfSheets) {
+ return 2;//部分导入成功
+ } else if (failNum.equals(numberOfSheets)) {
+ return 0;//导入失败
+ }
+ return 0;
+ }
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/task/SendWsListener.java b/flower_city/src/main/java/com/dg/core/task/SendWsListener.java
new file mode 100644
index 0000000..492c6ef
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/task/SendWsListener.java
@@ -0,0 +1,116 @@
+package com.dg.core.task;
+
+import com.dg.core.service.IGuideRepairOrderService;
+import com.dg.core.util.TestDate;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
+
+import javax.annotation.Resource;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.annotation.WebListener;
+import java.util.*;
+
+@WebListener
+@Slf4j
+public class SendWsListener implements ServletContextListener {
+
+ @Resource
+ private IGuideRepairOrderService iGuideRepairOrderService;
+
+ @Resource
+ RedisTemplate<String, Object> redisTemplate;
+
+ @Override
+ public void contextDestroyed(ServletContextEvent arg0) {
+ log.info("定时发送Xml信息监听--已关闭！");
+ }
+
+ @Override
+ public void contextInitialized(ServletContextEvent arg0) {
+ Calendar calendar = Calendar.getInstance();
+ int year = calendar.get(Calendar.YEAR);
+ int month = calendar.get(Calendar.MONTH);
+ //设置24小时制度，Calendar.HOUR是12小时制度
+ int day = calendar.get(Calendar.DAY_OF_MONTH);
+ calendar.set(year, month, day, 8, 00, 00);
+ // 当天8点（默认执行时间）
+ Date defaultdate = calendar.getTime();
+ Date sendDate = null;
+ if (defaultdate.before(new Date())) {
+ // 若当前时间超过了defaultdate时间，当天不再执行，则将执行时间sendDate改为明天8点
+ calendar.add(Calendar.DATE, 1);
+ sendDate = calendar.getTime();
+ }else {
+ // 若当前时间没有超过defaultdate时间，则将执行时间sendDate改为defaultdate
+ sendDate = defaultdate;
+ }
+
+
+ /**
+ * ----------------每刻任务 ----------------
+ * 启动服务器后，若此时时间没过8点，等待。到了8点自动执行一次，15分钟后再执行一次，周而复始
+ * 启动服务器后，若此时时间超过8点，会立刻执行一次，等到15分钟后再次执行一次，周而复始 到了第二天，不会再判断是否是8点，这个开始时间，只会判断一次而已
+ */
+ Timer qTimer = new Timer();
+ qTimer.schedule(new TimerTask() {
+
+ @Override
+ public void run() {
+ log.info("每刻任务已执行");
+ //定时更新超时状态
+ iGuideRepairOrderService.pushOvertimeGuideRepairOrder();
+ //定时更新未评价的单据评价状态
+ iGuideRepairOrderService.updateEvaluate();
+ //定时发送工单提醒信息
+ iGuideRepairOrderService.pushNoticeTimeRepairOrder();
+ TestDate td = new TestDate();
+ Map weather = td.getWeather("510400");
+ redisTemplate.opsForValue().set("weather",weather);
+ // TODO 写你的逻辑
+ }
+ }, defaultdate, 1 * 60 * 1000);// 定时每15分钟
+ log.info("每刻定时发送Xml信息监听--已启动！");
+
+ /**
+ * ----------------每日任务 ----------------
+ * 启动服务器后，若此时时间没过8点，等待。到了8点自动执行一次，24小时后（第二天8点）再执行一次，周而复始
+ * 启动服务器后，若此时时间已经超过8点，则等到24小时后（第二天8点）才执行一次，周而复始
+ */
+// Timer dTimer = new Timer();
+// dTimer.schedule(new TimerTask() {
+//
+// @Override
+// public void run() {
+// System.out.println("每日任务已经执行");
+// // TODO 写你的逻辑
+// }
+// }, sendDate, 24 * 60 * 60 * 1000);// 定时24小时：24 * 60 * 60 * 1000
+// System.out.println("每日定时发送Xml信息监听--已启动！");
+
+ /**
+ * ----------------每月任务 ----------------
+ * 启动服务器后，若此时时间没过8点，等待。到了8点自动执行判断是否是当前月份的1号，若是则执行一次，
+ * 24小时后（第二天8点）再执行一次判断（每月1号以后后的29天或30天后才会是下月1号，再执行一次），周而复始 启动服务器后，若此时时间已经超过8点，会立刻执行一次，等到下个月1号再次执行一次，周而复始
+ */
+// Timer mTimer = new Timer();
+// mTimer.schedule(new TimerTask() {
+//
+// @Override
+// public void run() {
+// Calendar c = Calendar.getInstance();
+// int day = c.get(Calendar.DAY_OF_MONTH);
+// System.out.println("月任务 判断中");
+// if (day == 1) {
+// // 每天执行，若为每月1号才执行
+// System.out.println("月任务执行已执行");
+// // TODO 写你的逻辑
+// }
+//
+// }
+// }, sendDate, 24 * 60 * 60 * 1000);// 每天执行一次检查
+//
+// System.out.println("每月定时发送Xml信息监听--已启动！");
+
+ }
+}
\ No newline at end of file
diff --git a/flower_city/src/main/java/com/dg/core/task/SwaggerConfig.java b/flower_city/src/main/java/com/dg/core/task/SwaggerConfig.java
new file mode 100644
index 0000000..8ee1a1f
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/task/SwaggerConfig.java
@@ -0,0 +1,51 @@
+package com.dg.core.task;
+
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.ArrayList;
+
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+
+ //配置了Swagger的Docket的bean实例
+ @Bean
+ public Docket docket(Environment environment){
+
+ return new Docket(DocumentationType.SWAGGER_2)
+ .apiInfo(apiInfo())
+ .enable(true) //配置是否启用Swagger，如果是false，在浏览器将无法访问
+ .select()// 通过.select()方法，去配置扫描接口,RequestHandlerSelectors配置如何扫描接口
+ .apis(RequestHandlerSelectors.basePackage("com.dg.core"))
+ // 配置如何通过path过滤,即这里只扫描请求以/longdi开头的接口
+// .paths(PathSelectors.ant("/longdi/**"))
+ .build();
+
+ }
+
+
+ //配置文档信息
+ private ApiInfo apiInfo() {
+ Contact contact = new Contact("花城e+", "http://localhost:8181/swagger-ui/index.html", "项目");
+ return new ApiInfo(
+ "花城e+接口文档", // 标题
+ "花城e+接口文档", // 描述
+ "v1.0", // 版本
+ "http://localhost:8181/swagger-ui/index.html", // 组织链接
+ contact, // 联系人信息
+ "Apach 2.0 许可", // 许可
+ "许可链接", // 许可连接
+ new ArrayList<>()// 扩展
+ );
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/DateUtils.java b/flower_city/src/main/java/com/dg/core/util/DateUtils.java
new file mode 100644
index 0000000..9441f30
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/DateUtils.java
@@ -0,0 +1,222 @@
+package com.dg.core.util;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import java.lang.management.ManagementFactory;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 时间工具类
+ *
+ * @author ruoyi
+ */
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils
+{
+ public static String YYYY = "yyyy";
+
+ public static String YYYY_MM = "yyyy-MM";
+
+ public static String YYYY_MM_DD = "yyyy-MM-dd";
+
+ public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
+
+ public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+
+ private static String[] parsePatterns = {
+ "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
+ "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
+ "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
+
+ /**
+ * 获取当前Date型日期
+ *
+ * @return Date() 当前日期
+ */
+ public static Date getNowDate()
+ {
+ return new Date();
+ }
+
+ /**
+ * 获取当前日期, 默认格式为yyyy-MM-dd
+ *
+ * @return String
+ */
+ public static String getDate()
+ {
+ return dateTimeNow(YYYY_MM_DD);
+ }
+
+ public static final String getTime()
+ {
+ return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
+ }
+
+ public static final String dateTimeNow()
+ {
+ return dateTimeNow(YYYYMMDDHHMMSS);
+ }
+
+ public static final String dateTimeNow(final String format)
+ {
+ return parseDateToStr(format, new Date());
+ }
+
+ public static final String dateTime(final Date date)
+ {
+ return parseDateToStr(YYYY_MM_DD, date);
+ }
+
+ public static final String parseDateToStr(final String format, final Date date)
+ {
+ return new SimpleDateFormat(format).format(date);
+ }
+
+ public static final Date dateTime(final String format, final String ts)
+ {
+ try
+ {
+ return new SimpleDateFormat(format).parse(ts);
+ }
+ catch (ParseException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * 日期路径 即年/月/日 如2018/08/08
+ */
+ public static final String datePath()
+ {
+ Date now = new Date();
+ return DateFormatUtils.format(now, "yyyy/MM/dd");
+ }
+
+ /**
+ * 日期路径 即年/月/日 如20180808
+ */
+ public static final String dateTime()
+ {
+ Date now = new Date();
+ return DateFormatUtils.format(now, "yyyyMMdd");
+ }
+
+ /**
+ * 日期型字符串转化为日期 格式
+ */
+ public static Date parseDate(Object str)
+ {
+ if (str == null)
+ {
+ return null;
+ }
+ try
+ {
+ return parseDate(str.toString(), parsePatterns);
+ }
+ catch (ParseException e)
+ {
+ return null;
+ }
+ }
+
+ /**
+ * 获取服务器启动时间
+ */
+ public static Date getServerStartDate()
+ {
+ long time = ManagementFactory.getRuntimeMXBean().getStartTime();
+ return new Date(time);
+ }
+
+ /**
+ * 计算相差天数
+ */
+ public static int differentDaysByMillisecond(Date date1, Date date2)
+ {
+ return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
+ }
+
+ /**
+ * 计算两个时间差
+ */
+ public static String getDatePoor(Date endDate, Date nowDate)
+ {
+ long nd = 1000 * 24 * 60 * 60;
+ long nh = 1000 * 60 * 60;
+ long nm = 1000 * 60;
+ // long ns = 1000;
+ // 获得两个时间的毫秒时间差异
+ long diff = endDate.getTime() - nowDate.getTime();
+ // 计算差多少天
+ long day = diff / nd;
+ // 计算差多少小时
+ long hour = diff % nd / nh;
+ // 计算差多少分钟
+ long min = diff % nd % nh / nm;
+ // 计算差多少秒//输出结果
+ // long sec = diff % nd % nh % nm / ns;
+ return day + "天" + hour + "小时" + min + "分钟";
+ }
+
+ /**
+ * 增加 LocalDateTime ==> Date
+ */
+ public static Date toDate(LocalDateTime temporalAccessor)
+ {
+ ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault());
+ return Date.from(zdt.toInstant());
+ }
+
+ /**
+ * 增加 LocalDate ==> Date
+ */
+ public static Date toDate(LocalDate temporalAccessor)
+ {
+ LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
+ ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
+ return Date.from(zdt.toInstant());
+ }
+
+ /**
+ * 获取当前日期前(后)x天的日期
+ *
+ * @param day
+ * 天数（如果day数为负数,说明是此日期前的天数）
+ * @param sdf 日期格式
+ */
+ public static String getBeforNumDay(SimpleDateFormat sdf,int day) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(new Date());
+ calendar.add(Calendar.DATE, day);
+ return sdf.format(calendar.getTime());
+ }
+
+ /**
+ * 获取当前日期前(后)n天的日期集合
+ * @param sdf 时间格式化字符
+ * @param dayNum 前(后)的天数
+ * @param isAround 1.前 2.后
+ * @return 当前日期前(后)n天的日期集合
+ */
+ public static List<String> getLastDayDateList(SimpleDateFormat sdf,Integer dayNum,Integer isAround){
+ List<String> dateList = new ArrayList<>();
+ for (int i = dayNum; i > 0; i--) {
+ String date = "";
+ if(isAround.equals(2)){
+ date = getBeforNumDay(sdf,i);
+ }else{
+ date = getBeforNumDay(sdf,-i);
+ }
+ dateList.add(date);
+ }
+ return dateList;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/IdUtils.java b/flower_city/src/main/java/com/dg/core/util/IdUtils.java
new file mode 100644
index 0000000..468fc38
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/IdUtils.java
@@ -0,0 +1,49 @@
+package com.dg.core.util;
+
+/**
+ * ID生成器工具类
+ *
+ * @author ruoyi
+ */
+public class IdUtils
+{
+ /**
+ * 获取随机UUID
+ *
+ * @return 随机UUID
+ */
+ public static String randomUUID()
+ {
+ return UUID.randomUUID().toString();
+ }
+
+ /**
+ * 简化的UUID，去掉了横线
+ *
+ * @return 简化的UUID，去掉了横线
+ */
+ public static String simpleUUID()
+ {
+ return UUID.randomUUID().toString(true);
+ }
+
+ /**
+ * 获取随机UUID，使用性能更好的ThreadLocalRandom生成UUID
+ *
+ * @return 随机UUID
+ */
+ public static String fastUUID()
+ {
+ return UUID.fastUUID().toString();
+ }
+
+ /**
+ * 简化的UUID，去掉了横线，使用性能更好的ThreadLocalRandom生成UUID
+ *
+ * @return 简化的UUID，去掉了横线
+ */
+ public static String fastSimpleUUID()
+ {
+ return UUID.fastUUID().toString(true);
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/MyBatisPlusConfig.java b/flower_city/src/main/java/com/dg/core/util/MyBatisPlusConfig.java
new file mode 100644
index 0000000..8d378c1
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/MyBatisPlusConfig.java
@@ -0,0 +1,22 @@
+package com.dg.core.util;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@MapperScan("com.zyd.mapper")
+public class MyBatisPlusConfig {
+ /**
+ * 分页插件
+ */
+ @Bean
+ public MybatisPlusInterceptor mybatisPlusInterceptor() {
+ MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+ return interceptor;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/MyUtil.java b/flower_city/src/main/java/com/dg/core/util/MyUtil.java
new file mode 100644
index 0000000..2bb11b2
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/MyUtil.java
@@ -0,0 +1,8 @@
+package com.dg.core.util;
+
+
+public class MyUtil {
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/PermissionUtil.java b/flower_city/src/main/java/com/dg/core/util/PermissionUtil.java
new file mode 100644
index 0000000..239e068
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/PermissionUtil.java
@@ -0,0 +1,102 @@
+package com.dg.core.util;
+
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IOrganizationChartService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@RestController
+public class PermissionUtil
+{
+
+ public static List<String> getPermission(SysUser sysUser,IOrganizationChartService iOrganizationChartService)
+ {
+ if (StringUtils.equals("3", sysUser.getUserType())) {
+ if (StringUtils.isEmpty(sysUser.getDataPermission())) {
+ return null;
+ }
+ else
+ {
+ List<String> ids = new ArrayList<>();
+ if (sysUser.getDataPermission().indexOf(",")>0)
+ {
+ String[] idl=sysUser.getDataPermission().split(",");
+ Collections.addAll(ids,idl);
+ }
+ else
+ {
+ ids.add(sysUser.getDataPermission());
+ }
+ return ids;
+ }
+ } else if (StringUtils.equals("4", sysUser.getUserType())) {
+ if (StringUtils.isEmpty(sysUser.getDataPermission())) {
+ return null;
+ }
+ else
+ {
+ List<String> ids = new ArrayList<>();
+ if (sysUser.getDataPermission().indexOf(",")>0)
+ {
+ String[] idl=sysUser.getDataPermission().split(",");
+ Collections.addAll(ids,idl);
+ }
+ else
+ {
+ ids.add(sysUser.getDataPermission());
+ }
+ return ids;
+ }
+ } else if(StringUtils.equals("2", sysUser.getUserType()))
+ {
+ //导办人员
+ List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+// List<String> ids=getStairDepartment(sysUser,iOrganizationChartService);
+ return ids;
+ }
+ else if(StringUtils.equals("1", sysUser.getUserType()))
+ {
+ //管理员
+// List<String> ids=iOrganizationChartService.getIds("");
+ List<String> ids=null;
+ return ids;
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+
+ /**
+ * 通过部门id 获取一级部门下的全部子部门以及一级部门
+ * @param sysUser
+ * @param iOrganizationChartService
+ * @return
+ */
+ public static List<String> getStairDepartment(SysUser sysUser,IOrganizationChartService iOrganizationChartService)
+ {
+ if(StringUtils.equals("1", sysUser.getUserType()))
+ {
+ //管理员
+ List<String> ids=null;
+ return ids;
+ }
+ else
+ {
+ //获取一级部门id
+ String stairId= iOrganizationChartService.getStairId(sysUser.getDepartmentId());
+ List<String> ids=iOrganizationChartService.getIds(stairId);
+ return ids;
+ }
+ }
+
+
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/SmsUtil.java b/flower_city/src/main/java/com/dg/core/util/SmsUtil.java
new file mode 100644
index 0000000..f8b5199
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/SmsUtil.java
@@ -0,0 +1,441 @@
+package com.dg.core.util;
+
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.CommonRequest;
+import com.aliyuncs.CommonResponse;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.IAcsClient;
+import com.aliyuncs.exceptions.ClientException;
+import com.aliyuncs.http.MethodType;
+import com.aliyuncs.profile.DefaultProfile;
+import com.dg.core.AliyunConfig;
+import com.dg.core.ResultData;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.squareup.okhttp.OkHttpClient;
+import com.squareup.okhttp.Request;
+import com.squareup.okhttp.Response;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 阿里云短信工具类
+ */
+@Component
+public class SmsUtil {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(SmsUtil.class);
+
+ // 注入阿里云配置
+ @Resource
+ AliyunConfig aliyunConfig;
+
+ // 注入redisTemplate
+ @Resource
+ RedisTemplate<String, Object> redisTemplate;
+
+ private String LoginName="DSC1210052";
+
+ private String Pwd="pzhsjj@123";
+
+ private String FeeType="2";
+
+ /**
+ * 发送短信登录验证码
+ *
+ * @param tel
+ * 电话
+ */
+ public ResultData<Object> sendSms(String tel) {
+ //cn-hangzhou 是阿里定义的签名固定值。填写阿里云申请短信签名的key和secret值
+ DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou", aliyunConfig.getKey(), aliyunConfig.getScrect());
+ /*阿里云提供的短信发送api的近期的相关代码，代码以最新的阿里api提供为准*/
+ IAcsClient client = new DefaultAcsClient(profile);
+ CommonRequest request = new CommonRequest();
+ request.setSysMethod(MethodType.POST);
+ request.setSysDomain("dysmsapi.aliyuncs.com");
+ request.setSysVersion("2017-05-25");
+ request.setSysAction("SendSms");
+ request.putQueryParameter("RegionId", "cn-hangzhou");
+ // 接收人电话
+ request.putQueryParameter("PhoneNumbers", tel);
+ // 短信签名
+ request.putQueryParameter("SignName", "集慧科技");
+ // 短信模板
+ request.putQueryParameter("TemplateCode", aliyunConfig.getTemplateCode());
+ Random rd = new Random();
+ int code = rd.nextInt(900000) + 100000;
+ // 短信内容
+ request.putQueryParameter("TemplateParam", "{code:" + code + "}");
+ // 获取短信发送的响应结果
+ try {
+ CommonResponse rs = client.getCommonResponse(request);
+ LOGGER.debug(rs.getData().toString());
+ // 把json格式的字符串装换成java的map的数据类型
+ ObjectMapper mapper = new ObjectMapper();
+ try {
+ HashMap<String, Object> m = mapper.readValue(rs.getData().toString(), HashMap.class);
+ if (m.get("Message").equals("OK")) {
+ redisTemplate.opsForValue().set(tel, code + "", 5, TimeUnit.MINUTES);
+ return ResultData.success("短信发送成功!");
+ }
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ return ResultData.error("短信发送失败");
+ }
+ } catch (ClientException e) {
+ e.printStackTrace();
+ return ResultData.error("短信发送失败");
+ }
+ return ResultData.error("短信发送失败");
+ }
+
+ /**
+ * 发送短信登录验证码(电信平台)
+ *
+ * @param tel
+ * 电话
+ */
+
+ public ResultData sendSmsNew(String tel) {
+ String url =
+ "https://dxsdk.028lk.com:8082/Api/SendSms?"+"LoginName="+LoginName+"&Pwd="+Pwd+"&FeeType="+FeeType+"&Mobile="+tel+"&Content=";
+ Random rd = new Random();
+ int code = rd.nextInt(900000) + 100000;
+ String content="您的验证码为："+code+"，用于手机验证，15分钟内有效，请勿泄露于他人！";
+ url=url+content;
+ OkHttpClient client = new OkHttpClient();
+ Response response;
+ //解密数据
+ String rsa = null;
+ Request request = new Request.Builder()
+ .url(url)
+ .get()
+ .addHeader("Content-Type", "application/x-www-form-urlencoded")
+ .build();
+ try {
+ response = client.newCall(request).execute();
+ redisTemplate.opsForValue().set(tel, code + "", 5, TimeUnit.MINUTES);
+// rsa = response.body().string().split("|")[0];
+ rsa = response.message();
+ if (!rsa.equals("OK")){
+ return ResultData.success("短信发送失败");
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ return ResultData.success("短信发送失败");
+ }
+ return ResultData.success("短信发送成功");
+ }
+
+ /**
+ * 发送工单超时短信
+ *
+ * @param tel
+ * 电话
+ * @param name
+ * 工单名
+ */
+ public ResultData<Object> sendSmsOvertime(String tel,String name) {
+ //cn-hangzhou 是阿里定义的签名固定值。填写阿里云申请短信签名的key和secret值
+ DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou", aliyunConfig.getKey(), aliyunConfig.getScrect());
+ /*阿里云提供的短信发送api的近期的相关代码，代码以最新的阿里api提供为准*/
+ IAcsClient client = new DefaultAcsClient(profile);
+ CommonRequest request = new CommonRequest();
+ request.setSysMethod(MethodType.POST);
+ request.setSysDomain("dysmsapi.aliyuncs.com");
+ request.setSysVersion("2017-05-25");
+ request.setSysAction("SendSms");
+ request.putQueryParameter("RegionId", "cn-hangzhou");
+ // 接收人电话
+ request.putQueryParameter("PhoneNumbers", tel);
+ // 短信签名
+ request.putQueryParameter("SignName", "集慧科技");
+ // 短信模板
+ request.putQueryParameter("TemplateCode", aliyunConfig.getTemplateCodeOvertime());
+ Random rd = new Random();
+ // 短信内容
+ request.putQueryParameter("TemplateParam", "{name:'" + name + "'}");
+ // 获取短信发送的响应结果
+ try {
+ CommonResponse rs = client.getCommonResponse(request);
+ LOGGER.debug(rs.getData().toString());
+ // 把json格式的字符串装换成java的map的数据类型
+ ObjectMapper mapper = new ObjectMapper();
+ try {
+ HashMap<String, Object> m = mapper.readValue(rs.getData().toString(), HashMap.class);
+ if (m.get("Message").equals("OK")) {
+ return ResultData.success("短信发送成功!");
+ }
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ return ResultData.error("短信发送失败");
+ }
+ } catch (ClientException e) {
+ e.printStackTrace();
+ return ResultData.error("短信发送失败");
+ }
+ return ResultData.error("短信发送失败");
+ }
+
+
+ /**
+ * 发送工单超时短信(电信)
+ *
+ * @param tel
+ * 电话
+ * @param name
+ * 工单名
+ */
+ public ResultData<Object> sendSmsOvertimeNew(String tel,String name) {
+ String url =
+ "https://dxsdk.028lk.com:8082/Api/SendSms?"+"LoginName="+LoginName+"&Pwd="+Pwd+"&FeeType="+FeeType+"&Mobile="+tel+"&Content=";
+ Random rd = new Random();
+ String content=name+"的导办工单超时未处理，请及时通知！";
+ url=url+content;
+ OkHttpClient client = new OkHttpClient();
+ Response response;
+ //解密数据
+ String rsa = null;
+ Request request = new Request.Builder()
+ .url(url)
+ .get()
+ .addHeader("Content-Type", "application/x-www-form-urlencoded")
+ .build();
+ try {
+ response = client.newCall(request).execute();
+ rsa = response.message();
+ if (!rsa.equals("OK")){
+ return ResultData.success("短信发送失败");
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ return ResultData.success("短信发送失败");
+ }
+ return ResultData.success("短信发送成功");
+ }
+
+ /**
+ * 发送工单完成短信
+ *
+ * @param tel
+ * 电话
+ * @param name
+ * 工单名
+ */
+ public ResultData<Object> sendSmsComplete(String tel,String name) {
+ //cn-hangzhou 是阿里定义的签名固定值。填写阿里云申请短信签名的key和secret值
+ DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou", aliyunConfig.getKey(), aliyunConfig.getScrect());
+ /*阿里云提供的短信发送api的近期的相关代码，代码以最新的阿里api提供为准*/
+ IAcsClient client = new DefaultAcsClient(profile);
+ CommonRequest request = new CommonRequest();
+ request.setSysMethod(MethodType.POST);
+ request.setSysDomain("dysmsapi.aliyuncs.com");
+ request.setSysVersion("2017-05-25");
+ request.setSysAction("SendSms");
+ request.putQueryParameter("RegionId", "cn-hangzhou");
+ // 接收人电话
+ request.putQueryParameter("PhoneNumbers", tel);
+ // 短信签名
+ request.putQueryParameter("SignName", "集慧科技");
+ // 短信模板
+ request.putQueryParameter("TemplateCode", aliyunConfig.getTemplateCodeComplete());
+ Random rd = new Random();
+ // 短信内容
+ request.putQueryParameter("TemplateParam", "{name:'" + name + "'}");
+ // 获取短信发送的响应结果
+ try {
+ CommonResponse rs = client.getCommonResponse(request);
+ LOGGER.debug(rs.getData().toString());
+ // 把json格式的字符串装换成java的map的数据类型
+ ObjectMapper mapper = new ObjectMapper();
+ try {
+ HashMap<String, Object> m = mapper.readValue(rs.getData().toString(), HashMap.class);
+ if (m.get("Message").equals("OK")) {
+ return ResultData.success("短信发送成功!");
+ }
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ return ResultData.error("短信发送失败");
+ }
+ } catch (ClientException e) {
+ e.printStackTrace();
+ return ResultData.error("短信发送失败");
+ }
+ return ResultData.error("短信发送失败");
+ }
+
+
+ /**
+ * 发送工单完成短信
+ *
+ * @param tel
+ * 电话
+ * @param name
+ * 工单名
+ */
+ public ResultData<Object> sendSmsCompleteNew(String tel,String name) {
+ String url =
+ "https://dxsdk.028lk.com:8082/Api/SendSms?"+"LoginName="+LoginName+"&Pwd="+Pwd+"&FeeType="+FeeType+"&Mobile="+tel+"&Content=";
+ Random rd = new Random();
+ String content="您的"+name+"导办工单已由工作人员处理完成，请通过个人中心-我的申请导办查询。";
+ url=url+content;
+ OkHttpClient client = new OkHttpClient();
+ Response response;
+ //解密数据
+ String rsa = null;
+ Request request = new Request.Builder()
+ .url(url)
+ .get()
+ .addHeader("Content-Type", "application/x-www-form-urlencoded")
+ .build();
+ try {
+ response = client.newCall(request).execute();
+ rsa = response.message();
+ if (!rsa.equals("OK")){
+ return ResultData.success("短信发送失败");
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ return ResultData.success("短信发送失败");
+ }
+ return ResultData.success("短信发送成功");
+ }
+
+
+ /**
+ * 发送工单提交短信
+ *
+ * @param tel
+ * 电话
+ * @param name
+ * 工单名
+ */
+ public ResultData<Object> sendSmsSubmit(String tel,String name) {
+ //cn-hangzhou 是阿里定义的签名固定值。填写阿里云申请短信签名的key和secret值
+ DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou", aliyunConfig.getKey(), aliyunConfig.getScrect());
+ /*阿里云提供的短信发送api的近期的相关代码，代码以最新的阿里api提供为准*/
+ IAcsClient client = new DefaultAcsClient(profile);
+ CommonRequest request = new CommonRequest();
+ request.setSysMethod(MethodType.POST);
+ request.setSysDomain("dysmsapi.aliyuncs.com");
+ request.setSysVersion("2017-05-25");
+ request.setSysAction("SendSms");
+ request.putQueryParameter("RegionId", "cn-hangzhou");
+ // 接收人电话
+ request.putQueryParameter("PhoneNumbers", tel);
+ // 短信签名
+ request.putQueryParameter("SignName", "集慧科技");
+ // 短信模板
+ request.putQueryParameter("TemplateCode", aliyunConfig.getTemplateCodeSubmit());
+ Random rd = new Random();
+ // 短信内容
+ request.putQueryParameter("TemplateParam", "{name:'" + name + "'}");
+ // 获取短信发送的响应结果
+ try {
+ CommonResponse rs = client.getCommonResponse(request);
+ LOGGER.debug(rs.getData().toString());
+ // 把json格式的字符串装换成java的map的数据类型
+ ObjectMapper mapper = new ObjectMapper();
+ try {
+ HashMap<String, Object> m = mapper.readValue(rs.getData().toString(), HashMap.class);
+ if (m.get("Message").equals("OK")) {
+ return ResultData.success("短信发送成功!");
+ }
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ return ResultData.error("短信发送失败");
+ }
+ } catch (ClientException e) {
+ e.printStackTrace();
+ return ResultData.error("短信发送失败");
+ }
+ return ResultData.error("短信发送失败");
+ }
+
+
+ /**
+ * 发送工单提交短信(电信平台)
+ *
+ * @param tel
+ * 电话
+ * @param name
+ * 工单名
+ */
+ public ResultData<Object> sendSmsSubmitNew(String tel,String name) {
+ String url =
+ "https://dxsdk.028lk.com:8082/Api/SendSms?"+"LoginName="+LoginName+"&Pwd="+Pwd+"&FeeType="+FeeType+"&Mobile="+tel+"&Content=";
+ Random rd = new Random();
+ String content="您在"+ LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) +"收到新的导办工单，请"+name+"尽快处理。";
+ url=url+content;
+ OkHttpClient client = new OkHttpClient();
+ Response response;
+ //解密数据
+ String rsa = null;
+ Request request = new Request.Builder()
+ .url(url)
+ .get()
+ .addHeader("Content-Type", "application/x-www-form-urlencoded")
+ .build();
+ try {
+ response = client.newCall(request).execute();
+ rsa = response.message();
+ if (!rsa.equals("OK")){
+ return ResultData.success("短信发送失败");
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ return ResultData.success("短信发送失败");
+ }
+ return ResultData.success("短信发送成功");
+ }
+
+
+ /**
+ * 发送工单提交短信(电信平台)
+ *
+ * @param tel
+ * 电话
+ * @param name
+ * 工单名
+ */
+ public ResultData<Object> sendSmsOvertimeRemind(String tel,String name) {
+ String url =
+ "https://dxsdk.028lk.com:8082/Api/SendSms?"+"LoginName="+LoginName+"&Pwd="+Pwd+"&FeeType="+FeeType+"&Mobile="+tel+"&Content=";
+ Random rd = new Random();
+ String content="您的待处理导办工单已超时，请 "+name+"尽快处理。";
+ url=url+content;
+ OkHttpClient client = new OkHttpClient();
+ Response response;
+ //解密数据
+ String rsa = null;
+ Request request = new Request.Builder()
+ .url(url)
+ .get()
+ .addHeader("Content-Type", "application/x-www-form-urlencoded")
+ .build();
+ try {
+ response = client.newCall(request).execute();
+ rsa = response.message();
+ if (!rsa.equals("OK")){
+ return ResultData.success("短信发送失败");
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ return ResultData.success("短信发送失败");
+ }
+ return ResultData.success("短信发送成功");
+ }
+}
\ No newline at end of file
diff --git a/flower_city/src/main/java/com/dg/core/util/Snowflake.java b/flower_city/src/main/java/com/dg/core/util/Snowflake.java
new file mode 100644
index 0000000..061cf6c
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/Snowflake.java
@@ -0,0 +1,17 @@
+package com.dg.core.util;
+
+
+import cn.hutool.core.util.IdUtil;
+
+/**
+ * 雪花id获取工具类
+ * @author lyq
+ * @date 2022-03-04
+ */
+public class Snowflake {
+ public static long getId() {
+ cn.hutool.core.lang.Snowflake snowflake = IdUtil.getSnowflake(1, 1);
+ long id = snowflake.nextId();
+ return id;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/TableDataInfo.java b/flower_city/src/main/java/com/dg/core/util/TableDataInfo.java
new file mode 100644
index 0000000..1b827d3
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/TableDataInfo.java
@@ -0,0 +1,87 @@
+package com.dg.core.util;
+
+import com.dg.core.ResultData;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 表格分页数据对象
+ *
+ * @author ruoyi
+ */
+public class TableDataInfo<T> implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 总记录数 */
+ private long total;
+
+ /** 列表数据 */
+ private List<T> rows;
+
+ /** 消息状态码 */
+ private int result;
+
+ /** 消息内容 */
+ private String msg;
+
+ /**
+ * 表格数据对象
+ */
+ public TableDataInfo()
+ {
+ }
+
+ /**
+ * 分页
+ *
+ * @param list 列表数据
+ * @param total 总记录数
+ */
+ public TableDataInfo(List<T> list, long total)
+ {
+ this.rows = list;
+ this.total = total;
+ }
+
+ public long getTotal()
+ {
+ return total;
+ }
+
+ public void setTotal(long total)
+ {
+ this.total = total;
+ }
+
+ public List<T> getRows()
+ {
+ return rows;
+ }
+
+ public void setRows(List<T> rows)
+ {
+ this.rows = rows;
+ }
+
+ public int getResult()
+ {
+ return result;
+ }
+
+ public void setResult(int result)
+ {
+ this.result = result;
+ }
+
+ public String getMsg()
+ {
+ return msg;
+ }
+
+ public void setMsg(String msg)
+ {
+ this.msg = msg;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/TemplateParam.java b/flower_city/src/main/java/com/dg/core/util/TemplateParam.java
new file mode 100644
index 0000000..82671f9
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/TemplateParam.java
@@ -0,0 +1,19 @@
+package com.dg.core.util;
+
+import lombok.Data;
+
+@Data
+public class TemplateParam {
+
+ private String key;
+ private String value;
+
+ public TemplateParam(String key, String value) {
+ this.key = key;
+ this.value = value;
+ }
+ public TemplateParam() {
+
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/TestDate.java b/flower_city/src/main/java/com/dg/core/util/TestDate.java
new file mode 100644
index 0000000..d166f08
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/TestDate.java
@@ -0,0 +1,179 @@
+package com.dg.core.util;
+
+
+import cn.hutool.core.date.DateTime;
+import com.alibaba.fastjson.JSONObject;
+import com.iceyyy.workday.WorkUtils;
+import com.squareup.okhttp.OkHttpClient;
+import com.squareup.okhttp.Request;
+import com.squareup.okhttp.Response;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * <p>TestDate 此类用于：</p>
+ * <p>@author：hujm</p>
+ * <p>@date：2021年04月22日 17:43</p>
+ * <p>@remark：</p>
+ */
+public class TestDate {
+
+ public static void main(String[] args) {
+ System.out.println(getJjr(2021, 4));
+ System.out.println(getMonthWekDay(2021, 4));
+ System.out.println(JJR(2021, 4));
+
+ }
+
+ /**
+ * 获取周末和节假日
+ *
+ * @param year
+ * @param month
+ * @return
+ */
+ public static Set<String> JJR(int year, int month) {
+ //获取所有的周末
+ Set<String> monthWekDay = getMonthWekDay(year, month);
+ //http://timor.tech/api/holiday api文档地址
+ Map jjr = getJjr(year, month + 1);
+ Integer code = (Integer) jjr.get("code");
+ if (code != 0) {
+ return monthWekDay;
+ }
+ Map<String, Map<String, Object>> holiday = (Map<String, Map<String, Object>>) jjr.get("holiday");
+ Set<String> strings = holiday.keySet();
+ for (String str : strings) {
+ Map<String, Object> stringObjectMap = holiday.get(str);
+ Integer wage = (Integer) stringObjectMap.get("wage");
+ String date = (String) stringObjectMap.get("date");
+ //筛选掉补班
+ if (wage.equals(1)) {
+ monthWekDay.remove(date);
+ } else {
+ monthWekDay.add(date);
+ }
+ }
+ return monthWekDay;
+ }
+
+ /**
+ * 获取节假日不含周末
+ *
+ * @param year
+ * @param month
+ * @return
+ */
+ private static Map getJjr(int year, int month) {
+ String url = "http://timor.tech/api/holiday/year/";
+ OkHttpClient client = new OkHttpClient();
+ Response response;
+ //解密数据
+ String rsa = null;
+ Request request = new Request.Builder()
+ .url(url)
+ .get()
+ .addHeader("Content-Type", "application/x-www-form-urlencoded")
+ .build();
+ try {
+ response = client.newCall(request).execute();
+ rsa = response.body().string();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return JSONObject.parseObject(rsa, Map.class);
+ }
+
+ /**
+ * 获取节假日不含周末
+ *
+ * @return
+ */
+ public Map getWeather(String code) {
+ String url = "https://restapi.amap.com/v3/weather/weatherInfo?key=9e0d819935da8a01de0e476ba8a9019e&city="+code;
+ OkHttpClient client = new OkHttpClient();
+ Response response;
+ //解密数据
+ String rsa = null;
+ Request request = new Request.Builder()
+ .url(url)
+ .get()
+ .addHeader("Content-Type", "application/x-www-form-urlencoded")
+ .build();
+ try {
+ response = client.newCall(request).execute();
+ rsa = response.body().string();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return JSONObject.parseObject(rsa, Map.class);
+ }
+
+ /**
+ * 获取周末 月从0开始
+ *
+ * @param year
+ * @param mouth
+ * @return
+ */
+ public static Set<String> getMonthWekDay(int year, int mouth) {
+ Set<String> dateList = new HashSet<>();
+ SimpleDateFormat simdf = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendar = new GregorianCalendar(year, mouth, 1);
+ Calendar endCalendar = new GregorianCalendar(year, mouth, 1);
+ endCalendar.add(Calendar.MONTH, 1);
+ while (true) {
+ int weekday = calendar.get(Calendar.DAY_OF_WEEK);
+ if (weekday == 1 || weekday == 7) {
+ dateList.add(simdf.format(calendar.getTime()));
+ }
+ calendar.add(Calendar.DATE, 1);
+ if (calendar.getTimeInMillis() >= endCalendar.getTimeInMillis()) {
+ break;
+ }
+ }
+ return dateList;
+ }
+
+ /**
+ * 判断该日期是否为工作日
+ *
+ * @param dateTime
+ * @return
+ */
+ public Boolean isWeekday(DateTime dateTime){
+ TestDate td=new TestDate();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(dateTime);
+ Set<String> jjr = td.JJR(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH));
+ String strdate = dateTime.toString("yyyy-MM-dd");
+ for (String ans: jjr ) {
+ if (ans.equals(strdate))
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * 获取该日期的下个工作日是多少
+ *
+ * @param dateTime
+ * @return
+ */
+ public DateTime nextWeekDay(DateTime dateTime){
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(dateTime);
+ while (true){
+ calendar.add(calendar.DATE,1);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+ String dateTimeToday = sdf.format(calendar.getTime());
+ if (!WorkUtils.isWorkendDay(dateTimeToday)){
+ return new DateTime(calendar);//返回日期
+ }
+ }
+
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/UUID.java b/flower_city/src/main/java/com/dg/core/util/UUID.java
new file mode 100644
index 0000000..46ee487
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/UUID.java
@@ -0,0 +1,486 @@
+package com.dg.core.util;
+
+
+import com.dg.core.exception.UtilException;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+
+/**
+ * 提供通用唯一识别码（universally unique identifier）（UUID）实现
+ *
+ * @author ruoyi
+ */
+public final class UUID implements java.io.Serializable, Comparable<UUID>
+{
+ private static final long serialVersionUID = -1185015143654744140L;
+
+ /**
+ * SecureRandom 的单例
+ *
+ */
+ private static class Holder
+ {
+ static final SecureRandom numberGenerator = getSecureRandom();
+ }
+
+ /** 此UUID的最高64有效位 */
+ private final long mostSigBits;
+
+ /** 此UUID的最低64有效位 */
+ private final long leastSigBits;
+
+ /**
+ * 私有构造
+ *
+ * @param data 数据
+ */
+ private UUID(byte[] data)
+ {
+ long msb = 0;
+ long lsb = 0;
+ assert data.length == 16 : "data must be 16 bytes in length";
+ for (int i = 0; i < 8; i++)
+ {
+ msb = (msb << 8) | (data[i] & 0xff);
+ }
+ for (int i = 8; i < 16; i++)
+ {
+ lsb = (lsb << 8) | (data[i] & 0xff);
+ }
+ this.mostSigBits = msb;
+ this.leastSigBits = lsb;
+ }
+
+ /**
+ * 使用指定的数据构造新的 UUID。
+ *
+ * @param mostSigBits 用于 {@code UUID} 的最高有效 64 位
+ * @param leastSigBits 用于 {@code UUID} 的最低有效 64 位
+ */
+ public UUID(long mostSigBits, long leastSigBits)
+ {
+ this.mostSigBits = mostSigBits;
+ this.leastSigBits = leastSigBits;
+ }
+
+ /**
+ * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的本地线程伪随机数生成器生成该 UUID。
+ *
+ * @return 随机生成的 {@code UUID}
+ */
+ public static UUID fastUUID()
+ {
+ return randomUUID(false);
+ }
+
+ /**
+ * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。
+ *
+ * @return 随机生成的 {@code UUID}
+ */
+ public static UUID randomUUID()
+ {
+ return randomUUID(true);
+ }
+
+ /**
+ * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。
+ *
+ * @param isSecure 是否使用{@link SecureRandom}如果是可以获得更安全的随机码，否则可以得到更好的性能
+ * @return 随机生成的 {@code UUID}
+ */
+ public static UUID randomUUID(boolean isSecure)
+ {
+ final Random ng = isSecure ? Holder.numberGenerator : getRandom();
+
+ byte[] randomBytes = new byte[16];
+ ng.nextBytes(randomBytes);
+ randomBytes[6] &= 0x0f; /* clear version */
+ randomBytes[6] |= 0x40; /* set to version 4 */
+ randomBytes[8] &= 0x3f; /* clear variant */
+ randomBytes[8] |= 0x80; /* set to IETF variant */
+ return new UUID(randomBytes);
+ }
+
+ /**
+ * 根据指定的字节数组获取类型 3（基于名称的）UUID 的静态工厂。
+ *
+ * @param name 用于构造 UUID 的字节数组。
+ *
+ * @return 根据指定数组生成的 {@code UUID}
+ */
+ public static UUID nameUUIDFromBytes(byte[] name)
+ {
+ MessageDigest md;
+ try
+ {
+ md = MessageDigest.getInstance("MD5");
+ }
+ catch (NoSuchAlgorithmException nsae)
+ {
+ throw new InternalError("MD5 not supported");
+ }
+ byte[] md5Bytes = md.digest(name);
+ md5Bytes[6] &= 0x0f; /* clear version */
+ md5Bytes[6] |= 0x30; /* set to version 3 */
+ md5Bytes[8] &= 0x3f; /* clear variant */
+ md5Bytes[8] |= 0x80; /* set to IETF variant */
+ return new UUID(md5Bytes);
+ }
+
+ /**
+ * 根据 {@link #toString()} 方法中描述的字符串标准表示形式创建{@code UUID}。
+ *
+ * @param name 指定 {@code UUID} 字符串
+ * @return 具有指定值的 {@code UUID}
+ * @throws IllegalArgumentException 如果 name 与 {@link #toString} 中描述的字符串表示形式不符抛出此异常
+ *
+ */
+ public static UUID fromString(String name)
+ {
+ String[] components = name.split("-");
+ if (components.length != 5)
+ {
+ throw new IllegalArgumentException("Invalid UUID string: " + name);
+ }
+ for (int i = 0; i < 5; i++)
+ {
+ components[i] = "0x" + components[i];
+ }
+
+ long mostSigBits = Long.decode(components[0]).longValue();
+ mostSigBits <<= 16;
+ mostSigBits |= Long.decode(components[1]).longValue();
+ mostSigBits <<= 16;
+ mostSigBits |= Long.decode(components[2]).longValue();
+
+ long leastSigBits = Long.decode(components[3]).longValue();
+ leastSigBits <<= 48;
+ leastSigBits |= Long.decode(components[4]).longValue();
+
+ return new UUID(mostSigBits, leastSigBits);
+ }
+
+ /**
+ * 返回此 UUID 的 128 位值中的最低有效 64 位。
+ *
+ * @return 此 UUID 的 128 位值中的最低有效 64 位。
+ */
+ public long getLeastSignificantBits()
+ {
+ return leastSigBits;
+ }
+
+ /**
+ * 返回此 UUID 的 128 位值中的最高有效 64 位。
+ *
+ * @return 此 UUID 的 128 位值中最高有效 64 位。
+ */
+ public long getMostSignificantBits()
+ {
+ return mostSigBits;
+ }
+
+ /**
+ * 与此 {@code UUID} 相关联的版本号. 版本号描述此 {@code UUID} 是如何生成的。
+ * <p>
+ * 版本号具有以下含意:
+ * <ul>
+ * <li>1 基于时间的 UUID
+ * <li>2 DCE 安全 UUID
+ * <li>3 基于名称的 UUID
+ * <li>4 随机生成的 UUID
+ * </ul>
+ *
+ * @return 此 {@code UUID} 的版本号
+ */
+ public int version()
+ {
+ // Version is bits masked by 0x000000000000F000 in MS long
+ return (int) ((mostSigBits >> 12) & 0x0f);
+ }
+
+ /**
+ * 与此 {@code UUID} 相关联的变体号。变体号描述 {@code UUID} 的布局。
+ * <p>
+ * 变体号具有以下含意：
+ * <ul>
+ * <li>0 为 NCS 向后兼容保留
+ * <li>2 <a href="http://www.ietf.org/rfc/rfc4122.txt">IETF RFC 4122</a>(Leach-Salz), 用于此类
+ * <li>6 保留，微软向后兼容
+ * <li>7 保留供以后定义使用
+ * </ul>
+ *
+ * @return 此 {@code UUID} 相关联的变体号
+ */
+ public int variant()
+ {
+ // This field is composed of a varying number of bits.
+ // 0 - - Reserved for NCS backward compatibility
+ // 1 0 - The IETF aka Leach-Salz variant (used by this class)
+ // 1 1 0 Reserved, Microsoft backward compatibility
+ // 1 1 1 Reserved for future definition.
+ return (int) ((leastSigBits >>> (64 - (leastSigBits >>> 62))) & (leastSigBits >> 63));
+ }
+
+ /**
+ * 与此 UUID 相关联的时间戳值。
+ *
+ * <p>
+ * 60 位的时间戳值根据此 {@code UUID} 的 time_low、time_mid 和 time_hi 字段构造。<br>
+ * 所得到的时间戳以 100 毫微秒为单位，从 UTC（通用协调时间） 1582 年 10 月 15 日零时开始。
+ *
+ * <p>
+ * 时间戳值仅在在基于时间的 UUID（其 version 类型为 1）中才有意义。<br>
+ * 如果此 {@code UUID} 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。
+ *
+ * @throws UnsupportedOperationException 如果此 {@code UUID} 不是 version 为 1 的 UUID。
+ */
+ public long timestamp() throws UnsupportedOperationException
+ {
+ checkTimeBase();
+ return (mostSigBits & 0x0FFFL) << 48//
+ | ((mostSigBits >> 16) & 0x0FFFFL) << 32//
+ | mostSigBits >>> 32;
+ }
+
+ /**
+ * 与此 UUID 相关联的时钟序列值。
+ *
+ * <p>
+ * 14 位的时钟序列值根据此 UUID 的 clock_seq 字段构造。clock_seq 字段用于保证在基于时间的 UUID 中的时间唯一性。
+ * <p>
+ * {@code clockSequence} 值仅在基于时间的 UUID（其 version 类型为 1）中才有意义。 如果此 UUID 不是基于时间的 UUID，则此方法抛出
+ * UnsupportedOperationException。
+ *
+ * @return 此 {@code UUID} 的时钟序列
+ *
+ * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
+ */
+ public int clockSequence() throws UnsupportedOperationException
+ {
+ checkTimeBase();
+ return (int) ((leastSigBits & 0x3FFF000000000000L) >>> 48);
+ }
+
+ /**
+ * 与此 UUID 相关的节点值。
+ *
+ * <p>
+ * 48 位的节点值根据此 UUID 的 node 字段构造。此字段旨在用于保存机器的 IEEE 802 地址，该地址用于生成此 UUID 以保证空间唯一性。
+ * <p>
+ * 节点值仅在基于时间的 UUID（其 version 类型为 1）中才有意义。<br>
+ * 如果此 UUID 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。
+ *
+ * @return 此 {@code UUID} 的节点值
+ *
+ * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
+ */
+ public long node() throws UnsupportedOperationException
+ {
+ checkTimeBase();
+ return leastSigBits & 0x0000FFFFFFFFFFFFL;
+ }
+
+ /**
+ * 返回此{@code UUID} 的字符串表现形式。
+ *
+ * <p>
+ * UUID 的字符串表示形式由此 BNF 描述：
+ *
+ * <pre>
+ * {@code
+ * UUID = <time_low>-<time_mid>-<time_high_and_version>-<variant_and_sequence>-<node>
+ * time_low = 4*<hexOctet>
+ * time_mid = 2*<hexOctet>
+ * time_high_and_version = 2*<hexOctet>
+ * variant_and_sequence = 2*<hexOctet>
+ * node = 6*<hexOctet>
+ * hexOctet = <hexDigit><hexDigit>
+ * hexDigit = [0-9a-fA-F]
+ * }
+ * </pre>
+ *
+ * </blockquote>
+ *
+ * @return 此{@code UUID} 的字符串表现形式
+ * @see #toString(boolean)
+ */
+ @Override
+ public String toString()
+ {
+ return toString(false);
+ }
+
+ /**
+ * 返回此{@code UUID} 的字符串表现形式。
+ *
+ * <p>
+ * UUID 的字符串表示形式由此 BNF 描述：
+ *
+ * <pre>
+ * {@code
+ * UUID = <time_low>-<time_mid>-<time_high_and_version>-<variant_and_sequence>-<node>
+ * time_low = 4*<hexOctet>
+ * time_mid = 2*<hexOctet>
+ * time_high_and_version = 2*<hexOctet>
+ * variant_and_sequence = 2*<hexOctet>
+ * node = 6*<hexOctet>
+ * hexOctet = <hexDigit><hexDigit>
+ * hexDigit = [0-9a-fA-F]
+ * }
+ * </pre>
+ *
+ * </blockquote>
+ *
+ * @param isSimple 是否简单模式，简单模式为不带'-'的UUID字符串
+ * @return 此{@code UUID} 的字符串表现形式
+ */
+ public String toString(boolean isSimple)
+ {
+ final StringBuilder builder = new StringBuilder(isSimple ? 32 : 36);
+ // time_low
+ builder.append(digits(mostSigBits >> 32, 8));
+ if (!isSimple)
+ {
+ builder.append('-');
+ }
+ // time_mid
+ builder.append(digits(mostSigBits >> 16, 4));
+ if (!isSimple)
+ {
+ builder.append('-');
+ }
+ // time_high_and_version
+ builder.append(digits(mostSigBits, 4));
+ if (!isSimple)
+ {
+ builder.append('-');
+ }
+ // variant_and_sequence
+ builder.append(digits(leastSigBits >> 48, 4));
+ if (!isSimple)
+ {
+ builder.append('-');
+ }
+ // node
+ builder.append(digits(leastSigBits, 12));
+
+ return builder.toString();
+ }
+
+ /**
+ * 返回此 UUID 的哈希码。
+ *
+ * @return UUID 的哈希码值。
+ */
+ @Override
+ public int hashCode()
+ {
+ long hilo = mostSigBits ^ leastSigBits;
+ return ((int) (hilo >> 32)) ^ (int) hilo;
+ }
+
+ /**
+ * 将此对象与指定对象比较。
+ * <p>
+ * 当且仅当参数不为 {@code null}、而是一个 UUID 对象、具有与此 UUID 相同的 varriant、包含相同的值（每一位均相同）时，结果才为 {@code true}。
+ *
+ * @param obj 要与之比较的对象
+ *
+ * @return 如果对象相同，则返回 {@code true}；否则返回 {@code false}
+ */
+ @Override
+ public boolean equals(Object obj)
+ {
+ if ((null == obj) || (obj.getClass() != UUID.class))
+ {
+ return false;
+ }
+ UUID id = (UUID) obj;
+ return (mostSigBits == id.mostSigBits && leastSigBits == id.leastSigBits);
+ }
+
+ // Comparison Operations
+
+ /**
+ * 将此 UUID 与指定的 UUID 比较。
+ *
+ * <p>
+ * 如果两个 UUID 不同，且第一个 UUID 的最高有效字段大于第二个 UUID 的对应字段，则第一个 UUID 大于第二个 UUID。
+ *
+ * @param val 与此 UUID 比较的 UUID
+ *
+ * @return 在此 UUID 小于、等于或大于 val 时，分别返回 -1、0 或 1。
+ *
+ */
+ @Override
+ public int compareTo(UUID val)
+ {
+ // The ordering is intentionally set up so that the UUIDs
+ // can simply be numerically compared as two numbers
+ return (this.mostSigBits < val.mostSigBits ? -1 : //
+ (this.mostSigBits > val.mostSigBits ? 1 : //
+ (this.leastSigBits < val.leastSigBits ? -1 : //
+ (this.leastSigBits > val.leastSigBits ? 1 : //
+ 0))));
+ }
+
+ // -------------------------------------------------------------------------------------------------------------------
+ // Private method start
+ /**
+ * 返回指定数字对应的hex值
+ *
+ * @param val 值
+ * @param digits 位
+ * @return 值
+ */
+ private static String digits(long val, int digits)
+ {
+ long hi = 1L << (digits * 4);
+ return Long.toHexString(hi | (val & (hi - 1))).substring(1);
+ }
+
+ /**
+ * 检查是否为time-based版本UUID
+ */
+ private void checkTimeBase()
+ {
+ if (version() != 1)
+ {
+ throw new UnsupportedOperationException("Not a time-based UUID");
+ }
+ }
+
+ /**
+ * 获取{@link SecureRandom}，类提供加密的强随机数生成器 (RNG)
+ *
+ * @return {@link SecureRandom}
+ */
+ public static SecureRandom getSecureRandom()
+ {
+ try
+ {
+ return SecureRandom.getInstance("SHA1PRNG");
+ }
+ catch (NoSuchAlgorithmException e)
+ {
+ throw new UtilException(e);
+ }
+ }
+
+ /**
+ * 获取随机数生成器对象<br>
+ * ThreadLocalRandom是JDK 7之后提供并发产生随机数，能够解决多个线程发生的竞争争夺。
+ *
+ * @return {@link ThreadLocalRandom}
+ */
+ public static ThreadLocalRandom getRandom()
+ {
+ return ThreadLocalRandom.current();
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/WxSubscribeDTO.java b/flower_city/src/main/java/com/dg/core/util/WxSubscribeDTO.java
new file mode 100644
index 0000000..0663af3
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/WxSubscribeDTO.java
@@ -0,0 +1,61 @@
+package com.dg.core.util;
+
+import java.util.List;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+
+@ApiModel("微信订阅消息请求参数")
+@Data
+public class WxSubscribeDTO {
+
+ @ApiModelProperty("用户在小程序的openid")
+ private String touser;
+
+ @ApiModelProperty("所需下发的订阅模板id")
+ private String template_id;
+
+ @ApiModelProperty("点击模板卡片后的跳转页面，仅限本小程序内的页面。支持带参数,（示例index?foo=bar）。该字段不填则模板无跳转。")
+ private String page;
+
+ @ApiModelProperty("模板内容，格式形如 { \"key1\": { \"value\": any }, \"key2\": { \"value\": any } }")
+ private Object data;
+
+ @ApiModelProperty("跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版")
+ private String miniprogram_state;
+
+ @ApiModelProperty("进入小程序查看”的语言类型，支持zh_CN(简体中文)、en_US(英文)、zh_HK(繁体中文)、zh_TW(繁体中文)，默认为zh_CN")
+ private String lang;
+
+ private List<TemplateParam> templateParamList;
+
+ public String toJSON() {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("{");
+ buffer.append(String.format("\"touser\":\"%s\"", this.touser)).append(",");
+ buffer.append(String.format("\"template_id\":\"%s\"", this.template_id)).append(",");
+ if (StringUtils.isNotEmpty(this.page)) {
+ buffer.append(String.format("\"page\":\"%s\"", this.page)).append(",");
+ }
+ if (StringUtils.isNotEmpty(this.miniprogram_state)) {
+ buffer.append(String.format("\"miniprogram_state\":\"%s\"", this.miniprogram_state)).append(",");
+ }
+ buffer.append("\"data\":{");
+ TemplateParam param = null;
+ for (int i = 0; i < this.templateParamList.size(); i++) {
+ param = templateParamList.get(i);
+ // 判断是否追加逗号
+ if (i < this.templateParamList.size() - 1) {
+ buffer.append(String.format("\"%s\": {\"value\":\"%s\"},", param.getKey(), param.getValue()));
+ } else {
+ buffer.append(String.format("\"%s\": {\"value\":\"%s\"}", param.getKey(), param.getValue()));
+ }
+ }
+ buffer.append("}");
+ buffer.append("}");
+ return buffer.toString();
+ }
+}
\ No newline at end of file
diff --git a/flower_city/src/main/java/com/dg/core/util/WxUtil.java b/flower_city/src/main/java/com/dg/core/util/WxUtil.java
new file mode 100644
index 0000000..2a5a78c
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/WxUtil.java
@@ -0,0 +1,297 @@
+package com.dg.core.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.db.gen.entity.GuideEvolveEntity;
+import com.dg.core.db.gen.entity.GuideRepairOrder;
+import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.db.manual.mapper.util.ConstantPropertiesUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.*;
+
+@Slf4j
+@Component
+public class WxUtil {
+
+ private static String ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential";
+
+ private static String miniprogramState="trial";//trial 为测试版 formal 为正式版 切记发布版本时候改为正式版
+
+ @Resource(name = "stringRedisTemplate")
+ private StringRedisTemplate stringRedisTemplate;
+
+ private static WxUtil wxUtil;
+
+ @PostConstruct
+ public void init() {
+ wxUtil = this;
+ wxUtil.stringRedisTemplate = this.stringRedisTemplate;
+ }
+
+ /**
+ * 获取花城token，（ps:0=token获取失败）
+ *
+ * @return
+ */
+ public String getBatteryCarAccessToken() throws Exception {
+ String accessToken = "0";
+// try {
+// // 此处APP_ID APP_SECRET 在微信小程序后端可见
+// // String accessTokenUrl = String.format(TEMP_URL, APP_ID, APP_SECRET);
+// String accessTokenUrl = ACCESS_TOKEN_URL + "&appid=" + ConstantPropertiesUtil.WX_OPEN_APP_ID
+// + "&secret=" +ConstantPropertiesUtil.WX_OPEN_APP_SECRET;
+// String result = httpGet(accessTokenUrl, null, null);
+// Map<String, Object> resultMap = JSON.parseObject(result, Map.class);
+// if (resultMap.containsKey("access_token")) {
+// accessToken = resultMap.get("access_token").toString();
+// }
+// } catch (IOException ioe) {
+// ioe.printStackTrace();
+// }
+ accessToken =wxUtil.stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get();
+ return accessToken;
+ }
+
+
+ /**
+ * http请求工具类，get请求
+ *
+ * @param url
+ * @param params
+ * @param resonseCharSet
+ * @return
+ * @throws Exception
+ */
+ public static String httpGet(String url, Map<String, Object> params, String... resonseCharSet) throws Exception {
+ DefaultHttpClient defaultHttpClient = null;
+ BufferedReader bufferedReader = null;
+ try {
+ defaultHttpClient = new DefaultHttpClient();
+ if (params != null) {
+ StringBuilder stringBuilder = new StringBuilder();
+ Iterator<String> iterator = params.keySet().iterator();
+ String key;
+ while (iterator.hasNext()) {
+ key = iterator.next();
+ Object val = params.get(key);
+ if (val instanceof List) {
+ List v = (List) val;
+ for (Object o : v) {
+ stringBuilder.append(key).append("=").append(o.toString()).append("&");
+ }
+ } else {
+ stringBuilder.append(key).append("=").append(val.toString()).append("&");
+ }
+ }
+ stringBuilder.deleteCharAt(stringBuilder.length() - 1);
+ url = url + "?" + stringBuilder.toString();
+ }
+ HttpGet httpGet = new HttpGet(url);
+ httpGet.setHeader("Content-Type", "application/json;charset=ut-8");
+ HttpResponse httpResponse = defaultHttpClient.execute(httpGet);
+ if (httpResponse.getStatusLine().getStatusCode() != 200) {
+ String errorLog = "请求失败，errorCode:" + httpResponse.getStatusLine().getStatusCode();
+
+ throw new Exception(url + errorLog);
+ }
+ // 读取返回信息
+ String charSet = "utf-8";
+ if (resonseCharSet != null && resonseCharSet.length > 0)
+ charSet = resonseCharSet[0];
+ String output;
+ bufferedReader = new BufferedReader(new InputStreamReader(httpResponse.getEntity().getContent(), charSet));
+
+ StringBuilder dataBuilder = new StringBuilder();
+ while ((output = bufferedReader.readLine()) != null) {
+ dataBuilder.append(output);
+ }
+ return dataBuilder.toString();
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw e;
+ } finally {
+ if (defaultHttpClient != null)
+ defaultHttpClient.getConnectionManager().shutdown();
+ if (bufferedReader != null)
+ bufferedReader.close();
+ }
+ }
+
+ /**
+ * http请求工具类，post请求
+ *
+ * @param url url
+ * @param param 参数值 仅支持String
+ * @return
+ * @throws Exception
+ */
+ public static String httpPost(String url, String param) throws Exception {
+ DefaultHttpClient defaultHttpClient = null;
+ BufferedReader bufferedReader = null;
+ try {
+ defaultHttpClient = new DefaultHttpClient();
+ HttpPost httpPost = new HttpPost(url);
+ httpPost.setHeader("Content-Type", "application/json;charset=ut-8");
+ if (StringUtils.isNotBlank(param)) {
+ HttpEntity httpEntity = new StringEntity(param, "utf-8");
+ httpPost.setEntity(httpEntity);
+ }
+ HttpResponse httpResponse = defaultHttpClient.execute(httpPost);
+ if (httpResponse.getStatusLine().getStatusCode() != 200) {
+ String errorLog = "请求失败，errorCode:" + httpResponse.getStatusLine().getStatusCode();
+ throw new Exception(url + errorLog);
+ }
+ // 读取返回信息
+ String output;
+ bufferedReader = new BufferedReader(new InputStreamReader(httpResponse.getEntity().getContent(), "utf-8"));
+ StringBuilder stringBuilder = new StringBuilder();
+ while ((output = bufferedReader.readLine()) != null) {
+ stringBuilder.append(output);
+ }
+ return stringBuilder.toString();
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw e;
+ } finally {
+ if (defaultHttpClient != null)
+ defaultHttpClient.getConnectionManager().shutdown();
+ if (bufferedReader != null)
+ bufferedReader.close();
+ }
+ }
+
+
+
+ public static String wxMessageModeSendUrl(String token, WxSubscribeDTO subscribeDTO) throws Exception {
+ String tmpurl = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=ACCESS_TOKEN";
+ String url = tmpurl.replace("ACCESS_TOKEN", token);
+ return httpPost(url, subscribeDTO.toJSON());
+ }
+
+ /**
+ * 订阅消息推送
+ *
+ * @param accessToken
+ * 获取会话token
+ * @return 消息推送结果
+ */
+ static void sendSubscribe(String accessToken, WxSubscribeDTO subscribeDTO) throws Exception {
+ String resultString = wxMessageModeSendUrl(accessToken, subscribeDTO);
+ JSONObject jsonResult = JSON.parseObject(resultString);
+ if (jsonResult != null) {
+ int errorCode = jsonResult.getIntValue("errcode");
+ String errorMessage = jsonResult.getString("errmsg");
+ if (errorCode == 0) {
+ System.out.println("订阅消息推送成功，openId：" + subscribeDTO.getTouser());
+ } else {
+ System.out.println(
+ "订阅消息发送失败，错误码：" + errorCode + ",错误信息：" + errorMessage + "用户openid：" + subscribeDTO.getTouser());
+ }
+ }
+ }
+
+ /**
+ * 工单完成推送
+ *
+ * @param openId
+ * 用户openid
+ * @param accessToken
+ * token会话标识
+ */
+ public void sendGuideRepairOrderComplete(String openId, String accessToken, String templateId, GuideEvolveEntity guideRepairOrder){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ subscribeDTO.setMiniprogram_state(miniprogramState);
+ subscribeDTO.setPage("packageE/pages/myApply/myApply");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ Calendar calendar = Calendar.getInstance();
+ paras.add(new TemplateParam("thing1","导办申请"));//业务办理类型
+ paras.add(new TemplateParam("thing3",guideRepairOrder.getRemark()));
+ paras.add(new TemplateParam("phrase8","已完成"));
+ calendar.setTime(new Date());
+ paras.add(new TemplateParam("time4",calendar.get(Calendar.YEAR)+"年"+(calendar.get(Calendar.MONTH)+1)+"月"+calendar.get(Calendar.DATE)+"日"));//结束日期
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ System.out.println(e.getMessage());
+ }
+ }
+
+
+ /**
+ * 工单提交推送
+ *
+ * @param openId
+ * 用户openid
+ * @param accessToken
+ * token会话标识
+ */
+ public void sendGuideRepairOrderSubmit(String openId, String accessToken, String templateId, GuideRepairOrder guideRepairOrder){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ subscribeDTO.setMiniprogram_state(miniprogramState);
+ subscribeDTO.setPage("packageE/pages/applyHandle/index/index");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing4","您有一个新的导办工单需要处理"));//工单新增提示内容
+ paras.add(new TemplateParam("thing2",guideRepairOrder.getConsultUserName()));//咨询人
+ paras.add(new TemplateParam("thing3",guideRepairOrder.getConsultContent()));//咨询内容
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ System.out.println(e.getMessage());
+ }
+ }
+
+
+ /**
+ * 工单超时推送
+ *
+ * @param openId
+ * 用户openid
+ * @param accessToken
+ * token会话标识
+ */
+ public void sendGuideRepairOrderOvertime(String openId, String accessToken, String templateId, SysUser sysUser){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ subscribeDTO.setMiniprogram_state(miniprogramState);
+ subscribeDTO.setPage("packageE/pages/applyHandle/index/index");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(new Date());
+ paras.add(new TemplateParam("time1",calendar.get(Calendar.YEAR)+"年"+(calendar.get(Calendar.MONTH)+1)+"月"+calendar.get(Calendar.DATE)+"日"));//超时时间
+ paras.add(new TemplateParam("thing2",sysUser.getUserName()+"导办人员有个工单已超时"));//咨询人
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ System.out.println(e.getMessage());
+ }
+ }
+
+
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2001.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2001.java
new file mode 100644
index 0000000..bdb7382
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2001.java
@@ -0,0 +1,31 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2001 implements Year20xx {
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20010120", false); // 班
+ map.put("20010121", false); // 班
+ map.put("20010124", true); // 休
+ map.put("20010125", true); // 休
+ map.put("20010126", true); // 休
+ map.put("20010129", true); // 休
+ map.put("20010130", true); // 休
+ map.put("20010428", false); // 班
+ map.put("20010429", false); // 班
+ map.put("20010501", true); // 休
+ map.put("20010502", true); // 休
+ map.put("20010503", true); // 休
+ map.put("20010504", true); // 休
+ map.put("20010507", true); // 休
+ map.put("20010929", false); // 班
+ map.put("20010930", false); // 班
+ map.put("20011001", true); // 休
+ return map;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2002.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2002.java
new file mode 100644
index 0000000..bb8ec95
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2002.java
@@ -0,0 +1,31 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2002 implements Year20xx {
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20020101", true); // 休
+ map.put("20020102", true); // 休
+ map.put("20020103", true); // 休
+ map.put("20020209", false); // 班
+ map.put("20020210", false); // 班
+ map.put("20020212", true); // 休
+ map.put("20020213", true); // 休
+ map.put("20020214", true); // 休
+ map.put("20020215", true); // 休
+ map.put("20020218", true); // 休
+ map.put("20020427", false); // 班
+ map.put("20020428", false); // 班
+ map.put("20020501", true); // 休
+ map.put("20020502", true); // 休
+ map.put("20020503", true); // 休
+ map.put("20020506", true); // 休
+ map.put("20020507", true); // 休
+ return map;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2003.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2003.java
new file mode 100644
index 0000000..c3b38e1
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2003.java
@@ -0,0 +1,31 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2003 implements Year20xx {
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20030101", true); // 休
+ map.put("20030203", true); // 休
+ map.put("20030204", true); // 休
+ map.put("20030205", true); // 休
+ map.put("20030206", true); // 休
+ map.put("20030207", true); // 休
+ map.put("20030208", false); // 班
+ map.put("20030209", false); // 班
+ map.put("20030426", false); // 班
+ map.put("20030427", false); // 班
+ map.put("20030501", true); // 休
+ map.put("20030502", true); // 休
+ map.put("20030505", true); // 休
+ map.put("20030506", true); // 休
+ map.put("20030507", true); // 休
+ map.put("20030927", false); // 班
+ map.put("20030928", false); // 班
+ return map;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2004.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2004.java
new file mode 100644
index 0000000..db9a9f5
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2004.java
@@ -0,0 +1,31 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2004 implements Year20xx {
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20040101", true); // 休
+ map.put("20040117", false); // 班
+ map.put("20040118", false); // 班
+ map.put("20040122", true); // 休
+ map.put("20040123", true); // 休
+ map.put("20040126", true); // 休
+ map.put("20040127", true); // 休
+ map.put("20040128", true); // 休
+ map.put("20040503", true); // 休
+ map.put("20040504", true); // 休
+ map.put("20040505", true); // 休
+ map.put("20040506", true); // 休
+ map.put("20040507", true); // 休
+ map.put("20040508", false); // 班
+ map.put("20040509", false); // 班
+ map.put("20041001", true); // 休
+ map.put("20041003", true); // 休
+ return map;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2005.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2005.java
new file mode 100644
index 0000000..05d2f89
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2005.java
@@ -0,0 +1,31 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2005 implements Year20xx {
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20050103", true); // 休
+ map.put("20050205", false); // 班
+ map.put("20050206", false); // 班
+ map.put("20050209", true); // 休
+ map.put("20050210", true); // 休
+ map.put("20050211", true); // 休
+ map.put("20050214", true); // 休
+ map.put("20050215", true); // 休
+ map.put("20050430", false); // 班
+ map.put("20050502", true); // 休
+ map.put("20050503", true); // 休
+ map.put("20050504", true); // 休
+ map.put("20050505", true); // 休
+ map.put("20050506", true); // 休
+ map.put("20050508", false); // 班
+ map.put("20051003", true); // 休
+ map.put("20051004", true); // 休
+ return map;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2006.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2006.java
new file mode 100644
index 0000000..45c1a30
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2006.java
@@ -0,0 +1,31 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2006 implements Year20xx {
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20060102", true); // 休
+ map.put("20060103", true); // 休
+ map.put("20060128", false); // 班
+ map.put("20060130", true); // 休
+ map.put("20060131", true); // 休
+ map.put("20060201", true); // 休
+ map.put("20060202", true); // 休
+ map.put("20060203", true); // 休
+ map.put("20060205", false); // 班
+ map.put("20060429", false); // 班
+ map.put("20060430", false); // 班
+ map.put("20060501", true); // 休
+ map.put("20060502", true); // 休
+ map.put("20060503", true); // 休
+ map.put("20060504", true); // 休
+ map.put("20060505", true); // 休
+ map.put("20060930", false); // 班
+ return map;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2007.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2007.java
new file mode 100644
index 0000000..4aba4ec
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2007.java
@@ -0,0 +1,31 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2007 implements Year20xx {
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20070101", true); // 休
+ map.put("20070102", true); // 休
+ map.put("20070103", true); // 休
+ map.put("20070217", false); // 班
+ map.put("20070219", true); // 休
+ map.put("20070220", true); // 休
+ map.put("20070221", true); // 休
+ map.put("20070222", true); // 休
+ map.put("20070223", true); // 休
+ map.put("20070225", false); // 班
+ map.put("20070428", false); // 班
+ map.put("20070429", false); // 班
+ map.put("20070501", true); // 休
+ map.put("20070502", true); // 休
+ map.put("20070503", true); // 休
+ map.put("20070504", true); // 休
+ map.put("20070507", true); // 休
+ return map;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2008.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2008.java
new file mode 100644
index 0000000..44618ea
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2008.java
@@ -0,0 +1,31 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2008 implements Year20xx {
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20080101", true); // 休
+ map.put("20080203", false); // 班
+ map.put("20080206", true); // 休
+ map.put("20080207", true); // 休
+ map.put("20080208", true); // 休
+ map.put("20080211", true); // 休
+ map.put("20080212", true); // 休
+ map.put("20080404", true); // 休
+ map.put("20080501", true); // 休
+ map.put("20080502", true); // 休
+ map.put("20080504", false); // 班
+ map.put("20080609", true); // 休
+ map.put("20080915", true); // 休
+ map.put("20080927", false); // 班
+ map.put("20080928", false); // 班
+ map.put("20080929", true); // 休
+ map.put("20080930", true); // 休
+ return map;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2009.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2009.java
new file mode 100644
index 0000000..39e507a
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2009.java
@@ -0,0 +1,31 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2009 implements Year20xx {
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20090101", true); // 休
+ map.put("20090102", true); // 休
+ map.put("20090104", false); // 班
+ map.put("20090124", false); // 班
+ map.put("20090126", true); // 休
+ map.put("20090127", true); // 休
+ map.put("20090128", true); // 休
+ map.put("20090129", true); // 休
+ map.put("20090130", true); // 休
+ map.put("20090201", false); // 班
+ map.put("20090406", true); // 休
+ map.put("20090501", true); // 休
+ map.put("20090528", true); // 休
+ map.put("20090529", true); // 休
+ map.put("20090531", false); // 班
+ map.put("20090927", false); // 班
+ map.put("20091001", true); // 休
+ return map;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2010.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2010.java
new file mode 100644
index 0000000..3956873
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2010.java
@@ -0,0 +1,31 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2010 implements Year20xx {
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20100101", true); // 休
+ map.put("20100215", true); // 休
+ map.put("20100216", true); // 休
+ map.put("20100217", true); // 休
+ map.put("20100218", true); // 休
+ map.put("20100219", true); // 休
+ map.put("20100220", false); // 班
+ map.put("20100221", false); // 班
+ map.put("20100405", true); // 休
+ map.put("20100503", true); // 休
+ map.put("20100612", false); // 班
+ map.put("20100613", false); // 班
+ map.put("20100614", true); // 休
+ map.put("20100615", true); // 休
+ map.put("20100616", true); // 休
+ map.put("20100919", false); // 班
+ map.put("20100922", true); // 休
+ return map;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2011.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2011.java
new file mode 100644
index 0000000..20889dd
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2011.java
@@ -0,0 +1,31 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2011 implements Year20xx {
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20110103", true); // 休
+ map.put("20110130", false); // 班
+ map.put("20110202", true); // 休
+ map.put("20110203", true); // 休
+ map.put("20110204", true); // 休
+ map.put("20110207", true); // 休
+ map.put("20110208", true); // 休
+ map.put("20110212", false); // 班
+ map.put("20110402", false); // 班
+ map.put("20110404", true); // 休
+ map.put("20110405", true); // 休
+ map.put("20110502", true); // 休
+ map.put("20110606", true); // 休
+ map.put("20110912", true); // 休
+ map.put("20111003", true); // 休
+ map.put("20111004", true); // 休
+ map.put("20111005", true); // 休
+ return map;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2012.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2012.java
new file mode 100644
index 0000000..f03ac13
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2012.java
@@ -0,0 +1,31 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2012 implements Year20xx {
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20120102", true); // 休
+ map.put("20120103", true); // 休
+ map.put("20120121", false); // 班
+ map.put("20120123", true); // 休
+ map.put("20120124", true); // 休
+ map.put("20120125", true); // 休
+ map.put("20120126", true); // 休
+ map.put("20120127", true); // 休
+ map.put("20120129", false); // 班
+ map.put("20120331", false); // 班
+ map.put("20120401", false); // 班
+ map.put("20120402", true); // 休
+ map.put("20120403", true); // 休
+ map.put("20120404", true); // 休
+ map.put("20120428", false); // 班
+ map.put("20120430", true); // 休
+ map.put("20120501", true); // 休
+ return map;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2013.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2013.java
new file mode 100644
index 0000000..417e4f1
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2013.java
@@ -0,0 +1,31 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2013 implements Year20xx {
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20130101", true); // 休
+ map.put("20130102", true); // 休
+ map.put("20130103", true); // 休
+ map.put("20130105", false); // 班
+ map.put("20130106", false); // 班
+ map.put("20130211", true); // 休
+ map.put("20130212", true); // 休
+ map.put("20130213", true); // 休
+ map.put("20130214", true); // 休
+ map.put("20130215", true); // 休
+ map.put("20130216", false); // 班
+ map.put("20130217", false); // 班
+ map.put("20130404", true); // 休
+ map.put("20130405", true); // 休
+ map.put("20130407", false); // 班
+ map.put("20130427", false); // 班
+ map.put("20130428", false); // 班
+ return map;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2014.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2014.java
new file mode 100644
index 0000000..86b9af7
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2014.java
@@ -0,0 +1,31 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2014 implements Year20xx {
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20140101", true); // 休
+ map.put("20140126", false); // 班
+ map.put("20140131", true); // 休
+ map.put("20140203", true); // 休
+ map.put("20140204", true); // 休
+ map.put("20140205", true); // 休
+ map.put("20140206", true); // 休
+ map.put("20140208", false); // 班
+ map.put("20140407", true); // 休
+ map.put("20140501", true); // 休
+ map.put("20140502", true); // 休
+ map.put("20140504", false); // 班
+ map.put("20140602", true); // 休
+ map.put("20140908", true); // 休
+ map.put("20140928", false); // 班
+ map.put("20141001", true); // 休
+ map.put("20141002", true); // 休
+ return map;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2015.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2015.java
new file mode 100644
index 0000000..9dac9d5
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2015.java
@@ -0,0 +1,31 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2015 implements Year20xx {
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20150101", true); // 休
+ map.put("20150102", true); // 休
+ map.put("20150104", false); // 班
+ map.put("20150215", false); // 班
+ map.put("20150218", true); // 休
+ map.put("20150219", true); // 休
+ map.put("20150220", true); // 休
+ map.put("20150223", true); // 休
+ map.put("20150224", true); // 休
+ map.put("20150228", false); // 班
+ map.put("20150406", true); // 休
+ map.put("20150501", true); // 休
+ map.put("20150622", true); // 休
+ map.put("20150903", true); // 休
+ map.put("20150904", true); // 休
+ map.put("20150906", false); // 班
+ map.put("20151001", true); // 休
+ return map;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2016.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2016.java
new file mode 100644
index 0000000..6cb2e0b
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2016.java
@@ -0,0 +1,31 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2016 implements Year20xx {
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20160101", true); // 休
+ map.put("20160206", false); // 班
+ map.put("20160208", true); // 休
+ map.put("20160209", true); // 休
+ map.put("20160210", true); // 休
+ map.put("20160211", true); // 休
+ map.put("20160212", true); // 休
+ map.put("20160214", false); // 班
+ map.put("20160404", true); // 休
+ map.put("20160502", true); // 休
+ map.put("20160609", true); // 休
+ map.put("20160610", true); // 休
+ map.put("20160612", false); // 班
+ map.put("20160915", true); // 休
+ map.put("20160916", true); // 休
+ map.put("20160918", false); // 班
+ map.put("20161003", true); // 休
+ return map;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2017.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2017.java
new file mode 100644
index 0000000..dfbebcc
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2017.java
@@ -0,0 +1,31 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2017 implements Year20xx {
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20170102", true); // 休
+ map.put("20170122", false); // 班
+ map.put("20170127", true); // 休
+ map.put("20170130", true); // 休
+ map.put("20170131", true); // 休
+ map.put("20170201", true); // 休
+ map.put("20170202", true); // 休
+ map.put("20170204", false); // 班
+ map.put("20170401", false); // 班
+ map.put("20170403", true); // 休
+ map.put("20170404", true); // 休
+ map.put("20170501", true); // 休
+ map.put("20170527", false); // 班
+ map.put("20170529", true); // 休
+ map.put("20170530", true); // 休
+ map.put("20170930", false); // 班
+ map.put("20171002", true); // 休
+ return map;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2018.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2018.java
new file mode 100644
index 0000000..4a92ace
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2018.java
@@ -0,0 +1,41 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2018 implements Year20xx {
+
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20180101", true); // 休
+ map.put("20180211", false); // 班
+ map.put("20180215", true); // 休
+ map.put("20180216", true); // 休
+ map.put("20180219", true); // 休
+ map.put("20180220", true); // 休
+ map.put("20180221", true); // 休
+ map.put("20180224", false); // 班
+ map.put("20180405", true); // 休
+ map.put("20180406", true); // 休
+ map.put("20180408", false); // 班
+ map.put("20180428", false); // 班
+ map.put("20180430", true); // 休
+ map.put("20180501", true); // 休
+ map.put("20180618", true); // 休
+ map.put("20180924", true); // 休
+ map.put("20180929", false); // 班
+ map.put("20180930", false); // 班
+ map.put("20181001", true); // 休
+ map.put("20181002", true); // 休
+ map.put("20181003", true); // 休
+ map.put("20181004", true); // 休
+ map.put("20181005", true); // 休
+ map.put("20181229", false); // 班
+ map.put("20181231", true); // 休
+ return map;
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2019.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2019.java
new file mode 100644
index 0000000..f296d62
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2019.java
@@ -0,0 +1,39 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2019 implements Year20xx {
+
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20190101", true); // 休
+ map.put("20190202", false); // 班
+ map.put("20190203", false); // 班
+ map.put("20190204", true); // 休
+ map.put("20190205", true); // 休
+ map.put("20190206", true); // 休
+ map.put("20190207", true); // 休
+ map.put("20190208", true); // 休
+ map.put("20190405", true); // 休
+ map.put("20190428", false); // 班
+ map.put("20190501", true); // 休
+ map.put("20190502", true); // 休
+ map.put("20190503", true); // 休
+ map.put("20190505", false); // 班
+ map.put("20190607", true); // 休
+ map.put("20190913", true); // 休
+ map.put("20190929", false); // 班
+ map.put("20191001", true); // 休
+ map.put("20191002", true); // 休
+ map.put("20191003", true); // 休
+ map.put("20191004", true); // 休
+ map.put("20191007", true); // 休
+ map.put("20191012", false); // 班
+ return map;
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year2020.java b/flower_city/src/main/java/com/dg/core/util/presence/Year2020.java
new file mode 100644
index 0000000..de2a26e
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year2020.java
@@ -0,0 +1,42 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Year2020 implements Year20xx {
+
+ @Override
+ public Map<String, Boolean> getYearMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ map.put("20200101", true); // 休
+ map.put("20200119", false); // 班
+ map.put("20200124", true); // 休
+ map.put("20200127", true); // 休
+ map.put("20200128", true); // 休
+ map.put("20200129", true); // 休
+ map.put("20200130", true); // 休
+ map.put("20200131", true); // 休(+)
+ // map.put("20200201", false); // 班
+ map.put("20200406", true); // 休
+ map.put("20200426", false); // 班
+ map.put("20200501", true); // 休
+ map.put("20200504", true); // 休
+ map.put("20200505", true); // 休
+ map.put("20200509", false); // 班
+ map.put("20200625", true); // 休
+ map.put("20200626", true); // 休
+ map.put("20200628", false); // 班
+ map.put("20200927", false); // 班
+ map.put("20201001", true); // 休
+ map.put("20201002", true); // 休
+ map.put("20201005", true); // 休
+ map.put("20201006", true); // 休
+ map.put("20201007", true); // 休
+ map.put("20201008", true); // 休
+ map.put("20201010", false); // 班
+ return map;
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/Year20xx.java b/flower_city/src/main/java/com/dg/core/util/presence/Year20xx.java
new file mode 100644
index 0000000..7946d3c
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/Year20xx.java
@@ -0,0 +1,7 @@
+package com.dg.core.util.presence;
+
+import java.util.Map;
+
+public interface Year20xx {
+ public Map<String, Boolean> getYearMap();
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/presence/YearMap.java b/flower_city/src/main/java/com/dg/core/util/presence/YearMap.java
new file mode 100644
index 0000000..a6bf1f3
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/presence/YearMap.java
@@ -0,0 +1,84 @@
+package com.dg.core.util.presence;
+
+import com.iceyyy.icework.presence.Year2001;
+import com.iceyyy.icework.presence.Year2002;
+import com.iceyyy.icework.presence.Year2003;
+import com.iceyyy.icework.presence.Year2004;
+import com.iceyyy.icework.presence.Year2005;
+import com.iceyyy.icework.presence.Year2006;
+import com.iceyyy.icework.presence.Year2007;
+import com.iceyyy.icework.presence.Year2008;
+import com.iceyyy.icework.presence.Year2009;
+import com.iceyyy.icework.presence.Year2010;
+import com.iceyyy.icework.presence.Year2011;
+import com.iceyyy.icework.presence.Year2012;
+import com.iceyyy.icework.presence.Year2013;
+import com.iceyyy.icework.presence.Year2014;
+import com.iceyyy.icework.presence.Year2015;
+import com.iceyyy.icework.presence.Year2016;
+import com.iceyyy.icework.presence.Year2017;
+import com.iceyyy.icework.presence.Year2018;
+import com.iceyyy.icework.presence.Year2019;
+import com.iceyyy.icework.presence.Year2020;
+import com.iceyyy.icework.presence.Year20xx;
+
+import java.util.Map;
+
+public class YearMap {
+
+ public static void main(String[] args) {
+ int year = 2001;
+ System.out.println(YearMap.yearMap(year));
+ }
+
+ public static Map<String, Boolean> yearMap(int year) {
+ com.iceyyy.icework.presence.Year20xx createMap = createMap(year);
+ return createMap.getYearMap();
+ }
+
+ private static Year20xx createMap(int year) {
+ if (year == 2001) {
+ return new Year2001();
+ } else if (year == 2002) {
+ return new Year2002();
+ } else if (year == 2003) {
+ return new Year2003();
+ } else if (year == 2004) {
+ return new Year2004();
+ } else if (year == 2005) {
+ return new Year2005();
+ } else if (year == 2006) {
+ return new Year2006();
+ } else if (year == 2007) {
+ return new Year2007();
+ } else if (year == 2008) {
+ return new Year2008();
+ } else if (year == 2009) {
+ return new Year2009();
+ } else if (year == 2010) {
+ return new Year2010();
+ } else if (year == 2011) {
+ return new Year2011();
+ } else if (year == 2012) {
+ return new Year2012();
+ } else if (year == 2013) {
+ return new Year2013();
+ } else if (year == 2014) {
+ return new Year2014();
+ } else if (year == 2015) {
+ return new Year2015();
+ } else if (year == 2016) {
+ return new Year2016();
+ } else if (year == 2017) {
+ return new Year2017();
+ } else if (year == 2018) {
+ return new Year2018();
+ } else if (year == 2019) {
+ return new Year2019();
+ } else if (year == 2020) {
+ return new Year2020();
+ }
+ return null;
+ }
+
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/workday/Data.java b/flower_city/src/main/java/com/dg/core/util/workday/Data.java
new file mode 100644
index 0000000..a832c39
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/workday/Data.java
@@ -0,0 +1,19 @@
+package com.dg.core.util.workday;
+
+public class Data {
+ private int date;
+ private boolean repose;
+
+ public Data(int date, boolean repose) {
+ this.date = date;
+ this.repose = repose;
+ }
+
+ public int getDate() {
+ return date;
+ }
+
+ public boolean getRepose() {
+ return repose;
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/workday/WorkUtils.java b/flower_city/src/main/java/com/dg/core/util/workday/WorkUtils.java
new file mode 100644
index 0000000..63d3f40
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/workday/WorkUtils.java
@@ -0,0 +1,699 @@
+package com.dg.core.util.workday;
+
+import com.iceyyy.icework.presence.YearMap;
+import com.iceyyy.nongli.NongLi;
+import com.iceyyy.workday.Data;
+
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.Map.Entry;
+
+/**
+ * iceworkday工作日算法
+ * @author IceWater zxcyhn@126.com
+ */
+public class WorkUtils {
+
+ public static Map<String, Boolean> weekendMap(String year) {
+ if (year == null || "".equals(year.trim())) {
+ throw new RuntimeException("传入的参数为空");
+ }
+ if (year.length() != 4) {
+ throw new RuntimeException("传入的参数格式错误，应传入yyyyMMdd格式的日期");
+ }
+ int yearNum = Integer.parseInt(year.substring(0, 4));
+ if (yearNum < 2001) {
+ throw new RuntimeException("工作日计算年份需要大于等于2001");
+ } else if (yearNum > 2017) {
+ Map<String, Boolean> mapFromFile = weekMapFromFile();
+ mapFromFile = filterMap(mapFromFile, yearNum);
+ Map<String, Boolean> map = complexCalculate(yearNum);
+ if (mapFromFile.size() != 0) {
+ map.putAll(mapFromFile);
+ }
+ return map;
+ } else {
+ Map<String, Boolean> map = YearMap.yearMap(yearNum);
+ return map;
+ }
+ }
+
+ public static boolean isWorkendDay(String ymd) {
+ if (ymd == null || "".equals(ymd)) {
+ throw new RuntimeException("输入的日期不能为空");
+ }
+ ymd = convertDate(ymd);
+ if("19991230".equals(ymd)) {
+ return true;
+ }
+ if("19991231".equals(ymd)) {
+ return true;
+ }
+ String yearStr = ymd.substring(0, 4);
+ Map<String, Boolean> weekendMap = weekendMap(yearStr);
+ Boolean isWeekend = weekendMap.get(ymd);
+ if (isWeekend == null) {
+ int day = getWeekDay(ymd);
+ if (day == 0 || day == 6) {
+ return true;
+ } else {
+ return false;
+ }
+ } else {
+ return isWeekend;
+ }
+ }
+
+ private static String convertDate(String dateStr) {
+ String[] array = null;
+ if (dateStr.contains("-")) {
+ array = dateStr.split("-");
+ } else if (dateStr.contains(".")) {
+ array = dateStr.split("\\.");
+ } else if (dateStr.contains("/")) {
+ array = dateStr.split("/");
+ } else if (dateStr.contains("_")) {
+ array = dateStr.split("_");
+ } else if (dateStr.contains("年")) {
+ if (dateStr.endsWith("日")) {
+ dateStr = dateStr.substring(0, dateStr.length() - 1);
+ }
+ array = dateStr.split("年|月");
+ } else {
+ if (dateStr.length() == 8) {
+ return dateStr;
+ }
+ }
+ String yearStr = array[0];
+ String monthStr = array[1];
+ String dayStr = array[2];
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < 4 - yearStr.length(); i++) {
+ sb.append("0");
+ }
+ sb.append(yearStr);
+ if (monthStr.length() == 1) {
+ sb.append("0");
+ }
+ sb.append(monthStr);
+ if (dayStr.length() == 1) {
+ sb.append("0");
+ }
+ sb.append(dayStr);
+ return sb.toString();
+ }
+
+ private static Map<String, Boolean> complexCalculate(int yearNum) {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ String newYear = "0101";
+ String chingming = "0405";
+ String labor = "0501";
+ String dragon = "0505L";
+ String autumn = "0815L";
+ Map<String, Boolean> newYearMap = gregorianNewYearMap(yearNum, newYear);
+ Map<String, Boolean> nextYearMap = gregorianNewYearMap(yearNum + 1, newYear);
+ map.putAll(currentYearMap(newYearMap, nextYearMap, yearNum));
+ map.putAll(festivalMap(yearNum, chingming));
+ map.putAll(newYearLunarMap(yearNum));
+ map.putAll(festivalMap(yearNum, labor));
+ map.putAll(festivalMap(yearNum, dragon));
+ map.putAll(nationalAutumnMap(yearNum, autumn));
+ return map;
+ }
+
+ private static Map<String, Boolean> nationalAutumnMap(int yearNum, String autumn) {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ String ymd = yearNum + "0815";// 中秋节
+ String ymdNational = yearNum + "1001";// 国庆节
+ String ymdAutumn = convertGregorian(ymd);
+ int day = getWeekDay(ymdNational);
+ Map<String, Boolean> mapHistory = getHistoryMap();
+ String key = ymdAutumn.substring(4, 8) + "_" + day;
+ if (mapHistory.get(key) != null) {
+ // TODO 此处希望从近几年相似的月份中进行类比，是一种优化算法，暂未实现，但不影响算法使用。
+ }
+ String monthAutumn = ymdAutumn.substring(4, 6);
+ String dateAutumn = ymdAutumn.substring(6, 8);
+ int monthAutumnNum = Integer.parseInt(monthAutumn);
+ int dateAutumnNum = Integer.parseInt(dateAutumn);
+ if (dateAutumnNum < 25 && monthAutumnNum == 9) {// 中秋在9.25以前
+ // 中秋最早9.7 最晚10.8
+ map.putAll(festivalMap(yearNum, "0815L"));// 中秋
+ map.putAll(nationalMap(yearNum));// 国庆
+ } else if (monthAutumnNum == 10) {// 中秋节在10月份
+ map.putAll(nationalOctMap(yearNum));// 国庆
+ } else if (dateAutumnNum >= 25 && monthAutumnNum == 9) {// 中秋节在9.25 9.26
+ // 9.27 9.28
+ // 9.29 9.30
+ // 1. 中秋 25 全部两段 周一~周日
+ // 2. 中秋 26 全部两段 周二~周一
+ // 3. 中秋 27 最复杂 周三~周二
+ // 4. 中秋 28 全部休8天 周四~周三
+ // 5. 中秋 29 全部休8天 周五~周四
+ // 6. 中秋 30 全部休8天 周六~周五
+ // 补班 最早 9.22 最迟 10.12
+ int dayAutumn = getWeekDay(ymdAutumn);
+ map.putAll(complexMap(yearNum, dateAutumnNum, dayAutumn));// 国庆
+ } else {
+ throw new RuntimeException("中秋日期格式错误");
+ }
+ return map;
+ }
+
+ private static Map<String, Boolean> complexMap(int yearNum, int dateAutumnNum, int dayAutumn) {
+ com.iceyyy.workday.Data[][] table = getAutumnTable(dateAutumnNum);
+ com.iceyyy.workday.Data[] row = getRow(table, dateAutumnNum, dayAutumn);
+ return row2map(row, yearNum);
+ }
+
+ private static Map<String, Boolean> row2map(com.iceyyy.workday.Data[] row, int yearNum) {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ for (int i = 0; i < row.length; i++) {
+ com.iceyyy.workday.Data data = row[i];
+ int date = data.getDate();
+ boolean repose = data.getRepose();
+ String monthStr = "10";// 10月份
+ if (date > 15) {
+ monthStr = "09";// 9月份
+ }
+ String dateStr = date + "";
+ if (date < 10) {
+ dateStr = "0" + date;
+ }
+ String key = yearNum + monthStr + dateStr;
+ map.put(key, repose);
+ }
+ return map;
+ }
+
+ /**
+ * 根据中秋的星期获取具体的某一行的数据
+ *
+ * @param table
+ * @param dayAutumn
+ * @return
+ */
+ private static com.iceyyy.workday.Data[] getRow(com.iceyyy.workday.Data[][] table, int dateAutumnNum, int dayAutumn) {
+ // 25 1 [0]
+ // 25 2 [1]
+ // 25 3 [2]
+
+ // 26 1 [6]
+ // 26 2 [0]
+ // 26 3 [1]
+ // 26 4 [2]
+ // date+index-23=day
+ // index=day+23-date
+ int index = (dayAutumn + 31 - dateAutumnNum) % 7;
+ return table[index];
+ }
+
+ private static com.iceyyy.workday.Data[][] getAutumnTable(int dateAutumnNum) {
+ com.iceyyy.workday.Data[][] days1 = {
+ { new com.iceyyy.workday.Data(25, true), new com.iceyyy.workday.Data(30, false), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true),
+ new com.iceyyy.workday.Data(5, true), new com.iceyyy.workday.Data(6, true), new com.iceyyy.workday.Data(8, false) },
+ { new com.iceyyy.workday.Data(22, false), new com.iceyyy.workday.Data(24, true), new com.iceyyy.workday.Data(25, true), new com.iceyyy.workday.Data(29, false), new com.iceyyy.workday.Data(30, false),
+ new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(5, true) },
+ { new com.iceyyy.workday.Data(25, true), new com.iceyyy.workday.Data(26, true), new com.iceyyy.workday.Data(27, true), new com.iceyyy.workday.Data(28, false), new com.iceyyy.workday.Data(29, false),
+ new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(7, true),
+ new com.iceyyy.workday.Data(12, false) },
+ { new com.iceyyy.workday.Data(21, false), new com.iceyyy.workday.Data(25, true), new com.iceyyy.workday.Data(26, true), new com.iceyyy.workday.Data(28, false), new com.iceyyy.workday.Data(1, true),
+ new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(6, true), new com.iceyyy.workday.Data(7, true),
+ new com.iceyyy.workday.Data(11, false) },
+ { new com.iceyyy.workday.Data(20, false), new com.iceyyy.workday.Data(25, true), new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(5, true),
+ new com.iceyyy.workday.Data(6, true), new com.iceyyy.workday.Data(7, true), new com.iceyyy.workday.Data(10, false) },
+ { new com.iceyyy.workday.Data(27, true), new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(5, true), new com.iceyyy.workday.Data(6, true),
+ new com.iceyyy.workday.Data(7, true), new com.iceyyy.workday.Data(9, false), new com.iceyyy.workday.Data(10, false) },
+ { new com.iceyyy.workday.Data(26, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(5, true), new com.iceyyy.workday.Data(6, true),
+ new com.iceyyy.workday.Data(7, true), new com.iceyyy.workday.Data(8, false), new com.iceyyy.workday.Data(9, false) } };
+ com.iceyyy.workday.Data[][] days2 = {
+ { new com.iceyyy.workday.Data(23, false), new com.iceyyy.workday.Data(25, true), new com.iceyyy.workday.Data(26, true), new com.iceyyy.workday.Data(30, false), new com.iceyyy.workday.Data(2, true),
+ new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(5, true), new com.iceyyy.workday.Data(6, true),
+ new com.iceyyy.workday.Data(8, false) },
+ { new com.iceyyy.workday.Data(23, false), new com.iceyyy.workday.Data(26, true), new com.iceyyy.workday.Data(27, true), new com.iceyyy.workday.Data(28, true), new com.iceyyy.workday.Data(29, false),
+ new com.iceyyy.workday.Data(30, false), new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true),
+ new com.iceyyy.workday.Data(5, true), new com.iceyyy.workday.Data(13, false) },
+ { new com.iceyyy.workday.Data(22, false), new com.iceyyy.workday.Data(26, true), new com.iceyyy.workday.Data(27, true), new com.iceyyy.workday.Data(29, false), new com.iceyyy.workday.Data(1, true),
+ new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(7, true) },
+ { new com.iceyyy.workday.Data(21, false), new com.iceyyy.workday.Data(26, true), new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true),
+ new com.iceyyy.workday.Data(6, true), new com.iceyyy.workday.Data(7, true) },
+ { new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(5, true), new com.iceyyy.workday.Data(6, true), new com.iceyyy.workday.Data(7, true),
+ new com.iceyyy.workday.Data(10, false) },
+ { new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(5, true), new com.iceyyy.workday.Data(6, true), new com.iceyyy.workday.Data(7, true),
+ new com.iceyyy.workday.Data(9, false) },
+ { new com.iceyyy.workday.Data(26, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(5, true), new com.iceyyy.workday.Data(6, true),
+ new com.iceyyy.workday.Data(7, true), new com.iceyyy.workday.Data(8, false), new com.iceyyy.workday.Data(9, false) } };
+ com.iceyyy.workday.Data[][] days3 = {
+ { new com.iceyyy.workday.Data(23, false), new com.iceyyy.workday.Data(24, false), new com.iceyyy.workday.Data(25, true), new com.iceyyy.workday.Data(26, true), new com.iceyyy.workday.Data(27, true),
+ new com.iceyyy.workday.Data(30, false), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(5, true),
+ new com.iceyyy.workday.Data(6, true), new com.iceyyy.workday.Data(8, false) },
+ { new com.iceyyy.workday.Data(27, true), new com.iceyyy.workday.Data(28, true), new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true),
+ new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(6, false), new com.iceyyy.workday.Data(7, false) },
+ { new com.iceyyy.workday.Data(27, true), new com.iceyyy.workday.Data(30, true), new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true),
+ new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(5, false), new com.iceyyy.workday.Data(6, false) },
+ { new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(6, true), new com.iceyyy.workday.Data(7, true),
+ new com.iceyyy.workday.Data(11, false) },
+ { new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(5, true), new com.iceyyy.workday.Data(6, true), new com.iceyyy.workday.Data(7, true),
+ new com.iceyyy.workday.Data(10, false) },
+ { new com.iceyyy.workday.Data(27, true), new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(5, true), new com.iceyyy.workday.Data(6, true),
+ new com.iceyyy.workday.Data(7, true), new com.iceyyy.workday.Data(9, false), new com.iceyyy.workday.Data(10, false) },
+ { new com.iceyyy.workday.Data(24, false), new com.iceyyy.workday.Data(26, true), new com.iceyyy.workday.Data(27, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true),
+ new com.iceyyy.workday.Data(5, true), new com.iceyyy.workday.Data(6, true), new com.iceyyy.workday.Data(7, true), new com.iceyyy.workday.Data(8, false),
+ new com.iceyyy.workday.Data(9, false) } };
+ com.iceyyy.workday.Data[][] days4 = {
+ { new com.iceyyy.workday.Data(28, true), new com.iceyyy.workday.Data(29, true), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true),
+ new com.iceyyy.workday.Data(5, true), new com.iceyyy.workday.Data(7, false), new com.iceyyy.workday.Data(8, false) },
+ { new com.iceyyy.workday.Data(28, true), new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true),
+ new com.iceyyy.workday.Data(5, true), new com.iceyyy.workday.Data(6, false), new com.iceyyy.workday.Data(7, false) },
+ { new com.iceyyy.workday.Data(30, true), new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true),
+ new com.iceyyy.workday.Data(6, false) },
+ { new com.iceyyy.workday.Data(27, false), new com.iceyyy.workday.Data(29, true), new com.iceyyy.workday.Data(30, true), new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true),
+ new com.iceyyy.workday.Data(3, true) },
+ { new com.iceyyy.workday.Data(26, false), new com.iceyyy.workday.Data(27, false), new com.iceyyy.workday.Data(28, true), new com.iceyyy.workday.Data(29, true), new com.iceyyy.workday.Data(30, true),
+ new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(5, true) },
+ { new com.iceyyy.workday.Data(25, false), new com.iceyyy.workday.Data(26, false), new com.iceyyy.workday.Data(28, true), new com.iceyyy.workday.Data(29, true), new com.iceyyy.workday.Data(30, true),
+ new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(5, true) },
+ { new com.iceyyy.workday.Data(25, false), new com.iceyyy.workday.Data(28, true), new com.iceyyy.workday.Data(29, true), new com.iceyyy.workday.Data(30, true), new com.iceyyy.workday.Data(3, true),
+ new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(5, true), new com.iceyyy.workday.Data(8, false) } };
+ com.iceyyy.workday.Data[][] days5 = {
+ { new com.iceyyy.workday.Data(29, true), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(5, true),
+ new com.iceyyy.workday.Data(6, true), new com.iceyyy.workday.Data(7, false), new com.iceyyy.workday.Data(8, false) },
+ { new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(5, true),
+ new com.iceyyy.workday.Data(7, false) },
+ { new com.iceyyy.workday.Data(28, false), new com.iceyyy.workday.Data(30, true), new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true),
+ new com.iceyyy.workday.Data(4, true) },
+ { new com.iceyyy.workday.Data(27, false), new com.iceyyy.workday.Data(28, false), new com.iceyyy.workday.Data(29, true), new com.iceyyy.workday.Data(30, true), new com.iceyyy.workday.Data(1, true),
+ new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(6, true) },
+ { new com.iceyyy.workday.Data(26, false), new com.iceyyy.workday.Data(27, false), new com.iceyyy.workday.Data(29, true), new com.iceyyy.workday.Data(30, true), new com.iceyyy.workday.Data(1, true),
+ new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(5, true), new com.iceyyy.workday.Data(6, true) },
+ { new com.iceyyy.workday.Data(26, false), new com.iceyyy.workday.Data(29, true), new com.iceyyy.workday.Data(30, true), new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(4, true),
+ new com.iceyyy.workday.Data(5, true), new com.iceyyy.workday.Data(6, true), new com.iceyyy.workday.Data(9, false) },
+ { new com.iceyyy.workday.Data(29, true), new com.iceyyy.workday.Data(30, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(5, true),
+ new com.iceyyy.workday.Data(6, true), new com.iceyyy.workday.Data(8, false), new com.iceyyy.workday.Data(9, false) } };
+ com.iceyyy.workday.Data[][] days6 = {
+ { new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(5, true), new com.iceyyy.workday.Data(6, true),
+ new com.iceyyy.workday.Data(8, false) },
+ { new com.iceyyy.workday.Data(29, false), new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true),
+ new com.iceyyy.workday.Data(5, true) },
+ { new com.iceyyy.workday.Data(28, false), new com.iceyyy.workday.Data(29, false), new com.iceyyy.workday.Data(30, true), new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true),
+ new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(7, true) },
+ { new com.iceyyy.workday.Data(27, false), new com.iceyyy.workday.Data(28, false), new com.iceyyy.workday.Data(30, true), new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true),
+ new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(6, true), new com.iceyyy.workday.Data(7, true) },
+ { new com.iceyyy.workday.Data(27, false), new com.iceyyy.workday.Data(30, true), new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(2, true), new com.iceyyy.workday.Data(5, true),
+ new com.iceyyy.workday.Data(6, true), new com.iceyyy.workday.Data(7, true), new com.iceyyy.workday.Data(10, false) },
+ { new com.iceyyy.workday.Data(30, true), new com.iceyyy.workday.Data(1, true), new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(5, true), new com.iceyyy.workday.Data(6, true),
+ new com.iceyyy.workday.Data(7, true), new com.iceyyy.workday.Data(9, false), new com.iceyyy.workday.Data(10, false) },
+ { new com.iceyyy.workday.Data(30, true), new com.iceyyy.workday.Data(3, true), new com.iceyyy.workday.Data(4, true), new com.iceyyy.workday.Data(5, true), new com.iceyyy.workday.Data(6, true),
+ new com.iceyyy.workday.Data(7, true), new com.iceyyy.workday.Data(8, false), new Data(9, false) } };
+ if (dateAutumnNum == 25) {
+ return days1;
+ } else if (dateAutumnNum == 26) {
+ return days2;
+ } else if (dateAutumnNum == 27) {
+ return days3;
+ } else if (dateAutumnNum == 28) {
+ return days4;
+ } else if (dateAutumnNum == 29) {
+ return days5;
+ } else if (dateAutumnNum == 30) {
+ return days6;
+ }
+ throw new RuntimeException("中秋日期格式错误");
+ }
+
+ private static Map<String, Boolean> nationalOctMap(int yearNum) {
+ String ymd = yearNum + "1001";
+ int day = getWeekDay(ymd);
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ int[][] correction = { { 30 }, { 29, 30 }, { 28, 29 }, { 28, 11 }, { 27, 10 }, { 9, 10 }, { 9 } };
+ for (int i = 0; i < correction[day].length; i++) {
+ int corr = correction[day][i];
+ if (corr <= 15) {
+ String key = yearNum + "10" + convertNum(corr);
+ map.put(key, false);
+ } else {
+ String key = yearNum + "09" + convertNum(corr);
+ map.put(key, false);
+ }
+ }
+ int start = 0;
+ if (day == 0 || day == 1) {
+ start = -1;
+ }
+ int end = 0;
+ if (day == 5) {
+ end = 1;
+ }
+ for (int i = 0 + start; i < 8 + end; i++) {// 国庆节一般为7天
+ String curDate = addDay(ymd, i);
+ int curDay = getWeekDay(curDate);
+ if (curDay > 0 && curDay < 6) {
+ map.put(curDate, true);
+ }
+ }
+ return map;
+ }
+
+ private static Map<String, Boolean> nationalMap(int yearNum) {
+ String ymd = yearNum + "1001";
+ int day = getWeekDay(ymd);
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ int[][] correction = { { 30, 8 }, { 29, 14 }, { 29, 12 }, { 28, 11 }, { 10 }, { 26, 9 }, { 8, 9 } };
+ if (day > 0 && day < 6) {
+ map.put(ymd, true);
+ }
+ for (int i = 0; i < correction[day].length; i++) {
+ int corr = correction[day][i];
+ if (corr <= 15) {
+ String key = yearNum + "10" + convertNum(corr);
+ map.put(key, false);
+ } else {
+ String key = yearNum + "09" + convertNum(corr);
+ map.put(key, false);
+ }
+ }
+ for (int i = 0; i < 7; i++) {// 国庆节一般为7天
+ String curDate = addDay(ymd, i);
+ int curDay = getWeekDay(curDate);
+ if (curDay > 0 && curDay < 6) {
+ map.put(curDate, true);
+ }
+ }
+ return map;
+ }
+
+ private static String convertNum(int num) {
+ if (num < 10) {
+ return "0" + num;
+ } else {
+ return num + "";
+ }
+ }
+
+ private static Map<String, Boolean> getHistoryMap() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ return map;
+ }
+
+ private static Map<String, Boolean> newYearLunarMap(int yearNum) {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ String ymd = yearNum + "0101";
+ ymd = convertGregorian(ymd);
+ int day = getWeekDay(ymd);
+ int[][] correction = { { 6, 7 }, { -2, 6 }, { -3, 12 }, { -3, 10 }, { -4, 9 }, { -5, 8 }, { -6, 7 } };
+ int correct = -1;
+ if (yearNum == 2014 || yearNum <= 2007) {
+ correction = new int[][] { { 6, 7 }, { -2, 6 }, { -3, 12 }, { -3, 10 }, { -4, 9 }, { -5, 8 }, { -6, 7 } };
+ correct = 0;
+ }
+ for (int i = 0; i < correction[day].length; i++) {
+ map.put(addDay(ymd, correction[day][i]), false);
+ }
+ for (int i = 0; i < 7; i++) {
+ String curYmd = addDay(ymd, i + correct);
+ int dayCur = getWeekDay(curYmd);
+ if (dayCur > 0 && dayCur < 6) {
+ map.put(curYmd, true);
+ }
+ }
+ return map;
+ }
+
+ private static Map<String, Boolean> currentYearMap(Map<String, Boolean> newYearMap,
+ Map<String, Boolean> nextYearMap, int yearNum) {
+ String yearStr = yearNum + "";
+ Set<String> setCur = newYearMap.keySet();
+ Set<String> setNext = nextYearMap.keySet();
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ for (String key : setCur) {
+ if (key.startsWith(yearStr)) {
+ map.put(key, newYearMap.get(key));
+ }
+ }
+ for (String key : setNext) {
+ if (key.startsWith(yearStr)) {
+ map.put(key, nextYearMap.get(key));
+ }
+ }
+ return map;
+ }
+
+ private static Map<String, Boolean> festivalMap(int yearNum, String festival) {
+ String ymd = yearNum + festival;
+ if (festival.endsWith("L")) {
+ festival = festival.substring(0, festival.length() - 1);
+ ymd = convertGregorian(ymd);
+ } else if ("0405".equals(festival)) {
+ ymd = chingming(yearNum);
+ }
+ return small(ymd);
+ }
+
+ private static Map<String, Boolean> gregorianNewYearMap(int yearNum, String festival) {
+ String ymd = yearNum + festival;
+ return gregorianNewYearSmall(ymd);
+ }
+
+ private static String chingming(int yearNum) {
+ return yearNum + "040" + qing(yearNum);
+ }
+
+ /**
+ * 计算清明节的日期(可计算范围: 1700-3100)
+ *
+ * @param year
+ * 需要计算的年份
+ * @return 清明节在公历中的日期
+ */
+ private static int qing(int year) {
+ if (year == 2232) {
+ return 4;
+ }
+ if (year < 1700) {
+ throw new RuntimeException("1700年以前暂时不支持");
+ }
+ if (year >= 3100) {
+ throw new RuntimeException("3100年以后暂时不支持");
+ }
+ double[] coefficient = { 5.15, 5.37, 5.59, 4.82, 5.02, 5.26, 5.48, 4.70, 4.92, 5.135, 5.36, 4.60, 4.81, 5.04,
+ 5.26 };
+ int mod = year % 100;
+ return (int) (mod * 0.2422 + coefficient[year / 100 - 17] - mod / 4);
+ }
+
+ private static Map<String, Boolean> small(String ymd) {
+ int day = getWeekDay(ymd);
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ int[][] correction = { { 1 }, {}, { -1, -3 }, { -1, -2, -3, -4 }, { 1, 3 }, {}, { 2 } };
+ // 6.取-1 2014年清明 2015年端午 6. 取2 2012年端午
+ if (day > 0 && day < 6) {
+ map.put(ymd, true);
+ }
+ if (day == 3) {
+ map.put(addDay(ymd, -1), true);
+ map.put(addDay(ymd, -2), true);
+ map.put(addDay(ymd, -3), false);
+ map.put(addDay(ymd, -4), false);
+ } else {
+ boolean flag = true;
+ for (int i = 0; i < correction[day].length; i++) {
+ map.put(addDay(ymd, correction[day][i]), flag);
+ flag = false;
+ }
+ }
+ return map;
+ }
+
+ private static Map<String, Boolean> gregorianNewYearSmall(String ymd) {
+ int day = getWeekDay(ymd);
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ int[][] correction = { { 1 }, {}, { 1, 2, 4, 5 }, {}, { 1, 2, 3 }, {}, { 2 } };
+ // 6.取-1 2014年清明 2015年端午 6. 取2 2012年端午 0{+1}1{} 2{+1+2 +4b+5b} 3{}
+ // 4{+1,+2,+3b}5{}6{+2}
+ if (day > 0 && day < 6) {
+ map.put(ymd, true);
+ }
+ if (day == 2) {
+ map.put(addDay(ymd, 1), true);
+ map.put(addDay(ymd, 2), true);
+ map.put(addDay(ymd, 4), false);
+ map.put(addDay(ymd, 5), false);
+ } else if (day == 3) {
+
+ } else if (day == 4) {
+ map.put(addDay(ymd, 1), true);
+ map.put(addDay(ymd, 3), false);
+ } else {
+ boolean flag = true;
+ for (int i = 0; i < correction[day].length; i++) {
+ map.put(addDay(ymd, correction[day][i]), flag);
+ flag = false;
+ }
+ }
+ return map;
+ }
+
+ private static int getWeekDay(String ymd) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+ Date date = null;
+ try {
+ date = sdf.parse(ymd);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ int day = calendar.get(Calendar.DAY_OF_WEEK) - 1;
+ return day;
+ }
+
+ private static String convertGregorian(String ymd) {// private
+ String cnYmd = convertCnYmd(ymd);
+ int start = 18;
+ int len = 60;// 公历农历按最多相差60天计算。
+ for (int i = start; i < start + len; i++) {
+ String gregorianDate = addDay(ymd, i);
+ String lunarDate = NongLi.getDate(gregorianDate);
+ if (cnYmd.equals(lunarDate)) {
+ return gregorianDate;
+ }
+ }
+ return null;
+ }
+
+ private static String convertCnYmd(String ymd) {// private
+ String numArray = "零一二三四五六七八九十";
+ String m = ymd.substring(4, 6);
+ String d = ymd.substring(6, 8);
+ int month = Integer.parseInt(m);
+ int day = Integer.parseInt(d);
+ String yearStr = "";
+ for (int i = 0; i < 4; i++) {
+ yearStr += numArray.charAt(ymd.charAt(i) - '0') + "";
+ }
+ yearStr += "年";
+ String monthStr = "";
+ if ("11".equals(m)) {
+ monthStr = "冬";
+ } else if ("12".equals(m)) {
+ monthStr = "腊";
+ } else if ("01".equals(m)) {
+ monthStr = "正";
+ } else {
+ monthStr = numArray.charAt(month) + "";
+ }
+ monthStr += "月";
+ String dayStr = "";
+ if (day <= 10) {
+ dayStr = "初" + numArray.charAt(day);
+ } else if (day < 20) {
+ dayStr = "十" + numArray.charAt(day - 10);
+ } else if (day == 20) {
+ dayStr = "二十";
+ } else if (day == 30) {
+ dayStr = "三十";
+ } else {
+ dayStr = "廿" + numArray.charAt(day - 20);
+ }
+ return yearStr + monthStr + dayStr;
+ }
+
+ private static String addDay(String date, int dayLength) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+ Date dateSrc = null;
+ try {
+ dateSrc = sdf.parse(date);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(dateSrc);
+ cal.set(Calendar.DAY_OF_MONTH, cal.get(Calendar.DAY_OF_MONTH) + dayLength);
+ return sdf.format(cal.getTime());
+ }
+
+ private static String[] read(String fileName) {
+ BufferedReader br = null;
+ ArrayList<String> list = new ArrayList<String>();
+
+ try {
+ br = new BufferedReader(
+ new InputStreamReader(WorkUtils.class.getClassLoader().getResourceAsStream(fileName)));
+ String every = null;
+ while ((every = br.readLine()) != null) {
+ if (!every.startsWith("#")) {
+ list.add(every);
+ }
+ }
+ String[] datas = new String[list.size()];
+ for (int i = 0; i < datas.length; i++) {
+ datas[i] = list.get(i);
+ }
+ return datas;
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ if (br != null) {
+ try {
+ br.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ return null;
+ }
+
+ private static Map<String, Boolean> weekMapFromFile() {
+ Map<String, Boolean> map = new HashMap<String, Boolean>();
+ String fileName = "iceweek.txt";
+ String[] lines = WorkUtils.read(fileName);
+ for (String line : lines) {
+ if (line == null || line.length() != 9) {
+ continue;
+ }
+ String key = line.substring(0, 8);
+ Boolean value = convertWork(line.substring(8));
+ map.put(key, value);
+ }
+ return map;
+ }
+
+ private static Boolean convertWork(String str) {
+ if ("b".equals(str)) {
+ return false;
+ } else if ("x".equals(str)) {
+ return true;
+ }
+ return null;
+ }
+
+ private static Map<String, Boolean> filterMap(Map<String, Boolean> map, int year) {
+ String yearStr = year + "";
+ Map<String, Boolean> newMap = new HashMap<String, Boolean>();
+ Set<Entry<String, Boolean>> entrySet = map.entrySet();
+ for (Entry<String, Boolean> entry : entrySet) {
+ String key = entry.getKey();
+ Boolean value = entry.getValue();
+ if (key != null && key.startsWith(yearStr)) {
+ newMap.put(key, value);
+ }
+ }
+ return newMap;
+ }
+
+ /**
+ * 提示语
+ * @return 提示语
+ */
+ protected static String warn() {
+ return "注意：该算法对于将来的时间仅是预测，并不能完全精确。";
+ }
+}
diff --git a/flower_city/src/main/java/com/dg/core/util/workday/WorkdayGen.java b/flower_city/src/main/java/com/dg/core/util/workday/WorkdayGen.java
new file mode 100644
index 0000000..e279939
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/util/workday/WorkdayGen.java
@@ -0,0 +1,74 @@
+package com.dg.core.util.workday;
+
+import com.iceyyy.workday.WorkUtils;
+
+import java.util.*;
+
+public class WorkdayGen {
+
+ public static void main(String[] args) {
+ int year = 2021;
+ String code = genYearCode(year);
+ System.out.println(code);
+ }
+
+ protected static String gen(int year) {
+ String yearStr = String.valueOf(year);
+ Map<String, Boolean> weekendMap = WorkUtils.weekendMap(yearStr);
+ Set<String> keySet = weekendMap.keySet();
+ List<String> list = new ArrayList<>(keySet);
+ Collections.sort(list);
+ StringBuilder sb = new StringBuilder();
+ for (String ymd : list) {
+ boolean weekendDay = WorkUtils.isWorkendDay(ymd);
+ String itemCode = genItemCode(ymd, weekendDay);
+ sb.append(itemCode);
+ }
+ return sb.toString();
+ }
+
+ private static String genItemCode(String ymd, boolean weekendDay) {
+ StringBuilder sb = new StringBuilder();
+ String tab = " ";
+ String nl = "\r\n";
+ sb.append(tab);
+ sb.append("map.put(\"");
+ sb.append(ymd);
+ sb.append("\", ");
+ sb.append(weekendDay);
+ sb.append("); // ");
+ sb.append(wordCode(weekendDay));
+ sb.append(nl);
+ return sb.toString();
+ }
+
+ private static String wordCode(boolean weekday) {
+ if (weekday) {
+ return "休";
+ } else {
+ return "班";
+ }
+ }
+
+ private static String genYearCode(int year) {
+ StringBuilder sb = new StringBuilder();
+ String nl = "\r\n";
+ sb.append("package com.iceyyy.icework.presence;" + nl);
+ sb.append("" + nl);
+ sb.append("import java.util.HashMap;" + nl);
+ sb.append("import java.util.Map;" + nl);
+ sb.append("");
+ sb.append("public class Year" + year + " implements Year20xx {" + nl);
+ sb.append("" + nl);
+ sb.append(" @Override" + nl);
+ sb.append(" public Map<String, Boolean> getYearMap() {" + nl);
+ sb.append(" Map<String, Boolean> map = new HashMap<String, Boolean>();" + nl);
+ String gen = gen(year);
+ sb.append(gen);
+ sb.append(" return map;" + nl);
+ sb.append(" }" + nl);
+ sb.append("" + nl);
+ sb.append("}" + nl);
+ return sb.toString();
+ }
+}
diff --git a/flower_city/src/main/resources/application-sms.properties b/flower_city/src/main/resources/application-sms.properties
new file mode 100644
index 0000000..946295a
--- /dev/null
+++ b/flower_city/src/main/resources/application-sms.properties
@@ -0,0 +1,25 @@
+#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u01B6\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
+aliyun.key=LTAI4Frqq9fpJek6d3bC7Rn1
+aliyun.screct=wkyvU72m6JmCFepCzGVuSpsJOsbRV0
+aliyun.SignName=????
+aliyun.TemplateCode=SMS_254326275
+
+#??????????,???????????????????????????????????
+
+#??????
+#aliyun.TemplateCodeOvertime=SMS_254460011
+#??????
+aliyun.TemplateCodeOvertime=SMS_254460012
+
+#??????
+#aliyun.TemplateCodeComplete=SMS_254875101
+#??????
+aliyun.TemplateCodeComplete=SMS_254875102
+
+#??????
+#aliyun.TemplateCodeSubmit=SMS_254880764
+#??????
+aliyun.TemplateCodeSubmit=SMS_254880763
+
+
+
diff --git a/flower_city/src/main/resources/application.properties b/flower_city/src/main/resources/application.properties
new file mode 100644
index 0000000..7820992
--- /dev/null
+++ b/flower_city/src/main/resources/application.properties
@@ -0,0 +1,56 @@
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+#spring.datasource.username=root
+#spring.datasource.password=nahanMysqlPwd&&RemoteRemote2019nahan
+spring.datasource.username=remote
+spring.datasource.password=Panzhihua!@#admin123#@!
+#spring.datasource.url=jdbc:mysql://10.8.0.74:3306/huacheng_smart_life?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
+#spring.datasource.url=jdbc:mysql://182.151.2.19:3306/huacheng_smart_life?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://118.121.197.120:3306/huacheng_smart_life?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+
+server.port=8187
+#server.port=8088
+
+swagger.enabled=true
+swagger.pathMapping=/
+#Redis
+#spring.redis.host=127.0.0.1
+#spring.redis.port=6379
+#spring.redis.database=2
+#spring.redis.password=nahanRedisPwsIsVerySimple&&
+
+spring.redis.host=192.168.1.52
+spring.redis.port=6379
+spring.redis.database=2
+spring.redis.password=ODEGi3MXRBNQ8pH2
+
+
+
+spring.mvc.pathmatch.matching-strategy=ant_path_matcher
+
+
+spring.servlet.multipart.max-file-size=100MB
+spring.servlet.multipart.max-request-size=150MB
+
+
+
+wx.open.app_id=wx118de8a734d269f0
+wx.open.app_secret=0264342daefde5cd70a6adada09ee5b1
+wx.open.redirect_url=http://yq.cdnhxx.com:8080/ucenter/wx/callback
+yygh.baseUrl=http://localhost:8080
+
+
+
+#ftp.username=root
+#ftp.password=6-gj!bx@TNb!Dwpjd]1h1Kvqmc
+#ftp.host=182.151.31.48
+#ftp.port=22
+#ftp.url=https://test.panzhihua.nhys.cdnhxx.com/
+
+
+
+
+ftp.username= root
+ftp.password= @!nY0[-zxO
+ftp.host= 182.151.24.68
+ftp.port= 22
+ftp.url= https://www.psciio.com
diff --git a/flower_city/src/main/resources/mapper/AgreementMapper.xml b/flower_city/src/main/resources/mapper/AgreementMapper.xml
new file mode 100644
index 0000000..eb55d52
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/AgreementMapper.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.AgreementMapper">
+ <resultMap type="com.dg.core.db.gen.entity.Agreement" id="AgreementResult">
+ <id property="id" column="id" />
+ <id property="agreement" column="agreement" />
+ <id property="updateUserId" column="update_user_id" />
+ <id property="updateTime" column="update_time" />
+ <id property="createTime" column="create_time" />
+ <id property="createUserId" column="create_user_id" />
+ <id property="agreementContent" column="agreement_content" />
+ </resultMap>
+
+ <sql id="selectAgreement">
+ select id,agreement,
+ (select user_name from automessage_sys_user where user_id=a.update_user_id)updateUserName,
+ update_user_id,
+ create_time,
+ update_time,
+ (select user_name from automessage_sys_user where user_id=a.create_user_id)createUserName,
+ create_user_id,agreement_content
+ FROM automessage_agreement a
+ </sql>
+
+ <select id="selectConfigList" resultMap="AgreementResult">
+ <include refid="selectAgreement" />
+ </select>
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/AreaCode2022Mapper.xml b/flower_city/src/main/resources/mapper/AreaCode2022Mapper.xml
new file mode 100644
index 0000000..33281b7
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/AreaCode2022Mapper.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.AreaCode2022Mapper">
+ <resultMap type="com.dg.core.db.gen.entity.AreaCode2022" id="AreaCodeResult">
+ <id property="code" column="code" />
+ <id property="name" column="name" />
+ <id property="level" column="level" />
+ <id property="pcode" column="pcode" />
+ </resultMap>
+
+ <sql id="selectAreaCode">
+ select code,name,level,pcode FROM automessage_area_code_2022
+ </sql>
+
+ <select id="selectByIdSet" resultMap="AreaCodeResult">
+ <include refid="selectAreaCode" />
+ WHERE code IN
+ <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ order by level
+ </select>
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/AutomessageCommonProblemMapper.xml b/flower_city/src/main/resources/mapper/AutomessageCommonProblemMapper.xml
new file mode 100644
index 0000000..91435f6
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/AutomessageCommonProblemMapper.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.AutomessageCommonProblemMapper">
+ <resultMap type="com.dg.core.db.gen.entity.AutomessageCommonProblem" id="AutomessageCommonProblemResult">
+ <id property="id" column="id" />
+ <id property="title" column="title" />
+ <id property="content" column="content" />
+ <id property="createTime" column="create_time" />
+ <id property="updateTime" column="update_time" />
+ <id property="updateUserId" column="update_user_id" />
+ <id property="createUserId" column="create_user_id" />
+
+ </resultMap>
+
+ <sql id="selectAutomessageCommonProblemResul">
+ SELECT
+ id,
+ title,
+ content,
+ create_time,
+ update_time,
+ (select user_name from automessage_sys_user where user_id=a.update_user_id)updateUserName,
+ update_user_id,
+ (select user_name from automessage_sys_user where user_id=a.create_user_id)createUserName,
+ create_user_id
+ FROM
+ automessage_common_problem a
+ </sql>
+
+ <select id="selectConfigList" resultMap="AutomessageCommonProblemResult">
+ <include refid="selectAutomessageCommonProblemResul" />
+ <where>
+ <if test="title!=null and title!=''">
+ and title like concat('%', #{title}, '%')
+ </if>
+ <if test="content!=null and content!=''">
+ and content like concat('%', #{content}, '%')
+ </if>
+ </where>
+ </select>
+
+ <select id="countConfigList" resultType="integer">
+ select count(*) from automessage_common_problem
+ <where>
+ <if test="title!=null and title!=''">
+ and title like concat('%', #{title}, '%')
+ </if>
+ <if test="content!=null and content!=''">
+ and content like concat('%', #{content}, '%')
+ </if>
+ </where>
+ </select>
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/AutomessagePolicyDocumentsMapper.xml b/flower_city/src/main/resources/mapper/AutomessagePolicyDocumentsMapper.xml
new file mode 100644
index 0000000..feb4ff0
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/AutomessagePolicyDocumentsMapper.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.AutomessagePolicyDocumentsMapper">
+ <resultMap type="com.dg.core.db.gen.entity.AutomessagePolicyDocuments" id="AutomessagePolicyDocumentsResult">
+ <id property="id" column="id" />
+ <id property="departmentId" column="department_id" />
+ <id property="name" column="name" />
+ <id property="linkType" column="link_type" />
+ <id property="articleLink" column="article_link" />
+ <id property="richText" column="rich_text" />
+ <id property="type" column="type" />
+ <id property="createTime" column="create_time" />
+ <id property="createUserId" column="create_user_id" />
+ <id property="updateTime" column="update_time" />
+ <id property="updateUserId" column="update_user_id" />
+ </resultMap>
+
+ <sql id="selectAutomessagePolicyDocumentsResult">
+ SELECT
+ id,
+ (select organization_name from automessage_organization_chart where id=a.department_id )departmentName,
+ department_id,
+ name,
+ link_type,
+ type,
+ article_link,
+ rich_text,
+ create_time,
+ update_time,
+ (select user_name from automessage_sys_user where user_id=a.update_user_id)updateUserName,
+ update_user_id,
+ (select user_name from automessage_sys_user where user_id=a.create_user_id)createUserName,
+ create_user_id
+ FROM
+ automessage_policy_documents a
+ </sql>
+
+ <select id="selectConfigList" resultMap="AutomessagePolicyDocumentsResult">
+ <include refid="selectAutomessagePolicyDocumentsResult" />
+ <where>
+ <if test="name!=null and name!=''">
+ and name like concat('%', #{name}, '%')
+ </if>
+ <if test="type!=null">
+ and type = #{type}
+ </if>
+ <if test="departmentId != null">
+ and department_id in (SELECT id from automessage_organization_chart where id=#{departmentId} or parent_id = #{departmentId})
+ </if>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ order by create_time desc
+ </select>
+
+ <select id="selectCountList" resultType="integer">
+ select count(*) from automessage_policy_documents
+ <where>
+ <if test="name!=null and name!=''">
+ and name like concat('%', #{name}, '%')
+ </if>
+ <if test="type!=null">
+ and type = #{type}
+ </if>
+ <if test="departmentId != null">
+ and department_id in (SELECT id from automessage_organization_chart where id=#{departmentId} or parent_id = #{departmentId})
+ </if>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ </select>
+
+ <select id="selectAutomessagePolicyDocumentById" resultMap="AutomessagePolicyDocumentsResult">
+ <include refid="selectAutomessagePolicyDocumentsResult" />
+ <where>
+ id = #{id}
+ </where>
+
+ </select>
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/AutomessageSmartConsultingMapper.xml b/flower_city/src/main/resources/mapper/AutomessageSmartConsultingMapper.xml
new file mode 100644
index 0000000..3f0c69b
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/AutomessageSmartConsultingMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.AutomessageSmartConsultingMapper">
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/AutomessageSysSettingsMapper.xml b/flower_city/src/main/resources/mapper/AutomessageSysSettingsMapper.xml
new file mode 100644
index 0000000..085d9d5
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/AutomessageSysSettingsMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.AutomessageSysSettingsMapper">
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/AutomessageSysSettingsRecordMapper.xml b/flower_city/src/main/resources/mapper/AutomessageSysSettingsRecordMapper.xml
new file mode 100644
index 0000000..9336e4a
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/AutomessageSysSettingsRecordMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.AutomessageSysSettingsRecordMapper">
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/AutomessageSysUserRecordMapper.xml b/flower_city/src/main/resources/mapper/AutomessageSysUserRecordMapper.xml
new file mode 100644
index 0000000..ae677ea
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/AutomessageSysUserRecordMapper.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.AutomessageSysUserRecordMapper">
+ <resultMap type="com.dg.core.db.gen.entity.AutomessageSysUserRecord" id="AutomessageSysUserRecordResult">
+ <id property="id" column="id" />
+ <id property="userId" column="user_id" />
+ <id property="createTime" column="create_time" />
+ <id property="joinType" column="join_type" />
+ </resultMap>
+
+ <sql id="selectAgreement">
+ select id,user_id,
+ (select user_name from automessage_sys_user where user_id=a.user_id)userName,
+ create_time,join_type FROM automessage_sys_user_record a
+ </sql>
+<!-- 小程序用户访问量统计1.累计访问量2.本年访问量 3.本月访问量 4.今日访问量 5.昨日访问-->
+ <select id="selectUserRecordCount" resultType="com.dg.core.db.manual.pojo.AppletUserCount">
+ select count(*)visits,1 type from automessage_sys_user_record UNION
+ select count(*)visits,2 type from automessage_sys_user_record where year(create_time)=year(SYSDATE()) UNION
+ select count(*)visits,3 type from automessage_sys_user_record where DATE_FORMAT(create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) ,'%Y%m' ) UNION
+ select count(*)visits,4 type from automessage_sys_user_record where to_days(create_time) = to_days(now()) UNION
+ select count(*)visits,5 type from automessage_sys_user_record where TO_DAYS( SYSDATE() ) - TO_DAYS(create_time) = 1
+ </select>
+
+ <select id="selectByDay" resultType="com.dg.core.db.manual.pojo.AppletUserCount">
+ select d.date, IFNULL(T.score,0) visits from
+ (
+ SELECT CURDATE() AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 1 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 2 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 3 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 4 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 5 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 6 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 7 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 8 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 9 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 10 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 11 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 12 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 13 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 14 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 15 DAY) AS date
+ ) d
+ left join(
+ select DATE_FORMAT(create_time,'%Y-%m-%d')create_time, COUNT(*) as score
+ from automessage_sys_user_record
+ group by DATE_FORMAT(create_time,'%Y-%m-%d')
+ ) T on T.create_time = d.date
+ GROUP BY d.date
+ </select>
+
+ <select id="selectByMonth" resultType="com.dg.core.db.manual.pojo.AppletUserCount">
+ select d.date, IFNULL(T.score,0) visits from
+ (
+ SELECT CURDATE() AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 1 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 2 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 3 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 4 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 5 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 6 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 7 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 8 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 9 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 10 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 11 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 12 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 13 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 14 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 15 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 16 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 17 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 18 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 19 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 20 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 21 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 22 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 23 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 24 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 25 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 26 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 27 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 28 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 29 DAY) AS date
+ UNION ALL
+ SELECT DATE_SUB(CURDATE(), INTERVAL 30 DAY) AS date
+ ) d
+ left join(
+ select DATE_FORMAT(create_time,'%Y-%m-%d')create_time, COUNT(*) as score
+ from automessage_sys_user_record
+ group by DATE_FORMAT(create_time,'%Y-%m-%d')
+ ) T on T.create_time = d.date
+ GROUP BY d.date
+ </select>
+
+ <select id="selectByYear" resultType="com.dg.core.db.manual.pojo.AppletUserCount">
+ select d.date, IFNULL(T.score,0) visits from
+ (
+ SELECT DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 11 month),"%Y-%m") date UNION
+ SELECT DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 10 month),"%Y-%m") date UNION
+ SELECT DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 9 month),"%Y-%m") date UNION
+ SELECT DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 8 month),"%Y-%m") date UNION
+ SELECT DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 7 month),"%Y-%m") date UNION
+ SELECT DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 6 month),"%Y-%m") date UNION
+ SELECT DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 5 month),"%Y-%m") date UNION
+ SELECT DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 4 month),"%Y-%m") date UNION
+ SELECT DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 3 month),"%Y-%m") date UNION
+ SELECT DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 2 month),"%Y-%m") date UNION
+ SELECT DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 month),"%Y-%m") date UNION
+ select DATE_FORMAT(NOW(),"%Y-%m") FROM DUAL
+ ) d
+ left join(
+ select DATE_FORMAT(create_time,'%Y-%m')create_time, COUNT(*) as score
+ from automessage_sys_user_record
+ group by DATE_FORMAT(create_time,'%Y-%m')
+ ) T on T.create_time = d.date
+ GROUP BY d.date
+ </select>
+
+<!-- 删除因为token问题产出的重复脏数据-->
+ <delete id="deleteDistinct" parameterType="string">
+ DELETE FROM automessage_sys_user_record where id in
+ (select id FROM(
+ Select id,user_id,DATE_FORMAT(create_time,'%Y-%m-%d')create_time
+ From automessage_sys_user_record Group By user_id,DATE_FORMAT(create_time,'%Y-%m-%d') Having Count(*)>1)
+ k)
+ </delete>
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/AutomessageTransactionEventInterviewMapper.xml b/flower_city/src/main/resources/mapper/AutomessageTransactionEventInterviewMapper.xml
new file mode 100644
index 0000000..fa4cb67
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/AutomessageTransactionEventInterviewMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.AutomessageTransactionEventInterviewMapper">
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml b/flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml
new file mode 100644
index 0000000..32cf559
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.ClassifyAdministrationMapper">
+
+ <resultMap type="com.dg.core.db.gen.entity.ClassifyAdministration" id="ClassifyAdministrationEntityResult">
+ <id property="id" column="id" />
+ <id property="classifyGrade" column="classify_grade" />
+ <id property="createTime" column="create_time" />
+ <id property="updateTime" column="update_time" />
+ <id property="classifyIcon" column="classify_icon" />
+ <id property="parentId" column="parent_id" />
+ <id property="classifyName" column="classify_name" />
+
+ </resultMap>
+
+ <sql id="selectClassifyAdministrationEntityVo">
+ SELECT
+ id,
+ classify_grade,
+ create_time,
+ update_time,
+ parent_id,
+ (select ca.classify_name from automessage_classify_administration as ca where ca.id= automessage_classify_administration.parent_id) as parentName,
+ classify_name,
+ classify_icon,
+ (IF(classify_grade = '2',(SELECT count(id) FROM automessage_transaction_event WHERE automessage_transaction_event.classify_id=automessage_classify_administration.id),
+ (SELECT count(id) FROM automessage_transaction_event WHERE automessage_transaction_event.classify_id in (SELECT id FROM automessage_classify_administration
+ WHERE automessage_classify_administration.parent_id=automessage_transaction_event.classify_id)))) as transactNum
+ FROM
+ automessage_classify_administration
+ </sql>
+
+ <select id="selectConfigList" resultMap="ClassifyAdministrationEntityResult">
+ <include refid="selectClassifyAdministrationEntityVo"/>
+ <where>
+ <if test="classifyName != null and classifyName != ''">
+ AND classify_name like concat('%', #{classifyName}, '%')
+ </if>
+ <if test="classifyGrade != null and classifyGrade != ''">
+ AND classify_grade = #{classifyGrade}
+ </if>
+ </where>
+ order by create_time desc
+ </select>
+
+ <select id="selectRootList" resultMap="ClassifyAdministrationEntityResult">
+ <include refid="selectClassifyAdministrationEntityVo"/>
+ <where>
+ parent_id=#{parentId}
+ <if test="departmentId!=null">
+ and id in (
+ select classify_id from automessage_transaction_event where department_id in (select id from automessage_organization_chart where id=#{departmentId} or parent_id=#{departmentId}) UNION
+ select parent_id from automessage_classify_administration
+ where id in (select classify_id FROM automessage_transaction_event
+ where department_id in (select id from automessage_organization_chart where id=#{departmentId} or parent_id=#{departmentId})) )
+ </if>
+ </where>
+ </select>
+
+ <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.ClassifyAdministration">
+ insert into automessage_classify_administration (
+ <if test="id != null">id,</if>
+ <if test="classifyGrade != null and classifyGrade != '' ">classify_grade,</if>
+ <if test="parentId != null">parent_id,</if>
+ <if test="classifyName != null and classifyName != '' ">classify_name,</if>
+ <if test="classifyIcon != null and classifyIcon != '' ">classify_icon,</if>
+ update_time,
+ create_time
+ )values(
+ <if test="id != null">#{id},</if>
+ <if test="classifyGrade != null and classifyGrade != '' ">#{classifyGrade},</if>
+ <if test="parentId != null">#{parentId},</if>
+ <if test="classifyName != null and classifyName != '' ">#{classifyName},</if>
+ <if test="classifyIcon != null and classifyIcon != '' ">#{classifyIcon},</if>
+ sysdate(),
+ sysdate()
+ )
+ </insert>
+
+ <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.ClassifyAdministration">
+ update automessage_classify_administration
+ <set>
+ <if test="id != null">id=#{id},</if>
+ <if test="classifyGrade != null and classifyGrade != '' ">classify_grade=#{classifyGrade},</if>
+ <if test="parentId != null">parent_id=#{parentId},</if>
+ <if test="classifyName != null and classifyName != '' ">classify_name=#{classifyName},</if>
+ <if test="classifyIcon != null and classifyIcon != '' ">classify_icon=#{classifyIcon},</if>
+ update_time=sysdate()
+ </set>
+ where id= #{id}
+ </update>
+
+ <delete id="deleteConfigById" parameterType="String">
+ delete from automessage_classify_administration where id= #{id}
+ </delete>
+
+ <select id="countNum" resultType="integer">
+ select count(id) from automessage_classify_administration
+ <where>
+ <if test="classifyName != null and classifyName != ''">
+ AND classify_name like concat('%', #{classifyName}, '%')
+ </if>
+ <if test="classifyGrade != null and classifyGrade != ''">
+ AND classify_grade = #{classifyGrade}
+ </if>
+ </where>
+ </select>
+
+ <select id="selectParent" resultType="string">
+ select id from automessage_classify_administration
+ <where>
+ <if test="parentId != null and parentId != ''">
+ AND parent_id = #{parentId}
+ </if>
+ </where>
+ </select>
+
+ <select id="selectParentData" resultType="com.dg.core.db.gen.entity.ClassifyAdministration">
+ <include refid="selectClassifyAdministrationEntityVo"/>
+ <where>
+ <if test="parentId != null and parentId != ''">
+ AND parent_id = #{parentId}
+ </if>
+ </where>
+ </select>
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/ElseAccessoryMapper.xml b/flower_city/src/main/resources/mapper/ElseAccessoryMapper.xml
new file mode 100644
index 0000000..5bc39ef
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/ElseAccessoryMapper.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.ElseAccessoryMapper">
+
+ <resultMap type="com.dg.core.db.gen.entity.ElseAccessoryEntity" id="ElseAccessoryEntityResult">
+ <id property="id" column="id" />
+ <id property="departmentId" column="department_id" />
+ <id property="createUserId" column="create_user_id" />
+ <id property="createTime" column="create_time" />
+ <id property="updateTime" column="update_time" />
+ <id property="name" column="name" />
+ <id property="url" column="url" />
+
+ </resultMap>
+
+ <sql id="selectElseAccessoryEntityVo">
+ SELECT
+ id,
+ department_id,
+ create_user_id,
+ (select organization_name from automessage_organization_chart where automessage_organization_chart.id=automessage_else_accessory.department_id) as departmentName,
+ create_time,
+ update_time,
+ (select automessage_sys_user.user_name from automessage_sys_user where automessage_sys_user.user_id=automessage_else_accessory.create_user_id) as createUserName,
+ url,
+ name
+ FROM
+ automessage_else_accessory
+ </sql>
+
+ <select id="selectConfigList" resultMap="ElseAccessoryEntityResult">
+ SELECT
+ id,
+ department_id,
+ (select organization_name from automessage_organization_chart where automessage_organization_chart.id=automessage_else_accessory.department_id) as departmentName,
+ create_time,
+ update_time,
+ url,
+ name,
+ create_user_id,
+ (select automessage_sys_user.user_name from automessage_sys_user where
+ automessage_sys_user.user_id=automessage_else_accessory.create_user_id) as createUserName,
+ <if test="userId!=null and userId!=''">
+ (case create_user_id when #{userId} then 1 else 0 end)isDelete
+ </if>
+ <if test="userId==null or userId==''">
+ 1 isDelete
+ </if>
+ FROM
+ automessage_else_accessory
+ <where>
+ <if test="Name != null and Name != ''">
+ AND automessage_else_accessory.name like concat('%', #{Name}, '%')
+ </if>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ order by create_time desc
+ </select>
+
+ <select id="selectListByIds" resultMap="ElseAccessoryEntityResult">
+ <include refid="selectElseAccessoryEntityVo"/>
+ WHERE id IN
+ <foreach collection="array" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ order by create_time desc
+ </select>
+
+
+ <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.ElseAccessoryEntity">
+ insert into automessage_else_accessory (
+ <if test="id != null">id,</if>
+ <if test="departmentId != null and departmentId != '' ">department_id,</if>
+ <if test="name != null and name != '' ">name,</if>
+ <if test="url != null and url != '' ">url,</if>
+ <if test="createUserId != null and createUserId != '' ">create_user_id,</if>
+ update_time,
+ create_time
+ )values(
+ <if test="id != null">#{id},</if>
+ <if test="departmentId != null and departmentId != '' ">#{departmentId},</if>
+ <if test="name != null and name != '' ">#{name},</if>
+ <if test="url != null and url != '' ">#{url},</if>
+ <if test="createUserId != null and createUserId != '' ">#{createUserId},</if>
+ sysdate(),
+ sysdate()
+ )
+ </insert>
+
+ <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.ElseAccessoryEntity">
+ update automessage_else_accessory
+ <set>
+ <if test="id != null">id=#{id},</if>
+ <if test="departmentId != null and departmentId != '' ">department_id=#{departmentId},</if>
+ <if test="name != null and name != '' ">name=#{name},</if>
+ <if test="url != null and url != '' ">url=#{url},</if>
+ update_time=sysdate()
+ </set>
+ where id= #{id}
+ </update>
+
+ <delete id="deleteConfigById" parameterType="string">
+ delete from automessage_else_accessory where id= #{Id}
+ </delete>
+
+ <select id="countNum" resultType="integer">
+ select count(id) from automessage_else_accessory
+ <where>
+ <if test="Name != null and Name != ''">
+ AND automessage_else_accessory.name like concat('%', #{Name}, '%')
+ </if>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ </select>
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/GuideEvolveMapper.xml b/flower_city/src/main/resources/mapper/GuideEvolveMapper.xml
new file mode 100644
index 0000000..4e70613
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/GuideEvolveMapper.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.GuideEvolveMapper">
+
+ <resultMap type="com.dg.core.db.gen.entity.GuideEvolveEntity" id="GuideEvolveResult">
+ <id property="id" column="id" />
+ <id property="departmentalId" column="departmental_id" />
+ <id property="toUserId" column="to_user_id" />
+ <id property="fromUserId" column="from_user_id" />
+ <id property="state" column="state" />
+ <id property="remark" column="remark" />
+ <id property="guideId" column="guide_id" />
+ <id property="transactionId" column="transaction_id" />
+ <id property="accessoryId" column="accessory_id" />
+ <id property="accessoryName" column="accessory_name" />
+ <id property="accessoryUrl" column="accessory_url" />
+ <id property="createTime" column="create_time" />
+ <id property="updateTime" column="update_time" />
+ <id property="fromDepartmentalId" column="from_departmental_id" />
+ <id property="videoUrl" column="video_url" />
+ <id property="pictureUrl" column="picture_url" />
+ <id property="guideOrderNum" column="guide_order_num" />
+ <id property="isTimeout" column="is_timeout" />
+
+ </resultMap>
+
+ <sql id="selectGuideEvolveVo">
+ SELECT
+ id,
+ departmental_id,
+ (select user_name from automessage_sys_user where a.to_user_id=user_id)toUserName,
+ (select user_name from automessage_sys_user where a.from_user_id=user_id)fromUserName,
+ to_user_id,
+ from_user_id,
+ state,
+ remark,
+ guide_id,
+ transaction_id,
+ accessory_id,
+ accessory_name,
+ accessory_url,
+ from_departmental_id,
+ video_url,
+ picture_url,
+ create_time,
+ update_time,
+ guide_order_num,
+ is_timeout
+ FROM
+ automessage_guide_evolve a
+ </sql>
+
+ <select id="selectConfigList" resultMap="GuideEvolveResult">
+ <include refid="selectGuideEvolveVo"/>
+ <where>
+ <if test="guideId != null and guideId != ''">
+ AND guide_id=#{guideId}
+ </if>
+ </where>
+ order by create_time desc
+ </select>
+
+ <select id="selectHideList" resultMap="GuideEvolveResult">
+ SELECT
+ id,
+ departmental_id,
+ IFNULL(
+ (select concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.to_user_id=user_id and (user_type in (1,2) or is_division_head=1)),
+ (select user_name from automessage_sys_user where a.to_user_id=user_id))toUserName,
+ IFNULL(
+ (select concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.from_user_id=user_id and (user_type in (1,2) or is_division_head=1)),
+ (select user_name from automessage_sys_user where a.from_user_id=user_id))fromUserName,
+ to_user_id,
+ from_user_id,
+ state,
+ remark,
+ guide_id,
+ transaction_id,
+ accessory_id,
+ accessory_name,
+ accessory_url,
+ from_departmental_id,
+ video_url,
+ picture_url,
+ create_time,
+ update_time,
+ guide_order_num,
+ is_timeout
+ FROM
+ automessage_guide_evolve a
+ <where>
+ <if test="guideId != null and guideId != ''">
+ AND guide_id=#{guideId}
+ </if>
+ </where>
+ order by create_time desc
+ </select>
+
+
+ <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.GuideEvolveEntity">
+ insert into automessage_guide_evolve (
+ <if test="departmentalId != null and departmentalId != '' ">departmental_id,</if>
+ <if test="toUserId != null and toUserId != '' ">to_user_id,</if>
+ <if test="fromUserId != null and fromUserId != '' ">from_user_id,</if>
+ <if test="state != null and state != '' ">state,</if>
+ <if test="remark != null and remark != '' ">remark,</if>
+ <if test="guideId != null and guideId != '' ">guide_id,</if>
+ <if test="transactionId != null and transactionId != '' ">transaction_id,</if>
+ <if test="accessoryId != null and accessoryId != '' ">accessory_id,</if>
+ <if test="accessoryName != null and accessoryName != '' ">accessory_name,</if>
+ <if test="accessoryUrl != null and accessoryUrl != '' ">accessory_url,</if>
+ <if test="fromDepartmentalId != null and fromDepartmentalId != '' ">from_departmental_id,</if>
+ <if test="videoUrl != null and videoUrl != '' ">video_url,</if>
+ <if test="pictureUrl != null and pictureUrl != '' ">picture_url,</if>
+ <if test="guidOrderNum != null and guidOrderNum != '' ">guide_order_num,</if>
+ <if test="isTimeout != null and isTimeout != '' ">is_timeout,</if>
+ update_time,
+ create_time
+ )values(
+ <if test="departmentalId != null and departmentalId != '' ">#{departmentalId},</if>
+ <if test="toUserId != null and toUserId != '' ">#{toUserId},</if>
+ <if test="fromUserId != null and fromUserId != '' ">#{fromUserId},</if>
+ <if test="state != null and state != '' ">#{state},</if>
+ <if test="remark != null and remark != '' ">#{remark},</if>
+ <if test="guideId != null and guideId != '' ">#{guideId},</if>
+ <if test="transactionId != null and transactionId != '' ">#{transactionId},</if>
+ <if test="accessoryId != null and accessoryId != '' ">#{accessoryId},</if>
+ <if test="accessoryName != null and accessoryName != '' ">#{accessoryName},</if>
+ <if test="accessoryUrl != null and accessoryUrl != '' ">#{accessoryUrl},</if>
+ <if test="fromDepartmentalId != null and fromDepartmentalId != '' ">#{fromDepartmentalId},</if>
+ <if test="videoUrl != null and videoUrl != '' ">#{videoUrl},</if>
+ <if test="pictureUrl != null and pictureUrl != '' ">#{pictureUrl},</if>
+ <if test="guidOrderNum != null and guidOrderNum != '' ">#{guidOrderNum},</if>
+ <if test="isTimeout != null and isTimeout != '' ">#{isTimeout},</if>
+ sysdate(),
+ sysdate()
+ )
+ </insert>
+
+ <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.GuideEvolveEntity">
+ update automessage_guide_evolve
+ <set>
+ <if test="departmentalId != null and departmentalId != '' ">departmental_id=#{departmentalId},</if>
+ <if test="toUserId != null and toUserId != '' ">to_user_id=#{toUserId},</if>
+ <if test="fromUserId != null and fromUserId != '' ">from_user_id=#{fromUserId},</if>
+ <if test="state != null and state != '' ">state=#{state},</if>
+ <if test="remark != null and remark != '' ">remark=#{remark},</if>
+ <if test="guideId != null and guideId != '' ">guide_id=#{guideId},</if>
+ <if test="transactionId != null and transactionId != '' ">transaction_id=#{transactionId},</if>
+ <if test="accessoryId != null and accessoryId != '' ">accessory_id=#{accessoryId},</if>
+ <if test="accessoryName != null and accessoryName != '' ">accessory_name=#{accessoryName},</if>
+ <if test="accessoryUrl != null and accessoryUrl != '' ">accessory_url=#{accessoryUrl},</if>
+ <if test="fromDepartmentalId != null and fromDepartmentalId != '' ">from_departmental_id=#{fromDepartmentalId},</if>
+ <if test="videoUrl != null and videoUrl != '' ">video_url=#{videoUrl},</if>
+ <if test="pictureUrl != null and pictureUrl != '' ">picture_url=#{pictureUrl},</if>
+ <if test="isTimeout != null and isTimeout != '' ">is_timeout=#{isTimeout},</if>
+ update_time=sysdate()
+ </set>
+ where id= #{Id}
+ </update>
+
+ <update id="updateGuid" parameterType="com.dg.core.db.gen.entity.GuideEvolveEntity">
+ UPDATE automessage_guide_evolve
+ SET guide_id = (SELECT id from automessage_guide_repair_order where order_num=automessage_guide_evolve.guide_order_num )
+ WHERE guide_id IS NULL
+ </update>
+
+ <delete id="deleteConfigById" parameterType="string">
+ delete from automessage_guide_evolve where id= #{Id}
+ </delete>
+
+ <select id="countNum" resultType="integer">
+ select count(id) from automessage_guide_evolve
+ </select>
+
+</mapper>
+
+
+
+
+
diff --git a/flower_city/src/main/resources/mapper/GuideRepairOrderImageMapper.xml b/flower_city/src/main/resources/mapper/GuideRepairOrderImageMapper.xml
new file mode 100644
index 0000000..30b971d
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/GuideRepairOrderImageMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.GuideRepairOrderImageMapper">
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml b/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
new file mode 100644
index 0000000..730bb4a
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.GuideRepairOrderMapper">
+
+ <resultMap type="com.dg.core.db.gen.entity.GuideRepairOrder" id="GuideRepairOrderResult">
+ <id property="id" column="id" />
+ <id property="orderNum" column="order_num" />
+ <id property="matterId" column="matter_id" />
+ <id property="matterName" column="matter_name" />
+ <id property="departmentId" column="department_id" />
+ <id property="classifyId" column="classify_id" />
+ <id property="consultContent" column="consult_content" />
+ <id property="consultUserName" column="consult_user_name" />
+ <id property="submitUserId" column="submit_user_id" />
+ <id property="guideUserId" column="guide_user_id" />
+ <id property="guideDepartmentId" column="guide_department_id" />
+ <id property="state" column="state" />
+ <id property="consultUserPhone" column="consult_user_phone" />
+ <id property="submitUserPhone" column="submit_user_phone" />
+ <id property="guideUserPhone" column="guide_user_phone" />
+ <id property="areaCode" column="area_code" />
+ <id property="detailedAddress" column="detailed_address" />
+ <id property="createTime" column="create_time" />
+ <id property="updateTime" column="update_time" />
+ <id property="evaluateContent" column="evaluate_content" />
+ <id property="suggest" column="suggest" />
+ <id property="evaluateState" column="evaluate_state" />
+ <id property="serviceState" column="service_state" />
+ <id property="images" column="images" />
+ <id property="video" column="video" />
+ <id property="isTimeout" column="is_timeout" />
+ <id property="submitType" column="submit_type" />
+ <id property="timeoutTime" column="timeout_time" />
+ <id property="isPush" column="is_push" />
+ <id property="isHideComments" column="is_hide_comments" />
+ <id property="isRemindPush" column="is_remind_push" />
+
+ </resultMap>
+
+ <sql id="selectGuideRepairOrderVo">
+ SELECT
+ id,
+ order_num,
+ matter_id,
+ submit_type,
+ matter_name,
+ timeout_time,
+ is_hide_comments,
+ is_push,
+ (select organization_name from automessage_organization_chart where a.department_id=id)organizationName,
+ concat(
+ (select classify_name from automessage_classify_administration where id=(select parent_id from automessage_classify_administration where id=a.classify_id)),
+ '-',(select classify_name from automessage_classify_administration where id=a.classify_id)
+ ) sumClassifyName,
+ department_id,
+ classify_id,
+ consult_content,
+ concat((IFNULL(consult_user_name,'')),(IFNULL(consult_user_phone,''))) consultUser,
+ consult_user_name,
+ concat((IFNULL((select user_name from automessage_sys_user where a.submit_user_id=user_id ),'')), (IFNULL(submit_user_phone,''))) submitUser,
+ submit_user_id,
+ concat((IFNULL((select user_name from automessage_sys_user where a.guide_user_id=user_id ),'')), (ifnull(guide_user_phone,''))) guideUser,
+ guide_user_id,
+ (select organization_name from automessage_organization_chart where a.guide_department_id=id)guideDepartmentName,
+ guide_department_id,
+ state,
+ consult_user_phone,
+ submit_user_phone,
+ guide_user_phone,
+ (select name from automessage_area_code_2022 where code=a.area_code)areaName,
+ area_code,
+ detailed_address,
+ create_time,
+ update_time,
+ evaluate_content,
+ suggest,
+ evaluate_state,
+ service_state,
+ video,
+ images,
+ is_timeout
+ FROM
+ automessage_guide_repair_order a
+ </sql>
+
+ <select id="selectConfigList" resultMap="GuideRepairOrderResult">
+ <include refid="selectGuideRepairOrderVo"/>
+ <where>
+ <if test="ids != null">
+ and guide_department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ <if test="guideUserId != null and guideUserId != ''">
+ AND a.guide_user_id=#{guideUserId}
+ </if>
+ <if test="matterName != null and matterName != ''">
+ AND (
+ (matter_name like concat('%', #{matterName}, '%')) or
+ ( classify_id in ( SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%') ) )
+ or (classify_id in (SELECT id FROM automessage_classify_administration WHERE automessage_classify_administration.parent_id in
+ (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%')))
+ or (select user_name from automessage_sys_user where a.guide_user_id=automessage_sys_user.user_id ) like concat('%', #{matterName}, '%')
+ or order_num like concat('%', #{matterName}, '%') or
+ (select user_name from automessage_sys_user where a.submit_user_id=automessage_sys_user.user_id ) like concat('%', #{matterName}, '%')
+ or consult_user_name like concat('%', #{matterName}, '%') or
+ guide_department_id in (SELECT id FROM automessage_organization_chart WHERE organization_name like concat('%', #{matterName}, '%') ) )
+ )
+ </if>
+ <if test="status != null and status != ''">
+ AND a.state=#{status}
+ </if>
+ <if test="createTimeStartTime != null and createTimeStartTime != ''">
+ and create_time > #{createTimeStartTime}
+ </if>
+ <if test="createTimeTimeEndTime != null and createTimeTimeEndTime != ''">
+ and #{createTimeTimeEndTime} > create_time
+ </if>
+ <if test="classifyId != null and classifyId != ''">
+ and classify_id in (select id FROM automessage_classify_administration where parent_id = #{classifyId})
+ </if>
+
+ </where>
+ order by update_time desc , create_time desc
+ </select>
+
+ <select id="countConfigList" resultType="integer">
+ select count(id) from automessage_guide_repair_order
+ <where>
+ <if test="ids != null">
+ and guide_department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ <if test="guideUserId != null and guideUserId != ''">
+ AND automessage_guide_repair_order.guide_user_id=#{guideUserId}
+ </if>
+ <if test="matterName != null and matterName != ''">
+ AND (
+ (matter_name like concat('%', #{matterName}, '%')) or
+ ( classify_id in ( SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%') ) )
+ or (classify_id in (SELECT id FROM automessage_classify_administration WHERE automessage_classify_administration.parent_id in
+ (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%')))
+ or (select user_name from automessage_sys_user where automessage_guide_repair_order.guide_user_id=automessage_sys_user.user_id ) like concat('%', #{matterName}, '%')
+ or order_num like concat('%', #{matterName}, '%') or
+ (select user_name from automessage_sys_user where automessage_guide_repair_order.submit_user_id=automessage_sys_user.user_id ) like concat('%', #{matterName}, '%')
+ or consult_user_name like concat('%', #{matterName}, '%') or
+ guide_department_id in (SELECT id FROM automessage_organization_chart WHERE organization_name like concat('%', #{matterName}, '%') ) )
+ )
+ </if>
+ <if test="status != null and status != ''">
+ AND automessage_guide_repair_order.state=#{status}
+ </if>
+
+ </where>
+ </select>
+
+ <select id="selectConfigData" resultMap="GuideRepairOrderResult">
+ <include refid="selectGuideRepairOrderVo"/>
+ <where>
+ <if test="Id != null and Id != ''">
+ AND id=#{Id}
+ </if>
+ <if test="orderNum != null and orderNum != ''">
+ AND order_num=#{orderNum}
+ </if>
+ </where>
+ </select>
+
+
+ <select id="selectBySubmitId" resultMap="GuideRepairOrderResult">
+ <include refid="selectGuideRepairOrderVo"/>
+ where submit_user_id=#{id} and ( state not in (3,5) or ( state in (3,5) and 60>datediff(now(),create_time)
+ )) order by create_time desc
+ </select>
+
+
+
+ <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.GuideRepairOrder">
+ update automessage_guide_repair_order
+ <set>
+ <if test="guideUserId != null and guideUserId != '' ">guide_user_id=#{guideUserId},</if>
+ <if test="guideDepartmentId != null and guideDepartmentId != '' ">guide_department_id=#{guideDepartmentId},</if>
+ <if test="state != null and state != '' ">state=#{state},</if>
+ <if test="guideUserPhone != null and guideUserPhone != '' ">guide_user_phone=#{guideUserPhone},</if>
+ <if test="evaluateState != null and evaluateState != '' ">evaluate_state=#{evaluateState},</if>
+ <if test="evaluateContent != null and evaluateContent != '' ">evaluate_content=#{evaluateContent},</if>
+ <if test="suggest != null and suggest != '' ">suggest=#{suggest},</if>
+ <if test="serviceState != null ">service_state=#{serviceState},</if>
+ <if test="isTimeout != null ">is_timeout=#{isTimeout},</if>
+ <if test="timeoutTime != null ">timeout_time=#{timeoutTime},</if>
+ update_time=sysdate()
+ </set>
+ where id= #{id}
+ </update>
+
+ <select id="countNum" resultType="integer">
+ select count(id) from automessage_guide_repair_order
+ </select>
+
+
+ <select id="countUser" resultType="integer">
+ select count(id) from automessage_guide_repair_order
+ <where>
+ <if test="userId != null and userId != ''">
+ AND guide_user_id=#{userId}
+ </if>
+ <if test="state != null and state != ''">
+ AND automessage_guide_repair_order.state = #{state}
+ </if>
+ </where>
+ </select>
+
+
+ <delete id="deleteConfigById" parameterType="string">
+ delete from automessage_guide_repair_order where id= #{Id}
+ </delete>
+
+
+
+ <!-- 首页统计 勿动 -->
+ <select id="countStatisticsNum" parameterType="string" resultType="integer">
+ select count(id) from automessage_guide_repair_order
+ <where>
+ <if test="state != null and state != ''">
+ automessage_guide_repair_order.state=#{state}
+ </if>
+ <if test="isTimeout != null and isTimeout != ''">
+ and is_timeout=#{isTimeout}
+ </if>
+ <if test="evaluateState != null and evaluateState != ''">
+ and evaluate_state=#{evaluateState}
+ </if>
+ <if test="guideUserId != null and guideUserId != ''">
+ AND guide_user_id=#{guideUserId}
+ </if>
+ <if test="ids != null">
+ and guide_department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ <if test="classifyIds != null">
+ and classify_id IN
+ <foreach collection="classifyIds" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ <if test="serviceState != null and serviceState != ''">
+ and automessage_guide_repair_order.service_state=#{serviceState}
+ </if>
+ <if test="time != null and time == 1 ">
+ and to_days(automessage_guide_repair_order.create_time) = to_days(now())
+ </if>
+ <if test="time != null and time == 2 ">
+ and TO_DAYS(NOW()) - TO_DAYS(automessage_guide_repair_order.create_time) = 1
+ </if>
+ <if test="time != null and time == 3 ">
+ and DATE_FORMAT( automessage_guide_repair_order.create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+ </if>
+ <if test="time != null and time == 4 ">
+ and YEAR(automessage_guide_repair_order.create_time)=YEAR(NOW())
+ </if>
+ </where>
+ </select>
+ <!-- 首页统计 勿动 -->
+ <select id="countListNum" resultType="com.dg.core.db.gen.entity.CountListNum">
+ select create_time,count(id) as num from automessage_guide_repair_order
+ <where>
+ <if test="state != null and state != ''">
+ automessage_guide_repair_order.state=#{state}
+ </if>
+ <if test="ids != null">
+ and guide_department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ GROUP BY
+ date_format(create_time,'%y%m%d')
+ ORDER BY
+ create_time DESC
+ LIMIT #{time}
+ </select>
+
+ <select id="selectOvertime" resultMap="GuideRepairOrderResult">
+ <include refid="selectGuideRepairOrderVo"/>
+ <where>
+ state=2 and is_push=2 and SYSDATE()>timeout_time and 1>(select count(*) from automessage_guide_evolve where state=9 and a.id=guide_id )
+ </where>
+ </select>
+
+ <select id="selectNoticeTime" resultMap="GuideRepairOrderResult">
+ <include refid="selectGuideRepairOrderVo"/>
+ <where>
+ state=2 and is_remind_push=2 and SYSDATE()>subdate(timeout_time, interval ${minute} minute ) and 1>(select count(*) from automessage_guide_evolve where state=9 and a.id=guide_id )
+ </where>
+ </select>
+ <select id="selectEvaluate" resultMap="GuideRepairOrderResult">
+ <include refid="selectGuideRepairOrderVo"/>
+ <where>
+ state=4 and datediff(now(),update_time)>=1
+ </where>
+ </select>
+
+
+
+
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml b/flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml
new file mode 100644
index 0000000..1abfb54
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml
@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.HomeStatisticsMapper">
+
+ <!-- 按办结量排序 -->
+ <select id="guidePlatePeople" resultType="com.dg.core.db.gen.entity.GuidePlate">
+ SELECT
+ user_name as userName,
+ (SELECT organization_name FROM automessage_organization_chart WHERE automessage_organization_chart.id=department_id) as departmentNmae,
+ (select count(id) from automessage_guide_repair_order WHERE automessage_guide_repair_order.guide_user_id=automessage_sys_user.user_id
+ and automessage_guide_repair_order.state=3
+ <if test="ids != null">
+ and guide_department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>) as num
+ FROM automessage_sys_user
+ <where>
+ user_type=2
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ ORDER BY
+ num DESC
+ LIMIT 10
+ </select>
+
+ <!-- 按评分排序 -->
+ <select id="score" resultType="com.dg.core.db.gen.entity.GuidePlate">
+ SELECT
+ user_name,
+ (SELECT organization_name FROM automessage_organization_chart WHERE automessage_organization_chart.id=department_id) as departmentNmae,
+ ( format((select sum(IF(evaluate_state='1',10,IF(evaluate_state='2',5,0))) from automessage_guide_repair_order
+ WHERE automessage_guide_repair_order.guide_user_id=automessage_sys_user.user_id
+ <if test="ids != null">
+ and guide_department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ )/(select count(id) from automessage_guide_repair_order
+ WHERE automessage_guide_repair_order.guide_user_id=automessage_sys_user.user_id
+ <if test="ids != null">
+ and guide_department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>),1)
+ ) as num
+ FROM automessage_sys_user
+ <where>
+ user_type=2
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ ORDER BY
+ num DESC
+ LIMIT 10
+ </select>
+
+ <!-- 按超时 -->
+ <select id="timeout" resultType="com.dg.core.db.gen.entity.GuidePlate">
+ SELECT
+ user_name as userName,
+ (SELECT organization_name FROM automessage_organization_chart WHERE automessage_organization_chart.id=department_id) as departmentNmae,
+ (select count(id) from automessage_guide_repair_order WHERE automessage_guide_repair_order.guide_user_id=automessage_sys_user.user_id
+ and automessage_guide_repair_order.is_timeout=2 <if test="ids != null">
+ and guide_department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ ) as num
+ FROM automessage_sys_user
+ <where>
+ user_type=2
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ ORDER BY
+ num DESC
+ LIMIT 10
+ </select>
+
+
+ <!-- 按未办结 -->
+ <select id="tosettled" resultType="com.dg.core.db.gen.entity.GuidePlate">
+ SELECT
+ user_name as userName,
+ (SELECT organization_name FROM automessage_organization_chart WHERE automessage_organization_chart.id=department_id) as departmentNmae,
+ (select count(id) from automessage_guide_repair_order WHERE automessage_guide_repair_order.guide_user_id=automessage_sys_user.user_id
+ and automessage_guide_repair_order.state=2
+ <if test="ids != null">
+ and guide_department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ ) as num
+ FROM automessage_sys_user
+ <where>
+ user_type=2
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ ORDER BY
+ num DESC
+ LIMIT 10
+ </select>
+
+ <!-- 按工单量 -->
+ <select id="workunit" resultType="com.dg.core.db.gen.entity.GuidePlate">
+ SELECT
+ user_name as userName,
+ (SELECT organization_name FROM automessage_organization_chart WHERE automessage_organization_chart.id=department_id) as departmentNmae,
+ (select count(id) from automessage_guide_repair_order WHERE automessage_guide_repair_order.guide_user_id=automessage_sys_user.user_id
+ <if test="ids != null">
+ and guide_department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>) as num
+ FROM automessage_sys_user
+ <where>
+ user_type=2
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ ORDER BY
+ num DESC
+ LIMIT 10
+ </select>
+
+
+ <!-- 导办人员统计数 -->
+ <select id="staffNum" resultType="int">
+ SELECT count(id)
+ FROM automessage_sys_user
+ <where>
+ user_type=2
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ </select>
+
+<!-- 获取一级组织 -->
+ <select id="getDepartment" resultType="com.dg.core.db.gen.entity.OrganizationEntity">
+ SELECT
+ organization_name as departmentNmae,
+ id
+ FROM automessage_organization_chart
+ WHERE grade=1
+ </select>
+
+
+ <!-- 组织排行榜 按评价 -->
+ <select id="organizationScore" resultType="int">
+ SELECT sum(IF(evaluate_state='1',10,IF(evaluate_state='2',5,0)))
+ FROM automessage_guide_repair_order
+ WHERE department_id in
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </select>
+
+
+
+ <!-- 组织排行榜 按办结量 -->
+ <select id="organizationNum" resultType="int">
+ SELECT count(id) FROM automessage_guide_repair_order WHERE department_id in
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </select>
+
+ <!-- 办事指南 根据导办数量排序 -->
+ <select id="guidanceTransaction" resultType="com.dg.core.db.gen.entity.Guidance">
+ SELECT matter_name as name ,(select count(id) from automessage_guide_repair_order
+ where automessage_guide_repair_order.matter_id=automessage_transaction_event.id
+ <if test="ids != null">
+ and automessage_guide_repair_order.guide_department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ ) as num
+ from automessage_transaction_event
+ <where>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ ORDER BY num DESC
+ LIMIT 10
+ </select>
+
+ <!-- 办事指南 根据导办数量排序 -->
+ <select id="guidanceBrowse" resultType="com.dg.core.db.gen.entity.Guidance">
+ SELECT matter_name as name ,browse_num as num from
+ automessage_transaction_event
+ <where>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ ORDER BY num DESC
+ LIMIT 10
+ </select>
+
+
+ <!-- 办事指南 统计数量 -->
+ <select id="countWork" resultType="int">
+ SELECT count(id) from automessage_transaction_event
+ <where>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ </select>
+
+
+
+ <!-- 首页统计 勿动 -->
+ <select id="countStatisticsNum" resultType="int">
+ select count(id) from automessage_transaction_event
+ <where>
+ <if test="classifyIds != null">
+ and classify_id IN
+ <foreach collection="classifyIds" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ </select>
+
+
+ <!-- 首页统计用 勿动 -->
+ <select id="getClassify" parameterType="string" resultType="com.dg.core.db.gen.entity.ClassifyAdministration">
+ select id,classify_name from automessage_classify_administration
+ <where>
+ <if test="parentId != null and parentId != ''">
+ AND parent_id=#{parentId}
+ </if>
+ <if test="classifyGrade != null and classifyGrade != ''">
+ AND classify_grade = #{classifyGrade}
+ </if>
+ </where>
+
+ </select>
+
+
+ <!-- 首页统计区域下的部门 -->
+ <select id="countId" parameterType="string" resultType="string">
+ select id from automessage_organization_chart
+ <where>
+ <if test="district != null ">
+ AND district=#{district}
+ </if>
+ </where>
+ </select>
+
+
+ <!-- 首页统计使用 勿动 -->
+ <select id="reversionRate" resultType="string">
+ select nullif(SUM(m.num),0) from (
+ select count(id) as num from automessage_guide_evolve
+ <where>
+ <if test="state != null and state != ''">
+ and automessage_guide_evolve.state=#{state}
+ </if>
+ <if test="isTimeout != null and isTimeout != ''">
+ and automessage_guide_evolve.is_timeout=#{isTimeout}
+ </if>
+ </where>
+ GROUP BY automessage_guide_evolve.id
+ ) as m
+ </select>
+
+
+
+ <!-- 首页统计 区域统计 勿动 -->
+ <select id="rangeStatistics" parameterType="string" resultType="int">
+ select count(id) from automessage_guide_repair_order
+ <where>
+ <if test="ids != null">
+ and guide_department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ </select>
+
+
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/HuaChengSysUserMapper.xml b/flower_city/src/main/resources/mapper/HuaChengSysUserMapper.xml
new file mode 100644
index 0000000..76b8601
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/HuaChengSysUserMapper.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.HuaChengSysUserMapper">
+
+ <resultMap type="com.dg.core.db.gen.entity.HuaChengSysUser" id="SysUserResult">
+ <id property="userId" column="user_id" />
+ <id property="account" column="account" />
+ <id property="password" column="password" />
+ <id property="openid" column="openid" />
+ <id property="sessionKey" column="session_key" />
+ <id property="unionid" column="unionid" />
+ <id property="phone" column="phone" />
+ <id property="nickName" column="nick_name" />
+ <id property="name" column="name" />
+ <id property="communityId" column="community_id" />
+ <id property="sex" column="sex" />
+ <id property="idCard" column="id_card" />
+ <id property="birthday" column="birthday" />
+ <id property="imageUrl" column="image_url" />
+ <id property="type" column="type" />
+ <id property="job" column="job" />
+ <id property="isVolunteer" column="is_volunteer" />
+ <id property="isPartymember" column="is_partymember" />
+ <id property="status" column="status" />
+ <id property="createAt" column="create_at" />
+ <id property="lastLoginTime" column="last_login_time" />
+ <id property="tags" column="tags" />
+ <id property="familyId" column="family_id" />
+ <id property="faceUrl" column="face_url" />
+ <id property="faceState" column="face_state" />
+ <id property="rejectReson" column="reject_reson" />
+ <id property="areaId" column="area_id" />
+ <id property="cardPhotoFront" column="card_photo_front" />
+ <id property="cardPhotoBack" column="card_photo_back" />
+ <id property="familyBook" column="family_book" />
+ <id property="continuousLandingDays" column="continuous_landing_days" />
+ <id property="isTips" column="is_tips" />
+ <id property="workStatus" column="work_status" />
+ <id property="workStartTime" column="work_start_time" />
+ <id property="workEndTime" column="work_end_time" />
+ <id property="bigAgeTips" column="big_age_tips" />
+ <id property="plaintextPassword" column="plaintext_password" />
+ <id property="streetId" column="street_id" />
+ <id property="relationName" column="relation_name" />
+ <id property="appId" column="app_id" />
+ <id property="isAccept" column="is_accept" />
+ <id property="bindingCheckUnitId" column="binding_check_unit_id" />
+ </resultMap>
+
+ <sql id="selectSysUserVo">
+ SELECT
+ user_id,
+ account,
+ password,
+ openid,
+ session_key,
+ unionid,
+ phone,
+ nick_name,
+ name,
+ community_id,
+ sex,
+ id_card,
+ birthday,
+ image_url,
+ type,
+ job,
+ is_volunteer,
+ is_partymember,
+ status,
+ create_at,
+ last_login_time,
+ tags,
+ family_id,
+ face_url,
+ face_state,
+ reject_reson,
+ area_id,
+ card_photo_front,
+ card_photo_back,
+ family_book,
+ continuous_landing_days,
+ is_tips,
+ work_status,
+ work_start_time,
+ work_end_time,
+ big_age_tips,
+ plaintext_password,
+ street_id,
+ relation_name,
+ app_id,
+ is_accept,
+ binding_check_unit_id
+ FROM
+ sys_user
+ </sql>
+
+
+ <select id="selectNum" resultType="integer">
+ select count(user_id) from sys_user
+ </select>
+
+ <select id="selectConfigList" resultMap="SysUserResult">
+ <include refid="selectSysUserVo"/>
+ </select>
+
+ <select id="selectData" parameterType="string" resultMap="SysUserResult">
+ <include refid="selectSysUserVo"/>
+ <where>
+ app_id='wx118de8a734d269f0'
+ <if test="userId!=null and userId!=''">
+ and user_id=#{userId}
+ </if>
+ <if test="account!=null and account!=''">
+ and account=#{account}
+ </if>
+ <if test="phone!=null and phone!=''">
+ and phone=#{phone}
+ </if>
+ </where>
+ </select>
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/KeywordMapper.xml b/flower_city/src/main/resources/mapper/KeywordMapper.xml
new file mode 100644
index 0000000..b1774ce
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/KeywordMapper.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.KeywordMapper">
+
+ <resultMap type="com.dg.core.db.gen.entity.KeywordEntity" id="KeywordEntityResult">
+ <id property="id" column="id" />
+ <id property="name" column="name" />
+ <id property="createTime" column="create_time" />
+ <id property="updateTime" column="update_time" />
+ <id property="transactionId" column="transaction_id" />
+
+ </resultMap>
+
+ <sql id="selectKeywordEntityVo">
+ SELECT
+ id,
+ name,
+ create_time,
+ update_time,
+ transaction_id
+ FROM
+ automessage_keyword
+ </sql>
+
+ <select id="selectConfigList" resultMap="KeywordEntityResult">
+ <include refid="selectKeywordEntityVo"/>
+ <!-- <where>-->
+ <!-- <if test="userName != null and userName != ''">-->
+ <!-- AND user_name like concat('%', #{userName}, '%')-->
+ <!-- </if>-->
+ <!-- <if test="streetName != null and streetName != ''">-->
+ <!-- AND street_name like concat('%', #{streetName}, '%')-->
+ <!-- </if>-->
+ <!-- <if test="loginName != null and loginName != ''">-->
+ <!-- AND login_name like concat('%', #{loginName}, '%')-->
+ <!-- </if>-->
+ <!-- <if test="phonenumber != null and phonenumber != ''">-->
+ <!-- AND phonenumber like concat('%', #{phonenumber}, '%')-->
+ <!-- </if>-->
+ <!-- <if test="roleId != null and roleId != ''">-->
+ <!-- AND role_id=#{roleId}-->
+ <!-- </if>-->
+
+ <!-- </where>-->
+
+ order by create_time desc
+ </select>
+
+
+ <select id="selectConfigData" resultMap="KeywordEntityResult">
+ <include refid="selectKeywordEntityVo"/>
+ <where>
+ <if test="Id != null and Id != ''">
+ AND automessage_keyword.id=#{Id}
+ </if>
+ <if test="name != null and name != ''">
+ AND automessage_keyword.name=#{name}
+ </if>
+ </where>
+ </select>
+
+ <select id="selectByName" resultMap="KeywordEntityResult">
+ <include refid="selectKeywordEntityVo"/>
+ <where>
+ name like concat('%',#{keyWord}, '%')
+ </where>
+ </select>
+
+ <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.KeywordEntity">
+ insert into automessage_keyword (
+ <if test="id != null">id,</if>
+ <if test="name != null and name != '' ">name,</if>
+ <if test="transactionId != null and transactionId !='' ">transaction_id,</if>
+ update_time,
+ create_time
+ )values(
+ <if test="id != null">#{id},</if>
+ <if test="name != null and name != '' ">#{name},</if>
+ <if test="transactionId != null and transactionId !='' ">#{transactionId},</if>
+ sysdate(),
+ sysdate()
+ )
+ </insert>
+
+ <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.KeywordEntity">
+ update automessage_keyword
+ <set>
+ <if test="id != null">id=#{id},</if>
+ <if test="name != null and name != '' ">name=#{name},</if>
+ <if test="transactionId != null and transactionId !='' ">transaction_id=#{transactionId},</if>
+ update_time=sysdate()
+ </set>
+ where id= #{id}
+ </update>
+
+ <delete id="deleteConfigById" parameterType="string">
+ delete from automessage_keyword where id= #{Id}
+ </delete>
+
+ <select id="countNum" resultType="integer">
+ select count(id) from automessage_keyword
+ </select>
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/MenuMapper.xml b/flower_city/src/main/resources/mapper/MenuMapper.xml
new file mode 100644
index 0000000..b43c0c2
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/MenuMapper.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.MenuMapper">
+
+ <resultMap type="com.dg.core.db.gen.entity.MenuEntity" id="MenuEntityResult">
+ <id property="id" column="id" />
+ <id property="title" column="title" />
+ <id property="createTime" column="create_time" />
+ <id property="updateTime" column="update_time" />
+ <id property="remark" column="remark" />
+ <id property="parentId" column="parent_id" />
+
+ </resultMap>
+
+ <sql id="selectMenuEntityVo">
+ SELECT
+ id,
+ title,
+ create_time,
+ update_time,
+ parent_id,
+ remark
+ FROM
+ automessage_menu
+ </sql>
+
+ <select id="selectConfigList" resultMap="MenuEntityResult">
+ <include refid="selectMenuEntityVo"/>
+<!-- <where>-->
+<!-- <if test="userName != null and userName != ''">-->
+<!-- AND user_name like concat('%', #{userName}, '%')-->
+<!-- </if>-->
+<!-- <if test="streetName != null and streetName != ''">-->
+<!-- AND street_name like concat('%', #{streetName}, '%')-->
+<!-- </if>-->
+<!-- <if test="loginName != null and loginName != ''">-->
+<!-- AND login_name like concat('%', #{loginName}, '%')-->
+<!-- </if>-->
+<!-- <if test="phonenumber != null and phonenumber != ''">-->
+<!-- AND phonenumber like concat('%', #{phonenumber}, '%')-->
+<!-- </if>-->
+<!-- <if test="roleId != null and roleId != ''">-->
+<!-- AND role_id=#{roleId}-->
+<!-- </if>-->
+
+<!-- </where>-->
+
+ order by create_time desc
+ </select>
+
+
+ <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.MenuEntity">
+ insert into automessage_menu (
+ <if test="id != null">id,</if>
+ <if test="title != null and title != '' ">title,</if>
+ <if test="parentId != null">parent_id,</if>
+ <if test="remark != null and remark != '' ">remark,</if>
+ update_time,
+ create_time
+ )values(
+ <if test="id != null">#{id},</if>
+ <if test="title != null and title != '' ">#{title},</if>
+ <if test="parentId != null">#{parentId},</if>
+ <if test="remark != null and remark != '' ">#{remark},</if>
+ sysdate(),
+ sysdate()
+ )
+ </insert>
+
+ <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.MenuEntity">
+ update automessage_menu
+ <set>
+ <if test="id != null">id=#{id},</if>
+ <if test="title != null and title != '' ">title=#{title},</if>
+ <if test="parentId != null">parent_id=#{parentId},</if>
+ <if test="remark != null and remark != '' ">remark=#{remark},</if>
+ update_time=sysdate()
+ </set>
+ where id= #{Id}
+ </update>
+
+ <delete id="deleteConfigById" parameterType="Long">
+ delete from automessage_menu where id= #{Id}
+ </delete>
+
+ <select id="countNum" resultType="integer">
+ select count(id) from automessage_menu
+ </select>
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml b/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
new file mode 100644
index 0000000..8d51b50
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.OrganizationChartMapper">
+
+ <resultMap type="com.dg.core.db.gen.entity.OrganizationChartEntity" id="OrganizationChartResult">
+ <id property="id" column="id" />
+ <id property="organizationName" column="organization_name" />
+ <id property="city" column="city" />
+ <id property="district" column="district" />
+ <id property="village" column="village" />
+ <id property="detailedAddress" column="detailed_address" />
+ <id property="createTime" column="create_time" />
+ <id property="updateTime" column="update_time" />
+ <id property="parentId" column="parent_id" />
+ <id property="grade" column="grade" />
+ <id property="resume" column="resume" />
+ <id property="contactNumber" column="contact_number" />
+ <id property="departmentalApplication" column="departmental_application" />
+ <id property="updateUserId" column="update_user_id" />
+ <id property="areaList" column="area_list" />
+
+ </resultMap>
+
+ <sql id="selectOrganizationChartVo">
+ SELECT
+ id,
+ resume,
+ organization_name,
+ contact_number,
+ departmental_application,
+ create_time,
+ update_time,
+ parent_id,
+ update_user_id,
+ (select user_name from automessage_sys_user where user_id=automessage_organization_chart.update_user_id) as updateUserName,
+ (select organization_name from automessage_organization_chart as oc where oc.id=automessage_organization_chart.parent_id) as parentName,
+ city,
+ district,
+ village,
+ (select name from automessage_area_code_2022 where city=automessage_area_code_2022.code) as cityName,
+ (select name from automessage_area_code_2022 where district=automessage_area_code_2022.code) as districtName,
+ (select name from automessage_area_code_2022 where village=automessage_area_code_2022.code) as villageName,
+ detailed_address,
+ grade,
+ area_list
+ FROM
+ automessage_organization_chart
+ </sql>
+
+ <select id="selectConfigById" resultMap="OrganizationChartResult">
+ <include refid="selectOrganizationChartVo"/>
+ where id= #{id}
+ </select>
+
+ <select id="queryList" resultMap="OrganizationChartResult">
+ <include refid="selectOrganizationChartVo"/>
+ <where>
+ <if test="organizationName != null and organizationName != ''">
+ AND organization_name like concat('%', #{organizationName}, '%')
+ </if>
+ <if test="ids != null">
+ and id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ </select>
+
+ <select id="countList" resultType="integer">
+ select count(id) from automessage_organization_chart
+ <where>
+ <if test="organizationName != null and organizationName != ''">
+ AND organization_name like concat('%', #{organizationName}, '%')
+ </if>
+ <if test="ids != null">
+ and id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ </select>
+
+ <select id="selectConfigList" resultMap="OrganizationChartResult">
+ <include refid="selectOrganizationChartVo"/>
+ <where>
+ <if test="parentId != null and parentId != ''">
+ AND parent_id=#{parentId}
+ </if>
+ <if test="grade != null and grade != ''">
+ AND grade=#{grade}
+ </if>
+ <if test="ids != null">
+ and id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ </select>
+
+ <select id="selectByKeyWord" resultMap="OrganizationChartResult">
+ <include refid="selectOrganizationChartVo"/>
+ where grade=1 and ( organization_name like concat('%', #{keyWord}, '%')
+ or((detailed_address like concat('%', #{keyWord}, '%') ) and TRIM(detailed_address) !='')
+ or((resume like concat('%', #{keyWord}, '%') ) and TRIM(resume) != '' ))
+ </select>
+
+ <select id="selectByCode" resultMap="OrganizationChartResult">
+ <include refid="selectOrganizationChartVo"/>
+ <where>
+ ( id=#{id} or parent_id=#{id}) and (city=#{areaCode} or district= #{areaCode} or village=#{areaCode}) and grade=#{grade}
+ </where>
+ order by grade
+ </select>
+
+ <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.OrganizationChartEntity">
+ insert into automessage_organization_chart (
+ <if test="id != null">id,</if>
+ <if test="organizationName != null and organizationName != '' ">organization_name,</if>
+ <if test="parentId != null">parent_id,</if>
+ <if test="city != null and city != '' ">city,</if>
+ <if test="district != null and district != '' ">district,</if>
+ <if test="village != null and village != '' ">village,</if>
+ <if test="detailedAddress != null and detailedAddress != '' ">detailed_address,</if>
+ <if test="grade != null and grade != '' ">grade,</if>
+ <if test="areaList != null and areaList != '' ">area_list,</if>
+ <if test="contactNumber != null and contactNumber != '' ">contact_number,</if>
+ <if test="departmentalApplication != null and departmentalApplication != '' ">departmental_application,</if>
+ <if test="updateUserId != null and updateUserId != '' ">update_user_id,</if>
+ <if test="resume != null and resume != '' ">resume,</if>
+ update_time,
+ create_time
+ )values(
+ <if test="id != null">#{id},</if>
+ <if test="organizationName != null and organizationName != '' ">#{organizationName},</if>
+ <if test="parentId != null">#{parentId},</if>
+ <if test="city != null and city != '' ">#{city},</if>
+ <if test="district != null and district != '' ">#{district},</if>
+ <if test="village != null and village != '' ">#{village},</if>
+ <if test="detailedAddress != null and detailedAddress != '' ">#{detailedAddress},</if>
+ <if test="grade != null and grade != '' ">#{grade},</if>
+ <if test="areaList != null and areaList != '' ">#{areaList},</if>
+ <if test="contactNumber != null and contactNumber != '' ">#{contactNumber},</if>
+ <if test="departmentalApplication != null and departmentalApplication != '' ">#{departmentalApplication},</if>
+ <if test="updateUserId != null and updateUserId != '' ">#{updateUserId},</if>
+ <if test="resume != null and resume != '' ">#{resume},</if>
+ sysdate(),
+ sysdate()
+ )
+ </insert>
+
+ <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.OrganizationChartEntity">
+ update automessage_organization_chart
+ <set>
+ <if test="id != null">id=#{id},</if>
+ <if test="organizationName != null and organizationName != '' ">organization_name=#{organizationName},</if>
+ <if test="parentId != null">parent_id=#{parentId},</if>
+ <if test="city != null and city != '' ">city=#{city},</if>
+ <if test="district != null and district != '' ">district=#{district},</if>
+ <if test="village != null and village != '' ">village=#{village},</if>
+ <if test="detailedAddress != null and detailedAddress != '' ">detailed_address=#{detailedAddress},</if>
+ <if test="grade != null and grade != '' ">grade=#{grade},</if>
+ <if test="departmentalApplication != null and departmentalApplication != '' ">departmental_application=#{departmentalApplication},</if>
+ <if test="updateUserId != null">update_user_id=#{updateUserId},</if>
+ <if test="areaList != null and areaList != '' ">area_list=#{areaList},</if>
+ <if test="contactNumber != null and contactNumber != '' ">contact_number=#{contactNumber},</if>
+ <if test="departmentalApplication != null ">departmental_application=#{departmentalApplication},</if>
+ <if test="updateUserId != null and updateUserId != '' ">update_user_id=#{updateUserId},</if>
+ <if test="resume != null and resume != '' ">resume=#{resume},</if>
+ update_time=sysdate()
+ </set>
+ where id= #{id}
+ </update>
+
+ <delete id="deleteConfigById" parameterType="string">
+ delete from automessage_organization_chart where id= #{Id}
+ </delete>
+
+ <select id="countNum" resultType="integer">
+ select count(id) from automessage_organization_chart
+ </select>
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/ReplyTemplateMapper.xml b/flower_city/src/main/resources/mapper/ReplyTemplateMapper.xml
new file mode 100644
index 0000000..a95a788
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/ReplyTemplateMapper.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.ReplyTemplateMapper">
+
+ <resultMap type="com.dg.core.db.gen.entity.ReplyTemplateEntity" id="ReplyTemplateResult">
+ <id property="id" column="id" />
+ <id property="name" column="name" />
+ <id property="handleState" column="handle_state" />
+ <id property="response" column="response" />
+ <id property="guidance" column="guidance" />
+ <id property="accessoryUrl" column="accessory_url" />
+ <id property="createTime" column="create_time" />
+ <id property="updateTime" column="update_time" />
+ <id property="accessoryName" column="accessory_name" />
+ <id property="videoUrl" column="video_url" />
+ <id property="videoName" column="video_name" />
+ <id property="createUserId" column="create_user_id" />
+ <id property="departmentId" column="department_id" />
+ <id property="pictureUrl" column="picture_url" />
+ <id property="pictureName" column="picture_name" />
+ <id property="accessoryId" column="accessory_id" />
+
+ </resultMap>
+
+ <sql id="selectReplyTemplateVo">
+ SELECT
+ id,
+ name,
+ create_time,
+ update_time,
+ handle_state,
+ response,
+ accessory_url,
+ accessory_name,
+ video_url,
+ video_name,
+ picture_url,
+ picture_name,
+ department_id,
+ create_user_id,
+ accessory_id,
+ (select organization_name from automessage_organization_chart where automessage_organization_chart.id=automessage_reply_template.department_id) as departmentName,
+ (select user_name from automessage_sys_user where automessage_sys_user.user_id=automessage_reply_template.create_user_id) as createUser,
+ guidance
+ FROM
+ automessage_reply_template
+ </sql>
+
+ <select id="selectConfigList" resultMap="ReplyTemplateResult">
+ SELECT
+ id,
+ name,
+ create_time,
+ update_time,
+ handle_state,
+ response,
+ accessory_url,
+ accessory_name,
+ video_url,
+ video_name,
+ picture_url,
+ picture_name,
+ department_id,
+ create_user_id,
+ <if test="userId!=null and userId!=''">
+ (case create_user_id when #{userId} then 1 else 0 end)isDelete,
+ </if>
+ <if test="userId==null or userId==''">
+ 1 isDelete,
+ </if>
+ accessory_id,
+ (select organization_name from automessage_organization_chart where automessage_organization_chart.id=automessage_reply_template.department_id) as departmentName,
+ (select user_name from automessage_sys_user where automessage_sys_user.user_id=automessage_reply_template.create_user_id) as createUser,
+ guidance
+ FROM
+ automessage_reply_template
+ <where>
+ <if test="Name != null and Name != ''">
+ AND automessage_reply_template.name like concat('%', #{Name}, '%')
+ </if>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ order by create_time desc
+ </select>
+
+
+ <select id="selectConfigData" parameterType="string" resultMap="ReplyTemplateResult">
+ <include refid="selectReplyTemplateVo"/>
+ where id=#{Id}
+ </select>
+
+
+ <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.ReplyTemplateEntity">
+ insert into automessage_reply_template (
+ <if test="id != null">id,</if>
+ <if test="name != null and name != '' ">name,</if>
+ <if test="handleState != null and handleState != '' ">handle_state,</if>
+ <if test="response != null and response != '' ">response,</if>
+ <if test="guidance != null and guidance != '' ">guidance,</if>
+ <if test="accessoryUrl != null and accessoryUrl != '' ">accessory_url,</if>
+ <if test="accessoryName != null and accessoryName != '' ">accessory_name,</if>
+ <if test="videoUrl != null and videoUrl != '' ">video_url,</if>
+ <if test="videoName != null and videoName != '' ">video_name,</if>
+ <if test="pictureUrl != null and pictureUrl != '' ">picture_url,</if>
+ <if test="pictureName != null and pictureName != '' ">picture_name,</if>
+ <if test="createUserId != null and createUserId != '' ">create_user_id,</if>
+ <if test="departmentId != null and departmentId != '' ">department_id,</if>
+ <if test="accessoryId != null and accessoryId != '' ">accessory_id,</if>
+ update_time,
+ create_time
+ )values(
+ <if test="id != null">#{id},</if>
+ <if test="name != null and name != '' ">#{name},</if>
+ <if test="handleState != null and handleState != '' ">#{handleState},</if>
+ <if test="response != null and response != '' ">#{response},</if>
+ <if test="guidance != null and guidance != '' ">#{guidance},</if>
+ <if test="accessoryUrl != null and accessoryUrl != '' ">#{accessoryUrl},</if>
+ <if test="accessoryName != null and accessoryName != '' ">#{accessoryName},</if>
+ <if test="videoUrl != null and videoUrl != '' ">#{videoUrl},</if>
+ <if test="videoName != null and videoName != '' ">#{videoName},</if>
+ <if test="pictureUrl != null and pictureUrl != '' ">#{pictureUrl},</if>
+ <if test="pictureName != null and pictureName != '' ">#{pictureName},</if>
+ <if test="createUserId != null and createUserId != '' ">#{createUserId},</if>
+ <if test="departmentId != null and departmentId != '' ">#{departmentId},</if>
+ <if test="accessoryId != null and accessoryId != '' ">#{accessoryId},</if>
+ sysdate(),
+ sysdate()
+ )
+ </insert>
+
+ <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.ReplyTemplateEntity">
+ update automessage_reply_template
+ <set>
+ <if test="id != null">id=#{id},</if>
+ <if test="name != null and name != '' ">name=#{name},</if>
+ <if test="handleState != null and handleState != '' ">handle_state=#{handleState},</if>
+ <if test="response != null and response != '' ">response=#{response},</if>
+ <if test="guidance != null and guidance != '' ">guidance=#{guidance},</if>
+ <if test="accessoryUrl != null and accessoryUrl != '' ">accessory_url=#{accessoryUrl},</if>
+ <if test="accessoryName != null and accessoryName != '' ">accessory_name=#{accessoryName},</if>
+ <if test="videoUrl != null and videoUrl != '' ">video_url=#{videoUrl},</if>
+ <if test="videoName != null and videoName != '' ">video_name=#{videoName},</if>
+ <if test="pictureUrl != null and pictureUrl != '' ">picture_url=#{pictureUrl},</if>
+ <if test="pictureName != null and pictureName != '' ">picture_name=#{pictureName},</if>
+ <if test="createUserId != null and createUserId != '' ">create_user_id=#{createUserId},</if>
+ <if test="departmentId != null and departmentId != '' ">department_id=#{departmentId},</if>
+ <if test="accessoryId != null and accessoryId != '' ">accessory_id=#{accessoryId},</if>
+ update_time=sysdate()
+ </set>
+ where id= #{id}
+ </update>
+
+ <delete id="deleteConfigById" parameterType="string">
+ delete from automessage_reply_template where id= #{Id}
+ </delete>
+
+ <select id="countNum" parameterType="string" resultType="integer">
+ select count(id) from automessage_reply_template
+ <where>
+ <if test="Name != null and Name != ''">
+ AND name=#{Name}
+ </if>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ </select>
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/RoleManagementMapper.xml b/flower_city/src/main/resources/mapper/RoleManagementMapper.xml
new file mode 100644
index 0000000..f9cee23
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/RoleManagementMapper.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.RoleManagementMapper">
+
+ <resultMap type="com.dg.core.db.gen.entity.RoleManagementEntity" id="RoleManagementEntityResult">
+ <id property="id" column="id" />
+ <id property="roleName" column="role_name" />
+ <id property="createUserId" column="create_user_id" />
+ <id property="createTime" column="create_time" />
+ <id property="updateUserId" column="update_user_id" />
+ <id property="updateTime" column="update_time" />
+ <id property="permission" column="permission" />
+
+ </resultMap>
+
+ <sql id="selectRoleManagementEntityVo">
+ SELECT
+ id,
+ role_name,
+ permission,
+ create_time,
+ update_time,
+ create_user_id,
+ (select user_name from automessage_sys_user where create_user_id=automessage_sys_user.user_id) as createName,
+ update_user_id
+ FROM
+ automessage_role_management
+ </sql>
+
+ <select id="selectConfigList" resultMap="RoleManagementEntityResult">
+ <include refid="selectRoleManagementEntityVo"/>
+ <where>
+ AND id not in(1,2,3,4)
+ <if test="name!=null and name!=''">
+ and role_name like concat('%', #{name}, '%')
+ </if>
+ <!-- <if test="streetName != null and streetName != ''">-->
+-- AND id not in(1,2,3,4)
+ <!-- </if>-->
+ <!-- <if test="loginName != null and loginName != ''">-->
+ <!-- AND login_name like concat('%', #{loginName}, '%')-->
+ <!-- </if>-->
+ <!-- <if test="phonenumber != null and phonenumber != ''">-->
+ <!-- AND phonenumber like concat('%', #{phonenumber}, '%')-->
+ <!-- </if>-->
+ <!-- <if test="roleId != null and roleId != ''">-->
+ <!-- AND role_id=#{roleId}-->
+ <!-- </if>-->
+
+ </where>
+
+ order by create_time desc
+ </select>
+
+ <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.RoleManagementEntity">
+ insert into automessage_role_management (
+ <if test="id != null">id,</if>
+ <if test="roleName != null and roleName != '' ">role_name,</if>
+ <if test="permission != null">permission,</if>
+ <if test="createUserId != null and createUserId != '' ">create_user_id,</if>
+ <if test="updateUserId != null and updateUserId != '' ">update_user_id,</if>
+ update_time,
+ create_time
+ )values(
+ <if test="id != null">#{id},</if>
+ <if test="roleName != null and roleName != '' ">#{roleName},</if>
+ <if test="permission != null and permission != '' " >#{permission},</if>
+ <if test="createUserId != null and createUserId != '' ">#{createUserId},</if>
+ <if test="updateUserId != null and updateUserId != '' ">#{updateUserId},</if>
+ sysdate(),
+ sysdate()
+ )
+ </insert>
+
+ <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.RoleManagementEntity">
+ update automessage_role_management
+ <set>
+ <if test="id != null">id=#{id},</if>
+ <if test="roleName != null and roleName != '' ">role_name=#{roleName},</if>
+ <if test="permission != null and permission != '' " >permission=#{permission},</if>
+ <if test="createUserId != null and createUserId != '' ">create_user_id=#{createUserId},</if>
+ <if test="updateUserId != null and updateUserId != '' ">update_user_id=#{updateUserId},</if>
+ update_time=sysdate()
+ </set>
+ where id= #{id}
+ </update>
+
+ <delete id="deleteConfigById" parameterType="string">
+ delete from automessage_role_management where id= #{Id}
+ </delete>
+
+ <select id="countNum" resultType="integer">
+ select count(id) from automessage_role_management
+ <where>
+ <if test="name!=null and name!=''">
+ and role_name like concat('%', #{name}, '%')
+ </if>
+ </where>
+ </select>
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/RoleMenuMapper.xml b/flower_city/src/main/resources/mapper/RoleMenuMapper.xml
new file mode 100644
index 0000000..075e0f0
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/RoleMenuMapper.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.RoleMenuEntityMapper">
+
+ <resultMap type="com.dg.core.db.gen.entity.RoleMenuEntity" id="RoleMenuEntityResult">
+ <id property="id" column="id" />
+ <id property="roleId" column="role_id" />
+ <id property="menuId" column="menu_id" />
+ <id property="createTime" column="create_time" />
+ <id property="updateTime" column="update_time" />
+
+ </resultMap>
+
+ <sql id="selectRoleManagementEntityVo">
+ SELECT
+ id,
+ role_id,
+ menu_id,
+ create_time,
+ update_time
+ FROM
+ automessage_role_menu
+ </sql>
+
+ <select id="selectConfigList" parameterType="string" resultMap="RoleMenuEntityResult">
+ <include refid="selectRoleManagementEntityVo"/>
+ <where>
+ <if test="roleId!=null and roleId!=''">
+ and role_id=#{roleId}
+ </if>
+
+
+ </where>
+ </select>
+
+ <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.RoleManagementEntity">
+ insert into automessage_role_menu (
+ <if test="id != null">id,</if>
+ <if test="roleId != null and roleId != '' ">role_id,</if>
+ <if test="menuId != null and menuId != '' ">menu_id,</if>
+ update_time,
+ create_time
+ )values(
+ <if test="id != null">#{id},</if>
+ <if test="roleId != null and roleId != '' ">#{roleId},</if>
+ <if test="menuId != null and menuId != '' ">#{menuId},</if>
+ sysdate(),
+ sysdate()
+ )
+ </insert>
+
+ <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.RoleManagementEntity">
+ update automessage_role_menu
+ <set>
+ <if test="id != null">id=#{id},</if>
+ <if test="roleId != null and roleId != '' ">role_id=#{roleId},</if>
+ <if test="menuId != null and menuId != '' ">menu_id=#{menuId},</if>
+ update_time=sysdate()
+ </set>
+ where id= #{Id}
+ </update>
+
+ <delete id="deleteConfigById" parameterType="string">
+ delete from automessage_role_menu where id= #{Id}
+ </delete>
+
+ <select id="countNum" resultType="integer">
+ select count(id) from automessage_role_menu
+ </select>
+
+</mapper>
+
+
+
+
+
diff --git a/flower_city/src/main/resources/mapper/SlideshowMapper.xml b/flower_city/src/main/resources/mapper/SlideshowMapper.xml
new file mode 100644
index 0000000..ac37d7d
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/SlideshowMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.SlideshowMapper">
+ <resultMap type="com.dg.core.db.gen.entity.Slideshow" id="SlideshowResult">
+ <id property="id" column="id" />
+ <id property="url" column="url" />
+ <id property="createTime" column="create_time" />
+ <id property="linkType" column="link_type" />
+ <id property="link" column="link" />
+ <id property="title" column="title" />
+ <id property="content" column="content" />
+ </resultMap>
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/SysUserMapper.xml b/flower_city/src/main/resources/mapper/SysUserMapper.xml
new file mode 100644
index 0000000..e81b265
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/SysUserMapper.xml
@@ -0,0 +1,362 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.SysUserMapper">
+ <resultMap type="com.dg.core.db.gen.entity.SysUser" id="SysUserResult">
+ <id property="id" column="id" />
+ <id property="userId" column="user_id" />
+ <result property="loginName" column="login_name" />
+ <result property="userName" column="user_name" />
+ <result property="userType" column="user_type" />
+ <result property="phonenumber" column="phonenumber" />
+ <result property="sex" column="sex" />
+ <result property="avatar" column="avatar" />
+ <result property="password" column="password" />
+ <result property="salt" column="salt" />
+ <result property="status" column="status" />
+ <result property="delFlag" column="del_flag" />
+ <result property="loginIp" column="login_ip" />
+ <result property="loginDate" column="login_date" />
+ <result property="pwdUpdateDate" column="pwd_update_date" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="remark" column="remark" />
+ <result property="roleIds" column="role_ids" />
+ <result property="dataPermission" column="data_permission" />
+ <result property="departmentId" column="department_id" />
+ <result property="stairId" column="stair_id" />
+ <result property="secondLevelId" column="second_level_id" />
+ <result property="departmentName" column="department_name" />
+ <result property="departmentArea" column="department_area" />
+ <result property="leisureState" column="leisure_state" />
+ <result property="masterIds" column="master_ids" />
+ <result property="masterNames" column="master_names" />
+ <result property="transactionIds" column="transaction_ids" />
+ <result property="transactionNames" column="transaction_names" />
+ <result property="openid" column="openid" />
+ <result property="transactionNum" column="transaction_num" />
+ <result property="isDivisionHead" column="is_division_head" />
+ <result property="mattersIds" column="matters_ids" />
+ <result property="departmentIds" column="department_ids" />
+ <result property="moreDepartmentIds" column="more_department_ids" />
+ <result property="departmentIdStr" column="department_id_str" />
+ </resultMap>
+
+ <sql id="selectSysUserVo">
+ SELECT
+ id,
+ user_id,
+ login_name,
+ user_name,
+ user_type,
+ phonenumber,
+ sex,
+ avatar,
+ password,
+ salt,
+ status,
+ del_flag,
+ login_ip,
+ login_date,
+ pwd_update_date,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ remark,
+ role_ids,
+ data_permission,
+ department_id,
+ stair_id,
+ second_level_id,
+ matters_ids,
+ department_ids,
+ more_department_ids,
+ department_id_str,
+ (SELECT GROUP_CONCAT(matter_name) FROM automessage_transaction_event WHERE id in (SELECT
+ substring_index(substring_index(matters_ids,',', b.help_topic_id + 1), ',', -1) result
+ FROM
+ mysql.help_topic b
+ where
+ b.help_topic_id < (LENGTH(matters_ids) - LENGTH(REPLACE(matters_ids, ',', '')) + 1))) as mattersNames,
+
+ concat(
+ IFNULL((SELECT name FROM automessage_area_code_2022 WHERE automessage_area_code_2022.code=(select city from automessage_organization_chart
+ where automessage_organization_chart.id=department_id)),''),
+ IFNULL((SELECT name FROM automessage_area_code_2022 WHERE automessage_area_code_2022.code=(select district from automessage_organization_chart
+ where automessage_organization_chart.id=department_id)),''),
+ IFNULL((SELECT name FROM automessage_area_code_2022 WHERE automessage_area_code_2022.code=(select village from automessage_organization_chart
+ where automessage_organization_chart.id=department_id)),'')
+ ) AS department_area,
+ leisure_state,
+ master_ids,
+ (SELECT GROUP_CONCAT(classify_name) FROM automessage_classify_administration WHERE id in (SELECT
+ substring_index(substring_index(master_ids,',', b.help_topic_id + 1), ',', -1) result
+ FROM
+ mysql.help_topic b
+ where
+ b.help_topic_id < (LENGTH(master_ids) - LENGTH(REPLACE(master_ids, ',', '')) + 1))) as master_names,
+ is_division_head,
+ transaction_ids,
+ transaction_names,
+ openid,
+ (select user_name from automessage_sys_user as asu where asu.user_id=automessage_sys_user.create_by) as createName,
+ transaction_num,
+ (select count(id) from automessage_guide_repair_order where automessage_guide_repair_order.state='3'
+ and automessage_guide_repair_order.guide_user_id=user_id and
+ automessage_guide_repair_order.guide_department_id=automessage_sys_user.department_id) as transactionEndNum,
+ (select role_name from automessage_role_management where automessage_role_management.id=role_ids) as roleName,
+ (select permission from automessage_role_management where automessage_role_management.id=role_ids) as permission,
+ (SELECT GROUP_CONCAT(organization_name) FROM automessage_organization_chart WHERE id in (SELECT
+ substring_index(substring_index(more_department_ids,',', b.help_topic_id + 1), ',', -1) result
+ FROM
+ mysql.help_topic b
+ where
+ b.help_topic_id < (LENGTH(more_department_ids) - LENGTH(REPLACE(more_department_ids, ',', '')) + 1)))
+ as department_name
+ FROM
+ automessage_sys_user
+ </sql>
+
+ <select id="selectNum" parameterType="string" resultType="integer">
+ select count(user_id) from automessage_sys_user
+ <where>
+ <if test="userType != null and userType != ''">
+ AND user_type=#{userType}
+ </if>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ <if test="isDivisionHead != null and isDivisionHead != ''">
+ AND is_division_head=#{isDivisionHead}
+ </if>
+ <if test="userName != null and userName != ''">
+ AND (user_name like concat('%', #{userName}, '%') or
+ (department_id in (SELECT id FROM automessage_organization_chart
+ WHERE organization_name like concat('%', #{userName}, '%'))) or
+ phonenumber like concat('%', #{userName}, '%'))
+ </if>
+
+ </where>
+ </select>
+
+ <select id="queryList" resultMap="SysUserResult">
+ <include refid="selectSysUserVo"/>
+ <where>
+ user_type=#{userType}
+ <if test="keyWord!=null and keyWord!=''">
+ and (transaction_names like concat('%',#{keyWord}, '%') or user_name like concat('%',#{keyWord}, '%'))
+ </if>
+ </where>
+ ORDER BY department_id
+ </select>
+
+ <select id="selectConfigList" parameterType="string" resultMap="SysUserResult">
+ <include refid="selectSysUserVo"/>
+ <where>
+ <if test="userType != null and userType != ''">
+ AND user_type=#{userType}
+ </if>
+ <if test="ids != null">
+ AND
+ <foreach collection="ids" item="param" open="(" close=")" separator="or">
+ locate(#{param},more_department_ids)>0
+ </foreach>
+ </if>
+
+ <if test="isDivisionHead != null and isDivisionHead != ''">
+ and is_division_head=#{isDivisionHead}
+ </if>
+ <if test="userName != null and userName != ''">
+ AND (user_name like concat('%', #{userName}, '%') or
+ (department_id in (SELECT id FROM automessage_organization_chart
+ WHERE organization_name like concat('%', #{userName}, '%'))) or
+ phonenumber like concat('%', #{userName}, '%'))
+ </if>
+ </where>
+ order by create_time desc
+ </select>
+
+ <select id="selectData" parameterType="string" resultMap="SysUserResult">
+ <include refid="selectSysUserVo"/>
+ <where>
+ <if test="userId!=null and userId!='' ">
+ AND user_id= #{userId}
+ </if>
+
+ <if test="phonenumber!=null and phonenumber!='' ">
+ AND phonenumber= #{phonenumber}
+ </if>
+
+ <if test="loginName!=null and loginName!='' ">
+ AND login_name= #{loginName}
+ </if>
+
+ </where>
+ </select>
+
+ <select id="getUserByAccount" parameterType="string" resultMap="SysUserResult">
+ <include refid="selectSysUserVo"/>
+ <where>
+ <if test="account!=null and account!='' ">
+ login_name= #{account}
+ </if>
+ </where>
+ </select>
+
+ <select id="selectListByDepartmentId" resultMap="SysUserResult">
+ <include refid="selectSysUserVo"/>
+ <where>
+ user_type=2 and status=0 and leisure_state=0
+ <if test="list!=null">
+ and department_id in
+ <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ </if>
+ <if test="classifyIdFront!=null and classifyIdFront!='' and classifyIdAfter!=null and classifyIdAfter!=''">
+ and (concat(',',matters_ids, ',') like concat('%',#{classifyIdFront}, '%') or concat(',',matters_ids, ',') like concat('%',#{classifyIdAfter}, '%'))
+ </if>
+
+ </where>
+ order by transaction_num
+ </select>
+
+ <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.SysUser">
+ insert ignore into automessage_sys_user (
+ create_time
+ <if test="userId != null and userId != '' ">,user_id</if>
+ <if test="loginName != null and loginName != '' ">,login_name</if>
+ <if test="userName != null and userName != '' ">,user_name</if>
+ <if test="userType != null and userType != '' ">,user_type</if>
+ <if test="phonenumber != null and phonenumber != '' ">,phonenumber</if>
+ <if test="sex != null and sex != '' ">,sex</if>
+ <if test="avatar != null and avatar != '' ">,avatar</if>
+ <if test="password != null and password != '' ">,password</if>
+ <if test="salt != null and salt != '' ">,salt</if>
+ <if test="status != null and status != '' ">,status</if>
+ <if test="delFlag != null and delFlag != '' ">,del_flag</if>
+ <if test="loginIp != null and loginIp != '' ">,login_ip</if>
+ <if test="loginDate != null ">,login_date</if>
+ <if test="pwdUpdateDate != null ">,pwd_update_date</if>
+ <if test="createBy != null and createBy != '' ">,create_by</if>
+ <if test="updateBy != null and updateBy != '' ">,update_by</if>
+ <if test="updateTime != null ">,update_time</if>
+ <if test="remark != null and remark != '' ">,remark</if>
+ <if test="roleIds != null and roleIds != '' ">,role_ids</if>
+ <if test="dataPermission != null and dataPermission != '' ">,data_permission</if>
+ <if test="departmentId != null and departmentId != '' ">,department_id</if>
+ <if test="stairId != null and stairId != '' ">,stair_id</if>
+ <if test="secondLevelId != null and secondLevelId != '' ">,second_level_id</if>
+ <if test="departmentName != null and departmentName != '' ">,department_name</if>
+ <if test="departmentArea != null and departmentArea != '' ">,department_area</if>
+ <if test="leisureState != null and leisureState != '' ">,leisure_state</if>
+ <if test="masterIds != null">,master_ids</if>
+ <if test="masterNames != null">,master_names</if>
+ <if test="transactionIds != null and transactionIds != '' ">,transaction_ids</if>
+ <if test="transactionNames != null and transactionNames != '' ">,transaction_names</if>
+ <if test="openid != null and openid != '' ">,openid</if>
+ <if test="isDivisionHead != null and isDivisionHead != '' ">,is_division_head</if>
+ <if test="mattersIds != null ">,matters_ids</if>
+ <if test="departmentIds != null ">,department_ids</if>
+ <if test="moreDepartmentIds != null ">,more_department_ids</if>
+ <if test="departmentIdStr != null ">,department_id_str</if>
+ )values(
+ sysdate()
+ <if test="userId != null and userId != '' ">,#{userId}</if>
+ <if test="loginName != null and loginName != '' ">,#{loginName}</if>
+ <if test="userName != null and userName != '' ">,#{userName}</if>
+ <if test="userType != null and userType != '' ">,#{userType}</if>
+ <if test="phonenumber != null and phonenumber != '' ">,#{phonenumber}</if>
+ <if test="sex != null and sex != '' ">,#{sex}</if>
+ <if test="avatar != null and avatar != '' ">,#{avatar}</if>
+ <if test="password != null and password != '' ">,#{password}</if>
+ <if test="salt != null and salt != '' ">,#{salt}</if>
+ <if test="status != null and status != '' ">,#{status}</if>
+ <if test="delFlag != null and delFlag != '' ">,#{delFlag}</if>
+ <if test="loginIp != null and loginIp != '' ">,#{loginIp}</if>
+ <if test="loginDate != null ">,#{loginDate}</if>
+ <if test="pwdUpdateDate != null and pwdUpdateDate != '' ">,#{pwdUpdateDate}</if>
+ <if test="createBy != null and createBy != '' ">,#{createBy}</if>
+ <if test="updateBy != null and updateBy != '' ">,#{updateBy}</if>
+ <if test="updateTime != null ">,#{updateTime}</if>
+ <if test="remark != null and remark != '' ">,#{remark}</if>
+ <if test="roleIds != null and roleIds != '' ">,#{roleIds}</if>
+ <if test="dataPermission != null and dataPermission != '' ">,#{dataPermission}</if>
+ <if test="departmentId != null and departmentId != '' ">,#{departmentId}</if>
+ <if test="stairId != null and stairId != '' ">,#{stairId}</if>
+ <if test="secondLevelId != null and secondLevelId != '' ">,#{secondLevelId}</if>
+ <if test="departmentName != null and departmentName != '' ">,#{departmentName}</if>
+ <if test="departmentArea != null and departmentArea != '' ">,#{departmentArea}</if>
+ <if test="leisureState != null and leisureState != '' ">,#{leisureState}</if>
+ <if test="masterIds != null">,#{masterIds}</if>
+ <if test="masterNames != null">,#{masterNames}</if>
+ <if test="transactionIds != null and transactionIds != '' ">,#{transactionIds}</if>
+ <if test="transactionNames != null and transactionNames != '' ">,#{transactionNames}</if>
+ <if test="openid != null and openid != '' ">,#{openid}</if>
+ <if test="isDivisionHead != null and isDivisionHead != '' ">,#{isDivisionHead}</if>
+ <if test="mattersIds != null">,#{mattersIds}</if>
+ <if test="departmentIds != null ">,#{departmentIds}</if>
+ <if test="moreDepartmentIds != null ">,#{moreDepartmentIds}</if>
+ <if test="departmentIdStr != null ">,#{departmentIdStr}</if>
+ )
+ </insert>
+
+ <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.SysUser">
+ update automessage_sys_user
+ <set>
+ <if test="userId != null and userId != '' ">user_id=#{userId}</if>
+ <if test="loginName != null and loginName != '' ">,login_name=#{loginName}</if>
+ <if test="userName != null and userName != '' ">,user_name=#{userName}</if>
+ <if test="userType != null and userType != '' ">,user_type=#{userType}</if>
+ <if test="phonenumber != null and phonenumber != '' ">,phonenumber=#{phonenumber}</if>
+ <if test="sex != null and sex != '' ">,sex=#{sex}</if>
+ <if test="avatar != null and avatar != '' ">,avatar=#{avatar}</if>
+ <if test="password != null and password != '' ">,password=#{password}</if>
+ <if test="salt != null and salt != '' ">,salt=#{salt}</if>
+ <if test="status != null and status != '' ">,status=#{status}</if>
+ <if test="delFlag != null and delFlag != '' ">,del_flag=#{delFlag}</if>
+ <if test="loginIp != null and loginIp != '' ">,login_ip=#{loginIp}</if>
+ <if test="loginDate != null ">,login_date=#{loginDate}</if>
+ <if test="pwdUpdateDate != null ">,pwd_update_date=#{pwdUpdateDate}</if>
+ <if test="createBy != null and createBy != '' ">,create_by=#{createBy}</if>
+ <if test="createTime != null ">,create_time=#{createTime}</if>
+ <if test="updateBy != null and updateBy != '' ">,update_by=#{updateBy}</if>
+ <if test="remark != null and remark != '' ">,remark=#{remark}</if>
+ <if test="roleIds != null and roleIds != '' ">,role_ids=#{roleIds}</if>
+ <if test="dataPermission != null and dataPermission != '' ">,data_permission=#{dataPermission}</if>
+ <if test="departmentId != null and departmentId != '' ">,department_id=#{departmentId}</if>
+ <if test="stairId != null and stairId != '' ">,stair_id=#{stairId}</if>
+ <if test="secondLevelId != null and secondLevelId != '' ">,second_level_id=#{secondLevelId}</if>
+ <if test="departmentName != null and departmentName != '' ">,department_name=#{departmentName}</if>
+ <if test="departmentArea != null and departmentArea != '' ">,department_area=#{departmentArea}</if>
+ <if test="leisureState != null and leisureState != '' ">,leisure_state=#{leisureState}</if>
+ <if test="masterIds != null">,master_ids=#{masterIds}</if>
+ <if test="masterNames != null">,master_names=#{masterNames}</if>
+ <if test="transactionIds != null and transactionIds != '' ">,transaction_ids=#{transactionIds}</if>
+ <if test="transactionNames != null and transactionNames != '' ">,transaction_names=#{transactionNames}</if>
+ <if test="openid != null and openid != '' ">,openid=#{openid}</if>
+ <if test="isDivisionHead != null and isDivisionHead != '' ">,is_division_head=#{isDivisionHead}</if>
+ <if test="mattersIds != null">,matters_ids=#{mattersIds}</if>
+ <if test="departmentIds != null ">,department_ids=#{departmentIds}</if>
+ <if test="moreDepartmentIds != null ">,more_department_ids=#{moreDepartmentIds}</if>
+ <if test="departmentIdStr != null ">,department_id_str=#{departmentIdStr}</if>
+ ,update_time=sysdate()
+ </set>
+ where user_id= #{userId}
+ </update>
+
+ <delete id="deleteConfigById" parameterType="string">
+ delete from automessage_sys_user where user_id= #{id}
+ </delete>
+
+ <select id="setGroup">
+ SET SESSION group_concat_max_len=10240
+ </select>
+
+
+</mapper>
diff --git a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
new file mode 100644
index 0000000..f4028fd
--- /dev/null
+++ b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
@@ -0,0 +1,502 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dg.core.db.gen.mapper.TransactionEventMapper">
+
+ <resultMap type="com.dg.core.db.gen.entity.TransactionEvent" id="TransactionEventEntityResult">
+ <id property="id" column="id" />
+ <id property="departmentId" column="department_id" />
+ <id property="departmentArea" column="department_area" />
+ <id property="classifyId" column="classify_id" />
+ <id property="matterName" column="matter_name" />
+ <id property="associateIds" column="associate_ids" />
+ <id property="transactionNum" column="transaction_num" />
+ <id property="browseNum" column="browse_num" />
+ <id property="basicInformation" column="basic_information" />
+ <id property="acceptConditions" column="accept_conditions" />
+ <id property="applicationMaterial" column="application_material" />
+ <id property="handlingProcedures" column="handling_procedures" />
+ <id property="rates" column="rates" />
+ <id property="createTime" column="create_time" />
+ <id property="updateTime" column="update_time" />
+ <id property="queryTime" column="query_time" />
+
+ <id property="associateNames" column="associate_names" />
+ <id property="queryTime" column="query_time" />
+ <id property="basicInformationUrl" column="basic_information_url" />
+ <id property="acceptConditionsUrl" column="accept_conditions_url" />
+ <id property="applicationMaterialUrl" column="application_material_url" />
+ <id property="handlingProceduresUrl" column="handling_procedures_url" />
+ <id property="ratesUrl" column="rates_url" />
+ <id property="basicInformationFileName" column="basic_information_file_name" />
+ <id property="acceptConditionsFileName" column="accept_conditions_file_name" />
+ <id property="applicationMaterialFileName" column="application_material_file_name" />
+ <id property="handlingProceduresFileName" column="handling_procedures_file_name" />
+ <id property="ratesFileName" column="rates_file_name" />
+ <id property="operationalGuidelineUrl" column="operational_guideline_url" />
+ <id property="operationalGuidelineVideoUrl" column="operational_guideline_video_url" />
+
+ <id property="setGist" column="set_gist" />
+ <id property="setGistUrl" column="set_gist_url" />
+ <id property="setGistName" column="set_gist_name" />
+
+ <id property="commonProblem" column="common_problem" />
+ <id property="commonProblemUrl" column="common_problem_url" />
+ <id property="commonProblemName" column="common_problem_name" />
+ <id property="operationalGuidelineVideoName" column="operational_guideline_video_name" />
+ <id property="operationalGuidelineName" column="operational_guideline_name" />
+ <id property="transactionArea" column="transaction_area" />
+ <id property="transactionAreaUrl" column="transaction_area_url" />
+ <id property="transactionAreaName" column="transaction_area_name" />
+ <id property="classifyIds" column="classify_ids" />
+ <id property="departmentIds" column="department_ids" />
+
+ </resultMap>
+
+ <sql id="selectTransactionEventEntityVo">
+ SELECT
+ id,
+ department_id,
+ concat(
+ IFNULL((SELECT name FROM automessage_area_code_2022 WHERE automessage_area_code_2022.code=(select city from automessage_organization_chart
+ where automessage_organization_chart.id=department_id)),''),
+ IFNULL((SELECT name FROM automessage_area_code_2022 WHERE automessage_area_code_2022.code=(select district from automessage_organization_chart
+ where automessage_organization_chart.id=department_id)),''),
+ IFNULL((SELECT name FROM automessage_area_code_2022 WHERE automessage_area_code_2022.code=(select village from automessage_organization_chart
+ where automessage_organization_chart.id=department_id)),'')
+ ) AS department_area,
+ (select contact_number from automessage_organization_chart where automessage_organization_chart.id=department_id) as contactNumber,
+ classify_id,
+ matter_name,
+ associate_ids,
+ transaction_num,
+ browse_num,
+ basic_information,
+ accept_conditions,
+ application_material,
+ handling_procedures,
+ rates,
+ create_time,
+ update_time,
+ query_time,
+ associate_names,
+ basic_information_url,
+ accept_conditions_url,
+ application_material_url,
+ handling_procedures_url,
+ rates_url,
+ basic_information_file_name,
+ accept_conditions_file_name,
+ application_material_file_name,
+ handling_procedures_file_name,
+ rates_file_name,
+ operational_guideline_url,
+ set_gist,
+ set_gist_url,
+ set_gist_name,
+ common_problem,
+ common_problem_url,
+ common_problem_name,
+ operational_guideline_video_url,
+ operational_guideline_video_name,
+ operational_guideline_name,
+ transaction_area,
+ transaction_area_url,
+ transaction_area_name,
+ classify_ids,
+ department_ids,
+ (SELECT GROUP_CONCAT(organization_name) FROM automessage_organization_chart WHERE id in (SELECT
+ substring_index(substring_index(department_ids,',', b.help_topic_id + 1), ',', -1) result
+ FROM
+ mysql.help_topic b
+ where
+ b.help_topic_id < (LENGTH(department_ids) - LENGTH(REPLACE(department_ids, ',', '')) + 1))) as departmentNames,
+ (IF((select classify_grade from automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id)='2',
+ (select classify_name from automessage_classify_administration where automessage_classify_administration.id=(select parent_id from
+ automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id)),
+ (select classify_name from automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id))) as classifyName,
+ (select organization_name from automessage_organization_chart where automessage_organization_chart.id=automessage_transaction_event.department_id) as departmentName,
+ concat(
+ (select classify_name from automessage_classify_administration where id=(select parent_id from automessage_classify_administration where id=automessage_transaction_event.classify_id)),
+ '>',(select classify_name from automessage_classify_administration where id=automessage_transaction_event.classify_id)
+ ) sumClassifyName
+ FROM
+ automessage_transaction_event
+ </sql>
+
+ <sql id="selectTransactionEventList">
+ SELECT
+ id,
+ department_id,
+ concat(
+ IFNULL((SELECT name FROM automessage_area_code_2022 WHERE automessage_area_code_2022.code=(select city from automessage_organization_chart
+ where automessage_organization_chart.id=department_id)),''),
+ IFNULL((SELECT name FROM automessage_area_code_2022 WHERE automessage_area_code_2022.code=(select district from automessage_organization_chart
+ where automessage_organization_chart.id=department_id)),''),
+ IFNULL((SELECT name FROM automessage_area_code_2022 WHERE automessage_area_code_2022.code=(select village from automessage_organization_chart
+ where automessage_organization_chart.id=department_id)),'')
+ ) AS department_area,
+ classify_id,
+ (IF((select classify_grade from automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id)='2',
+ (select classify_name from automessage_classify_administration where automessage_classify_administration.id=(select parent_id from
+ automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id)),
+ (select classify_name from automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id))) as classifyName,
+ (select organization_name from automessage_organization_chart where automessage_organization_chart.id=automessage_transaction_event.department_id) as departmentName,
+ matter_name,
+ associate_ids,
+ associate_names,
+ transaction_num,
+ browse_num,
+ department_ids,
+ (SELECT GROUP_CONCAT(organization_name) FROM automessage_organization_chart WHERE id in (SELECT
+ substring_index(substring_index(department_ids,',', b.help_topic_id + 1), ',', -1) result
+ FROM
+ mysql.help_topic b
+ where
+ b.help_topic_id < (LENGTH(department_ids) - LENGTH(REPLACE(department_ids, ',', '')) + 1))) as departmentNames,
+ create_time,
+ update_time
+ FROM
+ automessage_transaction_event
+ </sql>
+
+ <select id="selectConfigData" parameterType="string" resultMap="TransactionEventEntityResult">
+ <include refid="selectTransactionEventEntityVo"/>
+ where id=#{Id}
+ </select>
+
+ <select id="selectConfigList" resultMap="TransactionEventEntityResult">
+ <include refid="selectTransactionEventList"/>
+ <where>
+ <if test="keyword != null and keyword != ''">
+ AND (
+ (matter_name like concat('%', #{keyword}, '%')) or
+ (department_id in (SELECT id FROM automessage_organization_chart WHERE organization_name like concat('%', #{keyword}, '%')))
+ or (classify_id in (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{keyword}, '%')))
+ )
+
+ </if>
+ <if test="classifyGrade != null and classifyGrade != ''">
+ AND (select classify_grade from automessage_classify_administration where automessage_classify_administration.id=classify_id) = #{classifyGrade}
+ </if>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ order by create_time desc
+ </select>
+
+ <!-- 根据分类筛选数据 -->
+ <select id="selectClassifyList" resultMap="TransactionEventEntityResult">
+ <include refid="selectTransactionEventList"/>
+ <where>
+ <if test="ids != null">
+ and classify_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ order by create_time desc
+ </select>
+
+
+
+ <select id="selectListByIds" resultMap="TransactionEventEntityResult">
+ <include refid="selectTransactionEventList"/>
+ WHERE id IN
+ <foreach collection="array" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ order by create_time desc
+ </select>
+
+ <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.TransactionEvent">
+ insert into automessage_transaction_event (
+ <if test="id != null">id,</if>
+ <if test="departmentId != null and departmentId != '' ">department_id,</if>
+ <if test="departmentArea != null">department_area,</if>
+ <if test="classifyId != null and classifyId != '' ">classify_id,</if>
+ <if test="matterName != null and matterName != '' ">matter_name,</if>
+ <if test="associateIds != null ">associate_ids,</if>
+ <if test="transactionNum != null ">transaction_num,</if>
+ <if test="browseNum != null ">browse_num,</if>
+ <if test="basicInformation != null and basicInformation != '' ">basic_information,</if>
+ <if test="acceptConditions != null and acceptConditions != '' ">accept_conditions,</if>
+ <if test="applicationMaterial != null and applicationMaterial != '' ">application_material,</if>
+ <if test="handlingProcedures != null and handlingProcedures != '' ">handling_procedures,</if>
+ <if test="rates != null and rates != '' ">rates,</if>
+ <if test="associateNames != null ">associate_names,</if>
+ <if test="queryTime != null">query_time,</if>
+ <if test="basicInformationUrl != null and basicInformationUrl != '' ">basic_information_url,</if>
+ <if test="acceptConditionsUrl != null and acceptConditionsUrl != '' ">accept_conditions_url,</if>
+ <if test="applicationMaterialUrl != null and applicationMaterialUrl != '' ">application_material_url,</if>
+ <if test="handlingProceduresUrl != null and handlingProceduresUrl != '' ">handling_procedures_url,</if>
+ <if test="ratesUrl != null and ratesUrl != '' ">rates_url,</if>
+ <if test="basicInformationFileName != null and basicInformationFileName != '' ">basic_information_file_name,</if>
+ <if test="acceptConditionsFileName != null and acceptConditionsFileName != '' ">accept_conditions_file_name,</if>
+ <if test="applicationMaterialFileName != null and applicationMaterialFileName != '' ">application_material_file_name,</if>
+ <if test="handlingProceduresFileName != null and handlingProceduresFileName != '' ">handling_procedures_file_name,</if>
+ <if test="ratesFileName != null and ratesFileName != '' ">rates_file_name,</if>
+ <if test="operationalGuidelineUrl != null and operationalGuidelineUrl != '' ">operational_guideline_url,</if>
+ <if test="operationalGuidelineVideoUrl != null and operationalGuidelineVideoUrl != '' ">operational_guideline_video_url,</if>
+ <if test="setGist != null and setGist != '' ">set_gist,</if>
+ <if test="setGistUrl != null and setGistUrl != '' ">set_gist_url,</if>
+ <if test="setGistName != null and setGistName != '' ">set_gist_name,</if>
+ <if test="commonProblem != null and commonProblem != '' ">common_problem,</if>
+ <if test="commonProblemUrl != null and commonProblemUrl != '' ">common_problem_url,</if>
+ <if test="commonProblemName != null and commonProblemName != '' ">common_problem_name,</if>
+ <if test="operationalGuidelineVideoName != null and operationalGuidelineVideoName != '' ">operational_guideline_video_name,</if>
+ <if test="operationalGuidelineName != null and operationalGuidelineName != '' ">operational_guideline_name,</if>
+ <if test="transactionArea != null ">transaction_area,</if>
+ <if test="transactionAreaUrl != null ">transaction_area_url,</if>
+ <if test="transactionAreaName != null ">transaction_area_name,</if>
+ <if test="classifyIds != null ">classify_ids,</if>
+ <if test="departmentIds != null ">department_ids,</if>
+ update_time,
+ create_time
+ )values(
+ <if test="id != null">#{id},</if>
+ <if test="departmentId != null and departmentId != '' ">#{departmentId},</if>
+ <if test="departmentArea != null">#{departmentArea},</if>
+ <if test="classifyId != null and classifyId != '' ">#{classifyId},</if>
+ <if test="matterName != null and matterName != '' ">#{matterName},</if>
+ <if test="associateIds != null ">#{associateIds},</if>
+ <if test="transactionNum != null ">#{transactionNum},</if>
+ <if test="browseNum != null ">#{browseNum},</if>
+ <if test="basicInformation != null and basicInformation != '' ">#{basicInformation},</if>
+ <if test="acceptConditions != null and acceptConditions != '' ">#{acceptConditions},</if>
+ <if test="applicationMaterial != null and applicationMaterial != '' ">#{applicationMaterial},</if>
+ <if test="handlingProcedures != null and handlingProcedures != '' ">#{handlingProcedures},</if>
+ <if test="rates != null and rates != '' ">#{rates},</if>
+ <if test="associateNames != null ">#{associateNames},</if>
+ <if test="queryTime != null">#{queryTime},</if>
+ <if test="basicInformationUrl != null and basicInformationUrl != '' ">#{basicInformationUrl},</if>
+ <if test="acceptConditionsUrl != null and acceptConditionsUrl != '' ">#{acceptConditionsUrl},</if>
+ <if test="applicationMaterialUrl != null and applicationMaterialUrl != '' ">#{applicationMaterialUrl},</if>
+ <if test="handlingProceduresUrl != null and handlingProceduresUrl != '' ">#{handlingProceduresUrl},</if>
+ <if test="ratesUrl != null and ratesUrl != '' ">#{ratesUrl},</if>
+ <if test="basicInformationFileName != null and basicInformationFileName != '' ">#{basicInformationFileName},</if>
+ <if test="acceptConditionsFileName != null and acceptConditionsFileName != '' ">#{acceptConditionsFileName},</if>
+ <if test="applicationMaterialFileName != null and applicationMaterialFileName != '' ">#{applicationMaterialFileName},</if>
+ <if test="handlingProceduresFileName != null and handlingProceduresFileName != '' ">#{handlingProceduresFileName},</if>
+ <if test="ratesFileName != null and ratesFileName != '' ">#{ratesFileName},</if>
+ <if test="operationalGuidelineUrl != null and operationalGuidelineUrl != '' ">#{operationalGuidelineUrl},</if>
+ <if test="operationalGuidelineVideoUrl != null and operationalGuidelineVideoUrl != '' ">#{operationalGuidelineVideoUrl},</if>
+ <if test="setGist != null and setGist != '' ">#{setGist},</if>
+ <if test="setGistUrl != null and setGistUrl != '' ">#{setGistUrl},</if>
+ <if test="setGistName != null and setGistName != '' ">#{setGistName},</if>
+ <if test="commonProblem != null and commonProblem != '' ">#{commonProblem},</if>
+ <if test="commonProblemUrl != null and commonProblemUrl != '' ">#{commonProblemUrl},</if>
+ <if test="commonProblemName != null and commonProblemName != '' ">#{commonProblemName},</if>
+ <if test="operationalGuidelineVideoName != null and operationalGuidelineVideoName != '' ">#{operationalGuidelineVideoName},</if>
+ <if test="operationalGuidelineName != null and operationalGuidelineName != '' ">#{operationalGuidelineName},</if>
+ <if test="transactionArea != null ">#{transactionArea},</if>
+ <if test="transactionAreaUrl != null ">#{transactionAreaUrl},</if>
+ <if test="transactionAreaName != null ">#{transactionAreaName},</if>
+ <if test="classifyIds != null ">#{classifyIds},</if>
+ <if test="departmentIds != null ">#{departmentIds},</if>
+ sysdate(),
+ sysdate()
+ )
+ </insert>
+
+ <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.TransactionEvent">
+ update automessage_transaction_event
+ <set>
+ <if test="id != null">id=#{id},</if>
+ <if test="departmentId != null and departmentId != '' ">department_id=#{departmentId},</if>
+ <if test="departmentArea != null">department_area=#{departmentArea},</if>
+ <if test="classifyId != null and classifyId != '' ">classify_id=#{classifyId},</if>
+ <if test="matterName != null and matterName != '' ">matter_name=#{matterName},</if>
+ <if test="associateIds != null ">associate_ids=#{associateIds},</if>
+ <if test="transactionNum != null ">transaction_num=#{transactionNum},</if>
+ <if test="browseNum != null ">browse_num=#{browseNum},</if>
+ <if test="basicInformation != null">basic_information=#{basicInformation},</if>
+ <if test="acceptConditions != null ">accept_conditions=#{acceptConditions},</if>
+ <if test="applicationMaterial != null ">application_material=#{applicationMaterial},</if>
+ <if test="handlingProcedures != null ">handling_procedures=#{handlingProcedures},</if>
+ <if test="rates != null ">rates=#{rates},</if>
+ <if test="associateNames != null ">associate_names=#{associateNames},</if>
+ <if test="queryTime != null">query_time=#{queryTime},</if>
+ <if test="basicInformationUrl != null">basic_information_url=#{basicInformationUrl},</if>
+ <if test="acceptConditionsUrl != null ">accept_conditions_url=#{acceptConditionsUrl},</if>
+ <if test="applicationMaterialUrl != null ">application_material_url=#{applicationMaterialUrl},</if>
+ <if test="handlingProceduresUrl != null ">handling_procedures_url=#{handlingProceduresUrl},</if>
+ <if test="ratesUrl != null ">rates_url=#{ratesUrl},</if>
+ <if test="basicInformationFileName != null ">basic_information_file_name=#{basicInformationFileName},</if>
+ <if test="acceptConditionsFileName != null ">accept_conditions_file_name=#{acceptConditionsFileName},</if>
+ <if test="applicationMaterialFileName != null ">application_material_file_name=#{applicationMaterialFileName},</if>
+ <if test="handlingProceduresFileName != null ">handling_procedures_file_name=#{handlingProceduresFileName},</if>
+ <if test="ratesFileName != null ">rates_file_name=#{ratesFileName},</if>
+ <if test="operationalGuidelineUrl != null">operational_guideline_url=#{operationalGuidelineUrl},</if>
+ <if test="setGist != null and setGist != '' ">set_gist=#{setGist},</if>
+ <if test="setGistUrl != null and setGistUrl != '' ">set_gist_url=#{setGistUrl},</if>
+ <if test="setGistName != null and setGistName != '' ">set_gist_name=#{setGistName},</if>
+ <if test="commonProblem != null and commonProblem != '' ">common_problem=#{commonProblem},</if>
+ <if test="commonProblemUrl != null and commonProblemUrl != '' ">common_problem_url=#{commonProblemUrl},</if>
+ <if test="commonProblemName != null and commonProblemName != '' ">common_problem_name=#{commonProblemName},</if>
+ <if test="operationalGuidelineVideoUrl != null ">operational_guideline_video_url=#{operationalGuidelineVideoUrl},</if>
+ <if test="operationalGuidelineVideoName != null and operationalGuidelineVideoName != '' ">operational_guideline_video_name=#{operationalGuidelineVideoName},</if>
+ <if test="operationalGuidelineName != null and operationalGuidelineName != '' ">operational_guideline_name=#{operationalGuidelineName},</if>
+ <if test="transactionArea != null ">transaction_area=#{transactionArea},</if>
+ <if test="transactionAreaUrl != null ">transaction_area_url=#{transactionAreaUrl},</if>
+ <if test="transactionAreaName != null ">transaction_area_name=#{transactionAreaName},</if>
+ <if test="classifyIds != null ">classify_ids=#{classifyIds},</if>
+ <if test="departmentIds != null ">department_ids=#{departmentIds},</if>
+ update_time=sysdate()
+ </set>
+ where id= #{id}
+ </update>
+
+ <delete id="deleteConfigById" parameterType="string">
+ delete from automessage_transaction_event where id= #{Id}
+ </delete>
+
+ <select id="countNum" resultType="integer">
+ select count(id) from automessage_transaction_event
+ <where>
+ <if test="keyword != null and keyword != ''">
+ AND (matter_name like concat('%', #{keyword}, '%')) or
+ (department_id in (SELECT id FROM automessage_organization_chart WHERE organization_name like concat('%', #{keyword}, '%')))
+ or (classify_id in (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{keyword}, '%')))
+ or (associate_names like concat('%', #{keyword}, '%'))
+ </if>
+ <if test="classifyGrade != null and classifyGrade != ''">
+ AND (select classify_grade from classify_administration where classify_grade.id=classify_id) = #{classifyGrade}
+ </if>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ </select>
+
+
+ <select id="queryMatterNameList" resultMap="TransactionEventEntityResult">
+ select id,matter_name from automessage_transaction_event
+ <where>
+ <if test="matterName != null and matterName != ''">
+ AND (matter_name like concat('%', #{matterName}, '%') )
+ </if>
+ <if test="classifyId != null and classifyId != ''">
+ and (classify_id= #{classifyId} or classify_id in (select id FROM automessage_classify_administration where parent_id =#{classifyId} ))
+ </if>
+
+ </where>
+ order by create_time desc
+ </select>
+
+ <select id="queryAssociateNamesList" resultMap="TransactionEventEntityResult">
+ select id,matter_name from automessage_transaction_event
+ <where>
+ <if test="associateNames != null and associateNames != ''">
+ AND (associate_names like concat('%', #{associateNames}, '%') )
+ </if>
+ <if test="classifyId != null and classifyId != ''">
+ and (classify_id= #{classifyId} or classify_id in (select id FROM automessage_classify_administration where parent_id =#{classifyId} ))
+ </if>
+
+ </where>
+ order by create_time desc
+ </select>
+
+ <select id="sumTransactionNum" resultMap="TransactionEventEntityResult">
+ select sum(TransactionNum)sumTransactionNum, count(*) counttransaction from (
+ SELECT (select count(id) from automessage_guide_repair_order where state in (3,4) and a.id=matter_id) TransactionNum
+ from automessage_transaction_event a)k
+ </select>
+
+ <select id="queryByClassifyIdList" resultMap="TransactionEventEntityResult">
+ <include refid="selectTransactionEventEntityVo"/>
+ where (classify_id= #{classifyId} or classify_id in (select id FROM automessage_classify_administration where parent_id =#{classifyId} ))
+ <if test="departmentId!=null">
+ and department_id in (select id from automessage_organization_chart where id=#{departmentId} or parent_id=#{departmentId})
+ </if>
+ order by create_time desc
+ </select>
+
+ <select id="countNumByClassifyIdList" resultType="integer">
+ select count(id) from automessage_transaction_event
+ where (classify_id= #{classifyId} or classify_id in (select id FROM automessage_classify_administration where parent_id =#{classifyId} ))
+ <if test="departmentId!=null">
+ and department_id=#{departmentId}
+ </if>
+ order by create_time desc
+ </select>
+
+
+ <update id="updateConfigByMatterName" parameterType="com.dg.core.db.gen.entity.TransactionEvent">
+ update automessage_transaction_event
+ <set>
+ browse_num=browse_num+1,query_time=sysdate()
+ </set>
+ <where>
+ matter_name like concat('%', #{matterName}, '%')
+ </where>
+
+ </update>
+
+ <select id="countNumByMatterName" resultType="integer">
+ select count(id) from automessage_transaction_event
+ <where>
+ <if test="matterName != null and matterName != ''">
+ AND matter_name like concat('%', #{matterName}, '%')
+ </if>
+
+ </where>
+ </select>
+
+ <select id="selectSearch" resultType="com.dg.core.db.manual.pojo.Search">
+ select id,title,content,views, type FROM(
+ select id,organization_name title,resume content,null views,1 type from automessage_organization_chart where grade=1 UNION
+ select id,matter_name title,concat((select classify_name from automessage_classify_administration
+ where id=(select parent_id from automessage_classify_administration where id=automessage_transaction_event.classify_id)),
+ '>',(select classify_name from automessage_classify_administration where id=automessage_transaction_event.classify_id)) content,
+ browse_num views,2 type from automessage_transaction_event UNION
+ SELECT id ,name title,concat((select organization_name from automessage_organization_chart where id=automessage_policy_documents.department_id ),'>','政策文件') content,null views,5 type FROM automessage_policy_documents where type=2 UNION
+ SELECT id ,name title,concat((select organization_name from automessage_organization_chart where id=automessage_policy_documents.department_id ),'>','法律法规') content,null views,6 type FROM automessage_policy_documents where type=1
+ ) k
+ where k.title like concat('%',#{keyWord}, '%') or k.content like concat('%', #{keyWord}, '%')
+ </select>
+
+ <select id="selectSearchList" resultType="com.dg.core.db.manual.pojo.Search">
+ select distinct classify_id, content,type,parentClassifyId from ( select id,matter_name title,concat((select classify_name from automessage_classify_administration
+ where id=(select parent_id from automessage_classify_administration where id=automessage_transaction_event.classify_id)),
+ '/',(select classify_name from automessage_classify_administration where id=automessage_transaction_event.classify_id)) content,
+ classify_id,(select parent_id from automessage_classify_administration where id=automessage_transaction_event.classify_id) parentClassifyId,
+ 2 type from automessage_transaction_event) k
+ where k.title like concat('%',#{keyWord}, '%') or k.content like concat('%',#{keyWord}, '%')
+ </select>
+
+ <select id="selectSearchAssociate" resultType="com.dg.core.db.manual.pojo.Search">
+ select id,matter_name title,concat((select classify_name from automessage_classify_administration
+ where id=(select parent_id from automessage_classify_administration where id=automessage_transaction_event.classify_id)),
+ '>',(select classify_name from automessage_classify_administration where id=automessage_transaction_event.classify_id)) content,
+ browse_num views ,3 type from automessage_transaction_event where associate_names like concat('%',#{keyWord}, '%')
+ </select>
+
+ <select id="selectSearchAssociateDistinct" resultType="com.dg.core.db.manual.pojo.Search" >
+ select distinct classify_id,
+ (select ifnull(concat((select classify_name from automessage_classify_administration where c.parent_id=id),'/',classify_name),classify_name) content from automessage_classify_administration c where c.id=t.classify_id) content,
+ 3 type from automessage_transaction_event t where associate_names like concat('%',#{keyWord}, '%')
+ </select>
+
+ <select id="selectDataIfExist" resultType="string">
+ select id from automessage_transaction_event
+ where department_id=#{departmentId}
+ and matter_name=#{matterName}
+ </select>
+
+ <select id="selectclassifyId" resultType="string">
+ select id from automessage_transaction_event
+ where classify_id=#{classifyId}
+ </select>
+
+
+
+</mapper>
diff --git a/flower_city/src/test/java/com/dg/core/WMApplicationTests.java b/flower_city/src/test/java/com/dg/core/WMApplicationTests.java
new file mode 100644
index 0000000..4d2b87e
--- /dev/null
+++ b/flower_city/src/test/java/com/dg/core/WMApplicationTests.java
@@ -0,0 +1,13 @@
+package com.dg.core;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class WMApplicationTests {
+
+ @Test
+ void contextLoads() {
+ }
+
+}
diff --git a/springcloud_demo_on_k8s-master/.gitignore b/springcloud_demo_on_k8s-master/.gitignore
new file mode 100644
index 0000000..c456c4a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
diff --git a/springcloud_demo_on_k8s-master/.mvn/wrapper/maven-wrapper.jar b/springcloud_demo_on_k8s-master/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..01e6799
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/.mvn/wrapper/maven-wrapper.jar
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/.mvn/wrapper/maven-wrapper.properties b/springcloud_demo_on_k8s-master/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..7179346
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
diff --git a/springcloud_demo_on_k8s-master/LICENSE b/springcloud_demo_on_k8s-master/LICENSE
new file mode 100644
index 0000000..6af6986
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 magic lian
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/springcloud_demo_on_k8s-master/README.md b/springcloud_demo_on_k8s-master/README.md
new file mode 100644
index 0000000..4334ec4
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/README.md
@@ -0,0 +1,75 @@
+# springcloud-demo-on-k8s
+
+### Prepare
+* Java 1.8
+* Spring boot 2.0.3 RELEASE
+* Spring cloud Finchley.RELEASE
+* Maven-docker-plugin 1.0.0
+* Kubernetes 1.13
+* Kube-dns
+* Docker 18.06.1-ce
+
+
+### Service
+
++ eureka-server
++ service-zuul
++ service-api
++ service-tp
++ config-server
+
+### Build and Docker
+
+`mvn clean package docker:build`
+
+```docker push xxxxx```
+
+
+### Deploy
+
+#### run rabbitmq
+`sudo docker run -d --name rabbitmq -p 5671:5671 -p 5672:5672 -p 4369:4369 -p 25672:25672 -p 15671:15671 -p 15672:15672 rabbitmq:management`
+### run eureka
+`kubectl create/apply -f deploy-file/deploy-eurekaserver.yaml`
+
+#### 查询注册的服务
+`curl http://192.168.140.126:30719/eureka/apps`
+
+### run config server
+`kubectl create/apply -f deploy-file/config-server.yaml`
+
+### run service-api
+`kubectl create/apply -f deploy-file/service-api.yaml`
+
+### run service-tp
+`kubectl create/apply -f deploy-file/service-tp.yaml`
+
+### others
+
+`kubectl get/delete deploy,pod,svc --all-namespaces/-n default`
+
+`kubectl describe pod POD_ID`
+
+`kubectl logs -f POD_ID`
+
+ kubectl exec -it busybox sh
+ nslookup eureka-server
+
+#### refresh config on config server
+`curl -X POST http://localhost:8765/actuator/bus-refresh`
+
+`-- localhost：此处是登录到config-server的pod中执行的curl命令，故而ip地址为localhost`
+
+`-- 8765：config server的端口`
+
+### Test
+
+Check the other services whether join in eureka-server and make sure the config-server runs well.
+
+ eureka-server portal test : http://IP:Port
+
+ config-server and client test : http://IP:Port/custom-config/dev
+
+
+
+
diff --git a/springcloud_demo_on_k8s-master/adminConfig/custom-config-dev.yml b/springcloud_demo_on_k8s-master/adminConfig/custom-config-dev.yml
new file mode 100644
index 0000000..8d8e0b5
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/adminConfig/custom-config-dev.yml
@@ -0,0 +1,13 @@
+common:
+ db_driver: I am lihan! 3ks! (got it!!!) v0.0.1
+
+service_api:
+ aaa:
+ bbbb: 333555
+
+spring:
+ datasource:
+ url: jdbc:mysql://192.168.140.102:3306/bootdb?useUnicode=true&characterEncoding=utf8&useSSL=false
+ username: root
+ password: 123456
+
diff --git a/springcloud_demo_on_k8s-master/compile.lihan.md b/springcloud_demo_on_k8s-master/compile.lihan.md
new file mode 100644
index 0000000..a70c40a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/compile.lihan.md
@@ -0,0 +1 @@
+sudo /home/cc/k8s/apache-maven-3.6.3/bin/mvn package docker:build -Dmaven.test.skip=true
diff --git a/springcloud_demo_on_k8s-master/config-server-bak/.gitignore b/springcloud_demo_on_k8s-master/config-server-bak/.gitignore
new file mode 100644
index 0000000..c456c4a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/config-server-bak/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
diff --git a/springcloud_demo_on_k8s-master/config-server-bak/.mvn/wrapper/maven-wrapper.jar b/springcloud_demo_on_k8s-master/config-server-bak/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..01e6799
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/config-server-bak/.mvn/wrapper/maven-wrapper.jar
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/config-server-bak/.mvn/wrapper/maven-wrapper.properties b/springcloud_demo_on_k8s-master/config-server-bak/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..cd0d451
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/config-server-bak/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
diff --git a/springcloud_demo_on_k8s-master/config-server-bak/mvnw b/springcloud_demo_on_k8s-master/config-server-bak/mvnw
new file mode 100644
index 0000000..5551fde
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/config-server-bak/mvnw
@@ -0,0 +1,286 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+ # TODO classpath?
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ wget "$jarUrl" -O "$wrapperJarPath"
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ curl -o "$wrapperJarPath" "$jarUrl"
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/springcloud_demo_on_k8s-master/config-server-bak/mvnw.cmd b/springcloud_demo_on_k8s-master/config-server-bak/mvnw.cmd
new file mode 100644
index 0000000..e5cfb0a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/config-server-bak/mvnw.cmd
@@ -0,0 +1,161 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ echo Found %WRAPPER_JAR%
+) else (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
+ echo Finished downloading %WRAPPER_JAR%
+)
+@REM End of extension
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/springcloud_demo_on_k8s-master/config-server-bak/pom.xml b/springcloud_demo_on_k8s-master/config-server-bak/pom.xml
new file mode 100644
index 0000000..5a78396
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/config-server-bak/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>2.0.3.RELEASE</version>
+ <relativePath/> <!-- lookup parent from repository -->
+ </parent>
+ <groupId>com.springcloudme</groupId>
+ <artifactId>config-server</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>config-server</name>
+ <description>Demo project for Spring Boot</description>
+
+ <properties>
+ <java.version>1.8</java.version>
+ <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-config-server</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-bus-amqp</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+ </dependencies>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-dependencies</artifactId>
+ <version>${spring-cloud.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>spring-milestones</id>
+ <name>Spring Milestones</name>
+ <url>https://repo.spring.io/milestone</url>
+ </repository>
+ </repositories>
+
+</project>
diff --git a/springcloud_demo_on_k8s-master/config-server-bak/src/main/java/com/springcloudme/configserver/ConfigServerApplication.java b/springcloud_demo_on_k8s-master/config-server-bak/src/main/java/com/springcloudme/configserver/ConfigServerApplication.java
new file mode 100644
index 0000000..4ee5b6b
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/config-server-bak/src/main/java/com/springcloudme/configserver/ConfigServerApplication.java
@@ -0,0 +1,16 @@
+package com.springcloudme.configserver;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.config.server.EnableConfigServer;
+
+@SpringBootApplication
+@EnableConfigServer
+public class ConfigServerApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(ConfigServerApplication.class, args);
+ }
+
+}
+
diff --git a/springcloud_demo_on_k8s-master/config-server-bak/src/main/resources/application.yml b/springcloud_demo_on_k8s-master/config-server-bak/src/main/resources/application.yml
new file mode 100644
index 0000000..7ba2e49
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/config-server-bak/src/main/resources/application.yml
@@ -0,0 +1,16 @@
+
+server:
+ port: 8765
+
+spring:
+ application:
+ name: config-server
+
+ cloud:
+ config:
+ server:
+ git:
+ uri: https://github.com/magicLian/springcloud_demo_on_k8s.git
+ search-paths: adminConfig
+# username: *************
+# password: *************
diff --git a/springcloud_demo_on_k8s-master/config-server-bak/src/test/java/com/springcloudme/configserver/ConfigServerApplicationTests.java b/springcloud_demo_on_k8s-master/config-server-bak/src/test/java/com/springcloudme/configserver/ConfigServerApplicationTests.java
new file mode 100644
index 0000000..6c7b157
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/config-server-bak/src/test/java/com/springcloudme/configserver/ConfigServerApplicationTests.java
@@ -0,0 +1,17 @@
+package com.springcloudme.configserver;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class ConfigServerApplicationTests {
+
+ @Test
+ public void contextLoads() {
+ }
+
+}
+
diff --git a/springcloud_demo_on_k8s-master/config-server/.gitignore b/springcloud_demo_on_k8s-master/config-server/.gitignore
new file mode 100644
index 0000000..c456c4a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/config-server/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
diff --git a/springcloud_demo_on_k8s-master/config-server/.mvn/wrapper/maven-wrapper.jar b/springcloud_demo_on_k8s-master/config-server/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..01e6799
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/config-server/.mvn/wrapper/maven-wrapper.jar
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/config-server/.mvn/wrapper/maven-wrapper.properties b/springcloud_demo_on_k8s-master/config-server/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..cd0d451
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/config-server/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
diff --git a/springcloud_demo_on_k8s-master/config-server/mvnw b/springcloud_demo_on_k8s-master/config-server/mvnw
new file mode 100644
index 0000000..5551fde
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/config-server/mvnw
@@ -0,0 +1,286 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+ # TODO classpath?
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ wget "$jarUrl" -O "$wrapperJarPath"
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ curl -o "$wrapperJarPath" "$jarUrl"
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/springcloud_demo_on_k8s-master/config-server/mvnw.cmd b/springcloud_demo_on_k8s-master/config-server/mvnw.cmd
new file mode 100644
index 0000000..e5cfb0a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/config-server/mvnw.cmd
@@ -0,0 +1,161 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ echo Found %WRAPPER_JAR%
+) else (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
+ echo Finished downloading %WRAPPER_JAR%
+)
+@REM End of extension
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/springcloud_demo_on_k8s-master/config-server/pom.xml b/springcloud_demo_on_k8s-master/config-server/pom.xml
new file mode 100644
index 0000000..701b3e3
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/config-server/pom.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>2.0.3.RELEASE</version>
+ <relativePath/> <!-- lookup parent from repository -->
+ </parent>
+ <groupId>com.springcloudme</groupId>
+ <artifactId>config-server</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>config-server</name>
+ <description>Demo project for Spring Boot</description>
+
+ <properties>
+ <java.version>1.8</java.version>
+ <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-config-server</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-bus-amqp</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+ </dependencies>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-dependencies</artifactId>
+ <version>${spring-cloud.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <!--
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ -->
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>1.2.0</version>
+ <configuration>
+ <imageName>registry.cn-hangzhou.aliyuncs.com/wooddeep/config-server:v0.3</imageName>
+ <serverId>my-docker-registry</serverId>
+ <baseImage>java</baseImage>
+ <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
+ <resources>
+ <resource>
+ <targetPath>/</targetPath>
+ <directory>${project.build.directory}</directory>
+ <include>${project.build.finalName}.jar</include>
+ </resource>
+ </resources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>spring-milestones</id>
+ <name>Spring Milestones</name>
+ <url>https://repo.spring.io/milestone</url>
+ </repository>
+ </repositories>
+
+</project>
diff --git a/springcloud_demo_on_k8s-master/config-server/src/main/java/com/springcloudme/configserver/ConfigServerApplication.java b/springcloud_demo_on_k8s-master/config-server/src/main/java/com/springcloudme/configserver/ConfigServerApplication.java
new file mode 100644
index 0000000..fc754db
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/config-server/src/main/java/com/springcloudme/configserver/ConfigServerApplication.java
@@ -0,0 +1,18 @@
+package com.springcloudme.configserver;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.config.server.EnableConfigServer;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+
+@SpringBootApplication
+@EnableConfigServer
+@EnableEurekaClient
+public class ConfigServerApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(ConfigServerApplication.class, args);
+ }
+
+}
+
diff --git a/springcloud_demo_on_k8s-master/config-server/src/main/resources/application.yml b/springcloud_demo_on_k8s-master/config-server/src/main/resources/application.yml
new file mode 100644
index 0000000..97fcfc6
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/config-server/src/main/resources/application.yml
@@ -0,0 +1,23 @@
+
+server:
+ port: 8765
+
+eureka:
+ instance:
+ preferIpAddress: true
+ client:
+ serviceUrl:
+ defaultZone: http://${EUREKA_URL:localhost}:8761/eureka
+
+spring:
+ application:
+ name: config-server
+
+ cloud:
+ config:
+ server:
+ git:
+ uri: https://github.com/wooddeep/springcloud_demo_on_k8s.git
+ search-paths: adminConfig
+ username: wooddeep
+ password: Iamlihan(you guess)
diff --git a/springcloud_demo_on_k8s-master/config-server/src/main/resources/bootstrap.properties b/springcloud_demo_on_k8s-master/config-server/src/main/resources/bootstrap.properties
new file mode 100644
index 0000000..a180a50
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/config-server/src/main/resources/bootstrap.properties
@@ -0,0 +1,10 @@
+#bus总线配置
+management.endpoints.web.exposure.include=bus-refresh
+spring.cloud.bus.enabled=true
+spring.cloud.bus.trace.enabled =true
+
+#rabbitmq配置
+spring.rabbitmq.host=172.26.144.132
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=guest
+spring.rabbitmq.password=guest
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/config-server/src/test/java/com/springcloudme/configserver/ConfigServerApplicationTests.java b/springcloud_demo_on_k8s-master/config-server/src/test/java/com/springcloudme/configserver/ConfigServerApplicationTests.java
new file mode 100644
index 0000000..6c7b157
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/config-server/src/test/java/com/springcloudme/configserver/ConfigServerApplicationTests.java
@@ -0,0 +1,17 @@
+package com.springcloudme.configserver;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class ConfigServerApplicationTests {
+
+ @Test
+ public void contextLoads() {
+ }
+
+}
+
diff --git a/springcloud_demo_on_k8s-master/deploy-file/busybox.yaml b/springcloud_demo_on_k8s-master/deploy-file/busybox.yaml
new file mode 100644
index 0000000..babb765
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/deploy-file/busybox.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Pod
+metadata:
+ name: busybox
+ namespace: default
+spec:
+ containers:
+ - image: busybox
+ command:
+ - sleep
+ - "3600"
+ imagePullPolicy: IfNotPresent
+ name: busybox
+ restartPolicy: Always
diff --git a/springcloud_demo_on_k8s-master/deploy-file/config-server.yaml b/springcloud_demo_on_k8s-master/deploy-file/config-server.yaml
new file mode 100644
index 0000000..c3cd711
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/deploy-file/config-server.yaml
@@ -0,0 +1,42 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: config-server
+spec:
+ selector:
+ matchLabels:
+ app: springcloud-config-server
+
+ replicas: 1
+
+ template:
+ metadata:
+ labels:
+ app: springcloud-config-server
+ spec:
+ containers:
+ - name: config-server-instance
+ image: registry.cn-hangzhou.aliyuncs.com/wooddeep/config-server:v0.3
+ env:
+ - name: EUREKA_URL
+ value: eureka-server
+ ports:
+ - containerPort: 8765
+
+
+---
+kind: Service
+apiVersion: v1
+metadata:
+ name: config-server
+spec:
+ selector:
+ app: springcloud-config-server
+ ports:
+ - protocol: TCP
+ port: 8765
+ targetPort: 8765
+ #type: NodePort
+
+
diff --git a/springcloud_demo_on_k8s-master/deploy-file/deploy-eurekaserver.yaml b/springcloud_demo_on_k8s-master/deploy-file/deploy-eurekaserver.yaml
new file mode 100644
index 0000000..ebc86d4
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/deploy-file/deploy-eurekaserver.yaml
@@ -0,0 +1,60 @@
+---
+apiVersion: apps/v1
+
+kind: Deployment
+
+metadata:
+
+ name: eureka-server
+
+spec:
+
+ selector:
+
+ matchLabels:
+
+ app: spring-boot-app
+
+ replicas: 1
+
+ template:
+
+ metadata:
+
+ labels:
+
+ app: spring-boot-app
+
+ spec:
+
+ containers:
+
+ - name: eureka-server-instance
+
+ image: registry.cn-hangzhou.aliyuncs.com/wooddeep/eureka-server:v3
+
+ ports:
+
+ - containerPort: 8761
+ env:
+ - name: EUREKA_URL
+ value: eureka-server
+
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: eureka-server
+spec:
+ ports:
+ - port: 8761
+ targetPort: 8761
+ name: http
+ selector:
+ app: spring-boot-app
+ type: NodePort
+
+
+
+
diff --git a/springcloud_demo_on_k8s-master/deploy-file/service-api.yaml b/springcloud_demo_on_k8s-master/deploy-file/service-api.yaml
new file mode 100644
index 0000000..59aa0b1
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/deploy-file/service-api.yaml
@@ -0,0 +1,44 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: service-api
+spec:
+ selector:
+ matchLabels:
+ app: springcloud-service-api
+
+ replicas: 1
+
+ template:
+ metadata:
+ labels:
+ app: springcloud-service-api
+ spec:
+ containers:
+ - name: service-api-instance
+ image: registry.cn-hangzhou.aliyuncs.com/wooddeep/service-api:v4.2
+ env:
+ - name: EUREKA_URL
+ value: eureka-server
+ - name: CONFIG_URL
+ value: config-server
+ ports:
+ - containerPort: 8764
+
+
+---
+kind: Service
+apiVersion: v1
+metadata:
+ name: service-api
+spec:
+ selector:
+ app: springcloud-service-api
+ ports:
+ - protocol: TCP
+ port: 8764
+ targetPort: 8764
+ #type: NodePort
+
+
diff --git a/springcloud_demo_on_k8s-master/deploy-file/service-tp.yaml b/springcloud_demo_on_k8s-master/deploy-file/service-tp.yaml
new file mode 100644
index 0000000..53299a1
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/deploy-file/service-tp.yaml
@@ -0,0 +1,42 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: service-tp
+spec:
+ selector:
+ matchLabels:
+ app: springcloud-service-tp
+
+ replicas: 1
+
+ template:
+ metadata:
+ labels:
+ app: springcloud-service-tp
+ spec:
+ containers:
+ - name: service-tp-instance
+ image: registry.cn-hangzhou.aliyuncs.com/wooddeep/service-tp:v3
+ env:
+ - name: EUREKA_URL
+ value: eureka-server
+ ports:
+ - containerPort: 8763
+
+
+---
+kind: Service
+apiVersion: v1
+metadata:
+ name: service-tp
+spec:
+ selector:
+ app: springcloud-service-tp
+ ports:
+ - protocol: TCP
+ port: 8763
+ targetPort: 8763
+ #type: NodePort
+
+
diff --git a/springcloud_demo_on_k8s-master/deploy-file/service-zuul.yaml b/springcloud_demo_on_k8s-master/deploy-file/service-zuul.yaml
new file mode 100644
index 0000000..b27f78c
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/deploy-file/service-zuul.yaml
@@ -0,0 +1,43 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: service-zuul
+spec:
+ selector:
+ matchLabels:
+ app: springcloud-service-zuul
+
+ replicas: 1
+
+ template:
+ metadata:
+ labels:
+ app: springcloud-service-zuul
+ spec:
+ containers:
+ - name: service-zuul-instance
+ image: registry.cn-hangzhou.aliyuncs.com/magiclian/service-zuul:v3
+ env:
+ - name: EUREKA_URL
+ value: eureka-server
+ ports:
+ - containerPort: 8762
+
+
+---
+kind: Service
+apiVersion: v1
+metadata:
+ name: service-zuul
+spec:
+ selector:
+ app: springcloud-service-zuul
+ ports:
+ - protocol: TCP
+ port: 8762
+ targetPort: 8762
+ type: NodePort
+
+
+
diff --git a/springcloud_demo_on_k8s-master/eureka-server/.gitignore b/springcloud_demo_on_k8s-master/eureka-server/.gitignore
new file mode 100644
index 0000000..c456c4a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/eureka-server/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
diff --git a/springcloud_demo_on_k8s-master/eureka-server/.mvn/wrapper/maven-wrapper.jar b/springcloud_demo_on_k8s-master/eureka-server/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..01e6799
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/eureka-server/.mvn/wrapper/maven-wrapper.jar
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/eureka-server/.mvn/wrapper/maven-wrapper.properties b/springcloud_demo_on_k8s-master/eureka-server/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..7179346
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/eureka-server/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
diff --git a/springcloud_demo_on_k8s-master/eureka-server/mvnw b/springcloud_demo_on_k8s-master/eureka-server/mvnw
new file mode 100644
index 0000000..5551fde
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/eureka-server/mvnw
@@ -0,0 +1,286 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+ # TODO classpath?
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ wget "$jarUrl" -O "$wrapperJarPath"
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ curl -o "$wrapperJarPath" "$jarUrl"
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/springcloud_demo_on_k8s-master/eureka-server/mvnw.cmd b/springcloud_demo_on_k8s-master/eureka-server/mvnw.cmd
new file mode 100644
index 0000000..e5cfb0a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/eureka-server/mvnw.cmd
@@ -0,0 +1,161 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ echo Found %WRAPPER_JAR%
+) else (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
+ echo Finished downloading %WRAPPER_JAR%
+)
+@REM End of extension
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/springcloud_demo_on_k8s-master/eureka-server/pom.xml b/springcloud_demo_on_k8s-master/eureka-server/pom.xml
new file mode 100644
index 0000000..1e280e0
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/eureka-server/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>2.0.3.RELEASE</version>
+ <relativePath/>
+ </parent>
+ <groupId>com.springcloudme</groupId>
+ <artifactId>eureka-server</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>eureka-server</name>
+ <description>Demo project for Spring Boot</description>
+
+ <properties>
+ <java.version>1.8</java.version>
+ <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-dependencies</artifactId>
+ <version>${spring-cloud.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>1.2.0</version>
+ <configuration>
+ <imageName>registry.cn-hangzhou.aliyuncs.com/wooddeep/eureka-server:v3</imageName>
+ <serverId>my-docker-registry</serverId>
+ <baseImage>java</baseImage>
+ <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
+ <resources>
+ <resource>
+ <targetPath>/</targetPath>
+ <directory>${project.build.directory}</directory>
+ <include>${project.build.finalName}.jar</include>
+ </resource>
+ </resources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>spring-milestones</id>
+ <name>Spring Milestones</name>
+ <url>https://repo.spring.io/milestone</url>
+ </repository>
+ </repositories>
+
+</project>
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/eureka-server/src/main/java/com/springcloudme/eurekaserver/EurekaServerApplication.java b/springcloud_demo_on_k8s-master/eureka-server/src/main/java/com/springcloudme/eurekaserver/EurekaServerApplication.java
new file mode 100644
index 0000000..1754e7e
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/eureka-server/src/main/java/com/springcloudme/eurekaserver/EurekaServerApplication.java
@@ -0,0 +1,16 @@
+package com.springcloudme.eurekaserver;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
+
+@SpringBootApplication
+@EnableEurekaServer
+public class EurekaServerApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(EurekaServerApplication.class, args);
+ }
+
+}
+
diff --git a/springcloud_demo_on_k8s-master/eureka-server/src/main/resources/application.yml b/springcloud_demo_on_k8s-master/eureka-server/src/main/resources/application.yml
new file mode 100644
index 0000000..23aa116
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/eureka-server/src/main/resources/application.yml
@@ -0,0 +1,14 @@
+server:
+ port: 8761
+
+eureka:
+ instance:
+ hostname: eureka-server
+ preferIpAddress: true
+ client:
+ registerWithEureka: false
+ fetchRegistry: false
+ serviceUrl:
+ defaultZone: http://${EUREKA_URL:localhost}:${server.port}/eureka/
+ server:
+ enable-self-preservation: false
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/eureka-server/src/test/java/com/springcloudme/eurekaserver/EurekaServerApplicationTests.java b/springcloud_demo_on_k8s-master/eureka-server/src/test/java/com/springcloudme/eurekaserver/EurekaServerApplicationTests.java
new file mode 100644
index 0000000..a388a14
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/eureka-server/src/test/java/com/springcloudme/eurekaserver/EurekaServerApplicationTests.java
@@ -0,0 +1,17 @@
+package com.springcloudme.eurekaserver;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class EurekaServerApplicationTests {
+
+ @Test
+ public void contextLoads() {
+ }
+
+}
+
diff --git a/springcloud_demo_on_k8s-master/mvnw b/springcloud_demo_on_k8s-master/mvnw
new file mode 100644
index 0000000..5551fde
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/mvnw
@@ -0,0 +1,286 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+ # TODO classpath?
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ wget "$jarUrl" -O "$wrapperJarPath"
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ curl -o "$wrapperJarPath" "$jarUrl"
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/springcloud_demo_on_k8s-master/mvnw.cmd b/springcloud_demo_on_k8s-master/mvnw.cmd
new file mode 100644
index 0000000..e5cfb0a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/mvnw.cmd
@@ -0,0 +1,161 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ echo Found %WRAPPER_JAR%
+) else (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
+ echo Finished downloading %WRAPPER_JAR%
+)
+@REM End of extension
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/springcloud_demo_on_k8s-master/pom.xml b/springcloud_demo_on_k8s-master/pom.xml
new file mode 100644
index 0000000..109d9d0
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>2.1.2.RELEASE</version>
+ <relativePath/> <!-- lookup parent from repository -->
+ </parent>
+ <groupId>com.springcloudme</groupId>
+ <artifactId>springcloudme</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>springcloudme</name>
+ <description>Demo project for Spring Cloud</description>
+ <packaging>pom</packaging>
+ <modules>
+ <module>eureka-server</module>
+ <module>service-zuul</module>
+ <module>service-tp</module>
+ <module>service-influxdb-app</module>
+ <module>service-api</module>
+ <module>config-server</module>
+ </modules>
+
+ <properties>
+ <java.version>1.8</java.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/springcloud_demo_on_k8s-master/service-api/.gitignore b/springcloud_demo_on_k8s-master/service-api/.gitignore
new file mode 100644
index 0000000..c456c4a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-api/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
diff --git a/springcloud_demo_on_k8s-master/service-api/.mvn/wrapper/maven-wrapper.jar b/springcloud_demo_on_k8s-master/service-api/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..01e6799
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-api/.mvn/wrapper/maven-wrapper.jar
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-api/.mvn/wrapper/maven-wrapper.properties b/springcloud_demo_on_k8s-master/service-api/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..7179346
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-api/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
diff --git a/springcloud_demo_on_k8s-master/service-api/mvnw b/springcloud_demo_on_k8s-master/service-api/mvnw
new file mode 100644
index 0000000..5551fde
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-api/mvnw
@@ -0,0 +1,286 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+ # TODO classpath?
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ wget "$jarUrl" -O "$wrapperJarPath"
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ curl -o "$wrapperJarPath" "$jarUrl"
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/springcloud_demo_on_k8s-master/service-api/mvnw.cmd b/springcloud_demo_on_k8s-master/service-api/mvnw.cmd
new file mode 100644
index 0000000..e5cfb0a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-api/mvnw.cmd
@@ -0,0 +1,161 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ echo Found %WRAPPER_JAR%
+) else (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
+ echo Finished downloading %WRAPPER_JAR%
+)
+@REM End of extension
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/springcloud_demo_on_k8s-master/service-api/pom.xml b/springcloud_demo_on_k8s-master/service-api/pom.xml
new file mode 100644
index 0000000..745af07
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-api/pom.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>2.0.3.RELEASE</version>
+ <relativePath/> <!-- lookup parent from repository -->
+ </parent>
+ <groupId>com.springcloud</groupId>
+ <artifactId>service-api</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>service-api</name>
+ <description>Demo project for Spring Boot</description>
+
+ <properties>
+ <java.version>1.8</java.version>
+ <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-config</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-bus-amqp</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+ </dependencies>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-dependencies</artifactId>
+ <version>${spring-cloud.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>1.2.0</version>
+ <configuration>
+ <imageName>registry.cn-hangzhou.aliyuncs.com/wooddeep/service-api:v4.2</imageName>
+ <serverId>my-docker-registry</serverId>
+ <baseImage>java</baseImage>
+ <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
+ <resources>
+ <resource>
+ <targetPath>/</targetPath>
+ <directory>${project.build.directory}</directory>
+ <include>${project.build.finalName}.jar</include>
+ </resource>
+ </resources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>spring-milestones</id>
+ <name>Spring Milestones</name>
+ <url>https://repo.spring.io/milestone</url>
+ </repository>
+ </repositories>
+
+</project>
diff --git a/springcloud_demo_on_k8s-master/service-api/src/main/java/com/springcloud/serviceapi/ServiceApiApplication.java b/springcloud_demo_on_k8s-master/service-api/src/main/java/com/springcloud/serviceapi/ServiceApiApplication.java
new file mode 100644
index 0000000..bb4b77b
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-api/src/main/java/com/springcloud/serviceapi/ServiceApiApplication.java
@@ -0,0 +1,15 @@
+package com.springcloud.serviceapi;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+
+@SpringBootApplication
+@EnableEurekaClient
+public class ServiceApiApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(ServiceApiApplication.class, args);
+ }
+}
+
diff --git a/springcloud_demo_on_k8s-master/service-api/src/main/java/com/springcloud/serviceapi/controller/ApiController.java b/springcloud_demo_on_k8s-master/service-api/src/main/java/com/springcloud/serviceapi/controller/ApiController.java
new file mode 100644
index 0000000..9ee9cb0
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-api/src/main/java/com/springcloud/serviceapi/controller/ApiController.java
@@ -0,0 +1,29 @@
+package com.springcloud.serviceapi.controller;
+
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RefreshScope
+@RequestMapping("/user")
+public class ApiController {
+
+ @RequestMapping("/me")
+ public String showme(){
+ return "I'm in! new Api server";
+ }
+
+ @Value("${common.db_driver}")
+ String db_driver;
+
+ @RequestMapping(value = "/hi")
+ public String hi(){
+ return db_driver;
+ }
+
+
+
+}
diff --git a/springcloud_demo_on_k8s-master/service-api/src/main/resources/application.yml b/springcloud_demo_on_k8s-master/service-api/src/main/resources/application.yml
new file mode 100644
index 0000000..f981dff
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-api/src/main/resources/application.yml
@@ -0,0 +1,19 @@
+server:
+ port: 8764
+
+eureka:
+ instance:
+ preferIpAddress: true
+ client:
+ serviceUrl:
+ defaultZone: http://${EUREKA_URL:localhost}:8761/eureka
+
+spring:
+ application:
+ name: service-api
+
+ #rabbitmq:
+ # host: ${RABBITMQ_HOST:172.26.144.132}
+ # port: ${RABBITMQ_PORT:5672}
+ # username: guest
+ # password: guest
diff --git a/springcloud_demo_on_k8s-master/service-api/src/main/resources/bootstrap.properties b/springcloud_demo_on_k8s-master/service-api/src/main/resources/bootstrap.properties
new file mode 100644
index 0000000..941613c
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-api/src/main/resources/bootstrap.properties
@@ -0,0 +1,17 @@
+# curl http://127.0.0.1:8765/custom-config/dev -- 登录到 config-server 中获取 配置
+
+spring.cloud.config.label=master
+spring.cloud.config.name=custom-config
+spring.cloud.config.profile=${CONFIG_PROFILE:dev}
+spring.cloud.config.uri= http://${CONFIG_URL:localhost}:8765/
+
+#bus总线配置
+management.endpoints.web.exposure.include=bus-refresh
+spring.cloud.bus.enabled=true
+spring.cloud.bus.trace.enabled =true
+
+#rabbitmq配置
+spring.rabbitmq.host=172.26.144.132
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=guest
+spring.rabbitmq.password=guest
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-api/src/test/java/com/springcloud/serviceapi/ServiceApiApplicationTests.java b/springcloud_demo_on_k8s-master/service-api/src/test/java/com/springcloud/serviceapi/ServiceApiApplicationTests.java
new file mode 100644
index 0000000..76bf818
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-api/src/test/java/com/springcloud/serviceapi/ServiceApiApplicationTests.java
@@ -0,0 +1,17 @@
+package com.springcloud.serviceapi;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class ServiceApiApplicationTests {
+
+ @Test
+ public void contextLoads() {
+ }
+
+}
+
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/.gitignore b/springcloud_demo_on_k8s-master/service-influxdb-app/.gitignore
new file mode 100644
index 0000000..c456c4a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/.mvn/wrapper/MavenWrapperDownloader.java b/springcloud_demo_on_k8s-master/service-influxdb-app/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 0000000..8737acd
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,114 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+ /**
+ * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+ */
+ private static final String DEFAULT_DOWNLOAD_URL =
+ "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";
+
+ /**
+ * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+ * use instead of the default one.
+ */
+ private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+ ".mvn/wrapper/maven-wrapper.properties";
+
+ /**
+ * Path where the maven-wrapper.jar will be saved to.
+ */
+ private static final String MAVEN_WRAPPER_JAR_PATH =
+ ".mvn/wrapper/maven-wrapper.jar";
+
+ /**
+ * Name of the property which should be used to override the default download url for the wrapper.
+ */
+ private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+ public static void main(String args[]) {
+ System.out.println("- Downloader started");
+ File baseDirectory = new File(args[0]);
+ System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+ // If the maven-wrapper.properties exists, read it and check if it contains a custom
+ // wrapperUrl parameter.
+ File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+ String url = DEFAULT_DOWNLOAD_URL;
+ if (mavenWrapperPropertyFile.exists()) {
+ FileInputStream mavenWrapperPropertyFileInputStream = null;
+ try {
+ mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+ Properties mavenWrapperProperties = new Properties();
+ mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+ url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+ } catch (IOException e) {
+ System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+ } finally {
+ try {
+ if (mavenWrapperPropertyFileInputStream != null) {
+ mavenWrapperPropertyFileInputStream.close();
+ }
+ } catch (IOException e) {
+ // Ignore ...
+ }
+ }
+ }
+ System.out.println("- Downloading from: : " + url);
+
+ File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+ if (!outputFile.getParentFile().exists()) {
+ if (!outputFile.getParentFile().mkdirs()) {
+ System.out.println(
+ "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+ }
+ }
+ System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+ try {
+ downloadFileFromURL(url, outputFile);
+ System.out.println("Done");
+ System.exit(0);
+ } catch (Throwable e) {
+ System.out.println("- Error downloading");
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+ private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+ URL website = new URL(urlString);
+ ReadableByteChannel rbc;
+ rbc = Channels.newChannel(website.openStream());
+ FileOutputStream fos = new FileOutputStream(destination);
+ fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+ fos.close();
+ rbc.close();
+ }
+
+}
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/.mvn/wrapper/maven-wrapper.jar b/springcloud_demo_on_k8s-master/service-influxdb-app/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..01e6799
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/.mvn/wrapper/maven-wrapper.jar
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/.mvn/wrapper/maven-wrapper.properties b/springcloud_demo_on_k8s-master/service-influxdb-app/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..cd0d451
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/mvnw b/springcloud_demo_on_k8s-master/service-influxdb-app/mvnw
new file mode 100644
index 0000000..5551fde
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/mvnw
@@ -0,0 +1,286 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+ # TODO classpath?
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ wget "$jarUrl" -O "$wrapperJarPath"
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ curl -o "$wrapperJarPath" "$jarUrl"
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/mvnw.cmd b/springcloud_demo_on_k8s-master/service-influxdb-app/mvnw.cmd
new file mode 100644
index 0000000..e5cfb0a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/mvnw.cmd
@@ -0,0 +1,161 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ echo Found %WRAPPER_JAR%
+) else (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
+ echo Finished downloading %WRAPPER_JAR%
+)
+@REM End of extension
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/pom.xml b/springcloud_demo_on_k8s-master/service-influxdb-app/pom.xml
new file mode 100644
index 0000000..bbed2e7
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/pom.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>2.0.3.RELEASE</version>
+ <relativePath/>
+ </parent>
+ <groupId>com.springcloudme</groupId>
+ <artifactId>service-influxdb-app</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>service-influxdb-app</name>
+ <description>Demo project for Spring Boot</description>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <java.version>1.8</java.version>
+ <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.influxdb</groupId>
+ <artifactId>influxdb-java</artifactId>
+ <version>2.8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-freemarker</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ </dependency>
+ </dependencies>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-dependencies</artifactId>
+ <version>${spring-cloud.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+
+
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>1.2.0</version>
+ <configuration>
+ <imageName>registry.cn-hangzhou.aliyuncs.com/wooddeep/service-influxdb-app:v4</imageName>
+ <serverId>my-docker-registry</serverId>
+ <baseImage>java</baseImage>
+ <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
+ <resources>
+ <resource>
+ <targetPath>/</targetPath>
+ <directory>${project.build.directory}</directory>
+ <include>${project.build.finalName}.jar</include>
+ </resource>
+ </resources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/java/com/springcloudme/serviceinfluxdbapp/ServiceInfluxdbAppApplication.java b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/java/com/springcloudme/serviceinfluxdbapp/ServiceInfluxdbAppApplication.java
new file mode 100644
index 0000000..93dfa9e
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/java/com/springcloudme/serviceinfluxdbapp/ServiceInfluxdbAppApplication.java
@@ -0,0 +1,18 @@
+package com.springcloudme.serviceinfluxdbapp;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+
+@SpringBootApplication
+@ServletComponentScan
+@EnableEurekaClient
+public class ServiceInfluxdbAppApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(ServiceInfluxdbAppApplication.class, args);
+ }
+
+}
+
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/java/com/springcloudme/serviceinfluxdbapp/controller/ApiController.java b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/java/com/springcloudme/serviceinfluxdbapp/controller/ApiController.java
new file mode 100644
index 0000000..6e3d4f4
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/java/com/springcloudme/serviceinfluxdbapp/controller/ApiController.java
@@ -0,0 +1,14 @@
+package com.springcloudme.serviceinfluxdbapp.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/user")
+public class ApiController {
+
+ @RequestMapping("/me")
+ public String me(){
+ return "aaaaaaaaa";
+ }
+}
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/java/com/springcloudme/serviceinfluxdbapp/controller/InfluxdbController.java b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/java/com/springcloudme/serviceinfluxdbapp/controller/InfluxdbController.java
new file mode 100644
index 0000000..17ca2bb
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/java/com/springcloudme/serviceinfluxdbapp/controller/InfluxdbController.java
@@ -0,0 +1,37 @@
+package com.springcloudme.serviceinfluxdbapp.controller;
+
+import com.springcloudme.serviceinfluxdbapp.utils.InfluxDBUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+@RestController
+@RequestMapping("/influxdb")
+public class InfluxdbController {
+
+ private static Logger log = LoggerFactory.getLogger(InfluxdbController.class);
+
+ @RequestMapping("/queryUI")
+ public ModelAndView queryUI(){
+ ModelAndView mav = new ModelAndView();
+ mav.setViewName("query");
+ return mav;
+ }
+
+ @RequestMapping("/query")
+ public Object query(@RequestParam String sql){
+ log.info("in /influxdb/query");
+ InfluxDBUtils utils= InfluxDBUtils.getInfluxDBUtil();
+ return utils.query(utils.getInstance(),sql);
+ }
+
+ @RequestMapping("/insert")
+ public Object insert(){
+ log.info("in /influxdb/query");
+ InfluxDBUtils utils= InfluxDBUtils.getInfluxDBUtil();
+ return utils.insert(utils.getInstance());
+ }
+}
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/java/com/springcloudme/serviceinfluxdbapp/utils/InfluxDBUtils.java b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/java/com/springcloudme/serviceinfluxdbapp/utils/InfluxDBUtils.java
new file mode 100644
index 0000000..edf5552
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/java/com/springcloudme/serviceinfluxdbapp/utils/InfluxDBUtils.java
@@ -0,0 +1,135 @@
+package com.springcloudme.serviceinfluxdbapp.utils;
+
+import org.influxdb.InfluxDB;
+import org.influxdb.InfluxDBFactory;
+import org.influxdb.dto.Point;
+import org.influxdb.dto.Query;
+import org.influxdb.dto.QueryResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+@Component
+public class InfluxDBUtils {
+
+ private static Logger log = LoggerFactory.getLogger(InfluxDBUtils.class);
+
+ private static String host;
+
+ private static String port;
+
+ private static String uri;
+
+ private static String db;
+
+ private static String username;
+
+ private static String password;
+
+ private InfluxDB instance1;
+
+ @Autowired
+ InfluxDBUtils(@Value("${influxdb.host}") String host,@Value("${influxdb.port}") String port,
+ @Value("${influxdb.uri}") String uri,@Value("${influxdb.db}") String db,
+ @Value("${influxdb.username}") String username,@Value("${influxdb.password}") String password){
+ this.host = host;
+ this.port = port;
+ this.uri = uri;
+ this.db = db;
+ this.username = username;
+ this.password = password;
+ }
+
+ private static InfluxDBUtils utilInstance = new InfluxDBUtils(host,port,uri,db, username, password);
+
+ public static InfluxDBUtils getInfluxDBUtil() {
+ return utilInstance;
+ }
+
+
+ public InfluxDB getInstance(){
+ if(instance1 == null){
+ return connect();
+ }else {
+ return instance1;
+ }
+ }
+
+ public Map<String,Object> insert(InfluxDB instance){
+ log.info("in util exec");
+ log.info("host="+host+",port="+port+",db="+db+",password="+password+",user="+username+",uri="+uri);
+
+ Map<String,Object> result = new HashMap<>();
+ try {
+ String rpName = "aRetentionPolicy";
+ instance.createRetentionPolicy(rpName, db, "30d", "30m", 2, true);
+
+ Point point2 = Point.measurement("disk")
+ .time(System.currentTimeMillis(), TimeUnit.MILLISECONDS)
+ .addField("used", 80L)
+ .addField("free", 1L)
+ .build();
+
+ log.info("instance",instance);
+
+ instance.write(db,rpName , point2);
+
+ result.put("result",null);
+
+ return result;
+ }catch (Exception e){
+ e.printStackTrace();
+ result.put("result",e.getMessage());
+ return result;
+ }finally {
+ close();
+ }
+ }
+
+ public Map<String,Object> query(InfluxDB instance, String sql){
+ log.info("in util exec");
+ log.info("host="+host+",port="+port+",db="+db+",password="+password+",user="+username+",uri="+uri);
+
+ Map<String,Object> result = new HashMap<>();
+ try {
+ String rpName = "aRetentionPolicy";
+ instance.createRetentionPolicy(rpName, db, "30d", "30m", 2, true);
+ Query query = new Query(sql,db);
+
+ QueryResult query1 = instance.query(query);
+
+ result.put("result",query1);
+ return result;
+ }catch (Exception e){
+ e.printStackTrace();
+ result.put("result",e.getMessage());
+ return result;
+ }finally {
+ close();
+ }
+ }
+
+ private InfluxDB connect(){
+ try {
+ return InfluxDBFactory.connect(uri,username,password);
+ }catch (Exception e){
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ private void close(){
+ try {
+ InfluxDB instance = getInstance();
+ instance.close();
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/application.yml b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/application.yml
new file mode 100644
index 0000000..90330d1
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/application.yml
@@ -0,0 +1,33 @@
+server:
+ port: 8112
+
+spring:
+ application:
+ name: service-influxdb-app
+ resources:
+ static-locations: classpath:/static
+ freemarker:
+ template-loader-path: classpath:/static
+ cache: false
+ charset: utf-8
+ check-template-location: true
+ content-type: text/html
+ expose-request-attributes: false
+ expose-session-attributes: false
+ request-context-attribute: request
+ suffix: .html
+
+eureka:
+ instance:
+ preferIpAddress: true
+ client:
+ serviceUrl:
+ defaultZone: http://${EUREKA_URL:localhost}:8761/eureka
+
+influxdb:
+ host: ${INFLUXDB_HOST:172.21.81.42}
+ port: ${INFLUXDB_PORT:31639}
+ uri: ${INFLUXDB_URI:http://172.21.81.42:31639}
+ db: ${INFLUXDB_DB:lz}
+ username: ${INFLUXDB_USERNAME:u1}
+ password: ${INFLUXDB_PASSWORD:GAN68rfhzvvNSmdGAAWeR9JgC}
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/js/jquery.min.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/js/jquery.min.js
new file mode 100644
index 0000000..006e953
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/js/jquery.min.js
@@ -0,0 +1,5 @@
+/*! jQuery v1.9.1 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license
+//@ sourceMappingURL=jquery.min.map
+*/(function(e,t){var n,r,i=typeof t,o=e.document,a=e.location,s=e.jQuery,u=e.$,l={},c=[],p="1.9.1",f=c.concat,d=c.push,h=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,b=function(e,t){return new b.fn.init(e,t,r)},x=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^[\],:{}\s]*$/,E=/(?:^|:|,)(?:\s*\[)+/g,S=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,j=/^-ms-/,D=/-([\da-z])/gi,L=function(e,t){return t.toUpperCase()},H=function(e){(o.addEventListener||"load"===e.type||"complete"===o.readyState)&&(q(),b.ready())},q=function(){o.addEventListener?(o.removeEventListener("DOMContentLoaded",H,!1),e.removeEventListener("load",H,!1)):(o.detachEvent("onreadystatechange",H),e.detachEvent("onload",H))};b.fn=b.prototype={jquery:p,constructor:b,init:function(e,n,r){var i,a;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof b?n[0]:n,b.merge(this,b.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,!0)),C.test(i[1])&&b.isPlainObject(n))for(i in n)b.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(a=o.getElementById(i[2]),a&&a.parentNode){if(a.id!==i[2])return r.find(e);this.length=1,this[0]=a}return this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):b.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),b.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return h.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=b.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return b.each(this,e,t)},ready:function(e){return b.ready.promise().done(e),this},slice:function(){return this.pushStack(h.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(b.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:d,sort:[].sort,splice:[].splice},b.fn.init.prototype=b.fn,b.extend=b.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||b.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(o=arguments[u]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(b.isPlainObject(r)||(n=b.isArray(r)))?(n?(n=!1,a=e&&b.isArray(e)?e:[]):a=e&&b.isPlainObject(e)?e:{},s[i]=b.extend(c,a,r)):r!==t&&(s[i]=r));return s},b.extend({noConflict:function(t){return e.$===b&&(e.$=u),t&&e.jQuery===b&&(e.jQuery=s),b},isReady:!1,readyWait:1,holdReady:function(e){e?b.readyWait++:b.ready(!0)},ready:function(e){if(e===!0?!--b.readyWait:!b.isReady){if(!o.body)return setTimeout(b.ready);b.isReady=!0,e!==!0&&--b.readyWait>0||(n.resolveWith(o,[b]),b.fn.trigger&&b(o).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===b.type(e)},isArray:Array.isArray||function(e){return"array"===b.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==b.type(e)||e.nodeType||b.isWindow(e))return!1;try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||y.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=b.buildFragment([e],t,i),i&&b(i).remove(),b.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=b.trim(n),n&&k.test(n.replace(S,"@").replace(A,"]").replace(E,"")))?Function("return "+n)():(b.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||b.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&b.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(j,"ms-").replace(D,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:v&&!v.call("\ufeff\u00a0")?function(e){return null==e?"":v.call(e)}:function(e){return null==e?"":(e+"").replace(T,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?b.merge(n,"string"==typeof e?[e]:e):d.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(g)return g.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return f.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),b.isFunction(e)?(r=h.call(arguments,2),i=function(){return e.apply(n||this,r.concat(h.call(arguments)))},i.guid=e.guid=e.guid||b.guid++,i):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===b.type(r)){o=!0;for(u in r)b.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,b.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(b(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),b.ready.promise=function(t){if(!n)if(n=b.Deferred(),"complete"===o.readyState)setTimeout(b.ready);else if(o.addEventListener)o.addEventListener("DOMContentLoaded",H,!1),e.addEventListener("load",H,!1);else{o.attachEvent("onreadystatechange",H),e.attachEvent("onload",H);var r=!1;try{r=null==e.frameElement&&o.documentElement}catch(i){}r&&r.doScroll&&function a(){if(!b.isReady){try{r.doScroll("left")}catch(e){return setTimeout(a,50)}q(),b.ready()}}()}return n.promise(t)},b.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=b.type(e);return b.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=b(o);var _={};function F(e){var t=_[e]={};return b.each(e.match(w)||[],function(e,n){t[n]=!0}),t}b.Callbacks=function(e){e="string"==typeof e?_[e]||F(e):b.extend({},e);var n,r,i,o,a,s,u=[],l=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=u.length,n=!0;u&&o>a;a++)if(u[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,u&&(l?l.length&&c(l.shift()):r?u=[]:p.disable())},p={add:function(){if(u){var t=u.length;(function i(t){b.each(t,function(t,n){var r=b.type(n);"function"===r?e.unique&&p.has(n)||u.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=u.length:r&&(s=t,c(r))}return this},remove:function(){return u&&b.each(arguments,function(e,t){var r;while((r=b.inArray(t,u,r))>-1)u.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?b.inArray(e,u)>-1:!(!u||!u.length)},empty:function(){return u=[],this},disable:function(){return u=l=r=t,this},disabled:function(){return!u},lock:function(){return l=t,r||p.disable(),this},locked:function(){return!l},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!u||i&&!l||(n?l.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},b.extend({Deferred:function(e){var t=[["resolve","done",b.Callbacks("once memory"),"resolved"],["reject","fail",b.Callbacks("once memory"),"rejected"],["notify","progress",b.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return b.Deferred(function(n){b.each(t,function(t,o){var a=o[0],s=b.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&b.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?b.extend(e,r):r}},i={};return r.pipe=r.then,b.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=h.call(arguments),r=n.length,i=1!==r||e&&b.isFunction(e.promise)?r:0,o=1===i?e:b.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?h.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,u,l;if(r>1)for(s=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&b.isFunction(n[t].promise)?n[t].promise().done(a(t,l,n)).fail(o.reject).progress(a(t,u,s)):--i;return i||o.resolveWith(l,n),o.promise()}}),b.support=function(){var t,n,r,a,s,u,l,c,p,f,d=o.createElement("div");if(d.setAttribute("className","t"),d.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*"),r=d.getElementsByTagName("a")[0],!n||!r||!n.length)return{};s=o.createElement("select"),l=s.appendChild(o.createElement("option")),a=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={getSetAttribute:"t"!==d.className,leadingWhitespace:3===d.firstChild.nodeType,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:"/a"===r.getAttribute("href"),opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:!!a.value,optSelected:l.selected,enctype:!!o.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==o.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===o.compatMode,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},a.checked=!0,t.noCloneChecked=a.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!l.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}a=o.createElement("input"),a.setAttribute("value",""),t.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),t.radioValue="t"===a.value,a.setAttribute("checked","t"),a.setAttribute("name","t"),u=o.createDocumentFragment(),u.appendChild(a),t.appendChecked=a.checked,t.checkClone=u.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;return d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip,b(function(){var n,r,a,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",u=o.getElementsByTagName("body")[0];u&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",u.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",a=d.getElementsByTagName("td"),a[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===a[0].offsetHeight,a[0].style.display="",a[1].style.display="none",t.reliableHiddenOffsets=p&&0===a[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=4===d.offsetWidth,t.doesNotIncludeMarginInBodyOffset=1!==u.offsetTop,e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(o.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(u.style.zoom=1)),u.removeChild(n),n=d=a=r=null)}),n=s=u=l=r=a=null,t}();var O=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,B=/([A-Z])/g;function P(e,n,r,i){if(b.acceptData(e)){var o,a,s=b.expando,u="string"==typeof n,l=e.nodeType,p=l?b.cache:e,f=l?e[s]:e[s]&&s;if(f&&p[f]&&(i||p[f].data)||!u||r!==t)return f||(l?e[s]=f=c.pop()||b.guid++:f=s),p[f]||(p[f]={},l||(p[f].toJSON=b.noop)),("object"==typeof n||"function"==typeof n)&&(i?p[f]=b.extend(p[f],n):p[f].data=b.extend(p[f].data,n)),o=p[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[b.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[b.camelCase(n)])):a=o,a}}function R(e,t,n){if(b.acceptData(e)){var r,i,o,a=e.nodeType,s=a?b.cache:e,u=a?e[b.expando]:b.expando;if(s[u]){if(t&&(o=n?s[u]:s[u].data)){b.isArray(t)?t=t.concat(b.map(t,b.camelCase)):t in o?t=[t]:(t=b.camelCase(t),t=t in o?[t]:t.split(" "));for(r=0,i=t.length;i>r;r++)delete o[t[r]];if(!(n?$:b.isEmptyObject)(o))return}(n||(delete s[u].data,$(s[u])))&&(a?b.cleanData([e],!0):b.support.deleteExpando||s!=s.window?delete s[u]:s[u]=null)}}}b.extend({cache:{},expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?b.cache[e[b.expando]]:e[b.expando],!!e&&!$(e)},data:function(e,t,n){return P(e,t,n)},removeData:function(e,t){return R(e,t)},_data:function(e,t,n){return P(e,t,n,!0)},_removeData:function(e,t){return R(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&b.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),b.fn.extend({data:function(e,n){var r,i,o=this[0],a=0,s=null;if(e===t){if(this.length&&(s=b.data(o),1===o.nodeType&&!b._data(o,"parsedAttrs"))){for(r=o.attributes;r.length>a;a++)i=r[a].name,i.indexOf("data-")||(i=b.camelCase(i.slice(5)),W(o,i,s[i]));b._data(o,"parsedAttrs",!0)}return s}return"object"==typeof e?this.each(function(){b.data(this,e)}):b.access(this,function(n){return n===t?o?W(o,e,b.data(o,e)):null:(this.each(function(){b.data(this,e,n)}),t)},null,n,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){b.removeData(this,e)})}});function W(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(B,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:O.test(r)?b.parseJSON(r):r}catch(o){}b.data(e,n,r)}else r=t}return r}function $(e){var t;for(t in e)if(("data"!==t||!b.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}b.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=b._data(e,n),r&&(!i||b.isArray(r)?i=b._data(e,n,b.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=b.queue(e,t),r=n.length,i=n.shift(),o=b._queueHooks(e,t),a=function(){b.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return b._data(e,n)||b._data(e,n,{empty:b.Callbacks("once memory").add(function(){b._removeData(e,t+"queue"),b._removeData(e,n)})})}}),b.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?b.queue(this[0],e):n===t?this:this.each(function(){var t=b.queue(this,e,n);b._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&b.dequeue(this,e)})},dequeue:function(e){return this.each(function(){b.dequeue(this,e)})},delay:function(e,t){return e=b.fx?b.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=b.Deferred(),a=this,s=this.length,u=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=b._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(u));return u(),o.promise(n)}});var I,z,X=/[\t\r\n]/g,U=/\r/g,V=/^(?:input|select|textarea|button|object)$/i,Y=/^(?:a|area)$/i,J=/^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,G=/^(?:checked|selected)$/i,Q=b.support.getSetAttribute,K=b.support.input;b.fn.extend({attr:function(e,t){return b.access(this,b.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){b.removeAttr(this,e)})},prop:function(e,t){return b.access(this,b.prop,e,t,arguments.length>1)},removeProp:function(e){return e=b.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,u="string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=b.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,u=0===arguments.length||"string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?b.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return b.isFunction(e)?this.each(function(n){b(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=b(this),u=t,l=e.match(w)||[];while(o=l[a++])u=r?u:!s.hasClass(o),s[u?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&b._data(this,"__className__",this.className),this.className=this.className||e===!1?"":b._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(X," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=b.isFunction(e),this.each(function(n){var o,a=b(this);1===this.nodeType&&(o=i?e.call(this,n,a.val()):e,null==o?o="":"number"==typeof o?o+="":b.isArray(o)&&(o=b.map(o,function(e){return null==e?"":e+""})),r=b.valHooks[this.type]||b.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=b.valHooks[o.type]||b.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(U,""):null==n?"":n)}}}),b.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,u=0>i?s:o?i:0;for(;s>u;u++)if(n=r[u],!(!n.selected&&u!==i||(b.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&b.nodeName(n.parentNode,"optgroup"))){if(t=b(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n=b.makeArray(t);return b(e).find("option").each(function(){this.selected=b.inArray(b(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attr:function(e,n,r){var o,a,s,u=e.nodeType;if(e&&3!==u&&8!==u&&2!==u)return typeof e.getAttribute===i?b.prop(e,n,r):(a=1!==u||!b.isXMLDoc(e),a&&(n=n.toLowerCase(),o=b.attrHooks[n]||(J.test(n)?z:I)),r===t?o&&a&&"get"in o&&null!==(s=o.get(e,n))?s:(typeof e.getAttribute!==i&&(s=e.getAttribute(n)),null==s?t:s):null!==r?o&&a&&"set"in o&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r):(b.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=b.propFix[n]||n,J.test(n)?!Q&&G.test(n)?e[b.camelCase("default-"+n)]=e[r]=!1:e[r]=!1:b.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!b.support.radioValue&&"radio"===t&&b.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!b.isXMLDoc(e),a&&(n=b.propFix[n]||n,o=b.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):V.test(e.nodeName)||Y.test(e.nodeName)&&e.href?0:t}}}}),z={get:function(e,n){var r=b.prop(e,n),i="boolean"==typeof r&&e.getAttribute(n),o="boolean"==typeof r?K&&Q?null!=i:G.test(n)?e[b.camelCase("default-"+n)]:!!i:e.getAttributeNode(n);return o&&o.value!==!1?n.toLowerCase():t},set:function(e,t,n){return t===!1?b.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&b.propFix[n]||n,n):e[b.camelCase("default-"+n)]=e[n]=!0,n}},K&&Q||(b.attrHooks.value={get:function(e,n){var r=e.getAttributeNode(n);return b.nodeName(e,"input")?e.defaultValue:r&&r.specified?r.value:t},set:function(e,n,r){return b.nodeName(e,"input")?(e.defaultValue=n,t):I&&I.set(e,n,r)}}),Q||(I=b.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},b.attrHooks.contenteditable={get:I.get,set:function(e,t,n){I.set(e,""===t?!1:t,n)}},b.each(["width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}})})),b.support.hrefNormalized||(b.each(["href","src","width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null==r?t:r}})}),b.each(["href","src"],function(e,t){b.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),b.support.style||(b.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),b.support.optSelected||(b.propHooks.selected=b.extend(b.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),b.support.enctype||(b.propFix.enctype="encoding"),b.support.checkOn||b.each(["radio","checkbox"],function(){b.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),b.each(["radio","checkbox"],function(){b.valHooks[this]=b.extend(b.valHooks[this],{set:function(e,n){return b.isArray(n)?e.checked=b.inArray(b(e).val(),n)>=0:t}})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}b.event={global:{},add:function(e,n,r,o,a){var s,u,l,c,p,f,d,h,g,m,y,v=b._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=b.guid++),(u=v.events)||(u=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof b===i||e&&b.event.triggered===e.type?t:b.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(w)||[""],l=n.length;while(l--)s=rt.exec(n[l])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),p=b.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=b.event.special[g]||{},d=b.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&b.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=u[g])||(h=u[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),b.event.global[g]=!0;e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,p,f,d,h,g,m=b.hasData(e)&&b._data(e);if(m&&(c=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(s=rt.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=b.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));u&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||b.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)b.event.remove(e,d+t[l],n,r,!0);b.isEmptyObject(c)&&(delete m.handle,b._removeData(e,"events"))}},trigger:function(n,r,i,a){var s,u,l,c,p,f,d,h=[i||o],g=y.call(n,"type")?n.type:n,m=y.call(n,"namespace")?n.namespace.split("."):[];if(l=f=i=i||o,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+b.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),u=0>g.indexOf(":")&&"on"+g,n=n[b.expando]?n:new b.Event(g,"object"==typeof n&&n),n.isTrigger=!0,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:b.makeArray(r,[n]),p=b.event.special[g]||{},a||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!a&&!p.noBubble&&!b.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(l=l.parentNode);l;l=l.parentNode)h.push(l),f=l;f===(i.ownerDocument||o)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((l=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(b._data(l,"events")||{})[n.type]&&b._data(l,"handle"),s&&s.apply(l,r),s=u&&l[u],s&&b.acceptData(l)&&s.apply&&s.apply(l,r)===!1&&n.preventDefault();if(n.type=g,!(a||n.isDefaultPrevented()||p._default&&p._default.apply(i.ownerDocument,r)!==!1||"click"===g&&b.nodeName(i,"a")||!b.acceptData(i)||!u||!i[g]||b.isWindow(i))){f=i[u],f&&(i[u]=null),b.event.triggered=g;try{i[g]()}catch(v){}b.event.triggered=t,f&&(i[u]=f)}return n.result}},dispatch:function(e){e=b.event.fix(e);var n,r,i,o,a,s=[],u=h.call(arguments),l=(b._data(this,"events")||{})[e.type]||[],c=b.event.special[e.type]||{};if(u[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=b.event.handlers.call(this,e,l),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((b.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,u),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],u=n.delegateCount,l=e.target;if(u&&l.nodeType&&(!e.button||"click"!==e.type))for(;l!=this;l=l.parentNode||this)if(1===l.nodeType&&(l.disabled!==!0||"click"!==e.type)){for(o=[],a=0;u>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?b(r,this).index(l)>=0:b.find(r,this,null,[l]).length),o[r]&&o.push(i);o.length&&s.push({elem:l,handlers:o})}return n.length>u&&s.push({elem:this,handlers:n.slice(u)}),s},fix:function(e){if(e[b.expando])return e;var t,n,r,i=e.type,a=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new b.Event(a),t=r.length;while(t--)n=r[t],e[n]=a[n];return e.target||(e.target=a.srcElement||o),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,a):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,a,s=n.button,u=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||o,a=i.documentElement,r=i.body,e.pageX=n.clientX+(a&&a.scrollLeft||r&&r.scrollLeft||0)-(a&&a.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(a&&a.scrollTop||r&&r.scrollTop||0)-(a&&a.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&u&&(e.relatedTarget=u===e.target?n.toElement:u),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},click:{trigger:function(){return b.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t}},focus:{trigger:function(){if(this!==o.activeElement&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===o.activeElement&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=b.extend(new b.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?b.event.trigger(i,null,t):b.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},b.removeEvent=o.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},b.Event=function(e,n){return this instanceof b.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&b.extend(this,n),this.timeStamp=e&&e.timeStamp||b.now(),this[b.expando]=!0,t):new b.Event(e,n)},b.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},b.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){b.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;
+return(!i||i!==r&&!b.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),b.support.submitBubbles||(b.event.special.submit={setup:function(){return b.nodeName(this,"form")?!1:(b.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=b.nodeName(n,"input")||b.nodeName(n,"button")?n.form:t;r&&!b._data(r,"submitBubbles")&&(b.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),b._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&b.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return b.nodeName(this,"form")?!1:(b.event.remove(this,"._submit"),t)}}),b.support.changeBubbles||(b.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(b.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),b.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),b.event.simulate("change",this,e,!0)})),!1):(b.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!b._data(t,"changeBubbles")&&(b.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||b.event.simulate("change",this.parentNode,e,!0)}),b._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return b.event.remove(this,"._change"),!Z.test(this.nodeName)}}),b.support.focusinBubbles||b.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){b.event.simulate(t,e.target,b.event.fix(e),!0)};b.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),b.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return b().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=b.guid++)),this.each(function(){b.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,b(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){b.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){b.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?b.event.trigger(e,n,r,!0):t}}),function(e,t){var n,r,i,o,a,s,u,l,c,p,f,d,h,g,m,y,v,x="sizzle"+-new Date,w=e.document,T={},N=0,C=0,k=it(),E=it(),S=it(),A=typeof t,j=1<<31,D=[],L=D.pop,H=D.push,q=D.slice,M=D.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},_="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=F.replace("w","w#"),B="([*^$|!~]?=)",P="\\["+_+"*("+F+")"+_+"*(?:"+B+_+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+O+")|)|)"+_+"*\\]",R=":("+F+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+P.replace(3,8)+")*)|.*)\\)|)",W=RegExp("^"+_+"+|((?:^|[^\\\\])(?:\\\\.)*)"+_+"+$","g"),$=RegExp("^"+_+"*,"+_+"*"),I=RegExp("^"+_+"*([\\x20\\t\\r\\n\\f>+~])"+_+"*"),z=RegExp(R),X=RegExp("^"+O+"$"),U={ID:RegExp("^#("+F+")"),CLASS:RegExp("^\\.("+F+")"),NAME:RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:RegExp("^("+F.replace("w","w*")+")"),ATTR:RegExp("^"+P),PSEUDO:RegExp("^"+R),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+_+"*(even|odd|(([+-]|)(\\d*)n|)"+_+"*(?:([+-]|)"+_+"*(\\d+)|))"+_+"*\\)|)","i"),needsContext:RegExp("^"+_+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+_+"*((?:-\\d)?\\d*)"+_+"*\\)|)(?=[^-]|$)","i")},V=/[\x20\t\r\n\f]*[+~]/,Y=/^[^{]+\{\s*\[native code/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,G=/^(?:input|select|textarea|button)$/i,Q=/^h\d$/i,K=/'|\\/g,Z=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,et=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,tt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{q.call(w.documentElement.childNodes,0)[0].nodeType}catch(nt){q=function(e){var t,n=[];while(t=this[e++])n.push(t);return n}}function rt(e){return Y.test(e+"")}function it(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>i.cacheLength&&delete e[t.shift()],e[n]=r}}function ot(e){return e[x]=!0,e}function at(e){var t=p.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}}function st(e,t,n,r){var i,o,a,s,u,l,f,g,m,v;if((t?t.ownerDocument||t:w)!==p&&c(t),t=t||p,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(!d&&!r){if(i=J.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&y(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return H.apply(n,q.call(t.getElementsByTagName(e),0)),n;if((a=i[3])&&T.getByClassName&&t.getElementsByClassName)return H.apply(n,q.call(t.getElementsByClassName(a),0)),n}if(T.qsa&&!h.test(e)){if(f=!0,g=x,m=t,v=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){l=ft(e),(f=t.getAttribute("id"))?g=f.replace(K,"\\$&"):t.setAttribute("id",g),g="[id='"+g+"'] ",u=l.length;while(u--)l[u]=g+dt(l[u]);m=V.test(e)&&t.parentNode||t,v=l.join(",")}if(v)try{return H.apply(n,q.call(m.querySelectorAll(v),0)),n}catch(b){}finally{f||t.removeAttribute("id")}}}return wt(e.replace(W,"$1"),t,n,r)}a=st.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},c=st.setDocument=function(e){var n=e?e.ownerDocument||e:w;return n!==p&&9===n.nodeType&&n.documentElement?(p=n,f=n.documentElement,d=a(n),T.tagNameNoComments=at(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),T.attributes=at(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),T.getByClassName=at(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),T.getByName=at(function(e){e.id=x+0,e.innerHTML="<a name='"+x+"'></a><div name='"+x+"'></div>",f.insertBefore(e,f.firstChild);var t=n.getElementsByName&&n.getElementsByName(x).length===2+n.getElementsByName(x+0).length;return T.getIdNotName=!n.getElementById(x),f.removeChild(e),t}),i.attrHandle=at(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==A&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},T.getIdNotName?(i.find.ID=function(e,t){if(typeof t.getElementById!==A&&!d){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){return e.getAttribute("id")===t}}):(i.find.ID=function(e,n){if(typeof n.getElementById!==A&&!d){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==A&&r.getAttributeNode("id").value===e?[r]:t:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){var n=typeof e.getAttributeNode!==A&&e.getAttributeNode("id");return n&&n.value===t}}),i.find.TAG=T.tagNameNoComments?function(e,n){return typeof n.getElementsByTagName!==A?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},i.find.NAME=T.getByName&&function(e,n){return typeof n.getElementsByName!==A?n.getElementsByName(name):t},i.find.CLASS=T.getByClassName&&function(e,n){return typeof n.getElementsByClassName===A||d?t:n.getElementsByClassName(e)},g=[],h=[":focus"],(T.qsa=rt(n.querySelectorAll))&&(at(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||h.push("\\["+_+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||h.push(":checked")}),at(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&h.push("[*^$]="+_+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").length||h.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),h.push(",.*:")})),(T.matchesSelector=rt(m=f.matchesSelector||f.mozMatchesSelector||f.webkitMatchesSelector||f.oMatchesSelector||f.msMatchesSelector))&&at(function(e){T.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),g.push("!=",R)}),h=RegExp(h.join("|")),g=RegExp(g.join("|")),y=rt(f.contains)||f.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},v=f.compareDocumentPosition?function(e,t){var r;return e===t?(u=!0,0):(r=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t))?1&r||e.parentNode&&11===e.parentNode.nodeType?e===n||y(w,e)?-1:t===n||y(w,t)?1:0:4&r?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return u=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:0;if(o===a)return ut(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?ut(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},u=!1,[0,0].sort(v),T.detectDuplicates=u,p):p},st.matches=function(e,t){return st(e,null,null,t)},st.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&c(e),t=t.replace(Z,"='$1']"),!(!T.matchesSelector||d||g&&g.test(t)||h.test(t)))try{var n=m.call(e,t);if(n||T.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return st(t,p,null,[e]).length>0},st.contains=function(e,t){return(e.ownerDocument||e)!==p&&c(e),y(e,t)},st.attr=function(e,t){var n;return(e.ownerDocument||e)!==p&&c(e),d||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):d||T.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},st.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},st.uniqueSort=function(e){var t,n=[],r=1,i=0;if(u=!T.detectDuplicates,e.sort(v),u){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e};function ut(e,t){var n=t&&e,r=n&&(~t.sourceIndex||j)-(~e.sourceIndex||j);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function lt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function ct(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function pt(e){return ot(function(t){return t=+t,ot(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}o=st.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=o(t);return n},i=st.selectors={cacheLength:50,createPseudo:ot,match:U,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(et,tt),e[3]=(e[4]||e[5]||"").replace(et,tt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||st.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&st.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return U.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&z.test(n)&&(t=ft(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(et,tt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[e+" "];return t||(t=RegExp("(^|"+_+")"+e+"("+_+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==A&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=st.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[x]||(m[x]={}),l=c[e]||[],d=l[0]===N&&l[1],f=l[0]===N&&l[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[N,d,f];break}}else if(v&&(l=(t[x]||(t[x]={}))[e])&&l[0]===N)f=l[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[x]||(p[x]={}))[e]=[N,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||st.error("unsupported pseudo: "+e);return r[x]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?ot(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=M.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ot(function(e){var t=[],n=[],r=s(e.replace(W,"$1"));return r[x]?ot(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ot(function(e){return function(t){return st(e,t).length>0}}),contains:ot(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:ot(function(e){return X.test(e||"")||st.error("unsupported lang: "+e),e=e.replace(et,tt).toLowerCase(),function(t){var n;do if(n=d?t.getAttribute("xml:lang")||t.getAttribute("lang"):t.lang)return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===f},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return Q.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:pt(function(){return[0]}),last:pt(function(e,t){return[t-1]}),eq:pt(function(e,t,n){return[0>n?n+t:n]}),even:pt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:pt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:pt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:pt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})i.pseudos[n]=lt(n);for(n in{submit:!0,reset:!0})i.pseudos[n]=ct(n);function ft(e,t){var n,r,o,a,s,u,l,c=E[e+" "];if(c)return t?0:c.slice(0);s=e,u=[],l=i.preFilter;while(s){(!n||(r=$.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),u.push(o=[])),n=!1,(r=I.exec(s))&&(n=r.shift(),o.push({value:n,type:r[0].replace(W," ")}),s=s.slice(n.length));for(a in i.filter)!(r=U[a].exec(s))||l[a]&&!(r=l[a](r))||(n=r.shift(),o.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?st.error(e):E(e,u).slice(0)}function dt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function ht(e,t,n){var i=t.dir,o=n&&"parentNode"===i,a=C++;return t.first?function(t,n,r){while(t=t[i])if(1===t.nodeType||o)return e(t,n,r)}:function(t,n,s){var u,l,c,p=N+" "+a;if(s){while(t=t[i])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[i])if(1===t.nodeType||o)if(c=t[x]||(t[x]={}),(l=c[i])&&l[0]===p){if((u=l[1])===!0||u===r)return u===!0}else if(l=c[i]=[p],l[1]=e(t,n,s)||r,l[1]===!0)return!0}}function gt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function mt(e,t,n,r,i){var o,a=[],s=0,u=e.length,l=null!=t;for(;u>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),l&&t.push(s));return a}function yt(e,t,n,r,i,o){return r&&!r[x]&&(r=yt(r)),i&&!i[x]&&(i=yt(i,o)),ot(function(o,a,s,u){var l,c,p,f=[],d=[],h=a.length,g=o||xt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:mt(g,f,e,s,u),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,u),r){l=mt(y,d),r(l,[],s,u),c=l.length;while(c--)(p=l[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){l=[],c=y.length;while(c--)(p=y[c])&&l.push(m[c]=p);i(null,y=[],l,u)}c=y.length;while(c--)(p=y[c])&&(l=i?M.call(o,p):f[c])>-1&&(o[l]=!(a[l]=p))}}else y=mt(y===a?y.splice(h,y.length):y),i?i(null,a,y,u):H.apply(a,y)})}function vt(e){var t,n,r,o=e.length,a=i.relative[e[0].type],s=a||i.relative[" "],u=a?1:0,c=ht(function(e){return e===t},s,!0),p=ht(function(e){return M.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;o>u;u++)if(n=i.relative[e[u].type])f=[ht(gt(f),n)];else{if(n=i.filter[e[u].type].apply(null,e[u].matches),n[x]){for(r=++u;o>r;r++)if(i.relative[e[r].type])break;return yt(u>1&>(f),u>1&&dt(e.slice(0,u-1)).replace(W,"$1"),n,r>u&&vt(e.slice(u,r)),o>r&&vt(e=e.slice(r)),o>r&&dt(e))}f.push(n)}return gt(f)}function bt(e,t){var n=0,o=t.length>0,a=e.length>0,s=function(s,u,c,f,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,T=l,C=s||a&&i.find.TAG("*",d&&u.parentNode||u),k=N+=null==T?1:Math.random()||.1;for(w&&(l=u!==p&&u,r=n);null!=(h=C[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,u,c)){f.push(h);break}w&&(N=k,r=++n)}o&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,o&&b!==v){g=0;while(m=t[g++])m(x,y,u,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=L.call(f));y=mt(y)}H.apply(f,y),w&&!s&&y.length>0&&v+t.length>1&&st.uniqueSort(f)}return w&&(N=k,l=T),x};return o?ot(s):s}s=st.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=ft(e)),n=t.length;while(n--)o=vt(t[n]),o[x]?r.push(o):i.push(o);o=S(e,bt(i,r))}return o};function xt(e,t,n){var r=0,i=t.length;for(;i>r;r++)st(e,t[r],n);return n}function wt(e,t,n,r){var o,a,u,l,c,p=ft(e);if(!r&&1===p.length){if(a=p[0]=p[0].slice(0),a.length>2&&"ID"===(u=a[0]).type&&9===t.nodeType&&!d&&i.relative[a[1].type]){if(t=i.find.ID(u.matches[0].replace(et,tt),t)[0],!t)return n;e=e.slice(a.shift().value.length)}o=U.needsContext.test(e)?0:a.length;while(o--){if(u=a[o],i.relative[l=u.type])break;if((c=i.find[l])&&(r=c(u.matches[0].replace(et,tt),V.test(a[0].type)&&t.parentNode||t))){if(a.splice(o,1),e=r.length&&dt(a),!e)return H.apply(n,q.call(r,0)),n;break}}}return s(e,p)(r,t,d,n,V.test(e)),n}i.pseudos.nth=i.pseudos.eq;function Tt(){}i.filters=Tt.prototype=i.pseudos,i.setFilters=new Tt,c(),st.attr=b.attr,b.find=st,b.expr=st.selectors,b.expr[":"]=b.expr.pseudos,b.unique=st.uniqueSort,b.text=st.getText,b.isXMLDoc=st.isXML,b.contains=st.contains}(e);var at=/Until$/,st=/^(?:parents|prev(?:Until|All))/,ut=/^.[^:#\[\.,]*$/,lt=b.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};b.fn.extend({find:function(e){var t,n,r,i=this.length;if("string"!=typeof e)return r=this,this.pushStack(b(e).filter(function(){for(t=0;i>t;t++)if(b.contains(r[t],this))return!0}));for(n=[],t=0;i>t;t++)b.find(e,this[t],n);return n=this.pushStack(i>1?b.unique(n):n),n.selector=(this.selector?this.selector+" ":"")+e,n},has:function(e){var t,n=b(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(b.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e,!1))},filter:function(e){return this.pushStack(ft(this,e,!0))},is:function(e){return!!e&&("string"==typeof e?lt.test(e)?b(e,this.context).index(this[0])>=0:b.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,o=[],a=lt.test(e)||"string"!=typeof e?b(e,t||this.context):0;for(;i>r;r++){n=this[r];while(n&&n.ownerDocument&&n!==t&&11!==n.nodeType){if(a?a.index(n)>-1:b.find.matchesSelector(n,e)){o.push(n);break}n=n.parentNode}}return this.pushStack(o.length>1?b.unique(o):o)},index:function(e){return e?"string"==typeof e?b.inArray(this[0],b(e)):b.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?b(e,t):b.makeArray(e&&e.nodeType?[e]:e),r=b.merge(this.get(),n);return this.pushStack(b.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),b.fn.andSelf=b.fn.addBack;function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}b.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return b.dir(e,"parentNode")},parentsUntil:function(e,t,n){return b.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return b.dir(e,"nextSibling")},prevAll:function(e){return b.dir(e,"previousSibling")},nextUntil:function(e,t,n){return b.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return b.dir(e,"previousSibling",n)},siblings:function(e){return b.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return b.sibling(e.firstChild)},contents:function(e){return b.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:b.merge([],e.childNodes)}},function(e,t){b.fn[e]=function(n,r){var i=b.map(this,t,n);return at.test(e)||(r=n),r&&"string"==typeof r&&(i=b.filter(r,i)),i=this.length>1&&!ct[e]?b.unique(i):i,this.length>1&&st.test(e)&&(i=i.reverse()),this.pushStack(i)}}),b.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?b.find.matchesSelector(t[0],e)?[t[0]]:[]:b.find.matches(e,t)},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!b(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(t=t||0,b.isFunction(t))return b.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return b.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=b.grep(e,function(e){return 1===e.nodeType});if(ut.test(t))return b.filter(t,r,!n);t=b.filter(t,r)}return b.grep(e,function(e){return b.inArray(e,t)>=0===n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Nt=/^(?:checkbox|radio)$/i,Ct=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:b.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(o),Dt=jt.appendChild(o.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,b.fn.extend({text:function(e){return b.access(this,function(e){return e===t?b.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(b.isFunction(e))return this.each(function(t){b(this).wrapAll(e.call(this,t))});if(this[0]){var t=b(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return b.isFunction(e)?this.each(function(t){b(this).wrapInner(e.call(this,t))}):this.each(function(){var t=b(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=b.isFunction(e);return this.each(function(n){b(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){b.nodeName(this,"body")||b(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.insertBefore(e,this.firstChild)})},before:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=0;for(;null!=(n=this[r]);r++)(!e||b.filter(e,[n]).length>0)&&(t||1!==n.nodeType||b.cleanData(Ot(n)),n.parentNode&&(t&&b.contains(n.ownerDocument,n)&&Mt(Ot(n,"script")),n.parentNode.removeChild(n)));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&b.cleanData(Ot(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&b.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return b.clone(this,e,t)})},html:function(e){return b.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!b.support.htmlSerialize&&mt.test(e)||!b.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(b.cleanData(Ot(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){var t=b.isFunction(e);return t||"string"==typeof e||(e=b(e).not(this).detach()),this.domManip([e],!0,function(e){var t=this.nextSibling,n=this.parentNode;n&&(b(this).remove(),n.insertBefore(e,t))})},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=f.apply([],e);var i,o,a,s,u,l,c=0,p=this.length,d=this,h=p-1,g=e[0],m=b.isFunction(g);if(m||!(1>=p||"string"!=typeof g||b.support.checkClone)&&Ct.test(g))return this.each(function(i){var o=d.eq(i);m&&(e[0]=g.call(this,i,n?o.html():t)),o.domManip(e,n,r)});if(p&&(l=b.buildFragment(e,this[0].ownerDocument,!1,this),i=l.firstChild,1===l.childNodes.length&&(l=i),i)){for(n=n&&b.nodeName(i,"tr"),s=b.map(Ot(l,"script"),Ht),a=s.length;p>c;c++)o=l,c!==h&&(o=b.clone(o,!0,!0),a&&b.merge(s,Ot(o,"script"))),r.call(n&&b.nodeName(this[c],"table")?Lt(this[c],"tbody"):this[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,b.map(s,qt),c=0;a>c;c++)o=s[c],kt.test(o.type||"")&&!b._data(o,"globalEval")&&b.contains(u,o)&&(o.src?b.ajax({url:o.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):b.globalEval((o.text||o.textContent||o.innerHTML||"").replace(St,"")));l=i=null}return this}});function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function Ht(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function Mt(e,t){var n,r=0;for(;null!=(n=e[r]);r++)b._data(n,"globalEval",!t||b._data(t[r],"globalEval"))}function _t(e,t){if(1===t.nodeType&&b.hasData(e)){var n,r,i,o=b._data(e),a=b._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)b.event.add(t,n,s[n][r])}a.data&&(a.data=b.extend({},a.data))}}function Ft(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!b.support.noCloneEvent&&t[b.expando]){i=b._data(t);for(r in i.events)b.removeEvent(t,r,i.handle);t.removeAttribute(b.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),b.support.html5Clone&&e.innerHTML&&!b.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Nt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}b.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){b.fn[e]=function(e){var n,r=0,i=[],o=b(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),b(o[r])[t](n),d.apply(i,n.get());return this.pushStack(i)}});function Ot(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||b.nodeName(o,n)?s.push(o):b.merge(s,Ot(o,n));return n===t||n&&b.nodeName(e,n)?b.merge([e],s):s}function Bt(e){Nt.test(e.type)&&(e.defaultChecked=e.checked)}b.extend({clone:function(e,t,n){var r,i,o,a,s,u=b.contains(e.ownerDocument,e);if(b.support.html5Clone||b.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(b.support.noCloneEvent&&b.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||b.isXMLDoc(e)))for(r=Ot(o),s=Ot(e),a=0;null!=(i=s[a]);++a)r[a]&&Ft(i,r[a]);if(t)if(n)for(s=s||Ot(e),r=r||Ot(o),a=0;null!=(i=s[a]);a++)_t(i,r[a]);else _t(e,o);return r=Ot(o,"script"),r.length>0&&Mt(r,!u&&Ot(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,u,l,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===b.type(o))b.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),u=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[u]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!b.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!b.support.tbody){o="table"!==u||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)b.nodeName(l=o.childNodes[i],"tbody")&&!l.childNodes.length&&o.removeChild(l)
+}b.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),b.support.appendChecked||b.grep(Ot(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===b.inArray(o,r))&&(a=b.contains(o.ownerDocument,o),s=Ot(f.appendChild(o),"script"),a&&Mt(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,u=b.expando,l=b.cache,p=b.support.deleteExpando,f=b.event.special;for(;null!=(n=e[s]);s++)if((t||b.acceptData(n))&&(o=n[u],a=o&&l[o])){if(a.events)for(r in a.events)f[r]?b.event.remove(n,r):b.removeEvent(n,r,a.handle);l[o]&&(delete l[o],p?delete n[u]:typeof n.removeAttribute!==i?n.removeAttribute(u):n[u]=null,c.push(o))}}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+x+")(.*)$","i"),Yt=RegExp("^("+x+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+x+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===b.css(e,"display")||!b.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=b._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=b._data(r,"olddisplay",un(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&b._data(r,"olddisplay",i?n:b.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}b.fn.extend({css:function(e,n){return b.access(this,function(e,n,r){var i,o,a={},s=0;if(b.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=b.css(e,n[s],!1,o);return a}return r!==t?b.style(e,n,r):b.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?b(this).show():b(this).hide()})}}),b.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":b.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,u=b.camelCase(n),l=e.style;if(n=b.cssProps[u]||(b.cssProps[u]=tn(l,u)),s=b.cssHooks[n]||b.cssHooks[u],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:l[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(b.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||b.cssNumber[u]||(r+="px"),b.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(l[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{l[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,u=b.camelCase(n);return n=b.cssProps[u]||(b.cssProps[u]=tn(e.style,u)),s=b.cssHooks[n]||b.cssHooks[u],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||b.isNumeric(o)?o||0:a):a},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s.getPropertyValue(n)||s[n]:t,l=e.style;return s&&(""!==u||b.contains(e.ownerDocument,e)||(u=b.style(e,n)),Yt.test(u)&&Ut.test(n)&&(i=l.width,o=l.minWidth,a=l.maxWidth,l.minWidth=l.maxWidth=l.width=u,u=s.width,l.width=i,l.minWidth=o,l.maxWidth=a)),u}):o.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s[n]:t,l=e.style;return null==u&&l&&l[n]&&(u=l[n]),Yt.test(u)&&!zt.test(n)&&(i=l.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),l.left="fontSize"===n?"1em":u,u=l.pixelLeft+"px",l.left=i,a&&(o.left=a)),""===u?"auto":u});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=b.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=b.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=b.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=b.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=b.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(b.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function un(e){var t=o,n=Gt[e];return n||(n=ln(e,t),"none"!==n&&n||(Pt=(Pt||b("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=ln(e,t),Pt.detach()),Gt[e]=n),n}function ln(e,t){var n=b(t.createElement(e)).appendTo(t.body),r=b.css(n[0],"display");return n.remove(),r}b.each(["height","width"],function(e,n){b.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(b.css(e,"display"))?b.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,i),i):0)}}}),b.support.opacity||(b.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=b.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===b.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),b(function(){b.support.reliableMarginRight||(b.cssHooks.marginRight={get:function(e,n){return n?b.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!b.support.pixelPosition&&b.fn.position&&b.each(["top","left"],function(e,n){b.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?b(e).position()[n]+"px":r):t}}})}),b.expr&&b.expr.filters&&(b.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!b.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||b.css(e,"display"))},b.expr.filters.visible=function(e){return!b.expr.filters.hidden(e)}),b.each({margin:"",padding:"",border:"Width"},function(e,t){b.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(b.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;b.fn.extend({serialize:function(){return b.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=b.prop(this,"elements");return e?b.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!b(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Nt.test(e))}).map(function(e,t){var n=b(this).val();return null==n?null:b.isArray(n)?b.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),b.param=function(e,n){var r,i=[],o=function(e,t){t=b.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=b.ajaxSettings&&b.ajaxSettings.traditional),b.isArray(e)||e.jquery&&!b.isPlainObject(e))b.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(b.isArray(t))b.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==b.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}b.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){b.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),b.fn.hover=function(e,t){return this.mouseenter(e).mouseleave(t||e)};var mn,yn,vn=b.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Nn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Cn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=b.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=a.href}catch(Ln){yn=o.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(w)||[];if(b.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(u){var l;return o[u]=!0,b.each(e[u]||[],function(e,u){var c=u(n,r,i);return"string"!=typeof c||a||o[c]?a?!(l=c):t:(n.dataTypes.unshift(c),s(c),!1)}),l}return s(n.dataTypes[0])||!o["*"]&&s("*")}function Mn(e,n){var r,i,o=b.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&b.extend(!0,e,r),e}b.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,u=e.indexOf(" ");return u>=0&&(i=e.slice(u,e.length),e=e.slice(0,u)),b.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&b.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?b("<div>").append(b.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},b.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){b.fn[t]=function(e){return this.on(t,e)}}),b.each(["get","post"],function(e,n){b[n]=function(e,r,i,o){return b.isFunction(r)&&(o=o||i,i=r,r=t),b.ajax({url:e,type:n,dataType:o,data:r,success:i})}}),b.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Nn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":b.parseJSON,"text xml":b.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Mn(Mn(e,b.ajaxSettings),t):Mn(b.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,u,l,c,p=b.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?b(f):b.event,h=b.Deferred(),g=b.Callbacks("once memory"),m=p.statusCode||{},y={},v={},x=0,T="canceled",N={readyState:0,getResponseHeader:function(e){var t;if(2===x){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===x?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return x||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return x||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>x)for(t in e)m[t]=[m[t],e[t]];else N.always(e[N.status]);return this},abort:function(e){var t=e||T;return l&&l.abort(t),k(0,t),this}};if(h.promise(N).complete=g.add,N.success=N.done,N.error=N.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=b.trim(p.dataType||"*").toLowerCase().match(w)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?80:443))==(mn[3]||("http:"===mn[1]?80:443)))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=b.param(p.data,p.traditional)),qn(An,p,n,N),2===x)return N;u=p.global,u&&0===b.active++&&b.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Cn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(b.lastModified[o]&&N.setRequestHeader("If-Modified-Since",b.lastModified[o]),b.etag[o]&&N.setRequestHeader("If-None-Match",b.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&N.setRequestHeader("Content-Type",p.contentType),N.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)N.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,N,p)===!1||2===x))return N.abort();T="abort";for(i in{success:1,error:1,complete:1})N[i](p[i]);if(l=qn(jn,p,n,N)){N.readyState=1,u&&d.trigger("ajaxSend",[N,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){N.abort("timeout")},p.timeout));try{x=1,l.send(y,k)}catch(C){if(!(2>x))throw C;k(-1,C)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,C=n;2!==x&&(x=2,s&&clearTimeout(s),l=t,a=i||"",N.readyState=e>0?4:0,r&&(w=_n(p,N,r)),e>=200&&300>e||304===e?(p.ifModified&&(T=N.getResponseHeader("Last-Modified"),T&&(b.lastModified[o]=T),T=N.getResponseHeader("etag"),T&&(b.etag[o]=T)),204===e?(c=!0,C="nocontent"):304===e?(c=!0,C="notmodified"):(c=Fn(p,w),C=c.state,y=c.data,v=c.error,c=!v)):(v=C,(e||!C)&&(C="error",0>e&&(e=0))),N.status=e,N.statusText=(n||C)+"",c?h.resolveWith(f,[y,C,N]):h.rejectWith(f,[N,C,v]),N.statusCode(m),m=t,u&&d.trigger(c?"ajaxSuccess":"ajaxError",[N,p,c?y:v]),g.fireWith(f,[N,C]),u&&(d.trigger("ajaxComplete",[N,p]),--b.active||b.event.trigger("ajaxStop")))}return N},getScript:function(e,n){return b.get(e,t,n,"script")},getJSON:function(e,t,n){return b.get(e,t,n,"json")}});function _n(e,n,r){var i,o,a,s,u=e.contents,l=e.dataTypes,c=e.responseFields;for(s in c)s in r&&(n[c[s]]=r[s]);while("*"===l[0])l.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in u)if(u[s]&&u[s].test(o)){l.unshift(s);break}if(l[0]in r)a=l[0];else{for(s in r){if(!l[0]||e.converters[s+" "+l[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==l[0]&&l.unshift(a),r[a]):t}function Fn(e,t){var n,r,i,o,a={},s=0,u=e.dataTypes.slice(),l=u[0];if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u[1])for(i in e.converters)a[i.toLowerCase()]=e.converters[i];for(;r=u[++s];)if("*"!==r){if("*"!==l&&l!==r){if(i=a[l+" "+r]||a["* "+r],!i)for(n in a)if(o=n.split(" "),o[1]===r&&(i=a[l+" "+o[0]]||a["* "+o[0]])){i===!0?i=a[n]:a[n]!==!0&&(r=o[0],u.splice(s--,0,r));break}if(i!==!0)if(i&&e["throws"])t=i(t);else try{t=i(t)}catch(c){return{state:"parsererror",error:i?c:"No conversion from "+l+" to "+r}}}l=r}return{state:"success",data:t}}b.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return b.globalEval(e),e}}}),b.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),b.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=o.head||b("head")[0]||o.documentElement;return{send:function(t,i){n=o.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var On=[],Bn=/(=)\?(?=&|$)|\?\?/;b.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=On.pop()||b.expando+"_"+vn++;return this[e]=!0,e}}),b.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,u=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return u||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=b.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,u?n[u]=n[u].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||b.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,On.push(o)),s&&b.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}b.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=b.ajaxSettings.xhr(),b.support.cors=!!Rn&&"withCredentials"in Rn,Rn=b.support.ajax=!!Rn,Rn&&b.ajaxTransport(function(n){if(!n.crossDomain||b.support.cors){var r;return{send:function(i,o){var a,s,u=n.xhr();if(n.username?u.open(n.type,n.url,n.async,n.username,n.password):u.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)u[s]=n.xhrFields[s];n.mimeType&&u.overrideMimeType&&u.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)u.setRequestHeader(s,i[s])}catch(l){}u.send(n.hasContent&&n.data||null),r=function(e,i){var s,l,c,p;try{if(r&&(i||4===u.readyState))if(r=t,a&&(u.onreadystatechange=b.noop,$n&&delete Pn[a]),i)4!==u.readyState&&u.abort();else{p={},s=u.status,l=u.getAllResponseHeaders(),"string"==typeof u.responseText&&(p.text=u.responseText);try{c=u.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,l)},n.async?4===u.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},b(e).unload($n)),Pn[a]=r),u.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+x+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n,r,i=this.createTween(e,t),o=Yn.exec(t),a=i.cur(),s=+a||0,u=1,l=20;if(o){if(n=+o[2],r=o[3]||(b.cssNumber[e]?"":"px"),"px"!==r&&s){s=b.css(i.elem,e,!0)||n||1;do u=u||".5",s/=u,b.style(i.elem,e,s+r);while(u!==(u=i.cur()/a)&&1!==u&&--l)}i.unit=r,i.start=s,i.end=o[1]?s+(o[1]+1)*n:n}return i}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=b.now()}function Zn(e,t){b.each(t,function(t,n){var r=(Qn[t]||[]).concat(Qn["*"]),i=0,o=r.length;for(;o>i;i++)if(r[i].call(e,t,n))return})}function er(e,t,n){var r,i,o=0,a=Gn.length,s=b.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;for(;u>a;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),1>o&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:b.extend({},t),opts:b.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=b.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?s.resolveWith(e,[l,t]):s.rejectWith(e,[l,t]),this}}),c=l.props;for(tr(c,l.opts.specialEasing);a>o;o++)if(r=Gn[o].call(l,e,c,l.opts))return r;return Zn(l,c),b.isFunction(l.opts.start)&&l.opts.start.call(e,l),b.fx.timer(b.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function tr(e,t){var n,r,i,o,a;for(i in e)if(r=b.camelCase(i),o=t[r],n=e[i],b.isArray(n)&&(o=n[1],n=e[i]=n[0]),i!==r&&(e[r]=n,delete e[i]),a=b.cssHooks[r],a&&"expand"in a){n=a.expand(n),delete e[r];for(i in n)i in e||(e[i]=n[i],t[i]=o)}else t[r]=o}b.Animation=b.extend(er,{tweener:function(e,t){b.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,u,l,c,p,f=this,d=e.style,h={},g=[],m=e.nodeType&&nn(e);n.queue||(c=b._queueHooks(e,"fx"),null==c.unqueued&&(c.unqueued=0,p=c.empty.fire,c.empty.fire=function(){c.unqueued||p()}),c.unqueued++,f.always(function(){f.always(function(){c.unqueued--,b.queue(e,"fx").length||c.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[d.overflow,d.overflowX,d.overflowY],"inline"===b.css(e,"display")&&"none"===b.css(e,"float")&&(b.support.inlineBlockNeedsLayout&&"inline"!==un(e.nodeName)?d.zoom=1:d.display="inline-block")),n.overflow&&(d.overflow="hidden",b.support.shrinkWrapBlocks||f.always(function(){d.overflow=n.overflow[0],d.overflowX=n.overflow[1],d.overflowY=n.overflow[2]}));for(i in t)if(a=t[i],Vn.exec(a)){if(delete t[i],u=u||"toggle"===a,a===(m?"hide":"show"))continue;g.push(i)}if(o=g.length){s=b._data(e,"fxshow")||b._data(e,"fxshow",{}),"hidden"in s&&(m=s.hidden),u&&(s.hidden=!m),m?b(e).show():f.done(function(){b(e).hide()}),f.done(function(){var t;b._removeData(e,"fxshow");for(t in h)b.style(e,t,h[t])});for(i=0;o>i;i++)r=g[i],l=f.createTween(r,m?s[r]:0),h[r]=s[r]||b.style(e,r),r in s||(s[r]=l.start,m&&(l.end=l.start,l.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}b.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(b.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?b.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=b.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){b.fx.step[e.prop]?b.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[b.cssProps[e.prop]]||b.cssHooks[e.prop])?b.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},b.each(["toggle","show","hide"],function(e,t){var n=b.fn[t];b.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),b.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=b.isEmptyObject(e),o=b.speed(t,n,r),a=function(){var t=er(this,b.extend({},e),o);a.finish=function(){t.stop(!0)},(i||b._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=b.timers,a=b._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&b.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=b._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=b.timers,a=r?r.length:0;for(n.finish=!0,b.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}b.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){b.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),b.speed=function(e,t,n){var r=e&&"object"==typeof e?b.extend({},e):{complete:n||!n&&t||b.isFunction(e)&&e,duration:e,easing:n&&t||t&&!b.isFunction(t)&&t};return r.duration=b.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in b.fx.speeds?b.fx.speeds[r.duration]:b.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){b.isFunction(r.old)&&r.old.call(this),r.queue&&b.dequeue(this,r.queue)},r},b.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},b.timers=[],b.fx=rr.prototype.init,b.fx.tick=function(){var e,n=b.timers,r=0;for(Xn=b.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||b.fx.stop(),Xn=t},b.fx.timer=function(e){e()&&b.timers.push(e)&&b.fx.start()},b.fx.interval=13,b.fx.start=function(){Un||(Un=setInterval(b.fx.tick,b.fx.interval))},b.fx.stop=function(){clearInterval(Un),Un=null},b.fx.speeds={slow:600,fast:200,_default:400},b.fx.step={},b.expr&&b.expr.filters&&(b.expr.filters.animated=function(e){return b.grep(b.timers,function(t){return e===t.elem}).length}),b.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){b.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,b.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},b.offset={setOffset:function(e,t,n){var r=b.css(e,"position");"static"===r&&(e.style.position="relative");var i=b(e),o=i.offset(),a=b.css(e,"top"),s=b.css(e,"left"),u=("absolute"===r||"fixed"===r)&&b.inArray("auto",[a,s])>-1,l={},c={},p,f;u?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),b.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(l.top=t.top-o.top+p),null!=t.left&&(l.left=t.left-o.left+f),"using"in t?t.using.call(e,l):i.css(l)}},b.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===b.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),b.nodeName(e[0],"html")||(n=e.offset()),n.top+=b.css(e[0],"borderTopWidth",!0),n.left+=b.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-b.css(r,"marginTop",!0),left:t.left-n.left-b.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||o.documentElement;while(e&&!b.nodeName(e,"html")&&"static"===b.css(e,"position"))e=e.offsetParent;return e||o.documentElement})}}),b.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);b.fn[e]=function(i){return b.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?b(a).scrollLeft():o,r?o:b(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return b.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}b.each({Height:"height",Width:"width"},function(e,n){b.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){b.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return b.access(this,function(n,r,i){var o;return b.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?b.css(n,r,s):b.style(n,r,i,s)},n,a?i:t,a,null)}})}),e.jQuery=e.$=b,"function"==typeof define&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return b})})(window);
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/layui.css b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/layui.css
new file mode 100644
index 0000000..f297bf6
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/layui.css
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ .layui-inline,img{display:inline-block;vertical-align:middle}h1,h2,h3,h4,h5,h6{font-weight:400}.layui-edge,.layui-header,.layui-inline,.layui-main{position:relative}.layui-elip,.layui-form-checkbox span,.layui-form-pane .layui-form-label{text-overflow:ellipsis;white-space:nowrap}.layui-btn,.layui-edge,.layui-inline,img{vertical-align:middle}.layui-btn,.layui-disabled,.layui-icon,.layui-unselect{-webkit-user-select:none;-ms-user-select:none;-moz-user-select:none}blockquote,body,button,dd,div,dl,dt,form,h1,h2,h3,h4,h5,h6,input,li,ol,p,pre,td,textarea,th,ul{margin:0;padding:0;-webkit-tap-highlight-color:rgba(0,0,0,0)}a:active,a:hover{outline:0}img{border:none}li{list-style:none}table{border-collapse:collapse;border-spacing:0}h4,h5,h6{font-size:100%}button,input,optgroup,option,select,textarea{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;outline:0}pre{white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word}body{line-height:24px;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}hr{height:1px;margin:10px 0;border:0;clear:both}a{color:#333;text-decoration:none}a:hover{color:#777}a cite{font-style:normal;*cursor:pointer}.layui-border-box,.layui-border-box *{box-sizing:border-box}.layui-box,.layui-box *{box-sizing:content-box}.layui-clear{clear:both;*zoom:1}.layui-clear:after{content:'\20';clear:both;*zoom:1;display:block;height:0}.layui-inline{*display:inline;*zoom:1}.layui-edge{display:inline-block;width:0;height:0;border-width:6px;border-style:dashed;border-color:transparent;overflow:hidden}.layui-edge-top{top:-4px;border-bottom-color:#999;border-bottom-style:solid}.layui-edge-right{border-left-color:#999;border-left-style:solid}.layui-edge-bottom{top:2px;border-top-color:#999;border-top-style:solid}.layui-edge-left{border-right-color:#999;border-right-style:solid}.layui-elip{overflow:hidden}.layui-disabled,.layui-disabled:hover{color:#d2d2d2!important;cursor:not-allowed!important}.layui-circle{border-radius:100%}.layui-show{display:block!important}.layui-hide{display:none!important}@font-face{font-family:layui-icon;src:url(../font/iconfont.eot?v=240);src:url(../font/iconfont.eot?v=240#iefix) format('embedded-opentype'),url(../font/iconfont.svg?v=240#iconfont) format('svg'),url(../font/iconfont.woff?v=240) format('woff'),url(../font/iconfont.ttf?v=240) format('truetype')}.layui-icon{font-family:layui-icon!important;font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.layui-icon-reply-fill:before{content:"\e611"}.layui-icon-set-fill:before{content:"\e614"}.layui-icon-menu-fill:before{content:"\e60f"}.layui-icon-search:before{content:"\e615"}.layui-icon-share:before{content:"\e641"}.layui-icon-set-sm:before{content:"\e620"}.layui-icon-engine:before{content:"\e628"}.layui-icon-close:before{content:"\1006"}.layui-icon-close-fill:before{content:"\1007"}.layui-icon-chart-screen:before{content:"\e629"}.layui-icon-star:before{content:"\e600"}.layui-icon-circle-dot:before{content:"\e617"}.layui-icon-chat:before{content:"\e606"}.layui-icon-release:before{content:"\e609"}.layui-icon-list:before{content:"\e60a"}.layui-icon-chart:before{content:"\e62c"}.layui-icon-ok-circle:before{content:"\1005"}.layui-icon-layim-theme:before{content:"\e61b"}.layui-icon-table:before{content:"\e62d"}.layui-icon-right:before{content:"\e602"}.layui-icon-left:before{content:"\e603"}.layui-icon-cart-simple:before{content:"\e698"}.layui-icon-face-cry:before{content:"\e69c"}.layui-icon-face-smile:before{content:"\e6af"}.layui-icon-survey:before{content:"\e6b2"}.layui-icon-tree:before{content:"\e62e"}.layui-icon-upload-circle:before{content:"\e62f"}.layui-icon-add-circle:before{content:"\e61f"}.layui-icon-download-circle:before{content:"\e601"}.layui-icon-templeate-1:before{content:"\e630"}.layui-icon-util:before{content:"\e631"}.layui-icon-face-surprised:before{content:"\e664"}.layui-icon-edit:before{content:"\e642"}.layui-icon-speaker:before{content:"\e645"}.layui-icon-down:before{content:"\e61a"}.layui-icon-file:before{content:"\e621"}.layui-icon-layouts:before{content:"\e632"}.layui-icon-rate-half:before{content:"\e6c9"}.layui-icon-add-circle-fine:before{content:"\e608"}.layui-icon-prev-circle:before{content:"\e633"}.layui-icon-read:before{content:"\e705"}.layui-icon-404:before{content:"\e61c"}.layui-icon-carousel:before{content:"\e634"}.layui-icon-help:before{content:"\e607"}.layui-icon-code-circle:before{content:"\e635"}.layui-icon-water:before{content:"\e636"}.layui-icon-username:before{content:"\e66f"}.layui-icon-find-fill:before{content:"\e670"}.layui-icon-about:before{content:"\e60b"}.layui-icon-location:before{content:"\e715"}.layui-icon-up:before{content:"\e619"}.layui-icon-pause:before{content:"\e651"}.layui-icon-date:before{content:"\e637"}.layui-icon-layim-uploadfile:before{content:"\e61d"}.layui-icon-delete:before{content:"\e640"}.layui-icon-play:before{content:"\e652"}.layui-icon-top:before{content:"\e604"}.layui-icon-friends:before{content:"\e612"}.layui-icon-refresh-3:before{content:"\e9aa"}.layui-icon-ok:before{content:"\e605"}.layui-icon-layer:before{content:"\e638"}.layui-icon-face-smile-fine:before{content:"\e60c"}.layui-icon-dollar:before{content:"\e659"}.layui-icon-group:before{content:"\e613"}.layui-icon-layim-download:before{content:"\e61e"}.layui-icon-picture-fine:before{content:"\e60d"}.layui-icon-link:before{content:"\e64c"}.layui-icon-diamond:before{content:"\e735"}.layui-icon-log:before{content:"\e60e"}.layui-icon-rate-solid:before{content:"\e67a"}.layui-icon-fonts-del:before{content:"\e64f"}.layui-icon-unlink:before{content:"\e64d"}.layui-icon-fonts-clear:before{content:"\e639"}.layui-icon-triangle-r:before{content:"\e623"}.layui-icon-circle:before{content:"\e63f"}.layui-icon-radio:before{content:"\e643"}.layui-icon-align-center:before{content:"\e647"}.layui-icon-align-right:before{content:"\e648"}.layui-icon-align-left:before{content:"\e649"}.layui-icon-loading-1:before{content:"\e63e"}.layui-icon-return:before{content:"\e65c"}.layui-icon-fonts-strong:before{content:"\e62b"}.layui-icon-upload:before{content:"\e67c"}.layui-icon-dialogue:before{content:"\e63a"}.layui-icon-video:before{content:"\e6ed"}.layui-icon-headset:before{content:"\e6fc"}.layui-icon-cellphone-fine:before{content:"\e63b"}.layui-icon-add-1:before{content:"\e654"}.layui-icon-face-smile-b:before{content:"\e650"}.layui-icon-fonts-html:before{content:"\e64b"}.layui-icon-form:before{content:"\e63c"}.layui-icon-cart:before{content:"\e657"}.layui-icon-camera-fill:before{content:"\e65d"}.layui-icon-tabs:before{content:"\e62a"}.layui-icon-fonts-code:before{content:"\e64e"}.layui-icon-fire:before{content:"\e756"}.layui-icon-set:before{content:"\e716"}.layui-icon-fonts-u:before{content:"\e646"}.layui-icon-triangle-d:before{content:"\e625"}.layui-icon-tips:before{content:"\e702"}.layui-icon-picture:before{content:"\e64a"}.layui-icon-more-vertical:before{content:"\e671"}.layui-icon-flag:before{content:"\e66c"}.layui-icon-loading:before{content:"\e63d"}.layui-icon-fonts-i:before{content:"\e644"}.layui-icon-refresh-1:before{content:"\e666"}.layui-icon-rmb:before{content:"\e65e"}.layui-icon-home:before{content:"\e68e"}.layui-icon-user:before{content:"\e770"}.layui-icon-notice:before{content:"\e667"}.layui-icon-login-weibo:before{content:"\e675"}.layui-icon-voice:before{content:"\e688"}.layui-icon-upload-drag:before{content:"\e681"}.layui-icon-login-qq:before{content:"\e676"}.layui-icon-snowflake:before{content:"\e6b1"}.layui-icon-file-b:before{content:"\e655"}.layui-icon-template:before{content:"\e663"}.layui-icon-auz:before{content:"\e672"}.layui-icon-console:before{content:"\e665"}.layui-icon-app:before{content:"\e653"}.layui-icon-prev:before{content:"\e65a"}.layui-icon-website:before{content:"\e7ae"}.layui-icon-next:before{content:"\e65b"}.layui-icon-component:before{content:"\e857"}.layui-icon-more:before{content:"\e65f"}.layui-icon-login-wechat:before{content:"\e677"}.layui-icon-shrink-right:before{content:"\e668"}.layui-icon-spread-left:before{content:"\e66b"}.layui-icon-camera:before{content:"\e660"}.layui-icon-note:before{content:"\e66e"}.layui-icon-refresh:before{content:"\e669"}.layui-icon-female:before{content:"\e661"}.layui-icon-male:before{content:"\e662"}.layui-icon-password:before{content:"\e673"}.layui-icon-senior:before{content:"\e674"}.layui-icon-theme:before{content:"\e66a"}.layui-icon-tread:before{content:"\e6c5"}.layui-icon-praise:before{content:"\e6c6"}.layui-icon-star-fill:before{content:"\e658"}.layui-icon-rate:before{content:"\e67b"}.layui-icon-template-1:before{content:"\e656"}.layui-icon-vercode:before{content:"\e679"}.layui-icon-cellphone:before{content:"\e678"}.layui-icon-screen-full:before{content:"\e622"}.layui-icon-screen-restore:before{content:"\e758"}.layui-icon-cols:before{content:"\e610"}.layui-icon-export:before{content:"\e67d"}.layui-icon-print:before{content:"\e66d"}.layui-icon-slider:before{content:"\e714"}.layui-main{width:1140px;margin:0 auto}.layui-header{z-index:1000;height:60px}.layui-header a:hover{transition:all .5s;-webkit-transition:all .5s}.layui-side{position:fixed;left:0;top:0;bottom:0;z-index:999;width:200px;overflow-x:hidden}.layui-side-scroll{position:relative;width:220px;height:100%;overflow-x:hidden}.layui-body{position:absolute;left:200px;right:0;top:0;bottom:0;z-index:998;width:auto;overflow:hidden;overflow-y:auto;box-sizing:border-box}.layui-layout-body{overflow:hidden}.layui-layout-admin .layui-header{background-color:#23262E}.layui-layout-admin .layui-side{top:60px;width:200px;overflow-x:hidden}.layui-layout-admin .layui-body{top:60px;bottom:44px}.layui-layout-admin .layui-main{width:auto;margin:0 15px}.layui-layout-admin .layui-footer{position:fixed;left:200px;right:0;bottom:0;height:44px;line-height:44px;padding:0 15px;background-color:#eee}.layui-layout-admin .layui-logo{position:absolute;left:0;top:0;width:200px;height:100%;line-height:60px;text-align:center;color:#009688;font-size:16px}.layui-layout-admin .layui-header .layui-nav{background:0 0}.layui-layout-left{position:absolute!important;left:200px;top:0}.layui-layout-right{position:absolute!important;right:0;top:0}.layui-container{position:relative;margin:0 auto;padding:0 15px;box-sizing:border-box}.layui-fluid{position:relative;margin:0 auto;padding:0 15px}.layui-row:after,.layui-row:before{content:'';display:block;clear:both}.layui-col-lg1,.layui-col-lg10,.layui-col-lg11,.layui-col-lg12,.layui-col-lg2,.layui-col-lg3,.layui-col-lg4,.layui-col-lg5,.layui-col-lg6,.layui-col-lg7,.layui-col-lg8,.layui-col-lg9,.layui-col-md1,.layui-col-md10,.layui-col-md11,.layui-col-md12,.layui-col-md2,.layui-col-md3,.layui-col-md4,.layui-col-md5,.layui-col-md6,.layui-col-md7,.layui-col-md8,.layui-col-md9,.layui-col-sm1,.layui-col-sm10,.layui-col-sm11,.layui-col-sm12,.layui-col-sm2,.layui-col-sm3,.layui-col-sm4,.layui-col-sm5,.layui-col-sm6,.layui-col-sm7,.layui-col-sm8,.layui-col-sm9,.layui-col-xs1,.layui-col-xs10,.layui-col-xs11,.layui-col-xs12,.layui-col-xs2,.layui-col-xs3,.layui-col-xs4,.layui-col-xs5,.layui-col-xs6,.layui-col-xs7,.layui-col-xs8,.layui-col-xs9{position:relative;display:block;box-sizing:border-box}.layui-col-xs1,.layui-col-xs10,.layui-col-xs11,.layui-col-xs12,.layui-col-xs2,.layui-col-xs3,.layui-col-xs4,.layui-col-xs5,.layui-col-xs6,.layui-col-xs7,.layui-col-xs8,.layui-col-xs9{float:left}.layui-col-xs1{width:8.33333333%}.layui-col-xs2{width:16.66666667%}.layui-col-xs3{width:25%}.layui-col-xs4{width:33.33333333%}.layui-col-xs5{width:41.66666667%}.layui-col-xs6{width:50%}.layui-col-xs7{width:58.33333333%}.layui-col-xs8{width:66.66666667%}.layui-col-xs9{width:75%}.layui-col-xs10{width:83.33333333%}.layui-col-xs11{width:91.66666667%}.layui-col-xs12{width:100%}.layui-col-xs-offset1{margin-left:8.33333333%}.layui-col-xs-offset2{margin-left:16.66666667%}.layui-col-xs-offset3{margin-left:25%}.layui-col-xs-offset4{margin-left:33.33333333%}.layui-col-xs-offset5{margin-left:41.66666667%}.layui-col-xs-offset6{margin-left:50%}.layui-col-xs-offset7{margin-left:58.33333333%}.layui-col-xs-offset8{margin-left:66.66666667%}.layui-col-xs-offset9{margin-left:75%}.layui-col-xs-offset10{margin-left:83.33333333%}.layui-col-xs-offset11{margin-left:91.66666667%}.layui-col-xs-offset12{margin-left:100%}@media screen and (max-width:768px){.layui-hide-xs{display:none!important}.layui-show-xs-block{display:block!important}.layui-show-xs-inline{display:inline!important}.layui-show-xs-inline-block{display:inline-block!important}}@media screen and (min-width:768px){.layui-container{width:750px}.layui-hide-sm{display:none!important}.layui-show-sm-block{display:block!important}.layui-show-sm-inline{display:inline!important}.layui-show-sm-inline-block{display:inline-block!important}.layui-col-sm1,.layui-col-sm10,.layui-col-sm11,.layui-col-sm12,.layui-col-sm2,.layui-col-sm3,.layui-col-sm4,.layui-col-sm5,.layui-col-sm6,.layui-col-sm7,.layui-col-sm8,.layui-col-sm9{float:left}.layui-col-sm1{width:8.33333333%}.layui-col-sm2{width:16.66666667%}.layui-col-sm3{width:25%}.layui-col-sm4{width:33.33333333%}.layui-col-sm5{width:41.66666667%}.layui-col-sm6{width:50%}.layui-col-sm7{width:58.33333333%}.layui-col-sm8{width:66.66666667%}.layui-col-sm9{width:75%}.layui-col-sm10{width:83.33333333%}.layui-col-sm11{width:91.66666667%}.layui-col-sm12{width:100%}.layui-col-sm-offset1{margin-left:8.33333333%}.layui-col-sm-offset2{margin-left:16.66666667%}.layui-col-sm-offset3{margin-left:25%}.layui-col-sm-offset4{margin-left:33.33333333%}.layui-col-sm-offset5{margin-left:41.66666667%}.layui-col-sm-offset6{margin-left:50%}.layui-col-sm-offset7{margin-left:58.33333333%}.layui-col-sm-offset8{margin-left:66.66666667%}.layui-col-sm-offset9{margin-left:75%}.layui-col-sm-offset10{margin-left:83.33333333%}.layui-col-sm-offset11{margin-left:91.66666667%}.layui-col-sm-offset12{margin-left:100%}}@media screen and (min-width:992px){.layui-container{width:970px}.layui-hide-md{display:none!important}.layui-show-md-block{display:block!important}.layui-show-md-inline{display:inline!important}.layui-show-md-inline-block{display:inline-block!important}.layui-col-md1,.layui-col-md10,.layui-col-md11,.layui-col-md12,.layui-col-md2,.layui-col-md3,.layui-col-md4,.layui-col-md5,.layui-col-md6,.layui-col-md7,.layui-col-md8,.layui-col-md9{float:left}.layui-col-md1{width:8.33333333%}.layui-col-md2{width:16.66666667%}.layui-col-md3{width:25%}.layui-col-md4{width:33.33333333%}.layui-col-md5{width:41.66666667%}.layui-col-md6{width:50%}.layui-col-md7{width:58.33333333%}.layui-col-md8{width:66.66666667%}.layui-col-md9{width:75%}.layui-col-md10{width:83.33333333%}.layui-col-md11{width:91.66666667%}.layui-col-md12{width:100%}.layui-col-md-offset1{margin-left:8.33333333%}.layui-col-md-offset2{margin-left:16.66666667%}.layui-col-md-offset3{margin-left:25%}.layui-col-md-offset4{margin-left:33.33333333%}.layui-col-md-offset5{margin-left:41.66666667%}.layui-col-md-offset6{margin-left:50%}.layui-col-md-offset7{margin-left:58.33333333%}.layui-col-md-offset8{margin-left:66.66666667%}.layui-col-md-offset9{margin-left:75%}.layui-col-md-offset10{margin-left:83.33333333%}.layui-col-md-offset11{margin-left:91.66666667%}.layui-col-md-offset12{margin-left:100%}}@media screen and (min-width:1200px){.layui-container{width:1170px}.layui-hide-lg{display:none!important}.layui-show-lg-block{display:block!important}.layui-show-lg-inline{display:inline!important}.layui-show-lg-inline-block{display:inline-block!important}.layui-col-lg1,.layui-col-lg10,.layui-col-lg11,.layui-col-lg12,.layui-col-lg2,.layui-col-lg3,.layui-col-lg4,.layui-col-lg5,.layui-col-lg6,.layui-col-lg7,.layui-col-lg8,.layui-col-lg9{float:left}.layui-col-lg1{width:8.33333333%}.layui-col-lg2{width:16.66666667%}.layui-col-lg3{width:25%}.layui-col-lg4{width:33.33333333%}.layui-col-lg5{width:41.66666667%}.layui-col-lg6{width:50%}.layui-col-lg7{width:58.33333333%}.layui-col-lg8{width:66.66666667%}.layui-col-lg9{width:75%}.layui-col-lg10{width:83.33333333%}.layui-col-lg11{width:91.66666667%}.layui-col-lg12{width:100%}.layui-col-lg-offset1{margin-left:8.33333333%}.layui-col-lg-offset2{margin-left:16.66666667%}.layui-col-lg-offset3{margin-left:25%}.layui-col-lg-offset4{margin-left:33.33333333%}.layui-col-lg-offset5{margin-left:41.66666667%}.layui-col-lg-offset6{margin-left:50%}.layui-col-lg-offset7{margin-left:58.33333333%}.layui-col-lg-offset8{margin-left:66.66666667%}.layui-col-lg-offset9{margin-left:75%}.layui-col-lg-offset10{margin-left:83.33333333%}.layui-col-lg-offset11{margin-left:91.66666667%}.layui-col-lg-offset12{margin-left:100%}}.layui-col-space1{margin:-.5px}.layui-col-space1>*{padding:.5px}.layui-col-space3{margin:-1.5px}.layui-col-space3>*{padding:1.5px}.layui-col-space5{margin:-2.5px}.layui-col-space5>*{padding:2.5px}.layui-col-space8{margin:-3.5px}.layui-col-space8>*{padding:3.5px}.layui-col-space10{margin:-5px}.layui-col-space10>*{padding:5px}.layui-col-space12{margin:-6px}.layui-col-space12>*{padding:6px}.layui-col-space15{margin:-7.5px}.layui-col-space15>*{padding:7.5px}.layui-col-space18{margin:-9px}.layui-col-space18>*{padding:9px}.layui-col-space20{margin:-10px}.layui-col-space20>*{padding:10px}.layui-col-space22{margin:-11px}.layui-col-space22>*{padding:11px}.layui-col-space25{margin:-12.5px}.layui-col-space25>*{padding:12.5px}.layui-col-space30{margin:-15px}.layui-col-space30>*{padding:15px}.layui-btn,.layui-input,.layui-select,.layui-textarea,.layui-upload-button{outline:0;-webkit-appearance:none;transition:all .3s;-webkit-transition:all .3s;box-sizing:border-box}.layui-elem-quote{margin-bottom:10px;padding:15px;line-height:22px;border-left:5px solid #009688;border-radius:0 2px 2px 0;background-color:#f2f2f2}.layui-quote-nm{border-style:solid;border-width:1px 1px 1px 5px;background:0 0}.layui-elem-field{margin-bottom:10px;padding:0;border-width:1px;border-style:solid}.layui-elem-field legend{margin-left:20px;padding:0 10px;font-size:20px;font-weight:300}.layui-field-title{margin:10px 0 20px;border-width:1px 0 0}.layui-field-box{padding:10px 15px}.layui-field-title .layui-field-box{padding:10px 0}.layui-progress{position:relative;height:6px;border-radius:20px;background-color:#e2e2e2}.layui-progress-bar{position:absolute;left:0;top:0;width:0;max-width:100%;height:6px;border-radius:20px;text-align:right;background-color:#5FB878;transition:all .3s;-webkit-transition:all .3s}.layui-progress-big,.layui-progress-big .layui-progress-bar{height:18px;line-height:18px}.layui-progress-text{position:relative;top:-20px;line-height:18px;font-size:12px;color:#666}.layui-progress-big .layui-progress-text{position:static;padding:0 10px;color:#fff}.layui-collapse{border-width:1px;border-style:solid;border-radius:2px}.layui-colla-content,.layui-colla-item{border-top-width:1px;border-top-style:solid}.layui-colla-item:first-child{border-top:none}.layui-colla-title{position:relative;height:42px;line-height:42px;padding:0 15px 0 35px;color:#333;background-color:#f2f2f2;cursor:pointer;font-size:14px;overflow:hidden}.layui-colla-content{display:none;padding:10px 15px;line-height:22px;color:#666}.layui-colla-icon{position:absolute;left:15px;top:0;font-size:14px}.layui-card{margin-bottom:15px;border-radius:2px;background-color:#fff;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}.layui-card:last-child{margin-bottom:0}.layui-card-header{position:relative;height:42px;line-height:42px;padding:0 15px;border-bottom:1px solid #f6f6f6;color:#333;border-radius:2px 2px 0 0;font-size:14px}.layui-bg-black,.layui-bg-blue,.layui-bg-cyan,.layui-bg-green,.layui-bg-orange,.layui-bg-red{color:#fff!important}.layui-card-body{position:relative;padding:10px 15px;line-height:24px}.layui-card-body[pad15]{padding:15px}.layui-card-body[pad20]{padding:20px}.layui-card-body .layui-table{margin:5px 0}.layui-card .layui-tab{margin:0}.layui-panel-window{position:relative;padding:15px;border-radius:0;border-top:5px solid #E6E6E6;background-color:#fff}.layui-auxiliar-moving{position:fixed;left:0;right:0;top:0;bottom:0;width:100%;height:100%;background:0 0;z-index:9999999999}.layui-form-label,.layui-form-mid,.layui-form-select,.layui-input-block,.layui-input-inline,.layui-textarea{position:relative}.layui-bg-red{background-color:#FF5722!important}.layui-bg-orange{background-color:#FFB800!important}.layui-bg-green{background-color:#009688!important}.layui-bg-cyan{background-color:#2F4056!important}.layui-bg-blue{background-color:#1E9FFF!important}.layui-bg-black{background-color:#393D49!important}.layui-bg-gray{background-color:#eee!important;color:#666!important}.layui-badge-rim,.layui-colla-content,.layui-colla-item,.layui-collapse,.layui-elem-field,.layui-form-pane .layui-form-item[pane],.layui-form-pane .layui-form-label,.layui-input,.layui-layedit,.layui-layedit-tool,.layui-quote-nm,.layui-select,.layui-tab-bar,.layui-tab-card,.layui-tab-title,.layui-tab-title .layui-this:after,.layui-textarea{border-color:#e6e6e6}.layui-timeline-item:before,hr{background-color:#e6e6e6}.layui-text{line-height:22px;font-size:14px;color:#666}.layui-text h1,.layui-text h2,.layui-text h3{font-weight:500;color:#333}.layui-text h1{font-size:30px}.layui-text h2{font-size:24px}.layui-text h3{font-size:18px}.layui-text a:not(.layui-btn){color:#01AAED}.layui-text a:not(.layui-btn):hover{text-decoration:underline}.layui-text ul{padding:5px 0 5px 15px}.layui-text ul li{margin-top:5px;list-style-type:disc}.layui-text em,.layui-word-aux{color:#999!important;padding:0 5px!important}.layui-btn{display:inline-block;height:38px;line-height:38px;padding:0 18px;background-color:#009688;color:#fff;white-space:nowrap;text-align:center;font-size:14px;border:none;border-radius:2px;cursor:pointer}.layui-btn:hover{opacity:.8;filter:alpha(opacity=80);color:#fff}.layui-btn:active{opacity:1;filter:alpha(opacity=100)}.layui-btn+.layui-btn{margin-left:10px}.layui-btn-container{font-size:0}.layui-btn-container .layui-btn{margin-right:10px;margin-bottom:10px}.layui-btn-container .layui-btn+.layui-btn{margin-left:0}.layui-table .layui-btn-container .layui-btn{margin-bottom:9px}.layui-btn-radius{border-radius:100px}.layui-btn .layui-icon{margin-right:3px;font-size:18px;vertical-align:bottom;vertical-align:middle\9}.layui-btn-primary{border:1px solid #C9C9C9;background-color:#fff;color:#555}.layui-btn-primary:hover{border-color:#009688;color:#333}.layui-btn-normal{background-color:#1E9FFF}.layui-btn-warm{background-color:#FFB800}.layui-btn-danger{background-color:#FF5722}.layui-btn-disabled,.layui-btn-disabled:active,.layui-btn-disabled:hover{border:1px solid #e6e6e6;background-color:#FBFBFB;color:#C9C9C9;cursor:not-allowed;opacity:1}.layui-btn-lg{height:44px;line-height:44px;padding:0 25px;font-size:16px}.layui-btn-sm{height:30px;line-height:30px;padding:0 10px;font-size:12px}.layui-btn-sm i{font-size:16px!important}.layui-btn-xs{height:22px;line-height:22px;padding:0 5px;font-size:12px}.layui-btn-xs i{font-size:14px!important}.layui-btn-group{display:inline-block;vertical-align:middle;font-size:0}.layui-btn-group .layui-btn{margin-left:0!important;margin-right:0!important;border-left:1px solid rgba(255,255,255,.5);border-radius:0}.layui-btn-group .layui-btn-primary{border-left:none}.layui-btn-group .layui-btn-primary:hover{border-color:#C9C9C9;color:#009688}.layui-btn-group .layui-btn:first-child{border-left:none;border-radius:2px 0 0 2px}.layui-btn-group .layui-btn-primary:first-child{border-left:1px solid #c9c9c9}.layui-btn-group .layui-btn:last-child{border-radius:0 2px 2px 0}.layui-btn-group .layui-btn+.layui-btn{margin-left:0}.layui-btn-group+.layui-btn-group{margin-left:10px}.layui-btn-fluid{width:100%}.layui-input,.layui-select,.layui-textarea{height:38px;line-height:1.3;line-height:38px\9;border-width:1px;border-style:solid;background-color:#fff;border-radius:2px}.layui-input::-webkit-input-placeholder,.layui-select::-webkit-input-placeholder,.layui-textarea::-webkit-input-placeholder{line-height:1.3}.layui-input,.layui-textarea{display:block;width:100%;padding-left:10px}.layui-input:hover,.layui-textarea:hover{border-color:#D2D2D2!important}.layui-input:focus,.layui-textarea:focus{border-color:#C9C9C9!important}.layui-textarea{min-height:100px;height:auto;line-height:20px;padding:6px 10px;resize:vertical}.layui-select{padding:0 10px}.layui-form input[type=checkbox],.layui-form input[type=radio],.layui-form select{display:none}.layui-form [lay-ignore]{display:initial}.layui-form-item{margin-bottom:15px;clear:both;*zoom:1}.layui-form-item:after{content:'\20';clear:both;*zoom:1;display:block;height:0}.layui-form-label{float:left;display:block;padding:9px 15px;width:80px;font-weight:400;line-height:20px;text-align:right}.layui-form-label-col{display:block;float:none;padding:9px 0;line-height:20px;text-align:left}.layui-form-item .layui-inline{margin-bottom:5px;margin-right:10px}.layui-input-block{margin-left:110px;min-height:36px}.layui-input-inline{display:inline-block;vertical-align:middle}.layui-form-item .layui-input-inline{float:left;width:190px;margin-right:10px}.layui-form-text .layui-input-inline{width:auto}.layui-form-mid{float:left;display:block;padding:9px 0!important;line-height:20px;margin-right:10px}.layui-form-danger+.layui-form-select .layui-input,.layui-form-danger:focus{border-color:#FF5722!important}.layui-form-select .layui-input{padding-right:30px;cursor:pointer}.layui-form-select .layui-edge{position:absolute;right:10px;top:50%;margin-top:-3px;cursor:pointer;border-width:6px;border-top-color:#c2c2c2;border-top-style:solid;transition:all .3s;-webkit-transition:all .3s}.layui-form-select dl{display:none;position:absolute;left:0;top:42px;padding:5px 0;z-index:899;min-width:100%;border:1px solid #d2d2d2;max-height:300px;overflow-y:auto;background-color:#fff;border-radius:2px;box-shadow:0 2px 4px rgba(0,0,0,.12);box-sizing:border-box}.layui-form-select dl dd,.layui-form-select dl dt{padding:0 10px;line-height:36px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.layui-form-select dl dt{font-size:12px;color:#999}.layui-form-select dl dd{cursor:pointer}.layui-form-select dl dd:hover{background-color:#f2f2f2;-webkit-transition:.5s all;transition:.5s all}.layui-form-select .layui-select-group dd{padding-left:20px}.layui-form-select dl dd.layui-select-tips{padding-left:10px!important;color:#999}.layui-form-select dl dd.layui-this{background-color:#5FB878;color:#fff}.layui-form-checkbox,.layui-form-select dl dd.layui-disabled{background-color:#fff}.layui-form-selected dl{display:block}.layui-form-checkbox,.layui-form-checkbox *,.layui-form-switch{display:inline-block;vertical-align:middle}.layui-form-selected .layui-edge{margin-top:-9px;-webkit-transform:rotate(180deg);transform:rotate(180deg);margin-top:-3px\9}:root .layui-form-selected .layui-edge{margin-top:-9px\0/IE9}.layui-form-selectup dl{top:auto;bottom:42px}.layui-select-none{margin:5px 0;text-align:center;color:#999}.layui-select-disabled .layui-disabled{border-color:#eee!important}.layui-select-disabled .layui-edge{border-top-color:#d2d2d2}.layui-form-checkbox{position:relative;height:30px;line-height:30px;margin-right:10px;padding-right:30px;cursor:pointer;font-size:0;-webkit-transition:.1s linear;transition:.1s linear;box-sizing:border-box}.layui-form-checkbox span{padding:0 10px;height:100%;font-size:14px;border-radius:2px 0 0 2px;background-color:#d2d2d2;color:#fff;overflow:hidden}.layui-form-checkbox:hover span{background-color:#c2c2c2}.layui-form-checkbox i{position:absolute;right:0;top:0;width:30px;height:28px;border:1px solid #d2d2d2;border-left:none;border-radius:0 2px 2px 0;color:#fff;font-size:20px;text-align:center}.layui-form-checkbox:hover i{border-color:#c2c2c2;color:#c2c2c2}.layui-form-checked,.layui-form-checked:hover{border-color:#5FB878}.layui-form-checked span,.layui-form-checked:hover span{background-color:#5FB878}.layui-form-checked i,.layui-form-checked:hover i{color:#5FB878}.layui-form-item .layui-form-checkbox{margin-top:4px}.layui-form-checkbox[lay-skin=primary]{height:auto!important;line-height:normal!important;min-width:18px;min-height:18px;border:none!important;margin-right:0;padding-left:28px;padding-right:0;background:0 0}.layui-form-checkbox[lay-skin=primary] span{padding-left:0;padding-right:15px;line-height:18px;background:0 0;color:#666}.layui-form-checkbox[lay-skin=primary] i{right:auto;left:0;width:16px;height:16px;line-height:16px;border:1px solid #d2d2d2;font-size:12px;border-radius:2px;background-color:#fff;-webkit-transition:.1s linear;transition:.1s linear}.layui-form-checkbox[lay-skin=primary]:hover i{border-color:#5FB878;color:#fff}.layui-form-checked[lay-skin=primary] i{border-color:#5FB878;background-color:#5FB878;color:#fff}.layui-checkbox-disbaled[lay-skin=primary] span{background:0 0!important;color:#c2c2c2}.layui-checkbox-disbaled[lay-skin=primary]:hover i{border-color:#d2d2d2}.layui-form-item .layui-form-checkbox[lay-skin=primary]{margin-top:10px}.layui-form-switch{position:relative;height:22px;line-height:22px;min-width:35px;padding:0 5px;margin-top:8px;border:1px solid #d2d2d2;border-radius:20px;cursor:pointer;background-color:#fff;-webkit-transition:.1s linear;transition:.1s linear}.layui-form-switch i{position:absolute;left:5px;top:3px;width:16px;height:16px;border-radius:20px;background-color:#d2d2d2;-webkit-transition:.1s linear;transition:.1s linear}.layui-form-switch em{position:relative;top:0;width:25px;margin-left:21px;padding:0!important;text-align:center!important;color:#999!important;font-style:normal!important;font-size:12px}.layui-form-onswitch{border-color:#5FB878;background-color:#5FB878}.layui-checkbox-disbaled,.layui-checkbox-disbaled i{border-color:#e2e2e2!important}.layui-form-onswitch i{left:100%;margin-left:-21px;background-color:#fff}.layui-form-onswitch em{margin-left:5px;margin-right:21px;color:#fff!important}.layui-checkbox-disbaled span{background-color:#e2e2e2!important}.layui-checkbox-disbaled:hover i{color:#fff!important}[lay-radio]{display:none}.layui-form-radio,.layui-form-radio *{display:inline-block;vertical-align:middle}.layui-form-radio{line-height:28px;margin:6px 10px 0 0;padding-right:10px;cursor:pointer;font-size:0}.layui-form-radio *{font-size:14px}.layui-form-radio>i{margin-right:8px;font-size:22px;color:#c2c2c2}.layui-form-radio>i:hover,.layui-form-radioed>i{color:#5FB878}.layui-radio-disbaled>i{color:#e2e2e2!important}.layui-form-pane .layui-form-label{width:110px;padding:8px 15px;height:38px;line-height:20px;border-width:1px;border-style:solid;border-radius:2px 0 0 2px;text-align:center;background-color:#FBFBFB;overflow:hidden;box-sizing:border-box}.layui-form-pane .layui-input-inline{margin-left:-1px}.layui-form-pane .layui-input-block{margin-left:110px;left:-1px}.layui-form-pane .layui-input{border-radius:0 2px 2px 0}.layui-form-pane .layui-form-text .layui-form-label{float:none;width:100%;border-radius:2px;box-sizing:border-box;text-align:left}.layui-form-pane .layui-form-text .layui-input-inline{display:block;margin:0;top:-1px;clear:both}.layui-form-pane .layui-form-text .layui-input-block{margin:0;left:0;top:-1px}.layui-form-pane .layui-form-text .layui-textarea{min-height:100px;border-radius:0 0 2px 2px}.layui-form-pane .layui-form-checkbox{margin:4px 0 4px 10px}.layui-form-pane .layui-form-radio,.layui-form-pane .layui-form-switch{margin-top:6px;margin-left:10px}.layui-form-pane .layui-form-item[pane]{position:relative;border-width:1px;border-style:solid}.layui-form-pane .layui-form-item[pane] .layui-form-label{position:absolute;left:0;top:0;height:100%;border-width:0 1px 0 0}.layui-form-pane .layui-form-item[pane] .layui-input-inline{margin-left:110px}@media screen and (max-width:450px){.layui-form-item .layui-form-label{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-form-item .layui-inline{display:block;margin-right:0;margin-bottom:20px;clear:both}.layui-form-item .layui-inline:after{content:'\20';clear:both;display:block;height:0}.layui-form-item .layui-input-inline{display:block;float:none;left:-3px;width:auto;margin:0 0 10px 112px}.layui-form-item .layui-input-inline+.layui-form-mid{margin-left:110px;top:-5px;padding:0}.layui-form-item .layui-form-checkbox{margin-right:5px;margin-bottom:5px}}.layui-layedit{border-width:1px;border-style:solid;border-radius:2px}.layui-layedit-tool{padding:3px 5px;border-bottom-width:1px;border-bottom-style:solid;font-size:0}.layedit-tool-fixed{position:fixed;top:0;border-top:1px solid #e2e2e2}.layui-layedit-tool .layedit-tool-mid,.layui-layedit-tool .layui-icon{display:inline-block;vertical-align:middle;text-align:center;font-size:14px}.layui-layedit-tool .layui-icon{position:relative;width:32px;height:30px;line-height:30px;margin:3px 5px;color:#777;cursor:pointer;border-radius:2px}.layui-layedit-tool .layui-icon:hover{color:#393D49}.layui-layedit-tool .layui-icon:active{color:#000}.layui-layedit-tool .layedit-tool-active{background-color:#e2e2e2;color:#000}.layui-layedit-tool .layui-disabled,.layui-layedit-tool .layui-disabled:hover{color:#d2d2d2;cursor:not-allowed}.layui-layedit-tool .layedit-tool-mid{width:1px;height:18px;margin:0 10px;background-color:#d2d2d2}.layedit-tool-html{width:50px!important;font-size:30px!important}.layedit-tool-b,.layedit-tool-code,.layedit-tool-help{font-size:16px!important}.layedit-tool-d,.layedit-tool-face,.layedit-tool-image,.layedit-tool-unlink{font-size:18px!important}.layedit-tool-image input{position:absolute;font-size:0;left:0;top:0;width:100%;height:100%;opacity:.01;filter:Alpha(opacity=1);cursor:pointer}.layui-layedit-iframe iframe{display:block;width:100%}#LAY_layedit_code{overflow:hidden}.layui-laypage{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;margin:10px 0;font-size:0}.layui-laypage>a:first-child,.layui-laypage>a:first-child em{border-radius:2px 0 0 2px}.layui-laypage>a:last-child,.layui-laypage>a:last-child em{border-radius:0 2px 2px 0}.layui-laypage>:first-child{margin-left:0!important}.layui-laypage>:last-child{margin-right:0!important}.layui-laypage a,.layui-laypage button,.layui-laypage input,.layui-laypage select,.layui-laypage span{border:1px solid #e2e2e2}.layui-laypage a,.layui-laypage span{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding:0 15px;height:28px;line-height:28px;margin:0 -1px 5px 0;background-color:#fff;color:#333;font-size:12px}.layui-flow-more a *,.layui-laypage input,.layui-table-view select[lay-ignore]{display:inline-block}.layui-laypage a:hover{color:#009688}.layui-laypage em{font-style:normal}.layui-laypage .layui-laypage-spr{color:#999;font-weight:700}.layui-laypage a{text-decoration:none}.layui-laypage .layui-laypage-curr{position:relative}.layui-laypage .layui-laypage-curr em{position:relative;color:#fff}.layui-laypage .layui-laypage-curr .layui-laypage-em{position:absolute;left:-1px;top:-1px;padding:1px;width:100%;height:100%;background-color:#009688}.layui-laypage-em{border-radius:2px}.layui-laypage-next em,.layui-laypage-prev em{font-family:Sim sun;font-size:16px}.layui-laypage .layui-laypage-count,.layui-laypage .layui-laypage-limits,.layui-laypage .layui-laypage-refresh,.layui-laypage .layui-laypage-skip{margin-left:10px;margin-right:10px;padding:0;border:none}.layui-laypage .layui-laypage-limits,.layui-laypage .layui-laypage-refresh{vertical-align:top}.layui-laypage .layui-laypage-refresh i{font-size:18px;cursor:pointer}.layui-laypage select{height:22px;padding:3px;border-radius:2px;cursor:pointer}.layui-laypage .layui-laypage-skip{height:30px;line-height:30px;color:#999}.layui-laypage button,.layui-laypage input{height:30px;line-height:30px;border-radius:2px;vertical-align:top;background-color:#fff;box-sizing:border-box}.layui-laypage input{width:40px;margin:0 10px;padding:0 3px;text-align:center}.layui-laypage input:focus,.layui-laypage select:focus{border-color:#009688!important}.layui-laypage button{margin-left:10px;padding:0 10px;cursor:pointer}.layui-table,.layui-table-view{margin:10px 0}.layui-flow-more{margin:10px 0;text-align:center;color:#999;font-size:14px}.layui-flow-more a{height:32px;line-height:32px}.layui-flow-more a *{vertical-align:top}.layui-flow-more a cite{padding:0 20px;border-radius:3px;background-color:#eee;color:#333;font-style:normal}.layui-flow-more a cite:hover{opacity:.8}.layui-flow-more a i{font-size:30px;color:#737383}.layui-table{width:100%;background-color:#fff;color:#666}.layui-table tr{transition:all .3s;-webkit-transition:all .3s}.layui-table th{text-align:left;font-weight:400}.layui-table tbody tr:hover,.layui-table thead tr,.layui-table-click,.layui-table-header,.layui-table-hover,.layui-table-mend,.layui-table-patch,.layui-table-tool,.layui-table-total,.layui-table-total tr,.layui-table[lay-even] tr:nth-child(even){background-color:#f2f2f2}.layui-table td,.layui-table th,.layui-table-col-set,.layui-table-fixed-r,.layui-table-grid-down,.layui-table-header,.layui-table-page,.layui-table-tips-main,.layui-table-tool,.layui-table-total,.layui-table-view,.layui-table[lay-skin=line],.layui-table[lay-skin=row]{border-width:1px;border-style:solid;border-color:#e6e6e6}.layui-table td,.layui-table th{position:relative;padding:9px 15px;min-height:20px;line-height:20px;font-size:14px}.layui-table[lay-skin=line] td,.layui-table[lay-skin=line] th{border-width:0 0 1px}.layui-table[lay-skin=row] td,.layui-table[lay-skin=row] th{border-width:0 1px 0 0}.layui-table[lay-skin=nob] td,.layui-table[lay-skin=nob] th{border:none}.layui-table img{max-width:100px}.layui-table[lay-size=lg] td,.layui-table[lay-size=lg] th{padding:15px 30px}.layui-table-view .layui-table[lay-size=lg] .layui-table-cell{height:40px;line-height:40px}.layui-table[lay-size=sm] td,.layui-table[lay-size=sm] th{font-size:12px;padding:5px 10px}.layui-table-view .layui-table[lay-size=sm] .layui-table-cell{height:20px;line-height:20px}.layui-table[lay-data]{display:none}.layui-table-box{position:relative;overflow:hidden}.layui-table-view .layui-table{position:relative;width:auto;margin:0}.layui-table-view .layui-table[lay-skin=line]{border-width:0 1px 0 0}.layui-table-view .layui-table[lay-skin=row]{border-width:0 0 1px}.layui-table-view .layui-table td,.layui-table-view .layui-table th{padding:5px 0;border-top:none;border-left:none}.layui-table-view .layui-table th.layui-unselect .layui-table-cell span{cursor:pointer}.layui-table-view .layui-table td{cursor:default}.layui-table-view .layui-form-checkbox[lay-skin=primary] i{width:18px;height:18px}.layui-table-view .layui-form-radio{line-height:0;padding:0}.layui-table-view .layui-form-radio>i{margin:0;font-size:20px}.layui-table-init{position:absolute;left:0;top:0;width:100%;height:100%;text-align:center;z-index:110}.layui-table-init .layui-icon{position:absolute;left:50%;top:50%;margin:-15px 0 0 -15px;font-size:30px;color:#c2c2c2}.layui-table-header{border-width:0 0 1px;overflow:hidden}.layui-table-header .layui-table{margin-bottom:-1px}.layui-table-tool .layui-inline[lay-event]{position:relative;width:26px;height:26px;padding:5px;line-height:16px;margin-right:10px;text-align:center;color:#333;border:1px solid #ccc;cursor:pointer;-webkit-transition:.5s all;transition:.5s all}.layui-table-tool .layui-inline[lay-event]:hover{border:1px solid #999}.layui-table-tool-temp{padding-right:120px}.layui-table-tool-self{position:absolute;right:17px;top:10px}.layui-table-tool .layui-table-tool-self .layui-inline[lay-event]{margin:0 0 0 10px}.layui-table-tool-panel{position:absolute;top:29px;left:-1px;padding:5px 0;min-width:150px;min-height:40px;border:1px solid #d2d2d2;text-align:left;overflow-y:auto;background-color:#fff;box-shadow:0 2px 4px rgba(0,0,0,.12)}.layui-table-cell,.layui-table-tool-panel li{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.layui-table-tool-panel li{padding:0 10px;line-height:30px;-webkit-transition:.5s all;transition:.5s all}.layui-table-tool-panel li .layui-form-checkbox[lay-skin=primary]{width:100%;padding-left:28px}.layui-table-tool-panel li:hover{background-color:#f2f2f2}.layui-table-tool-panel li .layui-form-checkbox[lay-skin=primary] i{position:absolute;left:0;top:0}.layui-table-tool-panel li .layui-form-checkbox[lay-skin=primary] span{padding:0}.layui-table-tool .layui-table-tool-self .layui-table-tool-panel{left:auto;right:-1px}.layui-table-col-set{position:absolute;right:0;top:0;width:20px;height:100%;border-width:0 0 0 1px;background-color:#fff}.layui-table-sort{width:10px;height:20px;margin-left:5px;cursor:pointer!important}.layui-table-sort .layui-edge{position:absolute;left:5px;border-width:5px}.layui-table-sort .layui-table-sort-asc{top:3px;border-top:none;border-bottom-style:solid;border-bottom-color:#b2b2b2}.layui-table-sort .layui-table-sort-asc:hover{border-bottom-color:#666}.layui-table-sort .layui-table-sort-desc{bottom:5px;border-bottom:none;border-top-style:solid;border-top-color:#b2b2b2}.layui-table-sort .layui-table-sort-desc:hover{border-top-color:#666}.layui-table-sort[lay-sort=asc] .layui-table-sort-asc{border-bottom-color:#000}.layui-table-sort[lay-sort=desc] .layui-table-sort-desc{border-top-color:#000}.layui-table-cell{height:28px;line-height:28px;padding:0 15px;position:relative;box-sizing:border-box}.layui-table-cell .layui-form-checkbox[lay-skin=primary]{top:-1px;padding:0}.layui-table-cell .layui-table-link{color:#01AAED}.laytable-cell-checkbox,.laytable-cell-numbers,.laytable-cell-radio,.laytable-cell-space{padding:0;text-align:center}.layui-table-body{position:relative;overflow:auto;margin-right:-1px;margin-bottom:-1px}.layui-table-body .layui-none{line-height:26px;padding:15px;text-align:center;color:#999}.layui-table-fixed{position:absolute;left:0;top:0;z-index:101}.layui-table-fixed .layui-table-body{overflow:hidden}.layui-table-fixed-l{box-shadow:0 -1px 8px rgba(0,0,0,.08)}.layui-table-fixed-r{left:auto;right:-1px;border-width:0 0 0 1px;box-shadow:-1px 0 8px rgba(0,0,0,.08)}.layui-table-fixed-r .layui-table-header{position:relative;overflow:visible}.layui-table-mend{position:absolute;right:-49px;top:0;height:100%;width:50px}.layui-table-tool{position:relative;z-index:890;width:100%;min-height:50px;line-height:30px;padding:10px 15px;border-width:0 0 1px}.layui-table-tool .layui-btn-container{margin-bottom:-10px}.layui-table-page,.layui-table-total{border-width:1px 0 0;margin-bottom:-1px;overflow:hidden}.layui-table-page{position:relative;width:100%;padding:7px 7px 0;height:41px;font-size:12px;white-space:nowrap}.layui-table-page>div{height:26px}.layui-table-page .layui-laypage{margin:0}.layui-table-page .layui-laypage a,.layui-table-page .layui-laypage span{height:26px;line-height:26px;margin-bottom:10px;border:none;background:0 0}.layui-table-page .layui-laypage a,.layui-table-page .layui-laypage span.layui-laypage-curr{padding:0 12px}.layui-table-page .layui-laypage span{margin-left:0;padding:0}.layui-table-page .layui-laypage .layui-laypage-prev{margin-left:-7px!important}.layui-table-page .layui-laypage .layui-laypage-curr .layui-laypage-em{left:0;top:0;padding:0}.layui-table-page .layui-laypage button,.layui-table-page .layui-laypage input{height:26px;line-height:26px}.layui-table-page .layui-laypage input{width:40px}.layui-table-page .layui-laypage button{padding:0 10px}.layui-table-page select{height:18px}.layui-table-patch .layui-table-cell{padding:0;width:30px}.layui-table-edit{position:absolute;left:0;top:0;width:100%;height:100%;padding:0 14px 1px;border-radius:0;box-shadow:1px 1px 20px rgba(0,0,0,.15)}.layui-table-edit:focus{border-color:#5FB878!important}select.layui-table-edit{padding:0 0 0 10px;border-color:#C9C9C9}.layui-table-view .layui-form-checkbox,.layui-table-view .layui-form-radio,.layui-table-view .layui-form-switch{top:0;margin:0;box-sizing:content-box}.layui-table-view .layui-form-checkbox{top:-1px;height:26px;line-height:26px}.layui-table-view .layui-form-checkbox i{height:26px}.layui-table-grid .layui-table-cell{overflow:visible}.layui-table-grid-down{position:absolute;top:0;right:0;width:26px;height:100%;padding:5px 0;border-width:0 0 0 1px;text-align:center;background-color:#fff;color:#999;cursor:pointer}.layui-table-grid-down .layui-icon{position:absolute;top:50%;left:50%;margin:-8px 0 0 -8px}.layui-table-grid-down:hover{background-color:#fbfbfb}body .layui-table-tips .layui-layer-content{background:0 0;padding:0;box-shadow:0 1px 6px rgba(0,0,0,.12)}.layui-table-tips-main{margin:-44px 0 0 -1px;max-height:150px;padding:8px 15px;font-size:14px;overflow-y:scroll;background-color:#fff;color:#666}.layui-table-tips-c{position:absolute;right:-3px;top:-13px;width:20px;height:20px;padding:3px;cursor:pointer;background-color:#666;border-radius:50%;color:#fff}.layui-table-tips-c:hover{background-color:#777}.layui-table-tips-c:before{position:relative;right:-2px}.layui-upload-file{display:none!important;opacity:.01;filter:Alpha(opacity=1)}.layui-upload-drag,.layui-upload-form,.layui-upload-wrap{display:inline-block}.layui-upload-list{margin:10px 0}.layui-upload-choose{padding:0 10px;color:#999}.layui-upload-drag{position:relative;padding:30px;border:1px dashed #e2e2e2;background-color:#fff;text-align:center;cursor:pointer;color:#999}.layui-upload-drag .layui-icon{font-size:50px;color:#009688}.layui-upload-drag[lay-over]{border-color:#009688}.layui-upload-iframe{position:absolute;width:0;height:0;border:0;visibility:hidden}.layui-upload-wrap{position:relative;vertical-align:middle}.layui-upload-wrap .layui-upload-file{display:block!important;position:absolute;left:0;top:0;z-index:10;font-size:100px;width:100%;height:100%;opacity:.01;filter:Alpha(opacity=1);cursor:pointer}.layui-tree{line-height:26px}.layui-tree li{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-tree li .layui-tree-spread,.layui-tree li a{display:inline-block;vertical-align:top;height:26px;*display:inline;*zoom:1;cursor:pointer}.layui-tree li a{font-size:0}.layui-tree li a i{font-size:16px}.layui-tree li a cite{padding:0 6px;font-size:14px;font-style:normal}.layui-tree li i{padding-left:6px;color:#333;-moz-user-select:none}.layui-tree li .layui-tree-check{font-size:13px}.layui-tree li .layui-tree-check:hover{color:#009E94}.layui-tree li ul{display:none;margin-left:20px}.layui-tree li .layui-tree-enter{line-height:24px;border:1px dotted #000}.layui-tree-drag{display:none;position:absolute;left:-666px;top:-666px;background-color:#f2f2f2;padding:5px 10px;border:1px dotted #000;white-space:nowrap}.layui-tree-drag i{padding-right:5px}.layui-nav{position:relative;padding:0 20px;background-color:#393D49;color:#fff;border-radius:2px;font-size:0;box-sizing:border-box}.layui-nav *{font-size:14px}.layui-nav .layui-nav-item{position:relative;display:inline-block;*display:inline;*zoom:1;vertical-align:middle;line-height:60px}.layui-nav .layui-nav-item a{display:block;padding:0 20px;color:#fff;color:rgba(255,255,255,.7);transition:all .3s;-webkit-transition:all .3s}.layui-nav .layui-this:after,.layui-nav-bar,.layui-nav-tree .layui-nav-itemed:after{position:absolute;left:0;top:0;width:0;height:5px;background-color:#5FB878;transition:all .2s;-webkit-transition:all .2s}.layui-nav-bar{z-index:1000}.layui-nav .layui-nav-item a:hover,.layui-nav .layui-this a{color:#fff}.layui-nav .layui-this:after{content:'';top:auto;bottom:0;width:100%}.layui-nav-img{width:30px;height:30px;margin-right:10px;border-radius:50%}.layui-nav .layui-nav-more{content:'';width:0;height:0;border-style:solid dashed dashed;border-color:#fff transparent transparent;overflow:hidden;cursor:pointer;transition:all .2s;-webkit-transition:all .2s;position:absolute;top:50%;right:3px;margin-top:-3px;border-width:6px;border-top-color:rgba(255,255,255,.7)}.layui-nav .layui-nav-mored,.layui-nav-itemed>a .layui-nav-more{margin-top:-9px;border-style:dashed dashed solid;border-color:transparent transparent #fff}.layui-nav-child{display:none;position:absolute;left:0;top:65px;min-width:100%;line-height:36px;padding:5px 0;box-shadow:0 2px 4px rgba(0,0,0,.12);border:1px solid #d2d2d2;background-color:#fff;z-index:100;border-radius:2px;white-space:nowrap}.layui-nav .layui-nav-child a{color:#333}.layui-nav .layui-nav-child a:hover{background-color:#f2f2f2;color:#000}.layui-nav-child dd{position:relative}.layui-nav .layui-nav-child dd.layui-this a,.layui-nav-child dd.layui-this{background-color:#5FB878;color:#fff}.layui-nav-child dd.layui-this:after{display:none}.layui-nav-tree{width:200px;padding:0}.layui-nav-tree .layui-nav-item{display:block;width:100%;line-height:45px}.layui-nav-tree .layui-nav-item a{position:relative;height:45px;line-height:45px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-nav-tree .layui-nav-item a:hover{background-color:#4E5465}.layui-nav-tree .layui-nav-bar{width:5px;height:0;background-color:#009688}.layui-nav-tree .layui-nav-child dd.layui-this,.layui-nav-tree .layui-nav-child dd.layui-this a,.layui-nav-tree .layui-this,.layui-nav-tree .layui-this>a,.layui-nav-tree .layui-this>a:hover{background-color:#009688;color:#fff}.layui-nav-tree .layui-this:after{display:none}.layui-nav-itemed>a,.layui-nav-tree .layui-nav-title a,.layui-nav-tree .layui-nav-title a:hover{color:#fff!important}.layui-nav-tree .layui-nav-child{position:relative;z-index:0;top:0;border:none;box-shadow:none}.layui-nav-tree .layui-nav-child a{height:40px;line-height:40px;color:#fff;color:rgba(255,255,255,.7)}.layui-nav-tree .layui-nav-child,.layui-nav-tree .layui-nav-child a:hover{background:0 0;color:#fff}.layui-nav-tree .layui-nav-more{right:10px}.layui-nav-itemed>.layui-nav-child{display:block;padding:0;background-color:rgba(0,0,0,.3)!important}.layui-nav-itemed>.layui-nav-child>.layui-this>.layui-nav-child{display:block}.layui-nav-side{position:fixed;top:0;bottom:0;left:0;overflow-x:hidden;z-index:999}.layui-bg-blue .layui-nav-bar,.layui-bg-blue .layui-nav-itemed:after,.layui-bg-blue .layui-this:after{background-color:#93D1FF}.layui-bg-blue .layui-nav-child dd.layui-this{background-color:#1E9FFF}.layui-bg-blue .layui-nav-itemed>a,.layui-nav-tree.layui-bg-blue .layui-nav-title a,.layui-nav-tree.layui-bg-blue .layui-nav-title a:hover{background-color:#007DDB!important}.layui-breadcrumb{visibility:hidden;font-size:0}.layui-breadcrumb>*{font-size:14px}.layui-breadcrumb a{color:#999!important}.layui-breadcrumb a:hover{color:#5FB878!important}.layui-breadcrumb a cite{color:#666;font-style:normal}.layui-breadcrumb span[lay-separator]{margin:0 10px;color:#999}.layui-tab{margin:10px 0;text-align:left!important}.layui-tab[overflow]>.layui-tab-title{overflow:hidden}.layui-tab-title{position:relative;left:0;height:40px;white-space:nowrap;font-size:0;border-bottom-width:1px;border-bottom-style:solid;transition:all .2s;-webkit-transition:all .2s}.layui-tab-title li{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;font-size:14px;transition:all .2s;-webkit-transition:all .2s;position:relative;line-height:40px;min-width:65px;padding:0 15px;text-align:center;cursor:pointer}.layui-tab-title li a{display:block}.layui-tab-title .layui-this{color:#000}.layui-tab-title .layui-this:after{position:absolute;left:0;top:0;content:'';width:100%;height:41px;border-width:1px;border-style:solid;border-bottom-color:#fff;border-radius:2px 2px 0 0;box-sizing:border-box;pointer-events:none}.layui-tab-bar{position:absolute;right:0;top:0;z-index:10;width:30px;height:39px;line-height:39px;border-width:1px;border-style:solid;border-radius:2px;text-align:center;background-color:#fff;cursor:pointer}.layui-tab-bar .layui-icon{position:relative;display:inline-block;top:3px;transition:all .3s;-webkit-transition:all .3s}.layui-tab-item{display:none}.layui-tab-more{padding-right:30px;height:auto!important;white-space:normal!important}.layui-tab-more li.layui-this:after{border-bottom-color:#e2e2e2;border-radius:2px}.layui-tab-more .layui-tab-bar .layui-icon{top:-2px;top:3px\9;-webkit-transform:rotate(180deg);transform:rotate(180deg)}:root .layui-tab-more .layui-tab-bar .layui-icon{top:-2px\0/IE9}.layui-tab-content{padding:10px}.layui-tab-title li .layui-tab-close{position:relative;display:inline-block;width:18px;height:18px;line-height:20px;margin-left:8px;top:1px;text-align:center;font-size:14px;color:#c2c2c2;transition:all .2s;-webkit-transition:all .2s}.layui-tab-title li .layui-tab-close:hover{border-radius:2px;background-color:#FF5722;color:#fff}.layui-tab-brief>.layui-tab-title .layui-this{color:#009688}.layui-tab-brief>.layui-tab-more li.layui-this:after,.layui-tab-brief>.layui-tab-title .layui-this:after{border:none;border-radius:0;border-bottom:2px solid #5FB878}.layui-tab-brief[overflow]>.layui-tab-title .layui-this:after{top:-1px}.layui-tab-card{border-width:1px;border-style:solid;border-radius:2px;box-shadow:0 2px 5px 0 rgba(0,0,0,.1)}.layui-tab-card>.layui-tab-title{background-color:#f2f2f2}.layui-tab-card>.layui-tab-title li{margin-right:-1px;margin-left:-1px}.layui-tab-card>.layui-tab-title .layui-this{background-color:#fff}.layui-tab-card>.layui-tab-title .layui-this:after{border-top:none;border-width:1px;border-bottom-color:#fff}.layui-tab-card>.layui-tab-title .layui-tab-bar{height:40px;line-height:40px;border-radius:0;border-top:none;border-right:none}.layui-tab-card>.layui-tab-more .layui-this{background:0 0;color:#5FB878}.layui-tab-card>.layui-tab-more .layui-this:after{border:none}.layui-timeline{padding-left:5px}.layui-timeline-item{position:relative;padding-bottom:20px}.layui-timeline-axis{position:absolute;left:-5px;top:0;z-index:10;width:20px;height:20px;line-height:20px;background-color:#fff;color:#5FB878;border-radius:50%;text-align:center;cursor:pointer}.layui-timeline-axis:hover{color:#FF5722}.layui-timeline-item:before{content:'';position:absolute;left:5px;top:0;z-index:0;width:1px;height:100%}.layui-timeline-item:last-child:before{display:none}.layui-timeline-item:first-child:before{display:block}.layui-timeline-content{padding-left:25px}.layui-timeline-title{position:relative;margin-bottom:10px}.layui-badge,.layui-badge-dot,.layui-badge-rim{position:relative;display:inline-block;padding:0 6px;font-size:12px;text-align:center;background-color:#FF5722;color:#fff;border-radius:2px}.layui-badge{height:18px;line-height:18px}.layui-badge-dot{width:8px;height:8px;padding:0;border-radius:50%}.layui-badge-rim{height:18px;line-height:18px;border-width:1px;border-style:solid;background-color:#fff;color:#666}.layui-btn .layui-badge,.layui-btn .layui-badge-dot{margin-left:5px}.layui-nav .layui-badge,.layui-nav .layui-badge-dot{position:absolute;top:50%;margin:-8px 6px 0}.layui-tab-title .layui-badge,.layui-tab-title .layui-badge-dot{left:5px;top:-2px}.layui-carousel{position:relative;left:0;top:0;background-color:#f8f8f8}.layui-carousel>[carousel-item]{position:relative;width:100%;height:100%;overflow:hidden}.layui-carousel>[carousel-item]:before{position:absolute;content:'\e63d';left:50%;top:50%;width:100px;line-height:20px;margin:-10px 0 0 -50px;text-align:center;color:#c2c2c2;font-family:layui-icon!important;font-size:30px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.layui-carousel>[carousel-item]>*{display:none;position:absolute;left:0;top:0;width:100%;height:100%;background-color:#f8f8f8;transition-duration:.3s;-webkit-transition-duration:.3s}.layui-carousel-updown>*{-webkit-transition:.3s ease-in-out up;transition:.3s ease-in-out up}.layui-carousel-arrow{display:none\9;opacity:0;position:absolute;left:10px;top:50%;margin-top:-18px;width:36px;height:36px;line-height:36px;text-align:center;font-size:20px;border:0;border-radius:50%;background-color:rgba(0,0,0,.2);color:#fff;-webkit-transition-duration:.3s;transition-duration:.3s;cursor:pointer}.layui-carousel-arrow[lay-type=add]{left:auto!important;right:10px}.layui-carousel:hover .layui-carousel-arrow[lay-type=add],.layui-carousel[lay-arrow=always] .layui-carousel-arrow[lay-type=add]{right:20px}.layui-carousel[lay-arrow=always] .layui-carousel-arrow{opacity:1;left:20px}.layui-carousel[lay-arrow=none] .layui-carousel-arrow{display:none}.layui-carousel-arrow:hover,.layui-carousel-ind ul:hover{background-color:rgba(0,0,0,.35)}.layui-carousel:hover .layui-carousel-arrow{display:block\9;opacity:1;left:20px}.layui-carousel-ind{position:relative;top:-35px;width:100%;line-height:0!important;text-align:center;font-size:0}.layui-carousel[lay-indicator=outside]{margin-bottom:30px}.layui-carousel[lay-indicator=outside] .layui-carousel-ind{top:10px}.layui-carousel[lay-indicator=outside] .layui-carousel-ind ul{background-color:rgba(0,0,0,.5)}.layui-carousel[lay-indicator=none] .layui-carousel-ind{display:none}.layui-carousel-ind ul{display:inline-block;padding:5px;background-color:rgba(0,0,0,.2);border-radius:10px;-webkit-transition-duration:.3s;transition-duration:.3s}.layui-carousel-ind li{display:inline-block;width:10px;height:10px;margin:0 3px;font-size:14px;background-color:#e2e2e2;background-color:rgba(255,255,255,.5);border-radius:50%;cursor:pointer;-webkit-transition-duration:.3s;transition-duration:.3s}.layui-carousel-ind li:hover{background-color:rgba(255,255,255,.7)}.layui-carousel-ind li.layui-this{background-color:#fff}.layui-carousel>[carousel-item]>.layui-carousel-next,.layui-carousel>[carousel-item]>.layui-carousel-prev,.layui-carousel>[carousel-item]>.layui-this{display:block}.layui-carousel>[carousel-item]>.layui-this{left:0}.layui-carousel>[carousel-item]>.layui-carousel-prev{left:-100%}.layui-carousel>[carousel-item]>.layui-carousel-next{left:100%}.layui-carousel>[carousel-item]>.layui-carousel-next.layui-carousel-left,.layui-carousel>[carousel-item]>.layui-carousel-prev.layui-carousel-right{left:0}.layui-carousel>[carousel-item]>.layui-this.layui-carousel-left{left:-100%}.layui-carousel>[carousel-item]>.layui-this.layui-carousel-right{left:100%}.layui-carousel[lay-anim=updown] .layui-carousel-arrow{left:50%!important;top:20px;margin:0 0 0 -18px}.layui-carousel[lay-anim=updown]>[carousel-item]>*,.layui-carousel[lay-anim=fade]>[carousel-item]>*{left:0!important}.layui-carousel[lay-anim=updown] .layui-carousel-arrow[lay-type=add]{top:auto!important;bottom:20px}.layui-carousel[lay-anim=updown] .layui-carousel-ind{position:absolute;top:50%;right:20px;width:auto;height:auto}.layui-carousel[lay-anim=updown] .layui-carousel-ind ul{padding:3px 5px}.layui-carousel[lay-anim=updown] .layui-carousel-ind li{display:block;margin:6px 0}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-this{top:0}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-carousel-prev{top:-100%}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-carousel-next{top:100%}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-carousel-next.layui-carousel-left,.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-carousel-prev.layui-carousel-right{top:0}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-this.layui-carousel-left{top:-100%}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-this.layui-carousel-right{top:100%}.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-next,.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-prev{opacity:0}.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-next.layui-carousel-left,.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-prev.layui-carousel-right{opacity:1}.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-this.layui-carousel-left,.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-this.layui-carousel-right{opacity:0}.layui-fixbar{position:fixed;right:15px;bottom:15px;z-index:999999}.layui-fixbar li{width:50px;height:50px;line-height:50px;margin-bottom:1px;text-align:center;cursor:pointer;font-size:30px;background-color:#9F9F9F;color:#fff;border-radius:2px;opacity:.95}.layui-fixbar li:hover{opacity:.85}.layui-fixbar li:active{opacity:1}.layui-fixbar .layui-fixbar-top{display:none;font-size:40px}body .layui-util-face{border:none;background:0 0}body .layui-util-face .layui-layer-content{padding:0;background-color:#fff;color:#666;box-shadow:none}.layui-util-face .layui-layer-TipsG{display:none}.layui-util-face ul{position:relative;width:372px;padding:10px;border:1px solid #D9D9D9;background-color:#fff;box-shadow:0 0 20px rgba(0,0,0,.2)}.layui-util-face ul li{cursor:pointer;float:left;border:1px solid #e8e8e8;height:22px;width:26px;overflow:hidden;margin:-1px 0 0 -1px;padding:4px 2px;text-align:center}.layui-util-face ul li:hover{position:relative;z-index:2;border:1px solid #eb7350;background:#fff9ec}.layui-code{position:relative;margin:10px 0;padding:15px;line-height:20px;border:1px solid #ddd;border-left-width:6px;background-color:#F2F2F2;color:#333;font-family:Courier New;font-size:12px}.layui-rate,.layui-rate *{display:inline-block;vertical-align:middle}.layui-rate{padding:10px 5px 10px 0;font-size:0}.layui-rate li i.layui-icon{font-size:20px;color:#FFB800;margin-right:5px;transition:all .3s;-webkit-transition:all .3s}.layui-rate li i:hover{cursor:pointer;transform:scale(1.12);-webkit-transform:scale(1.12)}.layui-rate[readonly] li i:hover{cursor:default;transform:scale(1)}.layui-colorpicker{width:26px;height:26px;border:1px solid #e6e6e6;padding:5px;border-radius:2px;line-height:24px;display:inline-block;cursor:pointer;transition:all .3s;-webkit-transition:all .3s}.layui-colorpicker:hover{border-color:#d2d2d2}.layui-colorpicker.layui-colorpicker-lg{width:34px;height:34px;line-height:32px}.layui-colorpicker.layui-colorpicker-sm{width:24px;height:24px;line-height:22px}.layui-colorpicker.layui-colorpicker-xs{width:22px;height:22px;line-height:20px}.layui-colorpicker-trigger-bgcolor{display:block;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg==);border-radius:2px}.layui-colorpicker-trigger-span{display:block;height:100%;box-sizing:border-box;border:1px solid rgba(0,0,0,.15);border-radius:2px;text-align:center}.layui-colorpicker-trigger-i{display:inline-block;color:#FFF;font-size:12px}.layui-colorpicker-trigger-i.layui-icon-close{color:#999}.layui-colorpicker-main{position:absolute;z-index:66666666;width:280px;padding:7px;background:#FFF;border:1px solid #d2d2d2;border-radius:2px;box-shadow:0 2px 4px rgba(0,0,0,.12)}.layui-colorpicker-main-wrapper{height:180px;position:relative}.layui-colorpicker-basis{width:260px;height:100%;position:relative}.layui-colorpicker-basis-white{width:100%;height:100%;position:absolute;top:0;left:0;background:linear-gradient(90deg,#FFF,hsla(0,0%,100%,0))}.layui-colorpicker-basis-black{width:100%;height:100%;position:absolute;top:0;left:0;background:linear-gradient(0deg,#000,transparent)}.layui-colorpicker-basis-cursor{width:10px;height:10px;border:1px solid #FFF;border-radius:50%;position:absolute;top:-3px;right:-3px;cursor:pointer}.layui-colorpicker-side{position:absolute;top:0;right:0;width:12px;height:100%;background:linear-gradient(red,#FF0,#0F0,#0FF,#00F,#F0F,red)}.layui-colorpicker-side-slider{width:100%;height:5px;box-shadow:0 0 1px #888;box-sizing:border-box;background:#FFF;border-radius:1px;border:1px solid #f0f0f0;cursor:pointer;position:absolute;left:0}.layui-colorpicker-main-alpha{display:none;height:12px;margin-top:7px;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg==)}.layui-colorpicker-alpha-bgcolor{height:100%;position:relative}.layui-colorpicker-alpha-slider{width:5px;height:100%;box-shadow:0 0 1px #888;box-sizing:border-box;background:#FFF;border-radius:1px;border:1px solid #f0f0f0;cursor:pointer;position:absolute;top:0}.layui-colorpicker-main-pre{padding-top:7px;font-size:0}.layui-colorpicker-pre{width:20px;height:20px;border-radius:2px;display:inline-block;margin-left:6px;margin-bottom:7px;cursor:pointer}.layui-colorpicker-pre:nth-child(11n+1){margin-left:0}.layui-colorpicker-pre-isalpha{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg==)}.layui-colorpicker-pre.layui-this{box-shadow:0 0 3px 2px rgba(0,0,0,.15)}.layui-colorpicker-pre>div{height:100%;border-radius:2px}.layui-colorpicker-main-input{text-align:right;padding-top:7px}.layui-colorpicker-main-input .layui-btn-container .layui-btn{margin:0 0 0 10px}.layui-colorpicker-main-input div.layui-inline{float:left;margin-right:10px;font-size:14px}.layui-colorpicker-main-input input.layui-input{width:150px;height:30px;color:#666}.layui-slider{height:4px;background:#e2e2e2;border-radius:3px;position:relative;cursor:pointer}.layui-slider-bar{border-radius:3px;position:absolute;height:100%}.layui-slider-step{position:absolute;top:0;width:4px;height:4px;border-radius:50%;background:#FFF;-webkit-transform:translateX(-50%);transform:translateX(-50%)}.layui-slider-wrap{width:36px;height:36px;position:absolute;top:-16px;-webkit-transform:translateX(-50%);transform:translateX(-50%);z-index:10;text-align:center}.layui-slider-wrap-btn{width:12px;height:12px;border-radius:50%;background:#FFF;display:inline-block;vertical-align:middle;cursor:pointer;transition:.3s}.layui-slider-wrap:after{content:"";height:100%;display:inline-block;vertical-align:middle}.layui-slider-wrap-btn.layui-slider-hover,.layui-slider-wrap-btn:hover{transform:scale(1.2)}.layui-slider-wrap-btn.layui-disabled:hover{transform:scale(1)!important}.layui-slider-tips{position:absolute;top:-42px;z-index:66666666;white-space:nowrap;display:none;-webkit-transform:translateX(-50%);transform:translateX(-50%);color:#FFF;background:#000;border-radius:3px;height:25px;line-height:25px;padding:0 10px}.layui-slider-tips:after{content:'';position:absolute;bottom:-12px;left:50%;margin-left:-6px;width:0;height:0;border-width:6px;border-style:solid;border-color:#000 transparent transparent}.layui-slider-input{width:70px;height:32px;border:1px solid #e6e6e6;border-radius:3px;font-size:16px;line-height:32px;position:absolute;right:0;top:-15px}.layui-slider-input-btn{display:none;position:absolute;top:0;right:0;width:20px;height:100%;border-left:1px solid #d2d2d2}.layui-slider-input-btn i{cursor:pointer;position:absolute;right:0;bottom:0;width:20px;height:50%;font-size:12px;line-height:16px;text-align:center;color:#999}.layui-slider-input-btn i:first-child{top:0;border-bottom:1px solid #d2d2d2}.layui-slider-input-txt{height:100%;font-size:14px}.layui-slider-input-txt input{height:100%;border:none}.layui-slider-input-btn i:hover{color:#009688}.layui-slider-vertical{width:4px;margin-left:34px}.layui-slider-vertical .layui-slider-bar{width:4px}.layui-slider-vertical .layui-slider-step{top:auto;left:0;-webkit-transform:translateY(50%);transform:translateY(50%)}.layui-slider-vertical .layui-slider-wrap{top:auto;left:-16px;-webkit-transform:translateY(50%);transform:translateY(50%)}.layui-slider-vertical .layui-slider-tips{top:auto;left:2px}@media \0screen{.layui-slider-wrap-btn{margin-left:-20px}.layui-slider-vertical .layui-slider-wrap-btn{margin-left:0;margin-bottom:-20px}.layui-slider-vertical .layui-slider-tips{margin-left:-8px}.layui-slider>span{margin-left:8px}}.layui-anim{-webkit-animation-duration:.3s;animation-duration:.3s;-webkit-animation-fill-mode:both;animation-fill-mode:both}.layui-anim.layui-icon{display:inline-block}.layui-anim-loop{-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite}.layui-trans,.layui-trans a{transition:all .3s;-webkit-transition:all .3s}@-webkit-keyframes layui-rotate{from{-webkit-transform:rotate(0)}to{-webkit-transform:rotate(360deg)}}@keyframes layui-rotate{from{transform:rotate(0)}to{transform:rotate(360deg)}}.layui-anim-rotate{-webkit-animation-name:layui-rotate;animation-name:layui-rotate;-webkit-animation-duration:1s;animation-duration:1s;-webkit-animation-timing-function:linear;animation-timing-function:linear}@-webkit-keyframes layui-up{from{-webkit-transform:translate3d(0,100%,0);opacity:.3}to{-webkit-transform:translate3d(0,0,0);opacity:1}}@keyframes layui-up{from{transform:translate3d(0,100%,0);opacity:.3}to{transform:translate3d(0,0,0);opacity:1}}.layui-anim-up{-webkit-animation-name:layui-up;animation-name:layui-up}@-webkit-keyframes layui-upbit{from{-webkit-transform:translate3d(0,30px,0);opacity:.3}to{-webkit-transform:translate3d(0,0,0);opacity:1}}@keyframes layui-upbit{from{transform:translate3d(0,30px,0);opacity:.3}to{transform:translate3d(0,0,0);opacity:1}}.layui-anim-upbit{-webkit-animation-name:layui-upbit;animation-name:layui-upbit}@-webkit-keyframes layui-scale{0%{opacity:.3;-webkit-transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1)}}@keyframes layui-scale{0%{opacity:.3;-ms-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-ms-transform:scale(1);transform:scale(1)}}.layui-anim-scale{-webkit-animation-name:layui-scale;animation-name:layui-scale}@-webkit-keyframes layui-scale-spring{0%{opacity:.5;-webkit-transform:scale(.5)}80%{opacity:.8;-webkit-transform:scale(1.1)}100%{opacity:1;-webkit-transform:scale(1)}}@keyframes layui-scale-spring{0%{opacity:.5;transform:scale(.5)}80%{opacity:.8;transform:scale(1.1)}100%{opacity:1;transform:scale(1)}}.layui-anim-scaleSpring{-webkit-animation-name:layui-scale-spring;animation-name:layui-scale-spring}@-webkit-keyframes layui-fadein{0%{opacity:0}100%{opacity:1}}@keyframes layui-fadein{0%{opacity:0}100%{opacity:1}}.layui-anim-fadein{-webkit-animation-name:layui-fadein;animation-name:layui-fadein}@-webkit-keyframes layui-fadeout{0%{opacity:1}100%{opacity:0}}@keyframes layui-fadeout{0%{opacity:1}100%{opacity:0}}.layui-anim-fadeout{-webkit-animation-name:layui-fadeout;animation-name:layui-fadeout}
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/layui.mobile.css b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/layui.mobile.css
new file mode 100644
index 0000000..6f7f0a1
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/layui.mobile.css
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ blockquote,body,button,dd,div,dl,dt,form,h1,h2,h3,h4,h5,h6,input,legend,li,ol,p,td,textarea,th,ul{margin:0;padding:0;-webkit-tap-highlight-color:rgba(0,0,0,0)}html{font:12px 'Helvetica Neue','PingFang SC',STHeitiSC-Light,Helvetica,Arial,sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}a,button,input{-webkit-tap-highlight-color:rgba(255,0,0,0)}a{text-decoration:none;background:0 0}a:active,a:hover{outline:0}table{border-collapse:collapse;border-spacing:0}li{list-style:none}b,strong{font-weight:700}h1,h2,h3,h4,h5,h6{font-weight:500}address,cite,dfn,em,var{font-style:normal}dfn{font-style:italic}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}img{border:0;vertical-align:bottom}.layui-inline,input,label{vertical-align:middle}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0;outline:0}button,select{text-transform:none}select{-webkit-appearance:none;border:none}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}@font-face{font-family:layui-icon;src:url(../font/iconfont.eot?v=1.0.7);src:url(../font/iconfont.eot?v=1.0.7#iefix) format('embedded-opentype'),url(../font/iconfont.woff?v=1.0.7) format('woff'),url(../font/iconfont.ttf?v=1.0.7) format('truetype'),url(../font/iconfont.svg?v=1.0.7#iconfont) format('svg')}.layui-icon{font-family:layui-icon!important;font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.layui-box,.layui-box *{-webkit-box-sizing:content-box!important;-moz-box-sizing:content-box!important;box-sizing:content-box!important}.layui-border-box,.layui-border-box *{-webkit-box-sizing:border-box!important;-moz-box-sizing:border-box!important;box-sizing:border-box!important}.layui-inline{position:relative;display:inline-block;*display:inline;*zoom:1}.layui-edge,.layui-upload-iframe{position:absolute;width:0;height:0}.layui-edge{border-style:dashed;border-color:transparent;overflow:hidden}.layui-elip{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-unselect{-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.layui-disabled,.layui-disabled:active{background-color:#d2d2d2!important;color:#fff!important;cursor:not-allowed!important}.layui-circle{border-radius:100%}.layui-show{display:block!important}.layui-hide{display:none!important}.layui-upload-iframe{border:0;visibility:hidden}.layui-upload-enter{border:1px solid #009E94;background-color:#009E94;color:#fff;-webkit-transform:scale(1.1);transform:scale(1.1)}@-webkit-keyframes layui-m-anim-scale{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}@keyframes layui-m-anim-scale{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}.layui-m-anim-scale{animation-name:layui-m-anim-scale;-webkit-animation-name:layui-m-anim-scale}@-webkit-keyframes layui-m-anim-up{0%{opacity:0;-webkit-transform:translateY(800px);transform:translateY(800px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes layui-m-anim-up{0%{opacity:0;-webkit-transform:translateY(800px);transform:translateY(800px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}.layui-m-anim-up{-webkit-animation-name:layui-m-anim-up;animation-name:layui-m-anim-up}@-webkit-keyframes layui-m-anim-left{0%{-webkit-transform:translateX(100%);transform:translateX(100%)}100%{-webkit-transform:translateX(0);transform:translateX(0)}}@keyframes layui-m-anim-left{0%{-webkit-transform:translateX(100%);transform:translateX(100%)}100%{-webkit-transform:translateX(0);transform:translateX(0)}}.layui-m-anim-left{-webkit-animation-name:layui-m-anim-left;animation-name:layui-m-anim-left}@-webkit-keyframes layui-m-anim-right{0%{-webkit-transform:translateX(-100%);transform:translateX(-100%)}100%{-webkit-transform:translateX(0);transform:translateX(0)}}@keyframes layui-m-anim-right{0%{-webkit-transform:translateX(-100%);transform:translateX(-100%)}100%{-webkit-transform:translateX(0);transform:translateX(0)}}.layui-m-anim-right{-webkit-animation-name:layui-m-anim-right;animation-name:layui-m-anim-right}@-webkit-keyframes layui-m-anim-lout{0%{-webkit-transform:translateX(0);transform:translateX(0)}100%{-webkit-transform:translateX(-100%);transform:translateX(-100%)}}@keyframes layui-m-anim-lout{0%{-webkit-transform:translateX(0);transform:translateX(0)}100%{-webkit-transform:translateX(-100%);transform:translateX(-100%)}}.layui-m-anim-lout{-webkit-animation-name:layui-m-anim-lout;animation-name:layui-m-anim-lout}@-webkit-keyframes layui-m-anim-rout{0%{-webkit-transform:translateX(0);transform:translateX(0)}100%{-webkit-transform:translateX(100%);transform:translateX(100%)}}@keyframes layui-m-anim-rout{0%{-webkit-transform:translateX(0);transform:translateX(0)}100%{-webkit-transform:translateX(100%);transform:translateX(100%)}}.layui-m-anim-rout{-webkit-animation-name:layui-m-anim-rout;animation-name:layui-m-anim-rout}.layui-m-layer{position:relative;z-index:19891014}.layui-m-layer *{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.layui-m-layermain,.layui-m-layershade{position:fixed;left:0;top:0;width:100%;height:100%}.layui-m-layershade{background-color:rgba(0,0,0,.7);pointer-events:auto}.layui-m-layermain{display:table;font-family:Helvetica,arial,sans-serif;pointer-events:none}.layui-m-layermain .layui-m-layersection{display:table-cell;vertical-align:middle;text-align:center}.layui-m-layerchild{position:relative;display:inline-block;text-align:left;background-color:#fff;font-size:14px;border-radius:5px;box-shadow:0 0 8px rgba(0,0,0,.1);pointer-events:auto;-webkit-overflow-scrolling:touch;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.2s;animation-duration:.2s}.layui-m-layer0 .layui-m-layerchild{width:90%;max-width:640px}.layui-m-layer1 .layui-m-layerchild{border:none;border-radius:0}.layui-m-layer2 .layui-m-layerchild{width:auto;max-width:260px;min-width:40px;border:none;background:0 0;box-shadow:none;color:#fff}.layui-m-layerchild h3{padding:0 10px;height:60px;line-height:60px;font-size:16px;font-weight:400;border-radius:5px 5px 0 0;text-align:center}.layui-m-layerbtn span,.layui-m-layerchild h3{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-m-layercont{padding:50px 30px;line-height:22px;text-align:center}.layui-m-layer1 .layui-m-layercont{padding:0;text-align:left}.layui-m-layer2 .layui-m-layercont{text-align:center;padding:0;line-height:0}.layui-m-layer2 .layui-m-layercont i{width:25px;height:25px;margin-left:8px;display:inline-block;background-color:#fff;border-radius:100%;-webkit-animation:layui-m-anim-loading 1.4s infinite ease-in-out;animation:layui-m-anim-loading 1.4s infinite ease-in-out;-webkit-animation-fill-mode:both;animation-fill-mode:both}.layui-m-layerbtn,.layui-m-layerbtn span{position:relative;text-align:center;border-radius:0 0 5px 5px}.layui-m-layer2 .layui-m-layercont p{margin-top:20px}@-webkit-keyframes layui-m-anim-loading{0%,100%,80%{transform:scale(0);-webkit-transform:scale(0)}40%{transform:scale(1);-webkit-transform:scale(1)}}@keyframes layui-m-anim-loading{0%,100%,80%{transform:scale(0);-webkit-transform:scale(0)}40%{transform:scale(1);-webkit-transform:scale(1)}}.layui-m-layer2 .layui-m-layercont i:first-child{margin-left:0;-webkit-animation-delay:-.32s;animation-delay:-.32s}.layui-m-layer2 .layui-m-layercont i.layui-m-layerload{-webkit-animation-delay:-.16s;animation-delay:-.16s}.layui-m-layer2 .layui-m-layercont>div{line-height:22px;padding-top:7px;margin-bottom:20px;font-size:14px}.layui-m-layerbtn{display:box;display:-moz-box;display:-webkit-box;width:100%;height:50px;line-height:50px;font-size:0;border-top:1px solid #D0D0D0;background-color:#F2F2F2}.layui-m-layerbtn span{display:block;-moz-box-flex:1;box-flex:1;-webkit-box-flex:1;font-size:14px;cursor:pointer}.layui-m-layerbtn span[yes]{color:#40AFFE}.layui-m-layerbtn span[no]{border-right:1px solid #D0D0D0;border-radius:0 0 0 5px}.layui-m-layerbtn span:active{background-color:#F6F6F6}.layui-m-layerend{position:absolute;right:7px;top:10px;width:30px;height:30px;border:0;font-weight:400;background:0 0;cursor:pointer;-webkit-appearance:none;font-size:30px}.layui-m-layerend::after,.layui-m-layerend::before{position:absolute;left:5px;top:15px;content:'';width:18px;height:1px;background-color:#999;transform:rotate(45deg);-webkit-transform:rotate(45deg);border-radius:3px}.layui-m-layerend::after{transform:rotate(-45deg);-webkit-transform:rotate(-45deg)}body .layui-m-layer .layui-m-layer-footer{position:fixed;width:95%;max-width:100%;margin:0 auto;left:0;right:0;bottom:10px;background:0 0}.layui-m-layer-footer .layui-m-layercont{padding:20px;border-radius:5px 5px 0 0;background-color:rgba(255,255,255,.8)}.layui-m-layer-footer .layui-m-layerbtn{display:block;height:auto;background:0 0;border-top:none}.layui-m-layer-footer .layui-m-layerbtn span{background-color:rgba(255,255,255,.8)}.layui-m-layer-footer .layui-m-layerbtn span[no]{color:#FD482C;border-top:1px solid #c2c2c2;border-radius:0 0 5px 5px}.layui-m-layer-footer .layui-m-layerbtn span[yes]{margin-top:10px;border-radius:5px}body .layui-m-layer .layui-m-layer-msg{width:auto;max-width:90%;margin:0 auto;bottom:-150px;background-color:rgba(0,0,0,.7);color:#fff}.layui-m-layer-msg .layui-m-layercont{padding:10px 20px}
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/code.css b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/code.css
new file mode 100644
index 0000000..d0d3822
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/code.css
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ html #layuicss-skincodecss{display:none;position:absolute;width:1989px}.layui-code-h3,.layui-code-view{position:relative;font-size:12px}.layui-code-view{display:block;margin:10px 0;padding:0;border:1px solid #e2e2e2;border-left-width:6px;background-color:#F2F2F2;color:#333;font-family:Courier New}.layui-code-h3{padding:0 10px;height:32px;line-height:32px;border-bottom:1px solid #e2e2e2}.layui-code-h3 a{position:absolute;right:10px;top:0;color:#999}.layui-code-view .layui-code-ol{position:relative;overflow:auto}.layui-code-view .layui-code-ol li{position:relative;margin-left:45px;line-height:20px;padding:0 5px;border-left:1px solid #e2e2e2;list-style-type:decimal-leading-zero;*list-style-type:decimal;background-color:#fff}.layui-code-view pre{margin:0}.layui-code-notepad{border:1px solid #0C0C0C;border-left-color:#3F3F3F;background-color:#0C0C0C;color:#C2BE9E}.layui-code-notepad .layui-code-h3{border-bottom:none}.layui-code-notepad .layui-code-ol li{background-color:#3F3F3F;border-left:none}
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/laydate/default/laydate.css b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/laydate/default/laydate.css
new file mode 100644
index 0000000..f7e690e
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/laydate/default/laydate.css
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ .laydate-set-ym,.layui-laydate,.layui-laydate *,.layui-laydate-list{box-sizing:border-box}html #layuicss-laydate{display:none;position:absolute;width:1989px}.layui-laydate *{margin:0;padding:0}.layui-laydate{position:absolute;z-index:66666666;margin:5px 0;border-radius:2px;font-size:14px;-webkit-animation-duration:.3s;animation-duration:.3s;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-name:laydate-upbit;animation-name:laydate-upbit}.layui-laydate-main{width:272px}.layui-laydate-content td,.layui-laydate-header *,.layui-laydate-list li{transition-duration:.3s;-webkit-transition-duration:.3s}@-webkit-keyframes laydate-upbit{from{-webkit-transform:translate3d(0,20px,0);opacity:.3}to{-webkit-transform:translate3d(0,0,0);opacity:1}}@keyframes laydate-upbit{from{transform:translate3d(0,20px,0);opacity:.3}to{transform:translate3d(0,0,0);opacity:1}}.layui-laydate-static{position:relative;z-index:0;display:inline-block;margin:0;-webkit-animation:none;animation:none}.laydate-ym-show .laydate-next-m,.laydate-ym-show .laydate-prev-m{display:none!important}.laydate-ym-show .laydate-next-y,.laydate-ym-show .laydate-prev-y{display:inline-block!important}.laydate-time-show .laydate-set-ym span[lay-type=month],.laydate-time-show .laydate-set-ym span[lay-type=year],.laydate-time-show .layui-laydate-header .layui-icon,.laydate-ym-show .laydate-set-ym span[lay-type=month]{display:none!important}.layui-laydate-header{position:relative;line-height:30px;padding:10px 70px 5px}.laydate-set-ym span,.layui-laydate-header i{padding:0 5px;cursor:pointer}.layui-laydate-header *{display:inline-block;vertical-align:bottom}.layui-laydate-header i{position:absolute;top:10px;color:#999;font-size:18px}.layui-laydate-header i.laydate-prev-y{left:15px}.layui-laydate-header i.laydate-prev-m{left:45px}.layui-laydate-header i.laydate-next-y{right:15px}.layui-laydate-header i.laydate-next-m{right:45px}.laydate-set-ym{width:100%;text-align:center;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.laydate-time-text{cursor:default!important}.layui-laydate-content{position:relative;padding:10px;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.layui-laydate-content table{border-collapse:collapse;border-spacing:0}.layui-laydate-content td,.layui-laydate-content th{width:36px;height:30px;padding:5px;text-align:center}.layui-laydate-content td{position:relative;cursor:pointer}.laydate-day-mark{position:absolute;left:0;top:0;width:100%;height:100%;line-height:30px;font-size:12px;overflow:hidden}.laydate-day-mark::after{position:absolute;content:'';right:2px;top:2px;width:5px;height:5px;border-radius:50%}.layui-laydate-footer{position:relative;height:46px;line-height:26px;padding:10px 20px}.layui-laydate-footer span{margin-right:15px;display:inline-block;cursor:pointer;font-size:12px}.layui-laydate-footer span:hover{color:#5FB878}.laydate-footer-btns{position:absolute;right:10px;top:10px}.laydate-footer-btns span{height:26px;line-height:26px;margin:0 0 0 -1px;padding:0 10px;border:1px solid #C9C9C9;background-color:#fff;white-space:nowrap;vertical-align:top;border-radius:2px}.layui-laydate-list>li,.layui-laydate-range .layui-laydate-main{display:inline-block;vertical-align:middle}.layui-laydate-list{position:absolute;left:0;top:0;width:100%;height:100%;padding:10px;background-color:#fff}.layui-laydate-list>li{position:relative;width:33.3%;height:36px;line-height:36px;margin:3px 0;text-align:center;cursor:pointer}.laydate-month-list>li{width:25%;margin:17px 0}.laydate-time-list>li{height:100%;margin:0;line-height:normal;cursor:default}.laydate-time-list p{position:relative;top:-4px;line-height:29px}.laydate-time-list ol{height:181px;overflow:hidden}.laydate-time-list>li:hover ol{overflow-y:auto}.laydate-time-list ol li{width:130%;padding-left:33px;line-height:30px;text-align:left;cursor:pointer}.layui-laydate-hint{position:absolute;top:115px;left:50%;width:250px;margin-left:-125px;line-height:20px;padding:15px;text-align:center;font-size:12px}.layui-laydate-range{width:546px}.layui-laydate-range .laydate-main-list-0 .laydate-next-m,.layui-laydate-range .laydate-main-list-0 .laydate-next-y,.layui-laydate-range .laydate-main-list-1 .laydate-prev-m,.layui-laydate-range .laydate-main-list-1 .laydate-prev-y{display:none}.layui-laydate-range .laydate-main-list-1 .layui-laydate-content{border-left:1px solid #e2e2e2}.layui-laydate,.layui-laydate-hint{border:1px solid #d2d2d2;box-shadow:0 2px 4px rgba(0,0,0,.12);background-color:#fff;color:#666}.layui-laydate-header{border-bottom:1px solid #e2e2e2}.layui-laydate-header i:hover,.layui-laydate-header span:hover{color:#5FB878}.layui-laydate-content{border-top:none 0;border-bottom:none 0}.layui-laydate-content th{font-weight:400;color:#333}.layui-laydate-content td{color:#666}.layui-laydate-content td.laydate-selected{background-color:#00F7DE}.laydate-selected:hover{background-color:#00F7DE!important}.layui-laydate-content td:hover,.layui-laydate-list li:hover{background-color:#eaeaea;color:#333}.laydate-time-list li ol{margin:0;padding:0;border:1px solid #e2e2e2;border-left-width:0}.laydate-time-list li:first-child ol{border-left-width:1px}.laydate-time-list>li:hover{background:0 0}.layui-laydate-content .laydate-day-next,.layui-laydate-content .laydate-day-prev{color:#d2d2d2}.laydate-selected.laydate-day-next,.laydate-selected.laydate-day-prev{background-color:#f8f8f8!important}.layui-laydate-footer{border-top:1px solid #e2e2e2}.layui-laydate-hint{color:#FF5722}.laydate-day-mark::after{background-color:#5FB878}.layui-laydate-content td.layui-this .laydate-day-mark::after{display:none}.layui-laydate-footer span[lay-type=date]{color:#5FB878}.layui-laydate .layui-this{background-color:#009688!important;color:#fff!important}.layui-laydate .laydate-disabled,.layui-laydate .laydate-disabled:hover{background:0 0!important;color:#d2d2d2!important;cursor:not-allowed!important;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.laydate-theme-molv{border:none}.laydate-theme-molv.layui-laydate-range{width:548px}.laydate-theme-molv .layui-laydate-main{width:274px}.laydate-theme-molv .layui-laydate-header{border:none;background-color:#009688}.laydate-theme-molv .layui-laydate-header i,.laydate-theme-molv .layui-laydate-header span{color:#f6f6f6}.laydate-theme-molv .layui-laydate-header i:hover,.laydate-theme-molv .layui-laydate-header span:hover{color:#fff}.laydate-theme-molv .layui-laydate-content{border:1px solid #e2e2e2;border-top:none;border-bottom:none}.laydate-theme-molv .laydate-main-list-1 .layui-laydate-content{border-left:none}.laydate-theme-grid .laydate-month-list>li,.laydate-theme-grid .laydate-year-list>li,.laydate-theme-grid .layui-laydate-content td,.laydate-theme-grid .layui-laydate-content thead,.laydate-theme-molv .layui-laydate-footer{border:1px solid #e2e2e2}.laydate-theme-grid .laydate-selected,.laydate-theme-grid .laydate-selected:hover{background-color:#f2f2f2!important;color:#009688!important}.laydate-theme-grid .laydate-selected.laydate-day-next,.laydate-theme-grid .laydate-selected.laydate-day-prev{color:#d2d2d2!important}.laydate-theme-grid .laydate-month-list,.laydate-theme-grid .laydate-year-list{margin:1px 0 0 1px}.laydate-theme-grid .laydate-month-list>li,.laydate-theme-grid .laydate-year-list>li{margin:0 -1px -1px 0}.laydate-theme-grid .laydate-year-list>li{height:43px;line-height:43px}.laydate-theme-grid .laydate-month-list>li{height:71px;line-height:71px}
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/icon-ext.png b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/icon-ext.png
new file mode 100644
index 0000000..bbbb669
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/icon-ext.png
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/icon.png b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/icon.png
new file mode 100644
index 0000000..3e17da8
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/icon.png
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/layer.css b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/layer.css
new file mode 100644
index 0000000..157d537
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/layer.css
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ .layui-layer-imgbar,.layui-layer-imgtit a,.layui-layer-tab .layui-layer-title span,.layui-layer-title{text-overflow:ellipsis;white-space:nowrap}html #layuicss-layer{display:none;position:absolute;width:1989px}.layui-layer,.layui-layer-shade{position:fixed;_position:absolute;pointer-events:auto}.layui-layer-shade{top:0;left:0;width:100%;height:100%;_height:expression(document.body.offsetHeight+"px")}.layui-layer{-webkit-overflow-scrolling:touch;top:150px;left:0;margin:0;padding:0;background-color:#fff;-webkit-background-clip:content;border-radius:2px;box-shadow:1px 1px 50px rgba(0,0,0,.3)}.layui-layer-close{position:absolute}.layui-layer-content{position:relative}.layui-layer-border{border:1px solid #B2B2B2;border:1px solid rgba(0,0,0,.1);box-shadow:1px 1px 5px rgba(0,0,0,.2)}.layui-layer-load{background:url(loading-1.gif) center center no-repeat #eee}.layui-layer-ico{background:url(icon.png) no-repeat}.layui-layer-btn a,.layui-layer-dialog .layui-layer-ico,.layui-layer-setwin a{display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-move{display:none;position:fixed;*position:absolute;left:0;top:0;width:100%;height:100%;cursor:move;opacity:0;filter:alpha(opacity=0);background-color:#fff;z-index:2147483647}.layui-layer-resize{position:absolute;width:15px;height:15px;right:0;bottom:0;cursor:se-resize}.layer-anim{-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.3s;animation-duration:.3s}@-webkit-keyframes layer-bounceIn{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}@keyframes layer-bounceIn{0%{opacity:0;-webkit-transform:scale(.5);-ms-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layer-anim-00{-webkit-animation-name:layer-bounceIn;animation-name:layer-bounceIn}@-webkit-keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);-ms-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);-ms-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-01{-webkit-animation-name:layer-zoomInDown;animation-name:layer-zoomInDown}@-webkit-keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);-ms-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}}.layer-anim-02{-webkit-animation-name:layer-fadeInUpBig;animation-name:layer-fadeInUpBig}@-webkit-keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);-ms-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);-ms-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-03{-webkit-animation-name:layer-zoomInLeft;animation-name:layer-zoomInLeft}@-webkit-keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}@keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);-ms-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);-ms-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}.layer-anim-04{-webkit-animation-name:layer-rollIn;animation-name:layer-rollIn}@keyframes layer-fadeIn{0%{opacity:0}100%{opacity:1}}.layer-anim-05{-webkit-animation-name:layer-fadeIn;animation-name:layer-fadeIn}@-webkit-keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.layer-anim-06{-webkit-animation-name:layer-shake;animation-name:layer-shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.layui-layer-title{padding:0 80px 0 20px;height:42px;line-height:42px;border-bottom:1px solid #eee;font-size:14px;color:#333;overflow:hidden;background-color:#F8F8F8;border-radius:2px 2px 0 0}.layui-layer-setwin{position:absolute;right:15px;*right:0;top:15px;font-size:0;line-height:initial}.layui-layer-setwin a{position:relative;width:16px;height:16px;margin-left:10px;font-size:12px;_overflow:hidden}.layui-layer-setwin .layui-layer-min cite{position:absolute;width:14px;height:2px;left:0;top:50%;margin-top:-1px;background-color:#2E2D3C;cursor:pointer;_overflow:hidden}.layui-layer-setwin .layui-layer-min:hover cite{background-color:#2D93CA}.layui-layer-setwin .layui-layer-max{background-position:-32px -40px}.layui-layer-setwin .layui-layer-max:hover{background-position:-16px -40px}.layui-layer-setwin .layui-layer-maxmin{background-position:-65px -40px}.layui-layer-setwin .layui-layer-maxmin:hover{background-position:-49px -40px}.layui-layer-setwin .layui-layer-close1{background-position:1px -40px;cursor:pointer}.layui-layer-setwin .layui-layer-close1:hover{opacity:.7}.layui-layer-setwin .layui-layer-close2{position:absolute;right:-28px;top:-28px;width:30px;height:30px;margin-left:0;background-position:-149px -31px;*right:-18px;_display:none}.layui-layer-setwin .layui-layer-close2:hover{background-position:-180px -31px}.layui-layer-btn{text-align:right;padding:0 15px 12px;pointer-events:auto;user-select:none;-webkit-user-select:none}.layui-layer-btn a{height:28px;line-height:28px;margin:5px 5px 0;padding:0 15px;border:1px solid #dedede;background-color:#fff;color:#333;border-radius:2px;font-weight:400;cursor:pointer;text-decoration:none}.layui-layer-btn a:hover{opacity:.9;text-decoration:none}.layui-layer-btn a:active{opacity:.8}.layui-layer-btn .layui-layer-btn0{border-color:#1E9FFF;background-color:#1E9FFF;color:#fff}.layui-layer-btn-l{text-align:left}.layui-layer-btn-c{text-align:center}.layui-layer-dialog{min-width:260px}.layui-layer-dialog .layui-layer-content{position:relative;padding:20px;line-height:24px;word-break:break-all;overflow:hidden;font-size:14px;overflow-x:hidden;overflow-y:auto}.layui-layer-dialog .layui-layer-content .layui-layer-ico{position:absolute;top:16px;left:15px;_left:-40px;width:30px;height:30px}.layui-layer-ico1{background-position:-30px 0}.layui-layer-ico2{background-position:-60px 0}.layui-layer-ico3{background-position:-90px 0}.layui-layer-ico4{background-position:-120px 0}.layui-layer-ico5{background-position:-150px 0}.layui-layer-ico6{background-position:-180px 0}.layui-layer-rim{border:6px solid #8D8D8D;border:6px solid rgba(0,0,0,.3);border-radius:5px;box-shadow:none}.layui-layer-msg{min-width:180px;border:1px solid #D3D4D3;box-shadow:none}.layui-layer-hui{min-width:100px;background-color:#000;filter:alpha(opacity=60);background-color:rgba(0,0,0,.6);color:#fff;border:none}.layui-layer-hui .layui-layer-content{padding:12px 25px;text-align:center}.layui-layer-dialog .layui-layer-padding{padding:20px 20px 20px 55px;text-align:left}.layui-layer-page .layui-layer-content{position:relative;overflow:auto}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn{padding-top:10px}.layui-layer-nobg{background:0 0}.layui-layer-iframe iframe{display:block;width:100%}.layui-layer-loading{border-radius:100%;background:0 0;box-shadow:none;border:none}.layui-layer-loading .layui-layer-content{width:60px;height:24px;background:url(loading-0.gif) no-repeat}.layui-layer-loading .layui-layer-loading1{width:37px;height:37px;background:url(loading-1.gif) no-repeat}.layui-layer-ico16,.layui-layer-loading .layui-layer-loading2{width:32px;height:32px;background:url(loading-2.gif) no-repeat}.layui-layer-tips{background:0 0;box-shadow:none;border:none}.layui-layer-tips .layui-layer-content{position:relative;line-height:22px;min-width:12px;padding:8px 15px;font-size:12px;_float:left;border-radius:2px;box-shadow:1px 1px 3px rgba(0,0,0,.2);background-color:#000;color:#fff}.layui-layer-tips .layui-layer-close{right:-2px;top:-1px}.layui-layer-tips i.layui-layer-TipsG{position:absolute;width:0;height:0;border-width:8px;border-color:transparent;border-style:dashed;*overflow:hidden}.layui-layer-tips i.layui-layer-TipsB,.layui-layer-tips i.layui-layer-TipsT{left:5px;border-right-style:solid;border-right-color:#000}.layui-layer-tips i.layui-layer-TipsT{bottom:-8px}.layui-layer-tips i.layui-layer-TipsB{top:-8px}.layui-layer-tips i.layui-layer-TipsL,.layui-layer-tips i.layui-layer-TipsR{top:5px;border-bottom-style:solid;border-bottom-color:#000}.layui-layer-tips i.layui-layer-TipsR{left:-8px}.layui-layer-tips i.layui-layer-TipsL{right:-8px}.layui-layer-lan[type=dialog]{min-width:280px}.layui-layer-lan .layui-layer-title{background:#4476A7;color:#fff;border:none}.layui-layer-lan .layui-layer-btn{padding:5px 10px 10px;text-align:right;border-top:1px solid #E9E7E7}.layui-layer-lan .layui-layer-btn a{background:#fff;border-color:#E9E7E7;color:#333}.layui-layer-lan .layui-layer-btn .layui-layer-btn1{background:#C9C5C5}.layui-layer-molv .layui-layer-title{background:#009f95;color:#fff;border:none}.layui-layer-molv .layui-layer-btn a{background:#009f95;border-color:#009f95}.layui-layer-molv .layui-layer-btn .layui-layer-btn1{background:#92B8B1}.layui-layer-iconext{background:url(icon-ext.png) no-repeat}.layui-layer-prompt .layui-layer-input{display:block;width:230px;height:36px;margin:0 auto;line-height:30px;padding-left:10px;border:1px solid #e6e6e6;color:#333}.layui-layer-prompt textarea.layui-layer-input{width:300px;height:100px;line-height:20px;padding:6px 10px}.layui-layer-prompt .layui-layer-content{padding:20px}.layui-layer-prompt .layui-layer-btn{padding-top:0}.layui-layer-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4)}.layui-layer-tab .layui-layer-title{padding-left:0;overflow:visible}.layui-layer-tab .layui-layer-title span{position:relative;float:left;min-width:80px;max-width:260px;padding:0 20px;text-align:center;overflow:hidden;cursor:pointer}.layui-layer-tab .layui-layer-title span.layui-this{height:43px;border-left:1px solid #eee;border-right:1px solid #eee;background-color:#fff;z-index:10}.layui-layer-tab .layui-layer-title span:first-child{border-left:none}.layui-layer-tabmain{line-height:24px;clear:both}.layui-layer-tabmain .layui-layer-tabli{display:none}.layui-layer-tabmain .layui-layer-tabli.layui-this{display:block}.layui-layer-photos{-webkit-animation-duration:.8s;animation-duration:.8s}.layui-layer-photos .layui-layer-content{overflow:hidden;text-align:center}.layui-layer-photos .layui-layer-phimg img{position:relative;width:100%;display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-imgbar,.layui-layer-imguide{display:none}.layui-layer-imgnext,.layui-layer-imgprev{position:absolute;top:50%;width:27px;_width:44px;height:44px;margin-top:-22px;outline:0;blr:expression(this.onFocus=this.blur())}.layui-layer-imgprev{left:10px;background-position:-5px -5px;_background-position:-70px -5px}.layui-layer-imgprev:hover{background-position:-33px -5px;_background-position:-120px -5px}.layui-layer-imgnext{right:10px;_right:8px;background-position:-5px -50px;_background-position:-70px -50px}.layui-layer-imgnext:hover{background-position:-33px -50px;_background-position:-120px -50px}.layui-layer-imgbar{position:absolute;left:0;bottom:0;width:100%;height:32px;line-height:32px;background-color:rgba(0,0,0,.8);background-color:#000\9;filter:Alpha(opacity=80);color:#fff;overflow:hidden;font-size:0}.layui-layer-imgtit *{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:12px}.layui-layer-imgtit a{max-width:65%;overflow:hidden;color:#fff}.layui-layer-imgtit a:hover{color:#fff;text-decoration:underline}.layui-layer-imgtit em{padding-left:10px;font-style:normal}@-webkit-keyframes layer-bounceOut{100%{opacity:0;-webkit-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.05);transform:scale(1.05)}0%{-webkit-transform:scale(1);transform:scale(1)}}@keyframes layer-bounceOut{100%{opacity:0;-webkit-transform:scale(.7);-ms-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.05);-ms-transform:scale(1.05);transform:scale(1.05)}0%{-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layer-anim-close{-webkit-animation-name:layer-bounceOut;animation-name:layer-bounceOut;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.2s;animation-duration:.2s}@media screen and (max-width:1100px){.layui-layer-iframe{overflow-y:auto;-webkit-overflow-scrolling:touch}}
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/loading-0.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/loading-0.gif
new file mode 100644
index 0000000..6f3c953
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/loading-0.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/loading-1.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/loading-1.gif
new file mode 100644
index 0000000..db3a483
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/loading-1.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/loading-2.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/loading-2.gif
new file mode 100644
index 0000000..5bb90fd
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/css/modules/layer/default/loading-2.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/font/iconfont.eot b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/font/iconfont.eot
new file mode 100644
index 0000000..93b3d5a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/font/iconfont.eot
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/font/iconfont.svg b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/font/iconfont.svg
new file mode 100644
index 0000000..1c7ffe9
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/font/iconfont.svg
@@ -0,0 +1,473 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="layui-icon" horiz-adv-x="1024" >
+ <font-face
+ font-family="layui-icon"
+ font-weight="500"
+ font-stretch="normal"
+ units-per-em="1024"
+ ascent="896"
+ descent="-128"
+ />
+ <missing-glyph />
+
+ <glyph glyph-name="reply-fill" unicode="" d="M507.904 835.5840000000001q93.184 1.024 175.104-33.792t143.872-94.72 97.792-141.312 36.864-174.592q1.024-88.064-30.208-165.888t-87.04-137.728-131.072-98.816-162.304-48.128q-22.528-3.072-48.128-5.12t-56.832-3.072-69.632 0-86.528 6.144q-106.496 10.24-158.208 26.624t-41.472 18.432q54.272 9.216 93.184 29.696 20.48 11.264 16.896 32.256t-19.968 39.424q-52.224 57.344-84.48 133.632t-34.304 164.352q-1.024 93.184 33.792 175.104t95.232 143.36 142.336 97.28 175.104 36.864zM707.584 385.024q0-26.624 18.432-45.568t45.056-18.944 45.568 18.944 18.944 45.568-18.944 45.056-45.568 18.432-45.056-18.432-18.432-45.056zM450.56 385.024q0-26.624 19.456-46.08t46.08-19.456q27.648 0 46.592 19.456t18.944 46.08q0 27.648-18.944 46.592t-46.592 18.944q-26.624 0-46.08-18.944t-19.456-46.592zM196.608 386.048q0-26.624 18.944-46.08t45.568-19.456q27.648 0 46.592 19.456t18.944 46.08-18.944 45.568-46.592 18.944q-26.624 0-45.568-18.944t-18.944-45.568z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="set-fill" unicode="" d="M916.9398 445.2101l-69.9664 10.7833c-18.6619 2.863-38.1388 17.826-43.3424 33.2487-5.1618 15.3809-15.0883 65.4524-3.9288 80.6661l41.9004 57.135c11.1595 15.2346 9.3832 38.5985-3.9706 51.9314l-30.6364 30.6573c-13.3538 13.3538-36.7177 15.151-51.9314 3.9497l-57.135-41.8795c-15.2346-11.1804-39.4344-14.3987-53.7704-7.168-14.3569 7.2307-57.3022 35.7773-60.1652 54.4183l-10.7833 69.9664C570.3471 807.6016 552.542 822.8571 533.6712 822.8571h-43.34236734693877c-18.8709 0-36.6759-15.2555-39.5389-33.9174l-10.7833-69.9664c-2.863-18.6619-17.826-38.1388-33.2487-43.3424-15.4018-5.1827-65.4524-15.1092-80.687-3.9288L268.9567 713.5817c-15.2346 11.1804-38.6194 9.3832-51.9523-3.9497l-30.6364-30.6573c-13.3747-13.3538-15.151-36.7177-3.9706-51.9314l41.9004-57.135c11.1595-15.2346 14.3778-39.4136 7.168-53.7704-7.2307-14.3569-35.7773-57.2813-54.4183-60.1443l-69.9664-10.7833C88.3984 442.3471 73.1429 424.542 73.1429 405.6712v-43.34236734693877c0-18.8709 15.2555-36.6759 33.9174-39.5389l69.9664-10.7833c18.6619-2.863 38.1388-17.8469 43.3424-33.2487 5.1618-15.4018 15.0883-65.4733 3.9288-80.687l-41.9004-57.135c-11.1595-15.2346-9.3832-38.6194 3.9706-51.9314l30.6364-30.6573c13.3538-13.3538 36.7177-15.151 51.9523-3.9706l57.135 41.9213c15.2346 11.1386 39.4136 14.3778 53.7704 7.168 14.3569-7.2307 57.2813-35.7773 60.1443-54.4183l10.7833-69.9664c2.863-18.6619 20.6472-33.9174 39.5389-33.9174h43.34236734693877c18.8709 0 36.6759 15.2555 39.5389 33.9174l10.7833 69.9664c2.863 18.6619 17.826 38.1388 33.2487 43.3215 15.4018 5.1827 65.4524 15.0883 80.6661 3.9288l57.1559-41.9213c15.2346-11.1595 38.5985-9.3623 51.9314 3.9706l30.6364 30.6573c13.3747 13.3329 15.151 36.7177 3.9706 51.9314l-41.9004 57.135c-11.1595 15.2346-14.3778 39.4136-7.168 53.7496 7.2307 14.3778 35.7773 57.3231 54.4183 60.1861l69.9664 10.7833c18.6619 2.863 33.9174 20.6472 33.9174 39.5389v43.34236734693877C950.8571 424.542 935.6016 442.3471 916.9398 445.2101zM512 210.4633c-95.838 0-173.5367 77.6986-173.5367 173.5367s77.6986 173.5367 173.5367 173.5367 173.5367-77.6986 173.5367-173.5367S607.838 210.4633 512 210.4633zM512 384m-104.7824 0a5.014 5.014 0 1 1 209.5647 0 5.014 5.014 0 1 1-209.5647 0Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="menu-fill" unicode="" d="M511.999488 834.254727c-248.678712 0-450.273176-201.585181-450.273176-450.254727s201.594464-450.254727 450.273176-450.254727 450.273176 201.585181 450.273176 450.254727S760.6782 834.254727 511.999488 834.254727zM266.371377 589.705012l491.256222 0 0-33.772174L266.371377 555.932838 266.371377 589.705012zM757.627599 178.29396499999996L266.371377 178.29396499999996l0 33.773198 491.256222 0L757.627599 178.29396499999996zM140.487278 367.11340099999995l0 33.771151 743.024421 0 0-33.771151L140.487278 367.11340099999995z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="search" unicode="" d="M439.323351 120.52219c-49.280352 0-97.09834 9.656941-142.126681 28.699646-43.480015 18.388812-82.522793 44.706201-116.043584 78.225619s-59.841305 72.560596-78.230871 116.03883C83.878729 388.513804 74.222416 436.330856 74.222416 485.609189c0 49.284473 9.656313 97.104595 28.699798 142.133138 18.388542 43.479257 44.71008 82.520435 78.231894 116.03883 33.518745 33.515325 72.562546 59.832713 116.043584 78.219479 45.027318 19.039635 92.846329 28.694529 142.125658 28.694529 49.280352 0 97.099364-9.653871 142.126681-28.694529 43.481039-18.385742 82.525863-44.704155 116.044608-78.220502 33.520791-33.518395 59.842328-72.559573 78.230871-116.03883 19.042462-45.028543 28.699798-92.848665 28.699798-142.133138 0-49.278333-9.657336-97.095385-28.701845-142.122905-18.388542-43.47721-44.708033-82.520435-78.228824-116.03883s-72.563569-59.838853-116.043584-78.226642C536.422715 130.177084 488.603703 120.52219 439.323351 120.52219zM439.323351 797.483242c-171.975699 0-311.887855-139.906423-311.887855-311.875077S267.347652 173.734112 439.323351 173.734112s311.887855 139.907447 311.887855 311.874053S611.299051 797.483242 439.323351 797.483242zM890.678206-48.734702c-22.121716 0-42.90387 8.562003-58.541653 24.115234L674.672953 128.025071l37.039062 38.20616 157.888289-153.058978c5.606924-5.606695 13.091693-8.692986 21.077901-8.692986 7.983139 0 15.464837 3.087315 21.070738 8.69094 5.616135 5.622044 8.715856 13.126972 8.715856 21.123087 0 7.980765-3.091535 15.46318-8.702552 21.067828l-0.301888 0.306992L758.714395 213.230662l38.207726 37.035498 152.611906-157.427472c15.571265-15.638165 24.144876-36.422538 24.144876-58.549487 0-22.195511-8.625801-43.054585-24.287121-58.735729C933.723298-40.112324 912.876674-48.734702 890.678206-48.734702zM281.015489 327.245392c-42.340005 42.320874-65.652899 98.584296-65.643689 158.421102 0.008187 59.818387 23.319034 116.074645 65.637549 158.4078l37.634651-37.619806c-66.60666-66.629513-66.60973-175.00071-0.007163-241.577011L281.015489 327.245392z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="share" unicode="" d="M769.714 306.453c-51.754 0-97.702-24.851-126.571-63.269L394.479 367.94100000000003c3.93 13.798 6.034 28.364 6.034 43.424 0 16.496-2.527 32.399-7.211 47.35l247.724 124.288c28.71-40.052 75.647-66.151 128.687-66.151 87.388 0 158.229 70.84 158.229 158.229 0 87.388-70.841 158.229-158.229 158.229-87.389 0-158.229-70.841-158.229-158.229 0-6.046 0.352-12.009 1.011-17.88L351.22 526.116c-28.371 26.943-66.723 43.479-108.938 43.479-87.388 0-158.229-70.84-158.229-158.229s70.84-158.229 158.229-158.229c43.752 0 83.354 17.758 111.997 46.459l258.676-129.779c-0.964-7.062-1.474-14.266-1.474-21.592 0-87.389 70.84-158.229 158.229-158.229s158.229 70.84 158.229 158.229C927.938 235.61199999999997 857.103 306.453 769.714 306.453L769.714 306.453z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="set-sm" unicode="" d="M946.367 405.895c0.02 21.85-13.04 38.49-31.74 41.57-18.69 3.07-79.05 13.01-85.99 14.14-6.95 1.15-14.09 8.07-15.4 11.45-1.32 3.37-8.94 22.2-11.87 29.46-2.95 7.27-1.92 16.58 4.39 25.52 6.3 8.93 39.9 55.87 48.38 67.72 8.49 11.87 8.65 34.61-4.84 48.39-13.48 13.78-47.75 47.09-56.73 55.86-8.99 8.76-31.08 8.64-42.67 0.43-11.58-8.2-71.69-51.01-71.69-51.01s-9.97-6.89-20.67-2.64c-10.7 4.24-33.43 14.07-33.43 14.07s-7.19 5.43-9.68 19.79c-2.5 14.37-11.11 65.28-14.07 82.7-2.97 17.42-20.67 29.62-37.83 29.46-17.16-0.14-57.91 0-74.33 0s-32.26-15.68-34.75-29.46c-2.49-13.79-11.56-69.16-14.07-84.45-2.52-15.3-11.44-18.48-11.44-18.48s-19.56-8.06-29.91-12.31c-10.34-4.26-15.39-2.64-30.35 7.48-14.95 10.11-44.74 31.03-63.04 43.83-18.3 12.81-38.12 7.92-49.26-3.52s-36.06-35.77-51.02-50.43c-14.95-14.66-12.61-37.54 0.58-55.71 13.2-18.18 32.34-45.43 41.35-58.21 9.01-12.78 10.84-19.5 8.36-26.82-2.49-7.34-6.64-16.58-11.43-27.72-4.81-11.13-9.69-13.64-27.86-17.01-17.36-3.21-58.42-9.92-77.4-13.31-18.99-3.37-30.66-21.43-30.66-41.81l0-64.66c0-24.34 13.2-37.24 38.42-41.93 25.22-4.69 62.66-10.66 74.77-12.61 12.1-1.95 17.67-6.6 21.41-15.54 3.73-8.94 5.13-10.12 9.37-22.57 4.26-12.47 6.46-15.55-4.98-31.67-11.44-16.13-34.31-48.11-46.03-64.51-11.74-16.4-6.45-37.83 4.98-49.85 11.44-12.03 35.47-35.64 48.97-48.97 13.49-13.33 35.19-16.28 53.36-3.52 18.19 12.75 54.98 38.99 65.69 46.62 10.7 7.63 21.91 5.28 27.85 2.94 5.94-2.35 11.25-4.6 22-9.1 10.73-4.48 13.85-11.2 16.41-23.45 2.57-12.24 10.19-56.85 13.93-78.59 3.75-21.72 18.91-33.43 40.62-33.72 21.7-0.29 33.27-0.12 61.57 0 28.29 0.13 41.86 12.61 45.45 31.38 3.59 18.76 12.45 72.94 14.22 83.72 1.78 10.76 5.94 14.73 13.63 18.47 7.7 3.74 14.32 6.47 26.84 11.88 12.51 5.4 18.91 0.66 27.7-5.72 8.8-6.39 47.51-33.78 63.78-45.31 16.28-11.53 36.73-10.33 51.9 4.4 15.18 14.73 31.62 30.99 49.27 48.38 17.64 17.4 12.16 39.59 4.4 51.46-7.77 11.88-44.49 62.95-49.71 70.23-5.21 7.28-4.4 18.62-1.75 24.63 2.64 6.01 8.44 18.24 11.72 25.22 3.29 6.97 9.6 11.22 18.18 12.9 8.58 1.69 62.72 11 83.75 14.61 21.03 3.64 31.11 19.92 31.26 39.92C946.427 359.93499999999995 946.347 388.525 946.367 405.895zM908.587 338.615c0.21-5.76-4.66-10.65-8.82-11.38-4.17-0.73-63.26-11.38-81.48-14.29-18.21-2.92-33.23-15.07-38.72-28.06-3.98-9.44-5.47-13.51-10.59-26.96-5.12-13.44-4.64-32.19 2.56-42.26 7.2-10.08 46.82-64.9 50.38-70.45s4.27-11.95-1.28-17.5-40.99-41.2-47.39-47.39c-6.41-6.19-11.83-4.8-18.79 0-6.95 4.8-39.61 26.39-64.44 44.36-16.96 12.28-32.82 12.43-48.7 6.02-15.87-6.42 1.28 0.28-22.2-8.97-23.48-9.25-30.23-27.62-33.73-48.24-3.5-20.63-10.67-62.98-11.95-70.45-1.28-7.47-5.55-11.1-13.66-11.1l-64.9 0c-8.11 0-11.74 2.99-14.52 11.95-2.77 8.97-10.03 54.87-12.8 74.29-2.78 19.43-13.82 36.12-24.77 40.56-10.94 4.45-4.98 2.14-27.32 11.1-22.34 8.97-39.63 4.5-51.23-3.84-11.61-8.34-58.64-42.69-65.33-46.96-6.68-4.28-14.65-3.28-18.35 0.42-3.7 3.7-40.56 40.56-46.54 46.54-5.98 5.98-5.36 12.92 0 20.49 5.36 7.58 28.39 40.76 40.99 57.95 12.59 17.2 17.93 34.74 9.82 53.49-8.12 18.74-4.42 10.24-12.39 28.6-7.96 18.36-24.28 24.46-38.42 26.9-14.14 2.43-68.88 11.53-76.85 13.23-7.97 1.71-11.95 7.26-11.95 14.09l0 66.18c0 9.53 7.67 12.44 12.38 13.23 4.7 0.8 54.22 9.18 73 12.39 18.79 3.2 36.36 11.32 43.55 29.03 7.19 17.7 4.27 11.1 11.1 27.32 6.83 16.23 3.8 33.94-7.68 49.96-11.49 16.01-38.85 54-44.4 61.9-5.55 7.9-5.77 12.6 0.85 19.21 6.62 6.62 42.05 42.48 46.96 46.97 4.91 4.48 12.07 5.4 18.36 0.85 6.3-4.55 49.31-35.65 64.04-46.11 14.73-10.46 32.35-12.56 49.1-5.55 16.75 7.02 10.25 4.48 26.9 11.1s24.84 19.09 28.18 39.71c3.33 20.61 11.95 74.14 12.81 77.7 0.85 3.55 5.55 10.46 11.74 10.46s65.82-0.07 69.8 0c3.99 0.07 10.3-3.29 11.32-9.18 1.02-5.9 13.02-74.29 14.94-86.25 1.92-11.95 15.58-28.57 25.54-32.73 9.96-4.16 21.35-8.75 31.31-13.09 9.97-4.34 30.13-1.91 36.15 2.28 6.03 4.18 70.52 48.81 75.43 52.37 4.91 3.56 11.52 3.27 17.64-2.85s43.34-43.19 47.54-47.53c4.19-4.34 4.66-8.66 1.14-13.66-3.53-5.01-36.72-51.8-47.54-67.46-10.81-15.65-11.73-33.73-5.41-48.96 6.33-15.22 3.99-9.39 9.11-21.91 5.13-12.53 16.28-29.03 33.59-31.88 17.31-2.85 76.92-12.74 84.82-13.95 7.9-1.21 11.1-7.18 11.1-13.37S908.377 344.385 908.587 338.615zM526.833 573.1949999999999c-110.45 0-200-89.54-200-200s89.55-200 200-200c110.46 0 200 89.54 200 200S637.293 573.1949999999999 526.833 573.1949999999999zM526.833 208.19500000000005c-91.12 0-165 73.87-165 165s73.88 165 165 165c91.13 0 165-73.87 165-165S617.963 208.19500000000005 526.833 208.19500000000005z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="engine" unicode="" d="M422.214332 360.70413299999996L186.183684 360.70413299999996l0 46.568461 236.030648 0c10.379577 40.075407 46.47537 69.794509 89.785668 69.794509 51.432433 0 93.067103-41.657943 93.067103-93.067103C605.067103 332.56756700000005 563.40916 290.909624 512 290.909624 468.689703 290.909624 432.593909 320.65199900000005 422.214332 360.70413299999996L422.214332 360.70413299999996zM512 779.634098c-218.529658 0-395.634098-177.10444-395.634098-395.634098 0-218.529658 177.10444-395.634098 395.634098-395.634098 154.76275 0 288.417257 89.064217 353.440885 218.55293l101.398692-59.112389-23.063141-39.959044-62.161099 35.909613c-33.745261-51.595341-77.42792-96.115813-129.093079-129.744711l35.653614-61.765464-40.308133-23.295867-35.653614 61.765464c-53.620057-27.345298-113.360805-44.404109-176.894987-47.73209L535.319139-127.99706800000001l-46.568461 0 0 70.981412c-63.534182 3.327981-123.27493 20.386792-176.894987 47.73209l-35.653614-61.765464-40.308133 23.295867 35.653614 61.765464c-51.665159 33.628898-95.347818 78.149371-129.093079 129.744711l-62.161099-35.909613-23.295867 40.308133 62.114553 35.863067c-27.415116 53.550239-44.799743 113.104807-48.127724 176.685534L0.002932 360.70413299999996l0 46.568461 70.958139 0c3.327981 63.580727 20.712609 123.135295 48.127724 176.685534l-62.114553 35.863067 23.295867 40.308133 62.161099-35.909613c33.745261 51.595341 77.42792 96.115813 129.093079 129.744711l-35.653614 61.765464 40.308133 23.295867 35.653614-61.765464c53.620057 27.345298 113.360805 44.404109 176.894987 47.73209L488.727406 895.997068l46.568461 0 0-70.981412c63.534182-3.327981 123.27493-20.386792 176.894987-47.73209l35.653614 61.765464 40.308133-23.295867-35.653614-61.765464c51.665159-33.628898 95.347818-78.149371 129.093079-129.744711l62.161099 35.909613 23.063141-39.959044-101.398692-59.112389C800.417257 690.569881 666.76275 779.634098 512 779.634098L512 779.634098z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="close" unicode="ဆ" d="M783.483 701.249L512 429.775 240.517 701.249c-10.082 10.083-26.429 10.083-36.51 0-10.083-10.082-10.083-26.429 0-36.509l271.481-271.475L204.008 121.78800000000001c-10.083-10.081-10.083-26.428 0-36.508 10.082-10.082 26.429-10.082 36.51 0L512 356.755l271.483-271.475c10.082-10.082 26.429-10.082 36.513 0 10.081 10.083 10.081 26.428 0 36.508L548.51 393.265l271.485 271.474c10.081 10.083 10.081 26.429 0 36.509C809.912 711.33 793.564 711.33 783.483 701.249z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="close-fill" unicode="ဇ" d="M512 822.022125c-217.47508 0-394.423141-176.949085-394.423141-394.423141 0-217.474057 176.948061-394.422118 394.423141-394.422118 217.473033 0 394.422118 176.948061 394.422118 394.422118C906.422118 645.07304 729.473033 822.022125 512 822.022125zM702.228529 270.92978200000005c8.030907-8.030907 8.030907-21.052478 0-29.083385s-21.052478-8.030907-29.083385 0L512 402.992563 350.853833 241.84741899999995c-8.030907-8.030907-21.052478-8.030907-29.083385 0s-8.030907 21.052478 0 29.083385l161.146167 161.146167L321.771471 593.222115c-8.030907 8.030907-8.030907 21.052478 0 29.083385s21.052478 8.030907 29.083385 0l161.146167-161.146167L673.145144 622.305501c8.030907 8.030907 21.052478 8.030907 29.083385 0s8.030907-21.052478 0-29.083385L541.082362 432.075949 702.228529 270.92978200000005z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="chart-screen" unicode="" d="M963.930903 179.21903299999997l0 34.824133-37.354769-2.675946L926.576133 694.8538169999999 691.413206 694.8538169999999l0 70.462818L330.260819 765.316635l0-70.462818L95.690386 694.8538169999999l0-480.809627-35.621289 0 0-34.824133 432.583253 0 0-141.228535-90.313935 0 0-35.307134 216.753649 0 0 35.307134-90.313935 0L528.778128 179.21903299999997 963.930903 179.21903299999997zM366.212636 730.008478L655.216819 730.008478l0-35.307134L366.212636 694.7013440000001 366.212636 730.008478zM364.817869 332.73133600000006L222.224244 406.252817l14.295588 27.736715 123.238812-63.523779 173.928285 159.755494 127.5807-92.634794 93.13826 122.414027 12.420891-9.449209 12.420891-9.449209L667.639756 394.365068l-131.636063 95.621824L364.817869 332.73133600000006z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="star" unicode="" d="M749.624889-84.152889c-15.672889 0-31.246222 3.882667-45.084444 11.306667l-192.526222 103.637333L319.544889-72.817778c-31.203556-16.64-70.314667-14.392889-99.043556 5.304889-29.511111 20.337778-44.743111 55.921778-38.840889 90.695111l37.703111 225.251556L56.661333 410.908444c-25.002667 24.888889-33.464889 60.984889-22.058667 94.193778 11.349333 32.910222 40.064 56.576 74.965333 61.752889l221.326222 32.896 96.128 199.580444c15.488 32.085333 48.853333 52.807111 84.992 52.807111 36.167111 0 69.518222-20.736 84.963556-52.807111l96.156444-199.580444 221.297778-32.910222c34.872889-5.162667 63.616-28.8 74.979556-61.696 11.392-33.28 2.944-69.361778-22.030222-94.250667L804.622222 248.433778l37.745778-225.28c5.845333-34.773333-9.386667-70.357333-38.812444-90.638222C787.569778-78.392889 768.938667-84.152889 749.624889-84.152889zM512.014222 91.548444c4.636444 0 9.272889-1.137778 13.482667-3.384889l205.937778-110.862222c12.373333-6.641778 28.316444-5.802667 39.936 2.133333 11.392 7.836444 17.123556 21.006222 14.890667 34.304L746.097778 253.496889c-1.507556 9.088 1.450667 18.332444 7.964444 24.832l173.141333 172.842667c9.457778 9.429333 12.686222 23.025778 8.405333 35.484444-4.380444 12.672-15.701333 21.873778-29.525333 23.921778L669.866667 545.706667c-9.315556 1.379556-17.365333 7.296-21.447111 15.786667L545.720889 774.641778c-6.030222 12.529778-19.256889 20.608-33.706667 20.608s-27.690667-8.092444-33.763556-20.622222L375.608889 561.493333c-4.081778-8.490667-12.131556-14.407111-21.447111-15.786667L117.930667 510.577778c-13.624889-2.033778-25.201778-11.434667-29.539556-23.992889-4.266667-12.416-1.024-25.984 8.433778-35.399111L269.937778 278.328889c6.513778-6.499556 9.472-15.744 7.964444-24.832l-40.135111-239.744c-2.247111-13.312 3.484444-26.439111 14.976-34.360889 11.434667-7.836444 27.349333-8.775111 39.950222-2.062222l205.852444 110.833778C502.741333 90.410667 507.377778 91.548444 512.014222 91.548444zM200.32 439.210667c-6.840889 0-12.885333 4.963556-14.023111 11.946667-1.251556 7.751111 4.010667 15.061333 11.761778 16.312889l9.443556 1.536c7.793778 1.336889 15.061333-4.010667 16.312889-11.761778 1.251556-7.751111-4.010667-15.061333-11.761778-16.312889l-9.443556-1.536C201.856 439.267556 201.073778 439.210667 200.32 439.210667zM252.544 447.687111c-6.684444 0-12.643556 4.721778-13.937778 11.534222-1.493333 7.708444 3.555556 15.175111 11.264 16.654222l153.927111 29.696 58.055111 133.148444c3.157333 7.182222 11.548444 10.496 18.716444 7.352889 7.210667-3.143111 10.510222-11.52 7.367111-18.716444l-61.056-140.017778c-1.877333-4.295111-5.745778-7.395556-10.353778-8.277333l-161.28-31.118222C254.336 447.758222 253.44 447.687111 252.544 447.687111z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="circle-dot" unicode="" d="M513.133312 830.6731560000001c-247.538793 0-448.208115-200.669322-448.208115-448.207092 0-247.538793 200.670346-448.208115 448.208115-448.208115 247.538793 0 448.208115 200.670346 448.208115 448.208115C961.341427 630.004857 760.673128 830.6731560000001 513.133312 830.6731560000001zM513.132288-6.649187999999981c-214.901465 0-389.113205 174.212764-389.113205 389.114229 0 214.902488 174.21174 389.115252 389.113205 389.115252 214.903511 0 389.115252-174.212764 389.115252-389.115252C902.24754 167.563576 728.0358-6.649187999999981 513.132288-6.649187999999981zM513.133312 382.46504100000004m-344.602456 0a336.754 336.754 0 1 1 689.204911 0 336.754 336.754 0 1 1-689.204911 0Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="chat" unicode="" d="M132.682393 414.567179c0 208.287837 166.471452 377.143593 379.317095 377.143593s385.380184-168.855756 385.380184-377.143593c0-177.196725-122.197086-325.812507-290.49821-366.259708l-116.291586-51.04763 0 41.126676C290.570353 52.175568999999996 132.682393 215.31206599999996 132.682393 414.567179zM83.799056 414.567179c0-211.946157 160.764474-387.135154 369.469819-415.152255-3.2623-20.458961-10.036587-65.024969-7.286963-65.024969 2.384303 0 114.89068 47.294143 189.700503 78.865185 176.193885 51.91437 304.518528 211.946157 304.518528 401.312038 0 231.432976-191.70823 419.042865-428.200432 419.042865S83.799056 646.0001560000001 83.799056 414.567179zM340.71952 276.63573699999995c22.935362-41.481763 89.831958-75.102489 170.391738-75.102489 79.650061 0 148.489916 32.909527 172.168198 73.681116-12.701277 5.979178-19.068288 8.02886-28.131711 12.21009-19.894096-31.257911-75.425853-59.661821-142.729725-59.661821-66.969251 0-122.836653 28.40391-143.598512 61.083194L340.71952 276.63573699999995z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="release" unicode="" d="M990.78144 828.5388800000001c-3.35872 1.59744-7.04512 2.37568-11.01824 2.37568-14.45888 0-27.60704-10.81344-27.40224-10.81344-8.8064-4.42368-880.59904-443.22816-911.44192-459.44832-17.408-9.13408-27.36128-24.73984-25.92768-40.71424 1.10592-13.14816 9.78944-23.51104 23.10144-27.77088 26.17344-8.27392 290.24256-91.58656 290.24256-91.58656l4.83328-1.47456 16.67072 50.05312-254.32064 79.54432 780.73856 406.28224c-82.82112-93.88032-420.53632-476.32384-436.10112-493.93664-20.11136-22.48704-29.4912-45.09696-29.40928-70.98368l0.28672-153.27232-0.08192 0c0 0 0.08192-53.49376 0.08192-53.6576l0-1.96608 0 0c1.18784-13.5168 12.73856-24.24832 26.54208-24.24832s25.51808 10.73152 26.74688 24.24832l0 0c0 0 0.53248 191.03744 0 205.08672-0.49152 12.4928 5.07904 26.54208 10.69056 33.05472 5.65248 6.38976 390.63552 442.61376 465.75616 527.81056-21.38112-106.41408-126.68928-629.76-128.24576-637.41952-0.8192-4.05504-2.58048-4.05504-3.35872-4.05504-0.6144 0-1.31072 0.12288-2.048 0.36864-7.45472 2.37568-268.82048 81.55136-279.92064 84.91008l-4.7104 1.4336-17.16224-50.50368 5.07904-1.59744c2.58048-0.77824 258.90816-79.09376 284.38528-86.46656 5.07904-1.47456 10.24-2.2528 15.44192-2.2528 26.99264 0 49.5616 19.37408 54.8864 46.98112 2.08896 10.93632 27.0336 134.67648 55.9104 277.99552 39.77216 197.14048 84.7872 420.61824 85.93408 427.6224l0.6144 3.31776C1009.70496 798.96576 1013.26848 817.9712 990.78144 828.5388800000001z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="list" unicode="" d="M618.04471 733.97072l-397.175835 0c-16.927531 0-30.699186-13.771655-30.699186-30.699186l0-638.543068c0-16.927531 13.771655-30.699186 30.699186-30.699186l582.261227 0c16.927531 0 30.699186 13.771655 30.699186 30.699186l-0.726547 476.760404L618.04471 733.97072zM803.771715 541.488871 619.537713 541.488871 619.537713 705.552483 803.771715 541.488871zM813.363164 64.728466c0-5.64251-4.590552-10.233062-10.233062-10.233062l-582.261227 0c-5.64251 0-10.233062 4.590552-10.233062 10.233062l0 638.543068c0 5.64251 4.590552 10.233062 10.233062 10.233062l378.202715 0 0-192.481849 214.291574 0L813.363164 64.728466zM298.129516 482.495268l55.258535 0 0-55.258535-55.258535 0 0 55.258535ZM399.777591 468.168981l323.364759 0 0-26.605961-323.364759 0 0 26.605961ZM298.129516 342.044446l55.258535 0 0-55.258535-55.258535 0 0 55.258535ZM399.777591 327.718159l323.364759 0 0-26.605961-323.364759 0 0 26.605961ZM298.129516 199.804884l55.258535 0 0-55.258535-55.258535 0 0 55.258535ZM399.777591 185.478598l323.364759 0 0-26.605961-323.364759 0 0 26.605961ZM881.315812 53.053566" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="chart" unicode="" d="M953.440991 315.668729L784.061302 315.668729 681.06451 437.392024c-0.312108 0.373507-0.635473 0.737804-0.969071 1.094938-0.013303 0.014326-0.026606 0.027629-0.039909 0.041956-0.276293 0.293689-0.559748 0.582261-0.851391 0.86367-0.053212 0.051165-0.107447 0.099261-0.160659 0.150426-0.249687 0.237407-0.50142 0.470721-0.76134 0.697895-0.089028 0.078795-0.181125 0.153496-0.272199 0.230244-0.225127 0.191358-0.451278 0.381693-0.683569 0.565888-0.124843 0.099261-0.251733 0.192382-0.3776 0.288572-0.200568 0.153496-0.402159 0.306992-0.607844 0.454348-0.159636 0.11461-0.322341 0.224104-0.485047 0.334621-0.177032 0.12075-0.354064 0.242524-0.535189 0.35918-0.195451 0.12689-0.394996 0.246617-0.593518 0.367367-0.152473 0.092098-0.302899 0.186242-0.457418 0.275269-0.237407 0.137123-0.477884 0.268106-0.718361 0.397043-0.121773 0.065492-0.2415 0.132006-0.364297 0.195451-0.283456 0.146333-0.571005 0.285502-0.859577 0.420579-0.085958 0.040932-0.170892 0.082888-0.257873 0.122797-0.337691 0.154519-0.679475 0.298805-1.022283 0.437975-0.044002 0.017396-0.086981 0.036839-0.130983 0.055259-1.604544 0.638543-3.2623 1.113357-4.948709 1.416256-0.343831 0.062422-0.687662 0.112564-1.031493 0.160659-0.055259 0.008186-0.110517 0.01842-0.165776 0.025583-1.633197 0.216941-3.25923 0.26913-4.861728 0.173962-0.013303-0.001023-0.026606-0.001023-0.040932-0.002047-0.363274-0.022513-0.724501-0.054235-1.085728-0.091074-0.060375-0.00614-0.119727-0.011256-0.180102-0.017396-0.310062-0.034792-0.618077-0.077771-0.926092-0.122797-0.116657-0.017396-0.232291-0.032746-0.348947-0.051165-0.24764-0.040932-0.494257-0.086981-0.740874-0.135076-0.178055-0.033769-0.355087-0.067538-0.532119-0.105401-0.183172-0.039909-0.36532-0.083911-0.547469-0.127913-0.237407-0.056282-0.474814-0.113587-0.710175-0.176009-0.12075-0.032746-0.240477-0.068562-0.360204-0.102331-0.292666-0.082888-0.584308-0.168846-0.874927-0.26299-0.063445-0.020466-0.125867-0.042979-0.188288-0.063445-0.338714-0.112564-0.675382-0.230244-1.010003-0.357134-0.019443-0.007163-0.038886-0.01535-0.058328-0.022513-1.493004-0.571005-2.948145-1.284249-4.340865-2.149966-0.067538-0.041956-0.13303-0.088004-0.200568-0.12996-0.273223-0.172939-0.545422-0.346901-0.813528-0.531096-1.416256-0.971118-2.734274-2.089591-3.936659-3.333932-0.025583-0.026606-0.049119-0.053212-0.074701-0.079818-0.26299-0.275269-0.521886-0.555655-0.773619-0.843204-0.058328-0.066515-0.112564-0.134053-0.169869-0.200568-0.211824-0.246617-0.420579-0.496304-0.62217-0.751107-0.083911-0.106424-0.164752-0.214894-0.246617-0.322341-0.167822-0.218988-0.334621-0.437975-0.49528-0.663102-0.102331-0.14224-0.199545-0.287549-0.298805-0.431835-0.13303-0.194428-0.26606-0.387833-0.393973-0.586354-0.115634-0.179079-0.225127-0.360204-0.335644-0.541329-0.103354-0.168846-0.207731-0.336668-0.306992-0.508583-0.12689-0.220011-0.24764-0.443092-0.36839-0.666172-0.074701-0.138146-0.151449-0.275269-0.223081-0.416486-0.137123-0.265036-0.265036-0.533143-0.39295-0.802272-0.050142-0.105401-0.101307-0.209778-0.150426-0.316202-0.144286-0.317225-0.279363-0.63752-0.410346-0.958838-0.026606-0.064468-0.055259-0.127913-0.080841-0.193405-0.150426-0.378623-0.291642-0.760317-0.423649-1.14508-0.005117-0.016373-0.011256-0.031722-0.017396-0.048095-0.157589-0.463558-0.303922-0.930185-0.434905-1.400906l-97.897657-342.642824L435.093423 811.832042c-0.071631 0.569982-0.165776 1.13587-0.275269 1.696642-0.008186 0.040932-0.017396 0.081864-0.025583 0.12382-0.071631 0.356111-0.148379 0.709151-0.234337 1.061169-0.031722 0.128937-0.065492 0.255827-0.099261 0.38374-0.066515 0.254803-0.135076 0.508583-0.208754 0.760317-0.060375 0.206708-0.124843 0.411369-0.190335 0.615007-0.053212 0.166799-0.107447 0.332575-0.164752 0.49835-0.092098 0.26913-0.190335 0.535189-0.290619 0.800225-0.037862 0.098237-0.074701 0.196475-0.113587 0.293689-0.12382 0.313132-0.25378 0.623193-0.38988 0.930185-0.022513 0.050142-0.044002 0.100284-0.066515 0.150426-0.152473 0.338714-0.311085 0.672312-0.477884 1.00284-0.01228 0.024559-0.024559 0.049119-0.037862 0.074701-0.173962 0.343831-0.356111 0.682545-0.545422 1.017166-0.011256 0.019443-0.022513 0.039909-0.033769 0.059352-0.188288 0.330528-0.382717 0.654916-0.584308 0.975211-0.021489 0.034792-0.044002 0.068562-0.065492 0.103354-0.190335 0.298805-0.385786 0.592494-0.587378 0.88209-0.045025 0.065492-0.091074 0.12996-0.137123 0.194428-0.180102 0.252757-0.363274 0.502443-0.551562 0.74906-0.079818 0.105401-0.162706 0.208754-0.24457 0.312108-0.157589 0.199545-0.317225 0.396019-0.480954 0.590448-0.124843 0.149403-0.252757 0.295735-0.381693 0.442068-0.125867 0.14224-0.251733 0.284479-0.38067 0.424672-0.174985 0.191358-0.355087 0.378623-0.536212 0.563842-0.088004 0.090051-0.176009 0.180102-0.26606 0.26913-0.224104 0.222057-0.452301 0.440022-0.684592 0.653893-0.054235 0.050142-0.10847 0.100284-0.163729 0.150426-0.265036 0.240477-0.535189 0.474814-0.810459 0.704035-0.028653 0.023536-0.056282 0.047072-0.084934 0.070608-0.294712 0.243547-0.595564 0.479931-0.902556 0.711198-0.01535 0.011256-0.029676 0.022513-0.045025 0.033769-0.311085 0.232291-0.627287 0.458441-0.949628 0.677429-0.019443 0.013303-0.037862 0.025583-0.057305 0.038886-0.309038 0.208754-0.623193 0.411369-0.942465 0.606821-0.045025 0.027629-0.090051 0.054235-0.134053 0.081864-0.288572 0.174985-0.581238 0.343831-0.877997 0.50756-0.090051 0.050142-0.181125 0.098237-0.272199 0.147356-0.25071 0.134053-0.502443 0.265036-0.759293 0.391926-0.156566 0.077771-0.314155 0.151449-0.472767 0.226151-0.194428 0.091074-0.38988 0.182149-0.587378 0.268106-0.239454 0.105401-0.481977 0.204661-0.724501 0.302899-0.12382 0.049119-0.246617 0.100284-0.37146 0.148379-0.334621 0.128937-0.673335 0.249687-1.014096 0.36532-0.042979 0.014326-0.085958 0.029676-0.128937 0.044002-1.6158 0.536212-3.296069 0.915859-5.02034 1.119497-0.01535 0.002047-0.029676 0.004093-0.044002 0.00614-0.309038 0.035816-0.620124 0.062422-0.931209 0.086981-0.132006 0.010233-0.265036 0.025583-0.397043 0.033769-0.174985 0.011256-0.349971 0.01535-0.525979 0.022513-0.270153 0.01228-0.539282 0.024559-0.808412 0.027629-0.054235 0.001023-0.10847-0.001023-0.162706-0.001023-1.696642 0.010233-3.371794-0.149403-5.006014-0.466628-0.065492-0.01228-0.12996-0.027629-0.195451-0.039909-0.331551-0.067538-0.662079-0.13917-0.989537-0.218988-0.148379-0.035816-0.295735-0.075725-0.443092-0.11461-0.234337-0.061398-0.468674-0.124843-0.700965-0.192382-0.224104-0.065492-0.445138-0.135076-0.666172-0.206708-0.149403-0.048095-0.297782-0.096191-0.446162-0.147356-0.286526-0.098237-0.568958-0.201591-0.850367-0.309038-0.079818-0.030699-0.160659-0.061398-0.240477-0.093121-0.330528-0.12996-0.655939-0.267083-0.979304-0.410346-0.033769-0.01535-0.067538-0.029676-0.101307-0.045025-0.355087-0.159636-0.705058-0.325411-1.050935-0.500397-0.008186-0.004093-0.016373-0.008186-0.023536-0.01228-0.360204-0.182149-0.714268-0.372483-1.064238-0.569982-0.004093-0.002047-0.008186-0.005117-0.013303-0.007163-0.344854-0.196475-0.684592-0.399089-1.019213-0.610914-0.020466-0.013303-0.040932-0.025583-0.060375-0.038886-0.313132-0.199545-0.621147-0.404206-0.925069-0.61603-0.050142-0.034792-0.099261-0.070608-0.149403-0.105401-0.268106-0.190335-0.532119-0.38374-0.791016-0.583285-0.091074-0.069585-0.181125-0.141216-0.271176-0.212848-0.212848-0.167822-0.422625-0.337691-0.629333-0.512676-0.137123-0.11461-0.271176-0.232291-0.406253-0.349971-0.154519-0.1361-0.308015-0.272199-0.459464-0.412392-0.179079-0.164752-0.354064-0.332575-0.528026-0.502443-0.102331-0.100284-0.204661-0.199545-0.304945-0.301875-0.211824-0.212848-0.418532-0.430812-0.623193-0.651846-0.059352-0.064468-0.119727-0.128937-0.179079-0.194428-0.231267-0.254803-0.456395-0.515746-0.678452-0.780783-0.031722-0.037862-0.063445-0.075725-0.095167-0.11461-0.23536-0.285502-0.465604-0.577145-0.688685-0.874927-0.01842-0.024559-0.036839-0.048095-0.055259-0.072655-0.226151-0.301875-0.445138-0.60989-0.657986-0.923022-0.019443-0.028653-0.038886-0.057305-0.058328-0.084934-0.202615-0.300852-0.400113-0.606821-0.590448-0.916882-0.032746-0.053212-0.064468-0.105401-0.096191-0.158612-0.169869-0.282433-0.335644-0.567935-0.49528-0.857531-0.053212-0.097214-0.105401-0.194428-0.158612-0.292666-0.130983-0.24457-0.258896-0.490164-0.381693-0.73985-0.080841-0.162706-0.157589-0.326435-0.234337-0.491187-0.088004-0.189312-0.177032-0.378623-0.260943-0.571005-0.107447-0.245593-0.209778-0.493234-0.310062-0.741897-0.047072-0.11768-0.095167-0.234337-0.141216-0.354064-0.130983-0.340761-0.25378-0.684592-0.370437-1.030469-0.013303-0.037862-0.026606-0.075725-0.038886-0.113587-0.180102-0.543376-0.345877-1.092891-0.48914-1.650593L244.22942 305.59939599999996 67.355037 305.59939599999996c-14.128789 0-25.582655-11.453866-25.582655-25.582655s11.453866-25.582655 25.582655-25.582655l191.314257 0c0.867764 0 1.725294 0.044002 2.570545 0.128937 0.828878-0.080841 1.656733-0.1361 2.478448-0.1361 11.218506 0 21.512966 7.439436 24.644283 18.779715l113.358791 410.43686 103.412254-723.884758c0.00921-0.072655 0.021489-0.145309 0.030699-0.217964l0.046049-0.320295c0.002047-0.011256 0.005117-0.021489 0.00614-0.032746 0.109494-0.7552 0.25071-1.502213 0.425695-2.238994 0.01535-0.064468 0.031722-0.12689 0.047072-0.191358 0.166799-0.679475 0.358157-1.350764 0.579191-2.01182 0.041956-0.124843 0.088004-0.24764 0.130983-0.37146 0.210801-0.600681 0.437975-1.194198 0.692778-1.77646 0.068562-0.156566 0.144286-0.309038 0.215918-0.464581 0.223081-0.484024 0.460488-0.961908 0.713244-1.431605 0.106424-0.196475 0.213871-0.390903 0.325411-0.584308 0.265036-0.462534 0.545422-0.914836 0.838088-1.359974 0.088004-0.13303 0.170892-0.268106 0.260943-0.399089 0.354064-0.51677 0.732687-1.016143 1.12359-1.506307 0.078795-0.099261 0.156566-0.198521 0.237407-0.296759 0.420579-0.511653 0.864694-1.004887 1.325182-1.482771 0.051165-0.052189 0.101307-0.105401 0.152473-0.157589 0.494257-0.50449 1.010003-0.989537 1.548262-1.454118 0.00921-0.007163 0.017396-0.014326 0.026606-0.022513 1.636267-1.408069 3.466961-2.620687 5.466502-3.592828 0.075725-0.036839 0.151449-0.074701 0.228197-0.11154 0.576121-0.273223 1.165546-0.525979 1.768273-0.75827 0.158612-0.061398 0.319272-0.118704 0.478907-0.177032 0.558725-0.202615 1.124614-0.393973 1.704828-0.559748 0.005117-0.001023 0.010233-0.002047 0.01535-0.004093 0.278339-0.079818 0.562818-0.13917 0.844228-0.209778 0.394996-0.098237 0.789992-0.194428 1.184989-0.274246 0.283456-0.056282 0.568958-0.103354 0.854461-0.149403 0.445138-0.073678 0.889253-0.134053 1.333368-0.183172 0.229221-0.024559 0.456395-0.052189 0.686638-0.071631 0.710175-0.059352 1.418302-0.099261 2.122337-0.099261 0.337691 0 0.671289 0.027629 1.007957 0.040932 0.276293 0.011256 0.550539 0.013303 0.828878 0.033769 0.401136 0.029676 0.799202 0.079818 1.196245 0.127913 0.191358 0.022513 0.38067 0.033769 0.572028 0.061398 0.069585 0.010233 0.1361 0.024559 0.205685 0.034792 0.232291 0.034792 0.462534 0.075725 0.692778 0.116657 0.463558 0.082888 0.921999 0.176009 1.3743 0.283456 0.109494 0.025583 0.218988 0.047072 0.327458 0.074701 0.582261 0.145309 1.152243 0.316202 1.716084 0.499373 0.098237 0.031722 0.196475 0.063445 0.293689 0.097214 1.90335 0.644683 3.694135 1.50119 5.351891 2.540869 0.014326 0.00921 0.028653 0.01842 0.042979 0.027629 1.089821 0.686638 2.121314 1.452071 3.087315 2.287089 0.083911 0.071631 0.167822 0.143263 0.25071 0.215918 0.424672 0.3776 0.837064 0.76748 1.235131 1.170662 0.12382 0.124843 0.243547 0.254803 0.36532 0.382717 0.317225 0.334621 0.626263 0.677429 0.925069 1.028423 0.155543 0.183172 0.308015 0.36839 0.458441 0.556679 0.26606 0.331551 0.523933 0.670266 0.773619 1.01512 0.130983 0.180102 0.261966 0.35918 0.387833 0.543376 0.294712 0.429789 0.575098 0.86981 0.843204 1.316995 0.099261 0.165776 0.195451 0.334621 0.290619 0.503467 0.283456 0.499373 0.555655 1.004887 0.806365 1.52268 0.031722 0.065492 0.060375 0.13303 0.091074 0.199545 0.276293 0.584308 0.530073 1.178849 0.762363 1.784646 0.00614 0.017396 0.014326 0.034792 0.020466 0.051165 0.251733 0.661056 0.472767 1.336438 0.669242 2.020006 0.002047 0.008186 0.00614 0.016373 0.008186 0.024559l0.061398 0.215918c0.029676 0.106424 0.062422 0.210801 0.090051 0.317225l117.579929 411.527704 79.800487-94.308923c0.070608-0.083911 0.146333-0.161682 0.217964-0.243547 0.190335-0.220011 0.38374-0.436952 0.581238-0.649799 0.134053-0.144286 0.26913-0.285502 0.405229-0.425695 0.164752-0.168846 0.331551-0.335644 0.50142-0.500397 0.164752-0.159636 0.329505-0.319272 0.496304-0.473791 0.138146-0.12689 0.279363-0.25071 0.419556-0.37453 0.198521-0.174985 0.397043-0.350994 0.599657-0.518816 0.081864-0.067538 0.166799-0.132006 0.249687-0.198521 0.817622-0.661056 1.667989-1.264806 2.545986-1.811252 0.098237-0.061398 0.195451-0.125867 0.294712-0.185218 0.228197-0.138146 0.459464-0.267083 0.691755-0.398066 0.157589-0.089028 0.315178-0.178055 0.474814-0.264013 0.200568-0.107447 0.403183-0.208754 0.606821-0.311085 0.202615-0.101307 0.406253-0.201591 0.611937-0.297782 0.173962-0.080841 0.348947-0.159636 0.523933-0.237407 0.245593-0.10847 0.494257-0.212848 0.743944-0.313132 0.144286-0.058328 0.289596-0.115634 0.434905-0.171915 0.291642-0.11154 0.586354-0.216941 0.883113-0.317225 0.11154-0.037862 0.223081-0.076748 0.334621-0.113587 0.337691-0.109494 0.677429-0.210801 1.02126-0.305969 0.078795-0.021489 0.157589-0.046049 0.236384-0.066515 0.376577-0.101307 0.757247-0.193405 1.140986-0.277316 0.050142-0.011256 0.100284-0.023536 0.150426-0.034792 0.405229-0.085958 0.813528-0.162706 1.225921-0.229221 0.031722-0.005117 0.063445-0.01228 0.096191-0.017396 0.412392-0.065492 0.828878-0.12075 1.24741-0.165776 0.032746-0.004093 0.064468-0.00921 0.097214-0.01228 0.382717-0.039909 0.768503-0.068562 1.155313-0.092098 0.068562-0.004093 0.1361-0.01228 0.204661-0.01535 0.25992-0.013303 0.521886-0.01535 0.782829-0.020466 0.188288-0.004093 0.376577-0.01535 0.564865-0.01535 0.008186 0 0.01535 0.001023 0.023536 0.001023l181.208085 0c14.129812 0 25.582655 11.453866 25.582655 25.582655S967.56978 315.668729 953.440991 315.668729z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="ok-circle" unicode="စ" d="M516.152065-63.152063c-60.696384 0-119.594819 11.894911-175.056991 35.353183-53.55473 22.651906-101.646028 55.073316-142.936433 96.364745-41.291428 41.291428-73.712839 89.381703-96.363721 142.936433-23.458271 55.462173-35.353183 114.359584-35.353183 175.055968s11.894911 119.594819 35.353183 175.056991c22.651906 53.55473 55.073316 101.646028 96.363721 142.936433 41.290405 41.291428 89.381703 73.712839 142.936433 96.363721 55.462173 23.458271 114.359584 35.353183 175.056991 35.353183s119.594819-11.894911 175.056991-35.353183c53.55473-22.651906 101.645005-55.073316 142.936433-96.363721 41.291428-41.290405 73.711815-89.38068 96.363721-142.936433 23.459295-55.462173 35.353183-114.359584 35.353183-175.056991 0-60.696384-11.893888-119.593795-35.353183-175.055968-22.651906-53.55473-55.072293-101.645005-96.363721-142.936433s-89.381703-73.712839-142.936433-96.364745C635.747907-51.25715200000002 576.849472-63.152063 516.152065-63.152063zM516.152065 774.870222c-214.115566 0-388.311956-174.196391-388.311956-388.311956s174.196391-388.311956 388.311956-388.311956 388.311956 174.196391 388.311956 388.311956S730.268654 774.870222 516.152065 774.870222zM434.74908 132.830517L209.49278 358.08784 289.087583 437.68162 434.74908 292.020122 743.218594 600.488613 822.812373 520.89381Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="layim-theme" unicode="" d="M958.830745 538.643056L740.659817 692.753993l-100.539834 0-3.977591-9.332553c-0.37146-0.871857-38.021965-86.8613-124.772748-88.667435-35.691897 0.76441-67.206658 15.500019-93.680613 43.828204-20.658506 22.106484-30.374798 44.584428-30.456662 44.776809l-3.955078 9.393951-100.587929 0L64.518433 538.643056 169.320337 379.756349l89.956801 65.019853-19.016099-368.05254 268.86654 0 4.093225 0 269.866311 0-19.016099 368.051517 89.956801-65.018829L958.830745 538.643056zM730.105437 507.20402l20.655436-399.781172-237.540068 0-4.093225 0L272.587282 107.42284700000005l20.656459 399.781172-115.938546-83.797521-36.3243 55.070246 159.440315 111.641683-19.276019 30.638811L121.066333 508.667348l-14.548344 22.056342 185.921433 131.330094 71.077825 0c5.332449-10.04375 15.433504-26.779923 30.951943-43.580564 32.047904-34.69622 72.256674-53.486168 116.345822-54.411237l0-0.031722c0.203638 0.00307 0.406253 0.01228 0.60989 0.016373 0.203638-0.00307 0.406253-0.013303 0.60989-0.016373l0 0.031722c44.073798 0.925069 84.359316 19.703761 116.566856 54.379515 15.623839 16.821107 25.814945 33.579793 31.188326 43.612287l71.120804 0 185.921433-131.330094-14.548344-22.056342L742.203986 620.7551920000001l-19.276019-30.638811 159.440315-111.641683-36.3243-55.070246L730.105437 507.20402z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="table" unicode="" d="M304.738028 343.684806M729.544153 511.153982M595.52788 637.723655M143.806755 686.614156l0-601.704045L881.172549 84.91011100000003l0 601.704045L143.806755 686.614156zM420.318416 299.80441299999995l0 128.936581 184.341448 0 0-128.936581L420.318416 299.80441299999995zM604.659865 256.825552l0-128.936581L420.318416 127.88897099999997l0 128.936581L604.659865 256.825552zM604.659865 600.656435l0-128.936581L420.318416 471.719854l0 128.936581L604.659865 600.656435zM374.232798 600.656435l0-128.936581L189.89135 471.719854l0 128.936581L374.232798 600.656435zM189.89135 428.740994L374.232798 428.740994l0-128.936581L189.89135 299.80441299999995 189.89135 428.740994zM650.745483 428.740994l184.341448 0 0-128.936581L650.745483 299.80441299999995 650.745483 428.740994zM650.745483 471.719854l0 128.936581 184.341448 0 0-128.936581L650.745483 471.719854zM189.89135 256.825552L374.232798 256.825552l0-128.936581L189.89135 127.88897099999997 189.89135 256.825552zM650.745483 127.88897099999997l0 128.936581 184.341448 0 0-128.936581L650.745483 127.88897099999997z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="right" unicode="" d="M283.648 721.9189759999999L340.873216 780.926976 740.352 383.99795200000005 340.876288-12.925952000000052 283.648 46.07795199999998 619.52 383.99795200000005Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="left" unicode="" d="M740.352 721.9189759999999L683.126784 780.926976 283.648 383.99795200000005 683.123712-12.925952000000052 740.352 46.07795199999998 404.48 383.99795200000005Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="cart-simple" unicode="" d="M235.097303 196.866982C247.384597 160.417152 286.382106 132.37606800000003 324.772759 132.37606800000003L861.658537 132.37606800000003 880.429732 132.37606800000003 885.649214 150.54185399999994 1009.08775 580.154957C1021.388907 622.967661 993.187631 660.786325 949.051586 660.786325L424.585365 660.786325C410.791718 660.786325 399.609756 649.5207379999999 399.609756 635.623932 399.609756 621.727125 410.791718 610.461538 424.585365 610.461538L949.051586 610.461538C959.924 610.461538 964.161052 604.779539 961.106394 594.148171L837.667859 164.53506800000002 861.658537 182.70085500000005 324.772759 182.70085500000005C307.742153 182.70085500000005 287.789837 197.04752900000005 282.395194 213.05054900000005L73.600164 832.433664C69.16437 845.592294 54.980454 852.636656 41.919502 848.167687 28.858551 843.698719 21.86648 829.408727 26.302275 816.250097L235.097303 196.866982ZM399.609756-6.017094000000043C399.609756 49.57012899999995 354.881911 94.63247799999999 299.707317 94.63247799999999 244.532723 94.63247799999999 199.804878 49.57012899999995 199.804878-6.017094000000043 199.804878-61.604318000000035 244.532723-106.66666699999996 299.707317-106.66666699999996 354.881911-106.66666699999996 399.609756-61.604318000000035 399.609756-6.017094000000043ZM249.756098-6.017094000000043C249.756098 21.77651800000001 272.120021 44.30769299999997 299.707317 44.30769299999997 327.294613 44.30769299999997 349.658537 21.77651800000001 349.658537-6.017094000000043 349.658537-33.810704999999984 327.294613-56.34187899999995 299.707317-56.34187899999995 272.120021-56.34187899999995 249.756098-33.810704999999984 249.756098-6.017094000000043ZM924.097562-6.017094000000043C924.097562 49.57012899999995 879.369715 94.63247799999999 824.195121 94.63247799999999 769.020529 94.63247799999999 724.292683 49.57012899999995 724.292683-6.017094000000043 724.292683-61.604318000000035 769.020529-106.66666699999996 824.195121-106.66666699999996 879.369715-106.66666699999996 924.097562-61.604318000000035 924.097562-6.017094000000043ZM774.243902-6.017094000000043C774.243902 21.77651800000001 796.607825 44.30769299999997 824.195121 44.30769299999997 851.782419 44.30769299999997 874.146342 21.77651800000001 874.146342-6.017094000000043 874.146342-33.810704999999984 851.782419-56.34187899999995 824.195121-56.34187899999995 796.607825-56.34187899999995 774.243902-33.810704999999984 774.243902-6.017094000000043Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="face-cry" unicode="" d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.23020799999995 229.230208-128 512-128 629.410831-128 740.826187-88.33104600000001 830.768465-16.686661999999956 841.557579-8.092490999999995 843.33693 7.620766000000003 834.742758 18.409879000000046 826.148587 29.198990999999978 810.43533 30.978341999999998 799.646219 22.384173000000033 718.470035-42.277495000000044 618.001779-78.04878099999996 512-78.04878099999996 256.817504-78.04878099999996 49.951219 128.81750399999999 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.66323599999998 904.470807 140.039307 897.177109 128.33175700000004 900.755245 112.92820300000005 912.462793 105.63450699999999 924.170342 98.34080900000004 939.573897 101.91894200000002 946.867595 113.62649199999998 997.013826 194.11920399999997 1024 287.101621 1024 384ZM337.170731 396.487806C371.654852 396.487806 399.609756 424.442709 399.609756 458.926829 399.609756 493.41095 371.654852 521.365854 337.170731 521.365854 302.686611 521.365854 274.731708 493.41095 274.731708 458.926829 274.731708 424.442709 302.686611 396.487806 337.170731 396.487806ZM711.804879 396.487806C746.288998 396.487806 774.243902 424.442709 774.243902 458.926829 774.243902 493.41095 746.288998 521.365854 711.804879 521.365854 677.320757 521.365854 649.365854 493.41095 649.365854 458.926829 649.365854 424.442709 677.320757 396.487806 711.804879 396.487806ZM352.788105 191.21547499999997C396.165222 225.91716899999994 453.151987 246.639629 524.487806 246.639629 595.823622 246.639629 652.810387 225.91716899999994 696.187505 191.21547499999997 722.700531 170.00505399999997 738.882517 148.42907300000002 746.631548 132.931012 752.800254 120.59359800000004 747.799529 105.59142399999996 735.462114 99.42271600000004 723.124702 93.25401 708.122526 98.25473499999998 701.953818 110.59214899999995 701.03616 112.42746499999998 698.492224 116.61747600000001 694.165854 122.38597100000004 686.602473 132.47047699999996 676.927317 142.654852 664.983226 152.21012499999995 630.311565 179.947456 584.273939 196.68840999999998 524.487806 196.68840999999998 464.70167 196.68840999999998 418.664045 179.947456 383.992384 152.21012499999995 372.048292 142.654852 362.373137 132.47047699999996 354.809756 122.38597100000004 350.483386 116.61747600000001 347.93945 112.42746499999998 347.021792 110.59214899999995 340.853084 98.25473499999998 325.850908 93.25401 313.513495 99.42271600000004 301.176081 105.59142399999996 296.175356 120.59359800000004 302.344062 132.931012 310.093092 148.42907300000002 326.275078 170.00505399999997 352.788105 191.21547499999997Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="face-smile" unicode="" d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.23020799999995 229.230208-128 512-128 629.410831-128 740.826187-88.33104600000001 830.768465-16.686661999999956 841.557579-8.092490999999995 843.33693 7.620766000000003 834.742758 18.409879000000046 826.148587 29.198990999999978 810.43533 30.978341999999998 799.646219 22.384173000000033 718.470035-42.277495000000044 618.001779-78.04878099999996 512-78.04878099999996 256.817504-78.04878099999996 49.951219 128.81750399999999 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.66323599999998 904.470807 140.039307 897.177109 128.33175700000004 900.755245 112.92820300000005 912.462793 105.63450699999999 924.170342 98.34080900000004 939.573897 101.91894200000002 946.867595 113.62649199999998 997.013826 194.11920399999997 1024 287.101621 1024 384ZM337.170731 396.487806C371.654852 396.487806 399.609756 424.442709 399.609756 458.926829 399.609756 493.41095 371.654852 521.365854 337.170731 521.365854 302.686611 521.365854 274.731708 493.41095 274.731708 458.926829 274.731708 424.442709 302.686611 396.487806 337.170731 396.487806ZM711.804879 396.487806C746.288998 396.487806 774.243902 424.442709 774.243902 458.926829 774.243902 493.41095 746.288998 521.365854 711.804879 521.365854 677.320757 521.365854 649.365854 493.41095 649.365854 458.926829 649.365854 424.442709 677.320757 396.487806 711.804879 396.487806ZM352.788105 127.22903299999996C396.165222 92.52733899999998 453.151987 71.80487900000003 524.487806 71.80487900000003 595.823622 71.80487900000003 652.810387 92.52733899999998 696.187505 127.22903299999996 722.700531 148.43945399999996 738.882517 170.01543500000002 746.631548 185.51349500000003 752.800254 197.850908 747.799529 212.85308399999997 735.462114 219.021792 723.124702 225.19049800000005 708.122526 220.18977299999995 701.953818 207.85235799999998 701.03616 206.01704299999994 698.492224 201.82703100000003 694.165854 196.058537 686.602473 185.97402899999997 676.927317 175.78965500000004 664.983226 166.23438299999998 630.311565 138.49705200000005 584.273939 121.75609799999995 524.487806 121.75609799999995 464.70167 121.75609799999995 418.664045 138.49705200000005 383.992384 166.23438299999998 372.048292 175.78965500000004 362.373137 185.97402899999997 354.809756 196.058537 350.483386 201.82703100000003 347.93945 206.01704299999994 347.021792 207.85235799999998 340.853084 220.18977299999995 325.850908 225.19049800000005 313.513495 219.021792 301.176081 212.85308399999997 296.175356 197.850908 302.344062 185.51349500000003 310.093092 170.01543500000002 326.275078 148.43945399999996 352.788105 127.22903299999996Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="survey" unicode="" d="M722.355804 849.454545C761.006291 849.454545 792.380951 818.166023 792.380951 779.627344L792.380951 437.500928 799.081094 453.813218 401.874746 51.22138 418.539682 58.181818 138.070006 58.181818C99.387643 58.181818 68.063492 89.328555 68.063492 127.771428L68.063492 872.727273 44.698413 849.454545 722.355804 849.454545ZM21.333333 896 21.333333 872.727273 21.333333 127.771428C21.333333 63.604277 73.59726 11.636363 138.070006 11.636363L418.539682 11.636363 428.337293 11.636363 435.204619 18.596802 832.410967 421.18864 839.11111 427.979625 839.11111 437.500928 839.11111 779.627344C839.11111 843.859757 786.827324 896 722.355804 896L44.698413 896 21.333333 896ZM775.859347 307.365395 759.337741 290.90909 775.859347 274.452787 869.319663 181.361879 885.841269 164.905574 902.362876 181.361879 972.458114 251.18006 988.979721 267.636363 972.458114 284.092668 878.997796 377.183575 862.47619 393.639878 845.954583 377.183575 775.859347 307.365395ZM845.954583 344.27097 939.414901 251.18006 939.414901 284.092668 869.319663 214.274485 902.362876 214.274485 808.902558 307.365395 808.902558 274.452787 878.997796 344.27097 845.954583 344.27097ZM518.843473 51.365395 513.841133 46.382827 512.453734 39.473248 489.088655-76.890387 482.215251-111.121568 516.58227-104.275332 633.407665-81.002605 640.344663-79.620689 645.347004-74.638121 902.362876 181.361879 918.884482 197.818182 902.362876 214.274485 808.902558 307.365395 792.380951 323.821698 775.859347 307.365395 518.843473 51.365395ZM775.859347 274.452787 869.319663 181.361879 869.319663 214.274485 612.303791-41.725515 624.243127-35.361033 507.41773-58.633758 534.911345-86.018703 558.276425 30.344934 551.886686 18.452787 808.902558 274.452787 775.859347 274.452787ZM426.576706 298.269073C444.201086 298.269073 458.488469 284.053815 458.488469 266.500753L458.488469 258.086116C458.488469 240.540958 444.323959 226.317797 426.576706 226.317797L426.576706 226.317797C408.952326 226.317797 394.664943 240.533054 394.664943 258.086116L394.664943 266.500753C394.664943 284.045911 408.829453 298.269073 426.576706 298.269073L426.576706 298.269073ZM278.349205 552.435127C278.349205 552.435127 280.851125 530.485568 305.477133 530.485568 330.103138 530.485568 331.559155 552.435127 331.559155 552.435127 329.927383 623.508937 362.988497 657.25782 430.67155 653.905282 475.722639 648.839223 499.06407 623.508937 500.624896 577.839917 497.503245 557.501184 480.405116 531.202385 449.969026 499.092521 409.671358 458.489557 389.522524 422.133143 389.522524 390.023279L389.522524 357.093903C389.522524 357.093903 392.614705 337.454532 414.885933 337.454532 437.157161 337.454532 440.249342 357.093903 440.249342 357.093903L440.249342 379.965664C440.249342 406.785969 459.546816 439.044836 498.21271 476.369762 538.652271 513.471183 558.730159 547.369069 558.730159 577.839917 555.395669 662.323878 511.195938 706.353877 425.776235 709.780917 327.515198 711.419936 278.349205 658.971339 278.349205 552.435127Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="tree" unicode="" d="M962.691679 258.53447400000005c-8.721639 54.163597-34.298154 97.584526-73.089645 133.8638-44.721551 41.825594-99.282191 65.724911-156.512636 84.432994-26.935466 8.80555-54.079686 16.971533-81.129762 25.427112 41.188074 7.485485 81.495082 10.991332 121.872698 12.269441 39.906895 1.26276 79.885422 0.276293 120.633475 0.276293-30.644951 44.233434-74.588789 71.110571-127.260405 84.384899-53.004191 13.357216-103.742782 9.715269-152.261822-32.081673 18.715247 66.336848 12.464893 120.18936-38.810934 160.830989-32.450063 25.719778-77.127611 31.000038-111.319341 14.916734 58.583257-31.127951 82.051761-84.265172 94.304829-145.102772-44.638663 69.056795-110.067838 96.432283-187.710173 86.487793-56.123228-7.187703-110.723777-26.270317-166.003801-40.048111 15.677051-14.358009 31.136138-24.116257 47.932686-27.839045 51.427276-11.399631 103.405091-20.301372 155.098427-30.524201 37.036521-7.323802 75.163887-12.144598 104.448864-40.879036-78.096682 23.458271-155.928329 30.034037-235.541551 9.092076C186.718589 530.20385 104.838743 479.821369 81.996502 429.437865c46.955428 23.955598 95.807043 18.776645 144.606469 17.139356 37.737486-1.266853 76.089979-3.461845 113.238041 1.594311 52.683896 7.170307 104.513332 20.624736 159.209048 31.909757-91.88164-62.077847-186.516997-122.342396-159.194722-259.889075 58.852386 100.205213 163.392324 150.107763 229.951229 238.105956-16.239869-91.498924 6.980995-169.376619 66.432015-237.83785 41.815361-48.152696 89.979314-92.010577 110.706381-156.013263 12.758582 141.877311-25.823132 270.789333-97.911984 396.334677C755.996107 391.809873 858.199837 325.909977 962.691679 258.53447400000005zM513.476631 320.10169099999996c-27.767414-14.065344-39.008432-35.954887-42.252313-64.998363-6.078439-54.437843-15.162328-108.532879-21.799492-162.916487-3.90903-32.026414-5.519714-64.333214-8.16496-96.53052 30.078039 0 55.507198 0 79.961146 0 9.912767 78.200036 19.732413 154.247037 28.913517 230.369761 0.883113 7.322779-0.756223 15.746636-3.705392 22.591531C536.246217 272.25086999999996 524.967336 295.41135899999995 513.476631 320.10169099999996z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="upload-circle" unicode="" d="M512-128c282.768 0 512 229.216 512 512C1024 666.768 794.768 896 512 896 229.216 896 0 666.768 0 384 0 101.21600000000001 229.216-128 512-128zM512 848c256.272 0 464-207.744 464-464 0-256.272-207.728-464-464-464S48 127.72799999999995 48 384C48 640.256 255.728 848 512 848zM377.728 534.544L480 534.544l0-478c0-17.664 14.336-32 32-32s32 14.336 32 32L544 534.544l102.272 0c17.616 0 23.424 11.568 12.944 25.68l-128.128 172.624c-10.496 14.128-27.664 14.128-38.16 0L364.8 560.24C354.32 546.1120000000001 360.128 534.544 377.728 534.544z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="add-circle" unicode="" d="M675.04 412.736l-127.04 0 0 127.264c0 20.064-16.288 36.32-36.32 36.32-20.064 0-36.32-16.192-36.32-36.32l0-127.232-127.072 0c-20.064 0-36.352-16.32-36.352-36.352 0-20.064 16.224-36.352 36.352-36.352l127.072 0 0-127.232c0-20 16.256-36.384 36.32-36.384 20.032 0 36.32 16.256 36.32 36.384l0 127.136 127.04 0c19.968 0 36.352 16.256 36.352 36.384C711.36 396.448 695.136 412.736 675.04 412.736L675.04 412.736zM511.328 830.56c-250.24 0-453.952-203.616-453.952-453.952 0-250.336 203.712-453.952 453.952-453.952 250.336 0 453.984 203.584 453.984 453.952C965.312 626.944 761.696 830.56 511.328 830.56L511.328 830.56zM511.328-20.576000000000022c-219.04 0-397.184 178.176-397.184 397.152 0 219.104 178.144 397.216 397.184 397.216s397.216-178.112 397.216-397.216C908.576 157.63199999999995 730.368-20.576000000000022 511.328-20.576000000000022L511.328-20.576000000000022zM511.328-20.576000000000022" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="download-circle" unicode="" d="M510.771521 828.211081c-244.998947 0-443.597097-198.60429-443.597097-443.590957s198.59815-443.591981 443.597097-443.591981c244.986667 0 443.583794 198.60429 443.583794 443.591981S755.758188 828.211081 510.771521 828.211081zM510.771521-30.044013999999947c-229.010811 0-414.664138 185.65435-414.664138 414.664138 0 229.010811 185.653327 414.657998 414.664138 414.657998 228.996484 0 414.652881-185.647187 414.652881-414.657998C925.424402 155.60931300000004 739.768005-30.044013999999947 510.771521-30.044013999999947zM662.749888 352.39518799999996L537.719266 245.82501100000002l0 324.388065c0 14.887059-12.06478 26.953885-26.947745 26.953885-14.894222 0-26.961048-12.066827-26.961048-26.953885l0-325.410348L357.936647 352.39518799999996c-10.56359 10.599406-27.693736 10.599406-38.267559 0-10.56359-10.596336-10.56359-27.777647 0-38.375006l170.181961-161.220868c5.629207-5.652743 13.111622-8.060583 20.49887-7.680936 7.373944-0.379647 14.859429 2.02717 20.488637 7.680936l170.181961 161.220868c10.562567 10.597359 10.562567 27.77867 0 38.375006C690.443623 362.99561700000004 673.313477 362.99561700000004 662.749888 352.39518799999996z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="templeate-1" unicode="" d="M320 384L106.666667 384c-35.349333 0-64-28.650667-64-64l0-213.333333c0-35.349333 28.650667-64 64-64l213.333333 0c35.349333 0 64 28.650667 64 64L384 320C384 355.349333 355.349333 384 320 384zM256 341.33333300000004l0-256L170.666667 85.33333300000004 170.666667 341.33333300000004 256 341.33333300000004zM85.333333 106.66666699999996L85.333333 320c0 11.754667 9.578667 21.333333 21.333333 21.333333l42.666667 0 0-256L106.666667 85.33333300000004C94.912 85.33333300000004 85.333333 94.91200000000003 85.333333 106.66666699999996zM341.333333 106.66666699999996c0-11.754667-9.578667-21.333333-21.333333-21.333333l-42.666667 0L277.333333 341.33333300000004l42.666667 0c11.754667 0 21.333333-9.578667 21.333333-21.333333L341.333333 106.66666699999996zM576 554.666667L234.666667 554.666667c-47.061333 0-85.333333-38.272-85.333333-85.333333l0-42.666667 42.666667 0 0 42.666667c0 23.530667 19.136 42.666667 42.666667 42.666667l42.666667 0 0-96 21.333333 0L298.666667 512l213.333333 0 0-426.666667-85.333333 0-21.333333-42.666667 170.666667 0c47.061333 0 85.333333 38.272 85.333333 85.333333L661.333333 469.333333C661.333333 516.394667 623.061333 554.666667 576 554.666667zM618.666667 128c0-23.530667-19.136-42.666667-42.666667-42.666667l-42.666667 0L533.333333 512l42.666667 0c23.530667 0 42.666667-19.136 42.666667-42.666667L618.666667 128zM853.333333 42.66666699999996c47.061333 0 85.333333 38.272 85.333333 85.333333L938.666667 640c0 47.061333-38.272 85.333333-85.333333 85.333333L341.333333 725.333333c-47.061333 0-85.333333-38.272-85.333333-85.333333l0-42.666667 42.666667 0 0 42.666667c0 23.530667 19.136 42.666667 42.666667 42.666667l85.333333 0 0-85.333333 21.333333 0 0 85.333333 298.666667 0 0-597.333333-42.666667 0-21.333333-42.666667L853.333333 42.66666699999996zM896 128c0-23.530667-19.136-42.666667-42.666667-42.666667l-85.333333 0L768 682.666667l85.333333 0c23.530667 0 42.666667-19.136 42.666667-42.666667L896 128z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="util" unicode="" d="M282.127566 639.0826059999999c-13.120832-13.221116-30.625508-20.50808-49.278333-20.50808-18.618033 0-36.157501 7.286963-49.311079 20.50808l-32.885991 33.019021 98.623181 99.027387 32.885991-33.019021c13.186324-13.221116 20.473287-30.829146 20.473287-49.548486C302.599829 669.8769589999999 295.347658 652.26893 282.127566 639.0826059999999L282.127566 639.0826059999999zM249.308089 705.0899489999999l-0.032746 0-32.884968-32.987299c4.418636-4.417613 10.252505-6.845918 16.458857-6.845918 6.206352 0 12.041244 2.428306 16.426111 6.813173 4.418636 4.452405 6.845918 10.288321 6.845918 16.493649C256.121262 694.802652 253.693979 700.671313 249.308089 705.0899489999999L249.308089 705.0899489999999zM396.703067 496.343671L249.578242 638.778684l32.278147 33.626865 147.157571-142.468782L396.703067 496.343671 396.703067 496.343671zM751.45979 133.92852400000004L618.131179 274.071332l32.884968 32.985252 133.330658-140.141784L751.45979 133.92852400000004 751.45979 133.92852400000004zM850.184279 67.95597399999997c-22.700001-22.766516-52.481282-34.168194-82.264609-34.168194-29.714765 0-59.395762 11.333116-81.994456 34.033118L538.194592 222.398462l32.884968 33.021068L718.811206 100.806149c27.117614-27.183106 71.269183-27.116591 98.488105 0.169869 27.186176 27.287483 27.117614 71.773673-0.135076 99.196233l-147.426701 154.273642 32.851199 33.021068 147.461493-154.308435C895.447159 187.557956 895.514697 113.421468 850.184279 67.95597399999997L850.184279 67.95597399999997zM801.716404 468.380806c-30.726815-30.860868-71.605851-47.861054-115.082038-47.861054-43.442418 0-84.321454 16.999163-115.082038 47.861054-30.760584 30.861892-47.692209 71.877027-47.692209 115.521037s16.931624 84.691891 47.692209 115.554806l42.497906 42.666752 32.885991-32.986275-42.497906-42.667775c-21.99085-22.090111-34.099632-51.367925-34.065863-82.566484 0-31.163767 12.108782-60.441581 34.065863-82.499969 21.956058-22.058388 51.16531-34.20094 82.196047-34.20094 31.064506 0 60.239989 12.142551 82.196047 34.20094l42.49893 42.665729 32.884968-33.019021L801.716404 468.380806 801.716404 468.380806zM844.214311 511.049604l-49.311079 49.51267-16.45988-16.493649c-17.538445-17.638729-40.879036-27.352975-65.73719-27.352975l-0.032746 0c-24.824385 0-48.198745 9.713222-65.73719 27.352975-17.539468 17.607006-27.252691 41.082674-27.252691 66.007343 0 24.925692 9.679453 48.400337 27.252691 66.040089l16.458857 16.495696-49.344848 49.51267 32.885991 33.021068 82.196047-82.533738-49.311079-49.482995c-8.769734-8.835226-13.626345-20.571525-13.626345-33.051767 0-12.446473 4.856611-24.183795 13.626345-32.987299 8.768711-8.835226 20.439518-13.69286 32.884968-13.69286 12.411681 0 24.082488 4.857635 32.852222 13.69286l49.344848 49.514717 82.196047-82.534761L844.214311 511.049604 844.214311 511.049604zM233.591129 129.139451l0 46.681182 46.512337 0 0-46.681182L233.591129 129.139451 233.591129 129.139451zM538.160823 356.538555l-92.247984 91.572602 32.717146 33.18889 92.214215-91.539856L538.160823 356.538555 538.160823 356.538555zM304.2187 101.04355599999997l173.634596 239.842507 37.641295-27.454282L338.318332 69.23715300000003c-21.923312-22.057365-51.132564-34.20094-82.19707-34.20094-31.028691 0-60.237943 12.143575-82.196047 34.168194-21.958104 22.057365-34.065863 51.335179-34.065863 82.533738 0 31.198559 12.107759 60.476373 34.065863 82.533738l2.765997 2.360767L417.243893 412.054963l27.353998-37.742603L205.596542 200.00340600000004c-12.411681-13.053294-19.224854-30.119995-19.224854-48.26526 0-18.71934 7.252171-36.291554 20.438495-49.513694C232.747925 76.15265599999998 277.775444 75.71263499999998 304.2187 101.04355599999997L304.2187 101.04355599999997z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="face-surprised" unicode="" d="M485.656116-128C221.592397-128 6.762016 86.81718000000001 6.762016 350.87649799999997s214.830381 478.867697 478.8941 478.867697c264.041716 0 478.854495-214.812779 478.854495-478.867697S749.697832-128 485.656116-128zM485.656116 798.834741c-247.024795 0-447.975846-200.959852-447.975846-447.962644 0-247.002792 200.951051-447.962644 447.975846-447.962644 247.002792 0 447.953843 200.959852 447.953843 447.962644C933.609959 597.8748889999999 732.658908 798.834741 485.656116 798.834741zM352.033458 447.380528c0-30.469398-24.682677-55.147675-55.143274-55.147675-30.451796 0-55.143274 24.678276-55.143274 55.147675 0 30.460597 24.691478 55.138874 55.143274 55.138874C327.350781 502.519402 352.033458 477.845526 352.033458 447.380528zM674.417647 502.519402c-30.460597 0-55.156476-24.678276-55.156476-55.138874 0-30.469398 24.695879-55.147675 55.156476-55.147675 30.451796 0 55.143274 24.678276 55.143274 55.147675C729.560922 477.845526 704.869444 502.519402 674.417647 502.519402zM562.005634 165.30976499999997c0-59.733046-34.192262-108.165484-76.349518-108.165484-42.166057 0-76.36272 48.432438-76.36272 108.165484 0 59.724245 34.196663 108.152282 76.36272 108.152282C527.813371 273.45764699999995 562.005634 225.03400999999997 562.005634 165.30976499999997zM835.631745 793.712503c0 0 12.871605 56.819883 41.959231 85.925112 29.083226 29.096427 69.915916 15.124685 78.492585-8.801097 9.461179-26.385689-2.033053-50.069442-29.092027-56.164202C899.404495 808.463141 874.880237 826.192952 835.631745 793.712503zM916.698651 757.570797c0 0 35.767659 20.576965 64.877288 19.393218 29.136032-1.174946 41.431165-29.144833 33.109728-45.110024-9.192746-17.588993-27.054573-22.966463-43.217788-11.797871C954.979023 731.44034 952.453108 752.721393 916.698651 757.570797z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="edit" unicode="" d="M769.089 516.251l-125.896 125.89 62.974 62.947c20.866 20.838 54.652 20.838 75.517 0l50.353-50.351c20.865-20.865 20.865-54.703 0-75.567L769.089 516.251zM403.349 150.52700000000004L277.453 276.418 619.706 615.982 745.601 490.09ZM176.314 47.283000000000015L252.912 251.87699999999995 377.753 127.01199999999994Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="speaker" unicode="" d="M587.182306 754.7203c-6.003737 2.705622-13.043061 1.642406-17.984606-2.721994l-259.223926-229.293243-148.246369 0c-9.253758 0-16.752546-7.498788-16.752546-16.756639l0-267.886213c0-9.249665 7.498788-16.756639 16.752546-16.756639l144.050814 0c9.253758 0 16.752546 7.506974 16.752546 16.756639L322.530764 490.391099c1.774413 0.704035 3.433192 1.719154 4.892427 3.010567l236.127905 208.861912 0-653.332912-160.751171 137.64287c-2.12643 1.824555-90.300632 78.69941-93.927229 76.162634-4.427846-3.097548-15.768125-17.59882-18.419512-22.512736-0.953721-1.768273-2.196015-1.334391 15.413038-16.379039 25.674753-21.936615 73.780377-61.548798 75.144444-62.717414l10.007935-8.570189 178.388876-152.761196c3.093455-2.653433 6.978948-4.028757 10.900258-4.028757 2.369977 0 4.756327 0.503467 7.003508 1.534959 5.939269 2.738367 9.749038 8.677637 9.749038 15.217586L597.060281 739.446431C597.060281 746.034477 593.190137 752.013655 587.182306 754.7203L587.182306 754.7203zM290.453185 254.814756l-115.040083 0L175.413102 489.195877l115.03906 0 0-234.381122L290.453185 254.814756zM747.742119 375.98444300000006c0-51.55212-34.83232-96.658434-84.702124-109.693308-1.415232-0.375553-2.846838-0.551562-4.245697-0.551562-7.438413 0-14.234189 4.992711-16.200984 12.523221-2.338255 8.949836 3.021823 18.104333 11.967566 20.442588 35.136242 9.18929 59.672054 40.96397 59.672054 77.279061 0 36.307927-24.535813 68.090794-59.672054 77.271898-8.945743 2.346441-14.305821 11.492752-11.967566 20.450774 2.342348 8.953929 11.499915 14.305821 20.446681 11.967566C712.909799 472.643899 747.742119 427.530422 747.742119 375.98444300000006L747.742119 375.98444300000006zM864.950588 375.793084c0-88.87619-48.554856-170.44495-126.718053-212.883505-2.537799-1.375324-5.276167-2.02717-7.982812-2.02717-5.939269 0-11.69946 3.166109-14.733563 8.762571-4.417613 8.134261-1.39886 18.303878 6.727215 22.720468 67.350944 36.566824 109.198028 106.851587 109.198028 183.427636 0 76.844156-42.055838 147.272181-109.741403 183.78784-8.154727 4.396123-11.192923 14.557554-6.795776 22.700001 4.38896 8.142447 14.558577 11.184737 22.701025 6.795776C816.151162 546.697499 864.950588 464.976266 864.950588 375.793084L864.950588 375.793084z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="down" unicode="" d="M888.306 619.94c15.615 15.617 40.93 15.617 56.545 0v0c15.617-15.615 15.617-40.93 0-56.545l-405.733-405.734c-15.615-15.617-40.928-15.617-56.545 0v0c-15.615 15.615-15.615 40.93 0 56.545l405.733 405.734zM538.619 214.20600000000002c15.617-15.615 15.617-40.93 0-56.545v0c-15.615-15.617-40.928-15.617-56.545 0l-405.734 405.734c-15.615 15.615-15.615 40.93 0 56.545v0c15.617 15.617 40.93 15.617 56.547 0l405.732-405.734zM538.619 214.20600000000002z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="file" unicode="" d="M887.443911 598.6304l0-44.578133 0-45.511111 0-477.866667c0-37.705956-30.560711-68.266667-68.266667-68.266667l-614.4 0c-37.705956 0-68.266667 30.560711-68.266667 68.266667l0 705.422222c0 37.6832 30.560711 68.266667 68.266667 68.266667l386.844444 0 45.511111 0 38.024533 0c7.805156 2.594133 16.566044 1.2288 22.778311-5.006222l183.136711-183.159467C885.919289 611.373511 887.876267 604.9564439999999 887.443911 598.6304zM659.888356 531.296711c-12.583822 0-22.755556 10.171733-22.755556 22.755556l0 204.8-45.511111 0-364.088889 0c-25.122133 0-45.511111-20.388978-45.511111-45.511111l0-659.911111c0-25.122133 20.388978-45.511111 45.511111-45.511111l568.888889 0c25.122133 0 45.511111 20.388978 45.511111 45.511111l0 455.111111 0 22.755556L659.888356 531.296711zM682.643911 750.273422l0-173.4656 159.288889 0 0 14.176711L682.643911 750.273422z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="layouts" unicode="" d="M917.213-103.239h-810.426c-23.151 0-41.918 18.766-41.918 41.917l0 698.644c0 23.148 18.767 41.917 41.918 41.917h810.426c23.149 0 41.918-18.769 41.918-41.917v-698.643c0-23.151-18.769-41.918-41.918-41.918zM316.38-61.321h600.833v363.294h-600.833v-363.294zM106.787-61.321h167.674v363.294h-167.674v-363.294zM148.705 637.322c-23.151 0-41.918-18.769-41.918-41.92s18.767-41.92 41.918-41.92 41.92 18.768 41.92 41.92-18.769 41.92-41.92 41.92zM274.461 637.322c-23.151 0-41.918-18.769-41.918-41.92s18.767-41.92 41.918-41.92c23.151 0 41.92 18.768 41.92 41.92s-18.77 41.92-41.92 41.92zM400.216 637.322c-23.15 0-41.918-18.769-41.918-41.92s18.769-41.92 41.918-41.92c23.152 0 41.92 18.768 41.92 41.92s-18.768 41.92-41.92 41.92zM875.293 511.566h-768.506v-167.675h810.426l0 167.675h-41.921z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="rate-half" unicode="" d="M1012.064 504l-359.552 31.008-140.512 331.04-140.512-331.552-359.552-30.496 273.024-236.544-82.016-351.552 309.056 186.528 309.056-186.528-81.504 351.552 272.544 236.544zM512 195.96799999999996l0 465.056 85.504-202.016 219.04-19.008-166.016-144.032 50.016-214.016-188.512 114.016z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="add-circle-fine" unicode="" d="M509.989715-60.972421000000054c-246.734474 0-446.75195 200.023616-446.75195 446.75809 0 246.732427 200.017476 446.75195 446.75195 446.75195 246.733451 0 446.757067-200.019523 446.757067-446.75195C956.746782 139.051195 756.723166-60.972421000000054 509.989715-60.972421000000054L509.989715-60.972421000000054zM509.989715 812.433746c-235.633648 0-426.650123-191.014428-426.650123-426.648077 0-235.639788 191.016475-426.654216 426.650123-426.654216 235.638765 0 426.654216 191.014428 426.654216 426.654216C936.643931 621.419318 745.62848 812.433746 509.989715 812.433746L509.989715 812.433746zM527.863804 153.46957999999995l-35.741016 0L492.122789 367.909533 277.678742 367.909533 277.678742 403.653619l214.443024 0L492.121765 618.0956189999999l35.741016 0L527.862781 403.653619l214.442 0 0-35.744086L527.863804 367.909533 527.863804 153.46957999999995 527.863804 153.46957999999995zM527.863804 153.46957999999995" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="prev-circle" unicode="" d="M508.638018 827.97307c-246.403458 0-446.845649-200.463469-446.845649-446.845649 0-246.382179 200.442191-446.845649 446.845649-446.845649 246.382179 0 446.845649 200.463469 446.845649 446.845649C955.483667 627.5096 755.041476 827.97307 508.638018 827.97307zM508.638018-23.16149900000005c-222.933422 0-404.28892 181.355498-404.28892 404.28892 0 222.933422 181.355498 404.28892 404.28892 404.28892 222.912144 0 404.28892-181.355498 404.28892-404.28892C912.926939 158.19399899999996 731.57144-23.16149900000005 508.638018-23.16149900000005zM252.87208 485.1999c8.639016 26.129831-32.470784 37.215859-41.067243 11.32009-27.810822-83.730363-22.321004-168.545923 14.086277-248.573851 11.362646-24.938243 48.025268-3.298146 36.747735 21.491148C230.976644 339.081373 228.806251 412.853462 252.87208 485.1999zM599.262572 247.73335499999996l-127.627629 133.394065 127.47868 133.223838c9.043305 9.064583 9.022026 23.789211-0.021278 32.832516-8.809243 8.830521-24.087108 8.766686-32.832516 0l-148.310199-148.310199c-4.617405-4.638683-6.979303-11.064749-6.553736-17.746156-0.404289-6.702685 1.936331-13.107472 6.575015-17.788712l148.310199-148.28892c4.383343-4.383343 10.213615-6.787798 16.405619-6.787798 6.170726 0 12.000997 2.404455 16.405619 6.787798C608.156928 224.114371 608.156928 238.83899899999994 599.262572 247.73335499999996z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="read" unicode="" d="M335.282306 712.495464C399.587328 713.451107 442.778899 696.882717 470.183494 669.3706540000001 479.127332 660.39174 485.691302 650.857363 490.241971 641.442689 492.795622 636.159553 494.049041 632.438701 494.358795 631.0740940000001L493.723712 636.7409230000001 493.723706 196.90019600000005C493.723706 199.018106 495.816045 203.920655 503.591595 207.36436700000002 511.039185 210.66283299999998 515.68422 209.16527399999995 517.176538 207.906613L500.671543 188.33763 521.297207 203.50146800000005C514.140179 213.23636899999997 499.631258 225.71450900000002 476.134074 237.35914000000002 439.577969 255.475456 390.86048 266.10507900000005 328.491925 266.10508200000004 265.860796 266.10508200000004 219.424582 255.71817999999996 186.827162 237.741581 164.977332 225.69198700000004 152.538132 212.28117299999997 147.220271 201.30886999999996L170.257196 190.14374199999997 151.035786 207.05224299999998C152.884078 209.15336100000002 158.307299 211.80336599999998 167.849005 208.050434 177.092077 204.41496099999995 179.2 199.20011699999998 179.2 196.66445199999998L179.2 497.049743 179.2 636.7409230000001 175.817447 624.023021C177.078908 626.226721 180.088681 630.807811 184.828724 636.965629 192.95423 647.521524 202.792594 658.127492 214.297641 668.007961 247.526453 696.544681 287.381649 713.209056 334.514421 712.495571L335.282306 712.495464ZM335.289387 763.689705C274.661039 764.607483 223.081402 743.04085 180.940156 706.850184 156.32698 685.712527 139.975514 664.470237 131.382553 649.4588249999999L128 643.549699 128 636.7409230000001 128 497.049743 128 196.66445199999998C128 159.26104999999995 164.542545 144.88818300000003 189.478606 173.23524099999997L191.776657 175.84764199999995 193.294121 178.978613C194.07832 180.59664399999997 199.156367 186.07133399999998 211.552092 192.907243 236.030601 206.40648099999999 274.024879 214.905082 328.491925 214.905082 383.221547 214.905079 424.163878 205.97190999999998 453.399258 191.483569 469.376966 183.56540600000005 477.614626 176.48075300000005 480.045882 173.17379000000005L481.844905 170.72677999999996 484.166551 168.768644C511.279708 145.90070000000003 544.923706 160.801293 544.923706 196.90019600000005L544.923712 636.740922 544.288627 642.407751C540.427211 659.419023 529.175531 682.697124 506.45814 705.503602 468.987716 743.1209699999999 412.352271 764.846461 334.521502 763.689812L335.289387 763.689705ZM0 506.026694L0 27.856867999999963C0-8.875636999999983 34.793167-23.40043300000002 61.4635 1.2485080000000153L63.46242 3.315859000000046C65.301149 5.444836000000009 69.655573 9.862312999999972 76.498228 15.820363000000043 88.306297 26.101906999999983 102.566352 36.46294 119.251411 46.17438500000003 167.295691 74.13829099999998 224.90855 90.95018200000004 292.337329 90.95018200000004 358.378978 90.95018000000005 409.459345 71.66956600000003 448.125308 39.64774 461.506042 28.56627400000002 472.380655 16.734758000000056 480.912593 4.997000999999955 485.832384-1.7713730000000396 488.762874-6.741985999999997 489.872527-9.02252199999998 496.058545-21.73590200000001 511.379537-27.027375000000006 524.092917-20.84135500000002 536.806298-14.655337000000031 542.097771 0.6656550000000152 535.91175 13.379036000000042 527.471002 30.726293000000055 509.777717 55.06771800000001 480.782336 79.08069999999998 433.134118 118.54132300000003 370.586889 142.15017999999998 292.337329 142.15018199999997 215.474895 142.15018499999996 149.074727 122.77408400000002 93.495781 90.424668 59.761154 70.78961500000003 36.872315 50.859801999999945 24.713677 36.78188399999999L44.088049 20.048869999999965 26.712598 38.84923500000002C28.162783 40.189508000000046 32.877261 41.946117999999956 40.792576 38.64178100000004 49.035365 35.200736000000006 51.2 30.12989200000004 51.2 27.856867999999963L51.2 506.026694C51.2 520.165184 39.73849 531.626694 25.6 531.626694 11.46151 531.626694 0 520.165184 0 506.026694L0 506.026694ZM696.80221 763.689812C618.971441 764.846461 562.335996 743.1209699999999 524.86557 705.503602 502.148181 682.697124 490.896501 659.419023 487.035083 642.407751L486.4 636.740922 486.400004 196.90019600000005C486.400006 160.801293 520.044004 145.90070000000003 547.157161 168.768644L549.478807 170.72677999999996 551.27783 173.17379000000005C553.709086 176.48075300000005 561.946746 183.56540600000005 577.924452 191.483569 607.159834 205.97190999999998 648.102165 214.905079 702.831787 214.905082 757.298833 214.905082 795.293111 206.40648099999999 819.77162 192.907243 832.167345 186.07133399999998 837.245391 180.59664399999997 838.029591 178.978613L839.547055 175.84764199999995 841.845105 173.23524099999997C866.781167 144.88818300000003 903.323712 159.26104999999995 903.323712 196.66445199999998L903.323712 497.049743 903.323712 636.7409230000001 903.323712 643.549699 899.941158 649.4588249999999C891.348196 664.470237 874.996732 685.712527 850.383556 706.850184 808.24231 743.04085 756.662673 764.607483 696.034325 763.689705L696.80221 763.689812ZM696.809291 712.495571C743.942063 713.209056 783.797257 696.544681 817.026071 668.007961 828.531119 658.127492 838.369481 647.521524 846.494989 636.965629 851.235031 630.807811 854.244804 626.226721 855.506263 624.023021L852.123712 636.7409230000001 852.123712 497.049743 852.123712 196.66445199999998C852.123712 199.20011699999998 854.231635 204.41496099999995 863.474707 208.050434 873.016412 211.80336599999998 878.439633 209.15336100000002 880.287925 207.05224299999998L861.066515 190.14374199999997 884.103441 201.30886999999996C878.785579 212.28117299999997 866.346381 225.69198700000004 844.49655 237.741581 811.89913 255.71817999999996 765.462916 266.10508200000004 702.831785 266.10508200000004 640.463232 266.10507900000005 591.745741 255.475456 555.189638 237.35914000000002 531.692454 225.71450900000002 517.183533 213.23636899999997 510.026502 203.50146800000005L530.652166 188.33763 514.147172 207.906613C515.63949 209.16527399999995 520.284527 210.66283299999998 527.732117 207.36436700000002 535.507665 203.920655 537.600004 199.018106 537.600004 196.90019600000005L537.6 636.7409230000001 536.964917 631.0740940000001C537.274671 632.438701 538.52809 636.159553 541.081741 641.442689 545.63241 650.857363 552.196378 660.39174 561.140218 669.3706540000001 588.544813 696.882717 631.736384 713.451107 696.041406 712.495464L696.809291 712.495571ZM972.799998 506.026694L972.799998 27.856867999999963C972.799998 30.12989200000004 974.964631 35.200736000000006 983.207422 38.64178100000004 991.122737 41.946117999999956 995.837214 40.189508000000046 997.287401 38.84923500000002L979.911949 20.048869999999965 999.286321 36.78188399999999C987.127682 50.859801999999945 964.238844 70.78961500000003 930.504218 90.424668 874.925269 122.77408400000002 808.525103 142.15018499999996 731.662669 142.15018199999997 653.132708 142.15017999999998 590.55104 117.26282200000003 543.127755 75.73800100000005 514.370099 50.55719499999998 496.945662 25.10259599999995 488.705389 7.022771000000034 482.841769-5.842485000000011 488.517717-21.02524200000005 501.382974-26.888862000000017 514.248233-32.752481999999986 529.430987-27.07653300000004 535.294607-14.211275 536.420563-11.740835999999945 539.350332-6.450639000000024 544.25735 0.7178109999999833 552.731727 13.097653000000037 563.54464 25.561581000000047 576.856734 37.21792900000003 615.190044 70.78337499999998 665.901421 90.95018000000005 731.662669 90.95018200000004 799.091447 90.95018200000004 856.704307 74.13829099999998 904.748587 46.17438500000003 921.433645 36.46294 935.6937 26.101906999999983 947.501771 15.820363000000043 954.344425 9.862312999999972 958.698848 5.444836000000009 960.537577 3.315859000000046L962.536497 1.2485080000000153C989.206831-23.40043300000002 1023.999998-8.875636999999983 1023.999998 27.856867999999963L1023.999998 506.026694C1023.999998 520.165184 1012.538487 531.626694 998.399998 531.626694 984.261508 531.626694 972.799998 520.165184 972.799998 506.026694L972.799998 506.026694Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="404" unicode="" d="M300.197309 299.705317l4.427931 1.803972c1.147982-2.787956 10.167841-7.543882 26.89558-14.267777l5.411915-12.955798c10.659833-24.927611 23.123639-62.483024 37.555413-112.66624 14.431775 5.575913 34.439462 0.983985 60.351057-13.611787l1.803972-4.427931L389.575913 107.828315l18.203716-42.639334c2.459962-5.575913-12.463805-15.579757-44.7713-29.847534-11.151826 7.215887-19.84369 9.675849-26.403587 7.05189l-0.983985 2.131967c-10.823831 25.419603-16.235746 42.311339-16.399744 50.675208l-4.427931-1.803972 6.3959-14.923767-11.151826-4.263933c-41.655349-16.235746-71.830878-18.695708-90.690583-7.871877l-4.427931-1.803972-1.803972 4.263933c-7.05189 16.727739 3.607944 77.406791 32.307495 182.037156 11.479821 4.427931 19.1877 14.923767 22.959641 31.323511C281.337604 290.685458 291.83344 296.425368 300.197309 299.705317L300.197309 299.705317zM216.230621 80.276746c28.371557 19.515695 40.999359 32.799488 38.047406 39.68738-0.983985 2.131967-0.65599 5.575913 0.65599 10.167841l-0.983985 2.131967c-25.5836-21.483664-38.047406-32.963485-37.391416-34.439462C215.246637 88.804612 215.082639 83.064702 216.230621 80.276746L216.230621 80.276746zM216.722614 72.896861l0.983985-2.131967c11.643818 1.147982 21.155669 3.279949 28.699552 6.231903 0.819987 0.327995 7.379885 5.411915 19.84369 15.251762l-0.983985 2.131967c-7.543882-2.951954-12.7918-0.983985-15.743754 6.067905C226.398463 85.032671 215.574632 75.848815 216.722614 72.896861L216.722614 72.896861zM225.90647 143.743754l11.151826 4.263933c-1.147982-2.623959-6.3959-8.691864-15.579757-18.53171-2.295964-10.823831-2.787956-17.547726-1.639974-20.335682 27.715567 20.663677 40.34337 33.783472 37.883408 39.523382l0.819987 10.331839-3.443946-3.935939-9.019859-3.443946-0.983985 2.131967c11.151826 4.263933 17.875721 16.891736 20.49968 37.719411l-0.983985 2.131967C239.35426 172.443306 227.21845 160.307495 227.874439 157.027546L225.90647 143.743754 225.90647 143.743754zM231.646381 173.42729l0.983985-2.131967 2.131967 0.819987c28.371557 23.123639 40.179372 40.179372 35.423447 51.331198 1.475977 0.65599 1.967969 1.639974 1.475977 2.951954l-2.295964-0.819987c-28.863549-21.647662-40.999359-38.047406-36.407431-49.035234C231.482383 175.723254 230.990391 174.73927 231.646381 173.42729L231.646381 173.42729zM240.994234 211.966688l0.983985-2.131967c13.775785 10.331839 35.915439 29.847534 66.418962 58.21909l2.131967 0.819987-6.3959 14.923767 0.491992 5.083921-2.295964-0.819987c-36.571429-32.963485-55.431134-51.82319-56.579116-56.743113L240.994234 211.966688 240.994234 211.966688zM311.67713 107.336323l-35.751441-13.939782c-1.475977-0.491992-6.887892-4.263933-16.235746-11.315823l0.819987-1.967969 12.299808 2.131967 20.007687 7.871877c11.643818 4.591928 32.143498 19.84369 61.171044 46.08328l-6.3959 14.923767-2.131967-0.819987c-24.107623-16.891736-34.439462-29.191544-31.159513-36.899423C315.449071 110.616272 314.629084 108.484305 311.67713 107.336323L311.67713 107.336323zM267.889814 264.773863l0.819987-1.967969c17.875721 16.891736 27.387572 25.419603 28.207559 25.747598l-0.983985 2.131967-8.855862-3.443946C274.941704 282.485586 268.545804 274.941704 267.889814 264.773863L267.889814 264.773863zM275.597694 222.954516c16.071749-37.883408 20.007687-67.894939 11.971813-90.034593l-3.443946-28.863549 26.89558 10.495836c-7.543882 30.011531-18.367713 65.598975-32.471493 106.926329l-0.983985 2.131967L275.597694 222.954516 275.597694 222.954516zM279.369635 231.810378l6.3959-14.923767c13.44779 15.087764 24.435618 24.271621 32.63549 27.55157l-3.607944 8.527867-2.459962 11.643818-2.131967-0.819987C289.045484 247.06214 278.713645 236.566304 279.369635 231.810378L279.369635 231.810378zM292.817425 194.58296c23.943626 17.219731 33.619475 30.995516 29.191544 41.491352l-2.787956 6.3959-2.295964-0.819987c-21.483664-18.859705-30.667521-31.651505-27.879564-38.3754L292.817425 194.58296 292.817425 194.58296zM294.457399 190.483024l2.787956-6.3959 2.295964-11.807816 2.295964 0.819987-0.491992-5.083921 6.3959-14.923767 32.471493 27.387572-6.3959 15.087764c-9.347854-10.331839-16.235746-16.399744-20.827675-18.203716l-2.295964-0.983985c-0.65599 1.639974 6.067905 10.167841 20.335682 25.419603l-3.115951 13.611787-0.983985 2.131967L294.457399 190.483024 294.457399 190.483024zM307.413197 148.171685l2.787956-6.3959 2.295964-11.643818c23.943626 17.219731 35.259449 27.387572 33.94747 30.503523l-5.411915 12.955798C329.224856 165.719411 318.07303 157.191544 307.413197 148.171685L307.413197 148.171685zM355.792441 131.935939c-23.779628-17.711723-34.111467-30.011531-30.995516-37.227418l1.475977-9.347854c25.255605 18.039718 36.899423 29.355541 34.931454 33.783472 24.435618 21.155669 38.703395 32.471493 42.803331 33.94747l-0.819987 1.967969c-1.803972 2.787956-6.723895 4.099936-14.595772 4.427931l-30.831518-31.9795L355.792441 131.935939 355.792441 131.935939zM327.912876 81.26073l4.591928-10.659833-0.491992-5.083921 2.295964 0.819987c23.451634 14.595772 34.275464 23.615631 32.63549 27.55157l-5.411915 12.955798L327.912876 81.26073 327.912876 81.26073zM333.816784 61.253043l5.411915-12.7918c25.747598 13.283792 37.719411 22.139654 35.915439 26.403587l-4.591928 10.659833C348.412556 70.272902 336.112748 62.237028 333.816784 61.253043L333.816784 61.253043zM357.596413 139.971813l1.803972-4.099936c4.919923 1.967969 8.527867 9.839846 10.823831 23.943626l-2.295964-0.819987C364.648302 147.679693 361.204356 141.44779 357.596413 139.971813L357.596413 139.971813zM731.674568 256.081999l3.935939-0.163997c-0.163997-2.459962 4.755926-9.019859 14.759769-19.515695l-0.65599-11.315823c-1.147982-21.975657-5.411915-53.955157-12.955798-95.774504 12.627803-0.65599 25.911595-10.659833 39.68738-30.175529l-0.163997-3.935939-47.887252-10.823831-1.967969-37.719411c-0.327995-4.919923-14.923767-7.379885-43.951313-7.379885-5.575913 9.019859-11.151826 13.775785-16.891736 13.939782l0.163997 1.967969c1.147982 22.467649 3.279949 36.735426 6.231903 42.967329l-3.935939 0.163997-0.65599-13.119795-9.839846 0.491992c-36.571429 1.803972-60.023062 9.839846-70.026906 24.271621l-3.935939 0.163997 0.163997 3.771941c0.819987 14.759769 30.667521 56.087124 89.706598 124.14606 10.167841-0.491992 19.515695 4.755926 28.371557 15.579757C714.290839 255.754004 724.294683 256.573991 731.674568 256.081999L731.674568 256.081999zM587.848815 115.86419l-0.163997-1.967969c9.019859-2.951954 16.891736-4.591928 23.615631-4.919923 0.65599 0 7.379885 1.475977 20.171685 4.755926l0.163997 1.967969c-6.723895 0.327995-9.839846 3.607944-9.511851 9.675849C599.328635 121.6041 588.012812 118.324151 587.848815 115.86419L587.848815 115.86419zM590.144779 121.440102c28.043562 5.083921 42.147341 10.659833 42.475336 16.727739 0.163997 1.803972 1.475977 4.263933 4.099936 7.215887l0.163997 1.967969c-26.731582-7.379885-40.015375-11.807816-40.179372-13.119795C592.440743 128.163997 590.308776 123.900064 590.144779 121.440102L590.144779 121.440102zM620.15631 165.227418l9.839846-0.491992c-1.803972-1.475977-7.871877-4.427931-18.367713-8.527867-5.575913-7.215887-8.527867-12.13581-8.527867-14.595772 28.043562 6.067905 42.147341 11.643818 42.311339 16.727739l4.263933 7.379885-3.935939-1.803972-8.035874 0.327995 0.163997 1.967969c9.839846-0.491992 19.351698 6.559898 28.863549 21.155669l0.163997 1.967969c-26.23959-7.379885-39.68738-12.463805-40.34337-14.923767L620.15631 165.227418 620.15631 165.227418zM670.667521 109.960282l-31.487508 1.475977c-1.31198 0-6.559898-0.983985-16.071749-2.951954l-0.163997-1.803972 9.839846-2.459962 17.711723-0.819987c10.331839-0.491992 30.995516 4.099936 61.991031 13.939782l0.65599 13.119795-1.803972 0.163997c-23.943626-4.591928-36.079436-10.167841-36.407431-16.891736C674.603459 110.944266 673.29148 109.796284 670.667521 109.960282L670.667521 109.960282zM635.244074 185.399103l-0.163997-1.967969 1.803972-0.163997c29.355541 7.70788 44.279308 16.563741 44.7713 26.23959 1.31198 0 2.131967 0.491992 2.131967 1.639974l-1.967969 0.163997c-29.191544-6.3959-44.115311-14.595772-44.607303-24.271621C635.900064 187.039078 635.244074 186.547085 635.244074 185.399103L635.244074 185.399103zM685.755285 207.37476c-1.803972-33.29148-9.675849-56.907111-23.615631-70.682896l-12.955798-20.171685 23.779628-1.147982c5.247918 24.763613 10.167841 54.611147 14.595772 89.870596l0.163997 1.967969L685.755285 207.37476 685.755285 207.37476zM656.071749 210.818706l-0.163997-1.967969c13.939782 3.115951 37.391416 10.167841 70.354901 21.155669l1.803972-0.163997 0.65599 13.119795 2.295964 3.607944-1.967969 0.163997c-39.03139-12.299808-59.859065-20.007687-62.483024-23.287636L656.071749 210.818706 656.071749 210.818706zM670.339526 68.46893l-0.65599-11.315823c23.943626 1.31198 35.915439 3.935939 36.079436 7.70788l0.491992 9.347854C684.443306 70.272902 672.471493 68.304933 670.339526 68.46893L670.339526 68.46893zM673.29148 85.196669l-0.491992-9.347854-2.295964-3.607944 1.967969-0.163997c22.631646 2.951954 33.94747 6.231903 34.111467 9.511851l0.65599 11.315823L673.29148 85.196669 673.29148 85.196669zM712.158873 113.568225c-23.943626-5.247918-36.079436-10.987828-36.407431-17.219731l-2.295964-7.379885c25.255605 5.083921 37.883408 9.511851 38.211403 13.44779 25.747598 7.543882 40.34337 11.151826 43.951313 10.987828l0.163997 1.803972c-0.327995 2.623959-3.443946 5.247918-9.347854 8.035874l-34.439462-13.44779L712.158873 113.568225 712.158873 113.568225zM682.147341 141.611787l-0.327995-5.73991-2.459962-9.347854c23.943626 4.755926 36.079436 8.691864 36.079436 11.479821l0.65599 11.315823C704.778988 147.351698 693.463165 144.727739 682.147341 141.611787L682.147341 141.611787zM688.051249 177.199231l-0.327995-5.73991-2.623959-9.511851 1.967969-0.163997-2.295964-3.607944-0.65599-13.119795 33.94747 9.511851 0.65599 13.283792c-10.659833-4.591928-18.039718-6.723895-21.975657-6.559898l-1.967969 0.163997c0 1.475977 8.199872 5.411915 24.271621 12.13581l2.623959 11.151826 0.163997 1.967969L688.051249 177.199231 688.051249 177.199231zM688.215247 180.807175c23.943626 4.755926 36.243434 11.807816 36.735426 20.991672l0.327995 5.73991-1.967969 0.163997c-22.631646-6.887892-34.275464-13.283792-34.603459-19.1877L688.215247 180.807175 688.215247 180.807175zM691.82319 212.786675l-0.65599-13.119795c15.415759 6.723895 26.89558 10.003844 34.111467 9.511851l0.327995 7.543882 2.459962 9.511851-1.803972 0.163997C704.450993 220.986547 692.971172 216.558616 691.82319 212.786675L691.82319 212.786675zM695.103139 240.994234l-0.163997-1.803972c19.351698 6.559898 29.355541 9.839846 30.339526 9.839846l0.163997 1.967969-7.871877 0.327995C706.746957 251.818065 699.367072 248.374119 695.103139 240.994234L695.103139 240.994234zM716.422806 118.980141l-0.163997-3.607944c4.427931-0.163997 10.003844 4.427931 16.727739 14.10378l-1.967969 0.163997C724.45868 122.26009 719.538757 118.816143 716.422806 118.980141L716.422806 118.980141zM479.118514 382.196028c53.627162 10.167841 89.870596 1.967969 109.222293-24.599616 9.675849-18.695708 15.579757-33.455477 17.875721-44.279308 11.807816-56.743113-5.903908-103.154388-53.299167-138.741832-12.463805-5.083921-22.631646-8.363869-30.339526-10.003844-31.651505-6.067905-63.631006 5.083921-95.938501 33.455477-9.347854 16.399744-15.251762 31.159513-18.039718 44.279308-13.283792 63.795003 1.967969 108.238309 45.919283 133.165919L479.118514 382.196028 479.118514 382.196028zM410.075593 265.429853c6.231903 5.247918 11.479821 8.199872 15.579757 9.019859-9.675849-9.347854-14.431775-15.087764-13.939782-17.219731-0.327995-5.411915-0.163997-10.167841 0.819987-14.267777l2.131967 0.327995c24.271621 15.743754 35.915439 25.5836 35.095452 29.519539l-2.131967 10.003844c-4.099936-3.607944-8.035874-5.73991-11.643818-6.559898l-0.819987 4.099936c10.823831 2.131967 15.251762 11.971813 13.44779 29.519539l-1.967969-0.327995c-22.467649-16.399744-34.603459-27.715567-36.407431-33.94747C409.255605 273.30173 409.255605 269.857783 410.075593 265.429853L410.075593 265.429853zM410.23959 286.257527c33.127482 21.647662 47.887252 40.34337 44.607303 56.251121-29.683536-23.615631-44.443306-36.079436-44.279308-37.555413C409.747598 295.769379 409.5836 289.537476 410.23959 286.257527L410.23959 286.257527zM412.699552 315.777066l0.491992-2.131967c27.059577 20.663677 44.607303 37.227418 52.643177 49.527226 10.331839 1.967969 17.055734 7.379885 20.49968 16.235746l-2.131967-0.491992C447.303011 372.028187 423.523382 350.872518 412.699552 315.777066L412.699552 315.777066zM414.339526 234.926329c2.459962-4.919923 4.263933-9.347854 5.083921-13.44779 18.859705 14.759769 30.339526 22.467649 34.111467 23.123639l-3.771941 18.039718C444.18706 261.493914 432.379244 252.310058 414.339526 234.926329L414.339526 234.926329zM421.883408 220.002562c2.131967-9.839846 5.247918-14.759769 9.675849-14.759769l27.879564 21.975657c-0.327995 1.147982-2.131967 6.231903-5.411915 15.415759C437.299167 228.530429 426.639334 220.986547 421.883408 220.002562L421.883408 220.002562zM432.707239 199.174888c5.083921-5.903908 8.527867-8.691864 10.495836-8.363869l3.935939 0.819987c10.987828 10.495836 19.1877 16.235746 24.599616 17.219731-0.819987 3.935939-3.935939 8.855862-9.511851 14.759769C442.21909 209.014734 432.379244 200.814862 432.707239 199.174888L432.707239 199.174888zM448.450993 185.563101l0.491992-2.131967c2.459962 0.491992 6.3959-0.819987 11.807816-3.771941 18.859705 10.003844 28.207559 16.727739 28.207559 19.84369-6.067905 1.639974-9.511851 4.427931-10.331839 8.363869C466.818706 202.946829 456.814862 195.566944 448.450993 185.563101L448.450993 185.563101zM469.442665 179.331198l0.491992-2.131967 14.923767 0.65599 12.627803 2.459962c2.459962 0.491992 8.199872 3.771941 17.547726 9.839846l-0.491992 2.131967c-6.887892-1.31198-13.611787 0.163997-20.49968 4.263933L469.442665 179.331198 469.442665 179.331198zM476.494555 249.030109l4.591928-21.811659c2.951954-14.431775 12.463805-25.091608 28.535554-31.9795l4.099936 0.819987c24.599616 34.275464 32.143498 73.798847 22.795644 118.570147l-2.459962 11.971813-6.231903 19.515695-6.067905-1.147982c-3.935939-0.819987-14.267777 0-30.831518 2.295964C473.870596 316.597053 469.278668 283.961563 476.494555 249.030109L476.494555 249.030109zM476.494555 363.172325l0.327995-1.967969c10.823831-2.131967 17.547726-3.115951 20.007687-2.623959 13.939782 10.167841 21.647662 17.875721 23.287636 23.287636l-21.319667-1.967969C496.174247 379.408072 488.630365 373.832159 476.494555 363.172325L476.494555 363.172325zM508.966047 363.172325l3.771941 2.787956c1.147982 0.163997 6.231903-2.951954 15.087764-9.675849 10.331839 13.119795 18.203716 20.171685 23.779628 21.155669-0.65599 2.951954-8.199872 4.263933-22.467649 4.099936C515.361947 370.716208 508.638053 364.648302 508.966047 363.172325L508.966047 363.172325zM511.590006 185.235106l0.491992-2.131967 4.099936 0.819987c19.84369 3.771941 35.751441 17.219731 47.723254 40.34337C554.557335 214.754644 537.173607 201.634849 511.590006 185.235106L511.590006 185.235106zM521.921845 197.534914c38.211403 24.271621 56.087124 42.311339 53.79116 53.79116 1.967969 4.919923 2.623959 8.527867 2.295964 10.823831-35.095452-26.567585-51.495195-44.935298-49.363229-54.939142C526.349776 206.71877 524.217809 203.602819 521.921845 197.534914L521.921845 197.534914zM528.64574 352.348495l7.543882-15.251762 2.131967 0.491992c4.263933 5.73991 13.283792 14.431775 27.059577 25.911595l-0.491992 2.131967c-5.411915 5.247918-8.363869 8.855862-8.855862 10.823831l-4.099936-0.819987L528.64574 352.348495 528.64574 352.348495zM536.845612 333.324792l4.263933-9.675849-0.491992-8.363869 4.099936 0.819987c19.515695 17.711723 29.027546 27.059577 28.863549 28.371557l-0.491992 2.131967c-1.967969 9.347854-4.263933 13.611787-7.05189 13.119795C548.817425 342.508648 539.141576 333.652787 536.845612 333.324792L536.845612 333.324792zM539.797566 236.402306c27.715567 19.84369 40.999359 32.63549 39.68738 38.703395 1.31198 7.215887 1.803972 12.13581 1.147982 14.759769l-1.967969-0.327995-35.095452-29.519539C540.78155 245.586163 539.469571 237.714286 539.797566 236.402306L539.797566 236.402306zM542.257527 307.413197l2.459962-11.971813 10.003844 3.935939c-7.05189-7.871877-10.331839-12.627803-10.003844-14.267777-0.65599-10.495836-0.819987-16.727739-0.327995-18.695708 18.695708 13.611787 30.831518 24.927611 36.243434 33.94747l-2.459962 11.971813c-7.05189-7.05189-12.7918-10.987828-16.727739-11.807816 8.035874 11.315823 13.939782 17.383728 17.711723 18.039718l-4.099936 19.84369C554.557335 320.532992 543.733504 310.201153 542.257527 307.413197L542.257527 307.413197zM307.249199 569.153107c-9.675849 0-17.711723-6.887892-19.84369-16.071749-4.263933-12.463805 1.639974-28.863549 29.519539-35.751441 1.31198 35.587444 0 49.527226 0 49.527226C313.809097 568.33312 310.693145 569.153107 307.249199 569.153107L307.249199 569.153107zM709.862908 537.173607c0-1.147982 0-2.131967-0.163997-3.115951 2.131967 3.279949 3.279949 7.215887 3.279949 11.479821 0 11.643818-9.183857 21.155669-20.49968 21.155669-3.443946 0-6.723895-0.819987-9.511851-2.459962C697.891095 563.905189 709.862908 551.933376 709.862908 537.173607L709.862908 537.173607zM531.761691 520.281871c0.65599 15.743754-32.963485 49.199231-32.963485 49.199231 0-18.203716 9.347854-42.803331 12.463805-48.707239-8.035874-11.643818-13.283792-32.307495-13.283792-32.307495S531.105701 504.374119 531.761691 520.281871L531.761691 520.281871zM488.794363 507.326073c2.459962 0 4.427931 1.967969 4.427931 4.427931 0 2.459962-1.967969 4.427931-4.427931 4.427931-2.459962 0-4.427931-1.967969-4.427931-4.427931C484.366432 509.294042 486.334401 507.326073 488.794363 507.326073L488.794363 507.326073zM445.335042 629.668161c-0.819987 8.855862-2.131967 16.235746-2.131967 16.235746s-53.627162 7.05189-63.959001-30.503523C395.151826 632.94811 427.623318 631.144138 445.335042 629.668161L445.335042 629.668161zM620.648302 614.908392c-9.675849 37.719411-63.303011 31.651505-63.303011 31.651505s-1.475977-7.379885-2.459962-16.235746C572.597053 631.636131 605.232543 632.784113 620.648302 614.908392L620.648302 614.908392zM419.587444 518.313901c29.847534 0 53.955157 21.975657 53.955157 49.035234 0 27.059577-24.271621 49.035234-53.955157 49.035234-29.847534 0-53.955157-21.975657-53.955157-49.035234C365.632287 540.289558 389.903908 518.313901 419.587444 518.313901L419.587444 518.313901zM419.587444 613.76041c28.371557 0 51.331198-20.827675 51.331198-46.411275 0-25.5836-22.959641-46.411275-51.331198-46.411275-28.207559 0-51.331198 20.827675-51.331198 46.411275C368.256246 592.932735 391.379885 613.76041 419.587444 613.76041L419.587444 613.76041zM419.587444 534.38565c20.007687 0 36.243434 14.759769 36.243434 32.799488 0 18.203716-16.235746 32.799488-36.243434 32.799488s-36.243434-14.759769-36.243434-32.799488C383.34401 549.14542 399.579757 534.38565 419.587444 534.38565L419.587444 534.38565zM435.331198 552.261371c1.967969 2.131967 4.919923 2.623959 6.559898 1.147982 1.639974-1.475977 1.475977-4.263933-0.491992-6.3959-1.967969-2.131967-4.919923-2.623959-6.559898-1.147982C433.035234 547.341448 433.199231 550.129404 435.331198 552.261371L435.331198 552.261371zM395.971813 585.880846c5.411915 5.73991 13.283792 7.05189 17.875721 3.115951 4.591928-3.935939 3.935939-11.807816-1.475977-17.547726-5.411915-5.73991-13.283792-7.05189-17.875721-3.115951C389.903908 572.433056 390.559898 580.304933 395.971813 585.880846L395.971813 585.880846zM584.240871 518.313901c29.847534 0 53.955157 21.975657 53.955157 49.035234 0 27.059577-24.271621 49.035234-53.955157 49.035234-29.847534 0-53.955157-21.975657-53.955157-49.035234C530.121717 540.289558 554.393338 518.313901 584.240871 518.313901L584.240871 518.313901zM584.240871 613.76041c28.371557 0 51.331198-20.827675 51.331198-46.411275 0-25.5836-22.959641-46.411275-51.331198-46.411275-28.207559 0-51.331198 20.827675-51.331198 46.411275C532.909673 592.932735 555.869315 613.76041 584.240871 613.76041L584.240871 613.76041zM584.240871 534.38565c20.007687 0 36.243434 14.759769 36.243434 32.799488 0 18.203716-16.235746 32.799488-36.243434 32.799488-20.007687 0-36.243434-14.759769-36.243434-32.799488C547.997438 549.14542 564.233184 534.38565 584.240871 534.38565L584.240871 534.38565zM599.820628 552.261371c1.967969 2.131967 4.919923 2.623959 6.559898 1.147982 1.639974-1.475977 1.475977-4.263933-0.491992-6.3959-1.967969-2.131967-4.919923-2.623959-6.559898-1.147982C597.688661 547.341448 597.852659 550.129404 599.820628 552.261371L599.820628 552.261371zM560.62524 585.880846c5.411915 5.73991 13.283792 7.05189 17.875721 3.115951 4.591928-3.935939 3.935939-11.807816-1.475977-17.547726-5.411915-5.73991-13.283792-7.05189-17.875721-3.115951C554.557335 572.433056 555.213325 580.304933 560.62524 585.880846L560.62524 585.880846zM957.171044 381.540038C957.171044 381.540038 957.171044 381.540038 957.171044 381.540038c-0.65599 0.983985-1.31198 1.803972-1.967969 2.951954-0.327995 0.327995-0.491992 0.65599-0.819987 0.983985-0.327995 0.327995-1.967969 0.65599-2.295964 0.983985-11.315823 14.759769-29.355541 40.34337-62.975016 46.247277l0 34.931454c0 4.263933-0.819987 8.691864-5.083921 8.691864L685.919283 476.330557c-0.163997 10.331839-0.327995 18.203716-0.65599 27.879564 24.435618 1.803972 43.295324 19.351698 43.295324 41.491352 0 22.467649-19.84369 40.671365-45.263293 41.819347-1.967969 78.226778-5.903908 143.98975-7.70788 150.549648l-0.491992 0.983985c-1.967969 2.295964-9.511851 5.247918-21.155669 8.363869 0.327995 13.939782-3.279949 29.355541-11.643818 46.08328 3.443946-21.647662-22.795644-36.079436-26.567585-38.047406-0.163997 0-0.327995 0-0.491992 0 0.163997 4.427931 0 57.727098-88.230621 97.90647-1.475977-44.115311-14.10378-70.682896-31.9795-86.754644L494.534273 766.606022l-5.411915-0.327995 0-0.163997 0 0 0 0 0.327995 0 0.327995-0.163997c-0.819987-0.163997-0.983985-0.491992-1.147982-1.147982-10.331839-8.035874-28.043562-18.203716-64.450993-18.203716-13.283792 0-28.207559 1.31198-44.607303 3.935939-4.099936 0.819987-7.70788 1.147982-11.151826 1.147982-5.575913 0-10.003844-0.983985-16.071749-2.295964l-0.327995 0-0.327995-0.163997c-17.547726-4.099936-27.55157-7.70788-30.011531-10.659833l-0.491992-0.983985c-0.491992-2.131967-2.295964-8.363869-5.73991-150.549648-25.255605-0.983985-45.263293-19.351698-45.263293-41.983344 0-22.139654 18.859705-39.523382 43.459321-41.163357-0.163997-9.675849-0.327995-17.547726-0.65599-27.879564L132.099936 476.002562c-4.427931 0-10.495836-4.591928-10.495836-8.691864l0-97.414478c-11.807816-0.65599-19.679693-2.295964-26.731582-4.755926-29.027546-10.495836-35.751441-35.915439-35.587444-60.023062 0-1.475977 0.491992-2.787956 0.983985-3.771941-6.723895-11.643818-6.231903-25.5836-5.083921-35.587444 0.983985-8.035874 2.623959-12.13581 4.427931-13.939782-4.263933-8.855862-0.983985-18.859705 1.967969-26.731582 3.771941-10.167841 12.13581-11.971813 22.139654-10.003844-4.755926-9.019859-2.459962-17.219731 11.643818-28.699552 4.427931-3.607944 14.267777 7.05189 26.075593 16.071749l0-267.151826c0-4.263933 6.067905-6.067905 10.331839-6.067905l751.928251 0c4.427931 0 5.083921 1.803972 5.083921 6.067905L888.784113 248.374119c16.727739 0.983985 29.355541 7.70788 38.539398 19.84369 4.591928 6.231903 7.871877 11.807816 8.691864 16.891736C977.670724 313.153107 982.262652 344.640615 957.171044 381.540038L957.171044 381.540038zM316.433056 508.638053c-22.959641 0.491992-40.835362 16.727739-40.835362 36.735426 0 20.335682 18.859705 36.899423 41.983344 36.899423l0 2.623959 0.163997-0.65599c0-0.819987 0-1.475977 0-2.295964 0.491992 0.163997 0.983985 0.163997 1.475977 0.327995l1.803972 0 0 0.491992c5.247918 1.31198 12.7918 2.951954 19.351698 3.771941 10.003844 35.095452 34.111467 64.122998 34.111467 64.122998s-9.839846 28.863549-13.939782 67.238949c51.167201-85.11467 229.268418-81.178732 280.107623-10.823831-4.591928-32.799488-12.627803-56.415119-12.627803-56.415119s24.107623-28.863549 34.111467-64.122998c6.559898-0.819987 13.939782-1.147982 19.023703-2.295964 0 0.491992 0 2.623959 0 2.623959l0.491992 0c23.123639 0 41.983344-18.695708 41.983344-39.03139 0-9.347854-3.935939-18.695708-10.495836-25.419603-10.167841-6.723895-25.091608-10.331839-40.835362-10.331839 0-6.723895 0.983985-19.351698 1.803972-35.423447L318.401025 476.658552c0.163997 10.331839 0.491992 19.84369 0.65599 30.175529l0 2.131967L316.433056 508.638053 316.433056 508.638053zM126.524023 462.554773c0 4.099936 6.3959 9.183857 10.823831 9.183857l741.432415 0c4.263933 0 5.575913-4.919923 5.575913-9.183857l0-29.027546c0 0.491992-6.723895 1.475977-10.823831 1.147982-22.795644-2.295964-44.443306-3.607944-60.679052-9.183857L176.215247 425.491352l-1.31198-2.787956 0-60.18706c-10.823831 5.903908-25.5836 8.363869-48.215247 7.871877L126.68802 462.554773 126.524023 462.554773zM821.381166-13.693786 180.807175-13.693786 180.807175 282.649584c10.823831 4.263933 15.579757 10.987828 15.087764 21.975657-0.491992 8.363869-4.263933 13.611787-15.087764 16.727739l0 7.379885c5.903908 1.967969 3.935939 4.263933 5.247918 6.723895 5.411915 10.495836 5.575913 18.203716-5.247918 23.779628l0 55.759129 615.318386 0c-2.787956-5.575913-4.755926-7.871877-5.575913-12.299808-1.475977-8.035874-1.639974-18.367713-1.147982-28.207559L697.891095 315.449071c0 0-28.371557-15.251762-16.727739-32.799488 11.643818-17.383728 32.307495-11.479821 50.511211-0.327995 12.13581 7.379885 39.68738 23.287636 63.959001 40.179372 0.163997-0.163997 0.327995-0.163997 0.491992-0.327995-1.803972-1.31198-2.951954-2.295964-2.951954-2.295964-11.151826-7.543882-6.887892-36.899423 15.415759-41.327354 3.115951-0.65599 9.675849 0 9.675849 1.147982l0-293.391416L821.381166-13.693786 821.381166-13.693786zM177.855221 271.169763c0 3.443946-2.131967 6.231903-4.755926 8.035874 1.639974 0.491992 3.771941 0.983985 4.755926 1.475977L177.855221 271.169763 177.855221 271.169763zM177.855221 322.828956c-0.983985 0.163997-1.639974 0.327995-2.459962 0.491992 0.819987 0.491992 1.475977 0.983985 2.459962 1.475977L177.855221 322.828956 177.855221 322.828956zM878.780269-65.516976 137.347854-65.516976c-4.263933 0-10.823831 2.131967-10.823831 6.3959L126.524023 206.882767c5.903908 1.147982 4.919923 2.295964 6.723895 3.279949 19.679693 8.035874 38.047406 25.255605 25.747598 33.127482-0.163997 0-1.475977 0.163997-1.639974 0.163997 9.511851 3.771941 17.547726 9.839846 17.547726 20.663677l0-289.29148 655.169763 2.459962 0 291.915439c9.839846-9.675849 21.647662-14.595772 34.603459-10.331839 3.279949-6.559898 13.611787-9.839846 19.515695-10.331839l0-307.495195C884.192184-63.38501 883.044202-65.516976 878.780269-65.516976L878.780269-65.516976zM878.780269-65.516976" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="carousel" unicode="" d="M1002.069333 144.38400000000001L1002.069333 611.6906670000001c0 24.213333-16.917333 49.578667-42.069333 49.578667l-64 0 1.152 6.4c0 31.338667-26.005333 57.6-58.538667 57.6L186.432 725.269333c-31.936 0-58.410667-31.957333-58.410667-64l-0.213333 0.96L67.178667 662.229333c-25.152 0-45.226667-20.288-45.226667-44.501333l0-467.328L21.354667 150.39999999999998c0-24.789333 20.629333-44.693333 45.312-44.693333L127.786667 105.70666700000004l0-5.184C127.786667 69.03466700000001 153.792 42.66666699999996 186.432 42.66666699999996l652.842667 0c31.658667 0 56.277333 10.901333 56.725333 42.602667l64 0c24.661333 0 42.666667 34.325333 42.666667 59.114667L1002.069333 144.38400000000001zM128 149.26933299999996L64 149.26933299999996l0 469.333333 64 0L128 149.26933299999996zM853.333333 106.602667c0-6.421333-14.848-21.333333-21.333333-21.333333l-640 0c-6.485333 0-21.333333 14.848-21.333333 21.333333l0 554.666667c0 6.378667 9.258667 18.56 15.744 18.56l5.589333 2.773333 640 0c6.442667 0 21.333333-14.954667 21.333333-21.333333L853.333333 106.602667zM960 127.93600000000004l-64 0 0 490.666667 60.842667 1.984c4.970667 0 3.157333 2.944 3.157333-1.984l0-469.333333C960 144.29866700000002 965.013333 127.93600000000004 960 127.93600000000004zM412.458667 399.829333c43.925333 0 79.637333 34.773333 79.637333 77.482667 0 42.752-35.712 77.482667-79.637333 77.482667-43.925333 0-79.637333-34.730667-79.637333-77.482667C332.8 434.602667 368.533333 399.829333 412.458667 399.829333zM412.458667 516.0533330000001c21.952 0 39.829333-17.365333 39.829333-38.741333 0-21.333333-17.877333-38.741333-39.829333-38.741333-21.952 0-39.829333 17.408-39.829333 38.741333C372.629333 498.709333 390.506667 516.0533330000001 412.458667 516.0533330000001zM785.92 457.386667c-95.914667-23.338667-137.728-87.765333-168.256-134.805333-24.213333-37.269333-39.082667-58.346667-65.109333-58.346667l-0.042667 0c-35.456 0-57.109333 14.272-80.042667 28.16-24.362667 14.741333-49.536 29.952-88.64 29.952-75.648 0-156.906667-93.269333-165.930667-103.893333L213.333333 167.38133300000004c0-10.709333 8.917333-18.112 19.925333-18.112l557.504 0c10.986667 0 19.904 7.402667 19.904 18.112L810.666667 438.570667c0 5.973333-2.837333 11.626667-7.658667 15.296C798.186667 457.536 791.872 458.858667 785.92 457.386667zM770.858667 188.52266699999996L253.162667 188.52266699999996c24.874667 27.733333 85.290667 95.082667 130.666667 95.082667 27.733333 0 46.229333-11.157333 67.605333-24.128 25.152-15.168 53.632-32.426667 99.712-33.941333l2.944-0.064c47.637333 0 71.722667 37.12 97.237333 76.416 26.645333 41.088 56.469333 79.104 119.530667 102.485333L770.858667 188.52266699999996z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="help" unicode="" d="M690.2 741.8C635.2 783.6 573.2 798 494.6 798c-59.6 0-110.6-12.2-151-39.4C284 718 256 649.8 256 542l153.6 0c0 28.8-2.8 59.8 14 86.4 16.8 26.6 40.2 47 80.4 47 40.8 0 61.8-11.8 81.6-36.2 16.8-20.8 23.2-45.6 23.2-72 0-22.8-11.6-43.8-25.4-62.8-7.6-11.2-17.6-21.2-30.2-30.8 0 0-83-49.4-112.2-96.2-21.8-34.8-29.6-78.4-31.4-130.6-0.2-3.8 1.2-11.6 14.4-11.6 13 0 112 0 123.6 0 11.6 0 14 8.8 14.2 12.4 0.8 19 3.2 48.2 6.6 59.2 6.6 20.8 19.4 39 39.4 54.6l41.4 28.6c37.4 29.2 67.2 53 80.4 71.8 22.6 30.8 38.4 68.8 38.4 113.8C768 649 741 703.2 690.2 741.8zM484 155.6c-51.8 1.6-94.6-34.4-96.4-90.6-1.6-56.4 39-93.4 91-95 54-1.6 95.8 33.2 97.4 89.4C577.6 115.6 538 154 484 155.6z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="code-circle" unicode="" d="M513.544163 893.525741c-282.101629 0-510.78094-228.679311-510.78094-510.76288 0-282.083569 228.679311-510.76288 510.78094-510.76288s510.76288 228.679311 510.76288 510.76288C1024.325103 664.8464309999999 795.645793 893.525741 513.544163 893.525741zM513.544163-83.46335899999997c-257.503523 0-466.22622 208.740757-466.22622 466.22622S256.0587 848.989082 513.544163 848.989082s466.22622-208.740757 466.22622-466.22622S771.047686-83.46335899999997 513.544163-83.46335899999997zM171.771357 359.77212099999997L414.357086 256.088033 414.357086 300.805295 221.978945 380.50532599999997 414.357086 459.464886 414.357086 504.182148 171.771357 401.76228ZM442.585309 193.38272800000004L478.814238 193.38272800000004 584.737801 572.1429949999999 548.743656 572.1429949999999ZM612.749301 504.182148L612.749301 459.464886 804.874598 380.50532599999997 612.749301 300.805295 612.749301 256.088033 855.33503 359.77212099999997 855.33503 401.76228Z" horiz-adv-x="1025" />
+
+
+ <glyph glyph-name="water" unicode="" d="M862.315763 33.684211000000005C802.869868 33.684211000000005 754.526289 82.94399999999996 754.526289 143.50371900000005 754.526289 162.33094700000004 759.35885 180.96056099999998 768.520956 197.43438600000002 768.64671 197.79368399999998 768.808394 198.15298199999995 769.006008 198.49431600000003L849.075622 334.542596 849.057657 334.542596 862.315763 357.052632 875.573868 334.542596 875.573868 334.542596 955.140464 199.356632C955.715341 198.67396499999995 956.164464 197.865544 956.380043 196.96729800000003 965.380464 180.60126300000002 970.123201 162.151298 970.105236 143.50371900000005 970.105236 82.94399999999996 921.761657 33.684211000000005 862.315763 33.684211000000005L862.315763 33.684211000000005ZM924.33064 188.57768399999998C924.204885 188.79326300000002 924.115061 189.02680699999996 924.025236 189.27831600000002L862.315763 302.996211 800.606289 189.260351C800.516464 189.02680699999996 800.42664 188.79326300000002 800.300885 188.57768399999998 793.977236 176.505263 790.635763 162.81600000000003 790.635763 148.965053 790.635763 105.29235100000005 822.792956 69.75775399999998 862.333727 69.75775399999998 901.856534 69.75775399999998 933.995763 105.29235100000005 933.995763 148.98301800000002 933.995763 162.81600000000003 930.654289 176.52322800000002 924.33064 188.57768399999998L924.33064 188.57768399999998ZM682.684605 392.982456C593.50678 392.982456 520.982429 469.602807 520.982429 563.8108070000001 520.982429 593.093614 528.240254 622.071018 541.965447 647.706947 542.163061 648.281825 542.396605 648.820772 542.684043 649.341754L662.815412 860.968421 662.797447 860.968421 682.684605 896 702.571763 860.968421 702.535833 860.968421 821.89471 650.689123C822.774991 649.647158 823.439692 648.3716489999999 823.781026 646.970386 837.25471 621.514105 844.368815 592.8241399999999 844.35085 563.8108070000001 844.35085 469.602807 771.844464 392.982456 682.684605 392.982456L682.684605 392.982456ZM791.408254 630.1192980000001C791.21064 630.4965609999999 791.030991 630.891789 790.887271 631.322947L682.684605 823.924772 574.446008 631.287018C574.320254 630.891789 574.140605 630.4965609999999 573.942991 630.1013330000001 562.840675 609.6931930000001 556.912254 596.075789 556.912254 572.631579 556.912254 498.634105 613.375973 428.876351 682.684605 428.876351 751.993236 428.876351 808.367131 489.058807 808.367131 563.056281 808.367131 586.500491 802.492605 609.6931930000001 791.408254 630.1192980000001L791.408254 630.1192980000001ZM538.695833 276.983018C540.115061 275.330246 541.174991 273.33614 541.713938 271.12645599999996 563.433517 231.11859600000003 574.895131 186.02666699999997 574.895131 140.43171900000004 574.895131-7.581192999999985 458.051341-128 314.403903-128 170.738499-128 53.89471-7.581192999999985 53.89471 140.43171900000004 53.89471 186.47578899999996 65.589868 231.998877 87.704675 272.294175 88.010078 273.17445599999996 88.387341 274.01880700000004 88.872394 274.863158L282.408394 607.411649 282.372464 607.411649 314.403903 662.45614 346.453306 607.411649 346.399412 607.411649 538.695833 276.983018 538.695833 276.983018ZM314.403903 590.614456L119.807973 257.79649099999995C119.556464 257.113825 119.251061 256.449123 118.873798 255.78442099999995 98.932745 220.48336800000004 88.387341 180.42161399999998 88.387341 139.91073700000004 88.387341 12.072420999999963 189.799271-91.89052600000002 314.421868-91.89052600000002 439.026499-91.89052600000002 540.420464 12.072420999999963 540.402499 139.91073700000004 540.402499 180.42161399999998 529.857096 220.50133300000005 509.916043 255.78442099999995 509.53878 256.449123 509.233377 257.131789 508.963903 257.86835099999996L314.403903 590.614456 314.403903 590.614456Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="username" unicode="" d="M514.594 824.888c-144.11 0-260.979-118.46-260.979-264.558 0-88.783 43.497-166.928 109.711-214.898-135.361-59.354-230.159-195.858-230.159-354.931h0.894c1.541-21.375 18.641-38.377 40.117-38.377s38.575 17.051 40.117 38.377h0.645c0 0.944-0.099 1.79-0.099 2.734 0 0.05 0 0.099 0 0.149 0 0.099-0.05 0.149-0.05 0.199 0.05 159.967 120 291.054 273.009 304.924 8.948-0.944 17.598-2.734 26.844-2.734 144.11 0 260.979 118.46 260.979 264.558s-116.919 264.558-261.029 264.558zM514.594 377.54499999999996c-99.769 0-180.698 81.972-180.698 183.183s80.879 183.183 180.698 183.183c99.719 0 180.647-81.972 180.647-183.183s-80.879-183.183-180.647-183.183zM896.021-6.615000000000009c0 0.348-0.199 0.645-0.199 0.994-1.043 105.038-43.397 200.034-111.35 269.131v0c-7.157 7.357-17.001 11.98-27.986 11.98-21.574 0-39.122-17.747-39.122-39.668 0-11.135 4.573-21.127 11.83-28.334l-0.099-0.05c52.742-55.229 85.302-130.589 85.302-213.853 0-1.043-0.149-1.987-0.149-3.034h0.994c1.491-21.375 18.691-38.377 40.117-38.377 21.475 0 38.575 17.051 40.117 38.377h0.597c0 0.796-0.099 1.491-0.099 2.287-0.05 0.149 0.05 0.348 0.05 0.547z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="find-fill" unicode="" d="M512 896C229.236364 896 0 666.763636 0 384c0-282.786909 229.236364-512 512-512s512 229.213091 512 512C1024 666.763636 794.763636 896 512 896zM657.291636 383.976727c0-77.195636-60.392727-139.729455-136.424727-144.407273l-175.732364-151.714909-22.877091 13.242182 58.228364 222.021818c-8.634182 18.548364-13.800727 39.074909-13.800727 60.858182 0 77.195636 60.369455 139.729455 136.378182 144.430545l175.802182 151.714909 22.877091-13.172364-58.251636-222.068364C652.125091 426.309818 657.291636 405.806545 657.291636 383.976727zM512 384m-66.048 0a2.838 2.838 0 1 1 132.096 0 2.838 2.838 0 1 1-132.096 0Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="about" unicode="" d="M514.27174 834.607768c-249.516844 0-451.789687-202.272843-451.789687-451.789687s202.272843-451.789687 451.789687-451.789687 451.789687 202.272843 451.789687 451.789687S763.788583 834.607768 514.27174 834.607768zM514.27174-20.12919999999997c-222.541469 0-402.947282 180.405813-402.947282 402.947282s180.405813 402.947282 402.947282 402.947282 402.947282-180.405813 402.947282-402.947282S736.814232-20.12919999999997 514.27174-20.12919999999997zM514.295276 593.979362c-9.44614-10.360975-14.307867-22.951735-14.307867-37.483706 0-11.960403 3.886517-22.396079 11.534707-30.457686 7.783267-8.211009 17.853623-12.450567 29.313629-12.450567 9.312086 0 23.139 2.849908 35.782971 16.900925 9.865695 10.641361 14.866592 23.437805 14.866592 37.693484 0 11.68104-4.031826 21.900799-11.744485 29.832446C562.925856 615.325529 532.358677 613.449809 514.295276 593.979362zM549.461193 293.282882c-12.110829-11.541871-20.589944-18.759249-26.236548-23.316032 2.77009 14.953573 9.976212 44.614104 27.330462 103.023398 17.297968 57.890478 18.799158 67.991534 18.799158 72.955592 0 8.65717-3.63683 16.335037-9.921977 21.642926-14.124695 11.661597-39.035038 9.349949-69.131497-7.677866-16.779152-9.408277-34.595936-24.759917-54.493102-46.576805l-10.377348-11.541871 34.425044-26.548656 8.818853 8.715499c9.573029 9.292644 16.086373 15.35164 20.411889 19.393699-26.294876-86.460164-39.093367-140.190903-39.093367-164.262134 0-10.907421 3.172249-19.970844 9.573029-26.839275 6.460132-7.039323 15.510252-10.736529 25.891693-10.736529 10.146081 0 21.792329 3.926426 35.922141 11.949146 12.741185 7.212262 31.883151 23.029506 58.641585 48.190559l10.837836 10.391674-31.30703 30.475082L549.461193 293.282882z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="location" unicode="" d="M451.673935-98.39569900000004C478.883834-129.01914699999998 524.254807-128.8089789999999 551.400292-97.92885100000001 553.755808-95.38790800000004 558.821323-89.79676199999994 565.872444-81.84834999999998 577.572838-68.65901699999995 590.597131-53.62432000000001 604.615947-36.99831500000005 644.662065 10.495494000000008 684.708678 61.282182000000034 722.129538 113.35355300000003 759.658524 165.575381 792.492213 216.29072599999995 819.314991 264.54153799999995 868.685946 353.35368300000005 896 430.456574 896 493.714285 896 715.890551 719.301715 896 501.333333 896 283.364952 896 106.666667 715.890551 106.666667 493.714285 106.666667 430.401284 134.05152 353.19426999999996 183.54613 264.23737800000004 210.371803 216.02347099999997 243.193308 165.34812399999998 280.699364 113.16684599999996 318.155192 61.05544999999995 358.239268 10.22578999999996 398.322835-37.31103099999996 412.354743-53.95207300000004 425.391185-69.00072999999998 437.102468-82.20257900000001 444.160087-90.15846599999998 449.230214-95.75492099999997 451.982775-98.73670600000003L451.673935-98.39569900000004ZM486.822684-65.32134799999994C484.281231-62.568254000000024 479.425084-57.207989 472.585916-49.49835900000005 461.135889-36.591016999999965 448.364015-21.84776099999999 434.602351-5.527214999999956 395.275714 41.11192700000004 355.949587 90.98045200000001 319.289224 141.985137 282.808749 192.739548 250.983685 241.87642200000005 225.158316 288.29247799999996 179.388826 370.55419500000005 154.50505 440.709839 154.50505 493.714285 154.50505 688.960095 309.785362 847.238095 501.333333 847.238095 692.881306 847.238095 848.161617 688.960095 848.161617 493.714285 848.161617 440.753978 823.345286 370.701737 777.693969 288.58074899999997 751.873483 242.13293399999998 720.038415 192.96007499999996 683.537446 142.16873799999996 646.912604 91.20503299999996 607.624538 41.38032599999997 568.335977-5.21503800000005 554.587654-21.52024300000005 541.828177-36.24924999999996 530.389289-49.14379699999995 523.556841-56.84571100000005 518.705521-62.20043499999997 516.166694-64.95052599999997 507.543772-74.74891100000002 495.255793-74.80583000000001 487.131524-65.66235300000005L486.822684-65.32134799999994ZM714.955981 428.971194C723.919106 453.372045 728.565658 479.331002 728.565658 505.904762 728.565658 627.091817 632.184774 725.333333 513.29293 725.333333 394.401086 725.333333 298.020202 627.091817 298.020202 505.904762 298.020202 384.717709 394.401086 286.47619 513.29293 286.47619 549.003859 286.47619 583.510052 295.36805300000003 614.373097 312.125591 626.032316 318.456132 630.449257 333.22218 624.238611 345.10648100000003 618.027966 356.99078199999997 603.541579 361.49299399999995 591.882359 355.16245100000003 567.900883 342.14136099999996 541.111735 335.23809500000004 513.29293 335.23809500000004 420.821495 335.23809500000004 345.858586 411.648164 345.858586 505.904762 345.858586 600.161359 420.821495 676.571428 513.29293 676.571428 605.764365 676.571428 680.727273 600.161359 680.727273 505.904762 680.727273 485.192019 677.117041 465.022684 670.154965 446.069408 665.522846 433.459117 671.796821 419.408892 684.168282 414.687349 696.53974 409.965809 710.323861 416.360905 714.955981 428.971194L714.955981 428.971194Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="up" unicode="" d="M513.6 539.2l384-384c12.8-12.8 32-12.8 44.8 0 12.801 12.8 12.801 32 0 44.8l-403.2 403.2C532.8 609.6 520 616 513.6 616c-6.4 0-19.2 0-25.599-6.4L78.399 200c-12.8-12.8-12.8-32 0-44.8s32-12.8 44.8 0L513.6 539.2z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="pause" unicode="" d="M512-128c-282.714 0-511.893 229.232-511.893 512 0 282.768 229.179 512 511.893 512 282.714 0 511.893-229.232 511.893-512 0-282.768-229.179-512-511.893-512zM512 863.996c-265.043 0-479.9-214.91-479.9-479.996 0-265.097 214.857-479.996 479.9-479.996 265.043 0 479.9 214.899 479.9 479.996 0 265.086-214.857 479.996-479.9 479.996zM639.973 181.32299999999998h-21.329c-23.558 0-42.658 19.1-42.658 42.658v319.933c0 23.558 19.1 42.658 42.658 42.658h21.329c23.558 0 42.658-19.1 42.658-42.658v-319.933c0-23.558-19.1-42.658-42.658-42.658zM405.356 181.32299999999998h-21.329c-23.558 0-42.658 19.1-42.658 42.658v319.933c0 23.558 19.1 42.658 42.658 42.658h21.329c23.558 0 42.658-19.1 42.658-42.658v-319.933c0-23.558-19.1-42.658-42.658-42.658z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="date" unicode="" d="M933.185668 758.3591759999999l-167.054737 0 0 56.506968L732.333174 814.866145l0-56.506968L539.505447 758.3591759999999l0 56.506968-33.796734 0 0-56.506968-216.255299 0 0 56.506968-33.796734 0 0-56.506968L88.005356 758.3591759999999c-12.255115 0-22.224164-9.970072-22.224164-22.224164l0-706.60521c0-12.255115 9.970072-22.225187 22.224164-22.225187l845.179288 0c12.255115 0 22.225187 9.970072 22.225187 22.225187L955.409832 736.135012C955.409832 748.389104 945.43976 758.3591759999999 933.185668 758.3591759999999zM939.036933 29.528778999999986c0-3.226484-2.62478-5.852288-5.852288-5.852288l-845.179288 0c-3.226484 0-5.851265 2.62478-5.851265 5.852288L82.154092 736.135012c0 3.226484 2.62478 5.851265 5.851265 5.851265l167.650301 0 0-55.657624 33.796734 0 0 55.657624 216.255299 0 0-55.657624 33.796734 0 0 55.657624L732.333174 741.986277l0-55.657624 33.796734 0 0 55.657624 167.054737 0c3.226484 0 5.852288-2.62478 5.852288-5.851265L939.036933 29.528778999999986zM206.835765 608.260623l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM458.879152 608.260623l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM684.827207 608.260623l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM206.835765 433.345871l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM458.879152 433.345871l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM684.827207 433.345871l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM206.835765 257.877511l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM458.879152 257.877511l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM684.827207 257.877511l129.098263 0 0-94.008071-129.098263 0 0 94.008071Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="layim-uploadfile" unicode="" d="M914.7359263333336 663.0359498888887c-20.806884999999987 20.806885000000012-48.471967999999976 32.265868000000026-77.89816099999994 32.265868000000054l-352.221993 2.2737367544323206e-13-120.26099099999992 95.03035300000005-11.157106999999995 8.816806000000007-14.220886 9.769962616701378e-15L197.09333633333344 799.148976888889c-51.69538300000001 2.1316282072803006e-14-93.75224400000005-42.88778599999995-93.75224400000006-95.60442799999993l-1.5631940186722204e-13-255.13888799999998c-1.7763568394002505e-15-2.302439 0.08391099999999785-4.716417999999999 0.24968699999999489-7.196911999999999l-1.9895196601282805e-13-340.692403c-1.9539925233402755e-14-29.426192999999998 11.458982999999954-57.09127599999999 32.26586799999994-77.89816100000002 20.806884999999987-20.806885000000012 48.471967999999976-32.265868000000026 77.89816099999994-32.265868000000054l623.083981-3.410605131648481e-13c29.426192999999998-1.9539925233402755e-14 57.09127599999999 11.458982999999954 77.89816100000002 32.26586799999994 20.806885000000012 20.806884999999987 32.265868000000026 48.471967999999976 32.265868000000054 77.89816099999994L947.0028173333335 585.1377888888885C947.0017943333336 614.5639818888885 935.5428113333334 642.2280418888886 914.7359263333336 663.0359498888887zM197.09333633333372 758.2167298888891l141.88345099999998-8.526512829121202e-14L470.3948853333333 654.369569888889l366.44287999999995-2.2737367544323206e-13c38.236859-2.1316282072803006e-14 69.23178099999997-30.99492100000004 69.23178099999994-69.23178100000004L906.0695463333333 465.9195468888886 144.27334033333327 465.91954688888893 144.2733403333336 703.5445488888892C144.2733403333336 733.7361748888891 167.92296933333355 758.2167298888891 197.09333633333372 758.2167298888891zM836.8377653333331 31.28558888888881L213.75480733333322 31.28558888888915c-38.236859 2.1316282072803006e-14-69.23178099999997 30.99492100000004-69.23178099999994 69.23178100000004L144.52302633333338 424.4776928888892l761.546519-6.252776074688882e-13-2.2737367544323206e-13-323.96134599999993C906.0695463333333 62.28050988888867 875.0746243333334 31.285588888888583 836.8377653333331 31.28558888888881z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="delete" unicode="" d="M738.923 24.288h-451.956c-27.2 0-49.327 21.603-49.327 48.157v418.017c0 26.548 22.129 48.147 49.327 48.147h451.956c27.2 0 49.327-21.598 49.327-48.147v-418.017c0-26.555-22.129-48.157-49.327-48.157zM286.966 494.547c-4.447 0-7.168-2.644-7.168-4.084v-418.017c0-1.443 2.722-4.093 7.168-4.093h451.956c4.448 0 7.168 2.651 7.168 4.093v418.017c0 1.44-2.722 4.084-7.168 4.084h-451.956zM832.199 496.302h-640.401c-27.201 0-49.327 20.131-49.327 44.876v61.045c0 24.74 22.128 44.867 49.327 44.867h640.401c27.2 0 49.327-20.127 49.327-44.867v-61.045c0-24.744-22.129-44.876-49.327-44.876zM184.631 541.327c0.387-0.733 2.722-2.866 7.168-2.866h640.401c4.445 0 6.782 2.132 7.168 2.867v60.741c-0.393 0.736-2.733 2.863-7.168 2.863h-640.401c-4.437 0-6.776-2.128-7.168-2.863v-60.742zM600.748 605.354h-174.546c-27.201 0-49.327 20.13-49.327 44.876v10.736c0 24.74 22.128 44.867 49.327 44.867h174.546c27.2 0 49.327-20.126 49.327-44.867v-10.736c0-24.745-22.128-44.876-49.327-44.876zM419.034 650.378c0.387-0.733 2.722-2.865 7.168-2.865h174.546c4.446 0 6.782 2.131 7.168 2.865v10.432c-0.393 0.736-2.734 2.862-7.168 2.862h-174.546c-4.437 0-6.776-2.126-7.168-2.862v-10.432zM404.099 430.833h-30.097c-7.297 0-13.213-5.916-13.213-13.213v-272.34c0-7.297 5.916-13.212 13.213-13.212h30.098c7.297 0 13.212 5.916 13.212 13.212v272.341c0 7.297-5.916 13.213-13.212 13.213zM659.583 430.833h-30.097c-7.298 0-13.213-5.916-13.213-13.213v-272.34c0-7.297 5.917-13.212 13.213-13.212h30.097c7.297 0 13.212 5.916 13.212 13.212v272.341c0 7.297-5.916 13.213-13.212 13.213zM531.841 430.833h-30.098c-7.297 0-13.213-5.916-13.213-13.213v-272.34c0-7.297 5.917-13.212 13.213-13.212h30.098c7.297 0 13.212 5.916 13.212 13.212v272.341c0 7.297-5.916 13.213-13.212 13.213z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="play" unicode="" d="M512 896C229.376 896 0 666.624 0 384 0 101.37599999999998 229.376-128 512-128 794.624-128 1024 101.37599999999998 1024 384 1024 666.624 794.624 896 512 896L512 896 512 896zM512-95.23199999999997C245.76-95.23199999999997 32.768 117.75999999999999 32.768 384 32.768 650.24 245.76 863.232 512 863.232S991.232 650.24 991.232 384C991.232 117.75999999999999 778.24-95.23199999999997 512-95.23199999999997L512-95.23199999999997 512-95.23199999999997zM733.184 392.192L393.216 588.8c-4.096 4.096-8.192 4.096-12.288 0C376.832 588.8 372.736 584.704 372.736 580.608l0-393.216c0-4.096 4.096-8.192 4.096-8.192 4.096-4.096 8.192-4.096 12.288 0l344.064 196.608c4.096 4.096 4.096 4.096 4.096 8.192C741.376 388.096 737.28 392.192 733.184 392.192L733.184 392.192 733.184 392.192zM733.184 392.192" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="top" unicode="" d="M812 153.4l-300 172.8-300-172.8 300 604L812 153.4zM264.5 209.2l247.5 142.5 247.5-142.5L512 707.5 264.5 209.2zM371.7 138.3l0-126.2-15.9 0 0 126.2-45.9 0L309.9 153l107.4 0 0-14.8L371.7 138.2zM506.6 154.5c26.6 0 43.3-3.9 50-11.7 6.7-7.8 10-27.2 10-58.3 0-33.5-3.2-54.2-9.6-62-6.4-7.8-23.2-11.8-50.4-11.8-27 0-43.8 3.9-50.3 11.7-6.5 7.8-9.8 27.9-9.8 60.3l0 9.9 0.2 13.3c0 18.7 4.2 31.5 12.6 38.4C467.8 151 483.5 154.5 506.6 154.5zM506.5 141c-22.3 0-35.3-2.5-39.1-7.4-3.8-5-5.7-22-5.7-51 0-29.1 1.9-46.1 5.7-51.1 3.8-5 16.8-7.4 39.1-7.4 22.4 0 35.4 2.5 39.2 7.4 3.8 5 5.7 22 5.7 51.1l0 9.2-0.1 13.3c0 15.6-2.6 25.4-7.8 29.6S525.9 141 506.5 141zM608.4 12.1 608.4 153l59.2 0 5.4 0c15.9 0 26.7-3.1 32.5-9.2 5.8-6.1 8.7-17.6 8.7-34.4 0-16.1-3-27.1-9-32.9-6-5.9-17.3-8.8-33.9-8.8l-6.2-0.1-40.7 0 0-55.5L608.4 12.1zM624.3 81.1l37.7 0c15.8 0 25.9 1.6 30.3 4.9 4.4 3.2 6.7 10.7 6.7 22.3 0 13.6-1.5 22.2-4.5 25.9-3 3.6-10.1 5.4-21.3 5.4l-6.1 0.1-42.7 0L624.4 81.1z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="friends" unicode="" d="M672.02974 765.933689c7.66047-32.266891 8.420787-62.237483 7.713682-95.365998-0.283456-12.778024-7.291057-71.832002-5.3918-89.926102 1.561565-14.936177 5.132904-16.128329 10.759041-28.436656 9.803273-21.422915 6.51846-50.970882 2.76088-72.566736-2.056845-11.816117-6.404873-28.64541-13.017478-38.287001-7.291057-10.645454-21.864984-10.711969-28.319999-23.12365-9.29469-17.848507-4.045129-42.930765-9.903557-62.21497-6.65763-21.883403-23.599488-23.420409-24.877597-52.040237 8.316409-1.243317 16.59598-2.479471 24.877597-3.722788 8.316409-18.498306 23.533996-55.70265 39.08518-66.900689 13.024641-3.728928 26.048259-7.448646 39.07904-11.156084 45.641503-19.593244 96.365768-43.032072 142.108578-63.215764 41.656749-18.381649 91.51325-24.937972 106.575294-70.629617 0-31.026644 2.795673-104.309694 2.025123-144.978952L58.155515-56.631556000000046c-0.757247 40.669258 2.029216 113.952308 2.029216 144.978952 15.065114 45.691645 64.928778 52.247968 106.578364 70.629617 45.74281 20.182668 96.467075 43.62252 142.098345 63.215764 13.027711 3.707438 26.054399 7.427156 39.08211 11.156084 15.554254 11.197016 30.78105 48.402383 39.09439 66.900689l18.492166 4.710278c-4.196579 24.429389-18.658965 26.322505-24.682146 43.62559-2.356674 26.013467-4.729721 52.052516-7.095605 78.079286 0.107447-1.234107-17.006326 3.246951-19.252483 4.716418-24.130583 15.838733-24.618701 80.075757-26.941606 106.793258-1.063215 12.222369 15.163351 22.240537 10.654664 44.62536-26.433022 131.125433 11.437493 219.776496 71.330582 240.123916 41.564651 17.633612 119.167077 50.323129 191.563944 3.716648l17.971303-17.428951 29.061896-5.237281C662.71663 795.172617 672.02974 765.933689 672.02974 765.933689z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="refresh-3" unicode="" d="M820.376904 697.14807C740.637816 774.519228 631.884926 822.157201 511.999488 822.157201c-244.621347 0-442.925808-198.305485-442.925808-442.926832 0-244.6193 198.304462-442.925808 442.925808-442.925808 206.075449 0 379.271046 140.739395 428.740738 331.337337L822.859445 267.64189899999997c-45.759183-127.45381-167.656441-218.623229-310.859957-218.623229-182.371584 0-330.210677 147.842163-330.210677 330.210677 0 182.371584 147.840116 330.2117 330.210677 330.2117 88.762603 0 169.32443-35.035958 228.655723-92.015693L557.051567 433.822732l280.641725 0 113.880677 0 3.351328 0L954.925297 831.695438 820.376904 697.14807z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="ok" unicode="" d="M960 640L915.2 684.8 371.2 172.79999999999995 108.8 454.4 64 409.6 358.4 83.20000000000005 364.8 89.60000000000002 371.2 83.20000000000005Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="layer" unicode="" d="M96.089 724.318l0-684.236 831.822 0L927.911 724.318 96.089 724.318zM884.178 84.457L140.464 84.457 140.464 489.559l743.714 0L884.178 84.457z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="face-smile-fine" unicode="" d="M511.558443 852.9315573333333c-246.787686 0-447.597201-200.783932-447.597201-447.598224 0-246.815315 200.783932-447.598224 447.597201-447.598224 246.841921 0 447.64939 200.782909 447.64939 447.598224C959.207833 652.1476253333334 758.400365 852.9315573333333 511.558443 852.9315573333333zM511.558443-4.962310666666667c-226.247884 0-410.295644 184.046736-410.295644 410.295644 0 226.249931 184.072319 410.296667 410.295644 410.296667 226.27449 0 410.346809-184.046736 410.346809-410.296667C921.905252 179.08442633333334 737.832933-4.962310666666667 511.558443-4.962310666666667zM724.38055 303.5726953333334c-9.698896 3.457752-20.366863-1.566682-23.848151-11.264555-28.500101-79.45461-104.372116-132.844587-188.82353-132.844587-84.798315 0-160.770614 53.689806-189.070146 133.590578-3.432169 9.723455-14.075577 14.772448-23.823592 11.364839-9.699919-3.432169-14.797008-14.100136-11.364839-23.823592 33.547047-94.77248 123.668601-158.434405 224.234017-158.434405 100.142791 0 190.140525 63.314001 223.935212 157.564595C739.125369 289.3978573333334 734.102982 300.0903843333334 724.38055 303.5726953333334zM302.49494 515.3479593333334c0-24.653493 19.98517-44.638663 44.638663-44.638663 24.653493 0 44.638663 19.98517 44.638663 44.638663s-19.98517 44.63764-44.638663 44.63764C322.48011 559.9855993333333 302.49494 540.0014523333333 302.49494 515.3479593333334L302.49494 515.3479593333334zM631.398856 515.3479593333334c0-24.653493 19.98517-44.638663 44.63764-44.638663 24.653493 0 44.63764 19.98517 44.63764 44.638663s-19.984147 44.63764-44.63764 44.63764C651.384026 559.9855993333333 631.398856 540.0014523333333 631.398856 515.3479593333334L631.398856 515.3479593333334z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="dollar" unicode="" d="M517.565-65.45399999999995c-244.263 0-442.299 198.014-442.299 442.299s198.014 442.299 442.299 442.299c244.263 0 442.299-198.014 442.299-442.299 0-244.263-198.014-442.299-442.299-442.299zM517.565 863.383c-268.751 0-486.564-217.834-486.564-486.564s217.834-486.564 486.564-486.564c268.751 0 486.564 217.834 486.564 486.564 0 268.751-217.834 486.564-486.564 486.564zM497.036 425.349c-18.443 6.957-33.605 16.314-45.238 27.617-11.581 11.306-20.059 23.465-25.468 36.742-5.423 13.177-8.178 26.235-8.178 39.172-0.004 18.194 2.564 34.357 7.846 48.514 5.327 14.231 13.748 25.85 25.468 35.02 11.581 9.167 26.798 15.204 45.482 18.295v-205.52zM534.455 356.13199999999995c16.937-6.756 32.277-14.997 46.035-24.855 13.748-9.678 24.613-21.601 32.929-35.57 8.204-13.909 12.436-30.734 12.622-50.307 0-14.231-1.859-27.907-5.785-40.833-3.858-12.866-9.542-24.531-17.271-34.804-7.691-10.211-17.271-18.443-28.678-24.613-11.328-6.318-24.613-9.678-39.76-10.341v221.377zM534.455 94.18299999999999c29.037 3.318 53.978 11.306 74.785 24.134 20.985 12.866 37.018 30.15 48.281 51.734 11.125 21.535 16.876 46.832 16.937 76.196 0 16.08-1.67 30.377-5.033 42.985-3.318 12.622-8.204 24.15-14.836 34.357-6.739 10.341-14.836 20.189-24.613 29.326-8.853 8.204-19.107 15.957-30.659 23.041-11.328 7.197-22.836 13.706-34.281 19.261-11.581 5.694-21.601 10.516-30.659 14.231v221.377c14.527-3.318 26.662-8.594 36.62-16.192 9.859-7.395 17.766-16.192 23.776-26.384 5.941-10.211 10.341-20.985 12.972-32.345 2.666-11.328 4.026-22.836 3.858-34.097h46.155c0.004 16.314-1.566 32.345-5.327 48.281-3.543 15.957-9.938 30.909-19.107 44.969-8.996 13.909-21.601 26.235-37.684 36.742-16.192 10.521-36.62 18.295-61.318 23.562v49.426h-37.441v-53.316c-23.465-2.624-42.985-8.178-58.595-16.314-15.633-8.204-28.279-18.194-37.684-29.562-9.441-11.328-16.523-23.302-21.226-35.317-4.59-12.062-7.846-23.302-9.316-33.326-1.566-10.211-2.256-18.194-2.115-24.029 0.004-21.601 3.452-40.612 9.863-57.238 6.479-16.523 15.58-30.909 27.178-43.441 11.659-12.436 25.361-23.562 40.833-33.204 15.633-9.678 32.649-18.443 51.098-26.235v-237.329c-18.194 1.984-33.326 7.197-45.094 15.633-11.97 8.369-21.074 19.107-27.714 31.902-6.739 12.972-11.011 27.178-13.363 42.701-2.256 15.58-3.034 31.313-2.115 47.367h-47.803c-1.183-23.776 0.397-46.035 5.033-66.676s12.357-39.03 23.376-55.019c10.892-16.08 25.361-29.037 43.142-39.03 17.847-9.863 39.472-16.08 64.586-18.295v-65.283h37.441v65.283z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="group" unicode="" d="M1383.17753-39.75895700000001L1380.048488-13.938771999999972 1373.005994 17.35852699999998 1362.834458 47.090445000000045 1348.751189 77.605053 1334.667921 101.07716700000003 1315.107539 123.76659099999995 1293.199086 141.76331100000004 1262.684478 158.97562200000004 1240.777745 169.147158 1211.828518 176.18965200000002 1182.87757 183.23042599999997 1157.840075 192.61927200000002 1126.544497 207.48523 1101.507002 219.22214799999995 1070.992393 233.30541600000004 1047.52028 246.607714 1047.52028 329.54366300000004 1057.690095 341.280581 1067.080661 356.92751 1074.121435 372.57615899999996 1079.598549 392.136541 1085.858352 415.610375 1088.204704 433.605376 1091.595216 432.822685 1098.37624 433.866846 1103.593603 438.040048 1109.330466 447.428894 1112.982449 458.3814 1115.06905 471.943448 1117.676871 496.459723 1118.719312 517.324016 1117.676871 535.059266 1114.024889 546.0134929999999 1106.722645 550.186695 1102.549442 549.142535 1106.201425 572.614649 1109.330466 600.782906 1110.374627 626.341621 1109.851687 646.684693 1106.722645 665.4623839999999 1100.984061 683.718855 1093.160597 700.409945 1082.20637 719.189356 1069.688483 734.838006 1055.082274 746.8346730000001 1036.304583 758.83134 1012.832469 769.785566 993.010617 775.00121 969.017283 779.174412 945.543448 779.695632 921.550114 775.52243 898.599221 767.698965 878.256148 759.35256 860.520898 747.877113 844.089558 733.2726250000001 828.440908 716.058594 814.35764 695.715522 804.186104 673.8087889999999 797.92802 648.771294 797.14533 616.691305 800.274372 586.959387 804.186104 548.621314 795.579949 548.621314 790.102836 541.57882 788.539175 529.060933 790.102836 499.329015 794.014568 464.902674 797.14533 447.688644 802.622443 438.299798 812.793979 432.822685 819.052063 433.605376 822.965515 406.221529 826.877248 389.790189 833.137051 371.79346899999996 841.743207 353.79846799999996 851.914743 339.7152 859.738207 329.54366300000004 858.955517 245.04233299999999 867.267518 242.13003600000002 878.734364 238.975192 891.063029 234.389141 902.817148 229.80137100000002 913.712888 225.78814699999998 923.459535 220.91310299999998 935.215374 216.03977999999995 948.116866 208.58615799999995 961.018358 201.13081599999998 971.625104 193.38992099999996 985.386695 183.06872699999997 997.142535 172.174708 1008.323827 158.41311700000006 1020.077947 143.21860000000004 1032.549389 125.72933699999999 1043.300632 105.086951 1052.476173 82.72436500000003 1060.502621 62.08197800000005 1066.093267 42.72974099999999 1069.963715 22.517404000000056 1073.834162-0.27523199999995995 1076.41446-26.93831499999999 1076.84451-45.000403000000006 1075.984411-61.12726799999996 1072.328988-73.59870999999998 1065.377664-87.28805299999999 1057.277248-96.391345 1042.440532-103.91721500000006 1351.099261-103.91721500000006 1365.182529-96.87472100000002 1376.136756-85.92221500000005 1383.17753-74.18529799999999 1384.742911-59.319339000000014ZM438.650719 816.389195L421.44873 797.467007 405.96694 775.104421 394.785647 751.021637 387.904851 723.498455 387.044752 688.234377 390.48515 655.550598 394.785647 613.4057250000001 385.324553 613.4057250000001 379.303857 605.6648299999999 377.583658 591.903239 379.303857 559.21946 383.604354 521.375084 387.044752 502.452896 393.065448 492.131703 404.246741 486.111007 411.127537 486.971106 415.428034 456.867625 419.728531 438.805537 426.609327 419.02325 436.070421 399.240962 447.251713 383.75917200000004 455.852708 372.57787900000005 454.992609 279.687139 440.370918 270.226045 405.96694 253.88415499999996 370.702863 238.40236500000003 342.319581 224.64077399999996 319.956995 215.17967999999996 295.014111 207.43878500000005 269.211128 202.278188 244.268244 196.25749199999996 218.46526 185.07619899999997 194.382475 173.034807 172.879989 157.55301699999995 148.797205 133.470232 131.595216 108.52734799999996 118.693724 84.44456400000001 108.372531 58.641579999999976 98.051337 29.398198999999977 92.89074 6.175514000000021 88.590243-13.606772999999976 86.009945-36.829458000000045 86.009945-57.47184500000003 89.450343-78.11423200000002 99.771536-91.87582299999997 115.253326-102.19701699999996 135.035613-103.91721500000006 995.995162-103.91721500000006 1011.476952-96.17632000000003 1023.518344-84.13492799999995 1031.259239-71.23343599999998 1032.979438-54.891546999999946 1031.259239-33.38906099999997 1027.818842-5.005778999999961 1020.077947 29.398198999999977 1008.896654 62.08197800000005 993.414864 95.625857 977.933074 121.42884000000004 956.430587 146.37172399999997 932.347803 166.15401199999997 898.803924 185.07619899999997 874.72114 196.25749199999996 842.89746 203.99838699999998 811.07378 211.739282 783.550598 222.060476 749.14662 238.40236500000003 721.623438 251.303857 688.079559 266.78564700000004 662.276576 281.407338 662.276576 372.57787900000005 673.457869 385.479371 683.779062 402.68136 691.519957 419.883349 697.540653 441.385835 704.421449 467.188819 707.001747 486.971106 710.729418 486.111007 718.18304 487.258379 723.916463 491.84443 730.224432 502.165623 734.237656 514.207015 736.532402 529.1159789999999 739.398253 556.066335 740.545626 579.001747 739.398253 598.496761 735.385029 610.538153 727.356861 615.1259239999999 722.77081 613.9785509999999 726.784034 639.7815350000001 730.224432 670.7451149999999 731.371805 698.842844 730.797258 721.205429 727.356861 741.847816 721.050611 761.915656 712.449617 780.265018 700.408225 800.907405 686.646634 818.109394 670.590297 831.2981589999999 649.94791 844.485204 624.144927 856.526596 602.356888 862.261739 575.979358 866.847789 550.176374 867.422336 523.800564 862.834565 498.570407 854.233571 476.207822 845.05975 456.712807 832.443811Z" horiz-adv-x="1449" />
+
+
+ <glyph glyph-name="layim-download" unicode="" d="M186.888458 77.07363199999998l0 581.729108c14.85022-14.450107 35.050284-23.436782 57.359382-23.436782l560.03604 0 0-151.561881 25.029046 0 0 176.591951-585.065086 0c-31.191396 0-57.359382 26.166963-57.359382 57.359382 0 31.191396 26.165939 57.359382 57.359382 57.359382l572.551074 0L816.798914 800.143838 244.24784 800.143838c-45.431725 0-82.388429-36.957727-82.388429-82.388429l0-640.681778c0-41.796942 34.000372-75.789127 75.789127-75.789127l225.950102 0 0 25.029046L237.648538 26.31355099999996C209.661114 26.31355099999996 186.888458 49.078021000000035 186.888458 77.07363199999998zM236.947574 730.269421l560.38601 0 0-25.029046-560.38601 0 0 25.029046ZM686.086897 428.171012c-85.917812 0-164.908864-55.248302-194.553021-135.882783-30.013571-81.641415-4.269233-175.567621 62.624293-230.942813 67.00302-55.465243 164.474982-62.808488 238.931764-17.720593 74.094532 44.868907 113.272833 133.533272 96.080266 218.517829C869.882923 357.47283300000004 783.297916 428.171012 686.086897 428.171012zM686.086897 38.82858599999997c-75.595722 0-145.060817 48.634674-171.092703 119.595842-26.354228 71.839165-3.63069 154.438395 55.287187 203.074092 59.017138 48.718585 144.762011 55.029314 210.191186 15.237029 65.11195-39.59888 99.396801-117.681236 84.064604-192.408171C847.384513 100.72940100000005 771.387655 38.82858599999997 686.086897 38.82858599999997zM698.600909 152.23547199999996L698.600909 311.02496499999995 673.571862 311.02496499999995 673.571862 152.28459099999998 604.675726 221.17254100000002 586.978668 203.47548400000005 686.111456 104.35190499999999 785.185916 203.42738799999995 767.489882 221.123422Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="picture-fine" unicode="" d="M958.648085 84.30682933333333L65.772494 84.30682933333333 65.772494 721.9115253333333l892.87559 0L958.648085 84.30682933333333zM97.660762 116.20328333333339l829.099055 0L926.759817 690.0570263333334 97.660762 690.0570263333334 97.660762 116.20328333333339zM648.731616 419.05893933333334l-1.991354 0c-47.801702 0-86.696548 38.900985-86.696548 86.695524l0 1.978051c0 47.809889 38.894845 86.671988 86.696548 86.671988l1.991354 0c47.801702 0 86.698594-38.862099 86.698594-86.671988l0-1.978051C735.43021 457.95992433333333 696.533318 419.05893933333334 648.731616 419.05893933333334zM646.740262 562.5193053333333c-30.224372 0-54.810327-24.582885-54.810327-54.787814l0-1.978051c0-30.230512 24.584931-54.803163 54.810327-54.803163l1.991354 0c30.222325 0 54.810327 24.572652 54.810327 54.803163l0 1.978051c0 30.203906-24.586978 54.787814-54.810327 54.787814L646.740262 562.5193053333333zM91.097276 181.7900473333334l-22.748097 22.338774 274.373974 279.332916 22.750143-22.351054L91.097276 181.7900473333334zM604.886015 215.92242633333342L339.999113 480.74793033333333l22.548552 22.525016L627.433544 238.4638153333334 604.886015 215.92242633333342zM619.007641 202.70744933333333l-22.763446 22.337751 167.989015 171.035398 22.765493-22.350031L619.007641 202.70744933333333zM925.622924 222.7939273333334L758.534418 389.8343373333333l22.548552 22.529109 167.086459-167.044504L925.622924 222.7939273333334z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="link" unicode="" d="M262.4-121.60000000000002c-64 0-128 25.6-179.2 76.8-102.4 102.4-102.4 262.4 0 364.8l134.4 134.4 89.6-89.6-134.4-134.4c-51.2-51.2-51.2-128 0-179.2 51.2-51.2 128-51.2 179.2 0l179.2 179.2c25.6 25.6 38.4 57.6 38.4 89.6S556.8 384 537.6 409.6L467.2 473.6l89.6 89.6 70.4-70.4C672 448 697.6 384 697.6 313.6c0-70.4-25.6-134.4-76.8-179.2l-179.2-179.2C396.8-96 326.4-121.60000000000002 262.4-121.60000000000002zM467.2 204.79999999999995L396.8 268.79999999999995c-102.4 102.4-102.4 262.4 0 364.8l179.2 179.2c102.4 102.4 262.4 102.4 364.8 0 102.4-102.4 102.4-262.4 0-364.8l-134.4-134.4-89.6 89.6 134.4 134.4c51.2 51.2 51.2 128 0 179.2-51.2 51.2-134.4 51.2-179.2 0L486.4 544c-51.2-51.2-51.2-128 0-179.2l70.4-70.4L467.2 204.79999999999995z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="diamond" unicode="" d="M998.4 526.933333L797.866667 802.133333c-4.266667 6.4-12.8 10.666667-19.2 10.666667L243.2 812.8c0 0-14.933333-2.133333-23.466667-17.066667C194.133333 753.066667 32 512 32 512L21.333333 494.933333l12.8-14.933333L469.333333-27.733333000000016c4.266667-4.266667 6.4-6.4 10.666667-8.533333 6.4-4.266667 32-10.666667 46.933333 0 4.266667 2.133333 6.4 6.4 10.666667 8.533333l409.6 420.266667c10.666667 8.533333 10.666667 25.6 0 34.133333-8.533333 10.666667-23.466667 10.666667-32 0L561.066667 61.86666700000001l153.6 422.4 0 0 251.733333 0c2.133333 0 19.2 0 23.466667 4.266667l2.133333 2.133333C1004.8 497.066667 1006.933333 512 998.4 526.933333zM782.933333 763.733333l-96-226.133333L341.333333 537.6l-85.333333 226.133333L782.933333 763.733333zM221.866667 714.666667l72.533333-179.2-192 0L221.866667 714.666667zM91.733333 488.533333l215.466667 0 138.666667-416L91.733333 488.533333zM503.466667 44.799999999999955l-147.2 443.733333 307.2 0L503.466667 44.799999999999955zM736 535.4666669999999L810.666667 701.866667l119.466667-168.533333L736 533.333333z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="log" unicode="" d="M828.01742 700.357158C743.476979 784.899646 631.076002 831.458031 511.516999 831.458031c-119.55798 0-231.959979-46.558385-316.500421-131.09985C110.47716 615.81774 63.918775 503.41574 63.918775 383.85776c0-87.103824 25.045419-171.548074 72.429613-244.204861 9.393951-14.402011 28.685319-18.46249 43.087331-9.071609 14.404058 9.393951 18.46556 28.685319 9.072633 43.089377-40.768519 62.511729-62.317301 135.194098-62.317301 210.187093 0 212.469066 172.85586 385.326972 385.325949 385.326972s385.325949-172.857906 385.325949-385.326972-172.85586-385.326972-385.325949-385.326972c-70.357418 0-139.188062 19.131733-199.052498 55.323003-14.71412 8.900717-33.856086 4.180206-42.753733-10.534937-8.896624-14.71719-4.180206-33.856086 10.534937-42.753733 69.584821-42.070164 149.556201-64.307631 231.271294-64.307631 119.559003 0 231.959979 46.558385 316.500421 131.09985 84.539418 84.539418 131.097804 196.941418 131.097804 316.499397S912.556838 615.81774 828.01742 700.357158zM494.28964 690.216193c-21.782096 0-39.397289-17.658172-39.397289-39.439244l0-283.524378c0-1.360997 0.358157-2.706645 0.493234-4.03285 2.020006-19.886933 18.959817-34.573423 39.379892-34.573423l0 0 0.146333 0.832971 223.590358 0c21.782096 0 39.438221 17.616216 39.438221 39.397289s-17.658172 39.397289-39.439244 39.397289L533.686928 408.273846l0 242.503103C533.686928 672.5580219999999 516.071735 690.216193 494.28964 690.216193z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="rate-solid" unicode="" d="M957.111079 492.519576c-3.927449 11.669784-14.447037 19.86442-26.723641 20.816095L647.68068 535.250796 540.183388 811.873997c-4.586458 11.803837-15.951297 19.579941-28.614711 19.579941s-24.02723-7.776104-28.614711-19.579941L375.458719 535.250796l-282.708803-21.915126c-12.276604-0.951675-22.796192-9.146311-26.723641-20.816095-3.927449-11.669784-0.50142-24.557302 8.701173-32.737612l217.547735-193.358823-67.980277-291.298436c-2.848884-12.20702 2.009773-24.919553 12.273535-32.114418 10.264784-7.195889 23.87271-7.42818 34.375925-0.586354l240.624313 156.709111 240.625336-156.709111c5.099135-3.320629 10.92891-4.974291 16.752546-4.974291 6.173606 0 12.342096 1.858324 17.623379 5.561669 10.263761 7.194866 15.122419 19.907399 12.273535 32.114418l-67.980277 291.299459L948.409906 459.781964C957.613522 467.962274 961.037505 480.849792 957.111079 492.519576z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="fonts-del" unicode="" d="M928 448l-143.616 0c-3.456 55.616-14.272 106.56-29.504 144.96C725.504 666.816 617.344 768 464.32 768L256 768l0-320L96 448C78.336 448 64 433.664 64 416S78.336 384 96 384L256 384l0-320 229.632 0c156.288 0 240.768 97.856 267.904 167.488C772.736 280.96000000000004 782.272 333.312 784.96 384L928 384C945.664 384 960 398.336 960 416S945.664 448 928 448zM349.376 711.488l63.936 0c35.712 0 251.84 27.968 266.944-263.488l-330.88 0L349.376 711.488zM439.296 120.51199999999994L349.376 120.51199999999994 349.376 382.528 349.376 384l330.88 0C665.344 113.98400000000004 467.968 120.51199999999994 439.296 120.51199999999994z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="unlink" unicode="" d="M150.336 767.6800000000001C133.44 762.304 124.16 744.3199999999999 129.472 727.488 131.2 722.1759999999999 134.208 717.44 138.304 713.664l122.624-122.432C270.208 576.192 289.92 571.52 304.96 580.736 320 590.0799999999999 324.672 609.7280000000001 315.456 624.832 312.832 629.056 309.184 632.64 304.96 635.264L182.336 757.696C175.168 765.44 164.672 769.216 154.304 767.6800000000001 152.96 767.808 151.552 767.808 150.336 767.6800000000001L150.336 767.6800000000001zM406.08 831.424c-13.696-4.48-22.72-17.6-22.016-32L384.064 672c0-17.664 14.336-32 32-32s31.872 14.336 31.872 32L447.936 799.424C448.256 817.088 434.304 831.6800000000001 416.64 832 414.464 832.064 412.16 831.808 410.048 831.424 408.704 831.552 407.296 831.552 406.08 831.424L406.08 831.424zM91.392 511.872C73.728 509.12 61.632 492.544 64.384 474.88 67.136 457.28 83.712 445.248 101.376 448L224 448C241.664 448 256 462.208 256 479.872s-14.336 32-32 32L101.376 511.872c-1.984 0.192-3.968 0.192-6.016 0C94.016 512 92.608 512 91.392 511.872L91.392 511.872zM795.456 320c-17.728-2.752-29.824-14.08-27.072-31.744 2.752-17.6 19.328-35.008 36.992-32.256L928 256c17.664 0 32 19.584 32 37.248S945.664 320 928 320l-122.624 0c-1.984 0.192-3.968 0.192-6.016 0-1.344 0.128-2.688 0.128-4.032 0L795.456 320zM598.272 127.42399999999998c-13.76-4.48-22.72-17.6-22.08-32L576.192-32c0-17.664 14.336-32 32-32S640-49.66399999999999 640-32l0 127.424c0.32 17.6-13.568 32.256-31.232 32.576-2.176 0.064-4.352-0.192-6.592-0.576-1.344 0.128-2.688 0.128-4.032 0L598.272 127.42399999999998zM726.272 191.67999999999995c-16.896-5.376-26.24-23.36-20.864-40.192 1.664-5.312 4.736-10.048 8.832-13.824l122.56-122.432c9.28-15.04 28.928-19.776 44.032-10.496 14.976 9.344 19.712 28.992 10.368 44.032-2.624 4.224-6.144 7.808-10.368 10.432l-122.56 122.432c-7.168 7.744-17.6 11.52-28.032 9.984-1.344 0.128-2.688 0.128-4.032 0L726.272 191.61599999999999zM339.968 28.03200000000004c-49.152 0-98.304 18.688-135.744 56.128-74.816 74.88-74.816 196.608 0 271.488l87.744 87.744c12.48 12.48 32.768 12.48 45.248 0s12.48-32.768 0-45.248L249.408 310.46400000000006c-49.92-49.856-49.92-131.136 0-180.992 49.856-49.856 131.136-49.856 180.992 0l87.744 87.744c12.48 12.48 32.768 12.48 45.248 0s12.48-32.768 0-45.248l-87.744-87.744C438.272 46.72000000000003 389.12 28.03200000000004 339.968 28.03200000000004zM702.144 323.712c-8.192 0-16.384 3.136-22.656 9.344-12.48 12.48-12.48 32.768 0 45.248l87.744 87.744c49.856 49.92 49.856 131.072 0 180.992-49.856 49.856-131.136 49.856-180.992 0L498.496 559.296c-12.48-12.48-32.768-12.48-45.248 0s-12.48 32.768 0 45.248l87.744 87.744c74.88 74.88 196.608 74.88 271.488 0 74.88-74.816 74.88-196.672 0-271.488l-87.744-87.744C718.528 326.784 710.336 323.712 702.144 323.712z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="fonts-clear" unicode="" d="M944.787709 197.20939699999997L857.081297 197.20939699999997 741.092979-127.73993700000005 815.146059-127.73993700000005 832.440281-65.58476199999996 966.82809-65.58476199999996 984.512408-127.73993700000005 1062.011328-127.73993700000005 944.787709 197.20939699999997 944.787709 197.20939699999997ZM848.04409 1.1865400000000363L898.951519 153.25866699999995 949.923963 1.1865400000000363 848.04409 1.1865400000000363 848.04409 1.1865400000000363ZM210.238376 489.910857L183.386821 513.121524 12.46009 313.522794C-5.874386 292.652698-3.728862 260.989968 17.271265 242.720508 38.401424 224.45104800000001 70.454249 226.66158700000005 88.853741 247.53168300000004L100.361551 260.599873C106.603075 267.55657099999996 117.200662 268.20673 124.287392 262.22527 131.309106 256.048762 132.024281 245.51619000000005 125.912789 238.55949199999998 107.448281 217.62438099999997 98.085995 173.08850800000005 119.216154 154.81904799999995 140.281297 136.614603 183.841932 151.76330199999995 202.371455 172.69841299999996 208.417932 179.525079 219.145551 180.30526999999995 226.167265 174.19377799999995 233.188979 168.14730199999997 233.904154 157.61473 227.792662 150.65803200000005 209.328154 129.85295199999996 199.965868 85.05701599999998 221.096027 66.91758700000003 242.16117 48.648127000000045 285.656789 63.86184100000003 304.186313 84.666921 310.362821 91.62361899999996 321.025424 92.40381000000002 327.982122 86.29231700000003 335.068852 80.18082500000003 335.784027 69.71326999999997 329.672535 62.75657100000001 311.143011 41.82146 301.845741-2.9094599999999673 322.910884-20.983873000000017 344.041043-39.253333 387.601678-24.039619000000016 406.00117-3.234540000000038 412.177678 3.7221590000000333 422.840281 4.437332999999967 429.927011-1.6091430000000173 436.948725-7.720635000000016 437.598884-18.31822199999999 431.487392-25.144889000000035 413.022884-46.08000000000004 403.725614-90.81092100000001 424.790757-109.01536499999997 445.920916-127.15479400000004 477.973741-125.00927000000001 496.373233-104.20419000000004L667.299963 95.52457100000004 658.652852 132.90869799999996 210.238376 489.910857 210.238376 489.910857ZM844.013106 329.516698L680.10809 471.12127 929.639011 715.190857C933.2799 718.376635 936.725741 721.562413 939.976535 725.203302 977.815773 768.048762 973.524725 833.129651 930.28917 870.513778 887.183646 907.702857 821.58263 903.281778 783.808408 860.631365L783.483328 860.761397 564.249805 571.3107299999999 399.824662 713.56546C385.391138 726.113524 363.480789 724.553143 350.867709 710.249651L248.14263 593.871238 225.322059 567.994921 251.393424 545.434413 695.7119 161.25561900000002 726.26936 136.679619 847.328916 281.014857C859.941995 295.318349 858.44663 316.96863499999995 844.013106 329.516698L844.013106 329.516698ZM817.941741 830.724063C839.136916 854.779937 876.000916 857.315556 900.186821 836.250413 924.372725 815.380317 926.908344 778.906413 905.648154 754.85054 884.452979 730.924698 847.588979 728.389079 823.403075 749.3892060000001 799.21717 770.324317 796.811582 806.798222 817.941741 830.724063L817.941741 830.724063ZM765.473932 758.491429C768.919773 741.522286 777.6319 725.593397 791.80536 713.305397 806.043836 701.017397 823.533106 694.580825 841.087392 693.540571L643.634186 494.526984 593.116852 538.2176509999999 765.473932 758.491429 765.473932 758.491429ZM776.006503 299.739429L709.755328 219.314794 307.502122 566.369524 376.809043 645.03873C382.920535 651.865397 393.38809 652.5155560000001 400.409805 646.534095L774.381106 323.01511100000005C781.337805 317.098667 782.117995 306.69612700000005 776.006503 299.739429L776.006503 299.739429Z" horiz-adv-x="1063" />
+
+
+ <glyph glyph-name="triangle-r" unicode="" d="M293.291 728.256l426.88-355.456-426.88-355.52z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="circle" unicode="" d="M511.998 847.999C255.739 847.999 48 640.26 48 383.999c0-256.258 207.739-463.998 463.998-463.998C768.261-79.99900000000002 976 127.74199999999996 976 383.999 976 640.26 768.261 847.999 511.998 847.999zM512.002-16.000999999999976c-220.915 0-400.002 179.088-400.002 400 0 220.917 179.086 400 400.002 400 220.912 0 399.998-179.083 399.998-400C912 163.087 732.914-16.000999999999976 512.002-16.000999999999976z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="radio" unicode="" d="M512.5 383.5m-192 0a192 192 0 1 1 384 0 192 192 0 1 1-384 0ZM511.998 847.999C255.739 847.999 48 640.26 48 383.999c0-256.258 207.739-463.998 463.998-463.998C768.261-79.99900000000002 976 127.74199999999996 976 383.999 976 640.26 768.261 847.999 511.998 847.999zM512.002-16.000999999999976c-220.915 0-400.002 179.088-400.002 400 0 220.917 179.086 400 400.002 400 220.912 0 399.998-179.083 399.998-400C912 163.087 732.914-16.000999999999976 512.002-16.000999999999976z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="align-center" unicode="" d="M992 448L32 448C14.32 448 0 462.336 0 480 0 497.664 14.32 512 32 512L992 512C1009.68 512 1024 497.664 1024 480 1024 462.336 1009.68 448 992 448ZM800 704C817.664 704 832 689.664 832 672 832 654.336 817.664 640 800 640L224 640C206.32 640 192 654.336 192 672 192 689.664 206.32 704 224 704L800 704ZM992 832L32 832C14.32 832 0 846.336 0 864 0 881.664 14.32 896 32 896L992 896C1009.68 896 1024 881.664 1024 864 1024 846.336 1009.68 832 992 832ZM224 256C206.32 256 192 270.336 192 288 192 305.664 206.32 320 224 320L800 320C817.664 320 832 305.664 832 288 832 270.336 817.664 256 800 256L224 256ZM32 128L992 128C1009.68 128 1024 113.66399999999999 1024 96 1024 78.33600000000001 1009.68 64 992 64L32 64C14.32 64 0 78.33600000000001 0 96 0 113.66399999999999 14.32 128 32 128ZM224-64L800-64C817.664-64 832-78.33600000000001 832-96 832-113.66399999999999 817.664-128 800-128L224-128C206.32-128 192-113.66399999999999 192-96 192-78.33600000000001 206.32-64 224-64Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="align-right" unicode="" d="M992 64L32 64C14.32 64 0 78.33600000000001 0 96 0 113.66399999999999 14.32 128 32 128L992 128C1009.68 128 1024 113.66399999999999 1024 96 1024 78.33600000000001 1009.68 64 992 64ZM992 256L288 256C270.32 256 256 270.336 256 288 256 305.664 270.32 320 288 320L992 320C1009.68 320 1024 305.664 1024 288 1024 270.336 1009.68 256 992 256ZM992 448L32 448C14.32 448 0 462.336 0 480 0 497.664 14.32 512 32 512L992 512C1009.68 512 1024 497.664 1024 480 1024 462.336 1009.68 448 992 448ZM992 640L288 640C270.32 640 256 654.336 256 672 256 689.664 270.32 704 288 704L992 704C1009.68 704 1024 689.664 1024 672 1024 654.336 1009.68 640 992 640ZM992 832L32 832C14.32 832 0 846.336 0 864 0 881.664 14.32 896 32 896L992 896C1009.68 896 1024 881.664 1024 864 1024 846.336 1009.68 832 992 832ZM288-64L992-64C1009.68-64 1024-78.33600000000001 1024-96 1024-113.66399999999999 1009.68-128 992-128L288-128C270.32-128 256-113.66399999999999 256-96 256-78.33600000000001 270.32-64 288-64Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="align-left" unicode="" d="M992 448L32 448C14.336 448 0 462.336 0 480 0 497.664 14.336 512 32 512L992 512C1009.664 512 1024 497.664 1024 480 1024 462.336 1009.664 448 992 448ZM32 704L736 704C753.68 704 768 689.664 768 672 768 654.336 753.68 640 736 640L32 640C14.336 640 0 654.336 0 672 0 689.664 14.336 704 32 704ZM992 832L32 832C14.336 832 0 846.336 0 864 0 881.664 14.336 896 32 896L992 896C1009.664 896 1024 881.664 1024 864 1024 846.336 1009.664 832 992 832ZM32 320L736 320C753.68 320 768 305.664 768 288 768 270.336 753.68 256 736 256L32 256C14.336 256 0 270.336 0 288 0 305.664 14.336 320 32 320ZM32 128L992 128C1009.664 128 1024 113.66399999999999 1024 96 1024 78.33600000000001 1009.664 64 992 64L32 64C14.336 64 0 78.33600000000001 0 96 0 113.66399999999999 14.336 128 32 128ZM32-64L736-64C753.68-64 768-78.33600000000001 768-96 768-113.66399999999999 753.68-128 736-128L32-128C14.336-128 0-113.66399999999999 0-96 0-78.33600000000001 14.336-64 32-64Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="loading-1" unicode="" d="M537.574469 831.696462c-14.123672 0-25.574469-11.447726-25.574469-25.574469 0-14.123672 11.450796-25.574469 25.574469-25.574469 204.495464 0 370.82877-166.358889 370.82877-370.82877 0-14.123672 11.450796-25.574469 25.574469-25.574469 14.123672 0 25.574469 11.450796 25.574469 25.574469C959.551152 642.385838 770.241552 831.696462 537.574469 831.696462z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="return" unicode="" d="M927.858848 417.938973L168.863431 417.938973l308.721247 308.86758c11.685133 11.69025 11.435447 30.881334-0.557702 42.868343-11.992125 11.985986-31.18321 12.226462-42.868343 0.536212L75.199191 411.071565c-1.994424-1.662873-3.773953-3.583618-5.294586-5.713119-4.047176-5.373381-6.013971-11.839653-5.9055-18.328437-0.12996-7.794523 2.725064-15.561417 8.595772-21.432125l361.565802-361.744881c11.685133-11.691273 30.876218-11.449773 42.868343 0.535189 11.993149 11.985986 12.242835 31.17707 0.557702 42.868343L168.441828 356.54571799999997l759.417019 0c16.527418 0 29.925566 13.738909 29.925566 30.694069S944.386266 417.938973 927.858848 417.938973z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="fonts-strong" unicode="" d="M199.092919 848.487893l355.326704 0c70.335928 0 122.780371-2.942005 157.349701-8.809643 34.568307-5.884011 65.491597-18.131963 92.78522-36.759205 27.27725-18.627243 50.01409-43.427068 68.209498-74.397431 18.195408-30.986735 27.293623-65.699328 27.293623-104.169501 0-41.7161-11.17655-79.977519-33.496905-114.802676s-52.604078-60.951187-90.818425-78.362742c54.075593-15.765055 95.647407-42.626843 124.715443-80.585363s43.602054-82.58388 43.602054-133.877103c0-40.388872-9.417487-79.673597-28.220738-117.839849-18.803251-38.182624-44.482097-68.673056-77.035514-91.489714-32.55444-22.833031-72.702835-36.855396-120.414487-42.09984-29.931706-3.229554-102.122889-5.260817-216.572524-6.060019L199.092919-40.765192999999954 199.092919 848.487893zM378.171504 700.1084940000001l0-205.684546 117.64849 0c69.935816 0 113.410979 1.006933 130.390699 3.038196 30.730908 3.629667 54.891168 14.246469 72.478731 31.850405 17.588587 17.588587 26.381857 40.756239 26.381857 69.473281 0 27.501354-7.594979 49.838082-22.75219 67.042929-15.158235 17.188474-37.702694 27.597545-67.618027 31.242562-17.796318 2.01489-68.945255 3.038196-153.431461 3.038196L378.171504 700.109518zM378.171504 346.04454999999996l0-236.383732 166.622902 0c64.85203 0 106.008382 1.807159 123.43631 5.420453 26.750247 4.828982 48.543599 16.58063 65.363683 35.272341s25.247011 43.714617 25.247011 75.085092c0 26.526143-6.491855 49.03888-19.459191 67.538209-12.983709 18.48398-31.722492 31.961946-56.250118 40.404222s-77.739549 12.663414-159.619394 12.663414L378.171504 346.04454999999996z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="upload" unicode="" d="M831.488 478.208C831.488 478.208 831.488 478.208 831.488 478.208c0 143.36-114.688 258.048-253.952 258.048-98.304 0-184.32-57.344-225.28-139.264C327.68 605.184 307.2 609.28 286.72 609.28c-90.112 0-159.744-73.728-159.744-159.744 0-16.384 4.096-28.672 8.192-40.96C57.344 379.904 0 310.27200000000005 0 224.25599999999997c0-106.496 86.016-192.512 192.512-192.512l192.512 0 0 192.512L258.048 224.25599999999997l258.048 258.048 258.048-258.048-126.976 0 0-192.512 192.512 0L839.68 35.84000000000003c106.496 16.384 192.512 110.592 192.512 221.184C1024 371.712 937.984 465.92 831.488 478.208z" horiz-adv-x="1033" />
+
+
+ <glyph glyph-name="dialogue" unicode="" d="M998.4 500.992C998.4 682.24 811.392 829.696 581.632 829.696c-121.216 0-235.904-41.472-315.264-114.048 37.504 8.192 76.416 13.056 115.456 14.464 59.264 30.592 128.256 46.72 199.808 46.72 198.144 0 359.296-123.776 359.296-275.968 0-31.872-7.04-63.232-20.992-93.056 7.552-28.16 11.264-57.344 11.008-86.528C975.104 374.784 998.4 436.736 998.4 500.992L998.4 500.992zM442.368 398.72c-30.72 0-55.808-23.04-55.808-51.328s25.088-51.328 55.808-51.328 55.808 23.04 55.808 51.328S473.088 398.72 442.368 398.72zM243.328 398.72c-30.72 0-55.808-23.04-55.808-51.328s25.088-51.328 55.808-51.328 55.808 23.04 55.808 51.328C299.264 375.67999999999995 274.176 398.72 243.328 398.72zM641.28 398.72c-30.72 0-55.808-23.04-55.808-51.328s25.088-51.328 55.808-51.328 55.808 23.04 55.808 51.328S672.128 398.72 641.28 398.72zM442.368 677.888C212.608 677.888 25.6 530.432 25.6 349.312c0-179.968 173.696-296.192 332.544-321.664l60.8-78.336c5.632-7.424 14.464-11.008 23.296-11.008 8.832 0 17.792 3.712 23.424 11.008l60.8 78.464C685.312 53.24800000000005 859.008 169.47199999999998 859.008 349.44000000000005 859.136 530.432 672.128 677.888 442.368 677.888zM714.88 173.82399999999996c-52.224-45.184-124.288-77.952-197.376-89.6C503.168 81.91999999999996 490.112 74.24000000000001 481.28 62.72000000000003l-38.784-49.92-38.912 49.92c-8.96 11.52-21.888 19.2-36.224 21.504-73.216 11.776-145.152 44.416-197.376 89.728-39.68 34.304-86.912 92.544-86.912 175.36 0 69.76 35.584 136.192 100.352 187.264 68.736 54.144 160.768 84.096 258.944 84.096 98.304 0 190.336-29.824 259.072-84.096 64.768-51.072 100.352-117.504 100.352-187.264C801.664 266.36800000000005 754.56 208.12800000000004 714.88 173.82399999999996z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="video" unicode="" d="M952.523633 599.2477269999999L952.523633 599.2477269999999 952.523633 599.2477269999999zM100.53762400000005 661.054062C100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062zM100.74228 720.404517L100.74228 720.404517 100.74228 720.404517zM660.990107 739.9449716666666c8.697911 0 17.498151-0.511642 25.684421-2.353553 12.279404-2.865194 23.22854-8.18627 34.382332-16.679524 15.144599-11.460777 26.196063-29.572899 32.02878-52.187469 3.479165-13.405016 2.967523-28.651944 2.558209-42.05696-0.102328-4.195463-0.204657-8.083941-0.204657-11.665434l0-37.759169 101.407415 70.401919 25.479764 17.60048c0.511642 0.306985 1.330269 1.023284 2.148896 1.637254 4.40012 3.376836 11.051464 8.595583 20.977316 11.051464 3.274508 0.818627 6.549016 1.22794 10.02818 1.22794 9.618867 0 19.44239-3.274508 27.730987999999996-9.311882 18.82842-13.916657999999998 18.726092-35.405616 18.726092-51.061857 0-1.023284 0-2.148896 0-3.172179l0-409.620466c0-15.963226 0.102328-37.963825-19.647047-51.982812-6.753672-4.809433-16.679524-8.390926-27.219346-8.390926-5.01409 0-10.130509 0.818627-15.144599 2.762866-7.162986 2.762866-12.279404 6.856000999999999-16.065554 9.823524-0.920955 0.716299-1.841911 1.432597-2.353553 1.841911l-24.968122 17.395823-101.10043 70.094934 0-37.963825c0-3.581493 0.102328-7.367643 0.204657-11.460777 0.409313-14.735285 0.818627-29.982212-2.865194-43.796542-5.62806-21.488957999999997-16.679524-39.396423-31.107825-50.447886-7.879285-6.037374-18.930748-13.405016-34.075347-16.986509-7.776956-1.841911-16.167882-2.353553-24.45648-2.353553-4.297792 0-8.595583 0.102328-12.688718 0.204657-3.683821 0.102328-7.162986 0.204657-10.232837 0.204657L167.15339300000005 84.94107466666674c-1.944239 0-3.888478 0-5.832717 0-1.944239 0-3.990806 0-5.935045 0-16.577196 0-33.461377 0.61397-47.787349 6.549016-27.935644999999997 11.563106-46.764065 37.759169-53.006096 73.574098l-0.409313 2.251224 0 2.353553c-0.102328 18.930748-0.204657 37.861497-0.306985 56.792245l0 0.511642L53.87588699999998 598.0155226666666c0 4.40012-0.102328 8.902568-0.102328 13.712001999999998-0.306985 27.01469-0.716299 54.950335 9.311882 76.643949 9.823524 21.284300999999996 27.526331999999996 38.066154 48.708304 45.945438 5.730389 2.148896 11.051464 2.762866 15.04227 3.172179 1.023284 0.102328 2.353553 0.306985 3.069851 0.409313l4.093135 1.534926 500.9997 0c3.581493 0 7.572299 0.102328 11.767763 0.306985C651.166583 739.7403146666667 656.078345 739.9449716666666 660.990107 739.9449716666666M304.273409 266.7785886666668L559.889677 394.2797376666667l0 33.973019L304.273409 555.9585626666667 304.273409 266.7785886666668M660.990107 780.8763196666666c-5.62806 0-10.949136-0.204657-15.758569-0.306985-3.888478-0.102328-7.469971-0.204657-10.437494-0.204657L133.79434400000002 780.3646776666667l-7.265314 0-6.446687-2.353553c-5.3210749999999996-0.61397-13.609673-1.841911-22.716898-5.218747-31.210153-11.665434-57.303887-36.121915-71.629859-67.229739-13.814329999999998-30.084541-13.405016-64.159888-12.995703-94.244429 0.102328-4.604777 0.102328-9.004897 0.102328-13.20036l0-371.349655 0-0.102328 0-0.102328 0-0.511642c0.102328-18.930748 0.204657-37.861497 0.306985-56.792245l0-2.251224 0-3.479165 0.61397-3.376836 0.409313-2.251224c4.195463-23.944839 12.791046-45.126811 25.479764-62.727291 13.609673-18.82842 31.107825-32.847407 52.08514-41.545318 21.488957999999997-8.902568 44.001199-9.618867 63.443589-9.618867 2.046567 0 4.093135 0 6.139702 0 1.841911 0 3.78615 0 5.62806 0l473.166384 0c2.558209 0 5.62806-0.102328 9.004897-0.204657 4.195463-0.102328 8.902568-0.306985 13.916657999999998-0.306985 13.302688 0 24.149495 1.125612 33.973019 3.479165 22.819227 5.423404 39.089437 16.474868 49.322274 24.251824 21.693613999999997 16.577196 37.963825 42.363944999999994 45.84311 72.653143 2.251224 8.595583 3.376836 17.088838 3.990806 25.377436l36.838213-25.582093 24.558809-17.088838c0.306985-0.204657 0.61397-0.511642 0.920955-0.716299 4.809433-3.683821 13.609673-10.642149999999999 26.400719-15.656241 9.516538-3.683821 19.647047-5.62806 30.084541-5.62806 18.009793 0 36.53122799999999 5.832717 50.8572 15.963226 16.577196 11.767763 27.730987999999996 27.935644999999997 33.052064 48.094334 3.78615 14.4283 3.78615 27.628659999999996 3.78615 37.34985499999999l0 409.518137c0 0.920955 0 1.739582 0 2.660538l0 0.409313c0 9.41421 0.102328 22.409913-3.479165 36.53122799999999-5.116419 19.749375-15.758569 35.81493-31.721795 47.68502-15.144599 11.153792-33.666034 17.293495-52.08514 17.293495-6.753672 0-13.507345-0.818627-19.954032-2.455881-18.21445-4.604777-30.289198-13.916657999999998-36.019586-18.419107l0 0c-0.204657-0.204657-0.511642-0.409313-0.716299-0.511642l-25.172779-17.293495-0.102328 0-0.102328 0-37.14519799999999-25.786749c-0.511642 7.674628-1.637254 15.553912-3.683821 23.433197-8.18627 31.721795-24.354152 57.508544-46.866394 74.597382-15.758569 11.972419-32.02878 19.851704-49.833916 23.944839C685.8559009999999 779.7507076666667 674.702109 780.8763196666666 660.990107 780.8763196666666L660.990107 780.8763196666666zM345.204757 332.9850436666668L345.204757 489.75210666666663l157.074048-78.48586L345.204757 332.9850436666668 345.204757 332.9850436666668zM347.455981 429.177975L347.455981 308.02118499999995 347.455981 429.177975Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="headset" unicode="" d="M356.285031 2.1522690000000466L356.396571 2.1522690000000466 356.396571 285.236626 253.462201 285.236626 253.462201 2.1522690000000466ZM665.076886 285.236626l103.042841 0 0-283.08538-103.042841 0 0 283.08538ZM63.809793 301.950286c0-38.758746-3.195785-112.220874 5.457292-148.208507l65.735144 0c-10.112312 35.644825-7.747451 109.176538-7.747451 148.208507 0 219.937155 172.264389 398.231887 384.763131 398.231887 212.498742 0 384.763131-178.294732 384.763131-398.231887 0-39.031968 2.266623-112.563682-7.845689-148.208507l65.735144 0c8.653077 35.987632 5.555529 109.449761 5.555529 148.208507 0 256.20415-200.670346 463.898469-448.208115 463.898469C264.479115 765.848755 63.809793 558.1544349999999 63.809793 301.950286z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="cellphone-fine" unicode="" d="M731.514252 896L292.485748 896C195.323702 896 116.154627 816.830925 116.154627 719.6688790000001l0-671.337759c0-97.162046 79.169075-176.331121 176.331121-176.331121l438.628661 0c97.162046 0 176.331121 79.169075 176.331121 176.331121L907.445529 719.6688790000001C907.845373 816.830925 828.676298 896 731.514252 896zM292.485748 853.216712l438.628661 0c70.772355 0 128.349863-55.178446 133.147989-124.751269L159.737602 728.465443C164.135884 798.038266 222.113237 853.216712 292.485748 853.216712zM865.062085 48.73096399999997c0-73.571261-59.976572-133.547833-133.547833-133.547833L292.485748-84.816868c-73.571261 0-133.547833 59.976572-133.547833 133.547833l0 45.582194 705.724326 0L864.662241 48.73096399999997zM865.062085 137.096447L158.937915 137.096447 158.937915 685.682155l705.724326 0L864.662241 137.096447zM512-54.82858299999998c13.59469 0 26.789535 5.597813 36.385787 15.194065 9.596251 9.596251 15.194065 22.791097 15.194065 36.385787 0 13.59469-5.597813 26.789535-15.194065 36.385787-9.596251 9.596251-22.791097 15.194065-36.385787 15.194065-13.59469 0-26.789535-5.597813-36.385787-15.194065-9.596251-9.596251-15.194065-22.791097-15.194065-36.385787 0-13.59469 5.597813-26.789535 15.194065-36.385787C485.210465-49.23076900000001 498.40531-54.82858299999998 512-54.82858299999998z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="add-1" unicode="" d="M566.935 57.63900000000001c0-30.366-24.612-54.972-54.935-54.972v0c-30.384 0-54.996 24.612-54.996 54.972v610.057c0 30.361 24.612 54.972 54.996 54.972v0c30.33 0 54.935-24.612 54.935-54.972v-610.057zM817.004 417.633c30.384 0 54.996-24.606 54.996-54.966v0c0-30.354-24.612-54.966-54.996-54.966h-610.062c-30.33 0-54.942 24.612-54.942 54.966v0c0 30.359 24.612 54.966 54.942 54.966h610.062zM817.004 417.633z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="face-smile-b" unicode="" d="M511.931733-128c-136.738133 0-265.284267 53.213867-361.984 149.879467C53.282133 118.51093300000002 0 247.09119999999996 0 384c0 136.738133 53.282133 265.3184 150.050133 362.0864C246.749867 842.683733 375.296 896 512.136533 896s265.4208-53.316267 362.1888-149.9136c199.645867-199.714133 199.543467-524.5952 0-724.206933C777.454933-74.71786699999996 648.772267-128 511.931733-128L511.931733-128 511.931733-128 511.931733-128 511.931733-128 511.931733-128zM512.034133 829.303467c-118.920533 0-230.741333-46.2848-314.914133-130.389333C113.083733 614.8778669999999 66.7648 502.8864 66.7648 384c0-118.9888 46.2848-230.912 130.3552-315.016533 84.0704-84.0704 195.857067-130.321067 314.811733-130.321067 119.022933 0 230.946133 46.318933 315.016533 130.423467 173.704533 173.636267 173.704533 456.157867 0 629.794133C742.877867 782.984533 631.057067 829.303467 512.034133 829.303467L512.034133 829.303467 512.034133 829.303467 512.034133 829.303467 512.034133 829.303467 512.034133 829.303467zM330.103467 244.25813300000004c0 0 59.904-95.9488 181.828267-95.9488s201.8304 95.9488 201.8304 95.9488 45.294933 0.136533 45.192533-47.957333c0 0-78.506667-111.8208-247.022933-111.8208s-223.368533 111.8208-223.368533 111.8208S286.856533 244.25813300000004 330.103467 244.25813300000004L330.103467 244.25813300000004 330.103467 244.25813300000004 330.103467 244.25813300000004 330.103467 244.25813300000004zM363.2128 548.590933c-34.5088 0-62.702933-28.091733-62.702933-62.737067 0-34.679467 28.194133-62.6688 62.702933-62.6688 34.679467 0 62.702933 28.091733 62.702933 62.6688C425.915733 520.4992 397.858133 548.590933 363.2128 548.590933L363.2128 548.590933 363.2128 548.590933 363.2128 548.590933 363.2128 548.590933 363.2128 548.590933zM684.544 548.590933c-34.679467 0-62.702933-28.091733-62.702933-62.737067 0-34.679467 28.023467-62.6688 62.702933-62.6688 34.6112 0 62.600533 28.091733 62.600533 62.6688C747.144533 520.4992 719.121067 548.590933 684.544 548.590933L684.544 548.590933 684.544 548.590933 684.544 548.590933 684.544 548.590933 684.544 548.590933zM684.544 548.590933" horiz-adv-x="1025" />
+
+
+ <glyph glyph-name="fonts-html" unicode="" d="M194.33 416.235h-101.295v101.28h-46.035v-267.03h46.035v119.7h101.28v-119.7h46.035v267.03h-46.035v-101.28zM277.205 480.69h73.665v-230.205h46.035v230.205h73.665v36.825h-193.365v-36.825zM627.815 335.58000000000004l-46.755 181.935h-73.665v-267.03h46.035v211.785l46.035-211.785h55.245l46.83 213.93-0.795-213.93h46.035v267.03h-73.665l-45.3-181.935zM848.09 287.30999999999995v230.205h-46.035v-267.03h174.945v36.825h-128.91z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="screen-full" unicode="" d="M641.750109 511.899972l205.227128 204.519-0.704035-115.89966c-0.282433-9.611915 7.489578-18.09103 17.101493-17.808598l12.297071 0c9.611915 0.283456 17.667382 5.936199 17.808598 15.689331l0.565888 172.57752c0 0.14224 0.282433 9.187243 0.282433 9.187243 0.14224 4.804423-0.99056 9.187243-4.100388 12.297071-3.109828 3.109828-7.347339 5.086855-12.297071 4.946662l-8.763594-0.14224c-0.141216 0-0.278339 0-0.420579-0.14224L697.581696 797.833213c-9.611915-0.283456-17.667382-8.200776-17.808598-17.950837l0-12.297071c1.416256-11.44875 10.458189-18.092054 20.070104-17.808598l112.789832-0.283456-204.66124-203.814965c-9.329483-9.329483-9.329483-24.449855 0-33.778314 9.329483-9.470699 24.452925-9.470699 33.782408 0L641.750109 511.899972zM383.095141 319.11010699999997L177.726797 115.29411900000002l0.707105 115.338888c0.283456 9.607822-7.492648 18.086937-17.104563 17.808598l-13.001105 0c-9.611915-0.283456-17.667382-5.937223-17.808598-15.690354l-0.565888-172.718737c0-0.14224-0.282433-9.187243-0.282433-9.187243-0.14224-4.808516 0.99056-9.187243 4.096295-12.297071 3.109828-3.109828 7.351432-5.086855 12.297071-4.946662l8.762571 0.14224c0.14224 0 0.283456 0 0.425695 0.14224l171.873486-0.708128c9.607822 0.283456 17.667382 8.196683 17.808598 17.950837L344.93503 63.42477399999996c-1.415232 11.44875-10.461259 18.092054-20.074198 17.808598L212.069977 81.51682800000003 416.59 285.32872299999997c9.329483 9.329483 9.329483 24.453948 0 33.782408C407.40685 328.58182999999997 392.424624 328.58182999999997 383.095141 319.11010699999997L383.095141 319.11010699999997zM894.047276 60.03251399999999l-0.424672 172.718737c-0.283456 9.612938-8.200776 15.406898-17.809621 15.690354l-12.296047 0c-9.612938 0.278339-17.243733-8.200776-17.105586-17.808598l0.708128-115.903753L641.750109 319.11010699999997c-9.329483 9.329483-24.452925 9.329483-33.782408 0-9.325389-9.328459-9.325389-24.452925 0-33.782408L812.490795 81.51682800000003l-112.789832-0.283456c-9.611915 0.283456-18.515702-6.502088-20.073174-17.808598l0-12.297071c0.282433-9.611915 8.200776-17.667382 17.808598-17.950837l171.166381 0.708128c0.141216 0 0.282433-0.14224 0.424672-0.14224l8.763594-0.14224c4.803399-0.141216 9.187243 1.694595 12.296047 4.946662 3.109828 3.109828 4.238534 7.488555 4.097318 12.297071 0 0-0.14224 9.046027-0.14224 9.187243L894.047276 60.03149099999996zM212.216309 749.493252l112.789832 0.283456c9.607822-0.283456 18.512632 6.502088 20.070104 17.808598L345.076246 779.883399c-0.283456 9.611915-8.196683 17.667382-17.808598 17.950837l-172.011632-0.708128c-0.14224 0-0.283456 0.14224-0.425695 0.14224l-8.761548 0.14224c-4.808516 0.141216-9.187243-1.694595-12.297071-4.946662-3.109828-3.109828-4.242627-7.488555-4.096295-12.297071 0 0 0.282433-9.046027 0.282433-9.187243l0.420579-172.718737c0.14224-9.608845 8.200776-15.406898 17.808598-15.686261l13.005198 0c9.611915-0.282433 17.242709 8.196683 17.10047 17.808598l-0.564865 115.334795 205.231221-203.958228c9.324366-9.329483 24.448832-9.329483 33.777291 0 9.329483 9.329483 9.329483 24.452925 0 33.782408L212.216309 749.493252 212.216309 749.493252zM212.216309 749.493252" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="form" unicode="" d="M314.278111 437.019389l395.439892 0 0-30.297458-395.439892 0L314.278111 437.019389zM314.278111 315.83495200000004l395.439892 0 0-30.297458-395.439892 0L314.278111 315.83495200000004zM314.278111 194.62833l263.626661 0 0-30.297458L314.278111 164.330872 314.278111 194.62833zM609.376235 739.9931730000001c-7.849678 42.966669-48.394988 75.742447-97.378777 75.742447-48.961604 0-89.51311-32.775778-97.380776-75.742447L116.55177 739.9931730000001l0-787.725922 790.893774 0 0 787.725922L609.376235 739.9931730000001zM446.091342 670.440529l0 17.613058 0 36.791056c0 33.410348 29.57295 60.594317 65.906116 60.594317 36.352353 0 65.907115-27.183969 65.907115-60.594317l0-36.791056 0-17.621053 16.672696-8.712493c32.358061-16.929922 57.169039-42.663874 71.406386-73.213161L358.043239 588.50688c14.240345 30.555683 39.051523 56.281241 71.408385 73.213161L446.091342 670.440529zM874.489888-17.436289999999985L149.505227-17.436289999999985 149.505227 709.694715 413.138884 709.694715l0-21.641327c-51.44492-26.923746-88.727643-74.124144-98.86377-129.845165l395.44289 0c-10.102151 55.730615-47.40466 102.921419-98.859773 129.845165l0 21.641327 263.631658 0L874.489888-17.436289999999985z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="cart" unicode="" d="M365.920994 84.618469c-39.030945 0-70.78516-31.754215-70.78516-70.78516s31.754215-70.784136 70.78516-70.784136c39.030945 0 70.784136 31.753191 70.784136 70.784136S404.951939 84.618469 365.920994 84.618469zM365.920994-5.784493999999995c-10.818393 0-19.61985 8.801457-19.61985 19.618826 0 10.818393 8.801457 19.61985 19.61985 19.61985s19.618826-8.801457 19.618826-19.61985C385.540843 3.015939000000003 376.739387-5.784493999999995 365.920994-5.784493999999995zM808.821219 84.618469c-39.030945 0-70.784136-31.754215-70.784136-70.78516s31.753191-70.784136 70.784136-70.784136 70.78516 31.753191 70.78516 70.784136S847.852164 84.618469 808.821219 84.618469zM808.821219-5.784493999999995c-10.81737 0-19.618826 8.801457-19.618826 19.618826 0 10.818393 8.801457 19.61985 19.618826 19.61985 10.818393 0 19.61985-8.801457 19.61985-19.61985C828.441069 3.015939000000003 819.640636-5.784493999999995 808.821219-5.784493999999995zM443.99107 305.940157c-14.057157-1.416256-24.305569-13.959943-22.890336-28.0171 1.328251-13.187347 12.446473-23.02132 25.423019-23.02132 0.856507 0 1.723248 0.042979 2.594081 0.130983l439.314561 44.245713c0.088004 0.007163 0.174985 0.01842 0.261966 0.026606l0.180102 0.01842c0.50449 0.051165 1.001817 0.119727 1.496074 0.198521 0.222057 0.035816 0.443092 0.076748 0.663102 0.11768 0.552585 0.103354 1.100054 0.217964 1.638313 0.355087 0.085958 0.022513 0.169869 0.047072 0.254803 0.069585 0.586354 0.156566 1.161453 0.334621 1.728364 0.530073 0.077771 0.026606 0.155543 0.051165 0.233314 0.078795 0.626263 0.222057 1.239224 0.469698 1.840928 0.737804 0.039909 0.017396 0.078795 0.035816 0.118704 0.054235 1.277086 0.577145 2.496867 1.252527 3.647063 2.020006 0.001023 0.001023 0.002047 0.001023 0.00307 0.002047 0.553609 0.369414 1.088798 0.76134 1.609661 1.170662 0.069585 0.054235 0.137123 0.10847 0.205685 0.163729 0.48607 0.38988 0.958838 0.795109 1.413186 1.218758 0.092098 0.084934 0.180102 0.173962 0.270153 0.25992 0.394996 0.378623 0.778736 0.76748 1.14815 1.169639 0.11154 0.121773 0.222057 0.243547 0.331551 0.367367 0.333598 0.3776 0.653893 0.766456 0.964978 1.163499 0.12382 0.158612 0.249687 0.314155 0.370437 0.475837 0.322341 0.432859 0.629333 0.876973 0.925069 1.329275 0.113587 0.173962 0.224104 0.348947 0.333598 0.525979 0.296759 0.479931 0.580215 0.968048 0.845251 1.467421 0.069585 0.130983 0.134053 0.265036 0.201591 0.397043 0.289596 0.568958 0.563842 1.147126 0.811482 1.738597 0.00307 0.007163 0.005117 0.014326 0.008186 0.021489 0.569982 1.369184 1.019213 2.796696 1.345648 4.26514 0 0.001023 0 0.002047 0.001023 0.00307l0.00307 0.013303c0.035816 0.162706 0.075725 0.323365 0.10847 0.487094l56.17951 252.734118c0.895393 4.030803 0.780783 8.04728-0.165776 11.794627 0.50449 2.003634 0.774643 4.101411 0.774643 6.261611 0 14.128789-11.452843 25.582655-25.582655 25.582655L195.47502 616.098125l-52.358485 159.553902c-3.631714 11.067057-14.093996 17.972327-25.177426 17.590634-0.207731 0.005117-0.413416 0.01535-0.62217 0.01535L54.663994 793.258011c-14.128789 0-25.582655-11.453866-25.582655-25.582655s11.453866-25.582655 25.582655-25.582655l45.614897 0 197.955514-603.235934c3.536546-10.776438 13.546527-17.613146 24.303522-17.613146 2.067079 0 4.16281 0.26299 6.245238 0.788969l567.583946 0c14.129812 0 25.582655 11.453866 25.582655 25.582655s-11.452843 25.582655-25.582655 25.582655L340.816223 173.1979 212.265428 564.933839l701.224666 0-48.137347-216.557174L443.99107 305.940157z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="camera-fill" unicode="" d="M512 480C436.515555 480 375.111111 419.712 375.111111 345.6 375.111111 271.48800000000006 436.515555 211.20000000000005 512 211.20000000000005 587.484446 211.20000000000005 648.888887 271.48800000000006 648.888887 345.6 648.888887 419.712 587.484446 480 512 480M512 172.79999999999995C414.808889 172.79999999999995 336 250.15679999999998 336 345.6 336 441.0432 414.808889 518.4 512 518.4 609.210667 518.4 688 441.0432 688 345.6 688 250.15679999999998 609.210667 172.79999999999995 512 172.79999999999995M903.111113 691.2L723.767113 691.2C713.383113 691.2 703.448887 695.2512 696.115554 702.4512L640.792887 756.7488C633.459554 763.9488 623.505779 768 613.141333 768L512 768 410.878222 768C400.494222 768 390.56 763.9488 383.226667 756.7488L327.904 702.4512C320.570667 695.2512 310.616889 691.2 300.252445 691.2L120.888889 691.2C77.866667 691.2 42.666667 656.64 42.666667 614.4L42.666667 76.79999999999995C42.666667 34.559999999999945 77.866667 0 120.888889 0L903.111113 0C946.133333 0 981.333333 34.559999999999945 981.333333 76.79999999999995L981.333333 614.4C981.333333 656.64 946.133333 691.2 903.111113 691.2" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="tabs" unicode="" d="M310.30303 523.636364L124.121212 523.636364c-17.128727 0-31.030303-13.901576-31.030303-31.030303l0-186.181818c0-17.128727 13.901576-31.030303 31.030303-31.030303l186.181818 0c17.128727 0 31.030303 13.901576 31.030303 31.030303L341.333333 492.606061C341.333333 509.734788 327.431758 523.636364 310.30303 523.636364zM294.787879 306.42424200000005L139.636364 306.42424200000005c-17.128727 0-15.515152-1.613576-15.515152 15.515152L124.121212 477.090909c0 17.128727-1.613576 15.515152 15.515152 15.515152l155.151515 0c17.128727 0 15.515152 1.613576 15.515152-15.515152l0-155.151515C310.30303 304.81066699999997 311.916606 306.42424200000005 294.787879 306.42424200000005zM418.909091 352.969697l480.969697 0 0 31.030303L418.909091 384 418.909091 352.969697zM418.909091 228.84848499999998l480.969697 0 0 31.030303L418.909091 259.878788 418.909091 228.84848499999998zM418.909091 89.21212100000002l480.969697 0 0 31.030303L418.909091 120.24242400000003 418.909091 89.21212100000002zM418.909091 492.606061l480.969697 0 0 31.030303L418.909091 523.636364 418.909091 492.606061zM992.969697 725.333333l-15.515152 0L977.454545 849.454545c0 17.128727-13.901576 31.030303-31.030303 31.030303L775.757576 880.484848c-17.128727 0-31.030303-13.901576-31.030303-31.030303l0-124.121212-139.636364 0L605.090909 849.454545c0 17.128727-13.901576 31.030303-31.030303 31.030303L403.393939 880.484848c-17.128727 0-31.030303-13.901576-31.030303-31.030303l0-124.121212-124.121212 0L248.242424 849.454545c0 17.128727-13.901576 31.030303-31.030303 31.030303L31.030303 880.484848C13.901576 880.484848 0 866.583273 0 849.454545l0-946.424242c0-17.128727 13.901576-31.030303 31.030303-31.030303l961.939394 0c17.128727 0 31.030303 13.901576 31.030303 31.030303L1024 694.30303C1024 711.431758 1010.098424 725.333333 992.969697 725.333333zM992.969697-65.939394c0-17.128727-13.901576-31.030303-31.030303-31.030303L62.060606-96.969697c-17.128727 0-31.030303 13.901576-31.030303 31.030303L31.030303 818.424242c0 17.128727 13.901576 31.030303 31.030303 31.030303l124.121212 0c17.128727 0 31.030303-13.901576 31.030303-31.030303l0-124.121212 744.727273 0c17.128727 0 31.030303-13.901576 31.030303-31.030303L992.969697-65.939394z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="fonts-code" unicode="" d="M270 626c-12 12-32 12-44 0L9 409c-12-12-12-32 0-44l217-217c6-6 14-9 22-9s16 3 22 9c12 12 12 32 0 44L75 387 270 582C282 595 282 614 270 626zM1015 409L798 626c-12 12-32 12-44 0-12-12-12-32 0-44l195-195L754 192c-12-12-12-32 0-44 6-6 14-9 22-9s16 3 22 9l217 217C1027 377 1027 397 1015 409zM624 696L624 696c-16 6-34-3-40-19L382 119c-6-16 2-34 19-40l0 0c16-6 34 3 40 19l202 558C648 672 640 690 624 696z" horiz-adv-x="1025" />
+
+
+ <glyph glyph-name="fire" unicode="" d="M890.059904 352.19948999999997C845.890699 458.956706 840.554889 548.4951550000001 857.396326 618.42714 859.144623 625.686731 860.991676 631.9776790000001 862.858846 637.425182 863.763607 640.064841 865.906573 645.659889 866.16406 646.532651L880.890349 696.448108 833.062903 675.9309969999999C832.106692 675.5208 830.618069 674.894716 827.426684 673.550492 824.667648 672.380966 822.310677 671.354022 819.868514 670.244809 813.291441 667.2575449999999 807.049466 664.090938 800.697749 660.4128450000001 784.089623 650.795565 768.486253 638.656896 753.86285 623.033596 727.630498 595.007563 706.526618 557.766355 691.78157 509.713231 675.041103 455.157161 671.516484 411.46006 673.004574 347.939834 673.477918 327.73476900000003 673.463923 322.197583 672.83965 318.324215 673.779618 324.156339 684.455526 333.67819899999995 696.104608 329.19567600000005 693.056849 330.36844199999996 685.695898 339.012828 676.314007 361.368339 660.550914 398.92921 646.834249 460.170272 636.817284 549.350468 625.445924 650.588768 630.103925 734.7280519999999 644.646978 801.338628 647.677924 815.221065 650.899934 827.082435 654.086773 836.904609 655.91465 842.538316 657.254607 846.094657 657.880284 847.554385L678.645286 896 628.243642 880.578031C617.409833 877.263087 599.94569 869.52239 578.105438 855.845223 542.547644 833.577626 507.199569 802.385036 474.400401 760.836776 447.596676 726.883228 423.611383 687.30061 403.118547 641.7016189999999 378.907516 587.829195 363.003277 542.798944 353.158029 503.238462 349.274261 487.632585 346.433259 473.323627 344.1945 458.925156 343.334411 453.39353 342.592734 448.063234 341.804612 441.911844 341.502524 439.553997 340.356619 430.329551 340.073506 428.145504 337.596047 409.033293 335.848224 404.35337 329.235273 398.312868 336.081933 404.566848 343.232634 404.098227 346.608002 402.086756 344.852318 403.133013 341.598345 406.493651 337.991853 411.887149 327.030897 428.279226 317.980358 454.883162 313.690598 489.339595 311.250185 508.941598 310.203772 539.08627 310.370048 576.545325 310.480474 601.422138 311.113088 628.122479 312.099068 654.977888 312.481453 665.393013 312.891081 675.105466 313.30045 683.8491750000001 313.545346 689.079919 313.735044 692.813105 313.84201 694.783403L317.55517 763.179488 271.360516 712.604139C270.467691 711.626645 268.852992 709.837042 266.618705 707.326295 262.927895 703.178805 258.823678 698.493751 254.407949 693.3614689999999 241.78797 678.693606 229.164348 663.340425 217.341267 648.004036 211.724185 640.717803 206.411389 633.591345 201.450577 626.6638379999999 176.017063 591.147305 156.617347 555.4025280000001 138.122768 512.155497 90.841957 401.595812 76.97672 299.64870599999995 99.261816 188.13489300000003 126.80821 50.29373899999996 188.553235-37.64422200000001 278.8297-84.690336 344.19104-118.75233700000001 408.837235-128 507.940695-128 525.713007-128 557.977207-125.567138 590.857378-120.46215900000004 641.152493-112.65333099999998 687.496192-99.78932299999997 726.063273-80.59104400000001 738.155853-74.57148800000004 743.07901-59.88870199999997 737.059454-47.79612199999997 731.039898-35.70354299999997 716.357111-30.780384000000026 704.264531-36.79993999999999 670.855859-53.43041900000003 629.092954-65.02289699999994 583.352478-72.12456999999995 552.984316-76.83953499999996 523.228215-79.08327499999996 507.940695-79.08327499999996 416.16215-79.08327499999996 357.934257-70.75375399999996 301.436271-41.310745999999995 224.830174-1.3887230000000272 171.977796 73.88423 147.230072 197.72094500000003 126.99711 298.965952 139.514783 391.004811 183.099329 492.921284 200.282663 533.1021499999999 218.020237 565.784358 241.22153 598.183718 245.831691 604.6215589999999 250.802959 611.289899 256.082244 618.137961 267.31885 632.713596 279.402035 647.409487 291.488864 661.457681 298.732051 669.8762429999999 304.338773 676.1767130000001 307.478705 679.614406L264.997214 697.435142C264.883874 695.347445 264.688038 691.493511 264.43725 686.13688 264.020474 677.234965 263.603959 667.359281 263.215279 656.7726250000001 262.21142 629.430212 261.566827 602.224414 261.453805 576.7624579999999 261.278897 537.3588179999999 262.385015 505.49418 265.148621 483.296209 276.058157 395.668083 322.627019 326.024497 362.226031 362.19561799999997 379.341732 377.829698 384.756649 392.328523 388.584361 421.857186 397.932742 493.974714 407.332926 531.746825 447.736538 621.64966 466.587287 663.594818 488.484326 699.731218 512.795234 730.526996 542.034492 767.565749 573.156162 795.028785 604.068111 814.386984 614.696751 821.043029 624.472062 826.201428 633.124687 830.036563 638.02329 832.207788 641.258688 833.404991 642.556233 833.802016L612.91959 866.825663C608.658554 856.884484 602.686705 838.478616 596.856038 811.772799 581.186705 740.003594 576.231674 650.498985 588.206246 543.890345 607.295279 373.94226100000003 638.819345 298.82556999999997 678.537329 283.542234 701.302332 274.78234499999996 717.731637 289.43566899999996 721.133156 310.5407 722.475759 318.870999 722.489387 324.26340300000004 721.907881 349.08549100000005 720.532565 407.791853 723.691247 446.952173 738.546223 495.36355 751.151827 536.44438 768.544047 567.135763 789.576147 589.605967 809.230566 610.60429 821.725461 617.839716 852.347733 630.9761169999999L842.705318 653.453557 819.246577 660.374464C822.235501 670.505564 813.450321 644.87463 809.839253 629.8801189999999 790.647573 550.1890470000001 796.611315 450.1135 844.8591 333.498332 883.105728 241.056017 874.587669 126.06492400000002 824.002925 61.39712899999995 815.680378 50.75754500000005 817.558709 35.38570000000004 828.198295 27.063153000000057 838.837879 18.740607999999952 854.209724 20.618939999999952 862.532269 31.258523999999966 924.762731 110.81426299999998 934.658528 244.404363 890.059904 352.19948999999997Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="set" unicode="" d="M466.496-126.62400000000002l-1.056 0.064c-25.184 2.08-47.456 22.368-51.744 47.232l-17.344 102.4c-0.672 4.064-6.624 11.04-10.56 12.416l-30.336 12.416c-5.44 2.496-15.424 0.8-17.472-0.64l-84.992-60.16c-19.584-14.016-51.456-12.736-70.08 3.168l-64.288 64c-17.952 20.48-19.488 50.592-4.736 71.296l60.416 84.672c2.176 3.072 2.784 11.52 1.024 15.04l0 0c0 0-1.664 3.104-7.264 16.608-6.176 14.848-6.816 17.44-6.816 17.44-0.992 3.04-7.456 8.672-11.36 9.376l-102.56 17.248c-25.152 4.288-45.44 26.624-47.168 52L0 428.288c2.112 27.36 22.496 49.6 47.52 53.728l102.528 17.344c4.128 0.672 11.008 6.56 12.416 10.496l12.608 30.336c2.368 4.992 1.6 14.112-0.8 17.504L113.984 642.24C99.36 662.88 100.704 692.896 117.056 712.192l64.416 64.224c20.672 18.208 51.296 18.784 71.36 4.64l84.992-60.16c1.952-1.376 13.28-2.016 15.04-1.056 0.384 0.192 2.528 1.344 16.704 7.168 14.24 5.92 16.576 6.592 16.576 6.592 3.84 1.184 9.504 7.648 10.144 11.424l17.44 102.4c4.32 25.152 26.752 45.376 52.128 47.104l90.528 0.064c27.328-2.112 49.632-22.368 53.952-47.232l17.344-102.432c0.672-4.064 6.656-11.04 10.624-12.48l30.304-12.352c6.24-2.784 15.456-0.8 17.44 0.608l85.024 60.16c19.52 14.016 51.392 12.704 70.08-3.136l64.288-64.032c17.952-20.48 19.456-50.56 4.736-71.264l-60.416-84.672c-2.208-3.136-2.848-11.616-1.056-15.04 0.16-0.352 1.376-2.56 7.232-16.672 5.856-14.112 6.592-16.512 6.592-16.512 1.248-4.032 7.712-9.6 11.648-10.304l102.56-17.248c25.152-4.224 45.44-26.592 47.168-52l0.096-90.304c-2.112-27.392-22.528-49.6-47.552-53.728l-102.528-17.376c-4.128-0.672-10.944-6.496-12.32-10.432l-12.736-30.432c-2.336-4.928-1.568-14.112 0.832-17.472l60.288-84.512c14.624-20.736 13.216-50.816-3.232-70.048l-64.192-64.096c-11.328-9.92-24.64-14.72-38.784-14.72l0 0c-11.904 0-23.52 3.552-32.704 10.016l-84.992 60.16c-1.952 1.408-13.312 2.016-15.072 1.056-0.288-0.16-2.432-1.312-16.608-7.2-14.08-5.792-16.384-6.496-16.384-6.496-4.16-1.28-9.792-7.776-10.432-11.52l-17.408-102.4c-4.352-25.152-26.72-45.344-52.032-47.104L466.496-126.62400000000002zM347.84 100.60799999999995c10.368 0 20.192-2.112 28.48-6.112l27.648-11.296c20.416-7.072 38.976-28.992 42.848-51.584l17.344-102.336c0.288-1.6 3.136-4.32 5.056-4.832l87.296 0.064c-0.032 0.064 3.04 2.944 3.328 4.672l17.408 102.368c3.872 22.656 23.328 44.832 45.28 51.584 0 0 0 0 0 0-0.096 0 2.976 1.152 12.448 5.056 9.472 3.936 12.384 5.248 13.12 5.568 18.208 9.6 49.44 8.032 67.776-4.96l84.928-60.16c0.192-0.128 1.312-0.64 3.104-0.64l0 0c2.048 0 3.52 0.672 3.872 0.96l61.536 61.408 0 0c-0.16 0 0.064 4.416-0.992 5.952l-60.224 84.448c-13.248 18.624-15.68 47.168-5.792 67.872l11.648 27.84c6.944 19.968 29.408 38.912 51.68 42.496l102.464 17.376c1.824 0.384 4.736 3.648 4.864 5.408L972.8 428.288l0 0c-0.096 0-2.88 3.072-4.576 3.424l-102.72 17.28c-23.168 4.032-44.896 22.976-51.776 45.056l0 0c-0.032 0-1.216 3.04-5.12 12.512-3.968 9.568-5.28 12.512-5.632 13.248-10.24 19.36-8.288 48.736 4.96 67.456L868.448 672c0.96 1.408 0.736 5.6-0.384 6.912l-61.408 61.184c0.704-0.8-0.768-0.192-2.848-0.192-1.728 0-2.784-0.416-3.008-0.576l-85.024-60.16c-17.824-12.8-47.776-15.36-68-5.664l-27.712 11.296c-20.512 7.2-39.04 29.088-42.88 51.584l-17.344 102.336c-0.288 1.76-3.616 4.704-5.504 4.864L467.616 843.52c0-0.064-3.104-2.944-3.392-4.672l-17.408-102.336c-3.84-22.624-23.264-44.8-45.216-51.584 0-0.032-3.008-1.184-12.416-5.088-9.568-3.936-12.512-5.248-13.248-5.568-17.984-9.568-49.344-8.032-67.744 4.992L223.264 739.36c-0.416 0.32-6.176 0.288-6.848-0.224L154.688 677.6320000000001c0 0 0 0 0 0 0.224 0 0.032-4.384 1.056-5.856L216 587.264c13.312-18.752 15.744-47.296 5.76-67.968l-11.52-27.648c-6.976-20.032-29.472-38.944-51.776-42.624L55.968 431.68c-1.824-0.384-4.704-3.648-4.832-5.408l0.096-86.56 0 0c0.096 0 2.912-3.104 4.608-3.424l102.656-17.28c23.04-4 44.704-22.912 51.712-44.928 0.256-0.736 1.44-3.84 5.088-12.64 3.68-8.832 5.024-11.84 5.472-12.736 10.592-20.288 8.672-48.96-4.672-67.904l-60.512-84.768c-0.96-1.408-0.736-5.632 0.384-6.912l61.408-61.184c-0.736 0.8 0.736 0.224 2.816 0.192 1.728 0 2.784 0.416 3.008 0.576l84.992 60.16C318.624 96.32000000000005 333.088 100.60799999999995 347.84 100.60799999999995zM512.032 133.856c-138.336 0-250.848 112.224-250.848 250.176 0 137.92 112.544 250.144 250.848 250.144s250.848-112.224 250.848-250.144C762.88 246.08000000000004 650.336 133.856 512.032 133.856zM512.032 583.136c-110.08 0-199.648-89.312-199.648-199.104s89.568-199.136 199.648-199.136 199.648 89.344 199.648 199.136S622.112 583.136 512.032 583.136z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="fonts-u" unicode="" d="M0-49.23076900000001L945.230769-49.23076900000001 945.230769-128 0-128 0-49.23076900000001ZM0 896L407.076943 896 407.076943 834.065644 319.153861 827.872177 299.076923 809.911217 299.076923 365.841959C299.076923 281.19796199999996 317.076716 220.709337 353.076933 184.37435100000005 389.077071 148.03936499999998 448.153442 129.87210800000003 530.307702 129.87210800000003 606.000364 129.87210800000003 660.807522 149.17482299999995 694.730752 187.78072599999996 728.653982 226.38662899999997 745.61536 289.66226700000004 745.61536 377.60953099999995L745.61536 804.956475 724.153817 826.633531 633.461524 834.065644 633.461524 896 955.384596 896 955.384596 834.065644 868.846119 826.633531 849.461563 804.956475 849.461563 364.60331299999996C849.461563 246.92743900000005 819.923338 161.66533900000002 760.846178 108.81441500000005 701.76894 55.96348999999998 606.462188 29.53846199999998 474.923087 29.53846199999998 406.153531 29.53846199999998 345.807951 38.51886300000001 293.884613 56.47990200000004 241.961275 74.44093999999996 201.230887 100.143419 171.692347 133.58820400000002 149.076834 160.01362700000004 133.038474 190.25793999999996 123.57695 224.32200899999998 114.115348 258.386078 109.384625 307.21047599999997 109.384625 370.796702L109.384625 809.911217 89.307687 827.872177 0 834.065644 0 896Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="triangle-d" unicode="" d="M773.128299 88.65234199999998M889.696178 575.195553L158.862147 575.195553 524.357446 209.64704300000005 889.696178 575.195553Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="tips" unicode="" d="M967.280184 578.537671c-24.915459 58.887178-60.544935 111.76755-105.96745 157.161413-45.393863 45.393863-98.273211 81.051991-157.160389 105.96745-60.988026 25.803689-125.735679 38.853913-192.494129 38.853913-66.729797 0-131.504056-13.0799-192.494129-38.853913-58.887178-24.916483-111.766526-60.544935-157.160389-105.96745-45.393863-45.393863-81.051991-98.274234-105.96745-157.161413-25.803689-60.988026-38.884612-125.734656-38.884612-192.464453s13.0799-131.50508 38.884612-192.464453c24.915459-58.887178 60.544935-111.737874 105.96745-157.161413 45.393863-45.393863 98.273211-81.051991 157.160389-105.96745 60.988026-25.803689 125.735679-38.853913 192.494129-38.853913 66.729797 0 131.504056 13.0799 192.494129 38.853913 58.887178 24.916483 111.766526 60.544935 157.160389 105.96745 45.393863 45.393863 81.051991 98.274234 105.96745 157.161413 25.803689 60.988026 38.853913 125.734656 38.853913 192.464453S993.084896 517.549645 967.280184 578.537671zM511.687892-55.138552000000004c-243.302305 0-441.241446 197.909465-441.241446 441.21177S268.385587 827.284989 511.687892 827.284989c243.273652-0.029676 441.210747-197.938118 441.210747-441.21177S754.990197-55.138552000000004 511.687892-55.138552000000004zM511.657192 573.565427m-45.511543 0a44.475 44.475 0 1 1 91.023086 0 44.475 44.475 0 1 1-91.023086 0ZM542.729885 184.14011300000004c0-17.162892-13.906731-31.071669-31.070646-31.071669l0 0c-17.163915 0-31.070646 13.907755-31.070646 31.071669L480.588593 426.998303c0 17.162892 13.906731 31.071669 31.070646 31.071669l0 0c17.163915 0 31.070646-13.907755 31.070646-31.071669L542.729885 184.14011300000004z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="picture" unicode="" d="M765.376 615.424c0 0 103.04 1.024 103.04-100.992 0 0 9.536-98.752-103.04-100.928 0 0-100.864-2.176-99.84 100.928C665.536 514.496 664.448 605.8879999999999 765.376 615.424ZM968.32 770.56c0 0 54.208-4.224 54.208-52.032l0-712.832c0 0-3.2-51.008-54.208-52.096L968.32 770.56ZM1.472 5.631999999999948c0 0 2.176-52.096 52.096-52.096L968.32-46.464000000000055l0 150.848-99.712 0-203.072 206.144-153.024-153.984L304.32 413.568l-205.056-307.072-45.632-1.024L52.48 718.4639999999999 1.472 718.4639999999999 1.472 5.631999999999948ZM968.32 770.56L53.568 770.56c0 0-52.096 1.088-52.096-52.032L968.32 718.528 968.32 770.56Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="more-vertical" unicode="" d="M511.998465 623.681848c40.525995 0 73.386404 35.771715 73.386404 79.892585s-32.860409 79.892585-73.386404 79.892585c-40.524972 0-73.384357-35.771715-73.384357-79.892585S471.47247 623.681848 511.998465 623.681848L511.998465 623.681848zM511.998465 463.893608c-40.524972 0-73.384357-35.772738-73.384357-79.893608 0-44.12087 32.859385-79.892585 73.384357-79.892585 40.525995 0 73.386404 35.772738 73.386404 79.892585C585.384869 428.12087 552.52446 463.893608 511.998465 463.893608L511.998465 463.893608zM511.998465 144.320199c-40.524972 0-73.384357-35.733852-73.384357-79.894631 0-44.119847 32.859385-79.893608 73.384357-79.893608 40.525995 0 73.386404 35.772738 73.386404 79.893608C585.383846 108.58634600000005 552.52446 144.320199 511.998465 144.320199L511.998465 144.320199z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="flag" unicode="" d="M878.368178 798.272211c-11.363815 4.799306-24.470321 2.360767-33.31578-6.245238-0.36532-0.350994-37.162388-35.304064-95.163383-56.05262-75.462692-26.993794-150.763702-18.409279-223.812415 25.517163-38.347376 23.060205-81.875752 40.665165-129.376603 52.327786-37.582967 9.228175-77.742619 14.777565-119.363552 16.496719-70.805626 2.925632-121.493052-6.224772-123.615389-6.615675-14.56574-2.682086-25.140587-15.380292-25.140587-30.191626L128.58047-31.312913999999978c0-16.954137 13.745049-30.699186 30.699186-30.699186s30.699186 13.745049 30.699186 30.699186L189.978842 266.68306099999995c15.562441 5.250584 47.994084 14.447037 91.40171 17.48728 35.985586 2.51938 72.440869 0.378623 108.35073-6.363941 44.847417-8.420787 89.059362-24.102954 131.409912-46.611597 46.26879-24.591071 93.776803-41.069371 141.203976-48.977481 38.270629-6.380314 76.541257-7.219425 113.740484-2.491751 64.277956 8.16803 103.877859 30.461779 105.532545 31.406291 9.56689 5.464455 15.471366 15.637142 15.471366 26.656103L897.089565 769.958352C897.091612 782.298402 889.73711 793.470859 878.368178 798.272211zM835.69324 257.496841c-14.58416-5.755074-38.82526-13.530155-70.319555-17.225313-30.990828-3.635807-62.940494-2.676969-94.952582 2.851954-40.201607 6.943133-80.731696 21.171182-120.464629 42.289152-48.455595 25.753547-99.208513 43.61945-150.848637 53.101405-29.29214 5.378497-58.896388 8.079002-88.407516 8.079002-12.228509 0-24.443715-0.464581-36.609803-1.39272-34.879392-2.663666-63.618946-8.741082-84.111676-14.355963L189.978842 766.569162c19.971867 2.003634 50.446949 3.910053 86.392626 2.334161 58.186214-2.554172 143.250588-15.041578 218.064504-60.029188 61.32674-36.877909 119.196753-49.491181 169.691797-49.488111 42.293245 0.002047 79.416747 8.854669 109.019972 19.711947 24.269753 8.901741 45.327348 19.747763 62.544475 30.179346L835.692217 257.496841z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="loading" unicode="" d="M511.999488 756.654348m-70.608128 0a69 69 0 1 1 141.216255 0 69 69 0 1 1-141.216255 0ZM236.047576 639.997442m-68.561515 0a67 67 0 1 1 137.123031 0 67 67 0 1 1-137.123031 0ZM125.530506 382.12428m-62.421678 0a61 61 0 1 1 124.843356 0 61 61 0 1 1-124.843356 0ZM227.861126 100.71507499999996m-54.235229 0a53 53 0 1 1 108.470457 0 53 53 0 1 1-108.470457 0ZM514.166851-16.84438799999998m-47.192835 0a46.118 46.118 0 1 1 94.385671 0 46.118 46.118 0 1 1-94.385671 0ZM804.730553 91.450061m-33.834596 0a33.064 33.064 0 1 1 67.669192 0 33.064 33.064 0 1 1-67.669192 0ZM935.55411 383.395226m-23.969924 0a23.424 23.424 0 1 1 47.939849 0 23.424 23.424 0 1 1-47.939849 0ZM856.723717 634.80007m-17.135262 0a16.745 16.745 0 1 1 34.270525 0 16.745 16.745 0 1 1-34.270525 0Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="fonts-i" unicode="" d="M897.948 834.255l0-64.322-128.65 0L447.674-1.9329999999999927l128.65 0 0-64.32L126.052-66.25300000000004l0 64.32 128.65 0 321.622 771.866-128.65 0L447.674 834.255 897.948 834.255z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="refresh-1" unicode="" d="M688.146 736l-192 128v-256l192 128.001zM496.146 767.7090000000001c-231.174-8.416-416-198.479-416-431.709 0-238.587 193.413-432 432-432 233.23 0 423.293 184.826 431.709 416h-64.05c-8.377-195.817-169.778-352-367.658-352-203.241 0-368 164.759-368 368 0 197.88 156.183 359.282 352 367.658v64.051z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="rmb" unicode="" d="M511.998465 896C229.23338 896 0.004605 666.769178 0.004605 384.001023c0-282.773272 229.227752-512.001023 511.99386-512.001023 282.769178 0 511.994883 229.227752 511.994883 512.001023C1023.994372 666.769178 794.767644 896 511.998465 896zM511.998465-91.59690499999999c-262.660188 0-475.589742 212.930577-475.589742 475.597929 0 262.663258 212.929554 475.594859 475.589742 475.594859 262.663258 0 475.590765-212.9316 475.590765-475.594859C987.590254 121.33469500000001 774.662747-91.59690499999999 511.998465-91.59690499999999zM738.742652 301.137781L544.432155 301.137781l0 69.780273 194.310497 0c17.835204 0 32.249495 14.43885 32.249495 32.220842 0 17.784038-14.414291 32.19526-32.249495 32.19526L589.7462 435.334155l149.620669 209.579249c8.916067 15.397688 3.63069 35.099403-11.82021 43.988864-15.398712 8.891508-35.097356 3.629667-44.017516-11.793604L512.187777 437.098335 340.84334 677.108664c-8.864902 15.423271-28.617781 20.685111-44.016493 11.793604-15.395642-8.889461-20.685111-28.590152-11.82021-43.988864l149.622716-209.579249L285.628808 435.334155c-17.781992 0-32.245402-14.411221-32.245402-32.19526 0-17.781992 14.46341-32.220842 32.245402-32.220842l194.310497 0 0-69.780273L285.628808 301.137781c-17.781992 0-32.245402-14.413268-32.245402-32.19526s14.46341-32.220842 32.245402-32.220842l194.310497 0 0-132.435265c0-17.780969 14.46341-32.19526 32.248472-32.19526 17.835204 0 32.245402 14.414291 32.245402 32.19526L544.433178 236.72065499999997l194.310497 0c17.835204 0 32.249495 14.43885 32.249495 32.220842S756.577856 301.137781 738.742652 301.137781" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="home" unicode="" d="M824.084343-40.42033900000001H232.898863c-74.604138 0-85.85232 28.334325-85.852321 49.997718l-0.584307 5.314029V447.645552h48.806589v-402.916582c0-25.547863 13.548574-36.343743 37.629015-36.343743h568.020898c25.928532 0 27.978215 6.220678 27.978215 37.84391V447.585177l48.806589 0.118704c0.022513-14.346753 0-382.76666 0-433.098999 0-38.130436-12.726859-54.765301-51.858088-54.765301l-1.76111-0.25992zM1012.470921 493.103884C849.773422 615.120868 687.101505 737.137853 524.404006 859.153814c-6.207375 4.659113-18.433838 4.659113-24.641213 0C337.077573 737.137853 174.393377 615.120868 11.696902 493.103884c-24.856108-18.635429-0.572028-61.044308 24.642236-42.13361A15995638.709915 15995638.709915 0 0 1 512.025071 807.737794c0.988514-0.715291 1.644453-1.144056 2.823302-2.037403 18.040888-13.524015 36.057217-27.036773 54.073546-40.560788 58.291614-43.718711 116.583229-87.437421 174.874843-131.143852 81.33647-61.008492 162.696476-122.015961 244.033969-183.024454 25.212218-18.911722 49.496298 23.497157 24.64019 42.132587z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="user" unicode="" d="M611.2 342.4c70.4 54.4 115.2 140.8 115.2 230.4 0 156.8-128 288-284.8 288s-284.8-128-284.8-284.8c0-92.8 44.8-182.4 115.2-236.8C108.8 272 0 105.60000000000002 0-80c0-9.6 9.6-19.2 19.2-19.2h848c9.6 0 19.2 9.6 19.2 19.2 0 188.8-112 355.2-275.2 422.4z m-576-396.8C44.8 115.20000000000005 156.8 268.79999999999995 320 320c6.4 3.2 12.8 9.6 12.8 16s-3.2 16-9.6 19.2c-76.8 41.6-128 131.2-128 224 0 134.4 112 246.4 246.4 246.4s246.4-112 246.4-249.6c0-89.6-51.2-176-128-220.8-6.4-3.2-9.6-9.6-9.6-19.2 0-6.4 6.4-12.8 12.8-16 160-51.2 275.2-204.8 281.6-377.6H35.2zM812.8 361.6c54.4 41.6 86.4 108.8 86.4 176 0 89.6-54.4 172.8-134.4 208-9.6 3.2-22.4 0-25.6-9.6-3.2-9.6 0-22.4 9.6-25.6 67.2-28.8 112-99.2 112-172.8 0-67.2-38.4-131.2-96-163.2-6.4-3.2-9.6-9.6-9.6-19.2 0-6.4 6.4-12.8 12.8-16 131.2-41.6 217.6-160 217.6-297.6 0-9.6 9.6-19.2 19.2-19.2s19.2 9.6 19.2 19.2c-3.2 140.8-86.4 262.4-211.2 320z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="notice" unicode="" d="M544 798.976V864h-64v-65.024C289.536 786.304 160 658.624 160 416v-288h64V416c0 192 115.456 320 288 320 180.544 0 288-128 288-320v-288h64V416c0 242.88-122.496 370.56-320 382.976zM672 64a160 160 0 1 0-320 0h64a96 96 0 0 1 192 0h64zM64 128h896v-64H64v64z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="login-weibo" unicode="" d="M411.270737 288.350316c-17.973895 7.504842-41.189053-0.229053-52.264421-17.542737-11.223579-17.394526-5.955368-38.103579 11.870316-46.201263 18.108632-8.232421 42.132211-0.417684 53.342316 17.421474C435.253895 260.05557899999997 429.446737 280.62989500000003 411.270737 288.350316zM455.545263 306.64757899999995c-6.885053 2.721684-15.508211-0.579368-19.550316-7.329684-3.920842-6.790737-1.751579-14.524632 5.146947-17.367579 7.019789-2.883368 16.006737 0.458105 20.048842 7.370105C465.071158 296.259368 462.551579 304.087579 455.545263 306.64757899999995zM427.52 426.684632c-115.968-11.439158-203.924211-82.216421-196.378947-158.073263 7.531789-75.910737 107.654737-128.161684 223.649684-116.749474 115.994947 11.439158 203.924211 82.216421 196.392421 158.140632C643.664842 385.859368 543.541895 438.110316 427.52 426.684632zM529.300211 247.70021099999997c-23.673263-53.355789-91.769263-81.798737-149.530947-63.232-55.754105 17.933474-79.373474 72.811789-54.945684 122.246737 23.956211 48.464842 86.352842 75.870316 141.541053 61.561263C523.506526 353.562947 552.663579 299.85684200000003 529.300211 247.70021099999997zM512 896C229.241263 896 0 666.772211 0 384c0-282.758737 229.241263-512 512-512 282.772211 0 512 229.241263 512 512C1024 666.772211 794.772211 896 512 896zM455.531789 101.02568399999996c-145.354105 0-293.941895 70.197895-293.941895 185.667368 0 60.362105 38.386526 130.182737 104.474947 196.069053 88.252632 87.929263 191.164632 127.986526 229.874526 89.397895 17.084632-17.003789 18.741895-46.457263 7.760842-81.623579-5.726316-17.690947 16.666947-7.895579 16.666947-7.936 71.343158 29.763368 133.564632 31.514947 156.321684-0.862316 12.139789-17.246316 10.954105-41.472-0.215579-69.510737-5.173895-12.921263 1.589895-14.928842 11.466105-17.879579 40.178526-12.422737 84.924632-42.455579 84.924632-95.380211C772.837053 211.36168399999997 646.090105 101.02568399999996 455.531789 101.02568399999996zM718.672842 468.197053c4.715789 14.457263 1.765053 30.962526-9.202526 43.061895-10.954105 12.072421-27.136 16.666947-42.037895 13.527579l0 0.026947c-12.463158-2.694737-24.724211 5.268211-27.392 17.664-2.667789 12.463158 5.281684 24.697263 17.744842 27.338105 30.531368 6.467368 63.595789-2.937263 85.989053-27.715368 22.447158-24.764632 28.456421-58.489263 18.849684-88.064-3.907368-12.099368-16.936421-18.728421-29.062737-14.848-12.139789 3.920842-18.782316 16.922947-14.874947 28.995368L718.672842 468.183579zM853.261474 424.865684c-0.013474-0.013474-0.013474-0.080842-0.013474-0.107789-4.567579-14.026105-19.712-21.706105-33.778526-17.165474-14.133895 4.554105-21.854316 19.590737-17.300211 33.670737l0 0.013474c13.999158 43.169684 5.12 92.429474-27.567158 128.565895-32.714105 36.122947-80.949895 49.92-125.507368 40.488421-14.484211-3.085474-28.752842 6.130526-31.838316 20.574316-3.098947 14.403368 6.144 28.631579 20.641684 31.717053l0.026947 0c62.625684 13.271579 130.519579-6.117053 176.545684-56.966737C860.483368 554.886737 872.892632 485.618526 853.261474 424.865684z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="voice" unicode="" d="M463.380164 644.0568969999999v-0.003069c-4.550643 4.549619-10.484795 7.02295-16.913205 7.02295s-12.365632-2.473331-16.915251-7.02295c-4.549619-4.551666-7.020904-10.485819-7.020904-16.914229s2.471284-12.365632 7.020904-16.915251c60.437487-60.438511 93.675496-140.756791 93.675496-226.222301 0-85.464487-33.238009-165.783791-93.675496-226.220255-4.549619-4.551666-7.020904-10.487865-7.020904-16.915252 0-6.429433 2.471284-12.365632 7.020904-16.914228 4.550643-4.549619 10.486842-7.02295 16.915251-7.02295s12.364609 2.473331 16.913205 7.02295c35.114752 35.116799 62.317301 76.06849 80.814584 121.668037 17.904789 44.018539 26.90579 90.608647 26.90579 138.384768s-9.101285 94.26799-26.90579 138.384767c-18.59552 45.697785-45.698808 86.550215-80.814584 121.667013zM781.892405 618.929614v-0.002047c-31.358195 77.452-77.550237 146.990772-137.098471 206.539007-4.550643 4.549619-10.485819 7.02295-16.915252 7.02295-6.42841 0-12.363585-2.473331-16.914228-7.02295-9.29776-9.299807-9.29776-24.531719 0-33.82948 54.997592-54.998615 97.631598-119.195729 126.613676-190.71153 27.993564-69.044516 42.237987-142.045133 42.237987-216.924541s-14.244422-147.882072-42.237987-216.923518c-28.982078-71.517847-71.616084-135.616724-126.613676-190.711529-9.29776-9.298783-9.29776-24.531719 0-33.82948 4.551666-4.551666 10.485819-7.02295 16.914228-7.02295 6.429433 0 12.366655 2.471284 16.915252 7.02295 59.547211 59.547211 105.740276 129.085984 137.098471 206.53696 30.369681 74.78117 45.699832 153.817248 45.699831 234.928591 0 81.111343-15.331173 160.146397-45.699831 234.927567zM299.474141 427.621497c-11.670807 11.573593-27.103288 18.004049-43.522236 18.004049-16.419971 0-31.852452-6.429433-43.52326-18.004049-11.57257-11.57257-18.003026-27.104311-18.003026-43.522236 0-16.420995 6.42841-31.851429 18.003026-43.52326 11.574616-11.57257 27.103288-18.003026 43.52326-18.003025s31.852452 6.429433 43.522236 18.003025c11.573593 11.573593 18.003026 27.104311 18.003025 43.52326 0 16.419971-6.427386 31.852452-18.003025 43.522236z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="upload-drag" unicode="" d="M666.931 445.918l-124.245 99.362c-7.221 5.639-16.428 9.042-26.429 9.042-9.963 0-19.136-3.376-26.438-9.047l-124.215-99.391c-9.615-7.772-15.713-19.565-15.713-32.782 0-9.946 3.453-19.084 9.223-26.284 13.828-17.359 41.51-20.465 58.918-6.505l56.252 45.022v-261.12c0-23.177 18.842-41.984 41.95-41.984s41.95 18.842 41.95 41.984v261.12l56.286-45.056c17.545-13.892 45.09-10.718 58.914 6.554 5.754 7.137 9.236 16.316 9.236 26.308 0 13.211-6.086 24.999-15.609 32.716zM235.827 142.95000000000005c-85.026 0-152.542 31.71-188.655 89.839-36.113 58.095-34.406 134.724 4.335 195.174 37.342 58.334 102.366 92.023 178.995 94.549-19.866 130.492 42.667 202.377 84.753 235.008 90.112 69.871 234.257 79.053 335.565 21.367 58.982-33.587 94.037-85.675 100.454-146.978 113.937 18.978 177.562-33.826 206.814-69.905 63.317-78.131 71.27-204.39 18.91-300.203-46.524-85.06-130.389-127.317-229.82-116.497-18.739 2.116-32.222 18.978-30.174 37.683s19.285 32.017 37.683 30.174c96.7-10.718 143.258 46.353 162.406 81.408 39.014 71.373 33.826 167.868-12.049 224.495-38.673 47.684-100.352 60.518-178.483 37.069-2.94-0.916-6.319-1.443-9.822-1.443-18.851 0-34.133 15.282-34.133 34.133 0 1.495 0.096 2.969 0.283 4.414 8.549 68.506-31.114 106.53-65.93 126.362-77.346 44.066-191.522 37.035-259.925-15.974-58.266-45.193-75.947-117.18-51.132-208.179 0.761-2.688 1.198-5.775 1.198-8.963 0-18.851-15.282-34.133-34.133-34.133-1.481 0-2.94 0.094-4.371 0.277-70.759 8.822-128.991-13.535-159.677-61.424-24.61-38.434-26.146-86.46-3.823-122.368 27.716-44.578 86.05-64.375 164.147-55.637 1.132 0.133 2.443 0.209 3.772 0.209 18.853 0 34.138-15.284 34.138-34.138 0-17.525-13.205-31.965-30.208-33.914-14.153-1.653-27.874-2.404-41.118-2.404z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="login-qq" unicode="" d="M512 896C229.227789 896 0 666.772211 0 384c0-282.745263 229.227789-512 512-512s512 229.254737 512 512C1024 666.772211 794.772211 896 512 896L512 896zM738.856421 258.93726300000003c0 0-16.208842-44.220632-45.945263-83.941053 0 0 53.126737-18.054737 48.64-64.983579 0 0 1.778526-52.345263-113.461895-48.734316 0 0-81.071158 6.319158-105.377684 40.609684l-21.423158 0c-24.306526-34.304-105.350737-40.609684-105.350737-40.609684-115.280842-3.610947-113.475368 48.734316-113.475368 48.734316-4.500211 46.928842 48.626526 64.983579 48.626526 64.983579-29.709474 39.720421-45.918316 83.941053-45.918316 83.941053-72.057263-116.439579-64.848842 16.249263-64.848842 16.249263 13.527579 78.524632 70.238316 129.967158 70.238316 129.967158-8.111158 71.316211 21.611789 83.941053 21.611789 83.941053C318.410105 709.712842 508.025263 705.859368 512 705.751579c3.988211 0.107789 193.576421 3.961263 199.828211-216.643368 0 0 29.709474-12.638316 21.611789-83.941053 0 0 56.737684-51.442526 70.238316-129.967158l0 0C803.678316 275.18652599999996 810.873263 142.49768400000005 738.856421 258.93726300000003L738.856421 258.93726300000003zM738.856421 258.93726300000003" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="snowflake" unicode="" d="M480.695-64h63.725V59.291000000000054l68.854-68.242 44.945 44.546-113.798 112.79v180.02l177.271-102.44 41.67-155.652 60.725 16.284-25.398 94.872 85.259-49.266 31.87 55.246-84.726 48.961 94.497 25.343-16.495 61.622-156.068-41.855-176.934 102.245 177.667 102.667 155.513-41.709 16.274 60.793-94.78 25.418 85.255 49.264-31.869 55.247-84.733-48.965 25.326 94.594-61.557 16.51-41.817-156.206-176.948-102.251V644.461l113.849 113.951-44.459 44.496-69.392-69.454V832h-63.725v-97.935l-69.188 69.249-45.068-45.107 114.256-114.355V438.89l-156.557 90.469L283.45 684.39l-60.188-16.458 24.84-94.632-107.544 62.145-31.868-55.247 106.667-61.639-93.463-25.557 16.074-61.237 154.482 42.243 156.169-90.243-156.138-90.226-154.485 42.243-15.855-60.409 94.289-25.784-107.534-62.14 31.868-55.247 106.672 61.642-24.621-93.801 61.012-16.685 40.69 155.028 156.179 90.25v-180.455l-113.801-112.79 44.338-43.944 69.463 68.845V-64z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="file-b" unicode="" d="M790.08 177.91999999999996l-138.112-119.232V177.91999999999996h138.112zM198.848 763.008h627.328v-516.16H617.088a34.56 34.56 0 0 1-34.816-34.432v-206.528H198.848V763.008z m662.208 68.8H164.032a34.56 34.56 0 0 1-34.816-34.432v-825.92a34.56 34.56 0 0 1 34.816-34.432h453.056l278.784 240.896V797.376a34.56 34.56 0 0 1-34.816 34.432z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="template" unicode="" d="M734 172.89999999999998v82.8h-59.9v-37l-35.7-9.7 15.7-57.8zM674.1 419.3H734v-81.8h-59.9zM734 600.2l-95.6-26 15.7-57.8 20 5.4v-20.7H734zM866.1 131.29999999999995v-37l-35.7-9.7 7.9-28.9 7.8-28.9 79.9 21.7v82.8h-29.9zM740.9 60.299999999999955L651.4 36l7.9-28.9 7.8-29 89.5 24.4-7.8 28.9zM740.9 781.7l-89.5-24.3 7.9-28.9 7.8-28.9 89.5 24.3-7.8 28.9zM830.4 806l7.9-28.9 7.8-28.9 20 5.5v-20.8H926V832zM866.1 612.6v-120.3H926V612.6h-29.9zM866.1 371.9v-120.3H926V371.9h-29.9zM541.9 665.6l35.7 9.7-7.8 28.9-7.8 28.9-50-13.6L98 832v-783.5l384.1-104.3L512-64l29.9 8.1 35.7 9.7-7.8 28.9-7.8 28.9-20-5.4V120.79999999999995l35.7 9.7-15.7 57.8-20-5.4V486l35.7 9.7-15.7 57.8-20-5.4V665.6z m-59.8-659.4l-324.2 88.1V753.7l324.2-88.1V548l-192 52.2v-427.3l192-52.2v-114.5z m0 360.9V182.79999999999995l-132.2 35.9V521.8l132.2-35.9v-118.8z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="auz" unicode="" d="M324.266667 435.2c-17.066667 17.066667-39.822222 17.066667-51.2 0-17.066667-17.066667-17.066667-39.822222 0-51.2l153.6-159.288889c5.688889-5.688889 17.066667-11.377778 28.444444-11.377778s17.066667 5.688889 28.444445 11.377778l295.822222 290.133333c17.066667 17.066667 17.066667 39.822222 0 51.2-17.066667 17.066667-39.822222 17.066667-51.2 0L455.111111 304.355556 324.266667 435.2zM927.288889 753.777778L523.377778 896h-22.755556L96.711111 753.777778c-17.066667-5.688889-28.444444-17.066667-28.444444-34.133334v-432.355555c11.377778-250.311111 409.6-409.6 426.666666-415.288889h22.755556c17.066667 5.688889 415.288889 159.288889 426.666667 415.288889V719.644444c11.377778 17.066667 0 28.444444-17.066667 34.133334z m-45.511111-460.8c-5.688889-182.044444-301.511111-312.888889-369.777778-341.333334-113.777778 45.511111-358.4 182.044444-369.777778 341.333334v398.222222L512 822.044444l369.777778-125.155555v-403.911111z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="console" unicode="" d="M30.552 104.72699999999998c4.654-16.29 23.272-23.272 37.236-18.618 16.291 4.655 23.273 23.273 18.618 37.236C16.588 314.182 84.08 521.31 237.68 640c11.636 9.31 23.273 16.29 37.236 25.6 25.6 16.29 53.528 30.255 83.782 39.564 58.182 20.945 118.691 30.254 176.873 27.927h25.6c6.982 0 11.636 0 18.618-2.327 30.255-4.655 58.182-11.637 88.436-23.273 235.055-86.11 356.073-346.764 269.964-581.818-4.654-16.291 2.327-32.582 18.618-37.237 16.291-4.654 32.582 2.328 37.237 18.619 41.89 116.363 39.563 239.709 0 349.09h2.327C921.897 656.2909999999999 738.043 784.2909999999999 537.897 793.6h-48.873c-200.145-9.31-384-137.31-458.472-337.455-39.564-109.381-41.891-232.727 0-351.418z m707.49 386.328a29.498 29.498 0 0 1-41.89 0L521.606 316.509c-4.654 2.327-9.309 2.327-13.963 2.327-32.582 0-58.182-25.6-58.182-58.181s25.6-58.182 58.182-58.182 58.181 25.6 58.181 58.182c0 4.654 0 9.309-2.327 16.29l174.546 174.546c11.636 11.636 11.636 30.254 0 39.564z m228.073-458.473H58.48c-16.29 0-30.255-13.964-30.255-30.255 0-16.29 13.964-30.254 30.255-30.254h907.636c16.291 0 30.255 13.963 30.255 30.254 0 16.291-13.964 30.255-30.255 30.255z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="app" unicode="" d="M432.022 818.946h-376.324c-6.627 0-12.078-5.45-12.078-12.078v-376.324c0-6.627 5.45-12.078 12.078-12.078h376.324c6.627 0 12.078 5.45 12.078 12.078v376.473c0 6.627-5.45 11.93-12.078 11.93zM391.517 471.196h-295.169v295.169h295.021v-295.169zM976.847 635.717l-211.95 211.95c-8.837 8.837-23.124 8.837-31.963 0l-211.95-211.95c-8.837-8.837-8.837-23.124 0-31.963l211.95-212.098c8.837-8.837 23.124-8.837 31.963 0l211.95 211.95c8.837 8.987 8.837 23.271 0 32.109zM432.022 313.45000000000005h-376.324c-6.627 0-12.078-5.45-12.078-12.078v-376.324c0-6.627 5.45-12.078 12.078-12.078h376.324c6.627 0 12.078 5.45 12.078 12.078v376.473c0 6.627-5.45 11.93-12.078 11.93zM391.517-34.15499999999997h-295.169v295.021h295.021v-295.021zM932.511 313.45000000000005h-376.324c-6.627 0-12.078-5.45-12.078-12.078v-376.324c0-6.627 5.45-12.078 12.078-12.078h376.324c6.627 0 12.078 5.45 12.078 12.078v376.473c0 6.627-5.45 11.93-12.078 11.93zM891.859-34.15499999999997h-295.021v295.021h295.021v-295.021z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="prev" unicode="" d="M62.573 384.103l423.401 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.751-18.976-68.727 0l-39.753 39.753 0.269 0.246-385.655 385.661zM451.365 384.103l423.407 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.757-18.977-68.727 0l-39.762 39.754 0.273 0.249-385.662 385.661zM451.365 384.103z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="website" unicode="" d="M777.073418 147.443038c-30.460759 21.387342-40.83038 40.182278-76.47595 53.792405 25.275949 60.273418 40.182278 83.605063 42.126583 154.896203H887.898734c-3.888608-99.159494-45.367089-143.878481-110.825316-208.688608zM136.101266 356.13164600000005h167.210126c1.944304-71.291139 16.850633-94.622785 42.126583-154.896203-34.997468-13.610127-68.050633-31.756962-98.511393-53.792405C181.468354 212.25316499999997 139.989873 256.97215200000005 136.101266 356.13164600000005z m103.048101 259.888607c29.164557-23.979747 61.56962-42.774684 96.567089-57.681012-19.443038-53.792405-30.460759-90.734177-31.756962-152.951899H136.101266c3.240506 90.734177 46.663291 147.767089 103.048101 210.632911z m309.144304-209.98481V523.989873c47.311392 1.296203 71.291139 10.36962 114.065823 25.27595 18.146835-51.2 28.516456-84.901266 30.460759-143.23038H548.293671z m104.344304-195.078481c-40.182278 12.962025-60.273418 20.091139-104.344304 21.387342V356.13164600000005h144.526582c-1.944304-68.050633-16.202532-88.141772-40.182278-145.174684z m36.941772-57.681013c31.756962-12.313924 39.534177-28.516456 66.75443-47.311392-51.848101-44.718987-114.713924-73.883544-182.116455-84.901266 36.941772 37.589873 90.734177 82.308861 115.362025 132.212658z m-163.321519-137.397468l22.035443 165.913924c40.182278-1.296203 56.38481-7.777215 92.678481-18.794937-27.220253-56.38481-66.106329-106.288608-113.417722-147.118987h-1.296202z m-75.827848 5.18481c-67.402532 11.017722-130.268354 40.83038-182.764557 84.901266 27.868354 19.443038 57.681013 34.997468 88.789873 47.311392 23.331646-48.607595 55.088608-93.326582 93.974684-132.212658z m47.311392 335.068355v-123.787342c-44.070886-1.296203-64.162025-8.425316-104.344304-21.387342-23.979747 57.681013-38.237975 77.124051-40.182278 145.174684h144.526582zM383.675949 549.265823c42.774684-14.906329 66.75443-23.331646 114.065823-25.27595v-117.95443H353.21519c1.944304 58.329114 12.313924 92.03038 30.460759 143.23038z m-37.589873 57.032911c-31.756962 12.962025-60.921519 30.460759-88.141772 51.848101 53.792405 51.848101 115.362025 91.382278 192.486076 104.344304-44.718987-44.718987-80.364557-97.863291-104.344304-156.192405z m151.655696 161.377215v-193.782278c-44.070886 1.296203-64.162025 9.073418-103.696202 22.683544 29.164557 68.698734 49.903797 127.027848 102.4 171.098734h1.296202z m75.827848-4.536708c77.772152-13.610127 149.711392-49.903797 206.744304-104.344304-29.164557-22.035443-46.01519-37.589873-80.364557-51.848102-25.275949 59.625316-82.956962 112.76962-126.379747 156.192406z m-46.01519 4.536708c54.440506-46.01519 97.21519-104.992405 124.435443-171.098734-39.534177-13.610127-59.625316-21.387342-103.696202-22.683544l-22.035443 193.782278h1.296202z m-31.10886-751.149367c-46.663291 38.886076-62.865823 88.789873-91.382279 147.118988 36.293671 11.665823 53.144304 17.498734 93.326582 18.794936v-165.913924h-1.944303zM887.898734 406.035443h-145.174683c-1.296203 61.56962-12.313924 98.511392-31.756962 152.303798 37.589873 15.55443 57.032911 33.053165 88.789873 57.681012 56.38481-62.865823 84.901266-119.898734 88.141772-209.98481z m-375.898734 427.746835c-244.334177 0-442.005063-197.670886-442.005063-442.005063S267.665823-50.227847999999994 512-50.227847999999994s442.005063 197.670886 442.005063 442.005063S756.334177 833.782278 512 833.782278z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="next" unicode="" d="M948.066926 382.958838l-411.990051-412.24426c-18.47333-18.47333-48.417689-18.47333-66.875207 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L814.691135 383.088983 467.512212 730.269123c-18.466032 18.458735-18.466032 48.405526 0 66.873991 18.468465 18.464816 48.410391 18.464816 66.872774 0l38.682336-38.682336-0.261507-0.239614 375.259894-375.265975v0.003649m-378.312834 0L157.756743-29.28542200000004c-18.47333-18.47333-48.415256-18.47333-66.872775 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L436.369787 383.088983 89.19208 730.269123c-18.4636 18.458735-18.4636 48.405526 0 66.873991 18.470898 18.464816 48.415256 18.464816 66.872774 0l38.692067-38.682336-0.266372-0.239614 375.267191-375.265975-0.004865 0.003649m0 0z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="component" unicode="" d="M917.376 652.544L500.8 891.2a34.304 34.304 0 0 1-34.176 0L50.112 652.48a33.92 33.92 0 0 1-17.088-29.376v-477.44c0-12.16 6.528-23.296 17.088-29.44l416.512-238.72a35.136 35.136 0 0 1 34.176 0l416.576 238.72a33.92 33.92 0 0 1 17.088 29.44v477.44a33.92 33.92 0 0 1-17.088 29.44z m-51.264-487.36l-382.4-219.136-382.336 219.136V603.52l382.336 219.136 382.4-219.136v-438.272zM198.784 535.488a33.792 33.792 0 0 1 12.544-46.4l237.824-136.32V83.20000000000005c0-18.816 15.232-33.92 34.176-33.92a33.92 33.92 0 0 1 34.176 33.92V352.384l238.656 136.832a33.856 33.856 0 0 1 12.544 46.4 34.368 34.368 0 0 1-46.72 12.416L483.712 411.52 245.504 548.0319999999999a34.432 34.432 0 0 1-46.72-12.544z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="more" unicode="" d="M224 288c-52.928 0-96 43.072-96 96s43.072 96 96 96 96-43.072 96-96-43.072-96-96-96z m288 0c-52.928 0-96 43.072-96 96s43.072 96 96 96 96-43.072 96-96-43.072-96-96-96z m288 0c-52.928 0-96 43.072-96 96s43.072 96 96 96 96-43.072 96-96-43.072-96-96-96z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="login-wechat" unicode="" d="M516.464646 896C233.714646 896 4.464646 666.75 4.464646 384S233.714646-128 516.464646-128s512 229.25 512 512S799.214646 896 516.464646 896z m-74-523.375c-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.5-1.875-0.25-0.75-0.5-1.125-0.5-1.875-0.25-0.75-0.5-1.125-0.5-1.875-0.25-0.75-0.25-1.125-0.5-1.875s-0.5-1.125-0.5-1.875c-0.25-0.75-0.25-1.125-0.5-1.875s-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875c0-0.75-0.25-1.125-0.25-1.875s-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875 0-1.125-0.25-1.875c0-0.75-0.25-1.125-0.25-1.875s0-1.125-0.25-1.875c0-0.75 0-1.125-0.25-1.875 0-0.75 0-1.125-0.25-1.875v-22.5c0-0.75 0-1.125 0.25-1.875 0-0.75 0-1.125 0.25-1.875 0-0.75 0-1.125 0.25-1.875 0-0.75 0-1.125 0.25-1.875 0-0.75 0.25-1.125 0.25-1.875s0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875l0.25-0.875c-4.25-0.25-8.625-0.75-12.75-0.75-3.75-0.25-7.25-0.25-11-0.25-3.5 0-7 0-10.5 0.25-7.25 0.25-14 0.875-20.75 1.875-4.25 0.5-8.125 1.125-12.375 1.875-3.5 0.5-6.75 1.125-10.25 1.875-3 0.5-6.25 1.125-9.25 1.875-3 0.75-5.875 1.125-8.875 1.875-2.75 0.75-5.875 1.125-8.875 1.875-2.75 0.5-5.625 1.125-8.375 1.625l-3.25-1.625-3.75-1.875-4 1.375-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-2.75-1.375-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-2.5-1.375 0.5 1.375 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.5 1.125c-0.5 0.25-0.75 0.5-1.125 0.75-0.875 0.75-1.625 1.125-2.5 1.875s-1.625 1.125-2.5 1.875-1.625 1.125-2.5 1.875c-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.375 1.125-2.375 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-1.875 1.875-0.75 0.75-1.375 1.125-1.875 1.875l-1.875 1.875-1.875 1.875-1.875 1.875-1.875 1.875c-0.75 0.75-1.125 1.125-1.625 1.875s-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-0.875 1.125-1.625 1.875c-0.5 0.75-0.875 1.125-1.625 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.125 1.875-0.5 0.75-0.875 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.5 1.875-0.25 0.75-0.5 1.125-0.5 1.875-0.25 0.75-0.5 1.125-0.5 1.875-0.25 0.75-0.25 1.125-0.5 1.875s-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875 0 1.125-0.25 1.875c0 0.75 0 1.125-0.25 1.875 0 0.75 0 1.125-0.25 1.875 0 0.75 0 1.125-0.25 1.875V457.25v1.875 1.875 1.875 1.875 1.875 0.875 0.875 1.875 1.875 1.875 1.875 1.875 1.875c0 0.75 0 1.125 0.25 1.875 0 0.75 0 1.125 0.25 1.875 0 0.75 0 1.125 0.25 1.875 0 0.75 0.25 1.125 0.25 1.875s0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.5 1.875c0 0.75 0.25 1.125 0.5 1.875s0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.5 1.125 0.5 1.875c0.25 0.75 0.5 1.125 0.5 1.875 0.25 0.75 0.5 1.125 0.5 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.875 1.875 0.25 0.75 0.5 1.125 0.875 1.875 0.25 0.75 0.5 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.625 1.875 0.5 0.75 0.875 1.125 1.625 1.875 0.5 0.75 1.125 1.125 1.625 1.875s1.125 1.125 1.625 1.875 1.125 1.125 1.625 1.875 1.125 1.125 1.625 1.875 1.125 1.125 1.625 1.875l1.875 1.875 1.875 1.875 1.875 1.875 1.875 1.875c0.75 0.75 1.375 1.125 1.875 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.375 1.875 0.75 0.75 1.625 1.125 2.375 1.875 0.75 0.75 1.625 1.125 2.375 1.875 0.75 0.75 1.625 1.125 2.375 1.875 0.875 0.75 1.625 1.125 2.5 1.875s1.625 1.125 2.5 1.875 1.875 1.125 2.5 1.875c0.875 0.75 1.875 1.125 2.75 1.875 0.875 0.75 1.875 1.125 2.75 1.875 0.875 0.75 1.875 1.125 2.75 1.875 0.875 0.75 1.875 1.125 3 1.875 0.875 0.75 2.125 1.125 3 1.875s2.125 1.125 3 1.875c1.125 0.75 2.125 1.125 3.25 1.875 1.125 0.75 2.375 1.125 3.25 1.875 1.125 0.75 2.375 1.125 3.5 1.875 1.125 0.75 2.375 1.125 3.75 1.875 1.125 0.75 2.5 1.125 3.75 1.875 1.375 0.75 2.5 1.125 4 1.875 1.375 0.75 2.75 1.125 4.25 1.875 1.375 0.75 2.75 1.125 4.25 1.875 1.375 0.75 3 1.125 4.375 1.875 1.625 0.75 3 1.125 4.625 1.875 1.625 0.75 3.25 1.125 4.875 1.875 1.875 0.75 3.5 1.125 5.375 1.875s3.75 1.125 5.625 1.875c2.125 0.75 4.25 1.125 6 1.875 2.375 0.75 4.375 1.125 6.75 1.875 2.5 0.75 4.875 1.125 7.5 1.875 2.75 0.75 5.625 1.125 8.625 1.875 3.5 0.75 6.75 1.125 10.25 1.875 4.375 0.75 8.875 1.375 13.25 1.875 11 1.125 22.125 1.875 33.25 1.875h2.5c11.125 0 22.375-0.75 33.5-1.875 4.375-0.5 8.875-1.125 13.25-1.875 3.5-0.5 7-1.125 10.25-1.875 2.75-0.5 5.875-1.125 8.625-1.875 2.5-0.5 5.125-1.125 7.625-1.875 2.375-0.5 4.625-1.125 6.75-1.875 2.125-0.5 4.25-1.125 6.25-1.875 1.875-0.75 4-1.125 5.875-1.875s3.75-1.125 5.375-1.875c1.625-0.75 3.5-1.125 5.125-1.875 1.625-0.75 3.25-1.125 4.875-1.875 1.625-0.75 3-1.125 4.625-1.875 1.375-0.75 3-1.125 4.375-1.875s2.75-1.125 4.25-1.875c1.375-0.75 2.75-1.125 4-1.875 1.375-0.75 2.5-1.125 3.75-1.875 1.125-0.75 2.5-1.125 3.75-1.875 1.125-0.75 2.375-1.125 3.5-1.875 1.125-0.75 2.375-1.125 3.5-1.875 1.125-0.75 2.375-1.125 3.25-1.875 1.125-0.75 2.125-1.125 3.25-1.875 1.125-0.75 2.125-1.125 3-1.875s2.125-1.125 3-1.875 1.875-1.125 3-1.875c0.875-0.75 1.875-1.125 2.75-1.875 0.875-0.75 1.875-1.125 2.75-1.875 0.875-0.75 1.875-1.125 2.75-1.875 0.875-0.75 1.875-1.125 2.5-1.875 0.875-0.75 1.625-1.125 2.5-1.875s1.625-1.125 2.5-1.875 1.625-1.125 2.375-1.875c0.75-0.75 1.625-1.125 2.375-1.875 0.75-0.75 1.625-1.125 2.375-1.875 0.75-0.75 1.375-1.125 2.375-1.875 0.75-0.75 1.375-1.125 2.375-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 1.875-1.875 0.75-0.75 1.375-1.125 1.875-1.875l1.875-1.875 1.875-1.875 1.875-1.875 1.875-1.875c0.75-0.75 1.125-1.125 1.625-1.875s1.125-1.125 1.625-1.875 1.125-1.125 1.625-1.875 1.125-1.125 1.625-1.875 1.125-1.125 1.625-1.875 0.875-1.125 1.625-1.875c0.5-0.75 0.875-1.125 1.625-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.125-1.875 0.5-0.75 0.875-1.125 1.125-1.875 0.5-0.75 0.875-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.5-1.125 0.875-1.875 0.25-0.75 0.5-1.125 0.875-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.5-1.875 0.25-0.75 0.5-1.125 0.5-1.875 0.25-0.75 0.25-1.125 0.5-1.875s0.5-1.125 0.5-1.875c0.25-0.75 0.25-1.125 0.5-1.875s0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875c0-0.5 0.25-0.75 0.25-1.125-4.625 0.5-9.25 0.875-14 1.125-3.5 0.25-7 0.25-10.75 0.25-4 0-8.125 0-12.125-0.25-6.75-0.25-13.25-0.875-19.5-1.875-3.75-0.5-7.625-1.125-11.375-1.875-3-0.5-5.875-1.125-8.875-1.875-2.5-0.5-5.125-1.125-7.5-1.875-2.125-0.5-4.375-1.125-6.5-1.875-1.875-0.5-4-1.125-5.875-1.875-1.875-0.5-3.5-1.125-5.375-1.875-1.625-0.75-3.25-1.125-4.875-1.875-1.625-0.75-3-1.125-4.625-1.875-1.375-0.75-3-1.125-4.375-1.875s-2.75-1.125-4.25-1.875c-1.375-0.75-2.5-1.125-4-1.875-1.125-0.75-2.5-1.125-3.75-1.875-1.125-0.75-2.375-1.125-3.5-1.875-1.125-0.75-2.375-1.125-3.5-1.875-1.125-0.75-2.125-1.125-3.25-1.875-0.875-0.75-2.125-1.125-3-1.875s-2.125-1.125-3-1.875-1.875-1.125-3-1.875c-0.875-0.75-1.875-1.125-2.75-1.875-0.875-0.75-1.875-1.125-2.75-1.875-0.875-0.75-1.875-1.125-2.5-1.875-0.875-0.75-1.625-1.125-2.5-1.875s-1.625-1.125-2.5-1.875c-0.75-0.75-1.625-1.125-2.375-1.875-0.75-0.75-1.625-1.125-2.375-1.875-0.75-0.75-1.625-1.125-2.375-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-1.875-1.875l-1.875-1.875-1.875-1.875-1.875-1.875c-0.75-0.75-1.125-1.125-1.625-1.875s-1.125-1.125-1.625-1.875-1.125-1.125-1.625-1.875-1.125-1.125-1.625-1.875-1.125-1.125-1.625-1.875-0.875-1.125-1.625-1.875c-0.5-0.75-0.875-1.125-1.625-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.125-1.875-0.5-0.75-0.875-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.75-1.875-3.125-4.625-3.375-5.125-3.625-5.75z m433.625-71.25v-11.375c0-0.5 0-0.875-0.25-1.625 0-0.5 0-0.875-0.25-1.625 0-0.5 0-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.875-0.875-1.125-1.625-0.5-0.5-0.875-0.875-1.125-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625l-1.625-1.625-1.625-1.625c-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.375-0.875-1.875-1.625-0.75-0.5-1.375-0.875-1.875-1.625-0.75-0.5-1.375-0.875-2.125-1.625-0.75-0.5-1.375-0.875-2.125-1.625l-0.75-0.5 0.25-0.875 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.25-1.125-2.125 1.125-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-0.5 0.25-0.875-0.25c-2.125-0.5-4.25-0.875-6-1.625-2.125-0.5-4.25-0.875-6.25-1.625-2.125-0.5-4.25-0.875-6.5-1.625-2.375-0.5-4.375-0.875-6.75-1.625-2.375-0.5-4.875-1.125-7.25-1.625-2.75-0.5-5.375-1.125-8.125-1.625-3.25-0.5-6.5-1.125-9.75-1.625-5.375-0.75-10.75-1.125-15.875-1.625-2.75-0.25-5.875-0.25-8.625-0.25-3.75 0-7.5 0-11.125 0.25-6.5 0.25-12.75 0.75-19.125 1.625-3.75 0.5-7.5 0.875-11 1.625-2.75 0.5-5.875 0.875-8.625 1.625-2.375 0.5-4.875 0.875-7.25 1.625-2.125 0.5-4.25 0.875-6.25 1.625-1.875 0.5-3.75 0.875-5.625 1.625-1.875 0.5-3.5 0.875-5.125 1.625-1.625 0.5-3.25 0.875-4.875 1.625-1.375 0.5-3 0.875-4.375 1.625-1.375 0.5-2.75 0.875-4.25 1.625-1.375 0.5-2.5 0.875-4 1.625-1.125 0.5-2.5 0.875-3.75 1.625-1.125 0.5-2.375 0.875-3.75 1.625-1.125 0.5-2.375 0.875-3.5 1.625-1.125 0.5-2.125 0.875-3.25 1.625-1.125 0.5-2.125 0.875-3.25 1.625-0.875 0.5-2.125 0.875-3 1.625-0.875 0.5-1.875 0.875-3 1.625-0.875 0.5-1.875 0.875-2.75 1.625-0.875 0.5-1.875 0.875-2.75 1.625-0.875 0.5-1.875 0.875-2.5 1.625-0.875 0.5-1.625 0.875-2.5 1.625-0.875 0.5-1.625 0.875-2.5 1.625-0.75 0.5-1.625 0.875-2.375 1.625-0.75 0.5-1.625 0.875-2.375 1.625-0.75 0.5-1.625 0.875-2.375 1.625-0.75 0.5-1.375 0.875-2.375 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-1.875 1.625-0.75 0.5-1.375 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.5 0.5-1.125 0.875-1.625 1.625-0.5 0.5-1.125 0.875-1.625 1.625-0.5 0.5-1.125 0.875-1.625 1.625-0.5 0.5-1.125 0.875-1.625 1.625l-1.625 1.625-1.625 1.625c-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.125 1.625-0.5 0.5-0.875 0.875-1.125 1.625-0.5 0.5-0.875 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.5 0.875-0.875 1.625-0.25 0.5-0.5 0.875-0.875 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5 0 0.875-0.25 1.625 0 0.5 0 0.875-0.25 1.625 0 0.5 0 0.875-0.25 1.625v1.625 1.625 1.625 3.25 1.625 3.25 1.375 1.625 1.625 1.625 1.625 1.625 1.625 1.625 1.625 1.625c0 0.5 0 0.875 0.25 1.625 0 0.5 0 0.875 0.25 1.625 0 0.5 0 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.875 1.625 0.25 0.5 0.5 0.875 0.875 1.625 0.25 0.5 0.5 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625l1.625 1.625 1.625 1.625c0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.375 0.875 1.875 1.625 0.75 0.5 1.375 0.875 1.875 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.375 1.625 0.75 0.5 1.625 0.875 2.375 1.625 0.75 0.5 1.625 0.875 2.375 1.625 0.75 0.5 1.625 0.875 2.375 1.625 0.875 0.5 1.625 0.875 2.5 1.625 0.875 0.5 1.625 0.875 2.5 1.625 0.875 0.5 1.875 0.875 2.5 1.625 0.875 0.5 1.875 0.875 2.75 1.625 0.875 0.5 1.875 0.875 2.75 1.625 0.875 0.5 1.875 0.875 3 1.625 0.875 0.5 2.125 0.875 3 1.625 1.125 0.5 2.125 0.875 3.25 1.625 1.125 0.5 2.125 0.875 3.25 1.625 1.125 0.5 2.375 0.875 3.5 1.625 1.125 0.5 2.375 0.875 3.75 1.625 1.125 0.5 2.5 0.875 3.75 1.625 1.375 0.5 2.5 0.875 4 1.625 1.375 0.5 2.75 0.875 4.25 1.625 1.375 0.5 3 0.875 4.375 1.625 1.625 0.5 3.25 0.875 4.875 1.625 1.625 0.5 3.5 0.875 5.125 1.625 1.875 0.5 3.75 0.875 5.875 1.625 2.125 0.5 4.25 1.125 6.25 1.625 2.375 0.5 4.875 1.125 7.25 1.625 2.75 0.5 5.875 1.125 8.625 1.625 3.75 0.75 7.5 1.125 11.125 1.625 9.25 1.125 19.125 1.625 28.875 1.625h1.375c9.25 0 18.375-0.75 27.5-1.625 3.75-0.5 7.25-0.875 10.75-1.625 2.75-0.5 5.625-0.875 8.375-1.625 2.375-0.5 4.625-0.875 7-1.625 2.125-0.5 4.25-0.875 6.25-1.625 1.875-0.5 3.75-0.875 5.625-1.625 1.625-0.5 3.5-0.875 5.125-1.625 1.625-0.5 3.25-0.875 4.625-1.625 1.375-0.5 3-0.875 4.375-1.625 1.375-0.5 2.75-0.875 4.25-1.625 1.375-0.5 2.5-0.875 4-1.625 1.125-0.5 2.5-0.875 3.75-1.625 1.125-0.5 2.375-0.875 3.5-1.625 1.125-0.5 2.375-0.875 3.5-1.625 1.125-0.5 2.125-0.875 3.25-1.625 1.125-0.5 2.125-0.875 3.25-1.625 0.875-0.5 2.125-0.875 3-1.625 0.875-0.5 1.875-0.875 3-1.625 0.875-0.5 1.875-0.875 2.75-1.625 0.875-0.5 1.875-0.875 2.75-1.625 0.875-0.5 1.875-0.875 2.5-1.625 0.875-0.5 1.625-0.875 2.5-1.625 0.875-0.5 1.625-0.875 2.5-1.625 0.875-0.5 1.625-0.875 2.5-1.625 0.75-0.5 1.625-0.875 2.375-1.625 0.75-0.5 1.625-0.875 2.375-1.625 0.75-0.5 1.375-0.875 2.375-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 1.875-1.625 0.75-0.5 1.375-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625l1.625-1.625 1.625-1.625c0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.875-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.5-1.625 0.25-0.5 0.5-0.875 0.5-1.625 0.25-0.5 0.5-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625v-11.375h-3.125zM589.714646 384c-12.625 0-25.375-12.75-25.375-25.375 0-12.75 12.75-25.375 25.375-25.375 19.375 0 31.875 12.625 31.875 25.375-0.125 12.625-12.75 25.375-31.875 25.375zM729.589646 384c-12.625 0-25.375-12.75-25.375-25.375 0-12.75 12.75-25.375 25.375-25.375 19.125 0 31.875 12.625 31.875 25.375 0 12.625-12.75 25.375-31.875 25.375zM328.714646 568.75c-19.125 0-38.375-12.625-38.375-31.625 0-19.125 19.375-31.875 38.375-31.875s31.875 12.75 31.875 31.875-12.875 31.625-31.875 31.625zM506.964646 568.75c-19.125 0-38.125-12.625-38.125-31.625 0-19.125 19.125-31.875 38.125-31.875 19.125 0 31.875 12.75 31.875 31.875s-12.875 31.625-31.875 31.625z" horiz-adv-x="1059" />
+
+
+ <glyph glyph-name="shrink-right" unicode="" d="M52.294-28.71900000000005h899.793c16.546 0 29.999 13.405 29.999 29.999v59.974c-0.013 16.562-13.436 29.985-29.998 29.999h-899.795c-16.57 0-29.999-13.429-29.999-29.999v-59.974c0-16.617 13.429-29.999 29.999-29.999zM952.087 451.165h-479.884c-16.57 0-29.999-13.405-29.999-29.999v-59.974c0 0 0 0 0 0 0-16.572 13.428-30.01 29.997-30.022h479.885c16.571 0.013 29.999 13.448 29.999 30.022 0 0 0 0 0 0v59.974c0 16.593-13.429 29.999-29.999 29.999zM52.294 691.0840000000001h899.793c16.554 0.013 29.972 13.423 29.999 29.974v59.999c0 16.57-13.429 29.999-29.999 29.999h-899.793c-16.57 0-29.999-13.429-29.999-29.999v-59.997c0-16.546 13.429-29.975 29.999-29.975zM45.183 383.53499999999997l239.919-150.598v301.196l-239.919-150.598z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="spread-left" unicode="" d="M942.974 770.924h-843.556c-15.513 0-28.124-12.567-28.124-28.124v-56.226c0.012-15.527 12.596-28.111 28.123-28.124h843.559c15.534 0 28.124 12.59 28.124 28.124v56.226c0 15.578-12.59 28.124-28.124 28.124zM99.418 321.033h449.891c15.534 0 28.124 12.567 28.124 28.124v56.226c0 0 0 0 0 0 0 15.537-12.589 28.134-28.122 28.146h-449.892c-15.534-0.012-28.124-12.608-28.124-28.146 0 0 0 0 0 0v-56.226c0-15.556 12.59-28.124 28.124-28.124zM942.974 96.10900000000004h-843.556c-15.519-0.012-28.099-12.584-28.124-28.101v-56.249c0-15.534 12.59-28.124 28.124-28.124h843.556c15.534 0 28.124 12.59 28.124 28.124v56.248c0 15.513-12.59 28.103-28.124 28.102zM949.641 384.436l-224.924 141.186v-282.37l224.924 141.186z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="camera" unicode="" d="M884.3 648.6H704.2L679.5 698l-0.2 0.4c-1.9 3.6-3.6 6.9-5.1 9.9-12 23.4-21.5 41.9-54.1 41.9H416.7c-32.9 0-43.7-21.3-55.1-43.8-1.3-2.6-2.7-5.3-4.2-8.1l-24.8-49.7H152.4c-34 0-61.7-27.7-61.7-61.7v-488c0-34 27.7-61.7 61.7-61.7h731.9c34 0 61.7 27.7 61.7 61.7v488c0 34-27.7 61.7-61.7 61.7zM904 98.89999999999998c0-10.8-8.8-19.7-19.7-19.7H152.4c-10.8 0-19.7 8.8-19.7 19.7v488c0 10.8 8.8 19.7 19.7 19.7h206.1l36.2 72.5c1.5 2.9 2.9 5.7 4.3 8.3 10.6 20.8 11.1 20.8 17.7 20.8H620c4.6 0 5.8-0.6 5.8-0.6 2-1.2 7.2-11.2 10.9-18.5 1.6-3.1 3.3-6.5 5.3-10.1l36.2-72.4h206.1c10.8 0 19.7-8.8 19.7-19.7v-488zM525.5 565.5c-123.5 0-223.6-100.1-223.6-223.6S402 118.20000000000005 525.5 118.20000000000005s223.7 100.1 223.7 223.7c0 123.5-100.2 223.6-223.7 223.6z m0-402.5c-98.8 0-178.9 80.1-178.9 178.9 0 98.8 80.1 178.9 178.9 178.9 98.8 0 178.9-80.1 178.9-178.9 0-98.8-80.1-178.9-178.9-178.9z m246 402.5v-44.7H861v44.7h-89.5z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="note" unicode="" d="M987.2 384.36L512.43 859.13a84.75 84.75 0 0 1-65 24.71L111.55 864.09a84.83 84.83 0 0 1-79.65-79.65L12.15 448.57a84.57 84.57 0 0 1 24.69-65l474.8-474.8a84.91 84.91 0 0 1 119.93 0L987.2 264.41999999999996a84.9 84.9 0 0 1 0 119.94z m-39.28-80.66L592.29-51.91999999999996a29.31 29.31 0 0 0-41.37 0L76.1 422.9a29.22 29.22 0 0 0-8.49 22.38l19.74 335.88a29.29 29.29 0 0 0 27.48 27.48l335.9 19.75a29.32 29.32 0 0 0 22.38-8.52l474.8-474.8a29.31 29.31 0 0 0 0.01-41.37zM236.86 659.14c-50.92-50.95-50.92-133.8 0-184.72a130.61 130.61 0 1 1 184.71 184.72c-50.89 50.86-133.77 50.86-184.71 0zM382.29 513.7c-28.38-28.38-77.78-28.38-106.15 0a75.08 75.08 0 1 0 106.15 0z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="refresh" unicode="" d="M928 810.666667c-18.133333 0-32-13.866667-32-32v-164.266667C816 747.733333 669.866667 832 512 832 264.533333 832 64 631.4666669999999 64 384s200.533333-448 448-448c230.4 0 422.4 172.8 445.866667 402.133333 2.133333 17.066667-10.666667 33.066667-28.8 35.2-17.066667 2.133333-33.066667-10.666667-35.2-28.8C873.6 148.26666699999998 709.333333 0 512 0c-212.266667 0-384 171.733333-384 384s171.733333 384 384 384c137.6 0 264.533333-74.666667 332.8-192H693.333333c-18.133333 0-32-13.866667-32-32s13.866667-32 32-32h266.666667V778.666667c0 18.133333-14.933333 32-32 32z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="female" unicode="" d="M774.4 800c-48 35.2-108.8 51.2-172.8 51.2-105.6 0-208-51.2-268.8-150.4-89.6-134.4-57.6-313.6 60.8-416l-32-51.2-188.8 121.6S128 384 108.8 352c-22.4-35.2 22.4-64 22.4-64l188.8-121.6-105.6-163.2s-19.2-32 16-51.2c38.4-22.4 57.6 12.8 57.6 12.8l102.4 160 185.6-121.6s48-28.8 70.4 6.4c19.2 28.8-25.6 57.6-25.6 57.6L432 192l32 48c44.8-22.4 92.8-32 137.6-32 105.6 0 208 51.2 268.8 150.4 96 147.2 51.2 345.6-96 441.6z m35.2-400c-44.8-67.2-118.4-108.8-201.6-108.8-44.8 0-92.8 12.8-131.2 38.4-112 73.6-147.2 220.8-73.6 332.8 44.8 64 121.6 105.6 201.6 108.8 44.8 0 92.8-12.8 131.2-38.4 112-73.6 147.2-220.8 73.6-332.8z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="male" unicode="" d="M889.6 800h-240s-35.2 0-38.4-41.6c0-19.2 16-38.4 38.4-38.4h140.8l-179.2-179.2C556.8 582.4 489.6 608 416 608 240 608 96 464 96 288s144-320 320-320 320 144 320 320c0 73.6-25.6 140.8-67.2 195.2l179.2 179.2v-140.8c0-22.4 19.2-38.4 38.4-38.4 22.4 0 38.4 19.2 38.4 41.6V764.8h3.2C924.8 800 889.6 800 889.6 800zM416 48c-131.2 0-236.8 105.6-236.8 236.8 0 131.2 105.6 236.8 236.8 236.8s236.8-105.6 236.8-236.8c0-131.2-105.6-236.8-236.8-236.8z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="screen-restore" unicode="" d="M582.6 454.6v320h50V540l274 274 35.4-35.4-274-274h234.6v-50h-320zM117.4-46l274 274v-234.6h50v320h-320v-50H356l-274-274 35.4-35.4zM132 764h302V814H82v-352h50V764z m760-760H590v-50h352V306h-50v-302z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="password" unicode="" d="M519.2 343.29999999999995c-41.1 0-74.4-33.3-74.4-74.4 0-29.7 17.5-55 42.5-67.1v-81.9c0-17.6 14.3-31.9 31.9-31.9 17.6 0 31.9 14.3 31.9 31.9v81.9c25.1 12 42.5 37.4 42.5 66.9 0 41.3-33.2 74.6-74.4 74.6zM827.6-62.10000000000002H189.4c-35.9 0-65.1 29.2-65.1 65.1V428.4c0 35.9 29.2 65.1 65.1 65.1h638.2c17.3 0 33.7-6.7 46-19.1 12.3-12.3 19.1-28.7 19.1-46V3c0-35.9-29.2-65.1-65.1-65.1zM231.9 427.2c-34.8 0-41.3-6.6-41.3-41.3v-340.4c0-34.8 6.6-41.3 41.3-41.3h553.2c34.8 0 41.3 6.6 41.3 41.3V385.9c0 34.8-6.6 41.3-41.3 41.3H231.9zM519.2 86.70000000000005c-18.3 0-33.2 14.8-33.2 33.2V201c-26.3 12.8-42.6 38.8-42.6 67.8 0 41.8 33.9 75.7 75.7 75.7s75.7-33.9 75.7-75.7c0-29-16.3-55-42.5-67.8v-81.1c0.1-18.2-14.9-33.2-33.1-33.2zM519.2 342c-40.4 0-73.2-32.9-73.2-73.2 0-28.3 16.1-53.6 41.9-65.8l0.7-0.4V120c0-17 13.7-30.7 30.7-30.7S550 103.10000000000002 550 120v82.6l0.7 0.4c25.8 12.3 41.9 37.5 41.9 65.8-0.2 40.4-33.1 73.2-73.4 73.2zM207 523.1c-9.1 0-17.6 3.5-23.9 10-6.4 6.4-10 15-10 23.9v2h-0.2l0.2 1.4c0.1 0.5 0.1 0.9 0.2 1.4l0.2 1c0.1 0.6 0.2 1.4 0.4 2 15.3 75.7 57 144.2 117.2 193 29.9 24.2 63.4 43 99.8 56 37.5 13.3 77 20.2 117.5 20.2 61 0 120.8-16.3 173-47.2 50.6-29.9 93-72.8 122.5-123.8 4-5.6 6.1-12.2 6.1-19.2 0-18.3-15-33.3-33.3-33.3-13.2 0-25.1 7.7-30.4 19.8-49.2 84.6-140.4 137.4-238 137.4-128.1 0-238.2-87.1-267.6-211.8v-0.2c-0.7-18.4-15.4-32.6-33.7-32.6z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="senior" unicode="" d="M719.9 249.39999999999998L514.7 379.5V485.1C615.6 419 731.5 344 731.5 344s139.2-45.6 139.2 106.5c0 93-172.5 112.1-197.2 11.8l-69.6 47.3s24.2 101.5 162.4 106.5c138.2 4.9 192-94.6 190.9-199.6-1.2-104.7-136-198.3-237.3-167.1zM561 414c-4-19-23-33.7-47.6-33.7l-6.9 4.3-217.3 137.8S171 555.2 160.8 439c-10.2-116.1 147.4-129.5 186.8-23.8l81.7-47.6s-65.1-119.1-198.5-119.1C97.3 248.5 0.6 423.8 114 546.3c113.5 122.4 218.6 64.6 257 35.7 16.4-12.4 85.3-57.9 158.6-105.9l3.1-2.4c28.3-18.2 33.4-35.6 28.3-59.7zM434.1 149.70000000000005h212c16.7 0 30.3-13.6 30.3-30.3v-15.1c0-16.7-13.6-30.3-30.3-30.3h-212c-16.7 0-30.3 13.6-30.3 30.3v15.1c0 16.8 13.6 30.3 30.3 30.3z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="theme" unicode="" d="M512 800C229.696 800 0 570.304 0 288c0-90.368 30.304-174.496 85.344-236.896 55.264-62.624 129.152-97.12 208.128-97.12 81.568 0 161.536 36.832 231.264 106.592l2.272 2.496c65.792 81.472 132.896 121.056 205.088 121.056 46.72 0 89.216-15.872 126.688-29.92 30.336-11.328 56.576-21.12 81.216-21.12C1024 133.08799999999997 1024 241.664 1024 288c0 282.304-229.696 512-512 512z m428-602.912c-13.088 0-35.296 8.288-58.784 17.088-40.48 15.136-90.848 33.952-149.12 33.952-92.352 0-175.328-46.944-253.76-143.456-57.184-56.704-121.056-86.688-184.832-86.688-60.352 0-117.216 26.784-160.128 75.456C88.64 144.12800000000004 64 213.216 64 288 64 535.04 264.96 736 512 736s448-200.96 448-448c0-27.328-1.952-90.912-20-90.912zM800.704 379.93600000000004m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM457.024 582.624m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM672.704 555.9359999999999m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM291.392 443.936m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM278.4 197.24800000000005m-96 0a96 96 0 1 1 192 0 96 96 0 1 1-192 0Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="tread" unicode="" d="M860.8 172.79999999999995l6.4-57.6-6.4 57.6c12.8 0 25.6 3.2 35.2 12.8 6.4 9.6 6.4 22.4 3.2 32l57.6 12.8-57.6-12.8L800 553.6c-6.4 28.8-25.6 51.2-48 64-9.6 6.4-22.4 9.6-32 9.6H182.4c-22.4 3.2-41.6-6.4-51.2-25.6-6.4-9.6-6.4-19.2-9.6-28.8v-342.4c0-19.2 9.6-38.4 28.8-48 6.4-3.2 12.8-6.4 19.2-6.4h192l19.2-25.6 147.2-188.8c6.4-9.6 19.2-12.8 28.8-9.6 16 3.2 25.6 19.2 22.4 35.2l-9.6 118.4-6.4 67.2h297.6z m-233.6-57.6l9.6-128c3.2-28.8-9.6-54.4-28.8-73.6-35.2-32-92.8-28.8-124.8 6.4l-156.8 195.2H179.2c-19.2 0-38.4 6.4-57.6 16-35.2 19.2-57.6 57.6-57.6 99.2V572.8c0 19.2 6.4 38.4 16 57.6 19.2 38.4 57.6 60.8 99.2 54.4h537.6c67.2-3.2 121.6-48 137.6-112l102.4-339.2c6.4-28.8 3.2-57.6-12.8-80-19.2-22.4-48-38.4-76.8-38.4h-240zM304 627.2v-451.2h57.6V627.2H304z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="praise" unicode="" d="M860.8 595.2h-297.6l6.4 67.2 9.6 118.4c3.2 16-6.4 32-22.4 35.2-9.6 3.2-22.4 0-28.8-9.6l-147.2-188.8-19.2-25.6h-192c-6.4 0-12.8-3.2-19.2-6.4-19.2-9.6-28.8-28.8-28.8-48v-342.4c0-9.6 3.2-22.4 9.6-28.8 9.6-19.2 28.8-28.8 48-25.6h537.6c12.8 0 22.4 3.2 32 9.6 25.6 12.8 44.8 35.2 48 64l102.4 336 57.6-12.8-57.6 12.8c3.2 9.6 0 22.4-3.2 32-9.6 6.4-22.4 12.8-35.2 12.8l6.4 57.6-6.4-57.6z m-233.6 57.6h240c28.8 0 57.6-12.8 76.8-38.4 16-22.4 19.2-54.4 12.8-80l-102.4-339.2c-16-64-70.4-108.8-137.6-112H179.2c-41.6-3.2-80 19.2-99.2 54.4-9.6 19.2-16 38.4-16 57.6V537.6c0 41.6 22.4 80 57.6 99.2 19.2 9.6 38.4 12.8 57.6 16h144L480 848c32 35.2 89.6 38.4 124.8 6.4 19.2-19.2 32-44.8 28.8-73.6l-6.4-128z m-323.2-512h57.6V592H304v-451.2z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="star-fill" unicode="" d="M752-43.200000000000045c-9.6 0-20.8 3.2-30.4 8l-208 104-209.6-104c-20.8-11.2-48-9.6-67.2 4.8-19.2 14.4-30.4 40-25.6 64l43.2 224L89.6 411.2C72 428.8 65.6 456 72 478.4c8 24 27.2 41.6 52.8 44.8l228.8 41.6 102.4 208c11.2 22.4 33.6 36.8 57.6 36.8s48-14.4 57.6-36.8l102.4-208 228.8-40c24-3.2 44.8-20.8 51.2-44.8 8-24 1.6-49.6-16-67.2L772.8 257.6l41.6-224c4.8-25.6-6.4-49.6-25.6-64-9.6-8-22.4-12.8-36.8-12.8z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="rate" unicode="" d="M959.008 489.984l-308 47.008L512 832 372.992 536.992l-308-47.008 223.008-228-52.992-324L512 90.976l276.992-152.992-52.992 324zM512 156L304 39.00800000000004l40 235.008-179.008 182.016 242.016 32 104.992 224 104-224 240.992-34.016L680 273.024l36.992-235.008z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="template-1" unicode="" d="M512 384zM43.52 601.6l409.6-176.64c58.88-30.72 110.08 0 110.08 0l414.72 174.08 2.56 2.56c10.24 5.12 15.36 15.36 15.36 28.16 0 15.36-10.24 28.16-23.04 30.72L563.2 837.12c-56.32 23.04-97.28 0-97.28 0L46.08 660.48c-12.8-5.12-20.48-17.92-20.48-30.72s7.68-23.04 17.92-28.16z m0 0M512 222.72000000000003c-2.56 0-7.68 0-10.24 2.56l-486.4 215.04c-12.8 5.12-17.92 20.48-12.8 33.28 5.12 12.8 20.48 17.92 33.28 12.8L512 276.48 988.16 486.4c12.8 5.12 28.16 0 33.28-12.8 5.12-12.8 0-28.16-12.8-33.28l-486.4-215.04c-2.56-2.56-7.68-2.56-10.24-2.56zM512 71.67999999999995c-2.56 0-7.68 0-10.24 2.56l-486.4 215.04c-12.8 5.12-17.92 20.48-12.8 33.28 5.12 10.24 20.48 17.92 33.28 10.24L512 125.44000000000005 988.16 332.79999999999995c12.8 5.12 28.16 0 33.28-12.8 5.12-12.8 0-28.16-12.8-33.28l-486.4-215.04H512zM512-79.36000000000001c-2.56 0-7.68 0-10.24 2.56l-486.4 215.04c-12.8 5.12-17.92 20.48-12.8 33.28 5.12 12.8 20.48 17.92 33.28 12.8L512-25.600000000000023l476.16 209.92c12.8 5.12 28.16 0 33.28-12.8 5.12-12.8 0-28.16-12.8-33.28l-486.4-215.04c-2.56-2.56-7.68-2.56-10.24-2.56z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="vercode" unicode="" d="M513.807059-128C351.171765-128 58.428235 126.19294100000002 54.211765 376.16941199999997V662.287059a93.364706 93.364706 0 0 0 81.317647 88.545882 570.428235 570.428235 0 0 1 163.237647 40.357647A393.336471 393.336471 0 0 1 446.945882 872.508235a101.797647 101.797647 0 0 0 120.470589 5.421177A629.458824 629.458824 0 0 1 716.8 792.395294a1255.303529 1255.303529 0 0 1 169.863529-38.550588 98.785882 98.785882 0 0 0 79.510589-90.955294 2911.171765 2911.171765 0 0 0-3.011765-291.538824C924.611765 49.09176500000001 672.828235-128 513.807059-128z m0 963.764706a39.152941 39.152941 0 0 1-24.696471-7.830588A438.512941 438.512941 0 0 0 319.247059 734.569412a608.376471 608.376471 0 0 0-180.705883-43.369412 33.731765 33.731765 0 0 1-24.094117-30.117647v-283.708235C118.663529 155.10588199999995 389.722353-67.76470600000005 513.807059-67.76470600000005s354.183529 148.178824 391.529412 444.536471c9.035294 175.887059 0 281.901176 0 283.105882a38.550588 38.550588 0 0 1-29.515295 33.731765 1287.830588 1287.830588 0 0 0-180.705882 41.562353A676.442353 676.442353 0 0 0 536.094118 829.741176a37.345882 37.345882 0 0 1-24.094118 6.02353zM784.865882 479.171765L487.905882 198.47529399999996a40.357647 40.357647 0 0 0-49.392941-4.818823l-7.830588 6.625882-161.430588 171.068235a40.357647 40.357647 0 1 0 60.235294 55.416471l133.722353-141.552941 267.444706 252.988235a40.357647 40.357647 0 1 0 55.41647-60.235294" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="cellphone" unicode="" d="M785.066667 896H238.933333a102.4 102.4 0 0 1-102.4-102.4v-819.2a102.4 102.4 0 0 1 102.4-102.4h546.133334a102.4 102.4 0 0 1 102.4 102.4V793.6a102.4 102.4 0 0 1-102.4 102.4zM238.933333 827.733333h546.133334a34.133333 34.133333 0 0 0 34.133333-34.133333v-648.533333H204.8V793.6a34.133333 34.133333 0 0 0 34.133333 34.133333z m546.133334-887.466666H238.933333a34.133333 34.133333 0 0 0-34.133333 34.133333v102.4h614.4v-102.4a34.133333 34.133333 0 0 0-34.133333-34.133333zM512 8.53333299999997m-34.133333 0a34.133333 34.133333 0 1 1 68.266666 0 34.133333 34.133333 0 1 1-68.266666 0ZM426.666667 725.333333h170.666666a17.066667 17.066667 0 0 1 0 34.133334h-170.666666a17.066667 17.066667 0 0 1 0-34.133334z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="print" unicode="" d="M843.946667 603.733333h-47.36V725.333333a90.026667 90.026667 0 0 1-94.72 85.333334H312.32a81.493333 81.493333 0 0 1-85.333333-85.333334v-121.6H170.666667a81.493333 81.493333 0 0 1-85.333334-85.333333v-325.12a89.173333 89.173333 0 0 1 85.333334-93.866667h56.746666v-52.48a89.6 89.6 0 0 1 89.6-89.6h389.973334a89.6 89.6 0 0 1 89.6 89.6v52.48h47.36a97.706667 97.706667 0 0 1 94.72 93.866667V518.4a90.026667 90.026667 0 0 1-94.72 85.333333zM279.466667 725.333333a30.72 30.72 0 0 0 32.853333 33.706667h389.546667c18.773333 0 42.666667-11.52 42.666666-33.706667v-121.6H279.466667z m465.066666-678.4a37.546667 37.546667 0 0 0-37.546666-37.973333H317.013333a37.546667 37.546667 0 0 0-37.546666 37.973333v170.666667a37.546667 37.546667 0 0 0 37.546666 38.4h389.973334a37.546667 37.546667 0 0 0 37.546666-37.973333z m142.506667 146.346667a45.653333 45.653333 0 0 0-42.666667-42.666667h-47.786666v66.133334a89.6 89.6 0 0 1-89.6 89.6H317.013333a89.6 89.6 0 0 1-89.6-89.6v-65.28H170.666667a37.546667 37.546667 0 0 0-33.28 42.666666v324.266667A31.146667 31.146667 0 0 0 170.666667 552.106667h673.28c19.2 0 42.666667-11.52 42.666666-33.706667z m-640 281.173333h-37.546667a13.226667 13.226667 0 0 0 0 26.026667h38.826667a13.226667 13.226667 0 1 0 0-26.026667z m94.293333 0H298.666667a13.226667 13.226667 0 1 0 0 26.026667h42.666666a13.226667 13.226667 0 0 0 0-26.026667z m426.666667-116.48H248.32a13.226667 13.226667 0 0 0 0 26.026667H768a13.226667 13.226667 0 0 0 0-26.026667z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="cols" unicode="" d="M128 448h384V832H128z m64 320h256v-256H192zM576 832v-384h384V832z m320-320H640V768h256zM192 384h64v-384H192zM384 384h64v-384H384zM640 384h64v-384H640zM832 384h64v-384h-64z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="export" unicode="" d="M896.4374528 479.830016c0 26.673152-21.6236032 48.2967552-48.2967552 48.2967552H630.8069376c-26.673152 0-48.2967552-21.6236032-48.2967552-48.2967552v-83.04831147H384.69522773l-2.71428266 5.36849067c-41.336832 87.44686933-35.95195733 204.128256 150.601728 199.94487467v-108.91537067l172.19037866 164.757504L532.58267307 822.7110912v-106.57245867c-228.64418133 5.70709333-263.651328-183.517184-157.433856-314.01028266l4.6891008-5.34664534h-88.46595414c-26.673152 0-48.2967552-21.6236032-48.2967552-48.2967552v-66.78882986h-98.43616426c-26.673152 0-40.4258816-21.6236032-30.71781547-48.2967552l79.10304427-217.33485227c9.70806613-26.673152 39.20145067-48.2967552 65.87460266-48.2967552h603.70670934c23.75898453 0 37.2506624 17.16169387 33.05745066 39.76178347 0.4980736 2.77108053 0.77441707 5.619712 0.77441707 8.53497173v463.765504z m-60.37067093-306.4528896l-21.8464256 60.02223787c-9.70806613 26.673152-39.20145067 48.2967552-65.87460267 48.2967552H303.44697173v30.56708266c0 13.336576 10.81125547 24.14783147 24.14783147 24.14783147h315.28605013v107.1972352c0 13.336576 10.81125547 24.14783147 24.14783147 24.14783147h144.88917333c13.336576 0 24.14783147-10.81125547 24.14783147-24.14783147v-270.2311424z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="slider" unicode="" d="M228.7 683.9v-66.7H112v66.7h116.7z m333.2-266.6v-66.7H112v66.7h449.9zM295.4 150.60000000000002V84H112v66.7h183.4v-0.1z m116.6 600c9 0 16.8-3.3 23.5-9.9 6.5-6.5 9.9-14.5 9.9-23.5v-133.3c0-9-3.3-16.8-9.9-23.5-6.5-6.5-14.5-9.9-23.5-9.9H278.8c-9 0-16.8 3.3-23.5 9.9-6.5 6.5-9.9 14.3-9.9 23.5V717.1c0 9 3.3 16.8 9.9 23.5 6.5 6.5 14.3 9.9 23.5 9.9h133.3v0.1h-0.1z m66.7-533.3c9 0 16.8-3.3 23.5-9.9 6.5-6.5 9.9-14.5 9.9-23.5v-133.3c0-9-3.3-16.8-9.9-23.5-6.5-6.5-14.5-9.9-23.5-9.9H345.3c-9 0-16.8 3.3-23.5 9.9-6.5 6.5-9.9 14.5-9.9 23.5V183.89999999999998c0 9 3.3 16.8 9.9 23.5 6.5 6.5 14.3 9.9 23.5 9.9h133.4v0.1zM912 683.9v-66.7H462.1v66.7H912z m0-533.3V84H528.6v66.7h383.3v-0.1h0.1zM745.2 483.9c9 0 16.8-3.3 23.5-9.9 6.5-6.5 9.9-14.5 9.9-23.5v-133.3c0-9-3.3-16.8-9.9-23.5-6.5-6.5-14.5-9.9-23.5-9.9H612c-9 0-16.8 3.3-23.5 9.9-6.5 6.5-9.9 14.3-9.9 23.5V450.6c0 9 3.3 16.8 9.9 23.5 6.5 6.5 14.5 9.9 23.5 9.9l133.2-0.1zM912 417.3v-66.7H795.3v66.7H912z" horiz-adv-x="1024" />
+
+
+
+
+ </font>
+</defs></svg>
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/font/iconfont.ttf b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/font/iconfont.ttf
new file mode 100644
index 0000000..0c8b0a5
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/font/iconfont.ttf
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/font/iconfont.woff b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/font/iconfont.woff
new file mode 100644
index 0000000..786bb2a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/font/iconfont.woff
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/0.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/0.gif
new file mode 100644
index 0000000..a63f0d5
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/0.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/1.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/1.gif
new file mode 100644
index 0000000..b2b78b2
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/1.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/10.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/10.gif
new file mode 100644
index 0000000..556c7e3
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/10.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/11.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/11.gif
new file mode 100644
index 0000000..2bfc58b
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/11.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/12.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/12.gif
new file mode 100644
index 0000000..1c321c7
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/12.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/13.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/13.gif
new file mode 100644
index 0000000..300bbc2
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/13.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/14.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/14.gif
new file mode 100644
index 0000000..43b6d0a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/14.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/15.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/15.gif
new file mode 100644
index 0000000..c9f25fa
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/15.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/16.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/16.gif
new file mode 100644
index 0000000..34f28e4
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/16.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/17.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/17.gif
new file mode 100644
index 0000000..39cd035
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/17.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/18.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/18.gif
new file mode 100644
index 0000000..7bce299
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/18.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/19.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/19.gif
new file mode 100644
index 0000000..adac542
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/19.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/2.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/2.gif
new file mode 100644
index 0000000..7edbb58
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/2.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/20.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/20.gif
new file mode 100644
index 0000000..50631a6
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/20.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/21.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/21.gif
new file mode 100644
index 0000000..b984212
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/21.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/22.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/22.gif
new file mode 100644
index 0000000..1f0bd8b
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/22.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/23.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/23.gif
new file mode 100644
index 0000000..e05e0f9
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/23.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/24.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/24.gif
new file mode 100644
index 0000000..f35928a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/24.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/25.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/25.gif
new file mode 100644
index 0000000..0b4a883
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/25.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/26.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/26.gif
new file mode 100644
index 0000000..45c4fb5
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/26.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/27.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/27.gif
new file mode 100644
index 0000000..7a4c013
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/27.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/28.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/28.gif
new file mode 100644
index 0000000..fc5a0cf
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/28.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/29.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/29.gif
new file mode 100644
index 0000000..5dd7442
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/29.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/3.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/3.gif
new file mode 100644
index 0000000..86df67b
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/3.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/30.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/30.gif
new file mode 100644
index 0000000..b751f98
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/30.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/31.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/31.gif
new file mode 100644
index 0000000..c9476d7
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/31.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/32.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/32.gif
new file mode 100644
index 0000000..9931b06
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/32.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/33.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/33.gif
new file mode 100644
index 0000000..59111a3
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/33.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/34.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/34.gif
new file mode 100644
index 0000000..a334548
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/34.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/35.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/35.gif
new file mode 100644
index 0000000..a932264
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/35.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/36.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/36.gif
new file mode 100644
index 0000000..6de432a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/36.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/37.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/37.gif
new file mode 100644
index 0000000..d05f2da
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/37.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/38.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/38.gif
new file mode 100644
index 0000000..8b1c88a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/38.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/39.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/39.gif
new file mode 100644
index 0000000..38b84a5
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/39.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/4.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/4.gif
new file mode 100644
index 0000000..d52200c
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/4.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/40.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/40.gif
new file mode 100644
index 0000000..ae42991
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/40.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/41.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/41.gif
new file mode 100644
index 0000000..b9c715c
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/41.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/42.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/42.gif
new file mode 100644
index 0000000..0eb1434
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/42.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/43.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/43.gif
new file mode 100644
index 0000000..ac0b700
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/43.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/44.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/44.gif
new file mode 100644
index 0000000..ad44497
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/44.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/45.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/45.gif
new file mode 100644
index 0000000..6837fca
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/45.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/46.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/46.gif
new file mode 100644
index 0000000..d62916d
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/46.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/47.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/47.gif
new file mode 100644
index 0000000..58a0836
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/47.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/48.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/48.gif
new file mode 100644
index 0000000..7ffd161
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/48.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/49.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/49.gif
new file mode 100644
index 0000000..959b992
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/49.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/5.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/5.gif
new file mode 100644
index 0000000..4e8b09f
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/5.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/50.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/50.gif
new file mode 100644
index 0000000..6e22e7f
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/50.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/51.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/51.gif
new file mode 100644
index 0000000..ad3f4d3
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/51.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/52.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/52.gif
new file mode 100644
index 0000000..39f8a22
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/52.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/53.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/53.gif
new file mode 100644
index 0000000..a181ee7
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/53.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/54.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/54.gif
new file mode 100644
index 0000000..e289d92
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/54.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/55.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/55.gif
new file mode 100644
index 0000000..4351083
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/55.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/56.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/56.gif
new file mode 100644
index 0000000..e0eff22
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/56.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/57.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/57.gif
new file mode 100644
index 0000000..0bf130f
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/57.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/58.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/58.gif
new file mode 100644
index 0000000..0f06508
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/58.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/59.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/59.gif
new file mode 100644
index 0000000..7081e4f
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/59.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/6.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/6.gif
new file mode 100644
index 0000000..f7715bf
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/6.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/60.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/60.gif
new file mode 100644
index 0000000..6e15f89
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/60.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/61.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/61.gif
new file mode 100644
index 0000000..f092d7e
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/61.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/62.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/62.gif
new file mode 100644
index 0000000..7fe4984
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/62.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/63.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/63.gif
new file mode 100644
index 0000000..cf8e23e
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/63.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/64.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/64.gif
new file mode 100644
index 0000000..a779719
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/64.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/65.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/65.gif
new file mode 100644
index 0000000..7bb98f2
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/65.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/66.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/66.gif
new file mode 100644
index 0000000..bb6d077
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/66.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/67.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/67.gif
new file mode 100644
index 0000000..6e33f7c
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/67.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/68.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/68.gif
new file mode 100644
index 0000000..1a6c400
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/68.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/69.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/69.gif
new file mode 100644
index 0000000..a02f0b2
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/69.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/7.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/7.gif
new file mode 100644
index 0000000..e6d4db8
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/7.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/70.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/70.gif
new file mode 100644
index 0000000..416c5c1
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/70.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/71.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/71.gif
new file mode 100644
index 0000000..c17d60c
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/71.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/8.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/8.gif
new file mode 100644
index 0000000..66f967b
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/8.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/9.gif b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/9.gif
new file mode 100644
index 0000000..6044740
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/images/face/9.gif
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/carousel.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/carousel.js
new file mode 100644
index 0000000..2be2c8c
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/carousel.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var i=layui.$,n=(layui.hint(),layui.device(),{config:{},set:function(e){var n=this;return n.config=i.extend({},n.config,e),n},on:function(e,i){return layui.onevent.call(this,t,e,i)}}),t="carousel",a="layui-this",l=">*[carousel-item]>*",o="layui-carousel-left",r="layui-carousel-right",d="layui-carousel-prev",s="layui-carousel-next",u="layui-carousel-arrow",c="layui-carousel-ind",m=function(e){var t=this;t.config=i.extend({},t.config,n.config,e),t.render()};m.prototype.config={width:"600px",height:"280px",full:!1,arrow:"hover",indicator:"inside",autoplay:!0,interval:3e3,anim:"",trigger:"click",index:0},m.prototype.render=function(){var e=this,n=e.config;n.elem=i(n.elem),n.elem[0]&&(e.elemItem=n.elem.find(l),n.index<0&&(n.index=0),n.index>=e.elemItem.length&&(n.index=e.elemItem.length-1),n.interval<800&&(n.interval=800),n.full?n.elem.css({position:"fixed",width:"100%",height:"100%",zIndex:9999}):n.elem.css({width:n.width,height:n.height}),n.elem.attr("lay-anim",n.anim),e.elemItem.eq(n.index).addClass(a),e.elemItem.length<=1||(e.indicator(),e.arrow(),e.autoplay(),e.events()))},m.prototype.reload=function(e){var n=this;clearInterval(n.timer),n.config=i.extend({},n.config,e),n.render()},m.prototype.prevIndex=function(){var e=this,i=e.config,n=i.index-1;return n<0&&(n=e.elemItem.length-1),n},m.prototype.nextIndex=function(){var e=this,i=e.config,n=i.index+1;return n>=e.elemItem.length&&(n=0),n},m.prototype.addIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index+e,n.index>=i.elemItem.length&&(n.index=0)},m.prototype.subIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index-e,n.index<0&&(n.index=i.elemItem.length-1)},m.prototype.autoplay=function(){var e=this,i=e.config;i.autoplay&&(e.timer=setInterval(function(){e.slide()},i.interval))},m.prototype.arrow=function(){var e=this,n=e.config,t=i(['<button class="layui-icon '+u+'" lay-type="sub">'+("updown"===n.anim?"":"")+"</button>",'<button class="layui-icon '+u+'" lay-type="add">'+("updown"===n.anim?"":"")+"</button>"].join(""));n.elem.attr("lay-arrow",n.arrow),n.elem.find("."+u)[0]&&n.elem.find("."+u).remove(),n.elem.append(t),t.on("click",function(){var n=i(this),t=n.attr("lay-type");e.slide(t)})},m.prototype.indicator=function(){var e=this,n=e.config,t=e.elemInd=i(['<div class="'+c+'"><ul>',function(){var i=[];return layui.each(e.elemItem,function(e){i.push("<li"+(n.index===e?' class="layui-this"':"")+"></li>")}),i.join("")}(),"</ul></div>"].join(""));n.elem.attr("lay-indicator",n.indicator),n.elem.find("."+c)[0]&&n.elem.find("."+c).remove(),n.elem.append(t),"updown"===n.anim&&t.css("margin-top",-(t.height()/2)),t.find("li").on("hover"===n.trigger?"mouseover":n.trigger,function(){var t=i(this),a=t.index();a>n.index?e.slide("add",a-n.index):a<n.index&&e.slide("sub",n.index-a)})},m.prototype.slide=function(e,i){var n=this,l=n.elemItem,u=n.config,c=u.index,m=u.elem.attr("lay-filter");n.haveSlide||("sub"===e?(n.subIndex(i),l.eq(u.index).addClass(d),setTimeout(function(){l.eq(c).addClass(r),l.eq(u.index).addClass(r)},50)):(n.addIndex(i),l.eq(u.index).addClass(s),setTimeout(function(){l.eq(c).addClass(o),l.eq(u.index).addClass(o)},50)),setTimeout(function(){l.removeClass(a+" "+d+" "+s+" "+o+" "+r),l.eq(u.index).addClass(a),n.haveSlide=!1},300),n.elemInd.find("li").eq(u.index).addClass(a).siblings().removeClass(a),n.haveSlide=!0,layui.event.call(this,t,"change("+m+")",{index:u.index,prevIndex:c,item:l.eq(u.index)}))},m.prototype.events=function(){var e=this,i=e.config;i.elem.data("haveEvents")||(i.elem.on("mouseenter",function(){clearInterval(e.timer)}).on("mouseleave",function(){e.autoplay()}),i.elem.data("haveEvents",!0))},n.render=function(e){var i=new m(e);return i},e(t,n)});
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/code.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/code.js
new file mode 100644
index 0000000..b33f9d6
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/code.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var a=layui.$,l="http://www.layui.com/doc/modules/code.html";e("code",function(e){var t=[];e=e||{},e.elem=a(e.elem||".layui-code"),e.about=!("about"in e)||e.about,e.elem.each(function(){t.push(this)}),layui.each(t.reverse(),function(t,i){var c=a(i),o=c.html();(c.attr("lay-encode")||e.encode)&&(o=o.replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/'/g,"'").replace(/"/g,""")),c.html('<ol class="layui-code-ol"><li>'+o.replace(/[\r\t\n]+/g,"</li><li>")+"</li></ol>"),c.find(">.layui-code-h3")[0]||c.prepend('<h3 class="layui-code-h3">'+(c.attr("lay-title")||e.title||"code")+(e.about?'<a href="'+l+'" target="_blank">layui.code</a>':"")+"</h3>");var d=c.find(">.layui-code-ol");c.addClass("layui-box layui-code-view"),(c.attr("lay-skin")||e.skin)&&c.addClass("layui-code-"+(c.attr("lay-skin")||e.skin)),(d.find("li").length/100|0)>0&&d.css("margin-left",(d.find("li").length/100|0)+"px"),(c.attr("lay-height")||e.height)&&d.css("max-height",c.attr("lay-height")||e.height)})})}).addcss("modules/code.css","skincodecss");
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/colorpicker.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/colorpicker.js
new file mode 100644
index 0000000..fd99bf8
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/colorpicker.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var i=layui.jquery,o={config:{},index:layui.colorpicker?layui.colorpicker.index+1e4:0,set:function(e){var o=this;return o.config=i.extend({},o.config,e),o},on:function(e,i){return layui.onevent.call(this,"colorpicker",e,i)}},r=function(){var e=this,i=e.config;return{config:i}},t="colorpicker",n="layui-show",l="layui-colorpicker",c=".layui-colorpicker-main",a="layui-icon-down",s="layui-icon-close",f="layui-colorpicker-trigger-span",d="layui-colorpicker-trigger-i",u="layui-colorpicker-side",p="layui-colorpicker-side-slider",g="layui-colorpicker-basis",v="layui-colorpicker-alpha-bgcolor",h="layui-colorpicker-alpha-slider",m="layui-colorpicker-basis-cursor",b="layui-colorpicker-main-input",k=function(e){var i={h:0,s:0,b:0},o=Math.min(e.r,e.g,e.b),r=Math.max(e.r,e.g,e.b),t=r-o;return i.b=r,i.s=0!=r?255*t/r:0,0!=i.s?e.r==r?i.h=(e.g-e.b)/t:e.g==r?i.h=2+(e.b-e.r)/t:i.h=4+(e.r-e.g)/t:i.h=-1,r==o&&(i.h=0),i.h*=60,i.h<0&&(i.h+=360),i.s*=100/255,i.b*=100/255,i},y=function(e){var e=e.indexOf("#")>-1?e.substring(1):e;if(3==e.length){var i=e.split("");e=i[0]+i[0]+i[1]+i[1]+i[2]+i[2]}e=parseInt(e,16);var o={r:e>>16,g:(65280&e)>>8,b:255&e};return k(o)},x=function(e){var i={},o=e.h,r=255*e.s/100,t=255*e.b/100;if(0==r)i.r=i.g=i.b=t;else{var n=t,l=(255-r)*t/255,c=(n-l)*(o%60)/60;360==o&&(o=0),o<60?(i.r=n,i.b=l,i.g=l+c):o<120?(i.g=n,i.b=l,i.r=n-c):o<180?(i.g=n,i.r=l,i.b=l+c):o<240?(i.b=n,i.r=l,i.g=n-c):o<300?(i.b=n,i.g=l,i.r=l+c):o<360?(i.r=n,i.g=l,i.b=n-c):(i.r=0,i.g=0,i.b=0)}return{r:Math.round(i.r),g:Math.round(i.g),b:Math.round(i.b)}},C=function(e){var o=x(e),r=[o.r.toString(16),o.g.toString(16),o.b.toString(16)];return i.each(r,function(e,i){1==i.length&&(r[e]="0"+i)}),r.join("")},P=function(e){var i=/[0-9]{1,3}/g,o=e.match(i)||[];return{r:o[0],g:o[1],b:o[2]}},B=i(window),w=i(document),D=function(e){var r=this;r.index=++o.index,r.config=i.extend({},r.config,o.config,e),r.render()};D.prototype.config={color:"",size:null,alpha:!1,format:"hex",predefine:!1,colors:["#009688","#5FB878","#1E9FFF","#FF5722","#FFB800","#01AAED","#999","#c00","#ff8c00","#ffd700","#90ee90","#00ced1","#1e90ff","#c71585","rgb(0, 186, 189)","rgb(255, 120, 0)","rgb(250, 212, 0)","#393D49","rgba(0,0,0,.5)","rgba(255, 69, 0, 0.68)","rgba(144, 240, 144, 0.5)","rgba(31, 147, 255, 0.73)"]},D.prototype.render=function(){var e=this,o=e.config,r=i(['<div class="layui-unselect layui-colorpicker">',"<span "+("rgb"==o.format&&o.alpha?'class="layui-colorpicker-trigger-bgcolor"':"")+">",'<span class="layui-colorpicker-trigger-span" ','lay-type="'+("rgb"==o.format?o.alpha?"rgba":"torgb":"")+'" ','style="'+function(){var e="";return o.color?(e=o.color,(o.color.match(/[0-9]{1,3}/g)||[]).length>3&&(o.alpha&&"rgb"==o.format||(e="#"+C(k(P(o.color))))),"background: "+e):e}()+'">','<i class="layui-icon layui-colorpicker-trigger-i '+(o.color?a:s)+'"></i>',"</span>","</span>","</div>"].join("")),t=i(o.elem);o.size&&r.addClass("layui-colorpicker-"+o.size),t.addClass("layui-inline").html(e.elemColorBox=r),e.color=e.elemColorBox.find("."+f)[0].style.background,e.events()},D.prototype.renderPicker=function(){var e=this,o=e.config,r=e.elemColorBox[0],t=e.elemPicker=i(['<div id="layui-colorpicker'+e.index+'" data-index="'+e.index+'" class="layui-anim layui-anim-upbit layui-colorpicker-main">','<div class="layui-colorpicker-main-wrapper">','<div class="layui-colorpicker-basis">','<div class="layui-colorpicker-basis-white"></div>','<div class="layui-colorpicker-basis-black"></div>','<div class="layui-colorpicker-basis-cursor"></div>',"</div>",'<div class="layui-colorpicker-side">','<div class="layui-colorpicker-side-slider"></div>',"</div>","</div>",'<div class="layui-colorpicker-main-alpha '+(o.alpha?n:"")+'">','<div class="layui-colorpicker-alpha-bgcolor">','<div class="layui-colorpicker-alpha-slider"></div>',"</div>","</div>",function(){if(o.predefine){var e=['<div class="layui-colorpicker-main-pre">'];return layui.each(o.colors,function(i,o){e.push(['<div class="layui-colorpicker-pre'+((o.match(/[0-9]{1,3}/g)||[]).length>3?" layui-colorpicker-pre-isalpha":"")+'">','<div style="background:'+o+'"></div>',"</div>"].join(""))}),e.push("</div>"),e.join("")}return""}(),'<div class="layui-colorpicker-main-input">','<div class="layui-inline">','<input type="text" class="layui-input">',"</div>",'<div class="layui-btn-container">','<button class="layui-btn layui-btn-primary layui-btn-sm" colorpicker-events="clear">清空</button>','<button class="layui-btn layui-btn-sm" colorpicker-events="confirm">确定</button>',"</div","</div>","</div>"].join(""));e.elemColorBox.find("."+f)[0];i(c)[0]&&i(c).data("index")==e.index?e.removePicker(D.thisElemInd):(e.removePicker(D.thisElemInd),i("body").append(t)),D.thisElemInd=e.index,D.thisColor=r.style.background,e.position(),e.pickerEvents()},D.prototype.removePicker=function(e){var o=this;o.config;return i("#layui-colorpicker"+(e||o.index)).remove(),o},D.prototype.position=function(){var e=this,i=e.config,o=e.bindElem||e.elemColorBox[0],r=e.elemPicker[0],t=o.getBoundingClientRect(),n=r.offsetWidth,l=r.offsetHeight,c=function(e){return e=e?"scrollLeft":"scrollTop",document.body[e]|document.documentElement[e]},a=function(e){return document.documentElement[e?"clientWidth":"clientHeight"]},s=5,f=t.left,d=t.bottom;f-=(n-o.offsetWidth)/2,d+=s,f+n+s>a("width")?f=a("width")-n-s:f<s&&(f=s),d+l+s>a()&&(d=t.top>l?t.top-l:a()-l,d-=2*s),i.position&&(r.style.position=i.position),r.style.left=f+("fixed"===i.position?0:c(1))+"px",r.style.top=d+("fixed"===i.position?0:c())+"px"},D.prototype.val=function(){var e=this,i=(e.config,e.elemColorBox.find("."+f)),o=e.elemPicker.find("."+b),r=i[0],t=r.style.backgroundColor;if(t){var n=k(P(t)),l=i.attr("lay-type");if(e.select(n.h,n.s,n.b),"torgb"===l&&o.find("input").val(t),"rgba"===l){var c=P(t);if(3==(t.match(/[0-9]{1,3}/g)||[]).length)o.find("input").val("rgba("+c.r+", "+c.g+", "+c.b+", 1)"),e.elemPicker.find("."+h).css("left",280);else{o.find("input").val(t);var a=280*t.slice(t.lastIndexOf(",")+1,t.length-1);e.elemPicker.find("."+h).css("left",a)}e.elemPicker.find("."+v)[0].style.background="linear-gradient(to right, rgba("+c.r+", "+c.g+", "+c.b+", 0), rgb("+c.r+", "+c.g+", "+c.b+"))"}}else e.select(0,100,100),o.find("input").val(""),e.elemPicker.find("."+v)[0].style.background="",e.elemPicker.find("."+h).css("left",280)},D.prototype.side=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f),t=r.attr("lay-type"),n=e.elemPicker.find("."+u),l=e.elemPicker.find("."+p),c=e.elemPicker.find("."+g),y=e.elemPicker.find("."+m),C=e.elemPicker.find("."+v),w=e.elemPicker.find("."+h),D=l[0].offsetTop/180*360,E=100-(y[0].offsetTop+3)/180*100,H=(y[0].offsetLeft+3)/260*100,W=Math.round(w[0].offsetLeft/280*100)/100,j=e.elemColorBox.find("."+d),F=e.elemPicker.find(".layui-colorpicker-pre").children("div"),L=function(i,n,l,c){e.select(i,n,l);var f=x({h:i,s:n,b:l});if(j.addClass(a).removeClass(s),r[0].style.background="rgb("+f.r+", "+f.g+", "+f.b+")","torgb"===t&&e.elemPicker.find("."+b).find("input").val("rgb("+f.r+", "+f.g+", "+f.b+")"),"rgba"===t){var d=0;d=280*c,w.css("left",d),e.elemPicker.find("."+b).find("input").val("rgba("+f.r+", "+f.g+", "+f.b+", "+c+")"),r[0].style.background="rgba("+f.r+", "+f.g+", "+f.b+", "+c+")",C[0].style.background="linear-gradient(to right, rgba("+f.r+", "+f.g+", "+f.b+", 0), rgb("+f.r+", "+f.g+", "+f.b+"))"}o.change&&o.change(e.elemPicker.find("."+b).find("input").val())},M=i(['<div class="layui-auxiliar-moving" id="LAY-colorpicker-moving"></div'].join("")),Y=function(e){i("#LAY-colorpicker-moving")[0]||i("body").append(M),M.on("mousemove",e),M.on("mouseup",function(){M.remove()}).on("mouseleave",function(){M.remove()})};l.on("mousedown",function(e){var i=this.offsetTop,o=e.clientY,r=function(e){var r=i+(e.clientY-o),t=n[0].offsetHeight;r<0&&(r=0),r>t&&(r=t);var l=r/180*360;D=l,L(l,H,E,W),e.preventDefault()};Y(r),e.preventDefault()}),n.on("click",function(e){var o=e.clientY-i(this).offset().top;o<0&&(o=0),o>this.offsetHeight&&(o=this.offsetHeight);var r=o/180*360;D=r,L(r,H,E,W),e.preventDefault()}),y.on("mousedown",function(e){var i=this.offsetTop,o=this.offsetLeft,r=e.clientY,t=e.clientX,n=function(e){var n=i+(e.clientY-r),l=o+(e.clientX-t),a=c[0].offsetHeight-3,s=c[0].offsetWidth-3;n<-3&&(n=-3),n>a&&(n=a),l<-3&&(l=-3),l>s&&(l=s);var f=(l+3)/260*100,d=100-(n+3)/180*100;E=d,H=f,L(D,f,d,W),e.preventDefault()};layui.stope(e),Y(n),e.preventDefault()}),c.on("mousedown",function(e){var o=e.clientY-i(this).offset().top-3+B.scrollTop(),r=e.clientX-i(this).offset().left-3+B.scrollLeft();o<-3&&(o=-3),o>this.offsetHeight-3&&(o=this.offsetHeight-3),r<-3&&(r=-3),r>this.offsetWidth-3&&(r=this.offsetWidth-3);var t=(r+3)/260*100,n=100-(o+3)/180*100;E=n,H=t,L(D,t,n,W),e.preventDefault(),y.trigger(e,"mousedown")}),w.on("mousedown",function(e){var i=this.offsetLeft,o=e.clientX,r=function(e){var r=i+(e.clientX-o),t=C[0].offsetWidth;r<0&&(r=0),r>t&&(r=t);var n=Math.round(r/280*100)/100;W=n,L(D,H,E,n),e.preventDefault()};Y(r),e.preventDefault()}),C.on("click",function(e){var o=e.clientX-i(this).offset().left;o<0&&(o=0),o>this.offsetWidth&&(o=this.offsetWidth);var r=Math.round(o/280*100)/100;W=r,L(D,H,E,r),e.preventDefault()}),F.each(function(){i(this).on("click",function(){i(this).parent(".layui-colorpicker-pre").addClass("selected").siblings().removeClass("selected");var e,o=this.style.backgroundColor,r=k(P(o)),t=o.slice(o.lastIndexOf(",")+1,o.length-1);D=r.h,H=r.s,E=r.b,3==(o.match(/[0-9]{1,3}/g)||[]).length&&(t=1),W=t,e=280*t,L(r.h,r.s,r.b,t)})})},D.prototype.select=function(e,i,o,r){var t=this,n=(t.config,C({h:e,s:100,b:100})),l=C({h:e,s:i,b:o}),c=e/360*180,a=180-o/100*180-3,s=i/100*260-3;t.elemPicker.find("."+p).css("top",c),t.elemPicker.find("."+g)[0].style.background="#"+n,t.elemPicker.find("."+m).css({top:a,left:s}),"change"!==r&&t.elemPicker.find("."+b).find("input").val("#"+l)},D.prototype.pickerEvents=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f),t=e.elemPicker.find("."+b+" input"),n={clear:function(i){r[0].style.background="",e.elemColorBox.find("."+d).removeClass(a).addClass(s),e.color="",o.done&&o.done(""),e.removePicker()},confirm:function(i,n){var l=t.val(),c=l,f={};if(l.indexOf(",")>-1){if(f=k(P(l)),e.select(f.h,f.s,f.b),r[0].style.background=c="#"+C(f),(l.match(/[0-9]{1,3}/g)||[]).length>3&&"rgba"===r.attr("lay-type")){var u=280*l.slice(l.lastIndexOf(",")+1,l.length-1);e.elemPicker.find("."+h).css("left",u),r[0].style.background=l,c=l}}else f=y(l),r[0].style.background=c="#"+C(f),e.elemColorBox.find("."+d).removeClass(s).addClass(a);return"change"===n?(e.select(f.h,f.s,f.b,n),void(o.change&&o.change(c))):(e.color=l,o.done&&o.done(l),void e.removePicker())}};e.elemPicker.on("click","*[colorpicker-events]",function(){var e=i(this),o=e.attr("colorpicker-events");n[o]&&n[o].call(this,e)}),t.on("keyup",function(e){var o=i(this);n.confirm.call(this,o,13===e.keyCode?null:"change")})},D.prototype.events=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f);e.elemColorBox.on("click",function(){e.renderPicker(),i(c)[0]&&(e.val(),e.side())}),o.elem[0]&&!e.elemColorBox[0].eventHandler&&(w.on("click",function(o){if(!i(o.target).hasClass(l)&&!i(o.target).parents("."+l)[0]&&!i(o.target).hasClass(c.replace(/\./g,""))&&!i(o.target).parents(c)[0]&&e.elemPicker){if(e.color){var t=k(P(e.color));e.select(t.h,t.s,t.b)}else e.elemColorBox.find("."+d).removeClass(a).addClass(s);r[0].style.background=e.color||"",e.removePicker()}}),B.on("resize",function(){return!(!e.elemPicker||!i(c)[0])&&void e.position()}),e.elemColorBox[0].eventHandler=!0)},o.render=function(e){var i=new D(e);return r.call(i)},e(t,o)});
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/element.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/element.js
new file mode 100644
index 0000000..ac628df
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/element.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(t){"use strict";var a=layui.$,i=(layui.hint(),layui.device()),e="element",l="layui-this",n="layui-show",s=function(){this.config={}};s.prototype.set=function(t){var i=this;return a.extend(!0,i.config,t),i},s.prototype.on=function(t,a){return layui.onevent.call(this,e,t,a)},s.prototype.tabAdd=function(t,i){var e=".layui-tab-title",l=a(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.children(".layui-tab-bar"),o=l.children(".layui-tab-content"),r='<li lay-id="'+(i.id||"")+'"'+(i.attr?' lay-attr="'+i.attr+'"':"")+">"+(i.title||"unnaming")+"</li>";return s[0]?s.before(r):n.append(r),o.append('<div class="layui-tab-item">'+(i.content||"")+"</div>"),f.hideTabMore(!0),f.tabAuto(),this},s.prototype.tabDelete=function(t,i){var e=".layui-tab-title",l=a(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+i+'"]');return f.tabDelete(null,s),this},s.prototype.tabChange=function(t,i){var e=".layui-tab-title",l=a(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+i+'"]');return f.tabClick.call(s[0],null,null,s),this},s.prototype.tab=function(t){t=t||{},b.on("click",t.headerElem,function(i){var e=a(this).index();f.tabClick.call(this,i,e,null,t)})},s.prototype.progress=function(t,i){var e="layui-progress",l=a("."+e+"[lay-filter="+t+"]"),n=l.find("."+e+"-bar"),s=n.find("."+e+"-text");return n.css("width",i),s.text(i),this};var o=".layui-nav",r="layui-nav-item",c="layui-nav-bar",u="layui-nav-tree",d="layui-nav-child",y="layui-nav-more",h="layui-anim layui-anim-upbit",f={tabClick:function(t,i,s,o){o=o||{};var r=s||a(this),i=i||r.parent().children("li").index(r),c=o.headerElem?r.parent():r.parents(".layui-tab").eq(0),u=o.bodyElem?a(o.bodyElem):c.children(".layui-tab-content").children(".layui-tab-item"),d=r.find("a"),y=c.attr("lay-filter");"javascript:;"!==d.attr("href")&&"_blank"===d.attr("target")||(r.addClass(l).siblings().removeClass(l),u.eq(i).addClass(n).siblings().removeClass(n)),layui.event.call(this,e,"tab("+y+")",{elem:c,index:i})},tabDelete:function(t,i){var n=i||a(this).parent(),s=n.index(),o=n.parents(".layui-tab").eq(0),r=o.children(".layui-tab-content").children(".layui-tab-item"),c=o.attr("lay-filter");n.hasClass(l)&&(n.next()[0]?f.tabClick.call(n.next()[0],null,s+1):n.prev()[0]&&f.tabClick.call(n.prev()[0],null,s-1)),n.remove(),r.eq(s).remove(),setTimeout(function(){f.tabAuto()},50),layui.event.call(this,e,"tabDelete("+c+")",{elem:o,index:s})},tabAuto:function(){var t="layui-tab-more",e="layui-tab-bar",l="layui-tab-close",n=this;a(".layui-tab").each(function(){var s=a(this),o=s.children(".layui-tab-title"),r=(s.children(".layui-tab-content").children(".layui-tab-item"),'lay-stope="tabmore"'),c=a('<span class="layui-unselect layui-tab-bar" '+r+"><i "+r+' class="layui-icon"></i></span>');if(n===window&&8!=i.ie&&f.hideTabMore(!0),s.attr("lay-allowClose")&&o.find("li").each(function(){var t=a(this);if(!t.find("."+l)[0]){var i=a('<i class="layui-icon layui-unselect '+l+'">ဆ</i>');i.on("click",f.tabDelete),t.append(i)}}),"string"!=typeof s.attr("lay-unauto"))if(o.prop("scrollWidth")>o.outerWidth()+1){if(o.find("."+e)[0])return;o.append(c),s.attr("overflow",""),c.on("click",function(a){o[this.title?"removeClass":"addClass"](t),this.title=this.title?"":"收缩"})}else o.find("."+e).remove(),s.removeAttr("overflow")})},hideTabMore:function(t){var i=a(".layui-tab-title");t!==!0&&"tabmore"===a(t.target).attr("lay-stope")||(i.removeClass("layui-tab-more"),i.find(".layui-tab-bar").attr("title",""))},clickThis:function(){var t=a(this),i=t.parents(o),n=i.attr("lay-filter"),s=t.parent(),c=t.siblings("."+d),y="string"==typeof s.attr("lay-unselect");"javascript:;"!==t.attr("href")&&"_blank"===t.attr("target")||y||c[0]||(i.find("."+l).removeClass(l),s.addClass(l)),i.hasClass(u)&&(c.removeClass(h),c[0]&&(s["none"===c.css("display")?"addClass":"removeClass"](r+"ed"),"all"===i.attr("lay-shrink")&&s.siblings().removeClass(r+"ed"))),layui.event.call(this,e,"nav("+n+")",t)},collapse:function(){var t=a(this),i=t.find(".layui-colla-icon"),l=t.siblings(".layui-colla-content"),s=t.parents(".layui-collapse").eq(0),o=s.attr("lay-filter"),r="none"===l.css("display");if("string"==typeof s.attr("lay-accordion")){var c=s.children(".layui-colla-item").children("."+n);c.siblings(".layui-colla-title").children(".layui-colla-icon").html(""),c.removeClass(n)}l[r?"addClass":"removeClass"](n),i.html(r?"":""),layui.event.call(this,e,"collapse("+o+")",{title:t,content:l,show:r})}};s.prototype.init=function(t,e){var l=function(){return e?'[lay-filter="'+e+'"]':""}(),s={tab:function(){f.tabAuto.call({})},nav:function(){var t=200,e={},s={},p={},b=function(l,o,r){var c=a(this),f=c.find("."+d);o.hasClass(u)?l.css({top:c.position().top,height:c.children("a").outerHeight(),opacity:1}):(f.addClass(h),l.css({left:c.position().left+parseFloat(c.css("marginLeft")),top:c.position().top+c.height()-l.height()}),e[r]=setTimeout(function(){l.css({width:c.width(),opacity:1})},i.ie&&i.ie<10?0:t),clearTimeout(p[r]),"block"===f.css("display")&&clearTimeout(s[r]),s[r]=setTimeout(function(){f.addClass(n),c.find("."+y).addClass(y+"d")},300))};a(o+l).each(function(i){var l=a(this),o=a('<span class="'+c+'"></span>'),h=l.find("."+r);l.find("."+c)[0]||(l.append(o),h.on("mouseenter",function(){b.call(this,o,l,i)}).on("mouseleave",function(){l.hasClass(u)||(clearTimeout(s[i]),s[i]=setTimeout(function(){l.find("."+d).removeClass(n),l.find("."+y).removeClass(y+"d")},300))}),l.on("mouseleave",function(){clearTimeout(e[i]),p[i]=setTimeout(function(){l.hasClass(u)?o.css({height:0,top:o.position().top+o.height()/2,opacity:0}):o.css({width:0,left:o.position().left+o.width()/2,opacity:0})},t)})),h.find("a").each(function(){var t=a(this),i=(t.parent(),t.siblings("."+d));i[0]&&!t.children("."+y)[0]&&t.append('<span class="'+y+'"></span>'),t.off("click",f.clickThis).on("click",f.clickThis)})})},breadcrumb:function(){var t=".layui-breadcrumb";a(t+l).each(function(){var t=a(this),i="lay-separator",e=t.attr(i)||"/",l=t.find("a");l.next("span["+i+"]")[0]||(l.each(function(t){t!==l.length-1&&a(this).after("<span "+i+">"+e+"</span>")}),t.css("visibility","visible"))})},progress:function(){var t="layui-progress";a("."+t+l).each(function(){var i=a(this),e=i.find(".layui-progress-bar"),l=e.attr("lay-percent");e.css("width",function(){return/^.+\/.+$/.test(l)?100*new Function("return "+l)()+"%":l}()),i.attr("lay-showPercent")&&setTimeout(function(){e.html('<span class="'+t+'-text">'+l+"</span>")},350)})},collapse:function(){var t="layui-collapse";a("."+t+l).each(function(){var t=a(this).find(".layui-colla-item");t.each(function(){var t=a(this),i=t.find(".layui-colla-title"),e=t.find(".layui-colla-content"),l="none"===e.css("display");i.find(".layui-colla-icon").remove(),i.append('<i class="layui-icon layui-colla-icon">'+(l?"":"")+"</i>"),i.off("click",f.collapse).on("click",f.collapse)})})}};return s[t]?s[t]():layui.each(s,function(t,a){a()})},s.prototype.render=s.prototype.init;var p=new s,b=a(document);p.render();var v=".layui-tab-title li";b.on("click",v,f.tabClick),b.on("click",f.hideTabMore),a(window).on("resize",f.tabAuto),t(e,p)});
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/flow.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/flow.js
new file mode 100644
index 0000000..8a80c05
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/flow.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var l=layui.$,o=function(e){},t='<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon "></i>';o.prototype.load=function(e){var o,i,n,r,a=this,c=0;e=e||{};var f=l(e.elem);if(f[0]){var m=l(e.scrollElem||document),u=e.mb||50,s=!("isAuto"in e)||e.isAuto,v=e.end||"没有更多了",y=e.scrollElem&&e.scrollElem!==document,d="<cite>加载更多</cite>",h=l('<div class="layui-flow-more"><a href="javascript:;">'+d+"</a></div>");f.find(".layui-flow-more")[0]||f.append(h);var p=function(e,t){e=l(e),h.before(e),t=0==t||null,t?h.html(v):h.find("a").html(d),i=t,o=null,n&&n()},g=function(){o=!0,h.find("a").html(t),"function"==typeof e.done&&e.done(++c,p)};if(g(),h.find("a").on("click",function(){l(this);i||o||g()}),e.isLazyimg)var n=a.lazyimg({elem:e.elem+" img",scrollElem:e.scrollElem});return s?(m.on("scroll",function(){var e=l(this),t=e.scrollTop();r&&clearTimeout(r),i||(r=setTimeout(function(){var i=y?e.height():l(window).height(),n=y?e.prop("scrollHeight"):document.documentElement.scrollHeight;n-t-i<=u&&(o||g())},100))}),a):a}},o.prototype.lazyimg=function(e){var o,t=this,i=0;e=e||{};var n=l(e.scrollElem||document),r=e.elem||"img",a=e.scrollElem&&e.scrollElem!==document,c=function(e,l){var o=n.scrollTop(),r=o+l,c=a?function(){return e.offset().top-n.offset().top+o}():e.offset().top;if(c>=o&&c<=r&&!e.attr("src")){var m=e.attr("lay-src");layui.img(m,function(){var l=t.lazyimg.elem.eq(i);e.attr("src",m).removeAttr("lay-src"),l[0]&&f(l),i++})}},f=function(e,o){var f=a?(o||n).height():l(window).height(),m=n.scrollTop(),u=m+f;if(t.lazyimg.elem=l(r),e)c(e,f);else for(var s=0;s<t.lazyimg.elem.length;s++){var v=t.lazyimg.elem.eq(s),y=a?function(){return v.offset().top-n.offset().top+m}():v.offset().top;if(c(v,f),i=s,y>u)break}};if(f(),!o){var m;n.on("scroll",function(){var e=l(this);m&&clearTimeout(m),m=setTimeout(function(){f(null,e)},50)}),o=!0}return f},e("flow",new o)});
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/form.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/form.js
new file mode 100644
index 0000000..daa8ce5
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/form.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("layer",function(e){"use strict";var t=layui.$,i=layui.layer,a=layui.hint(),n=layui.device(),l="form",r=".layui-form",s="layui-this",o="layui-hide",c="layui-disabled",u=function(){this.config={verify:{required:[/[\S]+/,"必填项不能为空"],phone:[/^1\d{10}$/,"请输入正确的手机号"],email:[/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/,"邮箱格式不正确"],url:[/(^#)|(^http(s*):\/\/[^\s]+\.[^\s]+)/,"链接格式不正确"],number:function(e){if(!e||isNaN(e))return"只能填写数字"},date:[/^(\d{4})[-\/](\d{1}|0\d{1}|1[0-2])([-\/](\d{1}|0\d{1}|[1-2][0-9]|3[0-1]))*$/,"日期格式不正确"],identity:[/(^\d{15}$)|(^\d{17}(x|X|\d)$)/,"请输入正确的身份证号"]}}};u.prototype.set=function(e){var i=this;return t.extend(!0,i.config,e),i},u.prototype.verify=function(e){var i=this;return t.extend(!0,i.config.verify,e),i},u.prototype.on=function(e,t){return layui.onevent.call(this,l,e,t)},u.prototype.val=function(e,i){var a=t(r+'[lay-filter="'+e+'"]');a.each(function(e,a){var n=t(this);layui.each(i,function(e,t){var i,a=n.find('[name="'+e+'"]');a[0]&&(i=a[0].type,"checkbox"===i?a[0].checked=t:"radio"===i?a.each(function(){this.value===t&&(this.checked=!0)}):a.val(t))})}),f.render(null,e)},u.prototype.render=function(e,i){var n=this,u=t(r+function(){return i?'[lay-filter="'+i+'"]':""}()),d={select:function(){var e,i="请选择",a="layui-form-select",n="layui-select-title",r="layui-select-none",d="",f=u.find("select"),v=function(i,l){t(i.target).parent().hasClass(n)&&!l||(t("."+a).removeClass(a+"ed "+a+"up"),e&&d&&e.val(d)),e=null},y=function(i,u,f){var y,p=t(this),m=i.find("."+n),k=m.find("input"),x=i.find("dl"),g=x.children("dd"),b=this.selectedIndex;if(!u){var C=function(){var e=i.offset().top+i.outerHeight()+5-h.scrollTop(),t=x.outerHeight();b=p[0].selectedIndex,i.addClass(a+"ed"),g.removeClass(o),y=null,g.eq(b).addClass(s).siblings().removeClass(s),e+t>h.height()&&e>=t&&i.addClass(a+"up"),$()},w=function(e){i.removeClass(a+"ed "+a+"up"),k.blur(),y=null,e||T(k.val(),function(e){var i=p[0].selectedIndex;e&&(d=t(p[0].options[i]).html(),0===i&&d===k.attr("placeholder")&&(d=""),k.val(d||""))})},$=function(){var e=x.children("dd."+s);if(e[0]){var t=e.position().top,i=x.height(),a=e.height();t>i&&x.scrollTop(t+x.scrollTop()-i+a-5),t<0&&x.scrollTop(t+x.scrollTop()-5)}};m.on("click",function(e){i.hasClass(a+"ed")?w():(v(e,!0),C()),x.find("."+r).remove()}),m.find(".layui-edge").on("click",function(){k.focus()}),k.on("keyup",function(e){var t=e.keyCode;9===t&&C()}).on("keydown",function(e){var t=e.keyCode;9===t&&w();var i=function(t,a){var n,l;e.preventDefault();var r=function(){var e=x.children("dd."+s);if(x.children("dd."+o)[0]&&"next"===t){var i=x.children("dd:not(."+o+",."+c+")"),n=i.eq(0).index();if(n>=0&&n<e.index()&&!i.hasClass(s))return i.eq(0).prev()[0]?i.eq(0).prev():x.children(":last")}return a&&a[0]?a:y&&y[0]?y:e}();return l=r[t](),n=r[t]("dd:not(."+o+")"),l[0]?(y=r[t](),n[0]&&!n.hasClass(c)||!y[0]?(n.addClass(s).siblings().removeClass(s),void $()):i(t,y)):y=null};38===t&&i("prev"),40===t&&i("next"),13===t&&(e.preventDefault(),x.children("dd."+s).trigger("click"))});var T=function(e,i,a){var n=0;layui.each(g,function(){var i=t(this),l=i.text(),r=l.indexOf(e)===-1;(""===e||"blur"===a?e!==l:r)&&n++,"keyup"===a&&i[r?"addClass":"removeClass"](o)});var l=n===g.length;return i(l),l},j=function(e){var t=this.value,i=e.keyCode;return 9!==i&&13!==i&&37!==i&&38!==i&&39!==i&&40!==i&&(T(t,function(e){e?x.find("."+r)[0]||x.append('<p class="'+r+'">无匹配项</p>'):x.find("."+r).remove()},"keyup"),""===t&&x.find("."+r).remove(),void $())};f&&k.on("keyup",j).on("blur",function(i){var a=p[0].selectedIndex;e=k,d=t(p[0].options[a]).html(),0===a&&d===k.attr("placeholder")&&(d=""),setTimeout(function(){T(k.val(),function(e){d||k.val("")},"blur")},200)}),g.on("click",function(){var e=t(this),a=e.attr("lay-value"),n=p.attr("lay-filter");return!e.hasClass(c)&&(e.hasClass("layui-select-tips")?k.val(""):(k.val(e.text()),e.addClass(s)),e.siblings().removeClass(s),p.val(a).removeClass("layui-form-danger"),layui.event.call(this,l,"select("+n+")",{elem:p[0],value:a,othis:i}),w(!0),!1)}),i.find("dl>dt").on("click",function(e){return!1}),t(document).off("click",v).on("click",v)}};f.each(function(e,l){var r=t(this),o=r.next("."+a),u=this.disabled,d=l.value,f=t(l.options[l.selectedIndex]),v=l.options[0];if("string"==typeof r.attr("lay-ignore"))return r.show();var h="string"==typeof r.attr("lay-search"),p=v?v.value?i:v.innerHTML||i:i,m=t(['<div class="'+(h?"":"layui-unselect ")+a,(u?" layui-select-disabled":"")+'">','<div class="'+n+'">','<input type="text" placeholder="'+p+'" '+('value="'+(d?f.html():"")+'"')+(h?"":" readonly")+' class="layui-input'+(h?"":" layui-unselect")+(u?" "+c:"")+'">','<i class="layui-edge"></i></div>','<dl class="layui-anim layui-anim-upbit'+(r.find("optgroup")[0]?" layui-select-group":"")+'">',function(e){var t=[];return layui.each(e,function(e,a){0!==e||a.value?"optgroup"===a.tagName.toLowerCase()?t.push("<dt>"+a.label+"</dt>"):t.push('<dd lay-value="'+a.value+'" class="'+(d===a.value?s:"")+(a.disabled?" "+c:"")+'">'+a.innerHTML+"</dd>"):t.push('<dd lay-value="" class="layui-select-tips">'+(a.innerHTML||i)+"</dd>")}),0===t.length&&t.push('<dd lay-value="" class="'+c+'">没有选项</dd>'),t.join("")}(r.find("*"))+"</dl>","</div>"].join(""));o[0]&&o.remove(),r.after(m),y.call(this,m,u,h)})},checkbox:function(){var e={checkbox:["layui-form-checkbox","layui-form-checked","checkbox"],_switch:["layui-form-switch","layui-form-onswitch","switch"]},i=u.find("input[type=checkbox]"),a=function(e,i){var a=t(this);e.on("click",function(){var t=a.attr("lay-filter"),n=(a.attr("lay-text")||"").split("|");a[0].disabled||(a[0].checked?(a[0].checked=!1,e.removeClass(i[1]).find("em").text(n[1])):(a[0].checked=!0,e.addClass(i[1]).find("em").text(n[0])),layui.event.call(a[0],l,i[2]+"("+t+")",{elem:a[0],value:a[0].value,othis:e}))})};i.each(function(i,n){var l=t(this),r=l.attr("lay-skin"),s=(l.attr("lay-text")||"").split("|"),o=this.disabled;"switch"===r&&(r="_"+r);var u=e[r]||e.checkbox;if("string"==typeof l.attr("lay-ignore"))return l.show();var d=l.next("."+u[0]),f=t(['<div class="layui-unselect '+u[0],n.checked?" "+u[1]:"",o?" layui-checkbox-disbaled "+c:"",'"',r?' lay-skin="'+r+'"':"",">",function(){var e=n.title.replace(/\s/g,""),t={checkbox:[e?"<span>"+n.title+"</span>":"",'<i class="layui-icon layui-icon-ok"></i>'].join(""),_switch:"<em>"+((n.checked?s[0]:s[1])||"")+"</em><i></i>"};return t[r]||t.checkbox}(),"</div>"].join(""));d[0]&&d.remove(),l.after(f),a.call(this,f,u)})},radio:function(){var e="layui-form-radio",i=["",""],a=u.find("input[type=radio]"),n=function(a){var n=t(this),s="layui-anim-scaleSpring";a.on("click",function(){var o=n[0].name,c=n.parents(r),u=n.attr("lay-filter"),d=c.find("input[name="+o.replace(/(\.|#|\[|\])/g,"\\$1")+"]");n[0].disabled||(layui.each(d,function(){var a=t(this).next("."+e);this.checked=!1,a.removeClass(e+"ed"),a.find(".layui-icon").removeClass(s).html(i[1])}),n[0].checked=!0,a.addClass(e+"ed"),a.find(".layui-icon").addClass(s).html(i[0]),layui.event.call(n[0],l,"radio("+u+")",{elem:n[0],value:n[0].value,othis:a}))})};a.each(function(a,l){var r=t(this),s=r.next("."+e),o=this.disabled;if("string"==typeof r.attr("lay-ignore"))return r.show();s[0]&&s.remove();var u=t(['<div class="layui-unselect '+e,l.checked?" "+e+"ed":"",(o?" layui-radio-disbaled "+c:"")+'">','<i class="layui-anim layui-icon">'+i[l.checked?0:1]+"</i>","<div>"+function(){var e=l.title||"";return"string"==typeof r.next().attr("lay-radio")&&(e=r.next().html(),r.next().remove()),e}()+"</div>","</div>"].join(""));r.after(u),n.call(this,u)})}};return e?d[e]?d[e]():a.error("不支持的"+e+"表单渲染"):layui.each(d,function(e,t){t()}),n};var d=function(){var e=t(this),a=f.config.verify,s=null,o="layui-form-danger",c={},u=e.parents(r),d=u.find("*[lay-verify]"),v=e.parents("form")[0],h=u.find("input,select,textarea"),y=e.attr("lay-filter");if(layui.each(d,function(e,l){var r=t(this),c=r.attr("lay-verify").split("|"),u=r.attr("lay-verType"),d=r.val();if(r.removeClass(o),layui.each(c,function(e,t){var c,f="",v="function"==typeof a[t];if(a[t]){var c=v?f=a[t](d,l):!a[t][0].test(d);if(f=f||a[t][1],c)return"tips"===u?i.tips(f,function(){return"string"==typeof r.attr("lay-ignore")||"select"!==l.tagName.toLowerCase()&&!/^checkbox|radio$/.test(l.type)?r:r.next()}(),{tips:1}):"alert"===u?i.alert(f,{title:"提示",shadeClose:!0}):i.msg(f,{icon:5,shift:6}),n.android||n.ios||l.focus(),r.addClass(o),s=!0}}),s)return s}),s)return!1;var p={};return layui.each(h,function(e,t){if(t.name=(t.name||"").replace(/^\s*|\s*&/,""),t.name){if(/^.*\[\]$/.test(t.name)){var i=t.name.match(/^(.*)\[\]$/g)[0];p[i]=0|p[i],t.name=t.name.replace(/^(.*)\[\]$/,"$1["+p[i]++ +"]")}/^checkbox|radio$/.test(t.type)&&!t.checked||(c[t.name]=t.value)}}),layui.event.call(this,l,"submit("+y+")",{elem:this,form:v,field:c})},f=new u,v=t(document),h=t(window);f.render(),v.on("reset",r,function(){var e=t(this).attr("lay-filter");setTimeout(function(){f.render(null,e)},50)}),v.on("submit",r,d).on("click","*[lay-submit]",d),e(l,f)});
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/jquery.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/jquery.js
new file mode 100644
index 0000000..242696a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/jquery.js
@@ -0,0 +1,5 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;!function(e,t){"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){function n(e){var t=!!e&&"length"in e&&e.length,n=pe.type(e);return"function"!==n&&!pe.isWindow(e)&&("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e)}function r(e,t,n){if(pe.isFunction(t))return pe.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return pe.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(Ce.test(t))return pe.filter(t,e,n);t=pe.filter(t,e)}return pe.grep(e,function(e){return pe.inArray(e,t)>-1!==n})}function i(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function o(e){var t={};return pe.each(e.match(De)||[],function(e,n){t[n]=!0}),t}function a(){re.addEventListener?(re.removeEventListener("DOMContentLoaded",s),e.removeEventListener("load",s)):(re.detachEvent("onreadystatechange",s),e.detachEvent("onload",s))}function s(){(re.addEventListener||"load"===e.event.type||"complete"===re.readyState)&&(a(),pe.ready())}function u(e,t,n){if(void 0===n&&1===e.nodeType){var r="data-"+t.replace(_e,"-$1").toLowerCase();if(n=e.getAttribute(r),"string"==typeof n){try{n="true"===n||"false"!==n&&("null"===n?null:+n+""===n?+n:qe.test(n)?pe.parseJSON(n):n)}catch(i){}pe.data(e,t,n)}else n=void 0}return n}function l(e){var t;for(t in e)if(("data"!==t||!pe.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function c(e,t,n,r){if(He(e)){var i,o,a=pe.expando,s=e.nodeType,u=s?pe.cache:e,l=s?e[a]:e[a]&&a;if(l&&u[l]&&(r||u[l].data)||void 0!==n||"string"!=typeof t)return l||(l=s?e[a]=ne.pop()||pe.guid++:a),u[l]||(u[l]=s?{}:{toJSON:pe.noop}),"object"!=typeof t&&"function"!=typeof t||(r?u[l]=pe.extend(u[l],t):u[l].data=pe.extend(u[l].data,t)),o=u[l],r||(o.data||(o.data={}),o=o.data),void 0!==n&&(o[pe.camelCase(t)]=n),"string"==typeof t?(i=o[t],null==i&&(i=o[pe.camelCase(t)])):i=o,i}}function f(e,t,n){if(He(e)){var r,i,o=e.nodeType,a=o?pe.cache:e,s=o?e[pe.expando]:pe.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){pe.isArray(t)?t=t.concat(pe.map(t,pe.camelCase)):t in r?t=[t]:(t=pe.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;for(;i--;)delete r[t[i]];if(n?!l(r):!pe.isEmptyObject(r))return}(n||(delete a[s].data,l(a[s])))&&(o?pe.cleanData([e],!0):fe.deleteExpando||a!=a.window?delete a[s]:a[s]=void 0)}}}function d(e,t,n,r){var i,o=1,a=20,s=r?function(){return r.cur()}:function(){return pe.css(e,t,"")},u=s(),l=n&&n[3]||(pe.cssNumber[t]?"":"px"),c=(pe.cssNumber[t]||"px"!==l&&+u)&&Me.exec(pe.css(e,t));if(c&&c[3]!==l){l=l||c[3],n=n||[],c=+u||1;do o=o||".5",c/=o,pe.style(e,t,c+l);while(o!==(o=s()/u)&&1!==o&&--a)}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}function p(e){var t=ze.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function h(e,t){var n,r,i=0,o="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):void 0;if(!o)for(o=[],n=e.childNodes||e;null!=(r=n[i]);i++)!t||pe.nodeName(r,t)?o.push(r):pe.merge(o,h(r,t));return void 0===t||t&&pe.nodeName(e,t)?pe.merge([e],o):o}function g(e,t){for(var n,r=0;null!=(n=e[r]);r++)pe._data(n,"globalEval",!t||pe._data(t[r],"globalEval"))}function m(e){Be.test(e.type)&&(e.defaultChecked=e.checked)}function y(e,t,n,r,i){for(var o,a,s,u,l,c,f,d=e.length,y=p(t),v=[],x=0;x<d;x++)if(a=e[x],a||0===a)if("object"===pe.type(a))pe.merge(v,a.nodeType?[a]:a);else if(Ue.test(a)){for(u=u||y.appendChild(t.createElement("div")),l=(We.exec(a)||["",""])[1].toLowerCase(),f=Xe[l]||Xe._default,u.innerHTML=f[1]+pe.htmlPrefilter(a)+f[2],o=f[0];o--;)u=u.lastChild;if(!fe.leadingWhitespace&&$e.test(a)&&v.push(t.createTextNode($e.exec(a)[0])),!fe.tbody)for(a="table"!==l||Ve.test(a)?"<table>"!==f[1]||Ve.test(a)?0:u:u.firstChild,o=a&&a.childNodes.length;o--;)pe.nodeName(c=a.childNodes[o],"tbody")&&!c.childNodes.length&&a.removeChild(c);for(pe.merge(v,u.childNodes),u.textContent="";u.firstChild;)u.removeChild(u.firstChild);u=y.lastChild}else v.push(t.createTextNode(a));for(u&&y.removeChild(u),fe.appendChecked||pe.grep(h(v,"input"),m),x=0;a=v[x++];)if(r&&pe.inArray(a,r)>-1)i&&i.push(a);else if(s=pe.contains(a.ownerDocument,a),u=h(y.appendChild(a),"script"),s&&g(u),n)for(o=0;a=u[o++];)Ie.test(a.type||"")&&n.push(a);return u=null,y}function v(){return!0}function x(){return!1}function b(){try{return re.activeElement}catch(e){}}function w(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)w(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),i===!1)i=x;else if(!i)return e;return 1===o&&(a=i,i=function(e){return pe().off(e),a.apply(this,arguments)},i.guid=a.guid||(a.guid=pe.guid++)),e.each(function(){pe.event.add(this,t,i,r,n)})}function T(e,t){return pe.nodeName(e,"table")&&pe.nodeName(11!==t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function C(e){return e.type=(null!==pe.find.attr(e,"type"))+"/"+e.type,e}function E(e){var t=it.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function N(e,t){if(1===t.nodeType&&pe.hasData(e)){var n,r,i,o=pe._data(e),a=pe._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;r<i;r++)pe.event.add(t,n,s[n][r])}a.data&&(a.data=pe.extend({},a.data))}}function k(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!fe.noCloneEvent&&t[pe.expando]){i=pe._data(t);for(r in i.events)pe.removeEvent(t,r,i.handle);t.removeAttribute(pe.expando)}"script"===n&&t.text!==e.text?(C(t).text=e.text,E(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),fe.html5Clone&&e.innerHTML&&!pe.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Be.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:"input"!==n&&"textarea"!==n||(t.defaultValue=e.defaultValue)}}function S(e,t,n,r){t=oe.apply([],t);var i,o,a,s,u,l,c=0,f=e.length,d=f-1,p=t[0],g=pe.isFunction(p);if(g||f>1&&"string"==typeof p&&!fe.checkClone&&rt.test(p))return e.each(function(i){var o=e.eq(i);g&&(t[0]=p.call(this,i,o.html())),S(o,t,n,r)});if(f&&(l=y(t,e[0].ownerDocument,!1,e,r),i=l.firstChild,1===l.childNodes.length&&(l=i),i||r)){for(s=pe.map(h(l,"script"),C),a=s.length;c<f;c++)o=l,c!==d&&(o=pe.clone(o,!0,!0),a&&pe.merge(s,h(o,"script"))),n.call(e[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,pe.map(s,E),c=0;c<a;c++)o=s[c],Ie.test(o.type||"")&&!pe._data(o,"globalEval")&&pe.contains(u,o)&&(o.src?pe._evalUrl&&pe._evalUrl(o.src):pe.globalEval((o.text||o.textContent||o.innerHTML||"").replace(ot,"")));l=i=null}return e}function A(e,t,n){for(var r,i=t?pe.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||pe.cleanData(h(r)),r.parentNode&&(n&&pe.contains(r.ownerDocument,r)&&g(h(r,"script")),r.parentNode.removeChild(r));return e}function D(e,t){var n=pe(t.createElement(e)).appendTo(t.body),r=pe.css(n[0],"display");return n.detach(),r}function j(e){var t=re,n=lt[e];return n||(n=D(e,t),"none"!==n&&n||(ut=(ut||pe("<iframe frameborder='0' width='0' height='0'/>")).appendTo(t.documentElement),t=(ut[0].contentWindow||ut[0].contentDocument).document,t.write(),t.close(),n=D(e,t),ut.detach()),lt[e]=n),n}function L(e,t){return{get:function(){return e()?void delete this.get:(this.get=t).apply(this,arguments)}}}function H(e){if(e in Et)return e;for(var t=e.charAt(0).toUpperCase()+e.slice(1),n=Ct.length;n--;)if(e=Ct[n]+t,e in Et)return e}function q(e,t){for(var n,r,i,o=[],a=0,s=e.length;a<s;a++)r=e[a],r.style&&(o[a]=pe._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&Re(r)&&(o[a]=pe._data(r,"olddisplay",j(r.nodeName)))):(i=Re(r),(n&&"none"!==n||!i)&&pe._data(r,"olddisplay",i?n:pe.css(r,"display"))));for(a=0;a<s;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}function _(e,t,n){var r=bt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function F(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;o<4;o+=2)"margin"===n&&(a+=pe.css(e,n+Oe[o],!0,i)),r?("content"===n&&(a-=pe.css(e,"padding"+Oe[o],!0,i)),"margin"!==n&&(a-=pe.css(e,"border"+Oe[o]+"Width",!0,i))):(a+=pe.css(e,"padding"+Oe[o],!0,i),"padding"!==n&&(a+=pe.css(e,"border"+Oe[o]+"Width",!0,i)));return a}function M(t,n,r){var i=!0,o="width"===n?t.offsetWidth:t.offsetHeight,a=ht(t),s=fe.boxSizing&&"border-box"===pe.css(t,"boxSizing",!1,a);if(re.msFullscreenElement&&e.top!==e&&t.getClientRects().length&&(o=Math.round(100*t.getBoundingClientRect()[n])),o<=0||null==o){if(o=gt(t,n,a),(o<0||null==o)&&(o=t.style[n]),ft.test(o))return o;i=s&&(fe.boxSizingReliable()||o===t.style[n]),o=parseFloat(o)||0}return o+F(t,n,r||(s?"border":"content"),i,a)+"px"}function O(e,t,n,r,i){return new O.prototype.init(e,t,n,r,i)}function R(){return e.setTimeout(function(){Nt=void 0}),Nt=pe.now()}function P(e,t){var n,r={height:e},i=0;for(t=t?1:0;i<4;i+=2-t)n=Oe[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function B(e,t,n){for(var r,i=($.tweeners[t]||[]).concat($.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function W(e,t,n){var r,i,o,a,s,u,l,c,f=this,d={},p=e.style,h=e.nodeType&&Re(e),g=pe._data(e,"fxshow");n.queue||(s=pe._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,u=s.empty.fire,s.empty.fire=function(){s.unqueued||u()}),s.unqueued++,f.always(function(){f.always(function(){s.unqueued--,pe.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],l=pe.css(e,"display"),c="none"===l?pe._data(e,"olddisplay")||j(e.nodeName):l,"inline"===c&&"none"===pe.css(e,"float")&&(fe.inlineBlockNeedsLayout&&"inline"!==j(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",fe.shrinkWrapBlocks()||f.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],St.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(h?"hide":"show")){if("show"!==i||!g||void 0===g[r])continue;h=!0}d[r]=g&&g[r]||pe.style(e,r)}else l=void 0;if(pe.isEmptyObject(d))"inline"===("none"===l?j(e.nodeName):l)&&(p.display=l);else{g?"hidden"in g&&(h=g.hidden):g=pe._data(e,"fxshow",{}),o&&(g.hidden=!h),h?pe(e).show():f.done(function(){pe(e).hide()}),f.done(function(){var t;pe._removeData(e,"fxshow");for(t in d)pe.style(e,t,d[t])});for(r in d)a=B(h?g[r]:0,r,f),r in g||(g[r]=a.start,h&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function I(e,t){var n,r,i,o,a;for(n in e)if(r=pe.camelCase(n),i=t[r],o=e[n],pe.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=pe.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function $(e,t,n){var r,i,o=0,a=$.prefilters.length,s=pe.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var t=Nt||R(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;a<u;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),o<1&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:pe.extend({},t),opts:pe.extend(!0,{specialEasing:{},easing:pe.easing._default},n),originalProperties:t,originalOptions:n,startTime:Nt||R(),duration:n.duration,tweens:[],createTween:function(t,n){var r=pe.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;n<r;n++)l.tweens[n].run(1);return t?(s.notifyWith(e,[l,1,0]),s.resolveWith(e,[l,t])):s.rejectWith(e,[l,t]),this}}),c=l.props;for(I(c,l.opts.specialEasing);o<a;o++)if(r=$.prefilters[o].call(l,e,c,l.opts))return pe.isFunction(r.stop)&&(pe._queueHooks(l.elem,l.opts.queue).stop=pe.proxy(r.stop,r)),r;return pe.map(c,B,l),pe.isFunction(l.opts.start)&&l.opts.start.call(e,l),pe.fx.timer(pe.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function z(e){return pe.attr(e,"class")||""}function X(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(De)||[];if(pe.isFunction(n))for(;r=o[i++];)"+"===r.charAt(0)?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function U(e,t,n,r){function i(s){var u;return o[s]=!0,pe.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||a||o[l]?a?!(u=l):void 0:(t.dataTypes.unshift(l),i(l),!1)}),u}var o={},a=e===Qt;return i(t.dataTypes[0])||!o["*"]&&i("*")}function V(e,t){var n,r,i=pe.ajaxSettings.flatOptions||{};for(r in t)void 0!==t[r]&&((i[r]?e:n||(n={}))[r]=t[r]);return n&&pe.extend(!0,e,n),e}function Y(e,t,n){for(var r,i,o,a,s=e.contents,u=e.dataTypes;"*"===u[0];)u.shift(),void 0===i&&(i=e.mimeType||t.getResponseHeader("Content-Type"));if(i)for(a in s)if(s[a]&&s[a].test(i)){u.unshift(a);break}if(u[0]in n)o=u[0];else{for(a in n){if(!u[0]||e.converters[a+" "+u[0]]){o=a;break}r||(r=a)}o=o||r}if(o)return o!==u[0]&&u.unshift(o),n[o]}function J(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];for(o=c.shift();o;)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(a=l[u+" "+o]||l["* "+o],!a)for(i in l)if(s=i.split(" "),s[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){a===!0?a=l[i]:l[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(f){return{state:"parsererror",error:a?f:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}function G(e){return e.style&&e.style.display||pe.css(e,"display")}function K(e){for(;e&&1===e.nodeType;){if("none"===G(e)||"hidden"===e.type)return!0;e=e.parentNode}return!1}function Q(e,t,n,r){var i;if(pe.isArray(t))pe.each(t,function(t,i){n||rn.test(e)?r(e,i):Q(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==pe.type(t))r(e,t);else for(i in t)Q(e+"["+i+"]",t[i],n,r)}function Z(){try{return new e.XMLHttpRequest}catch(t){}}function ee(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function te(e){return pe.isWindow(e)?e:9===e.nodeType&&(e.defaultView||e.parentWindow)}var ne=[],re=e.document,ie=ne.slice,oe=ne.concat,ae=ne.push,se=ne.indexOf,ue={},le=ue.toString,ce=ue.hasOwnProperty,fe={},de="1.12.3",pe=function(e,t){return new pe.fn.init(e,t)},he=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,ge=/^-ms-/,me=/-([\da-z])/gi,ye=function(e,t){return t.toUpperCase()};pe.fn=pe.prototype={jquery:de,constructor:pe,selector:"",length:0,toArray:function(){return ie.call(this)},get:function(e){return null!=e?e<0?this[e+this.length]:this[e]:ie.call(this)},pushStack:function(e){var t=pe.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e){return pe.each(this,e)},map:function(e){return this.pushStack(pe.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(ie.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:ae,sort:ne.sort,splice:ne.splice},pe.extend=pe.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||pe.isFunction(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(i=arguments[s]))for(r in i)e=a[r],n=i[r],a!==n&&(l&&n&&(pe.isPlainObject(n)||(t=pe.isArray(n)))?(t?(t=!1,o=e&&pe.isArray(e)?e:[]):o=e&&pe.isPlainObject(e)?e:{},a[r]=pe.extend(l,o,n)):void 0!==n&&(a[r]=n));return a},pe.extend({expando:"jQuery"+(de+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isFunction:function(e){return"function"===pe.type(e)},isArray:Array.isArray||function(e){return"array"===pe.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){var t=e&&e.toString();return!pe.isArray(e)&&t-parseFloat(t)+1>=0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},isPlainObject:function(e){var t;if(!e||"object"!==pe.type(e)||e.nodeType||pe.isWindow(e))return!1;try{if(e.constructor&&!ce.call(e,"constructor")&&!ce.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}if(!fe.ownFirst)for(t in e)return ce.call(e,t);for(t in e);return void 0===t||ce.call(e,t)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?ue[le.call(e)]||"object":typeof e},globalEval:function(t){t&&pe.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(ge,"ms-").replace(me,ye)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t){var r,i=0;if(n(e))for(r=e.length;i<r&&t.call(e[i],i,e[i])!==!1;i++);else for(i in e)if(t.call(e[i],i,e[i])===!1)break;return e},trim:function(e){return null==e?"":(e+"").replace(he,"")},makeArray:function(e,t){var r=t||[];return null!=e&&(n(Object(e))?pe.merge(r,"string"==typeof e?[e]:e):ae.call(r,e)),r},inArray:function(e,t,n){var r;if(t){if(se)return se.call(t,e,n);for(r=t.length,n=n?n<0?Math.max(0,r+n):n:0;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;)e[i++]=t[r++];if(n!==n)for(;void 0!==t[r];)e[i++]=t[r++];return e.length=i,e},grep:function(e,t,n){for(var r,i=[],o=0,a=e.length,s=!n;o<a;o++)r=!t(e[o],o),r!==s&&i.push(e[o]);return i},map:function(e,t,r){var i,o,a=0,s=[];if(n(e))for(i=e.length;a<i;a++)o=t(e[a],a,r),null!=o&&s.push(o);else for(a in e)o=t(e[a],a,r),null!=o&&s.push(o);return oe.apply([],s)},guid:1,proxy:function(e,t){var n,r,i;if("string"==typeof t&&(i=e[t],t=e,e=i),pe.isFunction(e))return n=ie.call(arguments,2),r=function(){return e.apply(t||this,n.concat(ie.call(arguments)))},r.guid=e.guid=e.guid||pe.guid++,r},now:function(){return+new Date},support:fe}),"function"==typeof Symbol&&(pe.fn[Symbol.iterator]=ne[Symbol.iterator]),pe.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){ue["[object "+t+"]"]=t.toLowerCase()});var ve=function(e){function t(e,t,n,r){var i,o,a,s,u,l,f,p,h=t&&t.ownerDocument,g=t?t.nodeType:9;if(n=n||[],"string"!=typeof e||!e||1!==g&&9!==g&&11!==g)return n;if(!r&&((t?t.ownerDocument||t:B)!==H&&L(t),t=t||H,_)){if(11!==g&&(l=ye.exec(e)))if(i=l[1]){if(9===g){if(!(a=t.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(h&&(a=h.getElementById(i))&&R(t,a)&&a.id===i)return n.push(a),n}else{if(l[2])return Q.apply(n,t.getElementsByTagName(e)),n;if((i=l[3])&&w.getElementsByClassName&&t.getElementsByClassName)return Q.apply(n,t.getElementsByClassName(i)),n}if(w.qsa&&!X[e+" "]&&(!F||!F.test(e))){if(1!==g)h=t,p=e;else if("object"!==t.nodeName.toLowerCase()){for((s=t.getAttribute("id"))?s=s.replace(xe,"\\$&"):t.setAttribute("id",s=P),f=N(e),o=f.length,u=de.test(s)?"#"+s:"[id='"+s+"']";o--;)f[o]=u+" "+d(f[o]);p=f.join(","),h=ve.test(e)&&c(t.parentNode)||t}if(p)try{return Q.apply(n,h.querySelectorAll(p)),n}catch(m){}finally{s===P&&t.removeAttribute("id")}}}return S(e.replace(se,"$1"),t,n,r)}function n(){function e(n,r){return t.push(n+" ")>T.cacheLength&&delete e[t.shift()],e[n+" "]=r}var t=[];return e}function r(e){return e[P]=!0,e}function i(e){var t=H.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function o(e,t){for(var n=e.split("|"),r=n.length;r--;)T.attrHandle[n[r]]=t}function a(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||V)-(~e.sourceIndex||V);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function s(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function u(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function l(e){return r(function(t){return t=+t,r(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function c(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function f(){}function d(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function p(e,t,n){var r=t.dir,i=n&&"parentNode"===r,o=I++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,u,l,c=[W,o];if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i){if(l=t[P]||(t[P]={}),u=l[t.uniqueID]||(l[t.uniqueID]={}),(s=u[r])&&s[0]===W&&s[1]===o)return c[2]=s[2];if(u[r]=c,c[2]=e(t,n,a))return!0}}}function h(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function g(e,n,r){for(var i=0,o=n.length;i<o;i++)t(e,n[i],r);return r}function m(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function y(e,t,n,i,o,a){return i&&!i[P]&&(i=y(i)),o&&!o[P]&&(o=y(o,a)),r(function(r,a,s,u){var l,c,f,d=[],p=[],h=a.length,y=r||g(t||"*",s.nodeType?[s]:s,[]),v=!e||!r&&t?y:m(y,d,e,s,u),x=n?o||(r?e:h||i)?[]:a:v;if(n&&n(v,x,s,u),i)for(l=m(x,p),i(l,[],s,u),c=l.length;c--;)(f=l[c])&&(x[p[c]]=!(v[p[c]]=f));if(r){if(o||e){if(o){for(l=[],c=x.length;c--;)(f=x[c])&&l.push(v[c]=f);o(null,x=[],l,u)}for(c=x.length;c--;)(f=x[c])&&(l=o?ee(r,f):d[c])>-1&&(r[l]=!(a[l]=f))}}else x=m(x===a?x.splice(h,x.length):x),o?o(null,a,x,u):Q.apply(a,x)})}function v(e){for(var t,n,r,i=e.length,o=T.relative[e[0].type],a=o||T.relative[" "],s=o?1:0,u=p(function(e){return e===t},a,!0),l=p(function(e){return ee(t,e)>-1},a,!0),c=[function(e,n,r){var i=!o&&(r||n!==A)||((t=n).nodeType?u(e,n,r):l(e,n,r));return t=null,i}];s<i;s++)if(n=T.relative[e[s].type])c=[p(h(c),n)];else{if(n=T.filter[e[s].type].apply(null,e[s].matches),n[P]){for(r=++s;r<i&&!T.relative[e[r].type];r++);return y(s>1&&h(c),s>1&&d(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(se,"$1"),n,s<r&&v(e.slice(s,r)),r<i&&v(e=e.slice(r)),r<i&&d(e))}c.push(n)}return h(c)}function x(e,n){var i=n.length>0,o=e.length>0,a=function(r,a,s,u,l){var c,f,d,p=0,h="0",g=r&&[],y=[],v=A,x=r||o&&T.find.TAG("*",l),b=W+=null==v?1:Math.random()||.1,w=x.length;for(l&&(A=a===H||a||l);h!==w&&null!=(c=x[h]);h++){if(o&&c){for(f=0,a||c.ownerDocument===H||(L(c),s=!_);d=e[f++];)if(d(c,a||H,s)){u.push(c);break}l&&(W=b)}i&&((c=!d&&c)&&p--,r&&g.push(c))}if(p+=h,i&&h!==p){for(f=0;d=n[f++];)d(g,y,a,s);if(r){if(p>0)for(;h--;)g[h]||y[h]||(y[h]=G.call(u));y=m(y)}Q.apply(u,y),l&&!r&&y.length>0&&p+n.length>1&&t.uniqueSort(u)}return l&&(W=b,A=v),g};return i?r(a):a}var b,w,T,C,E,N,k,S,A,D,j,L,H,q,_,F,M,O,R,P="sizzle"+1*new Date,B=e.document,W=0,I=0,$=n(),z=n(),X=n(),U=function(e,t){return e===t&&(j=!0),0},V=1<<31,Y={}.hasOwnProperty,J=[],G=J.pop,K=J.push,Q=J.push,Z=J.slice,ee=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},te="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",ne="[\\x20\\t\\r\\n\\f]",re="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",ie="\\["+ne+"*("+re+")(?:"+ne+"*([*^$|!~]?=)"+ne+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+re+"))|)"+ne+"*\\]",oe=":("+re+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+ie+")*)|.*)\\)|)",ae=new RegExp(ne+"+","g"),se=new RegExp("^"+ne+"+|((?:^|[^\\\\])(?:\\\\.)*)"+ne+"+$","g"),ue=new RegExp("^"+ne+"*,"+ne+"*"),le=new RegExp("^"+ne+"*([>+~]|"+ne+")"+ne+"*"),ce=new RegExp("="+ne+"*([^\\]'\"]*?)"+ne+"*\\]","g"),fe=new RegExp(oe),de=new RegExp("^"+re+"$"),pe={ID:new RegExp("^#("+re+")"),CLASS:new RegExp("^\\.("+re+")"),TAG:new RegExp("^("+re+"|[*])"),ATTR:new RegExp("^"+ie),PSEUDO:new RegExp("^"+oe),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ne+"*(even|odd|(([+-]|)(\\d*)n|)"+ne+"*(?:([+-]|)"+ne+"*(\\d+)|))"+ne+"*\\)|)","i"),bool:new RegExp("^(?:"+te+")$","i"),needsContext:new RegExp("^"+ne+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ne+"*((?:-\\d)?\\d*)"+ne+"*\\)|)(?=[^-]|$)","i")},he=/^(?:input|select|textarea|button)$/i,ge=/^h\d$/i,me=/^[^{]+\{\s*\[native \w/,ye=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ve=/[+~]/,xe=/'|\\/g,be=new RegExp("\\\\([\\da-f]{1,6}"+ne+"?|("+ne+")|.)","ig"),we=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},Te=function(){L()};try{Q.apply(J=Z.call(B.childNodes),B.childNodes),J[B.childNodes.length].nodeType}catch(Ce){Q={apply:J.length?function(e,t){K.apply(e,Z.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}w=t.support={},E=t.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},L=t.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:B;return r!==H&&9===r.nodeType&&r.documentElement?(H=r,q=H.documentElement,_=!E(H),(n=H.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",Te,!1):n.attachEvent&&n.attachEvent("onunload",Te)),w.attributes=i(function(e){return e.className="i",!e.getAttribute("className")}),w.getElementsByTagName=i(function(e){return e.appendChild(H.createComment("")),!e.getElementsByTagName("*").length}),w.getElementsByClassName=me.test(H.getElementsByClassName),w.getById=i(function(e){return q.appendChild(e).id=P,!H.getElementsByName||!H.getElementsByName(P).length}),w.getById?(T.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&_){var n=t.getElementById(e);return n?[n]:[]}},T.filter.ID=function(e){var t=e.replace(be,we);return function(e){return e.getAttribute("id")===t}}):(delete T.find.ID,T.filter.ID=function(e){var t=e.replace(be,we);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}}),T.find.TAG=w.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):w.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},T.find.CLASS=w.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&_)return t.getElementsByClassName(e)},M=[],F=[],(w.qsa=me.test(H.querySelectorAll))&&(i(function(e){q.appendChild(e).innerHTML="<a id='"+P+"'></a><select id='"+P+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&F.push("[*^$]="+ne+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||F.push("\\["+ne+"*(?:value|"+te+")"),e.querySelectorAll("[id~="+P+"-]").length||F.push("~="),e.querySelectorAll(":checked").length||F.push(":checked"),e.querySelectorAll("a#"+P+"+*").length||F.push(".#.+[+~]")}),i(function(e){var t=H.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&F.push("name"+ne+"*[*^$|!~]?="),e.querySelectorAll(":enabled").length||F.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),F.push(",.*:")})),(w.matchesSelector=me.test(O=q.matches||q.webkitMatchesSelector||q.mozMatchesSelector||q.oMatchesSelector||q.msMatchesSelector))&&i(function(e){w.disconnectedMatch=O.call(e,"div"),O.call(e,"[s!='']:x"),M.push("!=",oe)}),F=F.length&&new RegExp(F.join("|")),M=M.length&&new RegExp(M.join("|")),t=me.test(q.compareDocumentPosition),R=t||me.test(q.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},U=t?function(e,t){if(e===t)return j=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n?n:(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1,1&n||!w.sortDetached&&t.compareDocumentPosition(e)===n?e===H||e.ownerDocument===B&&R(B,e)?-1:t===H||t.ownerDocument===B&&R(B,t)?1:D?ee(D,e)-ee(D,t):0:4&n?-1:1)}:function(e,t){if(e===t)return j=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,s=[e],u=[t];if(!i||!o)return e===H?-1:t===H?1:i?-1:o?1:D?ee(D,e)-ee(D,t):0;if(i===o)return a(e,t);for(n=e;n=n.parentNode;)s.unshift(n);for(n=t;n=n.parentNode;)u.unshift(n);for(;s[r]===u[r];)r++;return r?a(s[r],u[r]):s[r]===B?-1:u[r]===B?1:0},H):H},t.matches=function(e,n){return t(e,null,null,n)},t.matchesSelector=function(e,n){if((e.ownerDocument||e)!==H&&L(e),n=n.replace(ce,"='$1']"),w.matchesSelector&&_&&!X[n+" "]&&(!M||!M.test(n))&&(!F||!F.test(n)))try{var r=O.call(e,n);if(r||w.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(i){}return t(n,H,null,[e]).length>0},t.contains=function(e,t){return(e.ownerDocument||e)!==H&&L(e),R(e,t)},t.attr=function(e,t){(e.ownerDocument||e)!==H&&L(e);var n=T.attrHandle[t.toLowerCase()],r=n&&Y.call(T.attrHandle,t.toLowerCase())?n(e,t,!_):void 0;return void 0!==r?r:w.attributes||!_?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},t.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},t.uniqueSort=function(e){var t,n=[],r=0,i=0;if(j=!w.detectDuplicates,D=!w.sortStable&&e.slice(0),e.sort(U),j){for(;t=e[i++];)t===e[i]&&(r=n.push(i));for(;r--;)e.splice(n[r],1)}return D=null,e},C=t.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=C(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r++];)n+=C(t);return n},T=t.selectors={cacheLength:50,createPseudo:r,match:pe,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(be,we),e[3]=(e[3]||e[4]||e[5]||"").replace(be,we),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||t.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&t.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return pe.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&fe.test(n)&&(t=N(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(be,we).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=$[e+" "];return t||(t=new RegExp("(^|"+ne+")"+e+"("+ne+"|$)"))&&$(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,n,r){return function(i){var o=t.attr(i,e);return null==o?"!="===n:!n||(o+="","="===n?o===r:"!="===n?o!==r:"^="===n?r&&0===o.indexOf(r):"*="===n?r&&o.indexOf(r)>-1:"$="===n?r&&o.slice(-r.length)===r:"~="===n?(" "+o.replace(ae," ")+" ").indexOf(r)>-1:"|="===n&&(o===r||o.slice(0,r.length+1)===r+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,d,p,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s,x=!1;if(m){if(o){for(;g;){for(d=t;d=d[g];)if(s?d.nodeName.toLowerCase()===y:1===d.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){for(d=m,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),
+l=c[e]||[],p=l[0]===W&&l[1],x=p&&l[2],d=p&&m.childNodes[p];d=++p&&d&&d[g]||(x=p=0)||h.pop();)if(1===d.nodeType&&++x&&d===t){c[e]=[W,p,x];break}}else if(v&&(d=t,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),l=c[e]||[],p=l[0]===W&&l[1],x=p),x===!1)for(;(d=++p&&d&&d[g]||(x=p=0)||h.pop())&&((s?d.nodeName.toLowerCase()!==y:1!==d.nodeType)||!++x||(v&&(f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),c[e]=[W,x]),d!==t)););return x-=i,x===r||x%r===0&&x/r>=0}}},PSEUDO:function(e,n){var i,o=T.pseudos[e]||T.setFilters[e.toLowerCase()]||t.error("unsupported pseudo: "+e);return o[P]?o(n):o.length>1?(i=[e,e,"",n],T.setFilters.hasOwnProperty(e.toLowerCase())?r(function(e,t){for(var r,i=o(e,n),a=i.length;a--;)r=ee(e,i[a]),e[r]=!(t[r]=i[a])}):function(e){return o(e,0,i)}):o}},pseudos:{not:r(function(e){var t=[],n=[],i=k(e.replace(se,"$1"));return i[P]?r(function(e,t,n,r){for(var o,a=i(e,null,r,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,r,o){return t[0]=e,i(t,null,o,n),t[0]=null,!n.pop()}}),has:r(function(e){return function(n){return t(e,n).length>0}}),contains:r(function(e){return e=e.replace(be,we),function(t){return(t.textContent||t.innerText||C(t)).indexOf(e)>-1}}),lang:r(function(e){return de.test(e||"")||t.error("unsupported lang: "+e),e=e.replace(be,we).toLowerCase(),function(t){var n;do if(n=_?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===q},focus:function(e){return e===H.activeElement&&(!H.hasFocus||H.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!T.pseudos.empty(e)},header:function(e){return ge.test(e.nodeName)},input:function(e){return he.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:l(function(){return[0]}),last:l(function(e,t){return[t-1]}),eq:l(function(e,t,n){return[n<0?n+t:n]}),even:l(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:l(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:l(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:l(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}},T.pseudos.nth=T.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})T.pseudos[b]=s(b);for(b in{submit:!0,reset:!0})T.pseudos[b]=u(b);return f.prototype=T.filters=T.pseudos,T.setFilters=new f,N=t.tokenize=function(e,n){var r,i,o,a,s,u,l,c=z[e+" "];if(c)return n?0:c.slice(0);for(s=e,u=[],l=T.preFilter;s;){r&&!(i=ue.exec(s))||(i&&(s=s.slice(i[0].length)||s),u.push(o=[])),r=!1,(i=le.exec(s))&&(r=i.shift(),o.push({value:r,type:i[0].replace(se," ")}),s=s.slice(r.length));for(a in T.filter)!(i=pe[a].exec(s))||l[a]&&!(i=l[a](i))||(r=i.shift(),o.push({value:r,type:a,matches:i}),s=s.slice(r.length));if(!r)break}return n?s.length:s?t.error(e):z(e,u).slice(0)},k=t.compile=function(e,t){var n,r=[],i=[],o=X[e+" "];if(!o){for(t||(t=N(e)),n=t.length;n--;)o=v(t[n]),o[P]?r.push(o):i.push(o);o=X(e,x(i,r)),o.selector=e}return o},S=t.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,f=!r&&N(e=l.selector||e);if(n=n||[],1===f.length){if(o=f[0]=f[0].slice(0),o.length>2&&"ID"===(a=o[0]).type&&w.getById&&9===t.nodeType&&_&&T.relative[o[1].type]){if(t=(T.find.ID(a.matches[0].replace(be,we),t)||[])[0],!t)return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}for(i=pe.needsContext.test(e)?0:o.length;i--&&(a=o[i],!T.relative[s=a.type]);)if((u=T.find[s])&&(r=u(a.matches[0].replace(be,we),ve.test(o[0].type)&&c(t.parentNode)||t))){if(o.splice(i,1),e=r.length&&d(o),!e)return Q.apply(n,r),n;break}}return(l||k(e,f))(r,t,!_,n,!t||ve.test(e)&&c(t.parentNode)||t),n},w.sortStable=P.split("").sort(U).join("")===P,w.detectDuplicates=!!j,L(),w.sortDetached=i(function(e){return 1&e.compareDocumentPosition(H.createElement("div"))}),i(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||o("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),w.attributes&&i(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||o("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),i(function(e){return null==e.getAttribute("disabled")})||o(te,function(e,t,n){var r;if(!n)return e[t]===!0?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),t}(e);pe.find=ve,pe.expr=ve.selectors,pe.expr[":"]=pe.expr.pseudos,pe.uniqueSort=pe.unique=ve.uniqueSort,pe.text=ve.getText,pe.isXMLDoc=ve.isXML,pe.contains=ve.contains;var xe=function(e,t,n){for(var r=[],i=void 0!==n;(e=e[t])&&9!==e.nodeType;)if(1===e.nodeType){if(i&&pe(e).is(n))break;r.push(e)}return r},be=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},we=pe.expr.match.needsContext,Te=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,Ce=/^.[^:#\[\.,]*$/;pe.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?pe.find.matchesSelector(r,e)?[r]:[]:pe.find.matches(e,pe.grep(t,function(e){return 1===e.nodeType}))},pe.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(pe(e).filter(function(){for(t=0;t<i;t++)if(pe.contains(r[t],this))return!0}));for(t=0;t<i;t++)pe.find(e,r[t],n);return n=this.pushStack(i>1?pe.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},filter:function(e){return this.pushStack(r(this,e||[],!1))},not:function(e){return this.pushStack(r(this,e||[],!0))},is:function(e){return!!r(this,"string"==typeof e&&we.test(e)?pe(e):e||[],!1).length}});var Ee,Ne=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,ke=pe.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||Ee,"string"==typeof e){if(r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:Ne.exec(e),!r||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof pe?t[0]:t,pe.merge(this,pe.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:re,!0)),Te.test(r[1])&&pe.isPlainObject(t))for(r in t)pe.isFunction(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}if(i=re.getElementById(r[2]),i&&i.parentNode){if(i.id!==r[2])return Ee.find(e);this.length=1,this[0]=i}return this.context=re,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):pe.isFunction(e)?"undefined"!=typeof n.ready?n.ready(e):e(pe):(void 0!==e.selector&&(this.selector=e.selector,this.context=e.context),pe.makeArray(e,this))};ke.prototype=pe.fn,Ee=pe(re);var Se=/^(?:parents|prev(?:Until|All))/,Ae={children:!0,contents:!0,next:!0,prev:!0};pe.fn.extend({has:function(e){var t,n=pe(e,this),r=n.length;return this.filter(function(){for(t=0;t<r;t++)if(pe.contains(this,n[t]))return!0})},closest:function(e,t){for(var n,r=0,i=this.length,o=[],a=we.test(e)||"string"!=typeof e?pe(e,t||this.context):0;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?a.index(n)>-1:1===n.nodeType&&pe.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?pe.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?pe.inArray(this[0],pe(e)):pe.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(pe.uniqueSort(pe.merge(this.get(),pe(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),pe.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return xe(e,"parentNode")},parentsUntil:function(e,t,n){return xe(e,"parentNode",n)},next:function(e){return i(e,"nextSibling")},prev:function(e){return i(e,"previousSibling")},nextAll:function(e){return xe(e,"nextSibling")},prevAll:function(e){return xe(e,"previousSibling")},nextUntil:function(e,t,n){return xe(e,"nextSibling",n)},prevUntil:function(e,t,n){return xe(e,"previousSibling",n)},siblings:function(e){return be((e.parentNode||{}).firstChild,e)},children:function(e){return be(e.firstChild)},contents:function(e){return pe.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:pe.merge([],e.childNodes)}},function(e,t){pe.fn[e]=function(n,r){var i=pe.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=pe.filter(r,i)),this.length>1&&(Ae[e]||(i=pe.uniqueSort(i)),Se.test(e)&&(i=i.reverse())),this.pushStack(i)}});var De=/\S+/g;pe.Callbacks=function(e){e="string"==typeof e?o(e):pe.extend({},e);var t,n,r,i,a=[],s=[],u=-1,l=function(){for(i=e.once,r=t=!0;s.length;u=-1)for(n=s.shift();++u<a.length;)a[u].apply(n[0],n[1])===!1&&e.stopOnFalse&&(u=a.length,n=!1);e.memory||(n=!1),t=!1,i&&(a=n?[]:"")},c={add:function(){return a&&(n&&!t&&(u=a.length-1,s.push(n)),function r(t){pe.each(t,function(t,n){pe.isFunction(n)?e.unique&&c.has(n)||a.push(n):n&&n.length&&"string"!==pe.type(n)&&r(n)})}(arguments),n&&!t&&l()),this},remove:function(){return pe.each(arguments,function(e,t){for(var n;(n=pe.inArray(t,a,n))>-1;)a.splice(n,1),n<=u&&u--}),this},has:function(e){return e?pe.inArray(e,a)>-1:a.length>0},empty:function(){return a&&(a=[]),this},disable:function(){return i=s=[],a=n="",this},disabled:function(){return!a},lock:function(){return i=!0,n||c.disable(),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=n||[],n=[e,n.slice?n.slice():n],s.push(n),t||l()),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},pe.extend({Deferred:function(e){var t=[["resolve","done",pe.Callbacks("once memory"),"resolved"],["reject","fail",pe.Callbacks("once memory"),"rejected"],["notify","progress",pe.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return pe.Deferred(function(n){pe.each(t,function(t,o){var a=pe.isFunction(e[t])&&e[t];i[o[1]](function(){var e=a&&a.apply(this,arguments);e&&pe.isFunction(e.promise)?e.promise().progress(n.notify).done(n.resolve).fail(n.reject):n[o[0]+"With"](this===r?n.promise():this,a?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?pe.extend(e,r):r}},i={};return r.pipe=r.then,pe.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t,n,r,i=0,o=ie.call(arguments),a=o.length,s=1!==a||e&&pe.isFunction(e.promise)?a:0,u=1===s?e:pe.Deferred(),l=function(e,n,r){return function(i){n[e]=this,r[e]=arguments.length>1?ie.call(arguments):i,r===t?u.notifyWith(n,r):--s||u.resolveWith(n,r)}};if(a>1)for(t=new Array(a),n=new Array(a),r=new Array(a);i<a;i++)o[i]&&pe.isFunction(o[i].promise)?o[i].promise().progress(l(i,n,t)).done(l(i,r,o)).fail(u.reject):--s;return s||u.resolveWith(r,o),u.promise()}});var je;pe.fn.ready=function(e){return pe.ready.promise().done(e),this},pe.extend({isReady:!1,readyWait:1,holdReady:function(e){e?pe.readyWait++:pe.ready(!0)},ready:function(e){(e===!0?--pe.readyWait:pe.isReady)||(pe.isReady=!0,e!==!0&&--pe.readyWait>0||(je.resolveWith(re,[pe]),pe.fn.triggerHandler&&(pe(re).triggerHandler("ready"),pe(re).off("ready"))))}}),pe.ready.promise=function(t){if(!je)if(je=pe.Deferred(),"complete"===re.readyState||"loading"!==re.readyState&&!re.documentElement.doScroll)e.setTimeout(pe.ready);else if(re.addEventListener)re.addEventListener("DOMContentLoaded",s),e.addEventListener("load",s);else{re.attachEvent("onreadystatechange",s),e.attachEvent("onload",s);var n=!1;try{n=null==e.frameElement&&re.documentElement}catch(r){}n&&n.doScroll&&!function i(){if(!pe.isReady){try{n.doScroll("left")}catch(t){return e.setTimeout(i,50)}a(),pe.ready()}}()}return je.promise(t)},pe.ready.promise();var Le;for(Le in pe(fe))break;fe.ownFirst="0"===Le,fe.inlineBlockNeedsLayout=!1,pe(function(){var e,t,n,r;n=re.getElementsByTagName("body")[0],n&&n.style&&(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",fe.inlineBlockNeedsLayout=e=3===t.offsetWidth,e&&(n.style.zoom=1)),n.removeChild(r))}),function(){var e=re.createElement("div");fe.deleteExpando=!0;try{delete e.test}catch(t){fe.deleteExpando=!1}e=null}();var He=function(e){var t=pe.noData[(e.nodeName+" ").toLowerCase()],n=+e.nodeType||1;return(1===n||9===n)&&(!t||t!==!0&&e.getAttribute("classid")===t)},qe=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,_e=/([A-Z])/g;pe.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?pe.cache[e[pe.expando]]:e[pe.expando],!!e&&!l(e)},data:function(e,t,n){return c(e,t,n)},removeData:function(e,t){return f(e,t)},_data:function(e,t,n){return c(e,t,n,!0)},_removeData:function(e,t){return f(e,t,!0)}}),pe.fn.extend({data:function(e,t){var n,r,i,o=this[0],a=o&&o.attributes;if(void 0===e){if(this.length&&(i=pe.data(o),1===o.nodeType&&!pe._data(o,"parsedAttrs"))){for(n=a.length;n--;)a[n]&&(r=a[n].name,0===r.indexOf("data-")&&(r=pe.camelCase(r.slice(5)),u(o,r,i[r])));pe._data(o,"parsedAttrs",!0)}return i}return"object"==typeof e?this.each(function(){pe.data(this,e)}):arguments.length>1?this.each(function(){pe.data(this,e,t)}):o?u(o,e,pe.data(o,e)):void 0},removeData:function(e){return this.each(function(){pe.removeData(this,e)})}}),pe.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=pe._data(e,t),n&&(!r||pe.isArray(n)?r=pe._data(e,t,pe.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=pe.queue(e,t),r=n.length,i=n.shift(),o=pe._queueHooks(e,t),a=function(){pe.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return pe._data(e,n)||pe._data(e,n,{empty:pe.Callbacks("once memory").add(function(){pe._removeData(e,t+"queue"),pe._removeData(e,n)})})}}),pe.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length<n?pe.queue(this[0],e):void 0===t?this:this.each(function(){var n=pe.queue(this,e,t);pe._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&pe.dequeue(this,e)})},dequeue:function(e){return this.each(function(){pe.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=pe.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};for("string"!=typeof e&&(t=e,e=void 0),e=e||"fx";a--;)n=pe._data(o[a],e+"queueHooks"),n&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}}),function(){var e;fe.shrinkWrapBlocks=function(){if(null!=e)return e;e=!1;var t,n,r;return n=re.getElementsByTagName("body")[0],n&&n.style?(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",t.appendChild(re.createElement("div")).style.width="5px",e=3!==t.offsetWidth),n.removeChild(r),e):void 0}}();var Fe=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,Me=new RegExp("^(?:([+-])=|)("+Fe+")([a-z%]*)$","i"),Oe=["Top","Right","Bottom","Left"],Re=function(e,t){return e=t||e,"none"===pe.css(e,"display")||!pe.contains(e.ownerDocument,e)},Pe=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===pe.type(n)){i=!0;for(s in n)Pe(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,pe.isFunction(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(pe(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},Be=/^(?:checkbox|radio)$/i,We=/<([\w:-]+)/,Ie=/^$|\/(?:java|ecma)script/i,$e=/^\s+/,ze="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";!function(){var e=re.createElement("div"),t=re.createDocumentFragment(),n=re.createElement("input");e.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",fe.leadingWhitespace=3===e.firstChild.nodeType,fe.tbody=!e.getElementsByTagName("tbody").length,fe.htmlSerialize=!!e.getElementsByTagName("link").length,fe.html5Clone="<:nav></:nav>"!==re.createElement("nav").cloneNode(!0).outerHTML,n.type="checkbox",n.checked=!0,t.appendChild(n),fe.appendChecked=n.checked,e.innerHTML="<textarea>x</textarea>",fe.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue,t.appendChild(e),n=re.createElement("input"),n.setAttribute("type","radio"),n.setAttribute("checked","checked"),n.setAttribute("name","t"),e.appendChild(n),fe.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,fe.noCloneEvent=!!e.addEventListener,e[pe.expando]=1,fe.attributes=!e.getAttribute(pe.expando)}();var Xe={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:fe.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]};Xe.optgroup=Xe.option,Xe.tbody=Xe.tfoot=Xe.colgroup=Xe.caption=Xe.thead,Xe.th=Xe.td;var Ue=/<|&#?\w+;/,Ve=/<tbody/i;!function(){var t,n,r=re.createElement("div");for(t in{submit:!0,change:!0,focusin:!0})n="on"+t,(fe[t]=n in e)||(r.setAttribute(n,"t"),fe[t]=r.attributes[n].expando===!1);r=null}();var Ye=/^(?:input|select|textarea)$/i,Je=/^key/,Ge=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ke=/^(?:focusinfocus|focusoutblur)$/,Qe=/^([^.]*)(?:\.(.+)|)/;pe.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe._data(e);if(m){for(n.handler&&(u=n,n=u.handler,i=u.selector),n.guid||(n.guid=pe.guid++),(a=m.events)||(a=m.events={}),(c=m.handle)||(c=m.handle=function(e){return"undefined"==typeof pe||e&&pe.event.triggered===e.type?void 0:pe.event.dispatch.apply(c.elem,arguments)},c.elem=e),t=(t||"").match(De)||[""],s=t.length;s--;)o=Qe.exec(t[s])||[],p=g=o[1],h=(o[2]||"").split(".").sort(),p&&(l=pe.event.special[p]||{},p=(i?l.delegateType:l.bindType)||p,l=pe.event.special[p]||{},f=pe.extend({type:p,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&pe.expr.match.needsContext.test(i),namespace:h.join(".")},u),(d=a[p])||(d=a[p]=[],d.delegateCount=0,l.setup&&l.setup.call(e,r,h,c)!==!1||(e.addEventListener?e.addEventListener(p,c,!1):e.attachEvent&&e.attachEvent("on"+p,c))),l.add&&(l.add.call(e,f),f.handler.guid||(f.handler.guid=n.guid)),i?d.splice(d.delegateCount++,0,f):d.push(f),pe.event.global[p]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe.hasData(e)&&pe._data(e);if(m&&(c=m.events)){for(t=(t||"").match(De)||[""],l=t.length;l--;)if(s=Qe.exec(t[l])||[],p=g=s[1],h=(s[2]||"").split(".").sort(),p){for(f=pe.event.special[p]||{},p=(r?f.delegateType:f.bindType)||p,d=c[p]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=d.length;o--;)a=d[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(d.splice(o,1),a.selector&&d.delegateCount--,f.remove&&f.remove.call(e,a));u&&!d.length&&(f.teardown&&f.teardown.call(e,h,m.handle)!==!1||pe.removeEvent(e,p,m.handle),delete c[p])}else for(p in c)pe.event.remove(e,p+t[l],n,r,!0);pe.isEmptyObject(c)&&(delete m.handle,pe._removeData(e,"events"))}},trigger:function(t,n,r,i){var o,a,s,u,l,c,f,d=[r||re],p=ce.call(t,"type")?t.type:t,h=ce.call(t,"namespace")?t.namespace.split("."):[];if(s=c=r=r||re,3!==r.nodeType&&8!==r.nodeType&&!Ke.test(p+pe.event.triggered)&&(p.indexOf(".")>-1&&(h=p.split("."),p=h.shift(),h.sort()),a=p.indexOf(":")<0&&"on"+p,t=t[pe.expando]?t:new pe.Event(p,"object"==typeof t&&t),t.isTrigger=i?2:3,t.namespace=h.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=r),n=null==n?[t]:pe.makeArray(n,[t]),l=pe.event.special[p]||{},i||!l.trigger||l.trigger.apply(r,n)!==!1)){if(!i&&!l.noBubble&&!pe.isWindow(r)){for(u=l.delegateType||p,Ke.test(u+p)||(s=s.parentNode);s;s=s.parentNode)d.push(s),c=s;c===(r.ownerDocument||re)&&d.push(c.defaultView||c.parentWindow||e)}for(f=0;(s=d[f++])&&!t.isPropagationStopped();)t.type=f>1?u:l.bindType||p,o=(pe._data(s,"events")||{})[t.type]&&pe._data(s,"handle"),o&&o.apply(s,n),o=a&&s[a],o&&o.apply&&He(s)&&(t.result=o.apply(s,n),t.result===!1&&t.preventDefault());if(t.type=p,!i&&!t.isDefaultPrevented()&&(!l._default||l._default.apply(d.pop(),n)===!1)&&He(r)&&a&&r[p]&&!pe.isWindow(r)){c=r[a],c&&(r[a]=null),pe.event.triggered=p;try{r[p]()}catch(g){}pe.event.triggered=void 0,c&&(r[a]=c)}return t.result}},dispatch:function(e){e=pe.event.fix(e);var t,n,r,i,o,a=[],s=ie.call(arguments),u=(pe._data(this,"events")||{})[e.type]||[],l=pe.event.special[e.type]||{};if(s[0]=e,e.delegateTarget=this,!l.preDispatch||l.preDispatch.call(this,e)!==!1){for(a=pe.event.handlers.call(this,e,u),t=0;(i=a[t++])&&!e.isPropagationStopped();)for(e.currentTarget=i.elem,n=0;(o=i.handlers[n++])&&!e.isImmediatePropagationStopped();)e.rnamespace&&!e.rnamespace.test(o.namespace)||(e.handleObj=o,e.data=o.data,r=((pe.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s),void 0!==r&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()));return l.postDispatch&&l.postDispatch.call(this,e),e.result}},handlers:function(e,t){var n,r,i,o,a=[],s=t.delegateCount,u=e.target;if(s&&u.nodeType&&("click"!==e.type||isNaN(e.button)||e.button<1))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(r=[],n=0;n<s;n++)o=t[n],i=o.selector+" ",void 0===r[i]&&(r[i]=o.needsContext?pe(i,this).index(u)>-1:pe.find(i,this,null,[u]).length),r[i]&&r.push(o);r.length&&a.push({elem:u,handlers:r})}return s<t.length&&a.push({elem:this,handlers:t.slice(s)}),a},fix:function(e){if(e[pe.expando])return e;var t,n,r,i=e.type,o=e,a=this.fixHooks[i];for(a||(this.fixHooks[i]=a=Ge.test(i)?this.mouseHooks:Je.test(i)?this.keyHooks:{}),r=a.props?this.props.concat(a.props):this.props,e=new pe.Event(o),t=r.length;t--;)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||re),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,a.filter?a.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget detail eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,t){var n,r,i,o=t.button,a=t.fromElement;return null==e.pageX&&null!=t.clientX&&(r=e.target.ownerDocument||re,i=r.documentElement,n=r.body,e.pageX=t.clientX+(i&&i.scrollLeft||n&&n.scrollLeft||0)-(i&&i.clientLeft||n&&n.clientLeft||0),e.pageY=t.clientY+(i&&i.scrollTop||n&&n.scrollTop||0)-(i&&i.clientTop||n&&n.clientTop||0)),!e.relatedTarget&&a&&(e.relatedTarget=a===e.target?t.toElement:a),e.which||void 0===o||(e.which=1&o?1:2&o?3:4&o?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==b()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){if(this===b()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if(pe.nodeName(this,"input")&&"checkbox"===this.type&&this.click)return this.click(),!1},_default:function(e){return pe.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n){var r=pe.extend(new pe.Event,n,{type:e,isSimulated:!0});pe.event.trigger(r,null,t),r.isDefaultPrevented()&&n.preventDefault()}},pe.removeEvent=re.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)}:function(e,t,n){var r="on"+t;e.detachEvent&&("undefined"==typeof e[r]&&(e[r]=null),e.detachEvent(r,n))},pe.Event=function(e,t){return this instanceof pe.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&e.returnValue===!1?v:x):this.type=e,t&&pe.extend(this,t),this.timeStamp=e&&e.timeStamp||pe.now(),void(this[pe.expando]=!0)):new pe.Event(e,t)},pe.Event.prototype={constructor:pe.Event,isDefaultPrevented:x,isPropagationStopped:x,isImmediatePropagationStopped:x,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=v,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=v,e&&!this.isSimulated&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=v,e&&e.stopImmediatePropagation&&e.stopImmediatePropagation(),this.stopPropagation()}},pe.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,t){pe.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return i&&(i===r||pe.contains(r,i))||(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),fe.submit||(pe.event.special.submit={setup:function(){return!pe.nodeName(this,"form")&&void pe.event.add(this,"click._submit keypress._submit",function(e){var t=e.target,n=pe.nodeName(t,"input")||pe.nodeName(t,"button")?pe.prop(t,"form"):void 0;n&&!pe._data(n,"submit")&&(pe.event.add(n,"submit._submit",function(e){e._submitBubble=!0}),pe._data(n,"submit",!0))})},postDispatch:function(e){e._submitBubble&&(delete e._submitBubble,this.parentNode&&!e.isTrigger&&pe.event.simulate("submit",this.parentNode,e))},teardown:function(){return!pe.nodeName(this,"form")&&void pe.event.remove(this,"._submit")}}),fe.change||(pe.event.special.change={setup:function(){return Ye.test(this.nodeName)?("checkbox"!==this.type&&"radio"!==this.type||(pe.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._justChanged=!0)}),pe.event.add(this,"click._change",function(e){this._justChanged&&!e.isTrigger&&(this._justChanged=!1),pe.event.simulate("change",this,e)})),!1):void pe.event.add(this,"beforeactivate._change",function(e){var t=e.target;Ye.test(t.nodeName)&&!pe._data(t,"change")&&(pe.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||pe.event.simulate("change",this.parentNode,e)}),pe._data(t,"change",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||"radio"!==t.type&&"checkbox"!==t.type)return e.handleObj.handler.apply(this,arguments)},teardown:function(){return pe.event.remove(this,"._change"),!Ye.test(this.nodeName)}}),fe.focusin||pe.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){pe.event.simulate(t,e.target,pe.event.fix(e))};pe.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=pe._data(r,t);i||r.addEventListener(e,n,!0),pe._data(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=pe._data(r,t)-1;i?pe._data(r,t,i):(r.removeEventListener(e,n,!0),pe._removeData(r,t))}}}),pe.fn.extend({on:function(e,t,n,r){return w(this,e,t,n,r)},one:function(e,t,n,r){return w(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,pe(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return t!==!1&&"function"!=typeof t||(n=t,t=void 0),n===!1&&(n=x),this.each(function(){pe.event.remove(this,e,n,t)})},trigger:function(e,t){return this.each(function(){pe.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return pe.event.trigger(e,t,n,!0)}});var Ze=/ jQuery\d+="(?:null|\d+)"/g,et=new RegExp("<(?:"+ze+")[\\s/>]","i"),tt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,nt=/<script|<style|<link/i,rt=/checked\s*(?:[^=]|=\s*.checked.)/i,it=/^true\/(.*)/,ot=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,at=p(re),st=at.appendChild(re.createElement("div"));pe.extend({htmlPrefilter:function(e){return e.replace(tt,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u=pe.contains(e.ownerDocument,e);if(fe.html5Clone||pe.isXMLDoc(e)||!et.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(st.innerHTML=e.outerHTML,st.removeChild(o=st.firstChild)),!(fe.noCloneEvent&&fe.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||pe.isXMLDoc(e)))for(r=h(o),s=h(e),a=0;null!=(i=s[a]);++a)r[a]&&k(i,r[a]);if(t)if(n)for(s=s||h(e),r=r||h(o),a=0;null!=(i=s[a]);a++)N(i,r[a]);else N(e,o);return r=h(o,"script"),r.length>0&&g(r,!u&&h(e,"script")),r=s=i=null,o},cleanData:function(e,t){for(var n,r,i,o,a=0,s=pe.expando,u=pe.cache,l=fe.attributes,c=pe.event.special;null!=(n=e[a]);a++)if((t||He(n))&&(i=n[s],o=i&&u[i])){if(o.events)for(r in o.events)c[r]?pe.event.remove(n,r):pe.removeEvent(n,r,o.handle);u[i]&&(delete u[i],l||"undefined"==typeof n.removeAttribute?n[s]=void 0:n.removeAttribute(s),ne.push(i))}}}),pe.fn.extend({domManip:S,detach:function(e){return A(this,e,!0)},remove:function(e){return A(this,e)},text:function(e){return Pe(this,function(e){return void 0===e?pe.text(this):this.empty().append((this[0]&&this[0].ownerDocument||re).createTextNode(e))},null,e,arguments.length)},append:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.appendChild(e)}})},prepend:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++){for(1===e.nodeType&&pe.cleanData(h(e,!1));e.firstChild;)e.removeChild(e.firstChild);e.options&&pe.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return pe.clone(this,e,t)})},html:function(e){return Pe(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e)return 1===t.nodeType?t.innerHTML.replace(Ze,""):void 0;if("string"==typeof e&&!nt.test(e)&&(fe.htmlSerialize||!et.test(e))&&(fe.leadingWhitespace||!$e.test(e))&&!Xe[(We.exec(e)||["",""])[1].toLowerCase()]){e=pe.htmlPrefilter(e);try{for(;n<r;n++)t=this[n]||{},1===t.nodeType&&(pe.cleanData(h(t,!1)),t.innerHTML=e);t=0}catch(i){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=[];return S(this,arguments,function(t){var n=this.parentNode;pe.inArray(this,e)<0&&(pe.cleanData(h(this)),
+n&&n.replaceChild(t,this))},e)}}),pe.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){pe.fn[e]=function(e){for(var n,r=0,i=[],o=pe(e),a=o.length-1;r<=a;r++)n=r===a?this:this.clone(!0),pe(o[r])[t](n),ae.apply(i,n.get());return this.pushStack(i)}});var ut,lt={HTML:"block",BODY:"block"},ct=/^margin/,ft=new RegExp("^("+Fe+")(?!px)[a-z%]+$","i"),dt=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i},pt=re.documentElement;!function(){function t(){var t,c,f=re.documentElement;f.appendChild(u),l.style.cssText="-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",n=i=s=!1,r=a=!0,e.getComputedStyle&&(c=e.getComputedStyle(l),n="1%"!==(c||{}).top,s="2px"===(c||{}).marginLeft,i="4px"===(c||{width:"4px"}).width,l.style.marginRight="50%",r="4px"===(c||{marginRight:"4px"}).marginRight,t=l.appendChild(re.createElement("div")),t.style.cssText=l.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",t.style.marginRight=t.style.width="0",l.style.width="1px",a=!parseFloat((e.getComputedStyle(t)||{}).marginRight),l.removeChild(t)),l.style.display="none",o=0===l.getClientRects().length,o&&(l.style.display="",l.innerHTML="<table><tr><td></td><td>t</td></tr></table>",t=l.getElementsByTagName("td"),t[0].style.cssText="margin:0;border:0;padding:0;display:none",o=0===t[0].offsetHeight,o&&(t[0].style.display="",t[1].style.display="none",o=0===t[0].offsetHeight)),f.removeChild(u)}var n,r,i,o,a,s,u=re.createElement("div"),l=re.createElement("div");l.style&&(l.style.cssText="float:left;opacity:.5",fe.opacity="0.5"===l.style.opacity,fe.cssFloat=!!l.style.cssFloat,l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",fe.clearCloneStyle="content-box"===l.style.backgroundClip,u=re.createElement("div"),u.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",l.innerHTML="",u.appendChild(l),fe.boxSizing=""===l.style.boxSizing||""===l.style.MozBoxSizing||""===l.style.WebkitBoxSizing,pe.extend(fe,{reliableHiddenOffsets:function(){return null==n&&t(),o},boxSizingReliable:function(){return null==n&&t(),i},pixelMarginRight:function(){return null==n&&t(),r},pixelPosition:function(){return null==n&&t(),n},reliableMarginRight:function(){return null==n&&t(),a},reliableMarginLeft:function(){return null==n&&t(),s}}))}();var ht,gt,mt=/^(top|right|bottom|left)$/;e.getComputedStyle?(ht=function(t){var n=t.ownerDocument.defaultView;return n&&n.opener||(n=e),n.getComputedStyle(t)},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n.getPropertyValue(t)||n[t]:void 0,""!==a&&void 0!==a||pe.contains(e.ownerDocument,e)||(a=pe.style(e,t)),n&&!fe.pixelMarginRight()&&ft.test(a)&&ct.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o),void 0===a?a:a+""}):pt.currentStyle&&(ht=function(e){return e.currentStyle},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n[t]:void 0,null==a&&s&&s[t]&&(a=s[t]),ft.test(a)&&!mt.test(t)&&(r=s.left,i=e.runtimeStyle,o=i&&i.left,o&&(i.left=e.currentStyle.left),s.left="fontSize"===t?"1em":a,a=s.pixelLeft+"px",s.left=r,o&&(i.left=o)),void 0===a?a:a+""||"auto"});var yt=/alpha\([^)]*\)/i,vt=/opacity\s*=\s*([^)]*)/i,xt=/^(none|table(?!-c[ea]).+)/,bt=new RegExp("^("+Fe+")(.*)$","i"),wt={position:"absolute",visibility:"hidden",display:"block"},Tt={letterSpacing:"0",fontWeight:"400"},Ct=["Webkit","O","Moz","ms"],Et=re.createElement("div").style;pe.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=gt(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":fe.cssFloat?"cssFloat":"styleFloat"},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=pe.camelCase(t),u=e.style;if(t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:u[t];if(o=typeof n,"string"===o&&(i=Me.exec(n))&&i[1]&&(n=d(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(pe.cssNumber[s]?"":"px")),fe.clearCloneStyle||""!==n||0!==t.indexOf("background")||(u[t]="inherit"),!(a&&"set"in a&&void 0===(n=a.set(e,n,r)))))try{u[t]=n}catch(l){}}},css:function(e,t,n,r){var i,o,a,s=pe.camelCase(t);return t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],a&&"get"in a&&(o=a.get(e,!0,n)),void 0===o&&(o=gt(e,t,r)),"normal"===o&&t in Tt&&(o=Tt[t]),""===n||n?(i=parseFloat(o),n===!0||isFinite(i)?i||0:o):o}}),pe.each(["height","width"],function(e,t){pe.cssHooks[t]={get:function(e,n,r){if(n)return xt.test(pe.css(e,"display"))&&0===e.offsetWidth?dt(e,wt,function(){return M(e,t,r)}):M(e,t,r)},set:function(e,n,r){var i=r&&ht(e);return _(e,n,r?F(e,t,r,fe.boxSizing&&"border-box"===pe.css(e,"boxSizing",!1,i),i):0)}}}),fe.opacity||(pe.cssHooks.opacity={get:function(e,t){return vt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=pe.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===pe.trim(o.replace(yt,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=yt.test(o)?o.replace(yt,i):o+" "+i)}}),pe.cssHooks.marginRight=L(fe.reliableMarginRight,function(e,t){if(t)return dt(e,{display:"inline-block"},gt,[e,"marginRight"])}),pe.cssHooks.marginLeft=L(fe.reliableMarginLeft,function(e,t){if(t)return(parseFloat(gt(e,"marginLeft"))||(pe.contains(e.ownerDocument,e)?e.getBoundingClientRect().left-dt(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}):0))+"px"}),pe.each({margin:"",padding:"",border:"Width"},function(e,t){pe.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+Oe[r]+t]=o[r]||o[r-2]||o[0];return i}},ct.test(e)||(pe.cssHooks[e+t].set=_)}),pe.fn.extend({css:function(e,t){return Pe(this,function(e,t,n){var r,i,o={},a=0;if(pe.isArray(t)){for(r=ht(e),i=t.length;a<i;a++)o[t[a]]=pe.css(e,t[a],!1,r);return o}return void 0!==n?pe.style(e,t,n):pe.css(e,t)},e,t,arguments.length>1)},show:function(){return q(this,!0)},hide:function(){return q(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){Re(this)?pe(this).show():pe(this).hide()})}}),pe.Tween=O,O.prototype={constructor:O,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||pe.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(pe.cssNumber[n]?"":"px")},cur:function(){var e=O.propHooks[this.prop];return e&&e.get?e.get(this):O.propHooks._default.get(this)},run:function(e){var t,n=O.propHooks[this.prop];return this.options.duration?this.pos=t=pe.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):O.propHooks._default.set(this),this}},O.prototype.init.prototype=O.prototype,O.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=pe.css(e.elem,e.prop,""),t&&"auto"!==t?t:0)},set:function(e){pe.fx.step[e.prop]?pe.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[pe.cssProps[e.prop]]&&!pe.cssHooks[e.prop]?e.elem[e.prop]=e.now:pe.style(e.elem,e.prop,e.now+e.unit)}}},O.propHooks.scrollTop=O.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},pe.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},pe.fx=O.prototype.init,pe.fx.step={};var Nt,kt,St=/^(?:toggle|show|hide)$/,At=/queueHooks$/;pe.Animation=pe.extend($,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return d(n.elem,e,Me.exec(t),n),n}]},tweener:function(e,t){pe.isFunction(e)?(t=e,e=["*"]):e=e.match(De);for(var n,r=0,i=e.length;r<i;r++)n=e[r],$.tweeners[n]=$.tweeners[n]||[],$.tweeners[n].unshift(t)},prefilters:[W],prefilter:function(e,t){t?$.prefilters.unshift(e):$.prefilters.push(e)}}),pe.speed=function(e,t,n){var r=e&&"object"==typeof e?pe.extend({},e):{complete:n||!n&&t||pe.isFunction(e)&&e,duration:e,easing:n&&t||t&&!pe.isFunction(t)&&t};return r.duration=pe.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in pe.fx.speeds?pe.fx.speeds[r.duration]:pe.fx.speeds._default,null!=r.queue&&r.queue!==!0||(r.queue="fx"),r.old=r.complete,r.complete=function(){pe.isFunction(r.old)&&r.old.call(this),r.queue&&pe.dequeue(this,r.queue)},r},pe.fn.extend({fadeTo:function(e,t,n,r){return this.filter(Re).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=pe.isEmptyObject(e),o=pe.speed(t,n,r),a=function(){var t=$(this,pe.extend({},e),o);(i||pe._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,t,n){var r=function(e){var t=e.stop;delete e.stop,t(n)};return"string"!=typeof e&&(n=t,t=e,e=void 0),t&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,i=null!=e&&e+"queueHooks",o=pe.timers,a=pe._data(this);if(i)a[i]&&a[i].stop&&r(a[i]);else for(i in a)a[i]&&a[i].stop&&At.test(i)&&r(a[i]);for(i=o.length;i--;)o[i].elem!==this||null!=e&&o[i].queue!==e||(o[i].anim.stop(n),t=!1,o.splice(i,1));!t&&n||pe.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=pe._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=pe.timers,a=r?r.length:0;for(n.finish=!0,pe.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;t<a;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),pe.each(["toggle","show","hide"],function(e,t){var n=pe.fn[t];pe.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(P(t,!0),e,r,i)}}),pe.each({slideDown:P("show"),slideUp:P("hide"),slideToggle:P("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){pe.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),pe.timers=[],pe.fx.tick=function(){var e,t=pe.timers,n=0;for(Nt=pe.now();n<t.length;n++)e=t[n],e()||t[n]!==e||t.splice(n--,1);t.length||pe.fx.stop(),Nt=void 0},pe.fx.timer=function(e){pe.timers.push(e),e()?pe.fx.start():pe.timers.pop()},pe.fx.interval=13,pe.fx.start=function(){kt||(kt=e.setInterval(pe.fx.tick,pe.fx.interval))},pe.fx.stop=function(){e.clearInterval(kt),kt=null},pe.fx.speeds={slow:600,fast:200,_default:400},pe.fn.delay=function(t,n){return t=pe.fx?pe.fx.speeds[t]||t:t,n=n||"fx",this.queue(n,function(n,r){var i=e.setTimeout(n,t);r.stop=function(){e.clearTimeout(i)}})},function(){var e,t=re.createElement("input"),n=re.createElement("div"),r=re.createElement("select"),i=r.appendChild(re.createElement("option"));n=re.createElement("div"),n.setAttribute("className","t"),n.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",e=n.getElementsByTagName("a")[0],t.setAttribute("type","checkbox"),n.appendChild(t),e=n.getElementsByTagName("a")[0],e.style.cssText="top:1px",fe.getSetAttribute="t"!==n.className,fe.style=/top/.test(e.getAttribute("style")),fe.hrefNormalized="/a"===e.getAttribute("href"),fe.checkOn=!!t.value,fe.optSelected=i.selected,fe.enctype=!!re.createElement("form").enctype,r.disabled=!0,fe.optDisabled=!i.disabled,t=re.createElement("input"),t.setAttribute("value",""),fe.input=""===t.getAttribute("value"),t.value="t",t.setAttribute("type","radio"),fe.radioValue="t"===t.value}();var Dt=/\r/g,jt=/[\x20\t\r\n\f]+/g;pe.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=pe.isFunction(e),this.each(function(n){var i;1===this.nodeType&&(i=r?e.call(this,n,pe(this).val()):e,null==i?i="":"number"==typeof i?i+="":pe.isArray(i)&&(i=pe.map(i,function(e){return null==e?"":e+""})),t=pe.valHooks[this.type]||pe.valHooks[this.nodeName.toLowerCase()],t&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return t=pe.valHooks[i.type]||pe.valHooks[i.nodeName.toLowerCase()],t&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:(n=i.value,"string"==typeof n?n.replace(Dt,""):null==n?"":n)}}}),pe.extend({valHooks:{option:{get:function(e){var t=pe.find.attr(e,"value");return null!=t?t:pe.trim(pe.text(e)).replace(jt," ")}},select:{get:function(e){for(var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||i<0,a=o?null:[],s=o?i+1:r.length,u=i<0?s:o?i:0;u<s;u++)if(n=r[u],(n.selected||u===i)&&(fe.optDisabled?!n.disabled:null===n.getAttribute("disabled"))&&(!n.parentNode.disabled||!pe.nodeName(n.parentNode,"optgroup"))){if(t=pe(n).val(),o)return t;a.push(t)}return a},set:function(e,t){for(var n,r,i=e.options,o=pe.makeArray(t),a=i.length;a--;)if(r=i[a],pe.inArray(pe.valHooks.option.get(r),o)>-1)try{r.selected=n=!0}catch(s){r.scrollHeight}else r.selected=!1;return n||(e.selectedIndex=-1),i}}}}),pe.each(["radio","checkbox"],function(){pe.valHooks[this]={set:function(e,t){if(pe.isArray(t))return e.checked=pe.inArray(pe(e).val(),t)>-1}},fe.checkOn||(pe.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Lt,Ht,qt=pe.expr.attrHandle,_t=/^(?:checked|selected)$/i,Ft=fe.getSetAttribute,Mt=fe.input;pe.fn.extend({attr:function(e,t){return Pe(this,pe.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){pe.removeAttr(this,e)})}}),pe.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?pe.prop(e,t,n):(1===o&&pe.isXMLDoc(e)||(t=t.toLowerCase(),i=pe.attrHooks[t]||(pe.expr.match.bool.test(t)?Ht:Lt)),void 0!==n?null===n?void pe.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:(r=pe.find.attr(e,t),null==r?void 0:r))},attrHooks:{type:{set:function(e,t){if(!fe.radioValue&&"radio"===t&&pe.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(De);if(o&&1===e.nodeType)for(;n=o[i++];)r=pe.propFix[n]||n,pe.expr.match.bool.test(n)?Mt&&Ft||!_t.test(n)?e[r]=!1:e[pe.camelCase("default-"+n)]=e[r]=!1:pe.attr(e,n,""),e.removeAttribute(Ft?n:r)}}),Ht={set:function(e,t,n){return t===!1?pe.removeAttr(e,n):Mt&&Ft||!_t.test(n)?e.setAttribute(!Ft&&pe.propFix[n]||n,n):e[pe.camelCase("default-"+n)]=e[n]=!0,n}},pe.each(pe.expr.match.bool.source.match(/\w+/g),function(e,t){var n=qt[t]||pe.find.attr;Mt&&Ft||!_t.test(t)?qt[t]=function(e,t,r){var i,o;return r||(o=qt[t],qt[t]=i,i=null!=n(e,t,r)?t.toLowerCase():null,qt[t]=o),i}:qt[t]=function(e,t,n){if(!n)return e[pe.camelCase("default-"+t)]?t.toLowerCase():null}}),Mt&&Ft||(pe.attrHooks.value={set:function(e,t,n){return pe.nodeName(e,"input")?void(e.defaultValue=t):Lt&&Lt.set(e,t,n)}}),Ft||(Lt={set:function(e,t,n){var r=e.getAttributeNode(n);if(r||e.setAttributeNode(r=e.ownerDocument.createAttribute(n)),r.value=t+="","value"===n||t===e.getAttribute(n))return t}},qt.id=qt.name=qt.coords=function(e,t,n){var r;if(!n)return(r=e.getAttributeNode(t))&&""!==r.value?r.value:null},pe.valHooks.button={get:function(e,t){var n=e.getAttributeNode(t);if(n&&n.specified)return n.value},set:Lt.set},pe.attrHooks.contenteditable={set:function(e,t,n){Lt.set(e,""!==t&&t,n)}},pe.each(["width","height"],function(e,t){pe.attrHooks[t]={set:function(e,n){if(""===n)return e.setAttribute(t,"auto"),n}}})),fe.style||(pe.attrHooks.style={get:function(e){return e.style.cssText||void 0},set:function(e,t){return e.style.cssText=t+""}});var Ot=/^(?:input|select|textarea|button|object)$/i,Rt=/^(?:a|area)$/i;pe.fn.extend({prop:function(e,t){return Pe(this,pe.prop,e,t,arguments.length>1)},removeProp:function(e){return e=pe.propFix[e]||e,this.each(function(){try{this[e]=void 0,delete this[e]}catch(t){}})}}),pe.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&pe.isXMLDoc(e)||(t=pe.propFix[t]||t,i=pe.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=pe.find.attr(e,"tabindex");return t?parseInt(t,10):Ot.test(e.nodeName)||Rt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),fe.hrefNormalized||pe.each(["href","src"],function(e,t){pe.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),fe.optSelected||(pe.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),pe.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){pe.propFix[this.toLowerCase()]=this}),fe.enctype||(pe.propFix.enctype="encoding");var Pt=/[\t\r\n\f]/g;pe.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).addClass(e.call(this,t,z(this)))});if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)r.indexOf(" "+o+" ")<0&&(r+=o+" ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).removeClass(e.call(this,t,z(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)for(;r.indexOf(" "+o+" ")>-1;)r=r.replace(" "+o+" "," ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):pe.isFunction(e)?this.each(function(n){pe(this).toggleClass(e.call(this,n,z(this),t),t)}):this.each(function(){var t,r,i,o;if("string"===n)for(r=0,i=pe(this),o=e.match(De)||[];t=o[r++];)i.hasClass(t)?i.removeClass(t):i.addClass(t);else void 0!==e&&"boolean"!==n||(t=z(this),t&&pe._data(this,"__className__",t),pe.attr(this,"class",t||e===!1?"":pe._data(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;for(t=" "+e+" ";n=this[r++];)if(1===n.nodeType&&(" "+z(n)+" ").replace(Pt," ").indexOf(t)>-1)return!0;return!1}}),pe.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){pe.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),pe.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}});var Bt=e.location,Wt=pe.now(),It=/\?/,$t=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;pe.parseJSON=function(t){if(e.JSON&&e.JSON.parse)return e.JSON.parse(t+"");var n,r=null,i=pe.trim(t+"");return i&&!pe.trim(i.replace($t,function(e,t,i,o){return n&&t&&(r=0),0===r?e:(n=i||t,r+=!o-!i,"")}))?Function("return "+i)():pe.error("Invalid JSON: "+t)},pe.parseXML=function(t){var n,r;if(!t||"string"!=typeof t)return null;try{e.DOMParser?(r=new e.DOMParser,n=r.parseFromString(t,"text/xml")):(n=new e.ActiveXObject("Microsoft.XMLDOM"),n.async="false",n.loadXML(t))}catch(i){n=void 0}return n&&n.documentElement&&!n.getElementsByTagName("parsererror").length||pe.error("Invalid XML: "+t),n};var zt=/#.*$/,Xt=/([?&])_=[^&]*/,Ut=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Vt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Yt=/^(?:GET|HEAD)$/,Jt=/^\/\//,Gt=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Kt={},Qt={},Zt="*/".concat("*"),en=Bt.href,tn=Gt.exec(en.toLowerCase())||[];pe.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:en,type:"GET",isLocal:Vt.test(tn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Zt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":pe.parseJSON,"text xml":pe.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?V(V(e,pe.ajaxSettings),t):V(pe.ajaxSettings,e)},ajaxPrefilter:X(Kt),ajaxTransport:X(Qt),ajax:function(t,n){function r(t,n,r,i){var o,f,v,x,w,C=n;2!==b&&(b=2,u&&e.clearTimeout(u),c=void 0,s=i||"",T.readyState=t>0?4:0,o=t>=200&&t<300||304===t,r&&(x=Y(d,T,r)),x=J(d,x,T,o),o?(d.ifModified&&(w=T.getResponseHeader("Last-Modified"),w&&(pe.lastModified[a]=w),w=T.getResponseHeader("etag"),w&&(pe.etag[a]=w)),204===t||"HEAD"===d.type?C="nocontent":304===t?C="notmodified":(C=x.state,f=x.data,v=x.error,o=!v)):(v=C,!t&&C||(C="error",t<0&&(t=0))),T.status=t,T.statusText=(n||C)+"",o?g.resolveWith(p,[f,C,T]):g.rejectWith(p,[T,C,v]),T.statusCode(y),y=void 0,l&&h.trigger(o?"ajaxSuccess":"ajaxError",[T,d,o?f:v]),m.fireWith(p,[T,C]),l&&(h.trigger("ajaxComplete",[T,d]),--pe.active||pe.event.trigger("ajaxStop")))}"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,d=pe.ajaxSetup({},n),p=d.context||d,h=d.context&&(p.nodeType||p.jquery)?pe(p):pe.event,g=pe.Deferred(),m=pe.Callbacks("once memory"),y=d.statusCode||{},v={},x={},b=0,w="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!f)for(f={};t=Ut.exec(s);)f[t[1].toLowerCase()]=t[2];t=f[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?s:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=x[n]=x[n]||e,v[e]=t),this},overrideMimeType:function(e){return b||(d.mimeType=e),this},statusCode:function(e){var t;if(e)if(b<2)for(t in e)y[t]=[y[t],e[t]];else T.always(e[T.status]);return this},abort:function(e){var t=e||w;return c&&c.abort(t),r(0,t),this}};if(g.promise(T).complete=m.add,T.success=T.done,T.error=T.fail,d.url=((t||d.url||en)+"").replace(zt,"").replace(Jt,tn[1]+"//"),d.type=n.method||n.type||d.method||d.type,d.dataTypes=pe.trim(d.dataType||"*").toLowerCase().match(De)||[""],null==d.crossDomain&&(i=Gt.exec(d.url.toLowerCase()),d.crossDomain=!(!i||i[1]===tn[1]&&i[2]===tn[2]&&(i[3]||("http:"===i[1]?"80":"443"))===(tn[3]||("http:"===tn[1]?"80":"443")))),d.data&&d.processData&&"string"!=typeof d.data&&(d.data=pe.param(d.data,d.traditional)),U(Kt,d,n,T),2===b)return T;l=pe.event&&d.global,l&&0===pe.active++&&pe.event.trigger("ajaxStart"),d.type=d.type.toUpperCase(),d.hasContent=!Yt.test(d.type),a=d.url,d.hasContent||(d.data&&(a=d.url+=(It.test(a)?"&":"?")+d.data,delete d.data),d.cache===!1&&(d.url=Xt.test(a)?a.replace(Xt,"$1_="+Wt++):a+(It.test(a)?"&":"?")+"_="+Wt++)),d.ifModified&&(pe.lastModified[a]&&T.setRequestHeader("If-Modified-Since",pe.lastModified[a]),pe.etag[a]&&T.setRequestHeader("If-None-Match",pe.etag[a])),(d.data&&d.hasContent&&d.contentType!==!1||n.contentType)&&T.setRequestHeader("Content-Type",d.contentType),T.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+("*"!==d.dataTypes[0]?", "+Zt+"; q=0.01":""):d.accepts["*"]);for(o in d.headers)T.setRequestHeader(o,d.headers[o]);if(d.beforeSend&&(d.beforeSend.call(p,T,d)===!1||2===b))return T.abort();w="abort";for(o in{success:1,error:1,complete:1})T[o](d[o]);if(c=U(Qt,d,n,T)){if(T.readyState=1,l&&h.trigger("ajaxSend",[T,d]),2===b)return T;d.async&&d.timeout>0&&(u=e.setTimeout(function(){T.abort("timeout")},d.timeout));try{b=1,c.send(v,r)}catch(C){if(!(b<2))throw C;r(-1,C)}}else r(-1,"No Transport");return T},getJSON:function(e,t,n){return pe.get(e,t,n,"json")},getScript:function(e,t){return pe.get(e,void 0,t,"script")}}),pe.each(["get","post"],function(e,t){pe[t]=function(e,n,r,i){return pe.isFunction(n)&&(i=i||r,r=n,n=void 0),pe.ajax(pe.extend({url:e,type:t,dataType:i,data:n,success:r},pe.isPlainObject(e)&&e))}}),pe._evalUrl=function(e){return pe.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},pe.fn.extend({wrapAll:function(e){if(pe.isFunction(e))return this.each(function(t){pe(this).wrapAll(e.call(this,t))});if(this[0]){var t=pe(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){for(var e=this;e.firstChild&&1===e.firstChild.nodeType;)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return pe.isFunction(e)?this.each(function(t){pe(this).wrapInner(e.call(this,t))}):this.each(function(){var t=pe(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=pe.isFunction(e);return this.each(function(n){pe(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){pe.nodeName(this,"body")||pe(this).replaceWith(this.childNodes)}).end()}}),pe.expr.filters.hidden=function(e){return fe.reliableHiddenOffsets()?e.offsetWidth<=0&&e.offsetHeight<=0&&!e.getClientRects().length:K(e)},pe.expr.filters.visible=function(e){return!pe.expr.filters.hidden(e)};var nn=/%20/g,rn=/\[\]$/,on=/\r?\n/g,an=/^(?:submit|button|image|reset|file)$/i,sn=/^(?:input|select|textarea|keygen)/i;pe.param=function(e,t){var n,r=[],i=function(e,t){t=pe.isFunction(t)?t():null==t?"":t,r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(void 0===t&&(t=pe.ajaxSettings&&pe.ajaxSettings.traditional),pe.isArray(e)||e.jquery&&!pe.isPlainObject(e))pe.each(e,function(){i(this.name,this.value)});else for(n in e)Q(n,e[n],t,i);return r.join("&").replace(nn,"+")},pe.fn.extend({serialize:function(){return pe.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=pe.prop(this,"elements");return e?pe.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!pe(this).is(":disabled")&&sn.test(this.nodeName)&&!an.test(e)&&(this.checked||!Be.test(e))}).map(function(e,t){var n=pe(this).val();return null==n?null:pe.isArray(n)?pe.map(n,function(e){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),pe.ajaxSettings.xhr=void 0!==e.ActiveXObject?function(){return this.isLocal?ee():re.documentMode>8?Z():/^(get|post|head|put|delete|options)$/i.test(this.type)&&Z()||ee()}:Z;var un=0,ln={},cn=pe.ajaxSettings.xhr();e.attachEvent&&e.attachEvent("onunload",function(){for(var e in ln)ln[e](void 0,!0)}),fe.cors=!!cn&&"withCredentials"in cn,cn=fe.ajax=!!cn,cn&&pe.ajaxTransport(function(t){if(!t.crossDomain||fe.cors){var n;return{send:function(r,i){var o,a=t.xhr(),s=++un;if(a.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(o in t.xhrFields)a[o]=t.xhrFields[o];t.mimeType&&a.overrideMimeType&&a.overrideMimeType(t.mimeType),t.crossDomain||r["X-Requested-With"]||(r["X-Requested-With"]="XMLHttpRequest");for(o in r)void 0!==r[o]&&a.setRequestHeader(o,r[o]+"");a.send(t.hasContent&&t.data||null),n=function(e,r){var o,u,l;if(n&&(r||4===a.readyState))if(delete ln[s],n=void 0,a.onreadystatechange=pe.noop,r)4!==a.readyState&&a.abort();else{l={},o=a.status,"string"==typeof a.responseText&&(l.text=a.responseText);try{u=a.statusText}catch(c){u=""}o||!t.isLocal||t.crossDomain?1223===o&&(o=204):o=l.text?200:404}l&&i(o,u,l,a.getAllResponseHeaders())},t.async?4===a.readyState?e.setTimeout(n):a.onreadystatechange=ln[s]=n:n()},abort:function(){n&&n(void 0,!0)}}}}),pe.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return pe.globalEval(e),e}}}),pe.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),pe.ajaxTransport("script",function(e){if(e.crossDomain){var t,n=re.head||pe("head")[0]||re.documentElement;return{send:function(r,i){t=re.createElement("script"),t.async=!0,e.scriptCharset&&(t.charset=e.scriptCharset),t.src=e.url,t.onload=t.onreadystatechange=function(e,n){(n||!t.readyState||/loaded|complete/.test(t.readyState))&&(t.onload=t.onreadystatechange=null,t.parentNode&&t.parentNode.removeChild(t),t=null,n||i(200,"success"))},n.insertBefore(t,n.firstChild)},abort:function(){t&&t.onload(void 0,!0)}}}});var fn=[],dn=/(=)\?(?=&|$)|\?\?/;pe.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=fn.pop()||pe.expando+"_"+Wt++;return this[e]=!0,e}}),pe.ajaxPrefilter("json jsonp",function(t,n,r){var i,o,a,s=t.jsonp!==!1&&(dn.test(t.url)?"url":"string"==typeof t.data&&0===(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&dn.test(t.data)&&"data");if(s||"jsonp"===t.dataTypes[0])return i=t.jsonpCallback=pe.isFunction(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,s?t[s]=t[s].replace(dn,"$1"+i):t.jsonp!==!1&&(t.url+=(It.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return a||pe.error(i+" was not called"),a[0]},t.dataTypes[0]="json",o=e[i],e[i]=function(){a=arguments},r.always(function(){void 0===o?pe(e).removeProp(i):e[i]=o,t[i]&&(t.jsonpCallback=n.jsonpCallback,fn.push(i)),a&&pe.isFunction(o)&&o(a[0]),a=o=void 0}),"script"}),pe.parseHTML=function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||re;var r=Te.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=y([e],t,i),i&&i.length&&pe(i).remove(),pe.merge([],r.childNodes))};var pn=pe.fn.load;return pe.fn.load=function(e,t,n){if("string"!=typeof e&&pn)return pn.apply(this,arguments);var r,i,o,a=this,s=e.indexOf(" ");return s>-1&&(r=pe.trim(e.slice(s,e.length)),e=e.slice(0,s)),pe.isFunction(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),a.length>0&&pe.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?pe("<div>").append(pe.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},pe.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){pe.fn[t]=function(e){return this.on(t,e)}}),pe.expr.filters.animated=function(e){return pe.grep(pe.timers,function(t){return e===t.elem}).length},pe.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l,c=pe.css(e,"position"),f=pe(e),d={};"static"===c&&(e.style.position="relative"),s=f.offset(),o=pe.css(e,"top"),u=pe.css(e,"left"),l=("absolute"===c||"fixed"===c)&&pe.inArray("auto",[o,u])>-1,l?(r=f.position(),a=r.top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),pe.isFunction(t)&&(t=t.call(e,n,pe.extend({},s))),null!=t.top&&(d.top=t.top-s.top+a),null!=t.left&&(d.left=t.left-s.left+i),"using"in t?t.using.call(e,d):f.css(d)}},pe.fn.extend({offset:function(e){if(arguments.length)return void 0===e?this:this.each(function(t){pe.offset.setOffset(this,e,t)});var t,n,r={top:0,left:0},i=this[0],o=i&&i.ownerDocument;if(o)return t=o.documentElement,pe.contains(t,i)?("undefined"!=typeof i.getBoundingClientRect&&(r=i.getBoundingClientRect()),n=te(o),{top:r.top+(n.pageYOffset||t.scrollTop)-(t.clientTop||0),left:r.left+(n.pageXOffset||t.scrollLeft)-(t.clientLeft||0)}):r},position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===pe.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),pe.nodeName(e[0],"html")||(n=e.offset()),n.top+=pe.css(e[0],"borderTopWidth",!0),n.left+=pe.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-pe.css(r,"marginTop",!0),left:t.left-n.left-pe.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){
+for(var e=this.offsetParent;e&&!pe.nodeName(e,"html")&&"static"===pe.css(e,"position");)e=e.offsetParent;return e||pt})}}),pe.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,t){var n=/Y/.test(t);pe.fn[e]=function(r){return Pe(this,function(e,r,i){var o=te(e);return void 0===i?o?t in o?o[t]:o.document.documentElement[r]:e[r]:void(o?o.scrollTo(n?pe(o).scrollLeft():i,n?i:pe(o).scrollTop()):e[r]=i)},e,r,arguments.length,null)}}),pe.each(["top","left"],function(e,t){pe.cssHooks[t]=L(fe.pixelPosition,function(e,n){if(n)return n=gt(e,t),ft.test(n)?pe(e).position()[t]+"px":n})}),pe.each({Height:"height",Width:"width"},function(e,t){pe.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){pe.fn[r]=function(r,i){var o=arguments.length&&(n||"boolean"!=typeof r),a=n||(r===!0||i===!0?"margin":"border");return Pe(this,function(t,n,r){var i;return pe.isWindow(t)?t.document.documentElement["client"+e]:9===t.nodeType?(i=t.documentElement,Math.max(t.body["scroll"+e],i["scroll"+e],t.body["offset"+e],i["offset"+e],i["client"+e])):void 0===r?pe.css(t,n,a):pe.style(t,n,r,a)},t,o?r:void 0,o,null)}})}),pe.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),pe.fn.size=function(){return this.length},pe.fn.andSelf=pe.fn.addBack,layui.define(function(e){layui.$=pe,e("jquery",pe)}),pe});
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/laydate.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/laydate.js
new file mode 100644
index 0000000..ae0a591
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/laydate.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;!function(){"use strict";var e=window.layui&&layui.define,t={getPath:function(){var e=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,n=t.length-1,a=n;a>0;a--)if("interactive"===t[a].readyState){e=t[a].src;break}return e||t[n].src}();return e.substring(0,e.lastIndexOf("/")+1)}(),getStyle:function(e,t){var n=e.currentStyle?e.currentStyle:window.getComputedStyle(e,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](t)},link:function(e,a,i){if(n.path){var r=document.getElementsByTagName("head")[0],o=document.createElement("link");"string"==typeof a&&(i=a);var s=(i||e).replace(/\.|\//g,""),l="layuicss-"+s,d=0;o.rel="stylesheet",o.href=n.path+e,o.id=l,document.getElementById(l)||r.appendChild(o),"function"==typeof a&&!function c(){return++d>80?window.console&&console.error("laydate.css: Invalid"):void(1989===parseInt(t.getStyle(document.getElementById(l),"width"))?a():setTimeout(c,100))}()}}},n={v:"5.0.9",config:{},index:window.laydate&&window.laydate.v?1e5:0,path:t.getPath,set:function(e){var t=this;return t.config=w.extend({},t.config,e),t},ready:function(a){var i="laydate",r="",o=(e?"modules/laydate/":"theme/")+"default/laydate.css?v="+n.v+r;return e?layui.addcss(o,a,i):t.link(o,a,i),this}},a=function(){var e=this;return{hint:function(t){e.hint.call(e,t)},config:e.config}},i="laydate",r=".layui-laydate",o="layui-this",s="laydate-disabled",l="开始日期超出了结束日期<br>建议重新选择",d=[100,2e5],c="layui-laydate-static",m="layui-laydate-list",u="laydate-selected",h="layui-laydate-hint",y="laydate-day-prev",f="laydate-day-next",p="layui-laydate-footer",g=".laydate-btns-confirm",v="laydate-time-text",D=".laydate-btns-time",T=function(e){var t=this;t.index=++n.index,t.config=w.extend({},t.config,n.config,e),n.ready(function(){t.init()})},w=function(e){return new C(e)},C=function(e){for(var t=0,n="object"==typeof e?[e]:(this.selector=e,document.querySelectorAll(e||null));t<n.length;t++)this.push(n[t])};C.prototype=[],C.prototype.constructor=C,w.extend=function(){var e=1,t=arguments,n=function(e,t){e=e||(t.constructor===Array?[]:{});for(var a in t)e[a]=t[a]&&t[a].constructor===Object?n(e[a],t[a]):t[a];return e};for(t[0]="object"==typeof t[0]?t[0]:{};e<t.length;e++)"object"==typeof t[e]&&n(t[0],t[e]);return t[0]},w.ie=function(){var e=navigator.userAgent.toLowerCase();return!!(window.ActiveXObject||"ActiveXObject"in window)&&((e.match(/msie\s(\d+)/)||[])[1]||"11")}(),w.stope=function(e){e=e||window.event,e.stopPropagation?e.stopPropagation():e.cancelBubble=!0},w.each=function(e,t){var n,a=this;if("function"!=typeof t)return a;if(e=e||[],e.constructor===Object){for(n in e)if(t.call(e[n],n,e[n]))break}else for(n=0;n<e.length&&!t.call(e[n],n,e[n]);n++);return a},w.digit=function(e,t,n){var a="";e=String(e),t=t||2;for(var i=e.length;i<t;i++)a+="0";return e<Math.pow(10,t)?a+(0|e):e},w.elem=function(e,t){var n=document.createElement(e);return w.each(t||{},function(e,t){n.setAttribute(e,t)}),n},C.addStr=function(e,t){return e=e.replace(/\s+/," "),t=t.replace(/\s+/," ").split(" "),w.each(t,function(t,n){new RegExp("\\b"+n+"\\b").test(e)||(e=e+" "+n)}),e.replace(/^\s|\s$/,"")},C.removeStr=function(e,t){return e=e.replace(/\s+/," "),t=t.replace(/\s+/," ").split(" "),w.each(t,function(t,n){var a=new RegExp("\\b"+n+"\\b");a.test(e)&&(e=e.replace(a,""))}),e.replace(/\s+/," ").replace(/^\s|\s$/,"")},C.prototype.find=function(e){var t=this,n=0,a=[],i="object"==typeof e;return this.each(function(r,o){for(var s=i?[e]:o.querySelectorAll(e||null);n<s.length;n++)a.push(s[n]);t.shift()}),i||(t.selector=(t.selector?t.selector+" ":"")+e),w.each(a,function(e,n){t.push(n)}),t},C.prototype.each=function(e){return w.each.call(this,this,e)},C.prototype.addClass=function(e,t){return this.each(function(n,a){a.className=C[t?"removeStr":"addStr"](a.className,e)})},C.prototype.removeClass=function(e){return this.addClass(e,!0)},C.prototype.hasClass=function(e){var t=!1;return this.each(function(n,a){new RegExp("\\b"+e+"\\b").test(a.className)&&(t=!0)}),t},C.prototype.attr=function(e,t){var n=this;return void 0===t?function(){if(n.length>0)return n[0].getAttribute(e)}():n.each(function(n,a){a.setAttribute(e,t)})},C.prototype.removeAttr=function(e){return this.each(function(t,n){n.removeAttribute(e)})},C.prototype.html=function(e){return this.each(function(t,n){n.innerHTML=e})},C.prototype.val=function(e){return this.each(function(t,n){n.value=e})},C.prototype.append=function(e){return this.each(function(t,n){"object"==typeof e?n.appendChild(e):n.innerHTML=n.innerHTML+e})},C.prototype.remove=function(e){return this.each(function(t,n){e?n.removeChild(e):n.parentNode.removeChild(n)})},C.prototype.on=function(e,t){return this.each(function(n,a){a.attachEvent?a.attachEvent("on"+e,function(e){e.target=e.srcElement,t.call(a,e)}):a.addEventListener(e,t,!1)})},C.prototype.off=function(e,t){return this.each(function(n,a){a.detachEvent?a.detachEvent("on"+e,t):a.removeEventListener(e,t,!1)})},T.isLeapYear=function(e){return e%4===0&&e%100!==0||e%400===0},T.prototype.config={type:"date",range:!1,format:"yyyy-MM-dd",value:null,isInitValue:!0,min:"1900-1-1",max:"2099-12-31",trigger:"focus",show:!1,showBottom:!0,btns:["clear","now","confirm"],lang:"cn",theme:"default",position:null,calendar:!1,mark:{},zIndex:null,done:null,change:null},T.prototype.lang=function(){var e=this,t=e.config,n={cn:{weeks:["日","一","二","三","四","五","六"],time:["时","分","秒"],timeTips:"选择时间",startTime:"开始时间",endTime:"结束时间",dateTips:"返回日期",month:["一","二","三","四","五","六","七","八","九","十","十一","十二"],tools:{confirm:"确定",clear:"清空",now:"现在"}},en:{weeks:["Su","Mo","Tu","We","Th","Fr","Sa"],time:["Hours","Minutes","Seconds"],timeTips:"Select Time",startTime:"Start Time",endTime:"End Time",dateTips:"Select Date",month:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],tools:{confirm:"Confirm",clear:"Clear",now:"Now"}}};return n[t.lang]||n.cn},T.prototype.init=function(){var e=this,t=e.config,n="yyyy|y|MM|M|dd|d|HH|H|mm|m|ss|s",a="static"===t.position,i={year:"yyyy",month:"yyyy-MM",date:"yyyy-MM-dd",time:"HH:mm:ss",datetime:"yyyy-MM-dd HH:mm:ss"};t.elem=w(t.elem),t.eventElem=w(t.eventElem),t.elem[0]&&(t.range===!0&&(t.range="-"),t.format===i.date&&(t.format=i[t.type]),e.format=t.format.match(new RegExp(n+"|.","g"))||[],e.EXP_IF="",e.EXP_SPLIT="",w.each(e.format,function(t,a){var i=new RegExp(n).test(a)?"\\d{"+function(){return new RegExp(n).test(e.format[0===t?t+1:t-1]||"")?/^yyyy|y$/.test(a)?4:a.length:/^yyyy$/.test(a)?"1,4":/^y$/.test(a)?"1,308":"1,2"}()+"}":"\\"+a;e.EXP_IF=e.EXP_IF+i,e.EXP_SPLIT=e.EXP_SPLIT+"("+i+")"}),e.EXP_IF=new RegExp("^"+(t.range?e.EXP_IF+"\\s\\"+t.range+"\\s"+e.EXP_IF:e.EXP_IF)+"$"),e.EXP_SPLIT=new RegExp("^"+e.EXP_SPLIT+"$",""),e.isInput(t.elem[0])||"focus"===t.trigger&&(t.trigger="click"),t.elem.attr("lay-key")||(t.elem.attr("lay-key",e.index),t.eventElem.attr("lay-key",e.index)),t.mark=w.extend({},t.calendar&&"cn"===t.lang?{"0-1-1":"元旦","0-2-14":"情人","0-3-8":"妇女","0-3-12":"植树","0-4-1":"愚人","0-5-1":"劳动","0-5-4":"青年","0-6-1":"儿童","0-9-10":"教师","0-9-18":"国耻","0-10-1":"国庆","0-12-25":"圣诞"}:{},t.mark),w.each(["min","max"],function(e,n){var a=[],i=[];if("number"==typeof t[n]){var r=t[n],o=(new Date).getTime(),s=864e5,l=new Date(r?r<s?o+r*s:r:o);a=[l.getFullYear(),l.getMonth()+1,l.getDate()],r<s||(i=[l.getHours(),l.getMinutes(),l.getSeconds()])}else a=(t[n].match(/\d+-\d+-\d+/)||[""])[0].split("-"),i=(t[n].match(/\d+:\d+:\d+/)||[""])[0].split(":");t[n]={year:0|a[0]||(new Date).getFullYear(),month:a[1]?(0|a[1])-1:(new Date).getMonth(),date:0|a[2]||(new Date).getDate(),hours:0|i[0],minutes:0|i[1],seconds:0|i[2]}}),e.elemID="layui-laydate"+t.elem.attr("lay-key"),(t.show||a)&&e.render(),a||e.events(),t.value&&t.isInitValue&&(t.value.constructor===Date?e.setValue(e.parse(0,e.systemDate(t.value))):e.setValue(t.value)))},T.prototype.render=function(){var e=this,t=e.config,n=e.lang(),a="static"===t.position,i=e.elem=w.elem("div",{id:e.elemID,"class":["layui-laydate",t.range?" layui-laydate-range":"",a?" "+c:"",t.theme&&"default"!==t.theme&&!/^#/.test(t.theme)?" laydate-theme-"+t.theme:""].join("")}),r=e.elemMain=[],o=e.elemHeader=[],s=e.elemCont=[],l=e.table=[],d=e.footer=w.elem("div",{"class":p});if(t.zIndex&&(i.style.zIndex=t.zIndex),w.each(new Array(2),function(e){if(!t.range&&e>0)return!0;var a=w.elem("div",{"class":"layui-laydate-header"}),i=[function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-prev-y"});return e.innerHTML="",e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-prev-m"});return e.innerHTML="",e}(),function(){var e=w.elem("div",{"class":"laydate-set-ym"}),t=w.elem("span"),n=w.elem("span");return e.appendChild(t),e.appendChild(n),e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-next-m"});return e.innerHTML="",e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-next-y"});return e.innerHTML="",e}()],d=w.elem("div",{"class":"layui-laydate-content"}),c=w.elem("table"),m=w.elem("thead"),u=w.elem("tr");w.each(i,function(e,t){a.appendChild(t)}),m.appendChild(u),w.each(new Array(6),function(e){var t=c.insertRow(0);w.each(new Array(7),function(a){if(0===e){var i=w.elem("th");i.innerHTML=n.weeks[a],u.appendChild(i)}t.insertCell(a)})}),c.insertBefore(m,c.children[0]),d.appendChild(c),r[e]=w.elem("div",{"class":"layui-laydate-main laydate-main-list-"+e}),r[e].appendChild(a),r[e].appendChild(d),o.push(i),s.push(d),l.push(c)}),w(d).html(function(){var e=[],i=[];return"datetime"===t.type&&e.push('<span lay-type="datetime" class="laydate-btns-time">'+n.timeTips+"</span>"),w.each(t.btns,function(e,r){var o=n.tools[r]||"btn";t.range&&"now"===r||(a&&"clear"===r&&(o="cn"===t.lang?"重置":"Reset"),i.push('<span lay-type="'+r+'" class="laydate-btns-'+r+'">'+o+"</span>"))}),e.push('<div class="laydate-footer-btns">'+i.join("")+"</div>"),e.join("")}()),w.each(r,function(e,t){i.appendChild(t)}),t.showBottom&&i.appendChild(d),/^#/.test(t.theme)){var m=w.elem("style"),u=["#{{id}} .layui-laydate-header{background-color:{{theme}};}","#{{id}} .layui-this{background-color:{{theme}} !important;}"].join("").replace(/{{id}}/g,e.elemID).replace(/{{theme}}/g,t.theme);"styleSheet"in m?(m.setAttribute("type","text/css"),m.styleSheet.cssText=u):m.innerHTML=u,w(i).addClass("laydate-theme-molv"),i.appendChild(m)}e.remove(T.thisElemDate),a?t.elem.append(i):(document.body.appendChild(i),e.position()),e.checkDate().calendar(),e.changeEvent(),T.thisElemDate=e.elemID,"function"==typeof t.ready&&t.ready(w.extend({},t.dateTime,{month:t.dateTime.month+1}))},T.prototype.remove=function(e){var t=this,n=(t.config,w("#"+(e||t.elemID)));return n.hasClass(c)||t.checkDate(function(){n.remove()}),t},T.prototype.position=function(){var e=this,t=e.config,n=e.bindElem||t.elem[0],a=n.getBoundingClientRect(),i=e.elem.offsetWidth,r=e.elem.offsetHeight,o=function(e){return e=e?"scrollLeft":"scrollTop",document.body[e]|document.documentElement[e]},s=function(e){return document.documentElement[e?"clientWidth":"clientHeight"]},l=5,d=a.left,c=a.bottom;d+i+l>s("width")&&(d=s("width")-i-l),c+r+l>s()&&(c=a.top>r?a.top-r:s()-r,c-=2*l),t.position&&(e.elem.style.position=t.position),e.elem.style.left=d+("fixed"===t.position?0:o(1))+"px",e.elem.style.top=c+("fixed"===t.position?0:o())+"px"},T.prototype.hint=function(e){var t=this,n=(t.config,w.elem("div",{"class":h}));t.elem&&(n.innerHTML=e||"",w(t.elem).find("."+h).remove(),t.elem.appendChild(n),clearTimeout(t.hinTimer),t.hinTimer=setTimeout(function(){w(t.elem).find("."+h).remove()},3e3))},T.prototype.getAsYM=function(e,t,n){return n?t--:t++,t<0&&(t=11,e--),t>11&&(t=0,e++),[e,t]},T.prototype.systemDate=function(e){var t=e||new Date;return{year:t.getFullYear(),month:t.getMonth(),date:t.getDate(),hours:e?e.getHours():0,minutes:e?e.getMinutes():0,seconds:e?e.getSeconds():0}},T.prototype.checkDate=function(e){var t,a,i=this,r=(new Date,i.config),o=r.dateTime=r.dateTime||i.systemDate(),s=i.bindElem||r.elem[0],l=(i.isInput(s)?"val":"html",i.isInput(s)?s.value:"static"===r.position?"":s.innerHTML),c=function(e){e.year>d[1]&&(e.year=d[1],a=!0),e.month>11&&(e.month=11,a=!0),e.hours>23&&(e.hours=0,a=!0),e.minutes>59&&(e.minutes=0,e.hours++,a=!0),e.seconds>59&&(e.seconds=0,e.minutes++,a=!0),t=n.getEndDate(e.month+1,e.year),e.date>t&&(e.date=t,a=!0)},m=function(e,t,n){var o=["startTime","endTime"];t=(t.match(i.EXP_SPLIT)||[]).slice(1),n=n||0,r.range&&(i[o[n]]=i[o[n]]||{}),w.each(i.format,function(s,l){var c=parseFloat(t[s]);t[s].length<l.length&&(a=!0),/yyyy|y/.test(l)?(c<d[0]&&(c=d[0],a=!0),e.year=c):/MM|M/.test(l)?(c<1&&(c=1,a=!0),e.month=c-1):/dd|d/.test(l)?(c<1&&(c=1,a=!0),e.date=c):/HH|H/.test(l)?(c<1&&(c=0,a=!0),e.hours=c,r.range&&(i[o[n]].hours=c)):/mm|m/.test(l)?(c<1&&(c=0,a=!0),e.minutes=c,r.range&&(i[o[n]].minutes=c)):/ss|s/.test(l)&&(c<1&&(c=0,a=!0),e.seconds=c,r.range&&(i[o[n]].seconds=c))}),c(e)};return"limit"===e?(c(o),i):(l=l||r.value,"string"==typeof l&&(l=l.replace(/\s+/g," ").replace(/^\s|\s$/g,"")),i.startState&&!i.endState&&(delete i.startState,i.endState=!0),"string"==typeof l&&l?i.EXP_IF.test(l)?r.range?(l=l.split(" "+r.range+" "),i.startDate=i.startDate||i.systemDate(),i.endDate=i.endDate||i.systemDate(),r.dateTime=w.extend({},i.startDate),w.each([i.startDate,i.endDate],function(e,t){m(t,l[e],e)})):m(o,l):(i.hint("日期格式不合法<br>必须遵循下述格式：<br>"+(r.range?r.format+" "+r.range+" "+r.format:r.format)+"<br>已为你重置"),a=!0):l&&l.constructor===Date?r.dateTime=i.systemDate(l):(r.dateTime=i.systemDate(),delete i.startState,delete i.endState,delete i.startDate,delete i.endDate,delete i.startTime,delete i.endTime),c(o),a&&l&&i.setValue(r.range?i.endDate?i.parse():"":i.parse()),e&&e(),i)},T.prototype.mark=function(e,t){var n,a=this,i=a.config;return w.each(i.mark,function(e,a){var i=e.split("-");i[0]!=t[0]&&0!=i[0]||i[1]!=t[1]&&0!=i[1]||i[2]!=t[2]||(n=a||t[2])}),n&&e.html('<span class="laydate-day-mark">'+n+"</span>"),a},T.prototype.limit=function(e,t,n,a){var i,r=this,o=r.config,l={},d=o[n>41?"endDate":"dateTime"],c=w.extend({},d,t||{});return w.each({now:c,min:o.min,max:o.max},function(e,t){l[e]=r.newDate(w.extend({year:t.year,month:t.month,date:t.date},function(){var e={};return w.each(a,function(n,a){e[a]=t[a]}),e}())).getTime()}),i=l.now<l.min||l.now>l.max,e&&e[i?"addClass":"removeClass"](s),i},T.prototype.calendar=function(e){var t,a,i,r=this,s=r.config,l=e||s.dateTime,c=new Date,m=r.lang(),u="date"!==s.type&&"datetime"!==s.type,h=e?1:0,y=w(r.table[h]).find("td"),f=w(r.elemHeader[h][2]).find("span");if(l.year<d[0]&&(l.year=d[0],r.hint("最低只能支持到公元"+d[0]+"年")),l.year>d[1]&&(l.year=d[1],r.hint("最高只能支持到公元"+d[1]+"年")),r.firstDate||(r.firstDate=w.extend({},l)),c.setFullYear(l.year,l.month,1),t=c.getDay(),a=n.getEndDate(l.month||12,l.year),i=n.getEndDate(l.month+1,l.year),w.each(y,function(e,n){var d=[l.year,l.month],c=0;n=w(n),n.removeAttr("class"),e<t?(c=a-t+e,n.addClass("laydate-day-prev"),d=r.getAsYM(l.year,l.month,"sub")):e>=t&&e<i+t?(c=e-t,s.range||c+1===l.date&&n.addClass(o)):(c=e-i-t,n.addClass("laydate-day-next"),d=r.getAsYM(l.year,l.month)),d[1]++,d[2]=c+1,n.attr("lay-ymd",d.join("-")).html(d[2]),r.mark(n,d).limit(n,{year:d[0],month:d[1]-1,date:d[2]},e)}),w(f[0]).attr("lay-ym",l.year+"-"+(l.month+1)),w(f[1]).attr("lay-ym",l.year+"-"+(l.month+1)),"cn"===s.lang?(w(f[0]).attr("lay-type","year").html(l.year+"年"),w(f[1]).attr("lay-type","month").html(l.month+1+"月")):(w(f[0]).attr("lay-type","month").html(m.month[l.month]),w(f[1]).attr("lay-type","year").html(l.year)),u&&(s.range&&(e?r.endDate=r.endDate||{year:l.year+("year"===s.type?1:0),month:l.month+("month"===s.type?0:-1)}:r.startDate=r.startDate||{year:l.year,month:l.month},e&&(r.listYM=[[r.startDate.year,r.startDate.month+1],[r.endDate.year,r.endDate.month+1]],r.list(s.type,0).list(s.type,1),"time"===s.type?r.setBtnStatus("时间",w.extend({},r.systemDate(),r.startTime),w.extend({},r.systemDate(),r.endTime)):r.setBtnStatus(!0))),s.range||(r.listYM=[[l.year,l.month+1]],r.list(s.type,0))),s.range&&!e){var p=r.getAsYM(l.year,l.month);r.calendar(w.extend({},l,{year:p[0],month:p[1]}))}return s.range||r.limit(w(r.footer).find(g),null,0,["hours","minutes","seconds"]),s.range&&e&&!u&&r.stampRange(),r},T.prototype.list=function(e,t){var n=this,a=n.config,i=a.dateTime,r=n.lang(),l=a.range&&"date"!==a.type&&"datetime"!==a.type,d=w.elem("ul",{"class":m+" "+{year:"laydate-year-list",month:"laydate-month-list",time:"laydate-time-list"}[e]}),c=n.elemHeader[t],u=w(c[2]).find("span"),h=n.elemCont[t||0],y=w(h).find("."+m)[0],f="cn"===a.lang,p=f?"年":"",T=n.listYM[t]||{},C=["hours","minutes","seconds"],x=["startTime","endTime"][t];if(T[0]<1&&(T[0]=1),"year"===e){var M,b=M=T[0]-7;b<1&&(b=M=1),w.each(new Array(15),function(e){var i=w.elem("li",{"lay-ym":M}),r={year:M};M==T[0]&&w(i).addClass(o),i.innerHTML=M+p,d.appendChild(i),M<n.firstDate.year?(r.month=a.min.month,r.date=a.min.date):M>=n.firstDate.year&&(r.month=a.max.month,r.date=a.max.date),n.limit(w(i),r,t),M++}),w(u[f?0:1]).attr("lay-ym",M-8+"-"+T[1]).html(b+p+" - "+(M-1+p))}else if("month"===e)w.each(new Array(12),function(e){var i=w.elem("li",{"lay-ym":e}),s={year:T[0],month:e};e+1==T[1]&&w(i).addClass(o),i.innerHTML=r.month[e]+(f?"月":""),d.appendChild(i),T[0]<n.firstDate.year?s.date=a.min.date:T[0]>=n.firstDate.year&&(s.date=a.max.date),n.limit(w(i),s,t)}),w(u[f?0:1]).attr("lay-ym",T[0]+"-"+T[1]).html(T[0]+p);else if("time"===e){var E=function(){w(d).find("ol").each(function(e,a){w(a).find("li").each(function(a,i){n.limit(w(i),[{hours:a},{hours:n[x].hours,minutes:a},{hours:n[x].hours,minutes:n[x].minutes,seconds:a}][e],t,[["hours"],["hours","minutes"],["hours","minutes","seconds"]][e])})}),a.range||n.limit(w(n.footer).find(g),n[x],0,["hours","minutes","seconds"])};a.range?n[x]||(n[x]={hours:0,minutes:0,seconds:0}):n[x]=i,w.each([24,60,60],function(e,t){var a=w.elem("li"),i=["<p>"+r.time[e]+"</p><ol>"];w.each(new Array(t),function(t){i.push("<li"+(n[x][C[e]]===t?' class="'+o+'"':"")+">"+w.digit(t,2)+"</li>")}),a.innerHTML=i.join("")+"</ol>",d.appendChild(a)}),E()}if(y&&h.removeChild(y),h.appendChild(d),"year"===e||"month"===e)w(n.elemMain[t]).addClass("laydate-ym-show"),w(d).find("li").on("click",function(){var r=0|w(this).attr("lay-ym");if(!w(this).hasClass(s)){if(0===t)i[e]=r,l&&(n.startDate[e]=r),n.limit(w(n.footer).find(g),null,0);else if(l)n.endDate[e]=r;else{var c="year"===e?n.getAsYM(r,T[1]-1,"sub"):n.getAsYM(T[0],r,"sub");w.extend(i,{year:c[0],month:c[1]})}"year"===a.type||"month"===a.type?(w(d).find("."+o).removeClass(o),w(this).addClass(o),"month"===a.type&&"year"===e&&(n.listYM[t][0]=r,l&&(n[["startDate","endDate"][t]].year=r),n.list("month",t))):(n.checkDate("limit").calendar(),n.closeList()),n.setBtnStatus(),a.range||n.done(null,"change"),w(n.footer).find(D).removeClass(s)}});else{var S=w.elem("span",{"class":v}),k=function(){w(d).find("ol").each(function(e){var t=this,a=w(t).find("li");t.scrollTop=30*(n[x][C[e]]-2),t.scrollTop<=0&&a.each(function(e,n){if(!w(this).hasClass(s))return t.scrollTop=30*(e-2),!0})})},H=w(c[2]).find("."+v);k(),S.innerHTML=a.range?[r.startTime,r.endTime][t]:r.timeTips,w(n.elemMain[t]).addClass("laydate-time-show"),H[0]&&H.remove(),c[2].appendChild(S),w(d).find("ol").each(function(e){var t=this;w(t).find("li").on("click",function(){var r=0|this.innerHTML;w(this).hasClass(s)||(a.range?n[x][C[e]]=r:i[C[e]]=r,w(t).find("."+o).removeClass(o),w(this).addClass(o),E(),k(),(n.endDate||"time"===a.type)&&n.done(null,"change"),n.setBtnStatus())})})}return n},T.prototype.listYM=[],T.prototype.closeList=function(){var e=this;e.config;w.each(e.elemCont,function(t,n){w(this).find("."+m).remove(),w(e.elemMain[t]).removeClass("laydate-ym-show laydate-time-show")}),w(e.elem).find("."+v).remove()},T.prototype.setBtnStatus=function(e,t,n){var a,i=this,r=i.config,o=w(i.footer).find(g),d=r.range&&"date"!==r.type&&"time"!==r.type;d&&(t=t||i.startDate,n=n||i.endDate,a=i.newDate(t).getTime()>i.newDate(n).getTime(),i.limit(null,t)||i.limit(null,n)?o.addClass(s):o[a?"addClass":"removeClass"](s),e&&a&&i.hint("string"==typeof e?l.replace(/日期/g,e):l))},T.prototype.parse=function(e,t){var n=this,a=n.config,i=t||(e?w.extend({},n.endDate,n.endTime):a.range?w.extend({},n.startDate,n.startTime):a.dateTime),r=n.format.concat();return w.each(r,function(e,t){/yyyy|y/.test(t)?r[e]=w.digit(i.year,t.length):/MM|M/.test(t)?r[e]=w.digit(i.month+1,t.length):/dd|d/.test(t)?r[e]=w.digit(i.date,t.length):/HH|H/.test(t)?r[e]=w.digit(i.hours,t.length):/mm|m/.test(t)?r[e]=w.digit(i.minutes,t.length):/ss|s/.test(t)&&(r[e]=w.digit(i.seconds,t.length))}),a.range&&!e?r.join("")+" "+a.range+" "+n.parse(1):r.join("")},T.prototype.newDate=function(e){return e=e||{},new Date(e.year||1,e.month||0,e.date||1,e.hours||0,e.minutes||0,e.seconds||0)},T.prototype.setValue=function(e){var t=this,n=t.config,a=t.bindElem||n.elem[0],i=t.isInput(a)?"val":"html";return"static"===n.position||w(a)[i](e||""),this},T.prototype.stampRange=function(){var e,t,n=this,a=n.config,i=w(n.elem).find("td");if(a.range&&!n.endDate&&w(n.footer).find(g).addClass(s),n.endDate)return e=n.newDate({year:n.startDate.year,month:n.startDate.month,date:n.startDate.date}).getTime(),t=n.newDate({year:n.endDate.year,month:n.endDate.month,date:n.endDate.date}).getTime(),e>t?n.hint(l):void w.each(i,function(a,i){var r=w(i).attr("lay-ymd").split("-"),s=n.newDate({year:r[0],month:r[1]-1,date:r[2]}).getTime();w(i).removeClass(u+" "+o),s!==e&&s!==t||w(i).addClass(w(i).hasClass(y)||w(i).hasClass(f)?u:o),s>e&&s<t&&w(i).addClass(u)})},T.prototype.done=function(e,t){var n=this,a=n.config,i=w.extend({},n.startDate?w.extend(n.startDate,n.startTime):a.dateTime),r=w.extend({},w.extend(n.endDate,n.endTime));return w.each([i,r],function(e,t){"month"in t&&w.extend(t,{month:t.month+1})}),e=e||[n.parse(),i,r],"function"==typeof a[t||"done"]&&a[t||"done"].apply(a,e),n},T.prototype.choose=function(e){var t=this,n=t.config,a=n.dateTime,i=w(t.elem).find("td"),r=e.attr("lay-ymd").split("-"),l=function(e){new Date;e&&w.extend(a,r),n.range&&(t.startDate?w.extend(t.startDate,r):t.startDate=w.extend({},r,t.startTime),t.startYMD=r)};if(r={year:0|r[0],month:(0|r[1])-1,date:0|r[2]},!e.hasClass(s))if(n.range){if(w.each(["startTime","endTime"],function(e,n){t[n]=t[n]||{hours:0,minutes:0,seconds:0}}),t.endState)l(),delete t.endState,delete t.endDate,t.startState=!0,i.removeClass(o+" "+u),e.addClass(o);else if(t.startState){if(e.addClass(o),t.endDate?w.extend(t.endDate,r):t.endDate=w.extend({},r,t.endTime),t.newDate(r).getTime()<t.newDate(t.startYMD).getTime()){var d=w.extend({},t.endDate,{hours:t.startDate.hours,minutes:t.startDate.minutes,seconds:t.startDate.seconds});w.extend(t.endDate,t.startDate,{hours:t.endDate.hours,minutes:t.endDate.minutes,seconds:t.endDate.seconds}),t.startDate=d}n.showBottom||t.done(),t.stampRange(),t.endState=!0,t.done(null,"change")}else e.addClass(o),l(),t.startState=!0;w(t.footer).find(g)[t.endDate?"removeClass":"addClass"](s)}else"static"===n.position?(l(!0),t.calendar().done().done(null,"change")):"date"===n.type?(l(!0),t.setValue(t.parse()).remove().done()):"datetime"===n.type&&(l(!0),t.calendar().done(null,"change"))},T.prototype.tool=function(e,t){var n=this,a=n.config,i=a.dateTime,r="static"===a.position,o={datetime:function(){w(e).hasClass(s)||(n.list("time",0),a.range&&n.list("time",1),w(e).attr("lay-type","date").html(n.lang().dateTips))},date:function(){n.closeList(),w(e).attr("lay-type","datetime").html(n.lang().timeTips)},clear:function(){n.setValue("").remove(),r&&(w.extend(i,n.firstDate),n.calendar()),a.range&&(delete n.startState,delete n.endState,delete n.endDate,delete n.startTime,delete n.endTime),n.done(["",{},{}])},now:function(){var e=new Date;w.extend(i,n.systemDate(),{hours:e.getHours(),minutes:e.getMinutes(),seconds:e.getSeconds()}),n.setValue(n.parse()).remove(),r&&n.calendar(),n.done()},confirm:function(){if(a.range){if(!n.endDate)return n.hint("请先选择日期范围");if(w(e).hasClass(s))return n.hint("time"===a.type?l.replace(/日期/g,"时间"):l)}else if(w(e).hasClass(s))return n.hint("不在有效日期或时间范围内");n.done(),n.setValue(n.parse()).remove()}};o[t]&&o[t]()},T.prototype.change=function(e){var t=this,n=t.config,a=n.dateTime,i=n.range&&("year"===n.type||"month"===n.type),r=t.elemCont[e||0],o=t.listYM[e],s=function(s){var l=["startDate","endDate"][e],d=w(r).find(".laydate-year-list")[0],c=w(r).find(".laydate-month-list")[0];return d&&(o[0]=s?o[0]-15:o[0]+15,t.list("year",e)),c&&(s?o[0]--:o[0]++,t.list("month",e)),(d||c)&&(w.extend(a,{year:o[0]}),i&&(t[l].year=o[0]),n.range||t.done(null,"change"),t.setBtnStatus(),n.range||t.limit(w(t.footer).find(g),{year:o[0]})),d||c};return{prevYear:function(){s("sub")||(a.year--,t.checkDate("limit").calendar(),n.range||t.done(null,"change"))},prevMonth:function(){var e=t.getAsYM(a.year,a.month,"sub");w.extend(a,{year:e[0],month:e[1]}),t.checkDate("limit").calendar(),n.range||t.done(null,"change")},nextMonth:function(){var e=t.getAsYM(a.year,a.month);w.extend(a,{year:e[0],month:e[1]}),t.checkDate("limit").calendar(),n.range||t.done(null,"change")},nextYear:function(){s()||(a.year++,t.checkDate("limit").calendar(),n.range||t.done(null,"change"))}}},T.prototype.changeEvent=function(){var e=this;e.config;w(e.elem).on("click",function(e){w.stope(e)}),w.each(e.elemHeader,function(t,n){w(n[0]).on("click",function(n){e.change(t).prevYear()}),w(n[1]).on("click",function(n){e.change(t).prevMonth()}),w(n[2]).find("span").on("click",function(n){var a=w(this),i=a.attr("lay-ym"),r=a.attr("lay-type");i&&(i=i.split("-"),e.listYM[t]=[0|i[0],0|i[1]],e.list(r,t),w(e.footer).find(D).addClass(s))}),w(n[3]).on("click",function(n){e.change(t).nextMonth()}),w(n[4]).on("click",function(n){e.change(t).nextYear()})}),w.each(e.table,function(t,n){var a=w(n).find("td");a.on("click",function(){e.choose(w(this))})}),w(e.footer).find("span").on("click",function(){var t=w(this).attr("lay-type");e.tool(this,t)})},T.prototype.isInput=function(e){return/input|textarea/.test(e.tagName.toLocaleLowerCase())},T.prototype.events=function(){var e=this,t=e.config,n=function(n,a){n.on(t.trigger,function(){a&&(e.bindElem=this),e.render()})};t.elem[0]&&!t.elem[0].eventHandler&&(n(t.elem,"bind"),n(t.eventElem),w(document).on("click",function(n){n.target!==t.elem[0]&&n.target!==t.eventElem[0]&&n.target!==w(t.closeStop)[0]&&e.remove()}).on("keydown",function(t){13===t.keyCode&&w("#"+e.elemID)[0]&&e.elemID===T.thisElem&&(t.preventDefault(),w(e.footer).find(g)[0].click())}),w(window).on("resize",function(){return!(!e.elem||!w(r)[0])&&void e.position()}),t.elem[0].eventHandler=!0)},n.render=function(e){var t=new T(e);return a.call(t)},n.getEndDate=function(e,t){var n=new Date;return n.setFullYear(t||n.getFullYear(),e||n.getMonth()+1,1),new Date(n.getTime()-864e5).getDate()},window.lay=window.lay||w,e?(n.ready(),layui.define(function(e){n.path=layui.cache.dir,e(i,n)})):"function"==typeof define&&define.amd?define(function(){return n}):function(){n.ready(),window.laydate=n}()}();
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/layedit.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/layedit.js
new file mode 100644
index 0000000..96caa11
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/layedit.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define(["layer","form"],function(t){"use strict";var e=layui.$,i=layui.layer,a=layui.form,l=(layui.hint(),layui.device()),n="layedit",o="layui-show",r="layui-disabled",c=function(){var t=this;t.index=0,t.config={tool:["strong","italic","underline","del","|","left","center","right","|","link","unlink","face","image"],hideTool:[],height:280}};c.prototype.set=function(t){var i=this;return e.extend(!0,i.config,t),i},c.prototype.on=function(t,e){return layui.onevent(n,t,e)},c.prototype.build=function(t,i){i=i||{};var a=this,n=a.config,r="layui-layedit",c=e("string"==typeof t?"#"+t:t),u="LAY_layedit_"+ ++a.index,d=c.next("."+r),y=e.extend({},n,i),f=function(){var t=[],e={};return layui.each(y.hideTool,function(t,i){e[i]=!0}),layui.each(y.tool,function(i,a){C[a]&&!e[a]&&t.push(C[a])}),t.join("")}(),m=e(['<div class="'+r+'">','<div class="layui-unselect layui-layedit-tool">'+f+"</div>",'<div class="layui-layedit-iframe">','<iframe id="'+u+'" name="'+u+'" textarea="'+t+'" frameborder="0"></iframe>',"</div>","</div>"].join(""));return l.ie&&l.ie<8?c.removeClass("layui-hide").addClass(o):(d[0]&&d.remove(),s.call(a,m,c[0],y),c.addClass("layui-hide").after(m),a.index)},c.prototype.getContent=function(t){var e=u(t);if(e[0])return d(e[0].document.body.innerHTML)},c.prototype.getText=function(t){var i=u(t);if(i[0])return e(i[0].document.body).text()},c.prototype.setContent=function(t,i,a){var l=u(t);l[0]&&(a?e(l[0].document.body).append(i):e(l[0].document.body).html(i),layedit.sync(t))},c.prototype.sync=function(t){var i=u(t);if(i[0]){var a=e("#"+i[1].attr("textarea"));a.val(d(i[0].document.body.innerHTML))}},c.prototype.getSelection=function(t){var e=u(t);if(e[0]){var i=m(e[0].document);return document.selection?i.text:i.toString()}};var s=function(t,i,a){var l=this,n=t.find("iframe");n.css({height:a.height}).on("load",function(){var o=n.contents(),r=n.prop("contentWindow"),c=o.find("head"),s=e(["<style>","*{margin: 0; padding: 0;}","body{padding: 10px; line-height: 20px; overflow-x: hidden; word-wrap: break-word; font: 14px Helvetica Neue,Helvetica,PingFang SC,Microsoft YaHei,Tahoma,Arial,sans-serif; -webkit-box-sizing: border-box !important; -moz-box-sizing: border-box !important; box-sizing: border-box !important;}","a{color:#01AAED; text-decoration:none;}a:hover{color:#c00}","p{margin-bottom: 10px;}","img{display: inline-block; border: none; vertical-align: middle;}","pre{margin: 10px 0; padding: 10px; line-height: 20px; border: 1px solid #ddd; border-left-width: 6px; background-color: #F2F2F2; color: #333; font-family: Courier New; font-size: 12px;}","</style>"].join("")),u=o.find("body");c.append(s),u.attr("contenteditable","true").css({"min-height":a.height}).html(i.value||""),y.apply(l,[r,n,i,a]),g.call(l,r,t,a)})},u=function(t){var i=e("#LAY_layedit_"+t),a=i.prop("contentWindow");return[a,i]},d=function(t){return 8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),t},y=function(t,a,n,o){var r=t.document,c=e(r.body);c.on("keydown",function(t){var e=t.keyCode;if(13===e){var a=m(r),l=p(a),n=l.parentNode;if("pre"===n.tagName.toLowerCase()){if(t.shiftKey)return;return i.msg("请暂时用shift+enter"),!1}r.execCommand("formatBlock",!1,"<p>")}}),e(n).parents("form").on("submit",function(){var t=c.html();8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),n.value=t}),c.on("paste",function(e){r.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){f.call(t,c),n.value=c.html()},100)})},f=function(t){var i=this;i.document;t.find("*[style]").each(function(){var t=this.style.textAlign;this.removeAttribute("style"),e(this).css({"text-align":t||""})}),t.find("table").addClass("layui-table"),t.find("script,link").remove()},m=function(t){return t.selection?t.selection.createRange():t.getSelection().getRangeAt(0)},p=function(t){return t.endContainer||t.parentElement().childNodes[0]},v=function(t,i,a){var l=this.document,n=document.createElement(t);for(var o in i)n.setAttribute(o,i[o]);if(n.removeAttribute("text"),l.selection){var r=a.text||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.pasteHTML(e(n).prop("outerHTML")),a.select()}else{var r=a.toString()||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.deleteContents(),a.insertNode(n)}},h=function(t,i){var a=this.document,l="layedit-tool-active",n=p(m(a)),o=function(e){return t.find(".layedit-tool-"+e)};i&&i[i.hasClass(l)?"removeClass":"addClass"](l),t.find(">i").removeClass(l),o("unlink").addClass(r),e(n).parents().each(function(){var t=this.tagName.toLowerCase(),e=this.style.textAlign;"b"!==t&&"strong"!==t||o("b").addClass(l),"i"!==t&&"em"!==t||o("i").addClass(l),"u"===t&&o("u").addClass(l),"strike"===t&&o("d").addClass(l),"p"===t&&("center"===e?o("center").addClass(l):"right"===e?o("right").addClass(l):o("left").addClass(l)),"a"===t&&(o("link").addClass(l),o("unlink").removeClass(r))})},g=function(t,a,l){var n=t.document,o=e(n.body),c={link:function(i){var a=p(i),l=e(a).parent();b.call(o,{href:l.attr("href"),target:l.attr("target")},function(e){var a=l[0];"A"===a.tagName?a.href=e.url:v.call(t,"a",{target:e.target,href:e.url,text:e.url},i)})},unlink:function(t){n.execCommand("unlink")},face:function(e){x.call(this,function(i){v.call(t,"img",{src:i.src,alt:i.alt},e)})},image:function(a){var n=this;layui.use("upload",function(o){var r=l.uploadImage||{};o.render({url:r.url,method:r.type,elem:e(n).find("input")[0],done:function(e){0==e.code?(e.data=e.data||{},v.call(t,"img",{src:e.data.src,alt:e.data.title},a)):i.msg(e.msg||"上传失败")}})})},code:function(e){k.call(o,function(i){v.call(t,"pre",{text:i.code,"lay-lang":i.lang},e)})},help:function(){i.open({type:2,title:"帮助",area:["600px","380px"],shadeClose:!0,shade:.1,skin:"layui-layer-msg",content:["http://www.layui.com/about/layedit/help.html","no"]})}},s=a.find(".layui-layedit-tool"),u=function(){var i=e(this),a=i.attr("layedit-event"),l=i.attr("lay-command");if(!i.hasClass(r)){o.focus();var u=m(n);u.commonAncestorContainer;l?(n.execCommand(l),/justifyLeft|justifyCenter|justifyRight/.test(l)&&n.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){o.focus()},10)):c[a]&&c[a].call(this,u),h.call(t,s,i)}},d=/image/;s.find(">i").on("mousedown",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)||u.call(this)}).on("click",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)&&u.call(this)}),o.on("click",function(){h.call(t,s),i.close(x.index)})},b=function(t,e){var l=this,n=i.open({type:1,id:"LAY_layedit_link",area:"350px",shade:.05,shadeClose:!0,moveType:1,title:"超链接",skin:"layui-layer-msg",content:['<ul class="layui-form" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">URL</label>','<div class="layui-input-block" style="margin-left: 90px">','<input name="url" lay-verify="url" value="'+(t.href||"")+'" autofocus="true" autocomplete="off" class="layui-input">',"</div>","</li>",'<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">打开方式</label>','<div class="layui-input-block" style="margin-left: 90px">','<input type="radio" name="target" value="_self" class="layui-input" title="当前窗口"'+("_self"!==t.target&&t.target?"":"checked")+">",'<input type="radio" name="target" value="_blank" class="layui-input" title="新窗口" '+("_blank"===t.target?"checked":"")+">","</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-link-yes" class="layui-btn"> 确定 </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> 取消 </button>',"</li>","</ul>"].join(""),success:function(t,n){var o="submit(layedit-link-yes)";a.render("radio"),t.find(".layui-btn-primary").on("click",function(){i.close(n),l.focus()}),a.on(o,function(t){i.close(b.index),e&&e(t.field)})}});b.index=n},x=function(t){var a=function(){var t=["[微笑]","[嘻嘻]","[哈哈]","[可爱]","[可怜]","[挖鼻]","[吃惊]","[害羞]","[挤眼]","[闭嘴]","[鄙视]","[爱你]","[泪]","[偷笑]","[亲亲]","[生病]","[太开心]","[白眼]","[右哼哼]","[左哼哼]","[嘘]","[衰]","[委屈]","[吐]","[哈欠]","[抱抱]","[怒]","[疑问]","[馋嘴]","[拜拜]","[思考]","[汗]","[困]","[睡]","[钱]","[失望]","[酷]","[色]","[哼]","[鼓掌]","[晕]","[悲伤]","[抓狂]","[黑线]","[阴险]","[怒骂]","[互粉]","[心]","[伤心]","[猪头]","[熊猫]","[兔子]","[ok]","[耶]","[good]","[NO]","[赞]","[来]","[弱]","[草泥马]","[神马]","[囧]","[浮云]","[给力]","[围观]","[威武]","[奥特曼]","[礼物]","[钟]","[话筒]","[蜡烛]","[蛋糕]"],e={};return layui.each(t,function(t,i){e[i]=layui.cache.dir+"images/face/"+t+".gif"}),e}();return x.hide=x.hide||function(t){"face"!==e(t.target).attr("layedit-event")&&i.close(x.index)},x.index=i.tips(function(){var t=[];return layui.each(a,function(e,i){t.push('<li title="'+e+'"><img src="'+i+'" alt="'+e+'"></li>')}),'<ul class="layui-clear">'+t.join("")+"</ul>"}(),this,{tips:1,time:0,skin:"layui-box layui-util-face",maxWidth:500,success:function(l,n){l.css({marginTop:-4,marginLeft:-10}).find(".layui-clear>li").on("click",function(){t&&t({src:a[this.title],alt:this.title}),i.close(n)}),e(document).off("click",x.hide).on("click",x.hide)}})},k=function(t){var e=this,l=i.open({type:1,id:"LAY_layedit_code",area:"550px",shade:.05,shadeClose:!0,moveType:1,title:"插入代码",skin:"layui-layer-msg",content:['<ul class="layui-form layui-form-pane" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label">请选择语言</label>','<div class="layui-input-block">','<select name="lang">','<option value="JavaScript">JavaScript</option>','<option value="HTML">HTML</option>','<option value="CSS">CSS</option>','<option value="Java">Java</option>','<option value="PHP">PHP</option>','<option value="C#">C#</option>','<option value="Python">Python</option>','<option value="Ruby">Ruby</option>','<option value="Go">Go</option>',"</select>","</div>","</li>",'<li class="layui-form-item layui-form-text">','<label class="layui-form-label">代码</label>','<div class="layui-input-block">','<textarea name="code" lay-verify="required" autofocus="true" class="layui-textarea" style="height: 200px;"></textarea>',"</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-code-yes" class="layui-btn"> 确定 </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> 取消 </button>',"</li>","</ul>"].join(""),success:function(l,n){var o="submit(layedit-code-yes)";a.render("select"),l.find(".layui-btn-primary").on("click",function(){i.close(n),e.focus()}),a.on(o,function(e){i.close(k.index),t&&t(e.field)})}});k.index=l},C={html:'<i class="layui-icon layedit-tool-html" title="HTML源代码" lay-command="html" layedit-event="html""></i><span class="layedit-tool-mid"></span>',strong:'<i class="layui-icon layedit-tool-b" title="加粗" lay-command="Bold" layedit-event="b""></i>',italic:'<i class="layui-icon layedit-tool-i" title="斜体" lay-command="italic" layedit-event="i""></i>',underline:'<i class="layui-icon layedit-tool-u" title="下划线" lay-command="underline" layedit-event="u""></i>',del:'<i class="layui-icon layedit-tool-d" title="删除线" lay-command="strikeThrough" layedit-event="d""></i>',"|":'<span class="layedit-tool-mid"></span>',left:'<i class="layui-icon layedit-tool-left" title="左对齐" lay-command="justifyLeft" layedit-event="left""></i>',center:'<i class="layui-icon layedit-tool-center" title="居中对齐" lay-command="justifyCenter" layedit-event="center""></i>',right:'<i class="layui-icon layedit-tool-right" title="右对齐" lay-command="justifyRight" layedit-event="right""></i>',link:'<i class="layui-icon layedit-tool-link" title="插入链接" layedit-event="link""></i>',unlink:'<i class="layui-icon layedit-tool-unlink layui-disabled" title="清除链接" lay-command="unlink" layedit-event="unlink""></i>',face:'<i class="layui-icon layedit-tool-face" title="表情" layedit-event="face""></i>',image:'<i class="layui-icon layedit-tool-image" title="图片" layedit-event="image"><input type="file" name="file"></i>',code:'<i class="layui-icon layedit-tool-code" title="插入代码" layedit-event="code"></i>',help:'<i class="layui-icon layedit-tool-help" title="帮助" layedit-event="help"></i>'},w=new c;t(n,w)});
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/layer.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/layer.js
new file mode 100644
index 0000000..c6d5378
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/layer.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;!function(e,t){"use strict";var i,n,a=e.layui&&layui.define,o={getPath:function(){var e=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,i=t.length-1,n=i;n>0;n--)if("interactive"===t[n].readyState){e=t[n].src;break}return e||t[i].src}();return e.substring(0,e.lastIndexOf("/")+1)}(),config:{},end:{},minIndex:0,minLeft:[],btn:["确定","取消"],type:["dialog","page","iframe","loading","tips"],getStyle:function(t,i){var n=t.currentStyle?t.currentStyle:e.getComputedStyle(t,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](i)},link:function(t,i,n){if(r.path){var a=document.getElementsByTagName("head")[0],s=document.createElement("link");"string"==typeof i&&(n=i);var l=(n||t).replace(/\.|\//g,""),f="layuicss-"+l,c=0;s.rel="stylesheet",s.href=r.path+t,s.id=f,document.getElementById(f)||a.appendChild(s),"function"==typeof i&&!function u(){return++c>80?e.console&&console.error("layer.css: Invalid"):void(1989===parseInt(o.getStyle(document.getElementById(f),"width"))?i():setTimeout(u,100))}()}}},r={v:"3.1.1",ie:function(){var t=navigator.userAgent.toLowerCase();return!!(e.ActiveXObject||"ActiveXObject"in e)&&((t.match(/msie\s(\d+)/)||[])[1]||"11")}(),index:e.layer&&e.layer.v?1e5:0,path:o.getPath,config:function(e,t){return e=e||{},r.cache=o.config=i.extend({},o.config,e),r.path=o.config.path||r.path,"string"==typeof e.extend&&(e.extend=[e.extend]),o.config.path&&r.ready(),e.extend?(a?layui.addcss("modules/layer/"+e.extend):o.link("theme/"+e.extend),this):this},ready:function(e){var t="layer",i="",n=(a?"modules/layer/":"theme/")+"default/layer.css?v="+r.v+i;return a?layui.addcss(n,e,t):o.link(n,e,t),this},alert:function(e,t,n){var a="function"==typeof t;return a&&(n=t),r.open(i.extend({content:e,yes:n},a?{}:t))},confirm:function(e,t,n,a){var s="function"==typeof t;return s&&(a=n,n=t),r.open(i.extend({content:e,btn:o.btn,yes:n,btn2:a},s?{}:t))},msg:function(e,n,a){var s="function"==typeof n,f=o.config.skin,c=(f?f+" "+f+"-msg":"")||"layui-layer-msg",u=l.anim.length-1;return s&&(a=n),r.open(i.extend({content:e,time:3e3,shade:!1,skin:c,title:!1,closeBtn:!1,btn:!1,resize:!1,end:a},s&&!o.config.skin?{skin:c+" layui-layer-hui",anim:u}:function(){return n=n||{},(n.icon===-1||n.icon===t&&!o.config.skin)&&(n.skin=c+" "+(n.skin||"layui-layer-hui")),n}()))},load:function(e,t){return r.open(i.extend({type:3,icon:e||0,resize:!1,shade:.01},t))},tips:function(e,t,n){return r.open(i.extend({type:4,content:[e,t],closeBtn:!1,time:3e3,shade:!1,resize:!1,fixed:!1,maxWidth:210},n))}},s=function(e){var t=this;t.index=++r.index,t.config=i.extend({},t.config,o.config,e),document.body?t.creat():setTimeout(function(){t.creat()},30)};s.pt=s.prototype;var l=["layui-layer",".layui-layer-title",".layui-layer-main",".layui-layer-dialog","layui-layer-iframe","layui-layer-content","layui-layer-btn","layui-layer-close"];l.anim=["layer-anim-00","layer-anim-01","layer-anim-02","layer-anim-03","layer-anim-04","layer-anim-05","layer-anim-06"],s.pt.config={type:0,shade:.3,fixed:!0,move:l[1],title:"信息",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,anim:0,isOutAnim:!0,icon:-1,moveType:1,resize:!0,scrollbar:!0,tips:2},s.pt.vessel=function(e,t){var n=this,a=n.index,r=n.config,s=r.zIndex+a,f="object"==typeof r.title,c=r.maxmin&&(1===r.type||2===r.type),u=r.title?'<div class="layui-layer-title" style="'+(f?r.title[1]:"")+'">'+(f?r.title[0]:r.title)+"</div>":"";return r.zIndex=s,t([r.shade?'<div class="layui-layer-shade" id="layui-layer-shade'+a+'" times="'+a+'" style="'+("z-index:"+(s-1)+"; ")+'"></div>':"",'<div class="'+l[0]+(" layui-layer-"+o.type[r.type])+(0!=r.type&&2!=r.type||r.shade?"":" layui-layer-border")+" "+(r.skin||"")+'" id="'+l[0]+a+'" type="'+o.type[r.type]+'" times="'+a+'" showtime="'+r.time+'" conType="'+(e?"object":"string")+'" style="z-index: '+s+"; width:"+r.area[0]+";height:"+r.area[1]+(r.fixed?"":";position:absolute;")+'">'+(e&&2!=r.type?"":u)+'<div id="'+(r.id||"")+'" class="layui-layer-content'+(0==r.type&&r.icon!==-1?" layui-layer-padding":"")+(3==r.type?" layui-layer-loading"+r.icon:"")+'">'+(0==r.type&&r.icon!==-1?'<i class="layui-layer-ico layui-layer-ico'+r.icon+'"></i>':"")+(1==r.type&&e?"":r.content||"")+'</div><span class="layui-layer-setwin">'+function(){var e=c?'<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>':"";return r.closeBtn&&(e+='<a class="layui-layer-ico '+l[7]+" "+l[7]+(r.title?r.closeBtn:4==r.type?"1":"2")+'" href="javascript:;"></a>'),e}()+"</span>"+(r.btn?function(){var e="";"string"==typeof r.btn&&(r.btn=[r.btn]);for(var t=0,i=r.btn.length;t<i;t++)e+='<a class="'+l[6]+t+'">'+r.btn[t]+"</a>";return'<div class="'+l[6]+" layui-layer-btn-"+(r.btnAlign||"")+'">'+e+"</div>"}():"")+(r.resize?'<span class="layui-layer-resize"></span>':"")+"</div>"],u,i('<div class="layui-layer-move"></div>')),n},s.pt.creat=function(){var e=this,t=e.config,a=e.index,s=t.content,f="object"==typeof s,c=i("body");if(!t.id||!i("#"+t.id)[0]){switch("string"==typeof t.area&&(t.area="auto"===t.area?["",""]:[t.area,""]),t.shift&&(t.anim=t.shift),6==r.ie&&(t.fixed=!1),t.type){case 0:t.btn="btn"in t?t.btn:o.btn[0],r.closeAll("dialog");break;case 2:var s=t.content=f?t.content:[t.content||"","auto"];t.content='<iframe scrolling="'+(t.content[1]||"auto")+'" allowtransparency="true" id="'+l[4]+a+'" name="'+l[4]+a+'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="'+t.content[0]+'"></iframe>';break;case 3:delete t.title,delete t.closeBtn,t.icon===-1&&0===t.icon,r.closeAll("loading");break;case 4:f||(t.content=[t.content,"body"]),t.follow=t.content[1],t.content=t.content[0]+'<i class="layui-layer-TipsG"></i>',delete t.title,t.tips="object"==typeof t.tips?t.tips:[t.tips,!0],t.tipsMore||r.closeAll("tips")}if(e.vessel(f,function(n,r,u){c.append(n[0]),f?function(){2==t.type||4==t.type?function(){i("body").append(n[1])}():function(){s.parents("."+l[0])[0]||(s.data("display",s.css("display")).show().addClass("layui-layer-wrap").wrap(n[1]),i("#"+l[0]+a).find("."+l[5]).before(r))}()}():c.append(n[1]),i(".layui-layer-move")[0]||c.append(o.moveElem=u),e.layero=i("#"+l[0]+a),t.scrollbar||l.html.css("overflow","hidden").attr("layer-full",a)}).auto(a),i("#layui-layer-shade"+e.index).css({"background-color":t.shade[1]||"#000",opacity:t.shade[0]||t.shade}),2==t.type&&6==r.ie&&e.layero.find("iframe").attr("src",s[0]),4==t.type?e.tips():e.offset(),t.fixed&&n.on("resize",function(){e.offset(),(/^\d+%$/.test(t.area[0])||/^\d+%$/.test(t.area[1]))&&e.auto(a),4==t.type&&e.tips()}),t.time<=0||setTimeout(function(){r.close(e.index)},t.time),e.move().callback(),l.anim[t.anim]){var u="layer-anim "+l.anim[t.anim];e.layero.addClass(u).one("webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",function(){i(this).removeClass(u)})}t.isOutAnim&&e.layero.data("isOutAnim",!0)}},s.pt.auto=function(e){var t=this,a=t.config,o=i("#"+l[0]+e);""===a.area[0]&&a.maxWidth>0&&(r.ie&&r.ie<8&&a.btn&&o.width(o.innerWidth()),o.outerWidth()>a.maxWidth&&o.width(a.maxWidth));var s=[o.innerWidth(),o.innerHeight()],f=o.find(l[1]).outerHeight()||0,c=o.find("."+l[6]).outerHeight()||0,u=function(e){e=o.find(e),e.height(s[1]-f-c-2*(0|parseFloat(e.css("padding-top"))))};switch(a.type){case 2:u("iframe");break;default:""===a.area[1]?a.maxHeight>0&&o.outerHeight()>a.maxHeight?(s[1]=a.maxHeight,u("."+l[5])):a.fixed&&s[1]>=n.height()&&(s[1]=n.height(),u("."+l[5])):u("."+l[5])}return t},s.pt.offset=function(){var e=this,t=e.config,i=e.layero,a=[i.outerWidth(),i.outerHeight()],o="object"==typeof t.offset;e.offsetTop=(n.height()-a[1])/2,e.offsetLeft=(n.width()-a[0])/2,o?(e.offsetTop=t.offset[0],e.offsetLeft=t.offset[1]||e.offsetLeft):"auto"!==t.offset&&("t"===t.offset?e.offsetTop=0:"r"===t.offset?e.offsetLeft=n.width()-a[0]:"b"===t.offset?e.offsetTop=n.height()-a[1]:"l"===t.offset?e.offsetLeft=0:"lt"===t.offset?(e.offsetTop=0,e.offsetLeft=0):"lb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=0):"rt"===t.offset?(e.offsetTop=0,e.offsetLeft=n.width()-a[0]):"rb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=n.width()-a[0]):e.offsetTop=t.offset),t.fixed||(e.offsetTop=/%$/.test(e.offsetTop)?n.height()*parseFloat(e.offsetTop)/100:parseFloat(e.offsetTop),e.offsetLeft=/%$/.test(e.offsetLeft)?n.width()*parseFloat(e.offsetLeft)/100:parseFloat(e.offsetLeft),e.offsetTop+=n.scrollTop(),e.offsetLeft+=n.scrollLeft()),i.attr("minLeft")&&(e.offsetTop=n.height()-(i.find(l[1]).outerHeight()||0),e.offsetLeft=i.css("left")),i.css({top:e.offsetTop,left:e.offsetLeft})},s.pt.tips=function(){var e=this,t=e.config,a=e.layero,o=[a.outerWidth(),a.outerHeight()],r=i(t.follow);r[0]||(r=i("body"));var s={width:r.outerWidth(),height:r.outerHeight(),top:r.offset().top,left:r.offset().left},f=a.find(".layui-layer-TipsG"),c=t.tips[0];t.tips[1]||f.remove(),s.autoLeft=function(){s.left+o[0]-n.width()>0?(s.tipLeft=s.left+s.width-o[0],f.css({right:12,left:"auto"})):s.tipLeft=s.left},s.where=[function(){s.autoLeft(),s.tipTop=s.top-o[1]-10,f.removeClass("layui-layer-TipsB").addClass("layui-layer-TipsT").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left+s.width+10,s.tipTop=s.top,f.removeClass("layui-layer-TipsL").addClass("layui-layer-TipsR").css("border-bottom-color",t.tips[1])},function(){s.autoLeft(),s.tipTop=s.top+s.height+10,f.removeClass("layui-layer-TipsT").addClass("layui-layer-TipsB").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left-o[0]-10,s.tipTop=s.top,f.removeClass("layui-layer-TipsR").addClass("layui-layer-TipsL").css("border-bottom-color",t.tips[1])}],s.where[c-1](),1===c?s.top-(n.scrollTop()+o[1]+16)<0&&s.where[2]():2===c?n.width()-(s.left+s.width+o[0]+16)>0||s.where[3]():3===c?s.top-n.scrollTop()+s.height+o[1]+16-n.height()>0&&s.where[0]():4===c&&o[0]+16-s.left>0&&s.where[1](),a.find("."+l[5]).css({"background-color":t.tips[1],"padding-right":t.closeBtn?"30px":""}),a.css({left:s.tipLeft-(t.fixed?n.scrollLeft():0),top:s.tipTop-(t.fixed?n.scrollTop():0)})},s.pt.move=function(){var e=this,t=e.config,a=i(document),s=e.layero,l=s.find(t.move),f=s.find(".layui-layer-resize"),c={};return t.move&&l.css("cursor","move"),l.on("mousedown",function(e){e.preventDefault(),t.move&&(c.moveStart=!0,c.offset=[e.clientX-parseFloat(s.css("left")),e.clientY-parseFloat(s.css("top"))],o.moveElem.css("cursor","move").show())}),f.on("mousedown",function(e){e.preventDefault(),c.resizeStart=!0,c.offset=[e.clientX,e.clientY],c.area=[s.outerWidth(),s.outerHeight()],o.moveElem.css("cursor","se-resize").show()}),a.on("mousemove",function(i){if(c.moveStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1],l="fixed"===s.css("position");if(i.preventDefault(),c.stX=l?0:n.scrollLeft(),c.stY=l?0:n.scrollTop(),!t.moveOut){var f=n.width()-s.outerWidth()+c.stX,u=n.height()-s.outerHeight()+c.stY;a<c.stX&&(a=c.stX),a>f&&(a=f),o<c.stY&&(o=c.stY),o>u&&(o=u)}s.css({left:a,top:o})}if(t.resize&&c.resizeStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1];i.preventDefault(),r.style(e.index,{width:c.area[0]+a,height:c.area[1]+o}),c.isResize=!0,t.resizing&&t.resizing(s)}}).on("mouseup",function(e){c.moveStart&&(delete c.moveStart,o.moveElem.hide(),t.moveEnd&&t.moveEnd(s)),c.resizeStart&&(delete c.resizeStart,o.moveElem.hide())}),e},s.pt.callback=function(){function e(){var e=a.cancel&&a.cancel(t.index,n);e===!1||r.close(t.index)}var t=this,n=t.layero,a=t.config;t.openLayer(),a.success&&(2==a.type?n.find("iframe").on("load",function(){a.success(n,t.index)}):a.success(n,t.index)),6==r.ie&&t.IE6(n),n.find("."+l[6]).children("a").on("click",function(){var e=i(this).index();if(0===e)a.yes?a.yes(t.index,n):a.btn1?a.btn1(t.index,n):r.close(t.index);else{var o=a["btn"+(e+1)]&&a["btn"+(e+1)](t.index,n);o===!1||r.close(t.index)}}),n.find("."+l[7]).on("click",e),a.shadeClose&&i("#layui-layer-shade"+t.index).on("click",function(){r.close(t.index)}),n.find(".layui-layer-min").on("click",function(){var e=a.min&&a.min(n);e===!1||r.min(t.index,a)}),n.find(".layui-layer-max").on("click",function(){i(this).hasClass("layui-layer-maxmin")?(r.restore(t.index),a.restore&&a.restore(n)):(r.full(t.index,a),setTimeout(function(){a.full&&a.full(n)},100))}),a.end&&(o.end[t.index]=a.end)},o.reselect=function(){i.each(i("select"),function(e,t){var n=i(this);n.parents("."+l[0])[0]||1==n.attr("layer")&&i("."+l[0]).length<1&&n.removeAttr("layer").show(),n=null})},s.pt.IE6=function(e){i("select").each(function(e,t){var n=i(this);n.parents("."+l[0])[0]||"none"===n.css("display")||n.attr({layer:"1"}).hide(),n=null})},s.pt.openLayer=function(){var e=this;r.zIndex=e.config.zIndex,r.setTop=function(e){var t=function(){r.zIndex++,e.css("z-index",r.zIndex+1)};return r.zIndex=parseInt(e[0].style.zIndex),e.on("mousedown",t),r.zIndex}},o.record=function(e){var t=[e.width(),e.height(),e.position().top,e.position().left+parseFloat(e.css("margin-left"))];e.find(".layui-layer-max").addClass("layui-layer-maxmin"),e.attr({area:t})},o.rescollbar=function(e){l.html.attr("layer-full")==e&&(l.html[0].style.removeProperty?l.html[0].style.removeProperty("overflow"):l.html[0].style.removeAttribute("overflow"),l.html.removeAttr("layer-full"))},e.layer=r,r.getChildFrame=function(e,t){return t=t||i("."+l[4]).attr("times"),i("#"+l[0]+t).find("iframe").contents().find(e)},r.getFrameIndex=function(e){return i("#"+e).parents("."+l[4]).attr("times")},r.iframeAuto=function(e){if(e){var t=r.getChildFrame("html",e).outerHeight(),n=i("#"+l[0]+e),a=n.find(l[1]).outerHeight()||0,o=n.find("."+l[6]).outerHeight()||0;n.css({height:t+a+o}),n.find("iframe").css({height:t})}},r.iframeSrc=function(e,t){i("#"+l[0]+e).find("iframe").attr("src",t)},r.style=function(e,t,n){var a=i("#"+l[0]+e),r=a.find(".layui-layer-content"),s=a.attr("type"),f=a.find(l[1]).outerHeight()||0,c=a.find("."+l[6]).outerHeight()||0;a.attr("minLeft");s!==o.type[3]&&s!==o.type[4]&&(n||(parseFloat(t.width)<=260&&(t.width=260),parseFloat(t.height)-f-c<=64&&(t.height=64+f+c)),a.css(t),c=a.find("."+l[6]).outerHeight(),s===o.type[2]?a.find("iframe").css({height:parseFloat(t.height)-f-c}):r.css({height:parseFloat(t.height)-f-c-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom"))}))},r.min=function(e,t){var a=i("#"+l[0]+e),s=a.find(l[1]).outerHeight()||0,f=a.attr("minLeft")||181*o.minIndex+"px",c=a.css("position");o.record(a),o.minLeft[0]&&(f=o.minLeft[0],o.minLeft.shift()),a.attr("position",c),r.style(e,{width:180,height:s,left:f,top:n.height()-s,position:"fixed",overflow:"hidden"},!0),a.find(".layui-layer-min").hide(),"page"===a.attr("type")&&a.find(l[4]).hide(),o.rescollbar(e),a.attr("minLeft")||o.minIndex++,a.attr("minLeft",f)},r.restore=function(e){var t=i("#"+l[0]+e),n=t.attr("area").split(",");t.attr("type");r.style(e,{width:parseFloat(n[0]),height:parseFloat(n[1]),top:parseFloat(n[2]),left:parseFloat(n[3]),position:t.attr("position"),overflow:"visible"},!0),t.find(".layui-layer-max").removeClass("layui-layer-maxmin"),t.find(".layui-layer-min").show(),"page"===t.attr("type")&&t.find(l[4]).show(),o.rescollbar(e)},r.full=function(e){var t,a=i("#"+l[0]+e);o.record(a),l.html.attr("layer-full")||l.html.css("overflow","hidden").attr("layer-full",e),clearTimeout(t),t=setTimeout(function(){var t="fixed"===a.css("position");r.style(e,{top:t?0:n.scrollTop(),left:t?0:n.scrollLeft(),width:n.width(),height:n.height()},!0),a.find(".layui-layer-min").hide()},100)},r.title=function(e,t){var n=i("#"+l[0]+(t||r.index)).find(l[1]);n.html(e)},r.close=function(e){var t=i("#"+l[0]+e),n=t.attr("type"),a="layer-anim-close";if(t[0]){var s="layui-layer-wrap",f=function(){if(n===o.type[1]&&"object"===t.attr("conType")){t.children(":not(."+l[5]+")").remove();for(var a=t.find("."+s),r=0;r<2;r++)a.unwrap();a.css("display",a.data("display")).removeClass(s)}else{if(n===o.type[2])try{var f=i("#"+l[4]+e)[0];f.contentWindow.document.write(""),f.contentWindow.close(),t.find("."+l[5])[0].removeChild(f)}catch(c){}t[0].innerHTML="",t.remove()}"function"==typeof o.end[e]&&o.end[e](),delete o.end[e]};t.data("isOutAnim")&&t.addClass("layer-anim "+a),i("#layui-layer-moves, #layui-layer-shade"+e).remove(),6==r.ie&&o.reselect(),o.rescollbar(e),t.attr("minLeft")&&(o.minIndex--,o.minLeft.push(t.attr("minLeft"))),r.ie&&r.ie<10||!t.data("isOutAnim")?f():setTimeout(function(){f()},200)}},r.closeAll=function(e){i.each(i("."+l[0]),function(){var t=i(this),n=e?t.attr("type")===e:1;n&&r.close(t.attr("times")),n=null})};var f=r.cache||{},c=function(e){return f.skin?" "+f.skin+" "+f.skin+"-"+e:""};r.prompt=function(e,t){var a="";if(e=e||{},"function"==typeof e&&(t=e),e.area){var o=e.area;a='style="width: '+o[0]+"; height: "+o[1]+';"',delete e.area}var s,l=2==e.formType?'<textarea class="layui-layer-input"'+a+"></textarea>":function(){return'<input type="'+(1==e.formType?"password":"text")+'" class="layui-layer-input">'}(),f=e.success;return delete e.success,r.open(i.extend({type:1,btn:["确定","取消"],content:l,skin:"layui-layer-prompt"+c("prompt"),maxWidth:n.width(),success:function(t){s=t.find(".layui-layer-input"),s.val(e.value||"").focus(),"function"==typeof f&&f(t)},resize:!1,yes:function(i){var n=s.val();""===n?s.focus():n.length>(e.maxlength||500)?r.tips("最多输入"+(e.maxlength||500)+"个字数",s,{tips:1}):t&&t(n,i,s)}},e))},r.tab=function(e){e=e||{};var t=e.tab||{},n="layui-this",a=e.success;return delete e.success,r.open(i.extend({type:1,skin:"layui-layer-tab"+c("tab"),resize:!1,title:function(){var e=t.length,i=1,a="";if(e>0)for(a='<span class="'+n+'">'+t[0].title+"</span>";i<e;i++)a+="<span>"+t[i].title+"</span>";return a}(),content:'<ul class="layui-layer-tabmain">'+function(){var e=t.length,i=1,a="";if(e>0)for(a='<li class="layui-layer-tabli '+n+'">'+(t[0].content||"no content")+"</li>";i<e;i++)a+='<li class="layui-layer-tabli">'+(t[i].content||"no content")+"</li>";return a}()+"</ul>",success:function(t){var o=t.find(".layui-layer-title").children(),r=t.find(".layui-layer-tabmain").children();o.on("mousedown",function(t){t.stopPropagation?t.stopPropagation():t.cancelBubble=!0;var a=i(this),o=a.index();a.addClass(n).siblings().removeClass(n),r.eq(o).show().siblings().hide(),"function"==typeof e.change&&e.change(o)}),"function"==typeof a&&a(t)}},e))},r.photos=function(t,n,a){function o(e,t,i){var n=new Image;return n.src=e,n.complete?t(n):(n.onload=function(){n.onload=null,t(n)},void(n.onerror=function(e){n.onerror=null,i(e)}))}var s={};if(t=t||{},t.photos){var l=t.photos.constructor===Object,f=l?t.photos:{},u=f.data||[],d=f.start||0;s.imgIndex=(0|d)+1,t.img=t.img||"img";var y=t.success;if(delete t.success,l){if(0===u.length)return r.msg("没有图片")}else{var p=i(t.photos),h=function(){u=[],p.find(t.img).each(function(e){var t=i(this);t.attr("layer-index",e),u.push({alt:t.attr("alt"),pid:t.attr("layer-pid"),src:t.attr("layer-src")||t.attr("src"),thumb:t.attr("src")})})};if(h(),0===u.length)return;if(n||p.on("click",t.img,function(){var e=i(this),n=e.attr("layer-index");r.photos(i.extend(t,{photos:{start:n,data:u,tab:t.tab},full:t.full}),!0),h()}),!n)return}s.imgprev=function(e){s.imgIndex--,s.imgIndex<1&&(s.imgIndex=u.length),s.tabimg(e)},s.imgnext=function(e,t){s.imgIndex++,s.imgIndex>u.length&&(s.imgIndex=1,t)||s.tabimg(e)},s.keyup=function(e){if(!s.end){var t=e.keyCode;e.preventDefault(),37===t?s.imgprev(!0):39===t?s.imgnext(!0):27===t&&r.close(s.index)}},s.tabimg=function(e){if(!(u.length<=1))return f.start=s.imgIndex-1,r.close(s.index),r.photos(t,!0,e)},s.event=function(){s.bigimg.hover(function(){s.imgsee.show()},function(){s.imgsee.hide()}),s.bigimg.find(".layui-layer-imgprev").on("click",function(e){e.preventDefault(),s.imgprev()}),s.bigimg.find(".layui-layer-imgnext").on("click",function(e){e.preventDefault(),s.imgnext()}),i(document).on("keyup",s.keyup)},s.loadi=r.load(1,{shade:!("shade"in t)&&.9,scrollbar:!1}),o(u[d].src,function(n){r.close(s.loadi),s.index=r.open(i.extend({type:1,id:"layui-layer-photos",area:function(){var a=[n.width,n.height],o=[i(e).width()-100,i(e).height()-100];if(!t.full&&(a[0]>o[0]||a[1]>o[1])){var r=[a[0]/o[0],a[1]/o[1]];r[0]>r[1]?(a[0]=a[0]/r[0],a[1]=a[1]/r[0]):r[0]<r[1]&&(a[0]=a[0]/r[1],a[1]=a[1]/r[1])}return[a[0]+"px",a[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,isOutAnim:!1,skin:"layui-layer-photos"+c("photos"),content:'<div class="layui-layer-phimg"><img src="'+u[d].src+'" alt="'+(u[d].alt||"")+'" layer-pid="'+u[d].pid+'"><div class="layui-layer-imgsee">'+(u.length>1?'<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>':"")+'<div class="layui-layer-imgbar" style="display:'+(a?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(u[d].alt||"")+"</a><em>"+s.imgIndex+"/"+u.length+"</em></span></div></div></div>",success:function(e,i){s.bigimg=e.find(".layui-layer-phimg"),s.imgsee=e.find(".layui-layer-imguide,.layui-layer-imgbar"),s.event(e),t.tab&&t.tab(u[d],e),"function"==typeof y&&y(e)},end:function(){s.end=!0,i(document).off("keyup",s.keyup)}},t))},function(){r.close(s.loadi),r.msg("当前图片地址异常<br>是否继续查看下一张？",{time:3e4,btn:["下一张","不看了"],yes:function(){u.length>1&&s.imgnext(!0,!0)}})})}},o.run=function(t){i=t,n=i(e),l.html=i("html"),r.open=function(e){var t=new s(e);return t.index}},e.layui&&layui.define?(r.ready(),layui.define("jquery",function(t){r.path=layui.cache.dir,o.run(layui.$),e.layer=r,t("layer",r)})):"function"==typeof define&&define.amd?define(["jquery"],function(){return o.run(e.jQuery),r}):function(){o.run(e.jQuery),r.ready()}()}(window);
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/laypage.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/laypage.js
new file mode 100644
index 0000000..fd07fda
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/laypage.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define(function(e){"use strict";var a=document,t="getElementById",n="getElementsByTagName",i="laypage",r="layui-disabled",u=function(e){var a=this;a.config=e||{},a.config.index=++s.index,a.render(!0)};u.prototype.type=function(){var e=this.config;if("object"==typeof e.elem)return void 0===e.elem.length?2:3},u.prototype.view=function(){var e=this,a=e.config,t=a.groups="groups"in a?0|a.groups:5;a.layout="object"==typeof a.layout?a.layout:["prev","page","next"],a.count=0|a.count,a.curr=0|a.curr||1,a.limits="object"==typeof a.limits?a.limits:[10,20,30,40,50],a.limit=0|a.limit||10,a.pages=Math.ceil(a.count/a.limit)||1,a.curr>a.pages&&(a.curr=a.pages),t<0?t=1:t>a.pages&&(t=a.pages),a.prev="prev"in a?a.prev:"上一页",a.next="next"in a?a.next:"下一页";var n=a.pages>t?Math.ceil((a.curr+(t>1?1:0))/(t>0?t:1)):1,i={prev:function(){return a.prev?'<a href="javascript:;" class="layui-laypage-prev'+(1==a.curr?" "+r:"")+'" data-page="'+(a.curr-1)+'">'+a.prev+"</a>":""}(),page:function(){var e=[];if(a.count<1)return"";n>1&&a.first!==!1&&0!==t&&e.push('<a href="javascript:;" class="layui-laypage-first" data-page="1" title="首页">'+(a.first||1)+"</a>");var i=Math.floor((t-1)/2),r=n>1?a.curr-i:1,u=n>1?function(){var e=a.curr+(t-i-1);return e>a.pages?a.pages:e}():t;for(u-r<t-1&&(r=u-t+1),a.first!==!1&&r>2&&e.push('<span class="layui-laypage-spr">…</span>');r<=u;r++)r===a.curr?e.push('<span class="layui-laypage-curr"><em class="layui-laypage-em" '+(/^#/.test(a.theme)?'style="background-color:'+a.theme+';"':"")+"></em><em>"+r+"</em></span>"):e.push('<a href="javascript:;" data-page="'+r+'">'+r+"</a>");return a.pages>t&&a.pages>u&&a.last!==!1&&(u+1<a.pages&&e.push('<span class="layui-laypage-spr">…</span>'),0!==t&&e.push('<a href="javascript:;" class="layui-laypage-last" title="尾页" data-page="'+a.pages+'">'+(a.last||a.pages)+"</a>")),e.join("")}(),next:function(){return a.next?'<a href="javascript:;" class="layui-laypage-next'+(a.curr==a.pages?" "+r:"")+'" data-page="'+(a.curr+1)+'">'+a.next+"</a>":""}(),count:'<span class="layui-laypage-count">共 '+a.count+" 条</span>",limit:function(){var e=['<span class="layui-laypage-limits"><select lay-ignore>'];return layui.each(a.limits,function(t,n){e.push('<option value="'+n+'"'+(n===a.limit?"selected":"")+">"+n+" 条/页</option>")}),e.join("")+"</select></span>"}(),refresh:['<a href="javascript:;" data-page="'+a.curr+'" class="layui-laypage-refresh">','<i class="layui-icon layui-icon-refresh"></i>',"</a>"].join(""),skip:function(){return['<span class="layui-laypage-skip">到第','<input type="text" min="1" value="'+a.curr+'" class="layui-input">','页<button type="button" class="layui-laypage-btn">确定</button>',"</span>"].join("")}()};return['<div class="layui-box layui-laypage layui-laypage-'+(a.theme?/^#/.test(a.theme)?"molv":a.theme:"default")+'" id="layui-laypage-'+a.index+'">',function(){var e=[];return layui.each(a.layout,function(a,t){i[t]&&e.push(i[t])}),e.join("")}(),"</div>"].join("")},u.prototype.jump=function(e,a){if(e){var t=this,i=t.config,r=e.children,u=e[n]("button")[0],l=e[n]("input")[0],p=e[n]("select")[0],c=function(){var e=0|l.value.replace(/\s|\D/g,"");e&&(i.curr=e,t.render())};if(a)return c();for(var o=0,y=r.length;o<y;o++)"a"===r[o].nodeName.toLowerCase()&&s.on(r[o],"click",function(){var e=0|this.getAttribute("data-page");e<1||e>i.pages||(i.curr=e,t.render())});p&&s.on(p,"change",function(){var e=this.value;i.curr*e>i.count&&(i.curr=Math.ceil(i.count/e)),i.limit=e,t.render()}),u&&s.on(u,"click",function(){c()})}},u.prototype.skip=function(e){if(e){var a=this,t=e[n]("input")[0];t&&s.on(t,"keyup",function(t){var n=this.value,i=t.keyCode;/^(37|38|39|40)$/.test(i)||(/\D/.test(n)&&(this.value=n.replace(/\D/,"")),13===i&&a.jump(e,!0))})}},u.prototype.render=function(e){var n=this,i=n.config,r=n.type(),u=n.view();2===r?i.elem&&(i.elem.innerHTML=u):3===r?i.elem.html(u):a[t](i.elem)&&(a[t](i.elem).innerHTML=u),i.jump&&i.jump(i,e);var s=a[t]("layui-laypage-"+i.index);n.jump(s),i.hash&&!e&&(location.hash="!"+i.hash+"="+i.curr),n.skip(s)};var s={render:function(e){var a=new u(e);return a.index},index:layui.laypage?layui.laypage.index+1e4:0,on:function(e,a,t){return e.attachEvent?e.attachEvent("on"+a,function(a){a.target=a.srcElement,t.call(e,a)}):e.addEventListener(a,t,!1),this}};e(i,s)});
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/laytpl.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/laytpl.js
new file mode 100644
index 0000000..d482d4e
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/laytpl.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define(function(e){"use strict";var r={open:"{{",close:"}}"},c={exp:function(e){return new RegExp(e,"g")},query:function(e,c,t){var o=["#([\\s\\S])+?","([^{#}])*?"][e||0];return n((c||"")+r.open+o+r.close+(t||""))},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/'/g,"'").replace(/"/g,""")},error:function(e,r){var c="Laytpl Error：";return"object"==typeof console&&console.error(c+e+"\n"+(r||"")),c+e}},n=c.exp,t=function(e){this.tpl=e};t.pt=t.prototype,window.errors=0,t.pt.parse=function(e,t){var o=this,p=e,a=n("^"+r.open+"#",""),l=n(r.close+"$","");e=e.replace(/\s+|\r|\t|\n/g," ").replace(n(r.open+"#"),r.open+"# ").replace(n(r.close+"}"),"} "+r.close).replace(/\\/g,"\\\\").replace(n(r.open+"!(.+?)!"+r.close),function(e){return e=e.replace(n("^"+r.open+"!"),"").replace(n("!"+r.close),"").replace(n(r.open+"|"+r.close),function(e){return e.replace(/(.)/g,"\\$1")})}).replace(/(?="|')/g,"\\").replace(c.query(),function(e){return e=e.replace(a,"").replace(l,""),'";'+e.replace(/\\/g,"")+';view+="'}).replace(c.query(1),function(e){var c='"+(';return e.replace(/\s/g,"")===r.open+r.close?"":(e=e.replace(n(r.open+"|"+r.close),""),/^=/.test(e)&&(e=e.replace(/^=/,""),c='"+_escape_('),c+e.replace(/\\/g,"")+')+"')}),e='"use strict";var view = "'+e+'";return view;';try{return o.cache=e=new Function("d, _escape_",e),e(t,c.escape)}catch(u){return delete o.cache,c.error(u,p)}},t.pt.render=function(e,r){var n,t=this;return e?(n=t.cache?t.cache(e,c.escape):t.parse(t.tpl,e),r?void r(n):n):c.error("no data")};var o=function(e){return"string"!=typeof e?c.error("Template not found"):new t(e)};o.config=function(e){e=e||{};for(var c in e)r[c]=e[c]},o.v="1.2.0",e("laytpl",o)});
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/mobile.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/mobile.js
new file mode 100644
index 0000000..35cfdf0
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/mobile.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define(function(i){i("layui.mobile",layui.v)});layui.define(function(e){"use strict";var r={open:"{{",close:"}}"},c={exp:function(e){return new RegExp(e,"g")},query:function(e,c,t){var o=["#([\\s\\S])+?","([^{#}])*?"][e||0];return n((c||"")+r.open+o+r.close+(t||""))},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/'/g,"'").replace(/"/g,""")},error:function(e,r){var c="Laytpl Error：";return"object"==typeof console&&console.error(c+e+"\n"+(r||"")),c+e}},n=c.exp,t=function(e){this.tpl=e};t.pt=t.prototype,window.errors=0,t.pt.parse=function(e,t){var o=this,p=e,a=n("^"+r.open+"#",""),l=n(r.close+"$","");e=e.replace(/\s+|\r|\t|\n/g," ").replace(n(r.open+"#"),r.open+"# ").replace(n(r.close+"}"),"} "+r.close).replace(/\\/g,"\\\\").replace(n(r.open+"!(.+?)!"+r.close),function(e){return e=e.replace(n("^"+r.open+"!"),"").replace(n("!"+r.close),"").replace(n(r.open+"|"+r.close),function(e){return e.replace(/(.)/g,"\\$1")})}).replace(/(?="|')/g,"\\").replace(c.query(),function(e){return e=e.replace(a,"").replace(l,""),'";'+e.replace(/\\/g,"")+';view+="'}).replace(c.query(1),function(e){var c='"+(';return e.replace(/\s/g,"")===r.open+r.close?"":(e=e.replace(n(r.open+"|"+r.close),""),/^=/.test(e)&&(e=e.replace(/^=/,""),c='"+_escape_('),c+e.replace(/\\/g,"")+')+"')}),e='"use strict";var view = "'+e+'";return view;';try{return o.cache=e=new Function("d, _escape_",e),e(t,c.escape)}catch(u){return delete o.cache,c.error(u,p)}},t.pt.render=function(e,r){var n,t=this;return e?(n=t.cache?t.cache(e,c.escape):t.parse(t.tpl,e),r?void r(n):n):c.error("no data")};var o=function(e){return"string"!=typeof e?c.error("Template not found"):new t(e)};o.config=function(e){e=e||{};for(var c in e)r[c]=e[c]},o.v="1.2.0",e("laytpl",o)});layui.define(function(e){"use strict";var t=(window,document),i="querySelectorAll",n="getElementsByClassName",a=function(e){return t[i](e)},s={type:0,shade:!0,shadeClose:!0,fixed:!0,anim:"scale"},l={extend:function(e){var t=JSON.parse(JSON.stringify(s));for(var i in e)t[i]=e[i];return t},timer:{},end:{}};l.touch=function(e,t){e.addEventListener("click",function(e){t.call(this,e)},!1)};var o=0,r=["layui-m-layer"],d=function(e){var t=this;t.config=l.extend(e),t.view()};d.prototype.view=function(){var e=this,i=e.config,s=t.createElement("div");e.id=s.id=r[0]+o,s.setAttribute("class",r[0]+" "+r[0]+(i.type||0)),s.setAttribute("index",o);var l=function(){var e="object"==typeof i.title;return i.title?'<h3 style="'+(e?i.title[1]:"")+'">'+(e?i.title[0]:i.title)+"</h3>":""}(),d=function(){"string"==typeof i.btn&&(i.btn=[i.btn]);var e,t=(i.btn||[]).length;return 0!==t&&i.btn?(e='<span yes type="1">'+i.btn[0]+"</span>",2===t&&(e='<span no type="0">'+i.btn[1]+"</span>"+e),'<div class="layui-m-layerbtn">'+e+"</div>"):""}();if(i.fixed||(i.top=i.hasOwnProperty("top")?i.top:100,i.style=i.style||"",i.style+=" top:"+(t.body.scrollTop+i.top)+"px"),2===i.type&&(i.content='<i></i><i class="layui-m-layerload"></i><i></i><p>'+(i.content||"")+"</p>"),i.skin&&(i.anim="up"),"msg"===i.skin&&(i.shade=!1),s.innerHTML=(i.shade?"<div "+("string"==typeof i.shade?'style="'+i.shade+'"':"")+' class="layui-m-layershade"></div>':"")+'<div class="layui-m-layermain" '+(i.fixed?"":'style="position:static;"')+'><div class="layui-m-layersection"><div class="layui-m-layerchild '+(i.skin?"layui-m-layer-"+i.skin+" ":"")+(i.className?i.className:"")+" "+(i.anim?"layui-m-anim-"+i.anim:"")+'" '+(i.style?'style="'+i.style+'"':"")+">"+l+'<div class="layui-m-layercont">'+i.content+"</div>"+d+"</div></div></div>",!i.type||2===i.type){var y=t[n](r[0]+i.type),u=y.length;u>=1&&c.close(y[0].getAttribute("index"))}document.body.appendChild(s);var m=e.elem=a("#"+e.id)[0];i.success&&i.success(m),e.index=o++,e.action(i,m)},d.prototype.action=function(e,t){var i=this;e.time&&(l.timer[i.index]=setTimeout(function(){c.close(i.index)},1e3*e.time));var a=function(){var t=this.getAttribute("type");0==t?(e.no&&e.no(),c.close(i.index)):e.yes?e.yes(i.index):c.close(i.index)};if(e.btn)for(var s=t[n]("layui-m-layerbtn")[0].children,o=s.length,r=0;r<o;r++)l.touch(s[r],a);if(e.shade&&e.shadeClose){var d=t[n]("layui-m-layershade")[0];l.touch(d,function(){c.close(i.index,e.end)})}e.end&&(l.end[i.index]=e.end)};var c={v:"2.0 m",index:o,open:function(e){var t=new d(e||{});return t.index},close:function(e){var i=a("#"+r[0]+e)[0];i&&(i.innerHTML="",t.body.removeChild(i),clearTimeout(l.timer[e]),delete l.timer[e],"function"==typeof l.end[e]&&l.end[e](),delete l.end[e])},closeAll:function(){for(var e=t[n](r[0]),i=0,a=e.length;i<a;i++)c.close(0|e[0].getAttribute("index"))}};e("layer-mobile",c)});layui.define(function(t){var e=function(){function t(t){return null==t?String(t):J[W.call(t)]||"object"}function e(e){return"function"==t(e)}function n(t){return null!=t&&t==t.window}function r(t){return null!=t&&t.nodeType==t.DOCUMENT_NODE}function i(e){return"object"==t(e)}function o(t){return i(t)&&!n(t)&&Object.getPrototypeOf(t)==Object.prototype}function a(t){var e=!!t&&"length"in t&&t.length,r=T.type(t);return"function"!=r&&!n(t)&&("array"==r||0===e||"number"==typeof e&&e>0&&e-1 in t)}function s(t){return A.call(t,function(t){return null!=t})}function u(t){return t.length>0?T.fn.concat.apply([],t):t}function c(t){return t.replace(/::/g,"/").replace(/([A-Z]+)([A-Z][a-z])/g,"$1_$2").replace(/([a-z\d])([A-Z])/g,"$1_$2").replace(/_/g,"-").toLowerCase()}function l(t){return t in F?F[t]:F[t]=new RegExp("(^|\\s)"+t+"(\\s|$)")}function f(t,e){return"number"!=typeof e||k[c(t)]?e:e+"px"}function h(t){var e,n;return $[t]||(e=L.createElement(t),L.body.appendChild(e),n=getComputedStyle(e,"").getPropertyValue("display"),e.parentNode.removeChild(e),"none"==n&&(n="block"),$[t]=n),$[t]}function p(t){return"children"in t?D.call(t.children):T.map(t.childNodes,function(t){if(1==t.nodeType)return t})}function d(t,e){var n,r=t?t.length:0;for(n=0;n<r;n++)this[n]=t[n];this.length=r,this.selector=e||""}function m(t,e,n){for(j in e)n&&(o(e[j])||Q(e[j]))?(o(e[j])&&!o(t[j])&&(t[j]={}),Q(e[j])&&!Q(t[j])&&(t[j]=[]),m(t[j],e[j],n)):e[j]!==E&&(t[j]=e[j])}function v(t,e){return null==e?T(t):T(t).filter(e)}function g(t,n,r,i){return e(n)?n.call(t,r,i):n}function y(t,e,n){null==n?t.removeAttribute(e):t.setAttribute(e,n)}function x(t,e){var n=t.className||"",r=n&&n.baseVal!==E;return e===E?r?n.baseVal:n:void(r?n.baseVal=e:t.className=e)}function b(t){try{return t?"true"==t||"false"!=t&&("null"==t?null:+t+""==t?+t:/^[\[\{]/.test(t)?T.parseJSON(t):t):t}catch(e){return t}}function w(t,e){e(t);for(var n=0,r=t.childNodes.length;n<r;n++)w(t.childNodes[n],e)}var E,j,T,S,C,N,O=[],P=O.concat,A=O.filter,D=O.slice,L=window.document,$={},F={},k={"column-count":1,columns:1,"font-weight":1,"line-height":1,opacity:1,"z-index":1,zoom:1},M=/^\s*<(\w+|!)[^>]*>/,R=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,z=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,Z=/^(?:body|html)$/i,q=/([A-Z])/g,H=["val","css","html","text","data","width","height","offset"],I=["after","prepend","before","append"],V=L.createElement("table"),_=L.createElement("tr"),B={tr:L.createElement("tbody"),tbody:V,thead:V,tfoot:V,td:_,th:_,"*":L.createElement("div")},U=/complete|loaded|interactive/,X=/^[\w-]*$/,J={},W=J.toString,Y={},G=L.createElement("div"),K={tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},Q=Array.isArray||function(t){return t instanceof Array};return Y.matches=function(t,e){if(!e||!t||1!==t.nodeType)return!1;var n=t.matches||t.webkitMatchesSelector||t.mozMatchesSelector||t.oMatchesSelector||t.matchesSelector;if(n)return n.call(t,e);var r,i=t.parentNode,o=!i;return o&&(i=G).appendChild(t),r=~Y.qsa(i,e).indexOf(t),o&&G.removeChild(t),r},C=function(t){return t.replace(/-+(.)?/g,function(t,e){return e?e.toUpperCase():""})},N=function(t){return A.call(t,function(e,n){return t.indexOf(e)==n})},Y.fragment=function(t,e,n){var r,i,a;return R.test(t)&&(r=T(L.createElement(RegExp.$1))),r||(t.replace&&(t=t.replace(z,"<$1></$2>")),e===E&&(e=M.test(t)&&RegExp.$1),e in B||(e="*"),a=B[e],a.innerHTML=""+t,r=T.each(D.call(a.childNodes),function(){a.removeChild(this)})),o(n)&&(i=T(r),T.each(n,function(t,e){H.indexOf(t)>-1?i[t](e):i.attr(t,e)})),r},Y.Z=function(t,e){return new d(t,e)},Y.isZ=function(t){return t instanceof Y.Z},Y.init=function(t,n){var r;if(!t)return Y.Z();if("string"==typeof t)if(t=t.trim(),"<"==t[0]&&M.test(t))r=Y.fragment(t,RegExp.$1,n),t=null;else{if(n!==E)return T(n).find(t);r=Y.qsa(L,t)}else{if(e(t))return T(L).ready(t);if(Y.isZ(t))return t;if(Q(t))r=s(t);else if(i(t))r=[t],t=null;else if(M.test(t))r=Y.fragment(t.trim(),RegExp.$1,n),t=null;else{if(n!==E)return T(n).find(t);r=Y.qsa(L,t)}}return Y.Z(r,t)},T=function(t,e){return Y.init(t,e)},T.extend=function(t){var e,n=D.call(arguments,1);return"boolean"==typeof t&&(e=t,t=n.shift()),n.forEach(function(n){m(t,n,e)}),t},Y.qsa=function(t,e){var n,r="#"==e[0],i=!r&&"."==e[0],o=r||i?e.slice(1):e,a=X.test(o);return t.getElementById&&a&&r?(n=t.getElementById(o))?[n]:[]:1!==t.nodeType&&9!==t.nodeType&&11!==t.nodeType?[]:D.call(a&&!r&&t.getElementsByClassName?i?t.getElementsByClassName(o):t.getElementsByTagName(e):t.querySelectorAll(e))},T.contains=L.documentElement.contains?function(t,e){return t!==e&&t.contains(e)}:function(t,e){for(;e&&(e=e.parentNode);)if(e===t)return!0;return!1},T.type=t,T.isFunction=e,T.isWindow=n,T.isArray=Q,T.isPlainObject=o,T.isEmptyObject=function(t){var e;for(e in t)return!1;return!0},T.isNumeric=function(t){var e=Number(t),n=typeof t;return null!=t&&"boolean"!=n&&("string"!=n||t.length)&&!isNaN(e)&&isFinite(e)||!1},T.inArray=function(t,e,n){return O.indexOf.call(e,t,n)},T.camelCase=C,T.trim=function(t){return null==t?"":String.prototype.trim.call(t)},T.uuid=0,T.support={},T.expr={},T.noop=function(){},T.map=function(t,e){var n,r,i,o=[];if(a(t))for(r=0;r<t.length;r++)n=e(t[r],r),null!=n&&o.push(n);else for(i in t)n=e(t[i],i),null!=n&&o.push(n);return u(o)},T.each=function(t,e){var n,r;if(a(t)){for(n=0;n<t.length;n++)if(e.call(t[n],n,t[n])===!1)return t}else for(r in t)if(e.call(t[r],r,t[r])===!1)return t;return t},T.grep=function(t,e){return A.call(t,e)},window.JSON&&(T.parseJSON=JSON.parse),T.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(t,e){J["[object "+e+"]"]=e.toLowerCase()}),T.fn={constructor:Y.Z,length:0,forEach:O.forEach,reduce:O.reduce,push:O.push,sort:O.sort,splice:O.splice,indexOf:O.indexOf,concat:function(){var t,e,n=[];for(t=0;t<arguments.length;t++)e=arguments[t],n[t]=Y.isZ(e)?e.toArray():e;return P.apply(Y.isZ(this)?this.toArray():this,n)},map:function(t){return T(T.map(this,function(e,n){return t.call(e,n,e)}))},slice:function(){return T(D.apply(this,arguments))},ready:function(t){return U.test(L.readyState)&&L.body?t(T):L.addEventListener("DOMContentLoaded",function(){t(T)},!1),this},get:function(t){return t===E?D.call(this):this[t>=0?t:t+this.length]},toArray:function(){return this.get()},size:function(){return this.length},remove:function(){return this.each(function(){null!=this.parentNode&&this.parentNode.removeChild(this)})},each:function(t){return O.every.call(this,function(e,n){return t.call(e,n,e)!==!1}),this},filter:function(t){return e(t)?this.not(this.not(t)):T(A.call(this,function(e){return Y.matches(e,t)}))},add:function(t,e){return T(N(this.concat(T(t,e))))},is:function(t){return this.length>0&&Y.matches(this[0],t)},not:function(t){var n=[];if(e(t)&&t.call!==E)this.each(function(e){t.call(this,e)||n.push(this)});else{var r="string"==typeof t?this.filter(t):a(t)&&e(t.item)?D.call(t):T(t);this.forEach(function(t){r.indexOf(t)<0&&n.push(t)})}return T(n)},has:function(t){return this.filter(function(){return i(t)?T.contains(this,t):T(this).find(t).size()})},eq:function(t){return t===-1?this.slice(t):this.slice(t,+t+1)},first:function(){var t=this[0];return t&&!i(t)?t:T(t)},last:function(){var t=this[this.length-1];return t&&!i(t)?t:T(t)},find:function(t){var e,n=this;return e=t?"object"==typeof t?T(t).filter(function(){var t=this;return O.some.call(n,function(e){return T.contains(e,t)})}):1==this.length?T(Y.qsa(this[0],t)):this.map(function(){return Y.qsa(this,t)}):T()},closest:function(t,e){var n=[],i="object"==typeof t&&T(t);return this.each(function(o,a){for(;a&&!(i?i.indexOf(a)>=0:Y.matches(a,t));)a=a!==e&&!r(a)&&a.parentNode;a&&n.indexOf(a)<0&&n.push(a)}),T(n)},parents:function(t){for(var e=[],n=this;n.length>0;)n=T.map(n,function(t){if((t=t.parentNode)&&!r(t)&&e.indexOf(t)<0)return e.push(t),t});return v(e,t)},parent:function(t){return v(N(this.pluck("parentNode")),t)},children:function(t){return v(this.map(function(){return p(this)}),t)},contents:function(){return this.map(function(){return this.contentDocument||D.call(this.childNodes)})},siblings:function(t){return v(this.map(function(t,e){return A.call(p(e.parentNode),function(t){return t!==e})}),t)},empty:function(){return this.each(function(){this.innerHTML=""})},pluck:function(t){return T.map(this,function(e){return e[t]})},show:function(){return this.each(function(){"none"==this.style.display&&(this.style.display=""),"none"==getComputedStyle(this,"").getPropertyValue("display")&&(this.style.display=h(this.nodeName))})},replaceWith:function(t){return this.before(t).remove()},wrap:function(t){var n=e(t);if(this[0]&&!n)var r=T(t).get(0),i=r.parentNode||this.length>1;return this.each(function(e){T(this).wrapAll(n?t.call(this,e):i?r.cloneNode(!0):r)})},wrapAll:function(t){if(this[0]){T(this[0]).before(t=T(t));for(var e;(e=t.children()).length;)t=e.first();T(t).append(this)}return this},wrapInner:function(t){var n=e(t);return this.each(function(e){var r=T(this),i=r.contents(),o=n?t.call(this,e):t;i.length?i.wrapAll(o):r.append(o)})},unwrap:function(){return this.parent().each(function(){T(this).replaceWith(T(this).children())}),this},clone:function(){return this.map(function(){return this.cloneNode(!0)})},hide:function(){return this.css("display","none")},toggle:function(t){return this.each(function(){var e=T(this);(t===E?"none"==e.css("display"):t)?e.show():e.hide()})},prev:function(t){return T(this.pluck("previousElementSibling")).filter(t||"*")},next:function(t){return T(this.pluck("nextElementSibling")).filter(t||"*")},html:function(t){return 0 in arguments?this.each(function(e){var n=this.innerHTML;T(this).empty().append(g(this,t,e,n))}):0 in this?this[0].innerHTML:null},text:function(t){return 0 in arguments?this.each(function(e){var n=g(this,t,e,this.textContent);this.textContent=null==n?"":""+n}):0 in this?this.pluck("textContent").join(""):null},attr:function(t,e){var n;return"string"!=typeof t||1 in arguments?this.each(function(n){if(1===this.nodeType)if(i(t))for(j in t)y(this,j,t[j]);else y(this,t,g(this,e,n,this.getAttribute(t)))}):0 in this&&1==this[0].nodeType&&null!=(n=this[0].getAttribute(t))?n:E},removeAttr:function(t){return this.each(function(){1===this.nodeType&&t.split(" ").forEach(function(t){y(this,t)},this)})},prop:function(t,e){return t=K[t]||t,1 in arguments?this.each(function(n){this[t]=g(this,e,n,this[t])}):this[0]&&this[0][t]},removeProp:function(t){return t=K[t]||t,this.each(function(){delete this[t]})},data:function(t,e){var n="data-"+t.replace(q,"-$1").toLowerCase(),r=1 in arguments?this.attr(n,e):this.attr(n);return null!==r?b(r):E},val:function(t){return 0 in arguments?(null==t&&(t=""),this.each(function(e){this.value=g(this,t,e,this.value)})):this[0]&&(this[0].multiple?T(this[0]).find("option").filter(function(){return this.selected}).pluck("value"):this[0].value)},offset:function(t){if(t)return this.each(function(e){var n=T(this),r=g(this,t,e,n.offset()),i=n.offsetParent().offset(),o={top:r.top-i.top,left:r.left-i.left};"static"==n.css("position")&&(o.position="relative"),n.css(o)});if(!this.length)return null;if(L.documentElement!==this[0]&&!T.contains(L.documentElement,this[0]))return{top:0,left:0};var e=this[0].getBoundingClientRect();return{left:e.left+window.pageXOffset,top:e.top+window.pageYOffset,width:Math.round(e.width),height:Math.round(e.height)}},css:function(e,n){if(arguments.length<2){var r=this[0];if("string"==typeof e){if(!r)return;return r.style[C(e)]||getComputedStyle(r,"").getPropertyValue(e)}if(Q(e)){if(!r)return;var i={},o=getComputedStyle(r,"");return T.each(e,function(t,e){i[e]=r.style[C(e)]||o.getPropertyValue(e)}),i}}var a="";if("string"==t(e))n||0===n?a=c(e)+":"+f(e,n):this.each(function(){this.style.removeProperty(c(e))});else for(j in e)e[j]||0===e[j]?a+=c(j)+":"+f(j,e[j])+";":this.each(function(){this.style.removeProperty(c(j))});return this.each(function(){this.style.cssText+=";"+a})},index:function(t){return t?this.indexOf(T(t)[0]):this.parent().children().indexOf(this[0])},hasClass:function(t){return!!t&&O.some.call(this,function(t){return this.test(x(t))},l(t))},addClass:function(t){return t?this.each(function(e){if("className"in this){S=[];var n=x(this),r=g(this,t,e,n);r.split(/\s+/g).forEach(function(t){T(this).hasClass(t)||S.push(t)},this),S.length&&x(this,n+(n?" ":"")+S.join(" "))}}):this},removeClass:function(t){return this.each(function(e){if("className"in this){if(t===E)return x(this,"");S=x(this),g(this,t,e,S).split(/\s+/g).forEach(function(t){S=S.replace(l(t)," ")}),x(this,S.trim())}})},toggleClass:function(t,e){return t?this.each(function(n){var r=T(this),i=g(this,t,n,x(this));i.split(/\s+/g).forEach(function(t){(e===E?!r.hasClass(t):e)?r.addClass(t):r.removeClass(t)})}):this},scrollTop:function(t){if(this.length){var e="scrollTop"in this[0];return t===E?e?this[0].scrollTop:this[0].pageYOffset:this.each(e?function(){this.scrollTop=t}:function(){this.scrollTo(this.scrollX,t)})}},scrollLeft:function(t){if(this.length){var e="scrollLeft"in this[0];return t===E?e?this[0].scrollLeft:this[0].pageXOffset:this.each(e?function(){this.scrollLeft=t}:function(){this.scrollTo(t,this.scrollY)})}},position:function(){if(this.length){var t=this[0],e=this.offsetParent(),n=this.offset(),r=Z.test(e[0].nodeName)?{top:0,left:0}:e.offset();return n.top-=parseFloat(T(t).css("margin-top"))||0,n.left-=parseFloat(T(t).css("margin-left"))||0,r.top+=parseFloat(T(e[0]).css("border-top-width"))||0,r.left+=parseFloat(T(e[0]).css("border-left-width"))||0,{top:n.top-r.top,left:n.left-r.left}}},offsetParent:function(){return this.map(function(){for(var t=this.offsetParent||L.body;t&&!Z.test(t.nodeName)&&"static"==T(t).css("position");)t=t.offsetParent;return t})}},T.fn.detach=T.fn.remove,["width","height"].forEach(function(t){var e=t.replace(/./,function(t){return t[0].toUpperCase()});T.fn[t]=function(i){var o,a=this[0];return i===E?n(a)?a["inner"+e]:r(a)?a.documentElement["scroll"+e]:(o=this.offset())&&o[t]:this.each(function(e){a=T(this),a.css(t,g(this,i,e,a[t]()))})}}),I.forEach(function(e,n){var r=n%2;T.fn[e]=function(){var e,i,o=T.map(arguments,function(n){var r=[];return e=t(n),"array"==e?(n.forEach(function(t){return t.nodeType!==E?r.push(t):T.zepto.isZ(t)?r=r.concat(t.get()):void(r=r.concat(Y.fragment(t)))}),r):"object"==e||null==n?n:Y.fragment(n)}),a=this.length>1;return o.length<1?this:this.each(function(t,e){i=r?e:e.parentNode,e=0==n?e.nextSibling:1==n?e.firstChild:2==n?e:null;var s=T.contains(L.documentElement,i);o.forEach(function(t){if(a)t=t.cloneNode(!0);else if(!i)return T(t).remove();i.insertBefore(t,e),s&&w(t,function(t){if(!(null==t.nodeName||"SCRIPT"!==t.nodeName.toUpperCase()||t.type&&"text/javascript"!==t.type||t.src)){var e=t.ownerDocument?t.ownerDocument.defaultView:window;e.eval.call(e,t.innerHTML)}})})})},T.fn[r?e+"To":"insert"+(n?"Before":"After")]=function(t){return T(t)[e](this),this}}),Y.Z.prototype=d.prototype=T.fn,Y.uniq=N,Y.deserializeValue=b,T.zepto=Y,T}();!function(t){function e(t){return t._zid||(t._zid=h++)}function n(t,n,o,a){if(n=r(n),n.ns)var s=i(n.ns);return(v[e(t)]||[]).filter(function(t){return t&&(!n.e||t.e==n.e)&&(!n.ns||s.test(t.ns))&&(!o||e(t.fn)===e(o))&&(!a||t.sel==a)})}function r(t){var e=(""+t).split(".");return{e:e[0],ns:e.slice(1).sort().join(" ")}}function i(t){return new RegExp("(?:^| )"+t.replace(" "," .* ?")+"(?: |$)")}function o(t,e){return t.del&&!y&&t.e in x||!!e}function a(t){return b[t]||y&&x[t]||t}function s(n,i,s,u,l,h,p){var d=e(n),m=v[d]||(v[d]=[]);i.split(/\s/).forEach(function(e){if("ready"==e)return t(document).ready(s);var i=r(e);i.fn=s,i.sel=l,i.e in b&&(s=function(e){var n=e.relatedTarget;if(!n||n!==this&&!t.contains(this,n))return i.fn.apply(this,arguments)}),i.del=h;var d=h||s;i.proxy=function(t){if(t=c(t),!t.isImmediatePropagationStopped()){t.data=u;var e=d.apply(n,t._args==f?[t]:[t].concat(t._args));return e===!1&&(t.preventDefault(),t.stopPropagation()),e}},i.i=m.length,m.push(i),"addEventListener"in n&&n.addEventListener(a(i.e),i.proxy,o(i,p))})}function u(t,r,i,s,u){var c=e(t);(r||"").split(/\s/).forEach(function(e){n(t,e,i,s).forEach(function(e){delete v[c][e.i],"removeEventListener"in t&&t.removeEventListener(a(e.e),e.proxy,o(e,u))})})}function c(e,n){return!n&&e.isDefaultPrevented||(n||(n=e),t.each(T,function(t,r){var i=n[t];e[t]=function(){return this[r]=w,i&&i.apply(n,arguments)},e[r]=E}),e.timeStamp||(e.timeStamp=Date.now()),(n.defaultPrevented!==f?n.defaultPrevented:"returnValue"in n?n.returnValue===!1:n.getPreventDefault&&n.getPreventDefault())&&(e.isDefaultPrevented=w)),e}function l(t){var e,n={originalEvent:t};for(e in t)j.test(e)||t[e]===f||(n[e]=t[e]);return c(n,t)}var f,h=1,p=Array.prototype.slice,d=t.isFunction,m=function(t){return"string"==typeof t},v={},g={},y="onfocusin"in window,x={focus:"focusin",blur:"focusout"},b={mouseenter:"mouseover",mouseleave:"mouseout"};g.click=g.mousedown=g.mouseup=g.mousemove="MouseEvents",t.event={add:s,remove:u},t.proxy=function(n,r){var i=2 in arguments&&p.call(arguments,2);if(d(n)){var o=function(){return n.apply(r,i?i.concat(p.call(arguments)):arguments)};return o._zid=e(n),o}if(m(r))return i?(i.unshift(n[r],n),t.proxy.apply(null,i)):t.proxy(n[r],n);throw new TypeError("expected function")},t.fn.bind=function(t,e,n){return this.on(t,e,n)},t.fn.unbind=function(t,e){return this.off(t,e)},t.fn.one=function(t,e,n,r){return this.on(t,e,n,r,1)};var w=function(){return!0},E=function(){return!1},j=/^([A-Z]|returnValue$|layer[XY]$|webkitMovement[XY]$)/,T={preventDefault:"isDefaultPrevented",stopImmediatePropagation:"isImmediatePropagationStopped",stopPropagation:"isPropagationStopped"};t.fn.delegate=function(t,e,n){return this.on(e,t,n)},t.fn.undelegate=function(t,e,n){return this.off(e,t,n)},t.fn.live=function(e,n){return t(document.body).delegate(this.selector,e,n),this},t.fn.die=function(e,n){return t(document.body).undelegate(this.selector,e,n),this},t.fn.on=function(e,n,r,i,o){var a,c,h=this;return e&&!m(e)?(t.each(e,function(t,e){h.on(t,n,r,e,o)}),h):(m(n)||d(i)||i===!1||(i=r,r=n,n=f),i!==f&&r!==!1||(i=r,r=f),i===!1&&(i=E),h.each(function(f,h){o&&(a=function(t){return u(h,t.type,i),i.apply(this,arguments)}),n&&(c=function(e){var r,o=t(e.target).closest(n,h).get(0);if(o&&o!==h)return r=t.extend(l(e),{currentTarget:o,liveFired:h}),(a||i).apply(o,[r].concat(p.call(arguments,1)))}),s(h,e,i,r,n,c||a)}))},t.fn.off=function(e,n,r){var i=this;return e&&!m(e)?(t.each(e,function(t,e){i.off(t,n,e)}),i):(m(n)||d(r)||r===!1||(r=n,n=f),r===!1&&(r=E),i.each(function(){u(this,e,r,n)}))},t.fn.trigger=function(e,n){return e=m(e)||t.isPlainObject(e)?t.Event(e):c(e),e._args=n,this.each(function(){e.type in x&&"function"==typeof this[e.type]?this[e.type]():"dispatchEvent"in this?this.dispatchEvent(e):t(this).triggerHandler(e,n)})},t.fn.triggerHandler=function(e,r){var i,o;return this.each(function(a,s){i=l(m(e)?t.Event(e):e),i._args=r,i.target=s,t.each(n(s,e.type||e),function(t,e){if(o=e.proxy(i),i.isImmediatePropagationStopped())return!1})}),o},"focusin focusout focus blur load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select keydown keypress keyup error".split(" ").forEach(function(e){t.fn[e]=function(t){return 0 in arguments?this.bind(e,t):this.trigger(e)}}),t.Event=function(t,e){m(t)||(e=t,t=e.type);var n=document.createEvent(g[t]||"Events"),r=!0;if(e)for(var i in e)"bubbles"==i?r=!!e[i]:n[i]=e[i];return n.initEvent(t,r,!0),c(n)}}(e),function(t){function e(e,n,r){var i=t.Event(n);return t(e).trigger(i,r),!i.isDefaultPrevented()}function n(t,n,r,i){if(t.global)return e(n||x,r,i)}function r(e){e.global&&0===t.active++&&n(e,null,"ajaxStart")}function i(e){e.global&&!--t.active&&n(e,null,"ajaxStop")}function o(t,e){var r=e.context;return e.beforeSend.call(r,t,e)!==!1&&n(e,r,"ajaxBeforeSend",[t,e])!==!1&&void n(e,r,"ajaxSend",[t,e])}function a(t,e,r,i){var o=r.context,a="success";r.success.call(o,t,a,e),i&&i.resolveWith(o,[t,a,e]),n(r,o,"ajaxSuccess",[e,r,t]),u(a,e,r)}function s(t,e,r,i,o){var a=i.context;i.error.call(a,r,e,t),o&&o.rejectWith(a,[r,e,t]),n(i,a,"ajaxError",[r,i,t||e]),u(e,r,i)}function u(t,e,r){var o=r.context;r.complete.call(o,e,t),n(r,o,"ajaxComplete",[e,r]),i(r)}function c(t,e,n){if(n.dataFilter==l)return t;var r=n.context;return n.dataFilter.call(r,t,e)}function l(){}function f(t){return t&&(t=t.split(";",2)[0]),t&&(t==T?"html":t==j?"json":w.test(t)?"script":E.test(t)&&"xml")||"text"}function h(t,e){return""==e?t:(t+"&"+e).replace(/[&?]{1,2}/,"?")}function p(e){e.processData&&e.data&&"string"!=t.type(e.data)&&(e.data=t.param(e.data,e.traditional)),!e.data||e.type&&"GET"!=e.type.toUpperCase()&&"jsonp"!=e.dataType||(e.url=h(e.url,e.data),e.data=void 0)}function d(e,n,r,i){return t.isFunction(n)&&(i=r,r=n,n=void 0),t.isFunction(r)||(i=r,r=void 0),{url:e,data:n,success:r,dataType:i}}function m(e,n,r,i){var o,a=t.isArray(n),s=t.isPlainObject(n);t.each(n,function(n,u){o=t.type(u),i&&(n=r?i:i+"["+(s||"object"==o||"array"==o?n:"")+"]"),!i&&a?e.add(u.name,u.value):"array"==o||!r&&"object"==o?m(e,u,r,n):e.add(n,u)})}var v,g,y=+new Date,x=window.document,b=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,w=/^(?:text|application)\/javascript/i,E=/^(?:text|application)\/xml/i,j="application/json",T="text/html",S=/^\s*$/,C=x.createElement("a");C.href=window.location.href,t.active=0,t.ajaxJSONP=function(e,n){if(!("type"in e))return t.ajax(e);var r,i,u=e.jsonpCallback,c=(t.isFunction(u)?u():u)||"Zepto"+y++,l=x.createElement("script"),f=window[c],h=function(e){t(l).triggerHandler("error",e||"abort")},p={abort:h};return n&&n.promise(p),t(l).on("load error",function(o,u){clearTimeout(i),t(l).off().remove(),"error"!=o.type&&r?a(r[0],p,e,n):s(null,u||"error",p,e,n),window[c]=f,r&&t.isFunction(f)&&f(r[0]),f=r=void 0}),o(p,e)===!1?(h("abort"),p):(window[c]=function(){r=arguments},l.src=e.url.replace(/\?(.+)=\?/,"?$1="+c),x.head.appendChild(l),e.timeout>0&&(i=setTimeout(function(){h("timeout")},e.timeout)),p)},t.ajaxSettings={type:"GET",beforeSend:l,success:l,error:l,complete:l,context:null,global:!0,xhr:function(){return new window.XMLHttpRequest},accepts:{script:"text/javascript, application/javascript, application/x-javascript",json:j,xml:"application/xml, text/xml",html:T,text:"text/plain"},crossDomain:!1,timeout:0,processData:!0,cache:!0,dataFilter:l},t.ajax=function(e){var n,i,u=t.extend({},e||{}),d=t.Deferred&&t.Deferred();for(v in t.ajaxSettings)void 0===u[v]&&(u[v]=t.ajaxSettings[v]);r(u),u.crossDomain||(n=x.createElement("a"),n.href=u.url,n.href=n.href,u.crossDomain=C.protocol+"//"+C.host!=n.protocol+"//"+n.host),u.url||(u.url=window.location.toString()),(i=u.url.indexOf("#"))>-1&&(u.url=u.url.slice(0,i)),p(u);var m=u.dataType,y=/\?.+=\?/.test(u.url);if(y&&(m="jsonp"),u.cache!==!1&&(e&&e.cache===!0||"script"!=m&&"jsonp"!=m)||(u.url=h(u.url,"_="+Date.now())),"jsonp"==m)return y||(u.url=h(u.url,u.jsonp?u.jsonp+"=?":u.jsonp===!1?"":"callback=?")),t.ajaxJSONP(u,d);var b,w=u.accepts[m],E={},j=function(t,e){E[t.toLowerCase()]=[t,e]},T=/^([\w-]+:)\/\//.test(u.url)?RegExp.$1:window.location.protocol,N=u.xhr(),O=N.setRequestHeader;if(d&&d.promise(N),u.crossDomain||j("X-Requested-With","XMLHttpRequest"),j("Accept",w||"*/*"),(w=u.mimeType||w)&&(w.indexOf(",")>-1&&(w=w.split(",",2)[0]),N.overrideMimeType&&N.overrideMimeType(w)),(u.contentType||u.contentType!==!1&&u.data&&"GET"!=u.type.toUpperCase())&&j("Content-Type",u.contentType||"application/x-www-form-urlencoded"),u.headers)for(g in u.headers)j(g,u.headers[g]);if(N.setRequestHeader=j,N.onreadystatechange=function(){if(4==N.readyState){N.onreadystatechange=l,clearTimeout(b);var e,n=!1;if(N.status>=200&&N.status<300||304==N.status||0==N.status&&"file:"==T){if(m=m||f(u.mimeType||N.getResponseHeader("content-type")),"arraybuffer"==N.responseType||"blob"==N.responseType)e=N.response;else{e=N.responseText;try{e=c(e,m,u),"script"==m?(0,eval)(e):"xml"==m?e=N.responseXML:"json"==m&&(e=S.test(e)?null:t.parseJSON(e))}catch(r){n=r}if(n)return s(n,"parsererror",N,u,d)}a(e,N,u,d)}else s(N.statusText||null,N.status?"error":"abort",N,u,d)}},o(N,u)===!1)return N.abort(),s(null,"abort",N,u,d),N;var P=!("async"in u)||u.async;if(N.open(u.type,u.url,P,u.username,u.password),u.xhrFields)for(g in u.xhrFields)N[g]=u.xhrFields[g];for(g in E)O.apply(N,E[g]);return u.timeout>0&&(b=setTimeout(function(){N.onreadystatechange=l,N.abort(),s(null,"timeout",N,u,d)},u.timeout)),N.send(u.data?u.data:null),N},t.get=function(){return t.ajax(d.apply(null,arguments))},t.post=function(){var e=d.apply(null,arguments);return e.type="POST",t.ajax(e)},t.getJSON=function(){var e=d.apply(null,arguments);return e.dataType="json",t.ajax(e)},t.fn.load=function(e,n,r){if(!this.length)return this;var i,o=this,a=e.split(/\s/),s=d(e,n,r),u=s.success;return a.length>1&&(s.url=a[0],i=a[1]),s.success=function(e){o.html(i?t("<div>").html(e.replace(b,"")).find(i):e),u&&u.apply(o,arguments)},t.ajax(s),this};var N=encodeURIComponent;t.param=function(e,n){var r=[];return r.add=function(e,n){t.isFunction(n)&&(n=n()),null==n&&(n=""),this.push(N(e)+"="+N(n))},m(r,e,n),r.join("&").replace(/%20/g,"+")}}(e),function(t){t.fn.serializeArray=function(){var e,n,r=[],i=function(t){return t.forEach?t.forEach(i):void r.push({name:e,value:t})};return this[0]&&t.each(this[0].elements,function(r,o){n=o.type,e=o.name,e&&"fieldset"!=o.nodeName.toLowerCase()&&!o.disabled&&"submit"!=n&&"reset"!=n&&"button"!=n&&"file"!=n&&("radio"!=n&&"checkbox"!=n||o.checked)&&i(t(o).val())}),r},t.fn.serialize=function(){var t=[];return this.serializeArray().forEach(function(e){t.push(encodeURIComponent(e.name)+"="+encodeURIComponent(e.value))}),t.join("&")},t.fn.submit=function(e){if(0 in arguments)this.bind("submit",e);else if(this.length){var n=t.Event("submit");this.eq(0).trigger(n),n.isDefaultPrevented()||this.get(0).submit()}return this}}(e),function(){try{getComputedStyle(void 0)}catch(t){var e=getComputedStyle;window.getComputedStyle=function(t,n){try{return e(t,n)}catch(r){return null}}}}(),t("zepto",e)});layui.define(["layer-mobile","zepto"],function(e){"use strict";var t=layui.zepto,a=layui["layer-mobile"],i=(layui.device(),"layui-upload-enter"),n="layui-upload-iframe",r={icon:2,shift:6},o={file:"文件",video:"视频",audio:"音频"};a.msg=function(e){return a.open({content:e||"",skin:"msg",time:2})};var s=function(e){this.options=e};s.prototype.init=function(){var e=this,a=e.options,r=t("body"),s=t(a.elem||".layui-upload-file"),u=t('<iframe id="'+n+'" class="'+n+'" name="'+n+'"></iframe>');return t("#"+n)[0]||r.append(u),s.each(function(r,s){s=t(s);var u='<form target="'+n+'" method="'+(a.method||"post")+'" key="set-mine" enctype="multipart/form-data" action="'+(a.url||"")+'"></form>',l=s.attr("lay-type")||a.type;a.unwrap||(u='<div class="layui-box layui-upload-button">'+u+'<span class="layui-upload-icon"><i class="layui-icon"></i>'+(s.attr("lay-title")||a.title||"上传"+(o[l]||"图片"))+"</span></div>"),u=t(u),a.unwrap||u.on("dragover",function(e){e.preventDefault(),t(this).addClass(i)}).on("dragleave",function(){t(this).removeClass(i)}).on("drop",function(){t(this).removeClass(i)}),s.parent("form").attr("target")===n&&(a.unwrap?s.unwrap():(s.parent().next().remove(),s.unwrap().unwrap())),s.wrap(u),s.off("change").on("change",function(){e.action(this,l)})})},s.prototype.action=function(e,i){var o=this,s=o.options,u=e.value,l=t(e),p=l.attr("lay-ext")||s.ext||"";if(u){switch(i){case"file":if(p&&!RegExp("\\w\\.("+p+")$","i").test(escape(u)))return a.msg("不支持该文件格式",r),e.value="";break;case"video":if(!RegExp("\\w\\.("+(p||"avi|mp4|wma|rmvb|rm|flash|3gp|flv")+")$","i").test(escape(u)))return a.msg("不支持该视频格式",r),e.value="";break;case"audio":if(!RegExp("\\w\\.("+(p||"mp3|wav|mid")+")$","i").test(escape(u)))return a.msg("不支持该音频格式",r),e.value="";break;default:if(!RegExp("\\w\\.("+(p||"jpg|png|gif|bmp|jpeg")+")$","i").test(escape(u)))return a.msg("不支持该图片格式",r),e.value=""}s.before&&s.before(e),l.parent().submit();var c=t("#"+n),f=setInterval(function(){var t;try{t=c.contents().find("body").text()}catch(i){a.msg("上传接口存在跨域",r),clearInterval(f)}if(t){clearInterval(f),c.contents().find("body").html("");try{t=JSON.parse(t)}catch(i){return t={},a.msg("请对上传接口返回JSON字符",r)}"function"==typeof s.success&&s.success(t,e)}},30);e.value=""}},e("upload-mobile",function(e){var t=new s(e=e||{});t.init()})});layui.define(function(i){i("layim-mobile",layui.v)});layui["layui.mobile"]||layui.config({base:layui.cache.dir+"lay/modules/mobile/"}).extend({"layer-mobile":"layer-mobile",zepto:"zepto","upload-mobile":"upload-mobile","layim-mobile":"layim-mobile"}),layui.define(["layer-mobile","zepto","layim-mobile"],function(l){l("mobile",{layer:layui["layer-mobile"],layim:layui["layim-mobile"]})});
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/rate.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/rate.js
new file mode 100644
index 0000000..762fb3a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/rate.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var a=layui.jquery,i={config:{},index:layui.rate?layui.rate.index+1e4:0,set:function(e){var i=this;return i.config=a.extend({},i.config,e),i},on:function(e,a){return layui.onevent.call(this,n,e,a)}},l=function(){var e=this,a=e.config;return{setvalue:function(a){e.setvalue.call(e,a)},config:a}},n="rate",t="layui-rate",o="layui-icon-rate",s="layui-icon-rate-solid",u="layui-icon-rate-half",r="layui-icon-rate-solid layui-icon-rate-half",c="layui-icon-rate-solid layui-icon-rate",f="layui-icon-rate layui-icon-rate-half",v=function(e){var l=this;l.index=++i.index,l.config=a.extend({},l.config,i.config,e),l.render()};v.prototype.config={length:5,text:!1,readonly:!1,half:!1,value:0,theme:""},v.prototype.render=function(){var e=this,i=e.config,l=i.theme?'style="color: '+i.theme+';"':"";i.elem=a(i.elem),parseInt(i.value)!==i.value&&(i.half||(i.value=Math.ceil(i.value)-i.value<.5?Math.ceil(i.value):Math.floor(i.value)));for(var n='<ul class="layui-rate" '+(i.readonly?"readonly":"")+">",u=1;u<=i.length;u++){var r='<li class="layui-inline"><i class="layui-icon '+(u>Math.floor(i.value)?o:s)+'" '+l+"></i></li>";i.half&&parseInt(i.value)!==i.value&&u==Math.ceil(i.value)?n=n+'<li><i class="layui-icon layui-icon-rate-half" '+l+"></i></li>":n+=r}n+="</ul>"+(i.text?'<span class="layui-inline">'+i.value+"星":"")+"</span>";var c=i.elem,f=c.next("."+t);f[0]&&f.remove(),e.elemTemp=a(n),i.span=e.elemTemp.next("span"),i.setText&&i.setText(i.value),c.html(e.elemTemp),c.addClass("layui-inline"),i.readonly||e.action()},v.prototype.setvalue=function(e){var a=this,i=a.config;i.value=e,a.render()},v.prototype.action=function(){var e=this,i=e.config,l=e.elemTemp,n=l.find("i").width();l.children("li").each(function(e){var t=e+1,v=a(this);v.on("click",function(e){if(i.value=t,i.half){var o=e.pageX-a(this).offset().left;o<=n/2&&(i.value=i.value-.5)}i.text&&l.next("span").text(i.value+"星"),i.choose&&i.choose(i.value),i.setText&&i.setText(i.value)}),v.on("mousemove",function(e){if(l.find("i").each(function(){a(this).addClass(o).removeClass(r)}),l.find("i:lt("+t+")").each(function(){a(this).addClass(s).removeClass(f)}),i.half){var c=e.pageX-a(this).offset().left;c<=n/2&&v.children("i").addClass(u).removeClass(s)}}),v.on("mouseleave",function(){l.find("i").each(function(){a(this).addClass(o).removeClass(r)}),l.find("i:lt("+Math.floor(i.value)+")").each(function(){a(this).addClass(s).removeClass(f)}),i.half&&parseInt(i.value)!==i.value&&l.children("li:eq("+Math.floor(i.value)+")").children("i").addClass(u).removeClass(c)})})},v.prototype.events=function(){var e=this;e.config},i.render=function(e){var a=new v(e);return l.call(a)},e(n,i)});
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/slider.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/slider.js
new file mode 100644
index 0000000..446378d
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/slider.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var i=layui.jquery,t={config:{},index:layui.slider?layui.slider.index+1e4:0,set:function(e){var t=this;return t.config=i.extend({},t.config,e),t},on:function(e,i){return layui.onevent.call(this,n,e,i)}},a=function(){var e=this,i=e.config;return{setValue:function(i,t){return e.slide("set",i,t||0)},config:i}},n="slider",l="layui-disabled",s="layui-slider",r="layui-slider-bar",o="layui-slider-wrap",u="layui-slider-wrap-btn",d="layui-slider-tips",v="layui-slider-input",c="layui-slider-input-txt",m="layui-slider-input-btn",p="layui-slider-hover",f=function(e){var a=this;a.index=++t.index,a.config=i.extend({},a.config,t.config,e),a.render()};f.prototype.config={type:"default",min:0,max:100,value:0,step:1,showstep:!1,tips:!0,input:!1,range:!1,height:200,disabled:!1,theme:"#009688"},f.prototype.render=function(){var e=this,t=e.config;if(t.step<1&&(t.step=1),t.max<t.min&&(t.max=t.min+t.step),t.range){t.value="object"==typeof t.value?t.value:[t.min,t.value];var a=Math.min(t.value[0],t.value[1]),n=Math.max(t.value[0],t.value[1]);t.value[0]=a>t.min?a:t.min,t.value[1]=n>t.min?n:t.min,t.value[0]=t.value[0]>t.max?t.max:t.value[0],t.value[1]=t.value[1]>t.max?t.max:t.value[1];var r=Math.floor((t.value[0]-t.min)/(t.max-t.min)*100),v=Math.floor((t.value[1]-t.min)/(t.max-t.min)*100),m=v-r+"%";r+="%",v+="%"}else{"object"==typeof t.value&&(t.value=Math.min.apply(null,t.value)),t.value<t.min&&(t.value=t.min),t.value>t.max&&(t.value=t.max);var m=Math.floor((t.value-t.min)/(t.max-t.min)*100)+"%"}var p=t.disabled?"#c2c2c2":t.theme,f='<div class="layui-slider '+("vertical"===t.type?"layui-slider-vertical":"")+'">'+(t.tips?'<div class="layui-slider-tips"></div>':"")+'<div class="layui-slider-bar" style="background:'+p+"; "+("vertical"===t.type?"height":"width")+":"+m+";"+("vertical"===t.type?"bottom":"left")+":"+(r||0)+';"></div><div class="layui-slider-wrap" style="'+("vertical"===t.type?"bottom":"left")+":"+(r||m)+';"><div class="layui-slider-wrap-btn" style="border: 2px solid '+p+';"></div></div>'+(t.range?'<div class="layui-slider-wrap" style="'+("vertical"===t.type?"bottom":"left")+":"+v+';"><div class="layui-slider-wrap-btn" style="border: 2px solid '+p+';"></div></div>':"")+"</div>",h=i(t.elem),y=h.next("."+s);if(y[0]&&y.remove(),e.elemTemp=i(f),t.range?(e.elemTemp.find("."+o).eq(0).data("value",t.value[0]),e.elemTemp.find("."+o).eq(1).data("value",t.value[1])):e.elemTemp.find("."+o).data("value",t.value),h.html(e.elemTemp),"vertical"===t.type&&e.elemTemp.height(t.height+"px"),t.showstep){for(var g=(t.max-t.min)/t.step,b="",x=1;x<g+1;x++){var T=100*x/g;T<100&&(b+='<div class="layui-slider-step" style="'+("vertical"===t.type?"bottom":"left")+":"+T+'%"></div>')}e.elemTemp.append(b)}if(t.input&&!t.range){var w=i('<div class="layui-slider-input layui-input"><div class="layui-slider-input-txt"><input type="text" class="layui-input"></div><div class="layui-slider-input-btn"><i class="layui-icon layui-icon-up"></i><i class="layui-icon layui-icon-down"></i></div></div>');h.css("position","relative"),h.append(w),h.find("."+c).children("input").val(t.value),"vertical"===t.type?w.css({left:0,top:-48}):e.elemTemp.css("margin-right",w.outerWidth()+15)}t.disabled?(e.elemTemp.addClass(l),e.elemTemp.find("."+u).addClass(l)):e.slide(),e.elemTemp.find("."+u).on("mouseover",function(){var a="vertical"===t.type?t.height:e.elemTemp[0].offsetWidth,n=e.elemTemp.find("."+o),l="vertical"===t.type?a-i(this).parent()[0].offsetTop-n.height():i(this).parent()[0].offsetLeft,s=l/a*100,r=i(this).parent().data("value"),u=t.setTips?t.setTips(r):r;e.elemTemp.find("."+d).html(u),"vertical"===t.type?e.elemTemp.find("."+d).css({bottom:s+"%","margin-bottom":"20px",display:"inline-block"}):e.elemTemp.find("."+d).css({left:s+"%",display:"inline-block"})}).on("mouseout",function(){e.elemTemp.find("."+d).css("display","none")})},f.prototype.slide=function(e,t,a){var n=this,l=n.config,s=n.elemTemp,f=function(){return"vertical"===l.type?l.height:s[0].offsetWidth},h=s.find("."+o),y=s.next("."+v),g=y.children("."+c).children("input").val(),b=100/((l.max-l.min)/Math.ceil(l.step)),x=function(e,i){e=Math.ceil(e)*b>100?Math.ceil(e)*b:Math.round(e)*b,e=e>100?100:e,h.eq(i).css("vertical"===l.type?"bottom":"left",e+"%");var t=T(h[0].offsetLeft),a=l.range?T(h[1].offsetLeft):0;"vertical"===l.type?(s.find("."+d).css({bottom:e+"%","margin-bottom":"20px"}),t=T(f()-h[0].offsetTop-h.height()),a=l.range?T(f()-h[1].offsetTop-h.height()):0):s.find("."+d).css("left",e+"%"),t=t>100?100:t,a=a>100?100:a;var n=Math.min(t,a),o=Math.abs(t-a);"vertical"===l.type?s.find("."+r).css({height:o+"%",bottom:n+"%"}):s.find("."+r).css({width:o+"%",left:n+"%"});var u=l.min+Math.round((l.max-l.min)*e/100);if(g=u,y.children("."+c).children("input").val(g),h.eq(i).data("value",u),u=l.setTips?l.setTips(u):u,s.find("."+d).html(u),l.range){var v=[h.eq(0).data("value"),h.eq(1).data("value")];v[0]>v[1]&&v.reverse()}l.change&&l.change(l.range?v:u)},T=function(e){var i=e/f()*100/b,t=Math.round(i)*b;return e==f()&&(t=Math.ceil(i)*b),t},w=i(['<div class="layui-auxiliar-moving" id="LAY-slider-moving"></div'].join("")),M=function(e,t){var a=function(){t&&t(),w.remove()};i("#LAY-slider-moving")[0]||i("body").append(w),w.on("mousemove",e),w.on("mouseup",a).on("mouseleave",a)};if("set"===e)return x(t,a);s.find("."+u).each(function(e){var t=i(this);t.on("mousedown",function(i){i=i||window.event;var a=t.parent()[0].offsetLeft,n=i.clientX;"vertical"===l.type&&(a=f()-t.parent()[0].offsetTop-h.height(),n=i.clientY);var r=function(i){i=i||window.event;var r=a+("vertical"===l.type?n-i.clientY:i.clientX-n);r<0&&(r=0),r>f()&&(r=f());var o=r/f()*100/b;x(o,e),t.addClass(p),s.find("."+d).show(),i.preventDefault()},o=function(){t.removeClass(p),s.find("."+d).hide()};M(r,o)})}),s.on("click",function(e){var t=i("."+u);if(!t.is(event.target)&&0===t.has(event.target).length&&t.length){var a,n="vertical"===l.type?f()-e.clientY+i(this).offset().top:e.clientX-i(this).offset().left;n<0&&(n=0),n>f()&&(n=f());var s=n/f()*100/b;a=l.range?"vertical"===l.type?Math.abs(n-parseInt(i(h[0]).css("bottom")))>Math.abs(n-parseInt(i(h[1]).css("bottom")))?1:0:Math.abs(n-h[0].offsetLeft)>Math.abs(n-h[1].offsetLeft)?1:0:0,x(s,a),e.preventDefault()}}),y.hover(function(){var e=i(this);e.children("."+m).fadeIn("fast")},function(){var e=i(this);e.children("."+m).fadeOut("fast")}),y.children("."+m).children("i").each(function(e){i(this).on("click",function(){g=1==e?g-l.step<l.min?l.min:Number(g)-l.step:Number(g)+l.step>l.max?l.max:Number(g)+l.step;var i=(g-l.min)/(l.max-l.min)*100/b;x(i,0)})});var q=function(){var e=this.value;e=isNaN(e)?0:e,e=e<l.min?l.min:e,e=e>l.max?l.max:e,this.value=e;var i=(e-l.min)/(l.max-l.min)*100/b;x(i,0)};y.children("."+c).children("input").on("keydown",function(e){13===e.keyCode&&(e.preventDefault(),q.call(this))}).on("change",q)},f.prototype.events=function(){var e=this;e.config},t.render=function(e){var i=new f(e);return a.call(i)},e(n,t)});
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/table.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/table.js
new file mode 100644
index 0000000..e9217db
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/table.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define(["laytpl","laypage","layer","form","util"],function(e){"use strict";var t=layui.$,i=layui.laytpl,a=layui.laypage,l=layui.layer,n=layui.form,o=(layui.util,layui.hint()),r=layui.device(),d={config:{checkName:"LAY_CHECKED",indexName:"LAY_TABLE_INDEX"},cache:{},index:layui.table?layui.table.index+1e4:0,set:function(e){var i=this;return i.config=t.extend({},i.config,e),i},on:function(e,t){return layui.onevent.call(this,u,e,t)}},c=function(){var e=this,t=e.config,i=t.id||t.index;return i&&(c.that[i]=e,c.config[i]=t),{reload:function(t){e.reload.call(e,t)},setColsWidth:function(){e.setColsWidth.call(e)},resize:function(){e.resize.call(e)},config:t}},s=function(e){var t=c.config[e];return t||o.error("The ID option was not found in the table instance"),t||null},u="table",h=".layui-table",y="layui-hide",f="layui-none",p="layui-table-view",v=".layui-table-tool",m=".layui-table-box",g=".layui-table-init",b=".layui-table-header",x=".layui-table-body",k=".layui-table-main",C=".layui-table-fixed",w=".layui-table-fixed-l",T=".layui-table-fixed-r",A=".layui-table-total",L=".layui-table-page",S=".layui-table-sort",N="layui-table-edit",W="layui-table-hover",_=function(e){var t='{{#if(item2.colspan){}} colspan="{{item2.colspan}}"{{#} if(item2.rowspan){}} rowspan="{{item2.rowspan}}"{{#}}}';return e=e||{},['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<thead>","{{# layui.each(d.data.cols, function(i1, item1){ }}","<tr>","{{# layui.each(item1, function(i2, item2){ }}",'{{# if(item2.fixed && item2.fixed !== "right"){ left = true; } }}','{{# if(item2.fixed === "right"){ right = true; } }}',function(){return e.fixed&&"right"!==e.fixed?'{{# if(item2.fixed && item2.fixed !== "right"){ }}':"right"===e.fixed?'{{# if(item2.fixed === "right"){ }}':""}(),"{{# var isSort = !(item2.colGroup) && item2.sort; }}",'<th data-field="{{ item2.field||i2 }}" data-key="{{d.index}}-{{i1}}-{{i2}}" {{# if( item2.parentKey){ }}data-parentkey="{{ item2.parentKey }}"{{# } }} {{# if(item2.minWidth){ }}data-minwidth="{{item2.minWidth}}"{{# } }} '+t+' {{# if(item2.unresize || item2.colGroup){ }}data-unresize="true"{{# } }} class="{{# if(item2.hide){ }}layui-hide{{# } }}{{# if(isSort){ }} layui-unselect{{# } }}{{# if(!item2.field){ }} layui-table-col-special{{# } }}">','<div class="layui-table-cell laytable-cell-',"{{# if(item2.colGroup){ }}","group","{{# } else { }}","{{d.index}}-{{i1}}-{{i2}}",'{{# if(item2.type !== "normal"){ }}'," laytable-cell-{{ item2.type }}","{{# } }}","{{# } }}",'" {{#if(item2.align){}}align="{{item2.align}}"{{#}}}>','{{# if(item2.type === "checkbox"){ }}','<input type="checkbox" name="layTableCheckbox" lay-skin="primary" lay-filter="layTableAllChoose" {{# if(item2[d.data.checkName]){ }}checked{{# }; }}>',"{{# } else { }}",'<span>{{item2.title||""}}</span>',"{{# if(isSort){ }}",'<span class="layui-table-sort layui-inline"><i class="layui-edge layui-table-sort-asc" title="升序"></i><i class="layui-edge layui-table-sort-desc" title="降序"></i></span>',"{{# } }}","{{# } }}","</div>","</th>",e.fixed?"{{# }; }}":"","{{# }); }}","</tr>","{{# }); }}","</thead>","</table>"].join("")},E=['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<tbody></tbody>","</table>"].join(""),z=['<div class="layui-form layui-border-box {{d.VIEW_CLASS}}" lay-filter="LAY-table-{{d.index}}" lay-id="{{ d.data.id }}" style="{{# if(d.data.width){ }}width:{{d.data.width}}px;{{# } }} {{# if(d.data.height){ }}height:{{d.data.height}}px;{{# } }}">',"{{# if(d.data.toolbar){ }}",'<div class="layui-table-tool">','<div class="layui-table-tool-temp"></div>','<div class="layui-table-tool-self"></div>',"</div>","{{# } }}",'<div class="layui-table-box">',"{{# if(d.data.loading){ }}",'<div class="layui-table-init" style="background-color: #fff;">','<i class="layui-icon layui-icon-loading layui-icon"></i>',"</div>","{{# } }}","{{# var left, right; }}",'<div class="layui-table-header">',_(),"</div>",'<div class="layui-table-body layui-table-main">',E,"</div>","{{# if(left){ }}",'<div class="layui-table-fixed layui-table-fixed-l">','<div class="layui-table-header">',_({fixed:!0}),"</div>",'<div class="layui-table-body">',E,"</div>","</div>","{{# }; }}","{{# if(right){ }}",'<div class="layui-table-fixed layui-table-fixed-r">','<div class="layui-table-header">',_({fixed:"right"}),'<div class="layui-table-mend"></div>',"</div>",'<div class="layui-table-body">',E,"</div>","</div>","{{# }; }}","</div>","{{# if(d.data.totalRow){ }}",'<div class="layui-table-total">','<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>','<tbody><tr><td><div class="layui-table-cell" style="visibility: hidden;">Total</div></td></tr></tbody>',"</table>","</div>","{{# } }}","{{# if(d.data.page){ }}",'<div class="layui-table-page">','<div id="layui-table-page{{d.index}}"></div>',"</div>","{{# } }}","<style>","{{# layui.each(d.data.cols, function(i1, item1){","layui.each(item1, function(i2, item2){ }}",".laytable-cell-{{d.index}}-{{i1}}-{{i2}}{ ","{{# if(item2.width){ }}","width: {{item2.width}}px;","{{# } }}"," }","{{# });","}); }}","</style>","</div>"].join(""),H=t(window),R=t(document),F=function(e){var i=this;i.index=++d.index,i.config=t.extend({},i.config,d.config,e),i.render()};F.prototype.config={limit:10,loading:!0,cellMinWidth:60,defaultToolbar:["filter","exports","print"],autoSort:!0,text:{none:"无数据"}},F.prototype.render=function(){var e=this,a=e.config;if(a.elem=t(a.elem),a.where=a.where||{},a.id=a.id||a.elem.attr("id")||e.index,a.request=t.extend({pageName:"page",limitName:"limit"},a.request),a.response=t.extend({statusName:"code",statusCode:0,msgName:"msg",dataName:"data",countName:"count"},a.response),"object"==typeof a.page&&(a.limit=a.page.limit||a.limit,a.limits=a.page.limits||a.limits,e.page=a.page.curr=a.page.curr||1,delete a.page.elem,delete a.page.jump),!a.elem[0])return e;a.height&&/^full-\d+$/.test(a.height)&&(e.fullHeightGap=a.height.split("-")[1],a.height=H.height()-e.fullHeightGap),e.setInit();var l=a.elem,n=l.next("."+p),o=e.elem=t(i(z).render({VIEW_CLASS:p,data:a,index:e.index}));if(a.index=e.index,n[0]&&n.remove(),l.after(o),e.layTool=o.find(v),e.layBox=o.find(m),e.layHeader=o.find(b),e.layMain=o.find(k),e.layBody=o.find(x),e.layFixed=o.find(C),e.layFixLeft=o.find(w),e.layFixRight=o.find(T),e.layTotal=o.find(A),e.layPage=o.find(L),e.renderToolbar(),e.fullSize(),a.cols.length>1){var r=e.layFixed.find(b).find("th");r.height(e.layHeader.height()-1-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom")))}e.pullData(e.page),e.events()},F.prototype.initOpts=function(e){var t=this,i=(t.config,{checkbox:48,radio:48,space:15,numbers:40});e.checkbox&&(e.type="checkbox"),e.space&&(e.type="space"),e.type||(e.type="normal"),"normal"!==e.type&&(e.unresize=!0,e.width=e.width||i[e.type])},F.prototype.setInit=function(e){var t=this,i=t.config;return i.clientWidth=i.width||function(){var e=function(t){var a,l;t=t||i.elem.parent(),a=t.width();try{l="none"===t.css("display")}catch(n){}return!t[0]||a&&!l?a:e(t.parent())};return e()}(),"width"===e?i.clientWidth:void layui.each(i.cols,function(e,a){layui.each(a,function(l,n){if(!n)return void a.splice(l,1);if(n.key=e+"-"+l,n.hide=n.hide||!1,n.colGroup||n.colspan>1){var o=0;layui.each(i.cols[e+1],function(t,i){i.HAS_PARENT||o>1&&o==n.colspan||(i.HAS_PARENT=!0,i.parentKey=e+"-"+l,o+=parseInt(i.colspan>1?i.colspan:1))}),n.colGroup=!0}t.initOpts(n)})})},F.prototype.renderToolbar=function(){var e=this,a=e.config,l=['<div class="layui-inline" lay-event="add"><i class="layui-icon layui-icon-add-1"></i></div>','<div class="layui-inline" lay-event="update"><i class="layui-icon layui-icon-edit"></i></div>','<div class="layui-inline" lay-event="delete"><i class="layui-icon layui-icon-delete"></i></div>'].join(""),n=e.layTool.find(".layui-table-tool-temp");if("default"===a.toolbar)n.html(l);else if("string"==typeof a.toolbar){var o=t(a.toolbar).html()||"";o&&n.html(i(o).render(a))}var r={filter:{title:"筛选列",layEvent:"LAYTABLE_COLS",icon:"layui-icon-cols"},exports:{title:"导出",layEvent:"LAYTABLE_EXPORT",icon:"layui-icon-export"},print:{title:"打印",layEvent:"LAYTABLE_PRINT",icon:"layui-icon-print"}},d=[];"object"==typeof a.defaultToolbar&&layui.each(a.defaultToolbar,function(e,t){var i=r[t];i&&d.push('<div class="layui-inline" title="'+i.title+'" lay-event="'+i.layEvent+'"><i class="layui-icon '+i.icon+'"></i></div>')}),e.layTool.find(".layui-table-tool-self").html(d.join(""))},F.prototype.setParentCol=function(e,t){var i=this,a=i.config,l=i.layHeader.find('th[data-key="'+a.index+"-"+t+'"]'),n=parseInt(l.attr("colspan"))||0;if(l[0]){var o=t.split("-"),r=a.cols[o[0]][o[1]];e?n--:n++,l.attr("colspan",n),l[n<1?"addClass":"removeClass"](y),r.colspan=n,r.hide=n<1;var d=l.data("parentkey");d&&i.setParentCol(e,d)}},F.prototype.setColsPatch=function(){var e=this,t=e.config;layui.each(t.cols,function(t,i){layui.each(i,function(t,i){i.hide&&e.setParentCol(i.hide,i.parentKey)})})},F.prototype.setColsWidth=function(){var e=this,t=e.config,i=0,a=0,l=0,n=0,o=e.setInit("width");e.eachCols(function(e,t){t.hide||i++}),o=o-function(){return"line"===t.skin||"nob"===t.skin?2:i+1}()-e.getScrollWidth(e.layMain[0])-1;var r=function(e){layui.each(t.cols,function(i,r){layui.each(r,function(i,d){var c=0,s=d.minWidth||t.cellMinWidth;return d?void(d.colGroup||d.hide||(e?l&&l<s&&(a--,c=s):(c=d.width||0,/\d+%$/.test(c)?(c=Math.floor(parseFloat(c)/100*o),c<s&&(c=s)):c||(d.width=c=0,a++)),d.hide&&(c=0),n+=c)):void r.splice(i,1)})}),o>n&&a&&(l=(o-n)/a)};r(),r(!0),e.autoColNums=a,e.eachCols(function(i,a){var n=a.minWidth||t.cellMinWidth;a.colGroup||a.hide||(0===a.width?e.getCssRule(t.index+"-"+a.key,function(e){e.style.width=Math.floor(l>=n?l:n)+"px"}):/\d+%$/.test(a.width)&&e.getCssRule(t.index+"-"+a.key,function(e){e.style.width=Math.floor(parseFloat(a.width)/100*o)+"px"}))});var d=e.layMain.width()-e.getScrollWidth(e.layMain[0])-e.layMain.children("table").outerWidth();if(e.autoColNums&&d>=-i&&d<=i){var c=function(t){var i;return t=t||e.layHeader.eq(0).find("thead th:last-child"),i=t.data("field"),!i&&t.prev()[0]?c(t.prev()):t},s=c(),u=s.data("key");e.getCssRule(u,function(t){var i=t.style.width||s.outerWidth();t.style.width=parseFloat(i)+d+"px",e.layMain.height()-e.layMain.prop("clientHeight")>0&&(t.style.width=parseFloat(t.style.width)-1+"px")})}e.loading(!0)},F.prototype.resize=function(){var e=this;e.fullSize(),e.setColsWidth(),e.scrollPatch()},F.prototype.reload=function(e){var i=this;i.config.data&&i.config.data.constructor===Array&&delete i.config.data,i.config=t.extend({},i.config,e),i.render()},F.prototype.page=1,F.prototype.pullData=function(e){var i=this,a=i.config,l=a.request,n=a.response,o=function(){"object"==typeof a.initSort&&i.sort(a.initSort.field,a.initSort.type)};if(i.startTime=(new Date).getTime(),a.url){var r={};r[l.pageName]=e,r[l.limitName]=a.limit;var d=t.extend(r,a.where);a.contentType&&0==a.contentType.indexOf("application/json")&&(d=JSON.stringify(d)),t.ajax({type:a.method||"get",url:a.url,contentType:a.contentType,data:d,dataType:"json",headers:a.headers||{},success:function(t){"function"==typeof a.parseData&&(t=a.parseData(t)||t),t[n.statusName]!=n.statusCode?(i.renderForm(),i.layMain.html('<div class="'+f+'">'+(t[n.msgName]||"返回的数据不符合规范，正确的成功状态码 ("+n.statusName+") 应为："+n.statusCode)+"</div>")):(i.renderData(t,e,t[n.countName]),o(),a.time=(new Date).getTime()-i.startTime+" ms"),i.setColsWidth(),"function"==typeof a.done&&a.done(t,e,t[n.countName])},error:function(e,t){i.layMain.html('<div class="'+f+'">数据接口请求异常：'+t+"</div>"),i.renderForm(),i.setColsWidth()}})}else if(a.data&&a.data.constructor===Array){var c={},s=e*a.limit-a.limit;c[n.dataName]=a.data.concat().splice(s,a.limit),c[n.countName]=a.data.length,i.renderData(c,e,a.data.length),o(),i.setColsWidth(),"function"==typeof a.done&&a.done(c,e,c[n.countName])}},F.prototype.eachCols=function(e){var t=this;return d.eachCols(null,e,t.config.cols),t},F.prototype.renderData=function(e,n,o,r){var c=this,s=c.config,u=e[s.response.dataName]||[],h=[],p=[],v=[],m=function(){var e;return!r&&c.sortKey?c.sort(c.sortKey.field,c.sortKey.sort,!0):(layui.each(u,function(a,l){var o=[],u=[],f=[],m=a+s.limit*(n-1)+1;0!==l.length&&(r||(l[d.config.indexName]=a),c.eachCols(function(n,r){var c=r.field||n,h=s.index+"-"+r.key,p=l[c];if(void 0!==p&&null!==p||(p=""),!r.colGroup){var v=['<td data-field="'+c+'" data-key="'+h+'" '+function(){var e=[];return r.edit&&e.push('data-edit="'+r.edit+'"'),r.align&&e.push('align="'+r.align+'"'),r.templet&&e.push('data-content="'+p+'"'),r.toolbar&&e.push('data-off="true"'),r.event&&e.push('lay-event="'+r.event+'"'),r.style&&e.push('style="'+r.style+'"'),r.minWidth&&e.push('data-minwidth="'+r.minWidth+'"'),e.join(" ")}()+' class="'+function(){var e=[];return r.hide&&e.push(y),r.field||e.push("layui-table-col-special"),e.join(" ")}()+'">','<div class="layui-table-cell laytable-cell-'+function(){return"normal"===r.type?h:h+" laytable-cell-"+r.type}()+'">'+function(){var n=t.extend(!0,{LAY_INDEX:m},l),o=d.config.checkName;switch(r.type){case"checkbox":return'<input type="checkbox" name="layTableCheckbox" lay-skin="primary" '+function(){return r[o]?(l[o]=r[o],r[o]?"checked":""):n[o]?"checked":""}()+">";case"radio":return n[o]&&(e=a),'<input type="radio" name="layTableRadio_'+s.index+'" '+(n[o]?"checked":"")+' lay-type="layTableRadio">';case"numbers":return m}return r.toolbar?i(t(r.toolbar).html()||"").render(n):r.templet?function(){return"function"==typeof r.templet?r.templet(n):i(t(r.templet).html()||String(p)).render(n)}():p}(),"</div></td>"].join("");o.push(v),r.fixed&&"right"!==r.fixed&&u.push(v),"right"===r.fixed&&f.push(v)}}),h.push('<tr data-index="'+a+'">'+o.join("")+"</tr>"),p.push('<tr data-index="'+a+'">'+u.join("")+"</tr>"),v.push('<tr data-index="'+a+'">'+f.join("")+"</tr>"))}),c.layBody.scrollTop(0),c.layMain.find("."+f).remove(),c.layMain.find("tbody").html(h.join("")),c.layFixLeft.find("tbody").html(p.join("")),c.layFixRight.find("tbody").html(v.join("")),c.renderForm(),"number"==typeof e&&c.setThisRowChecked(e),c.syncCheckAll(),c.haveInit?c.scrollPatch():setTimeout(function(){c.scrollPatch()},50),c.haveInit=!0,l.close(c.tipsIndex),s.HAS_SET_COLS_PATCH||c.setColsPatch(),void(s.HAS_SET_COLS_PATCH=!0))};return c.key=s.id||s.index,d.cache[c.key]=u,c.layPage[0==o||0===u.length&&1==n?"addClass":"removeClass"](y),r?m():0===u.length?(c.renderForm(),c.layFixed.remove(),c.layMain.find("tbody").html(""),c.layMain.find("."+f).remove(),c.layMain.append('<div class="'+f+'">'+s.text.none+"</div>")):(m(),c.renderTotal(u),void(s.page&&(s.page=t.extend({elem:"layui-table-page"+s.index,count:o,limit:s.limit,limits:s.limits||[10,20,30,40,50,60,70,80,90],groups:3,layout:["prev","page","next","skip","count","limit"],prev:'<i class="layui-icon"></i>',next:'<i class="layui-icon"></i>',jump:function(e,t){t||(c.page=e.curr,s.limit=e.limit,c.loading(),c.pullData(e.curr))}},s.page),s.page.count=o,a.render(s.page))))},F.prototype.renderTotal=function(e){var t=this,i=t.config,a={};if(i.totalRow){layui.each(e,function(e,i){0!==i.length&&t.eachCols(function(e,t){var l=t.field||e,n=i[l];t.totalRow&&(a[l]=(a[l]||0)+(parseFloat(n)||0))})});var l=[];t.eachCols(function(e,t){var n=t.field||e,o=['<td data-field="'+n+'" data-key="'+i.index+"-"+t.key+'" '+function(){var e=[];return t.align&&e.push('align="'+t.align+'"'),t.style&&e.push('style="'+t.style+'"'),t.minWidth&&e.push('data-minwidth="'+t.minWidth+'"'),e.join(" ")}()+' class="'+function(){var e=[];return t.hide&&e.push(y),t.field||e.push("layui-table-col-special"),e.join(" ")}()+'">','<div class="layui-table-cell laytable-cell-'+function(){var e=i.index+"-"+t.key;return"normal"===t.type?e:e+" laytable-cell-"+t.type}()+'">'+function(){var e=t.totalRowText||"";return t.totalRow?parseFloat(a[n]).toFixed(2)||e:e}(),"</div></td>"].join("");l.push(o)}),t.layTotal.find("tbody").html("<tr>"+l.join("")+"</tr>")}},F.prototype.getColElem=function(e,t){var i=this,a=i.config;return e.eq(0).find(".laytable-cell-"+(a.index+"-"+t)+":eq(0)")},F.prototype.renderForm=function(e){n.render(e,"LAY-table-"+this.index)},F.prototype.setThisRowChecked=function(e){var t=this,i=(t.config,"layui-table-click"),a=t.layBody.find('tr[data-index="'+e+'"]');a.addClass(i).siblings("tr").removeClass(i)},F.prototype.sort=function(e,i,a,l){var n,r,c=this,s={},h=c.config,y=h.elem.attr("lay-filter"),f=d.cache[c.key];"string"==typeof e&&c.layHeader.find("th").each(function(i,a){var l=t(this),o=l.data("field");if(o===e)return e=l,n=o,!1});try{var n=n||e.data("field"),p=e.data("key");if(c.sortKey&&!a&&n===c.sortKey.field&&i===c.sortKey.sort)return;var v=c.layHeader.find("th .laytable-cell-"+p).find(S);c.layHeader.find("th").find(S).removeAttr("lay-sort"),v.attr("lay-sort",i||null),c.layFixed.find("th")}catch(m){return o.error("Table modules: Did not match to field")}c.sortKey={field:n,sort:i},h.autoSort&&("asc"===i?r=layui.sort(f,n):"desc"===i?r=layui.sort(f,n,!0):(r=layui.sort(f,d.config.indexName),delete c.sortKey)),s[h.response.dataName]=r||f,c.renderData(s,c.page,c.count,!0),l&&layui.event.call(e,u,"sort("+y+")",{field:n,type:i})},F.prototype.loading=function(e){var i=this,a=i.config;a.loading&&(e?(i.layInit&&i.layInit.remove(),delete i.layInit,i.layBox.find(g).remove()):(i.layInit=t(['<div class="layui-table-init">','<i class="layui-icon layui-icon-loading layui-icon"></i>',"</div>"].join("")),i.layBox.append(i.layInit)))},F.prototype.setCheckData=function(e,t){var i=this,a=i.config,l=d.cache[i.key];l[e]&&l[e].constructor!==Array&&(l[e][a.checkName]=t)},F.prototype.syncCheckAll=function(){var e=this,t=e.config,i=e.layHeader.find('input[name="layTableCheckbox"]'),a=function(i){return e.eachCols(function(e,a){"checkbox"===a.type&&(a[t.checkName]=i)}),i};i[0]&&(d.checkStatus(e.key).isAll?(i[0].checked||(i.prop("checked",!0),e.renderForm("checkbox")),a(!0)):(i[0].checked&&(i.prop("checked",!1),e.renderForm("checkbox")),a(!1)))},F.prototype.getCssRule=function(e,t){var i=this,a=i.elem.find("style")[0],l=a.sheet||a.styleSheet||{},n=l.cssRules||l.rules;layui.each(n,function(i,a){if(a.selectorText===".laytable-cell-"+e)return t(a),!0})},F.prototype.fullSize=function(){var e,t=this,i=t.config,a=i.height;t.fullHeightGap&&(a=H.height()-t.fullHeightGap,a<135&&(a=135),t.elem.css("height",a)),a&&(e=parseFloat(a)-(t.layHeader.outerHeight()||38),i.toolbar&&(e-=t.layTool.outerHeight()||50),i.totalRow&&(e-=t.layTotal.outerHeight()||40),i.page&&(e=e-(t.layPage.outerHeight()||41)-2),t.layMain.css("height",e))},F.prototype.getScrollWidth=function(e){var t=0;return e?t=e.offsetWidth-e.clientWidth:(e=document.createElement("div"),e.style.width="100px",e.style.height="100px",e.style.overflowY="scroll",document.body.appendChild(e),t=e.offsetWidth-e.clientWidth,document.body.removeChild(e)),t},F.prototype.scrollPatch=function(){var e=this,i=e.layMain.children("table"),a=e.layMain.width()-e.layMain.prop("clientWidth"),l=e.layMain.height()-e.layMain.prop("clientHeight"),n=(e.getScrollWidth(e.layMain[0]),i.outerWidth()-e.layMain.width()),o=function(e){if(a&&l){if(e=e.eq(0),!e.find(".layui-table-patch")[0]){var i=t('<th class="layui-table-patch"><div class="layui-table-cell"></div></th>');i.find("div").css({width:a}),e.find("tr").append(i)}}else e.find(".layui-table-patch").remove()};o(e.layHeader),o(e.layTotal);var r=e.layMain.height(),d=r-l;e.layFixed.find(x).css("height",i.height()>=d?d:"auto"),e.layFixRight[n>0?"removeClass":"addClass"](y),e.layFixRight.css("right",a-1)},F.prototype.events=function(){var e,a=this,o=a.config,c=t("body"),s={},h=a.layHeader.find("th"),f=".layui-table-cell",p=o.elem.attr("lay-filter");a.layTool.on("click","*[lay-event]",function(e){var i=t(this),c=i.attr("lay-event"),s=function(e){var l=t(e.list),n=t('<ul class="layui-table-tool-panel"></ul>');n.html(l),o.height&&n.css("max-height",o.height-(a.layTool.outerHeight()||50)),i.find(".layui-table-tool-panel")[0]||i.append(n),a.renderForm(),n.on("click",function(e){layui.stope(e)}),e.done&&e.done(n,l)};switch(layui.stope(e),R.trigger("table.tool.panel.remove"),l.close(a.tipsIndex),c){case"LAYTABLE_COLS":s({list:function(){var e=[];return a.eachCols(function(t,i){i.field&&"normal"==i.type&&e.push('<li><input type="checkbox" name="'+i.field+'" data-key="'+i.key+'" data-parentkey="'+(i.parentKey||"")+'" lay-skin="primary" '+(i.hide?"":"checked")+' title="'+(i.title||i.field)+'" lay-filter="LAY_TABLE_TOOL_COLS"></li>')}),e.join("")}(),done:function(){n.on("checkbox(LAY_TABLE_TOOL_COLS)",function(e){var i=t(e.elem),l=this.checked,n=i.data("key"),r=i.data("parentkey");layui.each(o.cols,function(e,t){layui.each(t,function(t,i){if(e+"-"+t===n){var d=i.hide;i.hide=!l,a.elem.find('*[data-key="'+o.index+"-"+n+'"]')[l?"removeClass":"addClass"](y),d!=i.hide&&a.setParentCol(!l,r),a.resize()}})})})}});break;case"LAYTABLE_EXPORT":r.ie?l.tips("导出功能不支持 IE，请用 Chrome 等高级浏览器导出",this,{tips:3}):s({list:function(){return['<li data-type="csv">导出到 Csv 文件</li>','<li data-type="xls">导出到 Excel 文件</li>'].join("")}(),done:function(e,i){i.on("click",function(){var e=t(this).data("type");d.exportFile(o.id,null,e)})}});break;case"LAYTABLE_PRINT":var h=window.open("打印窗口","_blank"),f=["<style>","body{font-size: 12px; color: #666;}","table{width: 100%; border-collapse: collapse; border-spacing: 0;}","th,td{line-height: 20px; padding: 9px 15px; border: 1px solid #ccc; text-align: left; font-size: 12px; color: #666;}","a{color: #666; text-decoration:none;}","*.layui-hide{display: none}","</style>"].join(""),v=t(a.layHeader.html());v.append(a.layMain.find("table").html()),v.find("th.layui-table-patch").remove(),v.find(".layui-table-col-special").remove(),h.document.write(f+v.prop("outerHTML")),h.document.close(),h.print(),h.close()}layui.event.call(this,u,"toolbar("+p+")",t.extend({event:c,config:o},{}))}),h.on("mousemove",function(e){var i=t(this),a=i.offset().left,l=e.clientX-a;i.data("unresize")||s.resizeStart||(s.allowResize=i.width()-l<=10,c.css("cursor",s.allowResize?"col-resize":""))}).on("mouseleave",function(){t(this);s.resizeStart||c.css("cursor","")}).on("mousedown",function(e){var i=t(this);if(s.allowResize){var l=i.data("key");e.preventDefault(),s.resizeStart=!0,s.offset=[e.clientX,e.clientY],a.getCssRule(l,function(e){var t=e.style.width||i.outerWidth();s.rule=e,s.ruleWidth=parseFloat(t),s.minWidth=i.data("minwidth")||o.cellMinWidth})}}),R.on("mousemove",function(t){if(s.resizeStart){if(t.preventDefault(),s.rule){var i=s.ruleWidth+t.clientX-s.offset[0];i<s.minWidth&&(i=s.minWidth),s.rule.style.width=i+"px",l.close(a.tipsIndex)}e=1}}).on("mouseup",function(t){s.resizeStart&&(s={},c.css("cursor",""),a.scrollPatch()),2===e&&(e=null)}),h.on("click",function(i){var l,n=t(this),o=n.find(S),r=o.attr("lay-sort");return o[0]&&1!==e?(l="asc"===r?"desc":"desc"===r?null:"asc",void a.sort(n,l,null,!0)):e=2}).find(S+" .layui-edge ").on("click",function(e){var i=t(this),l=i.index(),n=i.parents("th").eq(0).data("field");layui.stope(e),0===l?a.sort(n,"asc",null,!0):a.sort(n,"desc",null,!0)});var v=function(e){var l=t(this),n=l.parents("tr").eq(0).data("index"),o=a.layBody.find('tr[data-index="'+n+'"]'),r=d.cache[a.key][n];return t.extend({tr:o,data:d.clearCacheKey(r),del:function(){d.cache[a.key][n]=[],o.remove(),a.scrollPatch()},update:function(e){e=e||{},layui.each(e,function(e,l){if(e in r){var n,d=o.children('td[data-field="'+e+'"]');r[e]=l,a.eachCols(function(t,i){i.field==e&&i.templet&&(n=i.templet)}),d.children(f).html(function(){return n?function(){return"function"==typeof n?n(r):i(t(n).html()||l).render(r)}():l}()),d.data("content",l)}})}},e)};a.elem.on("click",'input[name="layTableCheckbox"]+',function(){var e=t(this).prev(),i=a.layBody.find('input[name="layTableCheckbox"]'),l=e.parents("tr").eq(0).data("index"),n=e[0].checked,o="layTableAllChoose"===e.attr("lay-filter");o?(i.each(function(e,t){t.checked=n,a.setCheckData(e,n)}),a.syncCheckAll(),a.renderForm("checkbox")):(a.setCheckData(l,n),a.syncCheckAll()),layui.event.call(e[0],u,"checkbox("+p+")",v.call(e[0],{checked:n,type:o?"all":"one"}))}),a.elem.on("click",'input[lay-type="layTableRadio"]+',function(){var e=t(this).prev(),i=e[0].checked,l=d.cache[a.key],n=e.parents("tr").eq(0).data("index");layui.each(l,function(e,t){n===e?t.LAY_CHECKED=!0:delete t.LAY_CHECKED}),a.setThisRowChecked(n),layui.event.call(this,u,"radio("+p+")",v.call(this,{checked:i}))}),a.layBody.on("mouseenter","tr",function(){var e=t(this),i=e.index();a.layBody.find("tr:eq("+i+")").addClass(W)}).on("mouseleave","tr",function(){var e=t(this),i=e.index();a.layBody.find("tr:eq("+i+")").removeClass(W)}).on("click","tr",function(){m.call(this,"row")}).on("dblclick","tr",function(){m.call(this,"rowDouble")});var m=function(e){var i=t(this);layui.event.call(this,u,e+"("+p+")",v.call(i.children("td")[0]))};a.layBody.on("change","."+N,function(){var e=t(this),i=this.value,l=e.parent().data("field"),n=e.parents("tr").eq(0).data("index"),o=d.cache[a.key][n];o[l]=i,layui.event.call(this,u,"edit("+p+")",v.call(this,{value:i,field:l}))}).on("blur","."+N,function(){var e,l=t(this),n=l.parent().data("field"),o=l.parents("tr").eq(0).data("index"),r=d.cache[a.key][o];a.eachCols(function(t,i){i.field==n&&i.templet&&(e=i.templet)}),l.siblings(f).html(function(a){return e?function(){return"function"==typeof e?e(r):i(t(e).html()||this.value).render(r)}():a}(this.value)),l.parent().data("content",this.value),l.remove()}),a.layBody.on("click","td",function(e){var i=t(this),a=(i.data("field"),i.data("edit")),l=i.children(f);if(!i.data("off")&&a){var n=t('<input class="layui-input '+N+'">');return n[0].value=i.data("content")||l.text(),i.find("."+N)[0]||i.append(n),n.focus(),void layui.stope(e)}}).on("mouseenter","td",function(){b.call(this)}).on("mouseleave","td",function(){b.call(this,"hide")});var g="layui-table-grid-down",b=function(e){var i=t(this),a=i.children(f);if(e)i.find(".layui-table-grid-down").remove();else if(a.prop("scrollWidth")>a.outerWidth()){if(a.find("."+g)[0])return;i.append('<div class="'+g+'"><i class="layui-icon layui-icon-down"></i></div>')}};a.layBody.on("click","."+g,function(e){var i=t(this),n=i.parent(),d=n.children(f);a.tipsIndex=l.tips(['<div class="layui-table-tips-main" style="margin-top: -'+(d.height()+16)+"px;"+function(){return"sm"===o.size?"padding: 4px 15px; font-size: 12px;":"lg"===o.size?"padding: 14px 15px;":""}()+'">',d.html(),"</div>",'<i class="layui-icon layui-table-tips-c layui-icon-close"></i>'].join(""),d[0],{tips:[3,""],time:-1,anim:-1,maxWidth:r.ios||r.android?300:a.elem.width()/2,isOutAnim:!1,skin:"layui-table-tips",success:function(e,t){e.find(".layui-table-tips-c").on("click",function(){l.close(t)})}}),layui.stope(e)}),a.layBody.on("click","*[lay-event]",function(){var e=t(this),i=e.parents("tr").eq(0).data("index");layui.event.call(this,u,"tool("+p+")",v.call(this,{event:e.attr("lay-event")})),a.setThisRowChecked(i)}),a.layMain.on("scroll",function(){var e=t(this),i=e.scrollLeft(),n=e.scrollTop();a.layHeader.scrollLeft(i),a.layTotal.scrollLeft(i),a.layFixed.find(x).scrollTop(n),l.close(a.tipsIndex)}),R.on("click",function(){R.trigger("table.remove.tool.panel")}),R.on("table.remove.tool.panel",function(){t(".layui-table-tool-panel").remove()}),H.on("resize",function(){a.resize()})},d.init=function(e,i){i=i||{};var a=this,l=t(e?'table[lay-filter="'+e+'"]':h+"[lay-data]"),n="Table element property lay-data configuration item has a syntax error: ";return l.each(function(){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(r){o.error(n+l)}var c=[],s=t.extend({elem:this,cols:[],data:[],skin:a.attr("lay-skin"),size:a.attr("lay-size"),even:"string"==typeof a.attr("lay-even")},d.config,i,l);e&&a.hide(),a.find("thead>tr").each(function(e){s.cols[e]=[],t(this).children().each(function(i){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(r){return o.error(n+l)}var d=t.extend({title:a.text(),colspan:a.attr("colspan")||0,rowspan:a.attr("rowspan")||0},l);d.colspan<2&&c.push(d),s.cols[e].push(d)})}),a.find("tbody>tr").each(function(e){var i=t(this),a={};i.children("td").each(function(e,i){var l=t(this),n=l.data("field");if(n)return a[n]=l.html()}),layui.each(c,function(e,t){var l=i.children("td").eq(e);a[t.field]=l.html()}),s.data[e]=a}),d.render(s)}),a},c.that={},c.config={},d.eachCols=function(e,i,a){var l=c.config[e]||{},n=[],o=0;a=t.extend(!0,[],a||l.cols),layui.each(a,function(e,t){layui.each(t,function(t,i){if(i.colGroup){var l=0;o++,i.CHILD_COLS=[],layui.each(a[e+1],function(e,t){t.PARENT_COL_INDEX||l>1&&l==i.colspan||(t.PARENT_COL_INDEX=o,i.CHILD_COLS.push(t),l+=parseInt(t.colspan>1?t.colspan:1))})}i.PARENT_COL_INDEX||n.push(i)})});var r=function(e){layui.each(e||n,function(e,t){return t.CHILD_COLS?r(t.CHILD_COLS):void("function"==typeof i&&i(e,t))})};r()},d.checkStatus=function(e){var t=0,i=0,a=[],l=d.cache[e]||[];return layui.each(l,function(e,l){return l.constructor===Array?void i++:void(l[d.config.checkName]&&(t++,a.push(d.clearCacheKey(l))))}),{data:a,isAll:!!l.length&&t===l.length-i}},d.exportFile=function(e,t,i){t=t||d.clearCacheKey(d.cache[e]),i=i||"csv";var a=c.config[e]||{},l={csv:"text/csv",xls:"application/vnd.ms-excel"}[i],n=document.createElement("a");return r.ie?o.error("IE_NOT_SUPPORT_EXPORTS"):(n.href="data:"+l+";charset=utf-8,\ufeff"+encodeURIComponent(function(){var i=[],a=[];return layui.each(t,function(t,l){var n=[];"object"==typeof e?(layui.each(e,function(e,a){0==t&&i.push(a||"")}),layui.each(d.clearCacheKey(l),function(e,t){n.push(t)})):d.eachCols(e,function(e,a){a.field&&"normal"==a.type&&!a.hide&&(0==t&&i.push(a.title||""),n.push(l[a.field]))}),a.push(n.join(","))}),i.join(",")+"\r\n"+a.join("\r\n")}()),n.download=(a.title||"table_"+(a.index||""))+"."+i,document.body.appendChild(n),n.click(),void document.body.removeChild(n))},d.resize=function(e){if(e){var t=s(e);if(!t)return;c.that[e].resize()}else layui.each(c.that,function(){this.resize()})},d.reload=function(e,i){i=i||{};var a=s(e);if(a)return i.data&&i.data.constructor===Array&&delete a.data,d.render(t.extend(!0,{},a,i))},d.render=function(e){var t=new F(e);return c.call(t)},d.clearCacheKey=function(e){return e=t.extend({},e),delete e[d.config.checkName],delete e[d.config.indexName],e},d.init(),e(u,d)});
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/tree.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/tree.js
new file mode 100644
index 0000000..e8c053d
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/tree.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var o=layui.$,a=layui.hint(),i="layui-tree-enter",r=function(e){this.options=e},t={arrow:["",""],checkbox:["",""],radio:["",""],branch:["",""],leaf:""};r.prototype.init=function(e){var o=this;e.addClass("layui-box layui-tree"),o.options.skin&&e.addClass("layui-tree-skin-"+o.options.skin),o.tree(e),o.on(e)},r.prototype.tree=function(e,a){var i=this,r=i.options,n=a||r.nodes;layui.each(n,function(a,n){var l=n.children&&n.children.length>0,c=o('<ul class="'+(n.spread?"layui-show":"")+'"></ul>'),s=o(["<li "+(n.spread?'data-spread="'+n.spread+'"':"")+">",function(){return l?'<i class="layui-icon layui-tree-spread">'+(n.spread?t.arrow[1]:t.arrow[0])+"</i>":""}(),function(){return r.check?'<i class="layui-icon layui-tree-check">'+("checkbox"===r.check?t.checkbox[0]:"radio"===r.check?t.radio[0]:"")+"</i>":""}(),function(){return'<a href="'+(n.href||"javascript:;")+'" '+(r.target&&n.href?'target="'+r.target+'"':"")+">"+('<i class="layui-icon layui-tree-'+(l?"branch":"leaf")+'">'+(l?n.spread?t.branch[1]:t.branch[0]:t.leaf)+"</i>")+("<cite>"+(n.name||"未命名")+"</cite></a>")}(),"</li>"].join(""));l&&(s.append(c),i.tree(c,n.children)),e.append(s),"function"==typeof r.click&&i.click(s,n),i.spread(s,n),r.drag&&i.drag(s,n)})},r.prototype.click=function(e,o){var a=this,i=a.options;e.children("a").on("click",function(e){layui.stope(e),i.click(o)})},r.prototype.spread=function(e,o){var a=this,i=(a.options,e.children(".layui-tree-spread")),r=e.children("ul"),n=e.children("a"),l=function(){e.data("spread")?(e.data("spread",null),r.removeClass("layui-show"),i.html(t.arrow[0]),n.find(".layui-icon").html(t.branch[0])):(e.data("spread",!0),r.addClass("layui-show"),i.html(t.arrow[1]),n.find(".layui-icon").html(t.branch[1]))};r[0]&&(i.on("click",l),n.on("dblclick",l))},r.prototype.on=function(e){var a=this,r=a.options,t="layui-tree-drag";e.find("i").on("selectstart",function(e){return!1}),r.drag&&o(document).on("mousemove",function(e){var i=a.move;if(i.from){var r=(i.to,o('<div class="layui-box '+t+'"></div>'));e.preventDefault(),o("."+t)[0]||o("body").append(r);var n=o("."+t)[0]?o("."+t):r;n.addClass("layui-show").html(i.from.elem.children("a").html()),n.css({left:e.pageX+10,top:e.pageY+10})}}).on("mouseup",function(){var e=a.move;e.from&&(e.from.elem.children("a").removeClass(i),e.to&&e.to.elem.children("a").removeClass(i),a.move={},o("."+t).remove())})},r.prototype.move={},r.prototype.drag=function(e,a){var r=this,t=(r.options,e.children("a")),n=function(){var t=o(this),n=r.move;n.from&&(n.to={item:a,elem:e},t.addClass(i))};t.on("mousedown",function(){var o=r.move;o.from={item:a,elem:e}}),t.on("mouseenter",n).on("mousemove",n).on("mouseleave",function(){var e=o(this),a=r.move;a.from&&(delete a.to,e.removeClass(i))})},e("tree",function(e){var i=new r(e=e||{}),t=o(e.elem);return t[0]?void i.init(t):a.error("layui.tree 没有找到"+e.elem+"元素")})});
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/upload.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/upload.js
new file mode 100644
index 0000000..404d534
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/upload.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("layer",function(e){"use strict";var i=layui.$,t=layui.layer,n=layui.hint(),a=layui.device(),o={config:{},set:function(e){var t=this;return t.config=i.extend({},t.config,e),t},on:function(e,i){return layui.onevent.call(this,r,e,i)}},l=function(){var e=this;return{upload:function(i){e.upload.call(e,i)},config:e.config}},r="upload",u="layui-upload-file",c="layui-upload-form",f="layui-upload-iframe",s="layui-upload-choose",p=function(e){var t=this;t.config=i.extend({},t.config,o.config,e),t.render()};p.prototype.config={accept:"images",exts:"",auto:!0,bindAction:"",url:"",field:"file",method:"post",data:{},drag:!0,size:0,number:0,multiple:!1},p.prototype.render=function(e){var t=this,e=t.config;e.elem=i(e.elem),e.bindAction=i(e.bindAction),t.file(),t.events()},p.prototype.file=function(){var e=this,t=e.config,n=e.elemFile=i(['<input class="'+u+'" type="file" accept="'+t.acceptMime+'" name="'+t.field+'"',t.multiple?" multiple":"",">"].join("")),o=t.elem.next();(o.hasClass(u)||o.hasClass(c))&&o.remove(),a.ie&&a.ie<10&&t.elem.wrap('<div class="layui-upload-wrap"></div>'),e.isFile()?(e.elemFile=t.elem,t.field=t.elem[0].name):t.elem.after(n),a.ie&&a.ie<10&&e.initIE()},p.prototype.initIE=function(){var e=this,t=e.config,n=i('<iframe id="'+f+'" class="'+f+'" name="'+f+'" frameborder="0"></iframe>'),a=i(['<form target="'+f+'" class="'+c+'" method="post" key="set-mine" enctype="multipart/form-data" action="'+t.url+'">',"</form>"].join(""));i("#"+f)[0]||i("body").append(n),t.elem.next().hasClass(c)||(e.elemFile.wrap(a),t.elem.next("."+c).append(function(){var e=[];return layui.each(t.data,function(i,t){t="function"==typeof t?t():t,e.push('<input type="hidden" name="'+i+'" value="'+t+'">')}),e.join("")}()))},p.prototype.msg=function(e){return t.msg(e,{icon:2,shift:6})},p.prototype.isFile=function(){var e=this.config.elem[0];if(e)return"input"===e.tagName.toLocaleLowerCase()&&"file"===e.type},p.prototype.preview=function(e){var i=this;window.FileReader&&layui.each(i.chooseFiles,function(i,t){var n=new FileReader;n.readAsDataURL(t),n.onload=function(){e&&e(i,t,this.result)}})},p.prototype.upload=function(e,t){var n,o=this,l=o.config,r=o.elemFile[0],u=function(){var t=0,n=0,a=e||o.files||o.chooseFiles||r.files,u=function(){l.multiple&&t+n===o.fileLength&&"function"==typeof l.allDone&&l.allDone({total:o.fileLength,successful:t,aborted:n})};layui.each(a,function(e,a){var r=new FormData;r.append(l.field,a),layui.each(l.data,function(e,i){i="function"==typeof i?i():i,r.append(e,i)}),i.ajax({url:l.url,type:"post",data:r,contentType:!1,processData:!1,dataType:"json",headers:l.headers||{},success:function(i){t++,d(e,i),u()},error:function(){n++,o.msg("请求上传接口出现异常"),m(e),u()}})})},c=function(){var e=i("#"+f);o.elemFile.parent().submit(),clearInterval(p.timer),p.timer=setInterval(function(){var i,t=e.contents().find("body");try{i=t.text()}catch(n){o.msg("获取上传后的响应信息出现异常"),clearInterval(p.timer),m()}i&&(clearInterval(p.timer),t.html(""),d(0,i))},30)},d=function(e,i){if(o.elemFile.next("."+s).remove(),r.value="","object"!=typeof i)try{i=JSON.parse(i)}catch(t){return i={},o.msg("请对上传接口返回有效JSON")}"function"==typeof l.done&&l.done(i,e||0,function(e){o.upload(e)})},m=function(e){l.auto&&(r.value=""),"function"==typeof l.error&&l.error(e||0,function(e){o.upload(e)})},h=l.exts,v=function(){var i=[];return layui.each(e||o.chooseFiles,function(e,t){i.push(t.name)}),i}(),g={preview:function(e){o.preview(e)},upload:function(e,i){var t={};t[e]=i,o.upload(t)},pushFile:function(){return o.files=o.files||{},layui.each(o.chooseFiles,function(e,i){o.files[e]=i}),o.files},resetFile:function(e,i,t){var n=new File([i],t);o.files=o.files||{},o.files[e]=n}},y=function(){if("choose"!==t&&!l.auto||(l.choose&&l.choose(g),"choose"!==t))return l.before&&l.before(g),a.ie?a.ie>9?u():c():void u()};if(v=0===v.length?r.value.match(/[^\/\\]+\..+/g)||[]||"":v,0!==v.length){switch(l.accept){case"file":if(h&&!RegExp("\\w\\.("+h+")$","i").test(escape(v)))return o.msg("选择的文件中包含不支持的格式"),r.value="";break;case"video":if(!RegExp("\\w\\.("+(h||"avi|mp4|wma|rmvb|rm|flash|3gp|flv")+")$","i").test(escape(v)))return o.msg("选择的视频中包含不支持的格式"),r.value="";break;case"audio":if(!RegExp("\\w\\.("+(h||"mp3|wav|mid")+")$","i").test(escape(v)))return o.msg("选择的音频中包含不支持的格式"),r.value="";break;default:if(layui.each(v,function(e,i){RegExp("\\w\\.("+(h||"jpg|png|gif|bmp|jpeg$")+")","i").test(escape(i))||(n=!0)}),n)return o.msg("选择的图片中包含不支持的格式"),r.value=""}if(o.fileLength=function(){var i=0,t=e||o.files||o.chooseFiles||r.files;return layui.each(t,function(){i++}),i}(),l.number&&o.fileLength>l.number)return o.msg("同时最多只能上传的数量为："+l.number);if(l.size>0&&!(a.ie&&a.ie<10)){var F;if(layui.each(o.chooseFiles,function(e,i){if(i.size>1024*l.size){var t=l.size/1024;t=t>=1?t.toFixed(2)+"MB":l.size+"KB",r.value="",F=t}}),F)return o.msg("文件不能超过"+F)}y()}},p.prototype.events=function(){var e=this,t=e.config,o=function(i){e.chooseFiles={},layui.each(i,function(i,t){var n=(new Date).getTime();e.chooseFiles[n+"-"+i]=t})},l=function(i,n){var a=e.elemFile,o=i.length>1?i.length+"个文件":(i[0]||{}).name||a[0].value.match(/[^\/\\]+\..+/g)||[]||"";a.next().hasClass(s)&&a.next().remove(),e.upload(null,"choose"),e.isFile()||t.choose||a.after('<span class="layui-inline '+s+'">'+o+"</span>")};t.elem.off("upload.start").on("upload.start",function(){var a=i(this),o=a.attr("lay-data");if(o)try{o=new Function("return "+o)(),e.config=i.extend({},t,o)}catch(l){n.error("Upload element property lay-data configuration item has a syntax error: "+o)}e.config.item=a,e.elemFile[0].click()}),a.ie&&a.ie<10||t.elem.off("upload.over").on("upload.over",function(){var e=i(this);e.attr("lay-over","")}).off("upload.leave").on("upload.leave",function(){var e=i(this);e.removeAttr("lay-over")}).off("upload.drop").on("upload.drop",function(n,a){var r=i(this),u=a.originalEvent.dataTransfer.files||[];r.removeAttr("lay-over"),o(u),t.auto?e.upload(u):l(u)}),e.elemFile.off("upload.change").on("upload.change",function(){var i=this.files||[];o(i),t.auto?e.upload():l(i)}),t.bindAction.off("upload.action").on("upload.action",function(){e.upload()}),t.elem.data("haveEvents")||(e.elemFile.on("change",function(){i(this).trigger("upload.change")}),t.elem.on("click",function(){e.isFile()||i(this).trigger("upload.start")}),t.drag&&t.elem.on("dragover",function(e){e.preventDefault(),i(this).trigger("upload.over")}).on("dragleave",function(e){i(this).trigger("upload.leave")}).on("drop",function(e){e.preventDefault(),i(this).trigger("upload.drop",e)}),t.bindAction.on("click",function(){i(this).trigger("upload.action")}),t.elem.data("haveEvents",!0))},o.render=function(e){var i=new p(e);return l.call(i)},e(r,o)});
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/util.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/util.js
new file mode 100644
index 0000000..8d38508
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/lay/modules/util.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(t){"use strict";var e=layui.$,i={fixbar:function(t){var i,a,n="layui-fixbar",r="layui-fixbar-top",o=e(document),l=e("body");t=e.extend({showHeight:200},t),t.bar1=t.bar1===!0?"":t.bar1,t.bar2=t.bar2===!0?"":t.bar2,t.bgcolor=t.bgcolor?"background-color:"+t.bgcolor:"";var c=[t.bar1,t.bar2,""],g=e(['<ul class="'+n+'">',t.bar1?'<li class="layui-icon" lay-type="bar1" style="'+t.bgcolor+'">'+c[0]+"</li>":"",t.bar2?'<li class="layui-icon" lay-type="bar2" style="'+t.bgcolor+'">'+c[1]+"</li>":"",'<li class="layui-icon '+r+'" lay-type="top" style="'+t.bgcolor+'">'+c[2]+"</li>","</ul>"].join("")),s=g.find("."+r),u=function(){var e=o.scrollTop();e>=t.showHeight?i||(s.show(),i=1):i&&(s.hide(),i=0)};e("."+n)[0]||("object"==typeof t.css&&g.css(t.css),l.append(g),u(),g.find("li").on("click",function(){var i=e(this),a=i.attr("lay-type");"top"===a&&e("html,body").animate({scrollTop:0},200),t.click&&t.click.call(this,a)}),o.on("scroll",function(){clearTimeout(a),a=setTimeout(function(){u()},100)}))},countdown:function(t,e,i){var a=this,n="function"==typeof e,r=new Date(t).getTime(),o=new Date(!e||n?(new Date).getTime():e).getTime(),l=r-o,c=[Math.floor(l/864e5),Math.floor(l/36e5)%24,Math.floor(l/6e4)%60,Math.floor(l/1e3)%60];n&&(i=e);var g=setTimeout(function(){a.countdown(t,o+1e3,i)},1e3);return i&&i(l>0?c:[0,0,0,0],e,g),l<=0&&clearTimeout(g),g},timeAgo:function(t,e){var i=this,a=[[],[]],n=(new Date).getTime()-new Date(t).getTime();return n>6912e5?(n=new Date(t),a[0][0]=i.digit(n.getFullYear(),4),a[0][1]=i.digit(n.getMonth()+1),a[0][2]=i.digit(n.getDate()),e||(a[1][0]=i.digit(n.getHours()),a[1][1]=i.digit(n.getMinutes()),a[1][2]=i.digit(n.getSeconds())),a[0].join("-")+" "+a[1].join(":")):n>=864e5?(n/1e3/60/60/24|0)+"天前":n>=36e5?(n/1e3/60/60|0)+"小时前":n>=12e4?(n/1e3/60|0)+"分钟前":n<0?"未来":"刚刚"},digit:function(t,e){var i="";t=String(t),e=e||2;for(var a=t.length;a<e;a++)i+="0";return t<Math.pow(10,e)?i+(0|t):t},toDateString:function(t,e){var i=this,a=new Date(t||new Date),n=[i.digit(a.getFullYear(),4),i.digit(a.getMonth()+1),i.digit(a.getDate())],r=[i.digit(a.getHours()),i.digit(a.getMinutes()),i.digit(a.getSeconds())];return e=e||"yyyy-MM-dd HH:mm:ss",e.replace(/yyyy/g,n[0]).replace(/MM/g,n[1]).replace(/dd/g,n[2]).replace(/HH/g,r[0]).replace(/mm/g,r[1]).replace(/ss/g,r[2])},escape:function(t){return String(t||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/'/g,"'").replace(/"/g,""")}};!function(t,e,i){"$:nomunge";function a(){n=e[l](function(){r.each(function(){var e=t(this),i=e.width(),a=e.height(),n=t.data(this,g);(i!==n.w||a!==n.h)&&e.trigger(c,[n.w=i,n.h=a])}),a()},o[s])}var n,r=t([]),o=t.resize=t.extend(t.resize,{}),l="setTimeout",c="resize",g=c+"-special-event",s="delay",u="throttleWindow";o[s]=250,o[u]=!0,t.event.special[c]={setup:function(){if(!o[u]&&this[l])return!1;var e=t(this);r=r.add(e),t.data(this,g,{w:e.width(),h:e.height()}),1===r.length&&a()},teardown:function(){if(!o[u]&&this[l])return!1;var e=t(this);r=r.not(e),e.removeData(g),r.length||clearTimeout(n)},add:function(e){function a(e,a,r){var o=t(this),l=t.data(this,g)||{};l.w=a!==i?a:o.width(),l.h=r!==i?r:o.height(),n.apply(this,arguments)}if(!o[u]&&this[l])return!1;var n;return t.isFunction(e)?(n=e,a):(n=e.handler,void(e.handler=a))}}}(e,window),t("util",i)});
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/layui.all.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/layui.all.js
new file mode 100644
index 0000000..5cd5973
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/layui.all.js
@@ -0,0 +1,5 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;!function(e){"use strict";var t=document,o={modules:{},status:{},timeout:10,event:{}},n=function(){this.v="2.4.5"},r=function(){var e=t.currentScript?t.currentScript.src:function(){for(var e,o=t.scripts,n=o.length-1,r=n;r>0;r--)if("interactive"===o[r].readyState){e=o[r].src;break}return e||o[n].src}();return e.substring(0,e.lastIndexOf("/")+1)}(),i=function(t){e.console&&console.error&&console.error("Layui hint: "+t)},a="undefined"!=typeof opera&&"[object Opera]"===opera.toString(),u={layer:"modules/layer",laydate:"modules/laydate",laypage:"modules/laypage",laytpl:"modules/laytpl",layim:"modules/layim",layedit:"modules/layedit",form:"modules/form",upload:"modules/upload",tree:"modules/tree",table:"modules/table",element:"modules/element",rate:"modules/rate",colorpicker:"modules/colorpicker",slider:"modules/slider",carousel:"modules/carousel",flow:"modules/flow",util:"modules/util",code:"modules/code",jquery:"modules/jquery",mobile:"modules/mobile","layui.all":"../layui.all"};n.prototype.cache=o,n.prototype.define=function(e,t){var n=this,r="function"==typeof e,i=function(){var e=function(e,t){layui[e]=t,o.status[e]=!0};return"function"==typeof t&&t(function(n,r){e(n,r),o.callback[n]=function(){t(e)}}),this};return r&&(t=e,e=[]),layui["layui.all"]||!layui["layui.all"]&&layui["layui.mobile"]?i.call(n):(n.use(e,i),n)},n.prototype.use=function(e,n,l){function s(e,t){var n="PLaySTATION 3"===navigator.platform?/^complete$/:/^(complete|loaded)$/;("load"===e.type||n.test((e.currentTarget||e.srcElement).readyState))&&(o.modules[f]=t,d.removeChild(v),function r(){return++m>1e3*o.timeout/4?i(f+" is not a valid module"):void(o.status[f]?c():setTimeout(r,4))}())}function c(){l.push(layui[f]),e.length>1?y.use(e.slice(1),n,l):"function"==typeof n&&n.apply(layui,l)}var y=this,p=o.dir=o.dir?o.dir:r,d=t.getElementsByTagName("head")[0];e="string"==typeof e?[e]:e,window.jQuery&&jQuery.fn.on&&(y.each(e,function(t,o){"jquery"===o&&e.splice(t,1)}),layui.jquery=layui.$=jQuery);var f=e[0],m=0;if(l=l||[],o.host=o.host||(p.match(/\/\/([\s\S]+?)\//)||["//"+location.host+"/"])[0],0===e.length||layui["layui.all"]&&u[f]||!layui["layui.all"]&&layui["layui.mobile"]&&u[f])return c(),y;if(o.modules[f])!function g(){return++m>1e3*o.timeout/4?i(f+" is not a valid module"):void("string"==typeof o.modules[f]&&o.status[f]?c():setTimeout(g,4))}();else{var v=t.createElement("script"),h=(u[f]?p+"lay/":/^\{\/\}/.test(y.modules[f])?"":o.base||"")+(y.modules[f]||f)+".js";h=h.replace(/^\{\/\}/,""),v.async=!0,v.charset="utf-8",v.src=h+function(){var e=o.version===!0?o.v||(new Date).getTime():o.version||"";return e?"?v="+e:""}(),d.appendChild(v),!v.attachEvent||v.attachEvent.toString&&v.attachEvent.toString().indexOf("[native code")<0||a?v.addEventListener("load",function(e){s(e,h)},!1):v.attachEvent("onreadystatechange",function(e){s(e,h)}),o.modules[f]=h}return y},n.prototype.getStyle=function(t,o){var n=t.currentStyle?t.currentStyle:e.getComputedStyle(t,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](o)},n.prototype.link=function(e,n,r){var a=this,u=t.createElement("link"),l=t.getElementsByTagName("head")[0];"string"==typeof n&&(r=n);var s=(r||e).replace(/\.|\//g,""),c=u.id="layuicss-"+s,y=0;return u.rel="stylesheet",u.href=e+(o.debug?"?v="+(new Date).getTime():""),u.media="all",t.getElementById(c)||l.appendChild(u),"function"!=typeof n?a:(function p(){return++y>1e3*o.timeout/100?i(e+" timeout"):void(1989===parseInt(a.getStyle(t.getElementById(c),"width"))?function(){n()}():setTimeout(p,100))}(),a)},o.callback={},n.prototype.factory=function(e){if(layui[e])return"function"==typeof o.callback[e]?o.callback[e]:null},n.prototype.addcss=function(e,t,n){return layui.link(o.dir+"css/"+e,t,n)},n.prototype.img=function(e,t,o){var n=new Image;return n.src=e,n.complete?t(n):(n.onload=function(){n.onload=null,"function"==typeof t&&t(n)},void(n.onerror=function(e){n.onerror=null,"function"==typeof o&&o(e)}))},n.prototype.config=function(e){e=e||{};for(var t in e)o[t]=e[t];return this},n.prototype.modules=function(){var e={};for(var t in u)e[t]=u[t];return e}(),n.prototype.extend=function(e){var t=this;e=e||{};for(var o in e)t[o]||t.modules[o]?i("模块名 "+o+" 已被占用"):t.modules[o]=e[o];return t},n.prototype.router=function(e){var t=this,e=e||location.hash,o={path:[],search:{},hash:(e.match(/[^#](#.*$)/)||[])[1]||""};return/^#\//.test(e)?(e=e.replace(/^#\//,""),o.href="/"+e,e=e.replace(/([^#])(#.*$)/,"$1").split("/")||[],t.each(e,function(e,t){/^\w+=/.test(t)?function(){t=t.split("="),o.search[t[0]]=t[1]}():o.path.push(t)}),o):o},n.prototype.data=function(t,o,n){if(t=t||"layui",n=n||localStorage,e.JSON&&e.JSON.parse){if(null===o)return delete n[t];o="object"==typeof o?o:{key:o};try{var r=JSON.parse(n[t])}catch(i){var r={}}return"value"in o&&(r[o.key]=o.value),o.remove&&delete r[o.key],n[t]=JSON.stringify(r),o.key?r[o.key]:r}},n.prototype.sessionData=function(e,t){return this.data(e,t,sessionStorage)},n.prototype.device=function(t){var o=navigator.userAgent.toLowerCase(),n=function(e){var t=new RegExp(e+"/([^\\s\\_\\-]+)");return e=(o.match(t)||[])[1],e||!1},r={os:function(){return/windows/.test(o)?"windows":/linux/.test(o)?"linux":/iphone|ipod|ipad|ios/.test(o)?"ios":/mac/.test(o)?"mac":void 0}(),ie:function(){return!!(e.ActiveXObject||"ActiveXObject"in e)&&((o.match(/msie\s(\d+)/)||[])[1]||"11")}(),weixin:n("micromessenger")};return t&&!r[t]&&(r[t]=n(t)),r.android=/android/.test(o),r.ios="ios"===r.os,r},n.prototype.hint=function(){return{error:i}},n.prototype.each=function(e,t){var o,n=this;if("function"!=typeof t)return n;if(e=e||[],e.constructor===Object){for(o in e)if(t.call(e[o],o,e[o]))break}else for(o=0;o<e.length&&!t.call(e[o],o,e[o]);o++);return n},n.prototype.sort=function(e,t,o){var n=JSON.parse(JSON.stringify(e||[]));return t?(n.sort(function(e,o){var n=/^-?\d+$/,r=e[t],i=o[t];return n.test(r)&&(r=parseFloat(r)),n.test(i)&&(i=parseFloat(i)),r&&!i?1:!r&&i?-1:r>i?1:r<i?-1:0}),o&&n.reverse(),n):n},n.prototype.stope=function(t){t=t||e.event;try{t.stopPropagation()}catch(o){t.cancelBubble=!0}},n.prototype.onevent=function(e,t,o){return"string"!=typeof e||"function"!=typeof o?this:n.event(e,t,null,o)},n.prototype.event=n.event=function(e,t,n,r){var i=this,a=null,u=t.match(/\((.*)\)$/)||[],l=(e+"."+t).replace(u[0],""),s=u[1]||"",c=function(e,t){var o=t&&t.call(i,n);o===!1&&null===a&&(a=!1)};return r?(o.event[l]=o.event[l]||{},o.event[l][s]=[r],this):(layui.each(o.event[l],function(e,t){return"{*}"===s?void layui.each(t,c):(""===e&&layui.each(t,c),void(s&&e===s&&layui.each(t,c)))}),a)},e.layui=new n}(window);layui.define(function(a){var i=layui.cache;layui.config({dir:i.dir.replace(/lay\/dest\/$/,"")}),a("layui.all",layui.v)});layui.define(function(e){"use strict";var r={open:"{{",close:"}}"},c={exp:function(e){return new RegExp(e,"g")},query:function(e,c,t){var o=["#([\\s\\S])+?","([^{#}])*?"][e||0];return n((c||"")+r.open+o+r.close+(t||""))},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/'/g,"'").replace(/"/g,""")},error:function(e,r){var c="Laytpl Error：";return"object"==typeof console&&console.error(c+e+"\n"+(r||"")),c+e}},n=c.exp,t=function(e){this.tpl=e};t.pt=t.prototype,window.errors=0,t.pt.parse=function(e,t){var o=this,p=e,a=n("^"+r.open+"#",""),l=n(r.close+"$","");e=e.replace(/\s+|\r|\t|\n/g," ").replace(n(r.open+"#"),r.open+"# ").replace(n(r.close+"}"),"} "+r.close).replace(/\\/g,"\\\\").replace(n(r.open+"!(.+?)!"+r.close),function(e){return e=e.replace(n("^"+r.open+"!"),"").replace(n("!"+r.close),"").replace(n(r.open+"|"+r.close),function(e){return e.replace(/(.)/g,"\\$1")})}).replace(/(?="|')/g,"\\").replace(c.query(),function(e){return e=e.replace(a,"").replace(l,""),'";'+e.replace(/\\/g,"")+';view+="'}).replace(c.query(1),function(e){var c='"+(';return e.replace(/\s/g,"")===r.open+r.close?"":(e=e.replace(n(r.open+"|"+r.close),""),/^=/.test(e)&&(e=e.replace(/^=/,""),c='"+_escape_('),c+e.replace(/\\/g,"")+')+"')}),e='"use strict";var view = "'+e+'";return view;';try{return o.cache=e=new Function("d, _escape_",e),e(t,c.escape)}catch(u){return delete o.cache,c.error(u,p)}},t.pt.render=function(e,r){var n,t=this;return e?(n=t.cache?t.cache(e,c.escape):t.parse(t.tpl,e),r?void r(n):n):c.error("no data")};var o=function(e){return"string"!=typeof e?c.error("Template not found"):new t(e)};o.config=function(e){e=e||{};for(var c in e)r[c]=e[c]},o.v="1.2.0",e("laytpl",o)});layui.define(function(e){"use strict";var a=document,t="getElementById",n="getElementsByTagName",i="laypage",r="layui-disabled",u=function(e){var a=this;a.config=e||{},a.config.index=++s.index,a.render(!0)};u.prototype.type=function(){var e=this.config;if("object"==typeof e.elem)return void 0===e.elem.length?2:3},u.prototype.view=function(){var e=this,a=e.config,t=a.groups="groups"in a?0|a.groups:5;a.layout="object"==typeof a.layout?a.layout:["prev","page","next"],a.count=0|a.count,a.curr=0|a.curr||1,a.limits="object"==typeof a.limits?a.limits:[10,20,30,40,50],a.limit=0|a.limit||10,a.pages=Math.ceil(a.count/a.limit)||1,a.curr>a.pages&&(a.curr=a.pages),t<0?t=1:t>a.pages&&(t=a.pages),a.prev="prev"in a?a.prev:"上一页",a.next="next"in a?a.next:"下一页";var n=a.pages>t?Math.ceil((a.curr+(t>1?1:0))/(t>0?t:1)):1,i={prev:function(){return a.prev?'<a href="javascript:;" class="layui-laypage-prev'+(1==a.curr?" "+r:"")+'" data-page="'+(a.curr-1)+'">'+a.prev+"</a>":""}(),page:function(){var e=[];if(a.count<1)return"";n>1&&a.first!==!1&&0!==t&&e.push('<a href="javascript:;" class="layui-laypage-first" data-page="1" title="首页">'+(a.first||1)+"</a>");var i=Math.floor((t-1)/2),r=n>1?a.curr-i:1,u=n>1?function(){var e=a.curr+(t-i-1);return e>a.pages?a.pages:e}():t;for(u-r<t-1&&(r=u-t+1),a.first!==!1&&r>2&&e.push('<span class="layui-laypage-spr">…</span>');r<=u;r++)r===a.curr?e.push('<span class="layui-laypage-curr"><em class="layui-laypage-em" '+(/^#/.test(a.theme)?'style="background-color:'+a.theme+';"':"")+"></em><em>"+r+"</em></span>"):e.push('<a href="javascript:;" data-page="'+r+'">'+r+"</a>");return a.pages>t&&a.pages>u&&a.last!==!1&&(u+1<a.pages&&e.push('<span class="layui-laypage-spr">…</span>'),0!==t&&e.push('<a href="javascript:;" class="layui-laypage-last" title="尾页" data-page="'+a.pages+'">'+(a.last||a.pages)+"</a>")),e.join("")}(),next:function(){return a.next?'<a href="javascript:;" class="layui-laypage-next'+(a.curr==a.pages?" "+r:"")+'" data-page="'+(a.curr+1)+'">'+a.next+"</a>":""}(),count:'<span class="layui-laypage-count">共 '+a.count+" 条</span>",limit:function(){var e=['<span class="layui-laypage-limits"><select lay-ignore>'];return layui.each(a.limits,function(t,n){e.push('<option value="'+n+'"'+(n===a.limit?"selected":"")+">"+n+" 条/页</option>")}),e.join("")+"</select></span>"}(),refresh:['<a href="javascript:;" data-page="'+a.curr+'" class="layui-laypage-refresh">','<i class="layui-icon layui-icon-refresh"></i>',"</a>"].join(""),skip:function(){return['<span class="layui-laypage-skip">到第','<input type="text" min="1" value="'+a.curr+'" class="layui-input">','页<button type="button" class="layui-laypage-btn">确定</button>',"</span>"].join("")}()};return['<div class="layui-box layui-laypage layui-laypage-'+(a.theme?/^#/.test(a.theme)?"molv":a.theme:"default")+'" id="layui-laypage-'+a.index+'">',function(){var e=[];return layui.each(a.layout,function(a,t){i[t]&&e.push(i[t])}),e.join("")}(),"</div>"].join("")},u.prototype.jump=function(e,a){if(e){var t=this,i=t.config,r=e.children,u=e[n]("button")[0],l=e[n]("input")[0],p=e[n]("select")[0],c=function(){var e=0|l.value.replace(/\s|\D/g,"");e&&(i.curr=e,t.render())};if(a)return c();for(var o=0,y=r.length;o<y;o++)"a"===r[o].nodeName.toLowerCase()&&s.on(r[o],"click",function(){var e=0|this.getAttribute("data-page");e<1||e>i.pages||(i.curr=e,t.render())});p&&s.on(p,"change",function(){var e=this.value;i.curr*e>i.count&&(i.curr=Math.ceil(i.count/e)),i.limit=e,t.render()}),u&&s.on(u,"click",function(){c()})}},u.prototype.skip=function(e){if(e){var a=this,t=e[n]("input")[0];t&&s.on(t,"keyup",function(t){var n=this.value,i=t.keyCode;/^(37|38|39|40)$/.test(i)||(/\D/.test(n)&&(this.value=n.replace(/\D/,"")),13===i&&a.jump(e,!0))})}},u.prototype.render=function(e){var n=this,i=n.config,r=n.type(),u=n.view();2===r?i.elem&&(i.elem.innerHTML=u):3===r?i.elem.html(u):a[t](i.elem)&&(a[t](i.elem).innerHTML=u),i.jump&&i.jump(i,e);var s=a[t]("layui-laypage-"+i.index);n.jump(s),i.hash&&!e&&(location.hash="!"+i.hash+"="+i.curr),n.skip(s)};var s={render:function(e){var a=new u(e);return a.index},index:layui.laypage?layui.laypage.index+1e4:0,on:function(e,a,t){return e.attachEvent?e.attachEvent("on"+a,function(a){a.target=a.srcElement,t.call(e,a)}):e.addEventListener(a,t,!1),this}};e(i,s)});!function(){"use strict";var e=window.layui&&layui.define,t={getPath:function(){var e=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,n=t.length-1,a=n;a>0;a--)if("interactive"===t[a].readyState){e=t[a].src;break}return e||t[n].src}();return e.substring(0,e.lastIndexOf("/")+1)}(),getStyle:function(e,t){var n=e.currentStyle?e.currentStyle:window.getComputedStyle(e,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](t)},link:function(e,a,i){if(n.path){var r=document.getElementsByTagName("head")[0],o=document.createElement("link");"string"==typeof a&&(i=a);var s=(i||e).replace(/\.|\//g,""),l="layuicss-"+s,d=0;o.rel="stylesheet",o.href=n.path+e,o.id=l,document.getElementById(l)||r.appendChild(o),"function"==typeof a&&!function c(){return++d>80?window.console&&console.error("laydate.css: Invalid"):void(1989===parseInt(t.getStyle(document.getElementById(l),"width"))?a():setTimeout(c,100))}()}}},n={v:"5.0.9",config:{},index:window.laydate&&window.laydate.v?1e5:0,path:t.getPath,set:function(e){var t=this;return t.config=w.extend({},t.config,e),t},ready:function(a){var i="laydate",r="",o=(e?"modules/laydate/":"theme/")+"default/laydate.css?v="+n.v+r;return e?layui.addcss(o,a,i):t.link(o,a,i),this}},a=function(){var e=this;return{hint:function(t){e.hint.call(e,t)},config:e.config}},i="laydate",r=".layui-laydate",o="layui-this",s="laydate-disabled",l="开始日期超出了结束日期<br>建议重新选择",d=[100,2e5],c="layui-laydate-static",m="layui-laydate-list",u="laydate-selected",h="layui-laydate-hint",y="laydate-day-prev",f="laydate-day-next",p="layui-laydate-footer",g=".laydate-btns-confirm",v="laydate-time-text",D=".laydate-btns-time",T=function(e){var t=this;t.index=++n.index,t.config=w.extend({},t.config,n.config,e),n.ready(function(){t.init()})},w=function(e){return new C(e)},C=function(e){for(var t=0,n="object"==typeof e?[e]:(this.selector=e,document.querySelectorAll(e||null));t<n.length;t++)this.push(n[t])};C.prototype=[],C.prototype.constructor=C,w.extend=function(){var e=1,t=arguments,n=function(e,t){e=e||(t.constructor===Array?[]:{});for(var a in t)e[a]=t[a]&&t[a].constructor===Object?n(e[a],t[a]):t[a];return e};for(t[0]="object"==typeof t[0]?t[0]:{};e<t.length;e++)"object"==typeof t[e]&&n(t[0],t[e]);return t[0]},w.ie=function(){var e=navigator.userAgent.toLowerCase();return!!(window.ActiveXObject||"ActiveXObject"in window)&&((e.match(/msie\s(\d+)/)||[])[1]||"11")}(),w.stope=function(e){e=e||window.event,e.stopPropagation?e.stopPropagation():e.cancelBubble=!0},w.each=function(e,t){var n,a=this;if("function"!=typeof t)return a;if(e=e||[],e.constructor===Object){for(n in e)if(t.call(e[n],n,e[n]))break}else for(n=0;n<e.length&&!t.call(e[n],n,e[n]);n++);return a},w.digit=function(e,t,n){var a="";e=String(e),t=t||2;for(var i=e.length;i<t;i++)a+="0";return e<Math.pow(10,t)?a+(0|e):e},w.elem=function(e,t){var n=document.createElement(e);return w.each(t||{},function(e,t){n.setAttribute(e,t)}),n},C.addStr=function(e,t){return e=e.replace(/\s+/," "),t=t.replace(/\s+/," ").split(" "),w.each(t,function(t,n){new RegExp("\\b"+n+"\\b").test(e)||(e=e+" "+n)}),e.replace(/^\s|\s$/,"")},C.removeStr=function(e,t){return e=e.replace(/\s+/," "),t=t.replace(/\s+/," ").split(" "),w.each(t,function(t,n){var a=new RegExp("\\b"+n+"\\b");a.test(e)&&(e=e.replace(a,""))}),e.replace(/\s+/," ").replace(/^\s|\s$/,"")},C.prototype.find=function(e){var t=this,n=0,a=[],i="object"==typeof e;return this.each(function(r,o){for(var s=i?[e]:o.querySelectorAll(e||null);n<s.length;n++)a.push(s[n]);t.shift()}),i||(t.selector=(t.selector?t.selector+" ":"")+e),w.each(a,function(e,n){t.push(n)}),t},C.prototype.each=function(e){return w.each.call(this,this,e)},C.prototype.addClass=function(e,t){return this.each(function(n,a){a.className=C[t?"removeStr":"addStr"](a.className,e)})},C.prototype.removeClass=function(e){return this.addClass(e,!0)},C.prototype.hasClass=function(e){var t=!1;return this.each(function(n,a){new RegExp("\\b"+e+"\\b").test(a.className)&&(t=!0)}),t},C.prototype.attr=function(e,t){var n=this;return void 0===t?function(){if(n.length>0)return n[0].getAttribute(e)}():n.each(function(n,a){a.setAttribute(e,t)})},C.prototype.removeAttr=function(e){return this.each(function(t,n){n.removeAttribute(e)})},C.prototype.html=function(e){return this.each(function(t,n){n.innerHTML=e})},C.prototype.val=function(e){return this.each(function(t,n){n.value=e})},C.prototype.append=function(e){return this.each(function(t,n){"object"==typeof e?n.appendChild(e):n.innerHTML=n.innerHTML+e})},C.prototype.remove=function(e){return this.each(function(t,n){e?n.removeChild(e):n.parentNode.removeChild(n)})},C.prototype.on=function(e,t){return this.each(function(n,a){a.attachEvent?a.attachEvent("on"+e,function(e){e.target=e.srcElement,t.call(a,e)}):a.addEventListener(e,t,!1)})},C.prototype.off=function(e,t){return this.each(function(n,a){a.detachEvent?a.detachEvent("on"+e,t):a.removeEventListener(e,t,!1)})},T.isLeapYear=function(e){return e%4===0&&e%100!==0||e%400===0},T.prototype.config={type:"date",range:!1,format:"yyyy-MM-dd",value:null,isInitValue:!0,min:"1900-1-1",max:"2099-12-31",trigger:"focus",show:!1,showBottom:!0,btns:["clear","now","confirm"],lang:"cn",theme:"default",position:null,calendar:!1,mark:{},zIndex:null,done:null,change:null},T.prototype.lang=function(){var e=this,t=e.config,n={cn:{weeks:["日","一","二","三","四","五","六"],time:["时","分","秒"],timeTips:"选择时间",startTime:"开始时间",endTime:"结束时间",dateTips:"返回日期",month:["一","二","三","四","五","六","七","八","九","十","十一","十二"],tools:{confirm:"确定",clear:"清空",now:"现在"}},en:{weeks:["Su","Mo","Tu","We","Th","Fr","Sa"],time:["Hours","Minutes","Seconds"],timeTips:"Select Time",startTime:"Start Time",endTime:"End Time",dateTips:"Select Date",month:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],tools:{confirm:"Confirm",clear:"Clear",now:"Now"}}};return n[t.lang]||n.cn},T.prototype.init=function(){var e=this,t=e.config,n="yyyy|y|MM|M|dd|d|HH|H|mm|m|ss|s",a="static"===t.position,i={year:"yyyy",month:"yyyy-MM",date:"yyyy-MM-dd",time:"HH:mm:ss",datetime:"yyyy-MM-dd HH:mm:ss"};t.elem=w(t.elem),t.eventElem=w(t.eventElem),t.elem[0]&&(t.range===!0&&(t.range="-"),t.format===i.date&&(t.format=i[t.type]),e.format=t.format.match(new RegExp(n+"|.","g"))||[],e.EXP_IF="",e.EXP_SPLIT="",w.each(e.format,function(t,a){var i=new RegExp(n).test(a)?"\\d{"+function(){return new RegExp(n).test(e.format[0===t?t+1:t-1]||"")?/^yyyy|y$/.test(a)?4:a.length:/^yyyy$/.test(a)?"1,4":/^y$/.test(a)?"1,308":"1,2"}()+"}":"\\"+a;e.EXP_IF=e.EXP_IF+i,e.EXP_SPLIT=e.EXP_SPLIT+"("+i+")"}),e.EXP_IF=new RegExp("^"+(t.range?e.EXP_IF+"\\s\\"+t.range+"\\s"+e.EXP_IF:e.EXP_IF)+"$"),e.EXP_SPLIT=new RegExp("^"+e.EXP_SPLIT+"$",""),e.isInput(t.elem[0])||"focus"===t.trigger&&(t.trigger="click"),t.elem.attr("lay-key")||(t.elem.attr("lay-key",e.index),t.eventElem.attr("lay-key",e.index)),t.mark=w.extend({},t.calendar&&"cn"===t.lang?{"0-1-1":"元旦","0-2-14":"情人","0-3-8":"妇女","0-3-12":"植树","0-4-1":"愚人","0-5-1":"劳动","0-5-4":"青年","0-6-1":"儿童","0-9-10":"教师","0-9-18":"国耻","0-10-1":"国庆","0-12-25":"圣诞"}:{},t.mark),w.each(["min","max"],function(e,n){var a=[],i=[];if("number"==typeof t[n]){var r=t[n],o=(new Date).getTime(),s=864e5,l=new Date(r?r<s?o+r*s:r:o);a=[l.getFullYear(),l.getMonth()+1,l.getDate()],r<s||(i=[l.getHours(),l.getMinutes(),l.getSeconds()])}else a=(t[n].match(/\d+-\d+-\d+/)||[""])[0].split("-"),i=(t[n].match(/\d+:\d+:\d+/)||[""])[0].split(":");t[n]={year:0|a[0]||(new Date).getFullYear(),month:a[1]?(0|a[1])-1:(new Date).getMonth(),date:0|a[2]||(new Date).getDate(),hours:0|i[0],minutes:0|i[1],seconds:0|i[2]}}),e.elemID="layui-laydate"+t.elem.attr("lay-key"),(t.show||a)&&e.render(),a||e.events(),t.value&&t.isInitValue&&(t.value.constructor===Date?e.setValue(e.parse(0,e.systemDate(t.value))):e.setValue(t.value)))},T.prototype.render=function(){var e=this,t=e.config,n=e.lang(),a="static"===t.position,i=e.elem=w.elem("div",{id:e.elemID,"class":["layui-laydate",t.range?" layui-laydate-range":"",a?" "+c:"",t.theme&&"default"!==t.theme&&!/^#/.test(t.theme)?" laydate-theme-"+t.theme:""].join("")}),r=e.elemMain=[],o=e.elemHeader=[],s=e.elemCont=[],l=e.table=[],d=e.footer=w.elem("div",{"class":p});if(t.zIndex&&(i.style.zIndex=t.zIndex),w.each(new Array(2),function(e){if(!t.range&&e>0)return!0;var a=w.elem("div",{"class":"layui-laydate-header"}),i=[function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-prev-y"});return e.innerHTML="",e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-prev-m"});return e.innerHTML="",e}(),function(){var e=w.elem("div",{"class":"laydate-set-ym"}),t=w.elem("span"),n=w.elem("span");return e.appendChild(t),e.appendChild(n),e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-next-m"});return e.innerHTML="",e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-next-y"});return e.innerHTML="",e}()],d=w.elem("div",{"class":"layui-laydate-content"}),c=w.elem("table"),m=w.elem("thead"),u=w.elem("tr");w.each(i,function(e,t){a.appendChild(t)}),m.appendChild(u),w.each(new Array(6),function(e){var t=c.insertRow(0);w.each(new Array(7),function(a){if(0===e){var i=w.elem("th");i.innerHTML=n.weeks[a],u.appendChild(i)}t.insertCell(a)})}),c.insertBefore(m,c.children[0]),d.appendChild(c),r[e]=w.elem("div",{"class":"layui-laydate-main laydate-main-list-"+e}),r[e].appendChild(a),r[e].appendChild(d),o.push(i),s.push(d),l.push(c)}),w(d).html(function(){var e=[],i=[];return"datetime"===t.type&&e.push('<span lay-type="datetime" class="laydate-btns-time">'+n.timeTips+"</span>"),w.each(t.btns,function(e,r){var o=n.tools[r]||"btn";t.range&&"now"===r||(a&&"clear"===r&&(o="cn"===t.lang?"重置":"Reset"),i.push('<span lay-type="'+r+'" class="laydate-btns-'+r+'">'+o+"</span>"))}),e.push('<div class="laydate-footer-btns">'+i.join("")+"</div>"),e.join("")}()),w.each(r,function(e,t){i.appendChild(t)}),t.showBottom&&i.appendChild(d),/^#/.test(t.theme)){var m=w.elem("style"),u=["#{{id}} .layui-laydate-header{background-color:{{theme}};}","#{{id}} .layui-this{background-color:{{theme}} !important;}"].join("").replace(/{{id}}/g,e.elemID).replace(/{{theme}}/g,t.theme);"styleSheet"in m?(m.setAttribute("type","text/css"),m.styleSheet.cssText=u):m.innerHTML=u,w(i).addClass("laydate-theme-molv"),i.appendChild(m)}e.remove(T.thisElemDate),a?t.elem.append(i):(document.body.appendChild(i),e.position()),e.checkDate().calendar(),e.changeEvent(),T.thisElemDate=e.elemID,"function"==typeof t.ready&&t.ready(w.extend({},t.dateTime,{month:t.dateTime.month+1}))},T.prototype.remove=function(e){var t=this,n=(t.config,w("#"+(e||t.elemID)));return n.hasClass(c)||t.checkDate(function(){n.remove()}),t},T.prototype.position=function(){var e=this,t=e.config,n=e.bindElem||t.elem[0],a=n.getBoundingClientRect(),i=e.elem.offsetWidth,r=e.elem.offsetHeight,o=function(e){return e=e?"scrollLeft":"scrollTop",document.body[e]|document.documentElement[e]},s=function(e){return document.documentElement[e?"clientWidth":"clientHeight"]},l=5,d=a.left,c=a.bottom;d+i+l>s("width")&&(d=s("width")-i-l),c+r+l>s()&&(c=a.top>r?a.top-r:s()-r,c-=2*l),t.position&&(e.elem.style.position=t.position),e.elem.style.left=d+("fixed"===t.position?0:o(1))+"px",e.elem.style.top=c+("fixed"===t.position?0:o())+"px"},T.prototype.hint=function(e){var t=this,n=(t.config,w.elem("div",{"class":h}));t.elem&&(n.innerHTML=e||"",w(t.elem).find("."+h).remove(),t.elem.appendChild(n),clearTimeout(t.hinTimer),t.hinTimer=setTimeout(function(){w(t.elem).find("."+h).remove()},3e3))},T.prototype.getAsYM=function(e,t,n){return n?t--:t++,t<0&&(t=11,e--),t>11&&(t=0,e++),[e,t]},T.prototype.systemDate=function(e){var t=e||new Date;return{year:t.getFullYear(),month:t.getMonth(),date:t.getDate(),hours:e?e.getHours():0,minutes:e?e.getMinutes():0,seconds:e?e.getSeconds():0}},T.prototype.checkDate=function(e){var t,a,i=this,r=(new Date,i.config),o=r.dateTime=r.dateTime||i.systemDate(),s=i.bindElem||r.elem[0],l=(i.isInput(s)?"val":"html",i.isInput(s)?s.value:"static"===r.position?"":s.innerHTML),c=function(e){e.year>d[1]&&(e.year=d[1],a=!0),e.month>11&&(e.month=11,a=!0),e.hours>23&&(e.hours=0,a=!0),e.minutes>59&&(e.minutes=0,e.hours++,a=!0),e.seconds>59&&(e.seconds=0,e.minutes++,a=!0),t=n.getEndDate(e.month+1,e.year),e.date>t&&(e.date=t,a=!0)},m=function(e,t,n){var o=["startTime","endTime"];t=(t.match(i.EXP_SPLIT)||[]).slice(1),n=n||0,r.range&&(i[o[n]]=i[o[n]]||{}),w.each(i.format,function(s,l){var c=parseFloat(t[s]);t[s].length<l.length&&(a=!0),/yyyy|y/.test(l)?(c<d[0]&&(c=d[0],a=!0),e.year=c):/MM|M/.test(l)?(c<1&&(c=1,a=!0),e.month=c-1):/dd|d/.test(l)?(c<1&&(c=1,a=!0),e.date=c):/HH|H/.test(l)?(c<1&&(c=0,a=!0),e.hours=c,r.range&&(i[o[n]].hours=c)):/mm|m/.test(l)?(c<1&&(c=0,a=!0),e.minutes=c,r.range&&(i[o[n]].minutes=c)):/ss|s/.test(l)&&(c<1&&(c=0,a=!0),e.seconds=c,r.range&&(i[o[n]].seconds=c))}),c(e)};return"limit"===e?(c(o),i):(l=l||r.value,"string"==typeof l&&(l=l.replace(/\s+/g," ").replace(/^\s|\s$/g,"")),i.startState&&!i.endState&&(delete i.startState,i.endState=!0),"string"==typeof l&&l?i.EXP_IF.test(l)?r.range?(l=l.split(" "+r.range+" "),i.startDate=i.startDate||i.systemDate(),i.endDate=i.endDate||i.systemDate(),r.dateTime=w.extend({},i.startDate),w.each([i.startDate,i.endDate],function(e,t){m(t,l[e],e)})):m(o,l):(i.hint("日期格式不合法<br>必须遵循下述格式：<br>"+(r.range?r.format+" "+r.range+" "+r.format:r.format)+"<br>已为你重置"),a=!0):l&&l.constructor===Date?r.dateTime=i.systemDate(l):(r.dateTime=i.systemDate(),delete i.startState,delete i.endState,delete i.startDate,delete i.endDate,delete i.startTime,delete i.endTime),c(o),a&&l&&i.setValue(r.range?i.endDate?i.parse():"":i.parse()),e&&e(),i)},T.prototype.mark=function(e,t){var n,a=this,i=a.config;return w.each(i.mark,function(e,a){var i=e.split("-");i[0]!=t[0]&&0!=i[0]||i[1]!=t[1]&&0!=i[1]||i[2]!=t[2]||(n=a||t[2])}),n&&e.html('<span class="laydate-day-mark">'+n+"</span>"),a},T.prototype.limit=function(e,t,n,a){var i,r=this,o=r.config,l={},d=o[n>41?"endDate":"dateTime"],c=w.extend({},d,t||{});return w.each({now:c,min:o.min,max:o.max},function(e,t){l[e]=r.newDate(w.extend({year:t.year,month:t.month,date:t.date},function(){var e={};return w.each(a,function(n,a){e[a]=t[a]}),e}())).getTime()}),i=l.now<l.min||l.now>l.max,e&&e[i?"addClass":"removeClass"](s),i},T.prototype.calendar=function(e){var t,a,i,r=this,s=r.config,l=e||s.dateTime,c=new Date,m=r.lang(),u="date"!==s.type&&"datetime"!==s.type,h=e?1:0,y=w(r.table[h]).find("td"),f=w(r.elemHeader[h][2]).find("span");if(l.year<d[0]&&(l.year=d[0],r.hint("最低只能支持到公元"+d[0]+"年")),l.year>d[1]&&(l.year=d[1],r.hint("最高只能支持到公元"+d[1]+"年")),r.firstDate||(r.firstDate=w.extend({},l)),c.setFullYear(l.year,l.month,1),t=c.getDay(),a=n.getEndDate(l.month||12,l.year),i=n.getEndDate(l.month+1,l.year),w.each(y,function(e,n){var d=[l.year,l.month],c=0;n=w(n),n.removeAttr("class"),e<t?(c=a-t+e,n.addClass("laydate-day-prev"),d=r.getAsYM(l.year,l.month,"sub")):e>=t&&e<i+t?(c=e-t,s.range||c+1===l.date&&n.addClass(o)):(c=e-i-t,n.addClass("laydate-day-next"),d=r.getAsYM(l.year,l.month)),d[1]++,d[2]=c+1,n.attr("lay-ymd",d.join("-")).html(d[2]),r.mark(n,d).limit(n,{year:d[0],month:d[1]-1,date:d[2]},e)}),w(f[0]).attr("lay-ym",l.year+"-"+(l.month+1)),w(f[1]).attr("lay-ym",l.year+"-"+(l.month+1)),"cn"===s.lang?(w(f[0]).attr("lay-type","year").html(l.year+"年"),w(f[1]).attr("lay-type","month").html(l.month+1+"月")):(w(f[0]).attr("lay-type","month").html(m.month[l.month]),w(f[1]).attr("lay-type","year").html(l.year)),u&&(s.range&&(e?r.endDate=r.endDate||{year:l.year+("year"===s.type?1:0),month:l.month+("month"===s.type?0:-1)}:r.startDate=r.startDate||{year:l.year,month:l.month},e&&(r.listYM=[[r.startDate.year,r.startDate.month+1],[r.endDate.year,r.endDate.month+1]],r.list(s.type,0).list(s.type,1),"time"===s.type?r.setBtnStatus("时间",w.extend({},r.systemDate(),r.startTime),w.extend({},r.systemDate(),r.endTime)):r.setBtnStatus(!0))),s.range||(r.listYM=[[l.year,l.month+1]],r.list(s.type,0))),s.range&&!e){var p=r.getAsYM(l.year,l.month);r.calendar(w.extend({},l,{year:p[0],month:p[1]}))}return s.range||r.limit(w(r.footer).find(g),null,0,["hours","minutes","seconds"]),s.range&&e&&!u&&r.stampRange(),r},T.prototype.list=function(e,t){var n=this,a=n.config,i=a.dateTime,r=n.lang(),l=a.range&&"date"!==a.type&&"datetime"!==a.type,d=w.elem("ul",{"class":m+" "+{year:"laydate-year-list",month:"laydate-month-list",time:"laydate-time-list"}[e]}),c=n.elemHeader[t],u=w(c[2]).find("span"),h=n.elemCont[t||0],y=w(h).find("."+m)[0],f="cn"===a.lang,p=f?"年":"",T=n.listYM[t]||{},C=["hours","minutes","seconds"],x=["startTime","endTime"][t];if(T[0]<1&&(T[0]=1),"year"===e){var M,b=M=T[0]-7;b<1&&(b=M=1),w.each(new Array(15),function(e){var i=w.elem("li",{"lay-ym":M}),r={year:M};M==T[0]&&w(i).addClass(o),i.innerHTML=M+p,d.appendChild(i),M<n.firstDate.year?(r.month=a.min.month,r.date=a.min.date):M>=n.firstDate.year&&(r.month=a.max.month,r.date=a.max.date),n.limit(w(i),r,t),M++}),w(u[f?0:1]).attr("lay-ym",M-8+"-"+T[1]).html(b+p+" - "+(M-1+p))}else if("month"===e)w.each(new Array(12),function(e){var i=w.elem("li",{"lay-ym":e}),s={year:T[0],month:e};e+1==T[1]&&w(i).addClass(o),i.innerHTML=r.month[e]+(f?"月":""),d.appendChild(i),T[0]<n.firstDate.year?s.date=a.min.date:T[0]>=n.firstDate.year&&(s.date=a.max.date),n.limit(w(i),s,t)}),w(u[f?0:1]).attr("lay-ym",T[0]+"-"+T[1]).html(T[0]+p);else if("time"===e){var E=function(){w(d).find("ol").each(function(e,a){w(a).find("li").each(function(a,i){n.limit(w(i),[{hours:a},{hours:n[x].hours,minutes:a},{hours:n[x].hours,minutes:n[x].minutes,seconds:a}][e],t,[["hours"],["hours","minutes"],["hours","minutes","seconds"]][e])})}),a.range||n.limit(w(n.footer).find(g),n[x],0,["hours","minutes","seconds"])};a.range?n[x]||(n[x]={hours:0,minutes:0,seconds:0}):n[x]=i,w.each([24,60,60],function(e,t){var a=w.elem("li"),i=["<p>"+r.time[e]+"</p><ol>"];w.each(new Array(t),function(t){i.push("<li"+(n[x][C[e]]===t?' class="'+o+'"':"")+">"+w.digit(t,2)+"</li>")}),a.innerHTML=i.join("")+"</ol>",d.appendChild(a)}),E()}if(y&&h.removeChild(y),h.appendChild(d),"year"===e||"month"===e)w(n.elemMain[t]).addClass("laydate-ym-show"),w(d).find("li").on("click",function(){var r=0|w(this).attr("lay-ym");if(!w(this).hasClass(s)){if(0===t)i[e]=r,l&&(n.startDate[e]=r),n.limit(w(n.footer).find(g),null,0);else if(l)n.endDate[e]=r;else{var c="year"===e?n.getAsYM(r,T[1]-1,"sub"):n.getAsYM(T[0],r,"sub");w.extend(i,{year:c[0],month:c[1]})}"year"===a.type||"month"===a.type?(w(d).find("."+o).removeClass(o),w(this).addClass(o),"month"===a.type&&"year"===e&&(n.listYM[t][0]=r,l&&(n[["startDate","endDate"][t]].year=r),n.list("month",t))):(n.checkDate("limit").calendar(),n.closeList()),n.setBtnStatus(),a.range||n.done(null,"change"),w(n.footer).find(D).removeClass(s)}});else{var S=w.elem("span",{"class":v}),k=function(){w(d).find("ol").each(function(e){var t=this,a=w(t).find("li");t.scrollTop=30*(n[x][C[e]]-2),t.scrollTop<=0&&a.each(function(e,n){if(!w(this).hasClass(s))return t.scrollTop=30*(e-2),!0})})},H=w(c[2]).find("."+v);k(),S.innerHTML=a.range?[r.startTime,r.endTime][t]:r.timeTips,w(n.elemMain[t]).addClass("laydate-time-show"),H[0]&&H.remove(),c[2].appendChild(S),w(d).find("ol").each(function(e){var t=this;w(t).find("li").on("click",function(){var r=0|this.innerHTML;w(this).hasClass(s)||(a.range?n[x][C[e]]=r:i[C[e]]=r,w(t).find("."+o).removeClass(o),w(this).addClass(o),E(),k(),(n.endDate||"time"===a.type)&&n.done(null,"change"),n.setBtnStatus())})})}return n},T.prototype.listYM=[],T.prototype.closeList=function(){var e=this;e.config;w.each(e.elemCont,function(t,n){w(this).find("."+m).remove(),w(e.elemMain[t]).removeClass("laydate-ym-show laydate-time-show")}),w(e.elem).find("."+v).remove()},T.prototype.setBtnStatus=function(e,t,n){var a,i=this,r=i.config,o=w(i.footer).find(g),d=r.range&&"date"!==r.type&&"time"!==r.type;d&&(t=t||i.startDate,n=n||i.endDate,a=i.newDate(t).getTime()>i.newDate(n).getTime(),i.limit(null,t)||i.limit(null,n)?o.addClass(s):o[a?"addClass":"removeClass"](s),e&&a&&i.hint("string"==typeof e?l.replace(/日期/g,e):l))},T.prototype.parse=function(e,t){var n=this,a=n.config,i=t||(e?w.extend({},n.endDate,n.endTime):a.range?w.extend({},n.startDate,n.startTime):a.dateTime),r=n.format.concat();return w.each(r,function(e,t){/yyyy|y/.test(t)?r[e]=w.digit(i.year,t.length):/MM|M/.test(t)?r[e]=w.digit(i.month+1,t.length):/dd|d/.test(t)?r[e]=w.digit(i.date,t.length):/HH|H/.test(t)?r[e]=w.digit(i.hours,t.length):/mm|m/.test(t)?r[e]=w.digit(i.minutes,t.length):/ss|s/.test(t)&&(r[e]=w.digit(i.seconds,t.length))}),a.range&&!e?r.join("")+" "+a.range+" "+n.parse(1):r.join("")},T.prototype.newDate=function(e){return e=e||{},new Date(e.year||1,e.month||0,e.date||1,e.hours||0,e.minutes||0,e.seconds||0)},T.prototype.setValue=function(e){var t=this,n=t.config,a=t.bindElem||n.elem[0],i=t.isInput(a)?"val":"html";return"static"===n.position||w(a)[i](e||""),this},T.prototype.stampRange=function(){var e,t,n=this,a=n.config,i=w(n.elem).find("td");if(a.range&&!n.endDate&&w(n.footer).find(g).addClass(s),n.endDate)return e=n.newDate({year:n.startDate.year,month:n.startDate.month,date:n.startDate.date}).getTime(),t=n.newDate({year:n.endDate.year,month:n.endDate.month,date:n.endDate.date}).getTime(),e>t?n.hint(l):void w.each(i,function(a,i){var r=w(i).attr("lay-ymd").split("-"),s=n.newDate({year:r[0],month:r[1]-1,date:r[2]}).getTime();w(i).removeClass(u+" "+o),s!==e&&s!==t||w(i).addClass(w(i).hasClass(y)||w(i).hasClass(f)?u:o),s>e&&s<t&&w(i).addClass(u)})},T.prototype.done=function(e,t){var n=this,a=n.config,i=w.extend({},n.startDate?w.extend(n.startDate,n.startTime):a.dateTime),r=w.extend({},w.extend(n.endDate,n.endTime));return w.each([i,r],function(e,t){"month"in t&&w.extend(t,{month:t.month+1})}),e=e||[n.parse(),i,r],"function"==typeof a[t||"done"]&&a[t||"done"].apply(a,e),n},T.prototype.choose=function(e){var t=this,n=t.config,a=n.dateTime,i=w(t.elem).find("td"),r=e.attr("lay-ymd").split("-"),l=function(e){new Date;e&&w.extend(a,r),n.range&&(t.startDate?w.extend(t.startDate,r):t.startDate=w.extend({},r,t.startTime),t.startYMD=r)};if(r={year:0|r[0],month:(0|r[1])-1,date:0|r[2]},!e.hasClass(s))if(n.range){if(w.each(["startTime","endTime"],function(e,n){t[n]=t[n]||{hours:0,minutes:0,seconds:0}}),t.endState)l(),delete t.endState,delete t.endDate,t.startState=!0,i.removeClass(o+" "+u),e.addClass(o);else if(t.startState){if(e.addClass(o),t.endDate?w.extend(t.endDate,r):t.endDate=w.extend({},r,t.endTime),t.newDate(r).getTime()<t.newDate(t.startYMD).getTime()){var d=w.extend({},t.endDate,{hours:t.startDate.hours,minutes:t.startDate.minutes,seconds:t.startDate.seconds});w.extend(t.endDate,t.startDate,{hours:t.endDate.hours,minutes:t.endDate.minutes,seconds:t.endDate.seconds}),t.startDate=d}n.showBottom||t.done(),t.stampRange(),t.endState=!0,t.done(null,"change")}else e.addClass(o),l(),t.startState=!0;w(t.footer).find(g)[t.endDate?"removeClass":"addClass"](s)}else"static"===n.position?(l(!0),t.calendar().done().done(null,"change")):"date"===n.type?(l(!0),t.setValue(t.parse()).remove().done()):"datetime"===n.type&&(l(!0),t.calendar().done(null,"change"))},T.prototype.tool=function(e,t){var n=this,a=n.config,i=a.dateTime,r="static"===a.position,o={datetime:function(){w(e).hasClass(s)||(n.list("time",0),a.range&&n.list("time",1),w(e).attr("lay-type","date").html(n.lang().dateTips))},date:function(){n.closeList(),w(e).attr("lay-type","datetime").html(n.lang().timeTips)},clear:function(){n.setValue("").remove(),r&&(w.extend(i,n.firstDate),n.calendar()),a.range&&(delete n.startState,delete n.endState,delete n.endDate,delete n.startTime,delete n.endTime),n.done(["",{},{}])},now:function(){var e=new Date;w.extend(i,n.systemDate(),{hours:e.getHours(),minutes:e.getMinutes(),seconds:e.getSeconds()}),n.setValue(n.parse()).remove(),r&&n.calendar(),n.done()},confirm:function(){if(a.range){if(!n.endDate)return n.hint("请先选择日期范围");if(w(e).hasClass(s))return n.hint("time"===a.type?l.replace(/日期/g,"时间"):l)}else if(w(e).hasClass(s))return n.hint("不在有效日期或时间范围内");n.done(),n.setValue(n.parse()).remove()}};o[t]&&o[t]()},T.prototype.change=function(e){var t=this,n=t.config,a=n.dateTime,i=n.range&&("year"===n.type||"month"===n.type),r=t.elemCont[e||0],o=t.listYM[e],s=function(s){var l=["startDate","endDate"][e],d=w(r).find(".laydate-year-list")[0],c=w(r).find(".laydate-month-list")[0];return d&&(o[0]=s?o[0]-15:o[0]+15,t.list("year",e)),c&&(s?o[0]--:o[0]++,t.list("month",e)),(d||c)&&(w.extend(a,{year:o[0]}),i&&(t[l].year=o[0]),n.range||t.done(null,"change"),t.setBtnStatus(),n.range||t.limit(w(t.footer).find(g),{year:o[0]})),d||c};return{prevYear:function(){s("sub")||(a.year--,t.checkDate("limit").calendar(),n.range||t.done(null,"change"))},prevMonth:function(){var e=t.getAsYM(a.year,a.month,"sub");w.extend(a,{year:e[0],month:e[1]}),t.checkDate("limit").calendar(),n.range||t.done(null,"change")},nextMonth:function(){var e=t.getAsYM(a.year,a.month);w.extend(a,{year:e[0],month:e[1]}),t.checkDate("limit").calendar(),n.range||t.done(null,"change")},nextYear:function(){s()||(a.year++,t.checkDate("limit").calendar(),n.range||t.done(null,"change"))}}},T.prototype.changeEvent=function(){var e=this;e.config;w(e.elem).on("click",function(e){w.stope(e)}),w.each(e.elemHeader,function(t,n){w(n[0]).on("click",function(n){e.change(t).prevYear()}),w(n[1]).on("click",function(n){e.change(t).prevMonth()}),w(n[2]).find("span").on("click",function(n){var a=w(this),i=a.attr("lay-ym"),r=a.attr("lay-type");i&&(i=i.split("-"),e.listYM[t]=[0|i[0],0|i[1]],e.list(r,t),w(e.footer).find(D).addClass(s))}),w(n[3]).on("click",function(n){e.change(t).nextMonth()}),w(n[4]).on("click",function(n){e.change(t).nextYear()})}),w.each(e.table,function(t,n){var a=w(n).find("td");a.on("click",function(){e.choose(w(this))})}),w(e.footer).find("span").on("click",function(){var t=w(this).attr("lay-type");e.tool(this,t)})},T.prototype.isInput=function(e){return/input|textarea/.test(e.tagName.toLocaleLowerCase())},T.prototype.events=function(){var e=this,t=e.config,n=function(n,a){n.on(t.trigger,function(){a&&(e.bindElem=this),e.render()})};t.elem[0]&&!t.elem[0].eventHandler&&(n(t.elem,"bind"),n(t.eventElem),w(document).on("click",function(n){n.target!==t.elem[0]&&n.target!==t.eventElem[0]&&n.target!==w(t.closeStop)[0]&&e.remove()}).on("keydown",function(t){13===t.keyCode&&w("#"+e.elemID)[0]&&e.elemID===T.thisElem&&(t.preventDefault(),w(e.footer).find(g)[0].click())}),w(window).on("resize",function(){return!(!e.elem||!w(r)[0])&&void e.position()}),t.elem[0].eventHandler=!0)},n.render=function(e){var t=new T(e);return a.call(t)},n.getEndDate=function(e,t){var n=new Date;return n.setFullYear(t||n.getFullYear(),e||n.getMonth()+1,1),new Date(n.getTime()-864e5).getDate()},window.lay=window.lay||w,e?(n.ready(),layui.define(function(e){n.path=layui.cache.dir,e(i,n)})):"function"==typeof define&&define.amd?define(function(){return n}):function(){n.ready(),window.laydate=n}()}();!function(e,t){"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){function n(e){var t=!!e&&"length"in e&&e.length,n=pe.type(e);return"function"!==n&&!pe.isWindow(e)&&("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e)}function r(e,t,n){if(pe.isFunction(t))return pe.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return pe.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(Ce.test(t))return pe.filter(t,e,n);t=pe.filter(t,e)}return pe.grep(e,function(e){return pe.inArray(e,t)>-1!==n})}function i(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function o(e){var t={};return pe.each(e.match(De)||[],function(e,n){t[n]=!0}),t}function a(){re.addEventListener?(re.removeEventListener("DOMContentLoaded",s),e.removeEventListener("load",s)):(re.detachEvent("onreadystatechange",s),e.detachEvent("onload",s))}function s(){(re.addEventListener||"load"===e.event.type||"complete"===re.readyState)&&(a(),pe.ready())}function u(e,t,n){if(void 0===n&&1===e.nodeType){var r="data-"+t.replace(_e,"-$1").toLowerCase();if(n=e.getAttribute(r),"string"==typeof n){try{n="true"===n||"false"!==n&&("null"===n?null:+n+""===n?+n:qe.test(n)?pe.parseJSON(n):n)}catch(i){}pe.data(e,t,n)}else n=void 0}return n}function l(e){var t;for(t in e)if(("data"!==t||!pe.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function c(e,t,n,r){if(He(e)){var i,o,a=pe.expando,s=e.nodeType,u=s?pe.cache:e,l=s?e[a]:e[a]&&a;if(l&&u[l]&&(r||u[l].data)||void 0!==n||"string"!=typeof t)return l||(l=s?e[a]=ne.pop()||pe.guid++:a),u[l]||(u[l]=s?{}:{toJSON:pe.noop}),"object"!=typeof t&&"function"!=typeof t||(r?u[l]=pe.extend(u[l],t):u[l].data=pe.extend(u[l].data,t)),o=u[l],r||(o.data||(o.data={}),o=o.data),void 0!==n&&(o[pe.camelCase(t)]=n),"string"==typeof t?(i=o[t],null==i&&(i=o[pe.camelCase(t)])):i=o,i}}function f(e,t,n){if(He(e)){var r,i,o=e.nodeType,a=o?pe.cache:e,s=o?e[pe.expando]:pe.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){pe.isArray(t)?t=t.concat(pe.map(t,pe.camelCase)):t in r?t=[t]:(t=pe.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;for(;i--;)delete r[t[i]];if(n?!l(r):!pe.isEmptyObject(r))return}(n||(delete a[s].data,l(a[s])))&&(o?pe.cleanData([e],!0):fe.deleteExpando||a!=a.window?delete a[s]:a[s]=void 0)}}}function d(e,t,n,r){var i,o=1,a=20,s=r?function(){return r.cur()}:function(){return pe.css(e,t,"")},u=s(),l=n&&n[3]||(pe.cssNumber[t]?"":"px"),c=(pe.cssNumber[t]||"px"!==l&&+u)&&Me.exec(pe.css(e,t));if(c&&c[3]!==l){l=l||c[3],n=n||[],c=+u||1;do o=o||".5",c/=o,pe.style(e,t,c+l);while(o!==(o=s()/u)&&1!==o&&--a)}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}function p(e){var t=ze.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function h(e,t){var n,r,i=0,o="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):void 0;if(!o)for(o=[],n=e.childNodes||e;null!=(r=n[i]);i++)!t||pe.nodeName(r,t)?o.push(r):pe.merge(o,h(r,t));return void 0===t||t&&pe.nodeName(e,t)?pe.merge([e],o):o}function g(e,t){for(var n,r=0;null!=(n=e[r]);r++)pe._data(n,"globalEval",!t||pe._data(t[r],"globalEval"))}function m(e){Be.test(e.type)&&(e.defaultChecked=e.checked)}function y(e,t,n,r,i){for(var o,a,s,u,l,c,f,d=e.length,y=p(t),v=[],x=0;x<d;x++)if(a=e[x],a||0===a)if("object"===pe.type(a))pe.merge(v,a.nodeType?[a]:a);else if(Ue.test(a)){for(u=u||y.appendChild(t.createElement("div")),l=(We.exec(a)||["",""])[1].toLowerCase(),f=Xe[l]||Xe._default,u.innerHTML=f[1]+pe.htmlPrefilter(a)+f[2],o=f[0];o--;)u=u.lastChild;if(!fe.leadingWhitespace&&$e.test(a)&&v.push(t.createTextNode($e.exec(a)[0])),!fe.tbody)for(a="table"!==l||Ve.test(a)?"<table>"!==f[1]||Ve.test(a)?0:u:u.firstChild,o=a&&a.childNodes.length;o--;)pe.nodeName(c=a.childNodes[o],"tbody")&&!c.childNodes.length&&a.removeChild(c);for(pe.merge(v,u.childNodes),u.textContent="";u.firstChild;)u.removeChild(u.firstChild);u=y.lastChild}else v.push(t.createTextNode(a));for(u&&y.removeChild(u),fe.appendChecked||pe.grep(h(v,"input"),m),x=0;a=v[x++];)if(r&&pe.inArray(a,r)>-1)i&&i.push(a);else if(s=pe.contains(a.ownerDocument,a),u=h(y.appendChild(a),"script"),s&&g(u),n)for(o=0;a=u[o++];)Ie.test(a.type||"")&&n.push(a);return u=null,y}function v(){return!0}function x(){return!1}function b(){try{return re.activeElement}catch(e){}}function w(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)w(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),i===!1)i=x;else if(!i)return e;return 1===o&&(a=i,i=function(e){return pe().off(e),a.apply(this,arguments)},i.guid=a.guid||(a.guid=pe.guid++)),e.each(function(){pe.event.add(this,t,i,r,n)})}function T(e,t){return pe.nodeName(e,"table")&&pe.nodeName(11!==t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function C(e){return e.type=(null!==pe.find.attr(e,"type"))+"/"+e.type,e}function E(e){var t=it.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function N(e,t){if(1===t.nodeType&&pe.hasData(e)){var n,r,i,o=pe._data(e),a=pe._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;r<i;r++)pe.event.add(t,n,s[n][r])}a.data&&(a.data=pe.extend({},a.data))}}function k(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!fe.noCloneEvent&&t[pe.expando]){i=pe._data(t);for(r in i.events)pe.removeEvent(t,r,i.handle);t.removeAttribute(pe.expando)}"script"===n&&t.text!==e.text?(C(t).text=e.text,E(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),fe.html5Clone&&e.innerHTML&&!pe.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Be.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:"input"!==n&&"textarea"!==n||(t.defaultValue=e.defaultValue)}}function S(e,t,n,r){t=oe.apply([],t);var i,o,a,s,u,l,c=0,f=e.length,d=f-1,p=t[0],g=pe.isFunction(p);if(g||f>1&&"string"==typeof p&&!fe.checkClone&&rt.test(p))return e.each(function(i){var o=e.eq(i);g&&(t[0]=p.call(this,i,o.html())),S(o,t,n,r)});if(f&&(l=y(t,e[0].ownerDocument,!1,e,r),i=l.firstChild,1===l.childNodes.length&&(l=i),i||r)){for(s=pe.map(h(l,"script"),C),a=s.length;c<f;c++)o=l,c!==d&&(o=pe.clone(o,!0,!0),a&&pe.merge(s,h(o,"script"))),n.call(e[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,pe.map(s,E),c=0;c<a;c++)o=s[c],Ie.test(o.type||"")&&!pe._data(o,"globalEval")&&pe.contains(u,o)&&(o.src?pe._evalUrl&&pe._evalUrl(o.src):pe.globalEval((o.text||o.textContent||o.innerHTML||"").replace(ot,"")));l=i=null}return e}function A(e,t,n){for(var r,i=t?pe.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||pe.cleanData(h(r)),r.parentNode&&(n&&pe.contains(r.ownerDocument,r)&&g(h(r,"script")),r.parentNode.removeChild(r));return e}function D(e,t){var n=pe(t.createElement(e)).appendTo(t.body),r=pe.css(n[0],"display");return n.detach(),r}function j(e){var t=re,n=lt[e];return n||(n=D(e,t),"none"!==n&&n||(ut=(ut||pe("<iframe frameborder='0' width='0' height='0'/>")).appendTo(t.documentElement),t=(ut[0].contentWindow||ut[0].contentDocument).document,t.write(),t.close(),n=D(e,t),ut.detach()),lt[e]=n),n}function L(e,t){return{get:function(){return e()?void delete this.get:(this.get=t).apply(this,arguments)}}}function H(e){if(e in Et)return e;for(var t=e.charAt(0).toUpperCase()+e.slice(1),n=Ct.length;n--;)if(e=Ct[n]+t,e in Et)return e}function q(e,t){for(var n,r,i,o=[],a=0,s=e.length;a<s;a++)r=e[a],r.style&&(o[a]=pe._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&Re(r)&&(o[a]=pe._data(r,"olddisplay",j(r.nodeName)))):(i=Re(r),(n&&"none"!==n||!i)&&pe._data(r,"olddisplay",i?n:pe.css(r,"display"))));for(a=0;a<s;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}function _(e,t,n){var r=bt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function F(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;o<4;o+=2)"margin"===n&&(a+=pe.css(e,n+Oe[o],!0,i)),r?("content"===n&&(a-=pe.css(e,"padding"+Oe[o],!0,i)),"margin"!==n&&(a-=pe.css(e,"border"+Oe[o]+"Width",!0,i))):(a+=pe.css(e,"padding"+Oe[o],!0,i),"padding"!==n&&(a+=pe.css(e,"border"+Oe[o]+"Width",!0,i)));return a}function M(t,n,r){var i=!0,o="width"===n?t.offsetWidth:t.offsetHeight,a=ht(t),s=fe.boxSizing&&"border-box"===pe.css(t,"boxSizing",!1,a);if(re.msFullscreenElement&&e.top!==e&&t.getClientRects().length&&(o=Math.round(100*t.getBoundingClientRect()[n])),o<=0||null==o){if(o=gt(t,n,a),(o<0||null==o)&&(o=t.style[n]),ft.test(o))return o;i=s&&(fe.boxSizingReliable()||o===t.style[n]),o=parseFloat(o)||0}return o+F(t,n,r||(s?"border":"content"),i,a)+"px"}function O(e,t,n,r,i){return new O.prototype.init(e,t,n,r,i)}function R(){return e.setTimeout(function(){Nt=void 0}),Nt=pe.now()}function P(e,t){var n,r={height:e},i=0;for(t=t?1:0;i<4;i+=2-t)n=Oe[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function B(e,t,n){for(var r,i=($.tweeners[t]||[]).concat($.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function W(e,t,n){var r,i,o,a,s,u,l,c,f=this,d={},p=e.style,h=e.nodeType&&Re(e),g=pe._data(e,"fxshow");n.queue||(s=pe._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,u=s.empty.fire,s.empty.fire=function(){s.unqueued||u()}),s.unqueued++,f.always(function(){f.always(function(){s.unqueued--,pe.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],l=pe.css(e,"display"),c="none"===l?pe._data(e,"olddisplay")||j(e.nodeName):l,"inline"===c&&"none"===pe.css(e,"float")&&(fe.inlineBlockNeedsLayout&&"inline"!==j(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",fe.shrinkWrapBlocks()||f.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],St.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(h?"hide":"show")){if("show"!==i||!g||void 0===g[r])continue;h=!0}d[r]=g&&g[r]||pe.style(e,r)}else l=void 0;if(pe.isEmptyObject(d))"inline"===("none"===l?j(e.nodeName):l)&&(p.display=l);else{g?"hidden"in g&&(h=g.hidden):g=pe._data(e,"fxshow",{}),o&&(g.hidden=!h),h?pe(e).show():f.done(function(){pe(e).hide()}),f.done(function(){var t;pe._removeData(e,"fxshow");for(t in d)pe.style(e,t,d[t])});for(r in d)a=B(h?g[r]:0,r,f),r in g||(g[r]=a.start,h&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function I(e,t){var n,r,i,o,a;for(n in e)if(r=pe.camelCase(n),i=t[r],o=e[n],pe.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=pe.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function $(e,t,n){var r,i,o=0,a=$.prefilters.length,s=pe.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var t=Nt||R(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;a<u;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),o<1&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:pe.extend({},t),opts:pe.extend(!0,{specialEasing:{},easing:pe.easing._default},n),originalProperties:t,originalOptions:n,startTime:Nt||R(),duration:n.duration,tweens:[],createTween:function(t,n){var r=pe.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;n<r;n++)l.tweens[n].run(1);return t?(s.notifyWith(e,[l,1,0]),s.resolveWith(e,[l,t])):s.rejectWith(e,[l,t]),this}}),c=l.props;for(I(c,l.opts.specialEasing);o<a;o++)if(r=$.prefilters[o].call(l,e,c,l.opts))return pe.isFunction(r.stop)&&(pe._queueHooks(l.elem,l.opts.queue).stop=pe.proxy(r.stop,r)),r;return pe.map(c,B,l),pe.isFunction(l.opts.start)&&l.opts.start.call(e,l),pe.fx.timer(pe.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function z(e){return pe.attr(e,"class")||""}function X(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(De)||[];if(pe.isFunction(n))for(;r=o[i++];)"+"===r.charAt(0)?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function U(e,t,n,r){function i(s){var u;return o[s]=!0,pe.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||a||o[l]?a?!(u=l):void 0:(t.dataTypes.unshift(l),i(l),!1)}),u}var o={},a=e===Qt;return i(t.dataTypes[0])||!o["*"]&&i("*")}function V(e,t){var n,r,i=pe.ajaxSettings.flatOptions||{};for(r in t)void 0!==t[r]&&((i[r]?e:n||(n={}))[r]=t[r]);return n&&pe.extend(!0,e,n),e}function Y(e,t,n){for(var r,i,o,a,s=e.contents,u=e.dataTypes;"*"===u[0];)u.shift(),void 0===i&&(i=e.mimeType||t.getResponseHeader("Content-Type"));if(i)for(a in s)if(s[a]&&s[a].test(i)){u.unshift(a);break}if(u[0]in n)o=u[0];else{for(a in n){if(!u[0]||e.converters[a+" "+u[0]]){o=a;break}r||(r=a)}o=o||r}if(o)return o!==u[0]&&u.unshift(o),n[o]}function J(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];for(o=c.shift();o;)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(a=l[u+" "+o]||l["* "+o],!a)for(i in l)if(s=i.split(" "),s[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){a===!0?a=l[i]:l[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(f){return{state:"parsererror",error:a?f:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}function G(e){return e.style&&e.style.display||pe.css(e,"display")}function K(e){for(;e&&1===e.nodeType;){if("none"===G(e)||"hidden"===e.type)return!0;e=e.parentNode}return!1}function Q(e,t,n,r){var i;if(pe.isArray(t))pe.each(t,function(t,i){n||rn.test(e)?r(e,i):Q(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==pe.type(t))r(e,t);else for(i in t)Q(e+"["+i+"]",t[i],n,r)}function Z(){try{return new e.XMLHttpRequest}catch(t){}}function ee(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function te(e){return pe.isWindow(e)?e:9===e.nodeType&&(e.defaultView||e.parentWindow)}var ne=[],re=e.document,ie=ne.slice,oe=ne.concat,ae=ne.push,se=ne.indexOf,ue={},le=ue.toString,ce=ue.hasOwnProperty,fe={},de="1.12.3",pe=function(e,t){return new pe.fn.init(e,t)},he=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,ge=/^-ms-/,me=/-([\da-z])/gi,ye=function(e,t){return t.toUpperCase()};pe.fn=pe.prototype={jquery:de,constructor:pe,selector:"",length:0,toArray:function(){return ie.call(this)},get:function(e){return null!=e?e<0?this[e+this.length]:this[e]:ie.call(this)},pushStack:function(e){var t=pe.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e){return pe.each(this,e)},map:function(e){return this.pushStack(pe.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(ie.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:ae,sort:ne.sort,splice:ne.splice},pe.extend=pe.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||pe.isFunction(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(i=arguments[s]))for(r in i)e=a[r],n=i[r],a!==n&&(l&&n&&(pe.isPlainObject(n)||(t=pe.isArray(n)))?(t?(t=!1,o=e&&pe.isArray(e)?e:[]):o=e&&pe.isPlainObject(e)?e:{},a[r]=pe.extend(l,o,n)):void 0!==n&&(a[r]=n));return a},pe.extend({expando:"jQuery"+(de+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isFunction:function(e){return"function"===pe.type(e)},isArray:Array.isArray||function(e){return"array"===pe.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){var t=e&&e.toString();return!pe.isArray(e)&&t-parseFloat(t)+1>=0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},isPlainObject:function(e){var t;if(!e||"object"!==pe.type(e)||e.nodeType||pe.isWindow(e))return!1;try{if(e.constructor&&!ce.call(e,"constructor")&&!ce.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}if(!fe.ownFirst)for(t in e)return ce.call(e,t);for(t in e);return void 0===t||ce.call(e,t)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?ue[le.call(e)]||"object":typeof e},globalEval:function(t){t&&pe.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(ge,"ms-").replace(me,ye)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t){var r,i=0;if(n(e))for(r=e.length;i<r&&t.call(e[i],i,e[i])!==!1;i++);else for(i in e)if(t.call(e[i],i,e[i])===!1)break;return e},trim:function(e){return null==e?"":(e+"").replace(he,"")},makeArray:function(e,t){var r=t||[];return null!=e&&(n(Object(e))?pe.merge(r,"string"==typeof e?[e]:e):ae.call(r,e)),r},inArray:function(e,t,n){var r;if(t){if(se)return se.call(t,e,n);for(r=t.length,n=n?n<0?Math.max(0,r+n):n:0;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;)e[i++]=t[r++];if(n!==n)for(;void 0!==t[r];)e[i++]=t[r++];return e.length=i,e},grep:function(e,t,n){for(var r,i=[],o=0,a=e.length,s=!n;o<a;o++)r=!t(e[o],o),r!==s&&i.push(e[o]);return i},map:function(e,t,r){var i,o,a=0,s=[];if(n(e))for(i=e.length;a<i;a++)o=t(e[a],a,r),null!=o&&s.push(o);else for(a in e)o=t(e[a],a,r),null!=o&&s.push(o);return oe.apply([],s)},guid:1,proxy:function(e,t){var n,r,i;if("string"==typeof t&&(i=e[t],t=e,e=i),pe.isFunction(e))return n=ie.call(arguments,2),r=function(){return e.apply(t||this,n.concat(ie.call(arguments)))},r.guid=e.guid=e.guid||pe.guid++,r},now:function(){return+new Date},support:fe}),"function"==typeof Symbol&&(pe.fn[Symbol.iterator]=ne[Symbol.iterator]),pe.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){ue["[object "+t+"]"]=t.toLowerCase()});var ve=function(e){function t(e,t,n,r){var i,o,a,s,u,l,f,p,h=t&&t.ownerDocument,g=t?t.nodeType:9;if(n=n||[],"string"!=typeof e||!e||1!==g&&9!==g&&11!==g)return n;if(!r&&((t?t.ownerDocument||t:B)!==H&&L(t),t=t||H,_)){if(11!==g&&(l=ye.exec(e)))if(i=l[1]){if(9===g){if(!(a=t.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(h&&(a=h.getElementById(i))&&R(t,a)&&a.id===i)return n.push(a),n}else{if(l[2])return Q.apply(n,t.getElementsByTagName(e)),n;if((i=l[3])&&w.getElementsByClassName&&t.getElementsByClassName)return Q.apply(n,t.getElementsByClassName(i)),n}if(w.qsa&&!X[e+" "]&&(!F||!F.test(e))){if(1!==g)h=t,p=e;else if("object"!==t.nodeName.toLowerCase()){for((s=t.getAttribute("id"))?s=s.replace(xe,"\\$&"):t.setAttribute("id",s=P),f=N(e),o=f.length,u=de.test(s)?"#"+s:"[id='"+s+"']";o--;)f[o]=u+" "+d(f[o]);p=f.join(","),h=ve.test(e)&&c(t.parentNode)||t}if(p)try{return Q.apply(n,h.querySelectorAll(p)),n}catch(m){}finally{s===P&&t.removeAttribute("id")}}}return S(e.replace(se,"$1"),t,n,r)}function n(){function e(n,r){return t.push(n+" ")>T.cacheLength&&delete e[t.shift()],e[n+" "]=r}var t=[];return e}function r(e){return e[P]=!0,e}function i(e){var t=H.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function o(e,t){for(var n=e.split("|"),r=n.length;r--;)T.attrHandle[n[r]]=t}function a(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||V)-(~e.sourceIndex||V);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function s(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function u(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function l(e){return r(function(t){return t=+t,r(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function c(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function f(){}function d(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function p(e,t,n){var r=t.dir,i=n&&"parentNode"===r,o=I++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,u,l,c=[W,o];if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i){if(l=t[P]||(t[P]={}),u=l[t.uniqueID]||(l[t.uniqueID]={}),(s=u[r])&&s[0]===W&&s[1]===o)return c[2]=s[2];if(u[r]=c,c[2]=e(t,n,a))return!0}}}function h(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function g(e,n,r){for(var i=0,o=n.length;i<o;i++)t(e,n[i],r);return r}function m(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function y(e,t,n,i,o,a){return i&&!i[P]&&(i=y(i)),o&&!o[P]&&(o=y(o,a)),r(function(r,a,s,u){var l,c,f,d=[],p=[],h=a.length,y=r||g(t||"*",s.nodeType?[s]:s,[]),v=!e||!r&&t?y:m(y,d,e,s,u),x=n?o||(r?e:h||i)?[]:a:v;if(n&&n(v,x,s,u),i)for(l=m(x,p),i(l,[],s,u),c=l.length;c--;)(f=l[c])&&(x[p[c]]=!(v[p[c]]=f));if(r){if(o||e){if(o){for(l=[],c=x.length;c--;)(f=x[c])&&l.push(v[c]=f);o(null,x=[],l,u)}for(c=x.length;c--;)(f=x[c])&&(l=o?ee(r,f):d[c])>-1&&(r[l]=!(a[l]=f))}}else x=m(x===a?x.splice(h,x.length):x),o?o(null,a,x,u):Q.apply(a,x)})}function v(e){for(var t,n,r,i=e.length,o=T.relative[e[0].type],a=o||T.relative[" "],s=o?1:0,u=p(function(e){return e===t},a,!0),l=p(function(e){return ee(t,e)>-1},a,!0),c=[function(e,n,r){var i=!o&&(r||n!==A)||((t=n).nodeType?u(e,n,r):l(e,n,r));return t=null,i}];s<i;s++)if(n=T.relative[e[s].type])c=[p(h(c),n)];else{if(n=T.filter[e[s].type].apply(null,e[s].matches),n[P]){for(r=++s;r<i&&!T.relative[e[r].type];r++);return y(s>1&&h(c),s>1&&d(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(se,"$1"),n,s<r&&v(e.slice(s,r)),r<i&&v(e=e.slice(r)),r<i&&d(e))}c.push(n)}return h(c)}function x(e,n){var i=n.length>0,o=e.length>0,a=function(r,a,s,u,l){var c,f,d,p=0,h="0",g=r&&[],y=[],v=A,x=r||o&&T.find.TAG("*",l),b=W+=null==v?1:Math.random()||.1,w=x.length;for(l&&(A=a===H||a||l);h!==w&&null!=(c=x[h]);h++){if(o&&c){for(f=0,a||c.ownerDocument===H||(L(c),s=!_);d=e[f++];)if(d(c,a||H,s)){u.push(c);break}l&&(W=b)}i&&((c=!d&&c)&&p--,r&&g.push(c))}if(p+=h,i&&h!==p){for(f=0;d=n[f++];)d(g,y,a,s);if(r){if(p>0)for(;h--;)g[h]||y[h]||(y[h]=G.call(u));y=m(y)}Q.apply(u,y),l&&!r&&y.length>0&&p+n.length>1&&t.uniqueSort(u)}return l&&(W=b,A=v),g};return i?r(a):a}var b,w,T,C,E,N,k,S,A,D,j,L,H,q,_,F,M,O,R,P="sizzle"+1*new Date,B=e.document,W=0,I=0,$=n(),z=n(),X=n(),U=function(e,t){return e===t&&(j=!0),0},V=1<<31,Y={}.hasOwnProperty,J=[],G=J.pop,K=J.push,Q=J.push,Z=J.slice,ee=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},te="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",ne="[\\x20\\t\\r\\n\\f]",re="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",ie="\\["+ne+"*("+re+")(?:"+ne+"*([*^$|!~]?=)"+ne+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+re+"))|)"+ne+"*\\]",oe=":("+re+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+ie+")*)|.*)\\)|)",ae=new RegExp(ne+"+","g"),se=new RegExp("^"+ne+"+|((?:^|[^\\\\])(?:\\\\.)*)"+ne+"+$","g"),ue=new RegExp("^"+ne+"*,"+ne+"*"),le=new RegExp("^"+ne+"*([>+~]|"+ne+")"+ne+"*"),ce=new RegExp("="+ne+"*([^\\]'\"]*?)"+ne+"*\\]","g"),fe=new RegExp(oe),de=new RegExp("^"+re+"$"),pe={ID:new RegExp("^#("+re+")"),CLASS:new RegExp("^\\.("+re+")"),TAG:new RegExp("^("+re+"|[*])"),ATTR:new RegExp("^"+ie),PSEUDO:new RegExp("^"+oe),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ne+"*(even|odd|(([+-]|)(\\d*)n|)"+ne+"*(?:([+-]|)"+ne+"*(\\d+)|))"+ne+"*\\)|)","i"),bool:new RegExp("^(?:"+te+")$","i"),needsContext:new RegExp("^"+ne+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ne+"*((?:-\\d)?\\d*)"+ne+"*\\)|)(?=[^-]|$)","i")},he=/^(?:input|select|textarea|button)$/i,ge=/^h\d$/i,me=/^[^{]+\{\s*\[native \w/,ye=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ve=/[+~]/,xe=/'|\\/g,be=new RegExp("\\\\([\\da-f]{1,6}"+ne+"?|("+ne+")|.)","ig"),we=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},Te=function(){L()};try{Q.apply(J=Z.call(B.childNodes),B.childNodes),J[B.childNodes.length].nodeType}catch(Ce){Q={apply:J.length?function(e,t){K.apply(e,Z.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}w=t.support={},E=t.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},L=t.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:B;return r!==H&&9===r.nodeType&&r.documentElement?(H=r,q=H.documentElement,_=!E(H),(n=H.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",Te,!1):n.attachEvent&&n.attachEvent("onunload",Te)),w.attributes=i(function(e){return e.className="i",!e.getAttribute("className")}),w.getElementsByTagName=i(function(e){return e.appendChild(H.createComment("")),!e.getElementsByTagName("*").length}),w.getElementsByClassName=me.test(H.getElementsByClassName),w.getById=i(function(e){return q.appendChild(e).id=P,!H.getElementsByName||!H.getElementsByName(P).length}),w.getById?(T.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&_){var n=t.getElementById(e);return n?[n]:[]}},T.filter.ID=function(e){var t=e.replace(be,we);return function(e){return e.getAttribute("id")===t}}):(delete T.find.ID,T.filter.ID=function(e){var t=e.replace(be,we);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}}),T.find.TAG=w.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):w.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},T.find.CLASS=w.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&_)return t.getElementsByClassName(e)},M=[],F=[],(w.qsa=me.test(H.querySelectorAll))&&(i(function(e){q.appendChild(e).innerHTML="<a id='"+P+"'></a><select id='"+P+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&F.push("[*^$]="+ne+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||F.push("\\["+ne+"*(?:value|"+te+")"),e.querySelectorAll("[id~="+P+"-]").length||F.push("~="),e.querySelectorAll(":checked").length||F.push(":checked"),e.querySelectorAll("a#"+P+"+*").length||F.push(".#.+[+~]")}),i(function(e){var t=H.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&F.push("name"+ne+"*[*^$|!~]?="),e.querySelectorAll(":enabled").length||F.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),F.push(",.*:")})),(w.matchesSelector=me.test(O=q.matches||q.webkitMatchesSelector||q.mozMatchesSelector||q.oMatchesSelector||q.msMatchesSelector))&&i(function(e){w.disconnectedMatch=O.call(e,"div"),O.call(e,"[s!='']:x"),M.push("!=",oe)}),F=F.length&&new RegExp(F.join("|")),M=M.length&&new RegExp(M.join("|")),t=me.test(q.compareDocumentPosition),R=t||me.test(q.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},U=t?function(e,t){if(e===t)return j=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n?n:(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1,1&n||!w.sortDetached&&t.compareDocumentPosition(e)===n?e===H||e.ownerDocument===B&&R(B,e)?-1:t===H||t.ownerDocument===B&&R(B,t)?1:D?ee(D,e)-ee(D,t):0:4&n?-1:1)}:function(e,t){if(e===t)return j=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,s=[e],u=[t];if(!i||!o)return e===H?-1:t===H?1:i?-1:o?1:D?ee(D,e)-ee(D,t):0;if(i===o)return a(e,t);for(n=e;n=n.parentNode;)s.unshift(n);for(n=t;n=n.parentNode;)u.unshift(n);for(;s[r]===u[r];)r++;return r?a(s[r],u[r]):s[r]===B?-1:u[r]===B?1:0},H):H},t.matches=function(e,n){return t(e,null,null,n)},t.matchesSelector=function(e,n){if((e.ownerDocument||e)!==H&&L(e),n=n.replace(ce,"='$1']"),w.matchesSelector&&_&&!X[n+" "]&&(!M||!M.test(n))&&(!F||!F.test(n)))try{var r=O.call(e,n);if(r||w.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(i){}return t(n,H,null,[e]).length>0},t.contains=function(e,t){return(e.ownerDocument||e)!==H&&L(e),R(e,t)},t.attr=function(e,t){(e.ownerDocument||e)!==H&&L(e);var n=T.attrHandle[t.toLowerCase()],r=n&&Y.call(T.attrHandle,t.toLowerCase())?n(e,t,!_):void 0;return void 0!==r?r:w.attributes||!_?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},t.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},t.uniqueSort=function(e){var t,n=[],r=0,i=0;if(j=!w.detectDuplicates,D=!w.sortStable&&e.slice(0),e.sort(U),j){for(;t=e[i++];)t===e[i]&&(r=n.push(i));for(;r--;)e.splice(n[r],1)}return D=null,e},C=t.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=C(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r++];)n+=C(t);return n},T=t.selectors={cacheLength:50,createPseudo:r,match:pe,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(be,we),e[3]=(e[3]||e[4]||e[5]||"").replace(be,we),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||t.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&t.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return pe.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&fe.test(n)&&(t=N(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(be,we).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=$[e+" "];return t||(t=new RegExp("(^|"+ne+")"+e+"("+ne+"|$)"))&&$(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,n,r){return function(i){var o=t.attr(i,e);return null==o?"!="===n:!n||(o+="","="===n?o===r:"!="===n?o!==r:"^="===n?r&&0===o.indexOf(r):"*="===n?r&&o.indexOf(r)>-1:"$="===n?r&&o.slice(-r.length)===r:"~="===n?(" "+o.replace(ae," ")+" ").indexOf(r)>-1:"|="===n&&(o===r||o.slice(0,r.length+1)===r+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,d,p,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s,x=!1;if(m){if(o){for(;g;){for(d=t;d=d[g];)if(s?d.nodeName.toLowerCase()===y:1===d.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){for(d=m,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),
+l=c[e]||[],p=l[0]===W&&l[1],x=p&&l[2],d=p&&m.childNodes[p];d=++p&&d&&d[g]||(x=p=0)||h.pop();)if(1===d.nodeType&&++x&&d===t){c[e]=[W,p,x];break}}else if(v&&(d=t,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),l=c[e]||[],p=l[0]===W&&l[1],x=p),x===!1)for(;(d=++p&&d&&d[g]||(x=p=0)||h.pop())&&((s?d.nodeName.toLowerCase()!==y:1!==d.nodeType)||!++x||(v&&(f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),c[e]=[W,x]),d!==t)););return x-=i,x===r||x%r===0&&x/r>=0}}},PSEUDO:function(e,n){var i,o=T.pseudos[e]||T.setFilters[e.toLowerCase()]||t.error("unsupported pseudo: "+e);return o[P]?o(n):o.length>1?(i=[e,e,"",n],T.setFilters.hasOwnProperty(e.toLowerCase())?r(function(e,t){for(var r,i=o(e,n),a=i.length;a--;)r=ee(e,i[a]),e[r]=!(t[r]=i[a])}):function(e){return o(e,0,i)}):o}},pseudos:{not:r(function(e){var t=[],n=[],i=k(e.replace(se,"$1"));return i[P]?r(function(e,t,n,r){for(var o,a=i(e,null,r,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,r,o){return t[0]=e,i(t,null,o,n),t[0]=null,!n.pop()}}),has:r(function(e){return function(n){return t(e,n).length>0}}),contains:r(function(e){return e=e.replace(be,we),function(t){return(t.textContent||t.innerText||C(t)).indexOf(e)>-1}}),lang:r(function(e){return de.test(e||"")||t.error("unsupported lang: "+e),e=e.replace(be,we).toLowerCase(),function(t){var n;do if(n=_?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===q},focus:function(e){return e===H.activeElement&&(!H.hasFocus||H.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!T.pseudos.empty(e)},header:function(e){return ge.test(e.nodeName)},input:function(e){return he.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:l(function(){return[0]}),last:l(function(e,t){return[t-1]}),eq:l(function(e,t,n){return[n<0?n+t:n]}),even:l(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:l(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:l(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:l(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}},T.pseudos.nth=T.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})T.pseudos[b]=s(b);for(b in{submit:!0,reset:!0})T.pseudos[b]=u(b);return f.prototype=T.filters=T.pseudos,T.setFilters=new f,N=t.tokenize=function(e,n){var r,i,o,a,s,u,l,c=z[e+" "];if(c)return n?0:c.slice(0);for(s=e,u=[],l=T.preFilter;s;){r&&!(i=ue.exec(s))||(i&&(s=s.slice(i[0].length)||s),u.push(o=[])),r=!1,(i=le.exec(s))&&(r=i.shift(),o.push({value:r,type:i[0].replace(se," ")}),s=s.slice(r.length));for(a in T.filter)!(i=pe[a].exec(s))||l[a]&&!(i=l[a](i))||(r=i.shift(),o.push({value:r,type:a,matches:i}),s=s.slice(r.length));if(!r)break}return n?s.length:s?t.error(e):z(e,u).slice(0)},k=t.compile=function(e,t){var n,r=[],i=[],o=X[e+" "];if(!o){for(t||(t=N(e)),n=t.length;n--;)o=v(t[n]),o[P]?r.push(o):i.push(o);o=X(e,x(i,r)),o.selector=e}return o},S=t.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,f=!r&&N(e=l.selector||e);if(n=n||[],1===f.length){if(o=f[0]=f[0].slice(0),o.length>2&&"ID"===(a=o[0]).type&&w.getById&&9===t.nodeType&&_&&T.relative[o[1].type]){if(t=(T.find.ID(a.matches[0].replace(be,we),t)||[])[0],!t)return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}for(i=pe.needsContext.test(e)?0:o.length;i--&&(a=o[i],!T.relative[s=a.type]);)if((u=T.find[s])&&(r=u(a.matches[0].replace(be,we),ve.test(o[0].type)&&c(t.parentNode)||t))){if(o.splice(i,1),e=r.length&&d(o),!e)return Q.apply(n,r),n;break}}return(l||k(e,f))(r,t,!_,n,!t||ve.test(e)&&c(t.parentNode)||t),n},w.sortStable=P.split("").sort(U).join("")===P,w.detectDuplicates=!!j,L(),w.sortDetached=i(function(e){return 1&e.compareDocumentPosition(H.createElement("div"))}),i(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||o("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),w.attributes&&i(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||o("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),i(function(e){return null==e.getAttribute("disabled")})||o(te,function(e,t,n){var r;if(!n)return e[t]===!0?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),t}(e);pe.find=ve,pe.expr=ve.selectors,pe.expr[":"]=pe.expr.pseudos,pe.uniqueSort=pe.unique=ve.uniqueSort,pe.text=ve.getText,pe.isXMLDoc=ve.isXML,pe.contains=ve.contains;var xe=function(e,t,n){for(var r=[],i=void 0!==n;(e=e[t])&&9!==e.nodeType;)if(1===e.nodeType){if(i&&pe(e).is(n))break;r.push(e)}return r},be=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},we=pe.expr.match.needsContext,Te=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,Ce=/^.[^:#\[\.,]*$/;pe.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?pe.find.matchesSelector(r,e)?[r]:[]:pe.find.matches(e,pe.grep(t,function(e){return 1===e.nodeType}))},pe.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(pe(e).filter(function(){for(t=0;t<i;t++)if(pe.contains(r[t],this))return!0}));for(t=0;t<i;t++)pe.find(e,r[t],n);return n=this.pushStack(i>1?pe.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},filter:function(e){return this.pushStack(r(this,e||[],!1))},not:function(e){return this.pushStack(r(this,e||[],!0))},is:function(e){return!!r(this,"string"==typeof e&&we.test(e)?pe(e):e||[],!1).length}});var Ee,Ne=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,ke=pe.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||Ee,"string"==typeof e){if(r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:Ne.exec(e),!r||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof pe?t[0]:t,pe.merge(this,pe.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:re,!0)),Te.test(r[1])&&pe.isPlainObject(t))for(r in t)pe.isFunction(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}if(i=re.getElementById(r[2]),i&&i.parentNode){if(i.id!==r[2])return Ee.find(e);this.length=1,this[0]=i}return this.context=re,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):pe.isFunction(e)?"undefined"!=typeof n.ready?n.ready(e):e(pe):(void 0!==e.selector&&(this.selector=e.selector,this.context=e.context),pe.makeArray(e,this))};ke.prototype=pe.fn,Ee=pe(re);var Se=/^(?:parents|prev(?:Until|All))/,Ae={children:!0,contents:!0,next:!0,prev:!0};pe.fn.extend({has:function(e){var t,n=pe(e,this),r=n.length;return this.filter(function(){for(t=0;t<r;t++)if(pe.contains(this,n[t]))return!0})},closest:function(e,t){for(var n,r=0,i=this.length,o=[],a=we.test(e)||"string"!=typeof e?pe(e,t||this.context):0;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?a.index(n)>-1:1===n.nodeType&&pe.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?pe.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?pe.inArray(this[0],pe(e)):pe.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(pe.uniqueSort(pe.merge(this.get(),pe(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),pe.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return xe(e,"parentNode")},parentsUntil:function(e,t,n){return xe(e,"parentNode",n)},next:function(e){return i(e,"nextSibling")},prev:function(e){return i(e,"previousSibling")},nextAll:function(e){return xe(e,"nextSibling")},prevAll:function(e){return xe(e,"previousSibling")},nextUntil:function(e,t,n){return xe(e,"nextSibling",n)},prevUntil:function(e,t,n){return xe(e,"previousSibling",n)},siblings:function(e){return be((e.parentNode||{}).firstChild,e)},children:function(e){return be(e.firstChild)},contents:function(e){return pe.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:pe.merge([],e.childNodes)}},function(e,t){pe.fn[e]=function(n,r){var i=pe.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=pe.filter(r,i)),this.length>1&&(Ae[e]||(i=pe.uniqueSort(i)),Se.test(e)&&(i=i.reverse())),this.pushStack(i)}});var De=/\S+/g;pe.Callbacks=function(e){e="string"==typeof e?o(e):pe.extend({},e);var t,n,r,i,a=[],s=[],u=-1,l=function(){for(i=e.once,r=t=!0;s.length;u=-1)for(n=s.shift();++u<a.length;)a[u].apply(n[0],n[1])===!1&&e.stopOnFalse&&(u=a.length,n=!1);e.memory||(n=!1),t=!1,i&&(a=n?[]:"")},c={add:function(){return a&&(n&&!t&&(u=a.length-1,s.push(n)),function r(t){pe.each(t,function(t,n){pe.isFunction(n)?e.unique&&c.has(n)||a.push(n):n&&n.length&&"string"!==pe.type(n)&&r(n)})}(arguments),n&&!t&&l()),this},remove:function(){return pe.each(arguments,function(e,t){for(var n;(n=pe.inArray(t,a,n))>-1;)a.splice(n,1),n<=u&&u--}),this},has:function(e){return e?pe.inArray(e,a)>-1:a.length>0},empty:function(){return a&&(a=[]),this},disable:function(){return i=s=[],a=n="",this},disabled:function(){return!a},lock:function(){return i=!0,n||c.disable(),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=n||[],n=[e,n.slice?n.slice():n],s.push(n),t||l()),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},pe.extend({Deferred:function(e){var t=[["resolve","done",pe.Callbacks("once memory"),"resolved"],["reject","fail",pe.Callbacks("once memory"),"rejected"],["notify","progress",pe.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return pe.Deferred(function(n){pe.each(t,function(t,o){var a=pe.isFunction(e[t])&&e[t];i[o[1]](function(){var e=a&&a.apply(this,arguments);e&&pe.isFunction(e.promise)?e.promise().progress(n.notify).done(n.resolve).fail(n.reject):n[o[0]+"With"](this===r?n.promise():this,a?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?pe.extend(e,r):r}},i={};return r.pipe=r.then,pe.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t,n,r,i=0,o=ie.call(arguments),a=o.length,s=1!==a||e&&pe.isFunction(e.promise)?a:0,u=1===s?e:pe.Deferred(),l=function(e,n,r){return function(i){n[e]=this,r[e]=arguments.length>1?ie.call(arguments):i,r===t?u.notifyWith(n,r):--s||u.resolveWith(n,r)}};if(a>1)for(t=new Array(a),n=new Array(a),r=new Array(a);i<a;i++)o[i]&&pe.isFunction(o[i].promise)?o[i].promise().progress(l(i,n,t)).done(l(i,r,o)).fail(u.reject):--s;return s||u.resolveWith(r,o),u.promise()}});var je;pe.fn.ready=function(e){return pe.ready.promise().done(e),this},pe.extend({isReady:!1,readyWait:1,holdReady:function(e){e?pe.readyWait++:pe.ready(!0)},ready:function(e){(e===!0?--pe.readyWait:pe.isReady)||(pe.isReady=!0,e!==!0&&--pe.readyWait>0||(je.resolveWith(re,[pe]),pe.fn.triggerHandler&&(pe(re).triggerHandler("ready"),pe(re).off("ready"))))}}),pe.ready.promise=function(t){if(!je)if(je=pe.Deferred(),"complete"===re.readyState||"loading"!==re.readyState&&!re.documentElement.doScroll)e.setTimeout(pe.ready);else if(re.addEventListener)re.addEventListener("DOMContentLoaded",s),e.addEventListener("load",s);else{re.attachEvent("onreadystatechange",s),e.attachEvent("onload",s);var n=!1;try{n=null==e.frameElement&&re.documentElement}catch(r){}n&&n.doScroll&&!function i(){if(!pe.isReady){try{n.doScroll("left")}catch(t){return e.setTimeout(i,50)}a(),pe.ready()}}()}return je.promise(t)},pe.ready.promise();var Le;for(Le in pe(fe))break;fe.ownFirst="0"===Le,fe.inlineBlockNeedsLayout=!1,pe(function(){var e,t,n,r;n=re.getElementsByTagName("body")[0],n&&n.style&&(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",fe.inlineBlockNeedsLayout=e=3===t.offsetWidth,e&&(n.style.zoom=1)),n.removeChild(r))}),function(){var e=re.createElement("div");fe.deleteExpando=!0;try{delete e.test}catch(t){fe.deleteExpando=!1}e=null}();var He=function(e){var t=pe.noData[(e.nodeName+" ").toLowerCase()],n=+e.nodeType||1;return(1===n||9===n)&&(!t||t!==!0&&e.getAttribute("classid")===t)},qe=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,_e=/([A-Z])/g;pe.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?pe.cache[e[pe.expando]]:e[pe.expando],!!e&&!l(e)},data:function(e,t,n){return c(e,t,n)},removeData:function(e,t){return f(e,t)},_data:function(e,t,n){return c(e,t,n,!0)},_removeData:function(e,t){return f(e,t,!0)}}),pe.fn.extend({data:function(e,t){var n,r,i,o=this[0],a=o&&o.attributes;if(void 0===e){if(this.length&&(i=pe.data(o),1===o.nodeType&&!pe._data(o,"parsedAttrs"))){for(n=a.length;n--;)a[n]&&(r=a[n].name,0===r.indexOf("data-")&&(r=pe.camelCase(r.slice(5)),u(o,r,i[r])));pe._data(o,"parsedAttrs",!0)}return i}return"object"==typeof e?this.each(function(){pe.data(this,e)}):arguments.length>1?this.each(function(){pe.data(this,e,t)}):o?u(o,e,pe.data(o,e)):void 0},removeData:function(e){return this.each(function(){pe.removeData(this,e)})}}),pe.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=pe._data(e,t),n&&(!r||pe.isArray(n)?r=pe._data(e,t,pe.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=pe.queue(e,t),r=n.length,i=n.shift(),o=pe._queueHooks(e,t),a=function(){pe.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return pe._data(e,n)||pe._data(e,n,{empty:pe.Callbacks("once memory").add(function(){pe._removeData(e,t+"queue"),pe._removeData(e,n)})})}}),pe.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length<n?pe.queue(this[0],e):void 0===t?this:this.each(function(){var n=pe.queue(this,e,t);pe._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&pe.dequeue(this,e)})},dequeue:function(e){return this.each(function(){pe.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=pe.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};for("string"!=typeof e&&(t=e,e=void 0),e=e||"fx";a--;)n=pe._data(o[a],e+"queueHooks"),n&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}}),function(){var e;fe.shrinkWrapBlocks=function(){if(null!=e)return e;e=!1;var t,n,r;return n=re.getElementsByTagName("body")[0],n&&n.style?(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",t.appendChild(re.createElement("div")).style.width="5px",e=3!==t.offsetWidth),n.removeChild(r),e):void 0}}();var Fe=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,Me=new RegExp("^(?:([+-])=|)("+Fe+")([a-z%]*)$","i"),Oe=["Top","Right","Bottom","Left"],Re=function(e,t){return e=t||e,"none"===pe.css(e,"display")||!pe.contains(e.ownerDocument,e)},Pe=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===pe.type(n)){i=!0;for(s in n)Pe(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,pe.isFunction(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(pe(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},Be=/^(?:checkbox|radio)$/i,We=/<([\w:-]+)/,Ie=/^$|\/(?:java|ecma)script/i,$e=/^\s+/,ze="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";!function(){var e=re.createElement("div"),t=re.createDocumentFragment(),n=re.createElement("input");e.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",fe.leadingWhitespace=3===e.firstChild.nodeType,fe.tbody=!e.getElementsByTagName("tbody").length,fe.htmlSerialize=!!e.getElementsByTagName("link").length,fe.html5Clone="<:nav></:nav>"!==re.createElement("nav").cloneNode(!0).outerHTML,n.type="checkbox",n.checked=!0,t.appendChild(n),fe.appendChecked=n.checked,e.innerHTML="<textarea>x</textarea>",fe.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue,t.appendChild(e),n=re.createElement("input"),n.setAttribute("type","radio"),n.setAttribute("checked","checked"),n.setAttribute("name","t"),e.appendChild(n),fe.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,fe.noCloneEvent=!!e.addEventListener,e[pe.expando]=1,fe.attributes=!e.getAttribute(pe.expando)}();var Xe={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:fe.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]};Xe.optgroup=Xe.option,Xe.tbody=Xe.tfoot=Xe.colgroup=Xe.caption=Xe.thead,Xe.th=Xe.td;var Ue=/<|&#?\w+;/,Ve=/<tbody/i;!function(){var t,n,r=re.createElement("div");for(t in{submit:!0,change:!0,focusin:!0})n="on"+t,(fe[t]=n in e)||(r.setAttribute(n,"t"),fe[t]=r.attributes[n].expando===!1);r=null}();var Ye=/^(?:input|select|textarea)$/i,Je=/^key/,Ge=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ke=/^(?:focusinfocus|focusoutblur)$/,Qe=/^([^.]*)(?:\.(.+)|)/;pe.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe._data(e);if(m){for(n.handler&&(u=n,n=u.handler,i=u.selector),n.guid||(n.guid=pe.guid++),(a=m.events)||(a=m.events={}),(c=m.handle)||(c=m.handle=function(e){return"undefined"==typeof pe||e&&pe.event.triggered===e.type?void 0:pe.event.dispatch.apply(c.elem,arguments)},c.elem=e),t=(t||"").match(De)||[""],s=t.length;s--;)o=Qe.exec(t[s])||[],p=g=o[1],h=(o[2]||"").split(".").sort(),p&&(l=pe.event.special[p]||{},p=(i?l.delegateType:l.bindType)||p,l=pe.event.special[p]||{},f=pe.extend({type:p,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&pe.expr.match.needsContext.test(i),namespace:h.join(".")},u),(d=a[p])||(d=a[p]=[],d.delegateCount=0,l.setup&&l.setup.call(e,r,h,c)!==!1||(e.addEventListener?e.addEventListener(p,c,!1):e.attachEvent&&e.attachEvent("on"+p,c))),l.add&&(l.add.call(e,f),f.handler.guid||(f.handler.guid=n.guid)),i?d.splice(d.delegateCount++,0,f):d.push(f),pe.event.global[p]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe.hasData(e)&&pe._data(e);if(m&&(c=m.events)){for(t=(t||"").match(De)||[""],l=t.length;l--;)if(s=Qe.exec(t[l])||[],p=g=s[1],h=(s[2]||"").split(".").sort(),p){for(f=pe.event.special[p]||{},p=(r?f.delegateType:f.bindType)||p,d=c[p]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=d.length;o--;)a=d[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(d.splice(o,1),a.selector&&d.delegateCount--,f.remove&&f.remove.call(e,a));u&&!d.length&&(f.teardown&&f.teardown.call(e,h,m.handle)!==!1||pe.removeEvent(e,p,m.handle),delete c[p])}else for(p in c)pe.event.remove(e,p+t[l],n,r,!0);pe.isEmptyObject(c)&&(delete m.handle,pe._removeData(e,"events"))}},trigger:function(t,n,r,i){var o,a,s,u,l,c,f,d=[r||re],p=ce.call(t,"type")?t.type:t,h=ce.call(t,"namespace")?t.namespace.split("."):[];if(s=c=r=r||re,3!==r.nodeType&&8!==r.nodeType&&!Ke.test(p+pe.event.triggered)&&(p.indexOf(".")>-1&&(h=p.split("."),p=h.shift(),h.sort()),a=p.indexOf(":")<0&&"on"+p,t=t[pe.expando]?t:new pe.Event(p,"object"==typeof t&&t),t.isTrigger=i?2:3,t.namespace=h.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=r),n=null==n?[t]:pe.makeArray(n,[t]),l=pe.event.special[p]||{},i||!l.trigger||l.trigger.apply(r,n)!==!1)){if(!i&&!l.noBubble&&!pe.isWindow(r)){for(u=l.delegateType||p,Ke.test(u+p)||(s=s.parentNode);s;s=s.parentNode)d.push(s),c=s;c===(r.ownerDocument||re)&&d.push(c.defaultView||c.parentWindow||e)}for(f=0;(s=d[f++])&&!t.isPropagationStopped();)t.type=f>1?u:l.bindType||p,o=(pe._data(s,"events")||{})[t.type]&&pe._data(s,"handle"),o&&o.apply(s,n),o=a&&s[a],o&&o.apply&&He(s)&&(t.result=o.apply(s,n),t.result===!1&&t.preventDefault());if(t.type=p,!i&&!t.isDefaultPrevented()&&(!l._default||l._default.apply(d.pop(),n)===!1)&&He(r)&&a&&r[p]&&!pe.isWindow(r)){c=r[a],c&&(r[a]=null),pe.event.triggered=p;try{r[p]()}catch(g){}pe.event.triggered=void 0,c&&(r[a]=c)}return t.result}},dispatch:function(e){e=pe.event.fix(e);var t,n,r,i,o,a=[],s=ie.call(arguments),u=(pe._data(this,"events")||{})[e.type]||[],l=pe.event.special[e.type]||{};if(s[0]=e,e.delegateTarget=this,!l.preDispatch||l.preDispatch.call(this,e)!==!1){for(a=pe.event.handlers.call(this,e,u),t=0;(i=a[t++])&&!e.isPropagationStopped();)for(e.currentTarget=i.elem,n=0;(o=i.handlers[n++])&&!e.isImmediatePropagationStopped();)e.rnamespace&&!e.rnamespace.test(o.namespace)||(e.handleObj=o,e.data=o.data,r=((pe.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s),void 0!==r&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()));return l.postDispatch&&l.postDispatch.call(this,e),e.result}},handlers:function(e,t){var n,r,i,o,a=[],s=t.delegateCount,u=e.target;if(s&&u.nodeType&&("click"!==e.type||isNaN(e.button)||e.button<1))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(r=[],n=0;n<s;n++)o=t[n],i=o.selector+" ",void 0===r[i]&&(r[i]=o.needsContext?pe(i,this).index(u)>-1:pe.find(i,this,null,[u]).length),r[i]&&r.push(o);r.length&&a.push({elem:u,handlers:r})}return s<t.length&&a.push({elem:this,handlers:t.slice(s)}),a},fix:function(e){if(e[pe.expando])return e;var t,n,r,i=e.type,o=e,a=this.fixHooks[i];for(a||(this.fixHooks[i]=a=Ge.test(i)?this.mouseHooks:Je.test(i)?this.keyHooks:{}),r=a.props?this.props.concat(a.props):this.props,e=new pe.Event(o),t=r.length;t--;)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||re),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,a.filter?a.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget detail eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,t){var n,r,i,o=t.button,a=t.fromElement;return null==e.pageX&&null!=t.clientX&&(r=e.target.ownerDocument||re,i=r.documentElement,n=r.body,e.pageX=t.clientX+(i&&i.scrollLeft||n&&n.scrollLeft||0)-(i&&i.clientLeft||n&&n.clientLeft||0),e.pageY=t.clientY+(i&&i.scrollTop||n&&n.scrollTop||0)-(i&&i.clientTop||n&&n.clientTop||0)),!e.relatedTarget&&a&&(e.relatedTarget=a===e.target?t.toElement:a),e.which||void 0===o||(e.which=1&o?1:2&o?3:4&o?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==b()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){if(this===b()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if(pe.nodeName(this,"input")&&"checkbox"===this.type&&this.click)return this.click(),!1},_default:function(e){return pe.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n){var r=pe.extend(new pe.Event,n,{type:e,isSimulated:!0});pe.event.trigger(r,null,t),r.isDefaultPrevented()&&n.preventDefault()}},pe.removeEvent=re.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)}:function(e,t,n){var r="on"+t;e.detachEvent&&("undefined"==typeof e[r]&&(e[r]=null),e.detachEvent(r,n))},pe.Event=function(e,t){return this instanceof pe.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&e.returnValue===!1?v:x):this.type=e,t&&pe.extend(this,t),this.timeStamp=e&&e.timeStamp||pe.now(),void(this[pe.expando]=!0)):new pe.Event(e,t)},pe.Event.prototype={constructor:pe.Event,isDefaultPrevented:x,isPropagationStopped:x,isImmediatePropagationStopped:x,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=v,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=v,e&&!this.isSimulated&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=v,e&&e.stopImmediatePropagation&&e.stopImmediatePropagation(),this.stopPropagation()}},pe.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,t){pe.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return i&&(i===r||pe.contains(r,i))||(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),fe.submit||(pe.event.special.submit={setup:function(){return!pe.nodeName(this,"form")&&void pe.event.add(this,"click._submit keypress._submit",function(e){var t=e.target,n=pe.nodeName(t,"input")||pe.nodeName(t,"button")?pe.prop(t,"form"):void 0;n&&!pe._data(n,"submit")&&(pe.event.add(n,"submit._submit",function(e){e._submitBubble=!0}),pe._data(n,"submit",!0))})},postDispatch:function(e){e._submitBubble&&(delete e._submitBubble,this.parentNode&&!e.isTrigger&&pe.event.simulate("submit",this.parentNode,e))},teardown:function(){return!pe.nodeName(this,"form")&&void pe.event.remove(this,"._submit")}}),fe.change||(pe.event.special.change={setup:function(){return Ye.test(this.nodeName)?("checkbox"!==this.type&&"radio"!==this.type||(pe.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._justChanged=!0)}),pe.event.add(this,"click._change",function(e){this._justChanged&&!e.isTrigger&&(this._justChanged=!1),pe.event.simulate("change",this,e)})),!1):void pe.event.add(this,"beforeactivate._change",function(e){var t=e.target;Ye.test(t.nodeName)&&!pe._data(t,"change")&&(pe.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||pe.event.simulate("change",this.parentNode,e)}),pe._data(t,"change",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||"radio"!==t.type&&"checkbox"!==t.type)return e.handleObj.handler.apply(this,arguments)},teardown:function(){return pe.event.remove(this,"._change"),!Ye.test(this.nodeName)}}),fe.focusin||pe.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){pe.event.simulate(t,e.target,pe.event.fix(e))};pe.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=pe._data(r,t);i||r.addEventListener(e,n,!0),pe._data(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=pe._data(r,t)-1;i?pe._data(r,t,i):(r.removeEventListener(e,n,!0),pe._removeData(r,t))}}}),pe.fn.extend({on:function(e,t,n,r){return w(this,e,t,n,r)},one:function(e,t,n,r){return w(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,pe(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return t!==!1&&"function"!=typeof t||(n=t,t=void 0),n===!1&&(n=x),this.each(function(){pe.event.remove(this,e,n,t)})},trigger:function(e,t){return this.each(function(){pe.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return pe.event.trigger(e,t,n,!0)}});var Ze=/ jQuery\d+="(?:null|\d+)"/g,et=new RegExp("<(?:"+ze+")[\\s/>]","i"),tt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,nt=/<script|<style|<link/i,rt=/checked\s*(?:[^=]|=\s*.checked.)/i,it=/^true\/(.*)/,ot=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,at=p(re),st=at.appendChild(re.createElement("div"));pe.extend({htmlPrefilter:function(e){return e.replace(tt,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u=pe.contains(e.ownerDocument,e);if(fe.html5Clone||pe.isXMLDoc(e)||!et.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(st.innerHTML=e.outerHTML,st.removeChild(o=st.firstChild)),!(fe.noCloneEvent&&fe.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||pe.isXMLDoc(e)))for(r=h(o),s=h(e),a=0;null!=(i=s[a]);++a)r[a]&&k(i,r[a]);if(t)if(n)for(s=s||h(e),r=r||h(o),a=0;null!=(i=s[a]);a++)N(i,r[a]);else N(e,o);return r=h(o,"script"),r.length>0&&g(r,!u&&h(e,"script")),r=s=i=null,o},cleanData:function(e,t){for(var n,r,i,o,a=0,s=pe.expando,u=pe.cache,l=fe.attributes,c=pe.event.special;null!=(n=e[a]);a++)if((t||He(n))&&(i=n[s],o=i&&u[i])){if(o.events)for(r in o.events)c[r]?pe.event.remove(n,r):pe.removeEvent(n,r,o.handle);u[i]&&(delete u[i],l||"undefined"==typeof n.removeAttribute?n[s]=void 0:n.removeAttribute(s),ne.push(i))}}}),pe.fn.extend({domManip:S,detach:function(e){return A(this,e,!0)},remove:function(e){return A(this,e)},text:function(e){return Pe(this,function(e){return void 0===e?pe.text(this):this.empty().append((this[0]&&this[0].ownerDocument||re).createTextNode(e))},null,e,arguments.length)},append:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.appendChild(e)}})},prepend:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++){for(1===e.nodeType&&pe.cleanData(h(e,!1));e.firstChild;)e.removeChild(e.firstChild);e.options&&pe.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return pe.clone(this,e,t)})},html:function(e){return Pe(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e)return 1===t.nodeType?t.innerHTML.replace(Ze,""):void 0;if("string"==typeof e&&!nt.test(e)&&(fe.htmlSerialize||!et.test(e))&&(fe.leadingWhitespace||!$e.test(e))&&!Xe[(We.exec(e)||["",""])[1].toLowerCase()]){e=pe.htmlPrefilter(e);try{for(;n<r;n++)t=this[n]||{},1===t.nodeType&&(pe.cleanData(h(t,!1)),t.innerHTML=e);t=0}catch(i){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=[];return S(this,arguments,function(t){var n=this.parentNode;pe.inArray(this,e)<0&&(pe.cleanData(h(this)),
+n&&n.replaceChild(t,this))},e)}}),pe.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){pe.fn[e]=function(e){for(var n,r=0,i=[],o=pe(e),a=o.length-1;r<=a;r++)n=r===a?this:this.clone(!0),pe(o[r])[t](n),ae.apply(i,n.get());return this.pushStack(i)}});var ut,lt={HTML:"block",BODY:"block"},ct=/^margin/,ft=new RegExp("^("+Fe+")(?!px)[a-z%]+$","i"),dt=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i},pt=re.documentElement;!function(){function t(){var t,c,f=re.documentElement;f.appendChild(u),l.style.cssText="-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",n=i=s=!1,r=a=!0,e.getComputedStyle&&(c=e.getComputedStyle(l),n="1%"!==(c||{}).top,s="2px"===(c||{}).marginLeft,i="4px"===(c||{width:"4px"}).width,l.style.marginRight="50%",r="4px"===(c||{marginRight:"4px"}).marginRight,t=l.appendChild(re.createElement("div")),t.style.cssText=l.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",t.style.marginRight=t.style.width="0",l.style.width="1px",a=!parseFloat((e.getComputedStyle(t)||{}).marginRight),l.removeChild(t)),l.style.display="none",o=0===l.getClientRects().length,o&&(l.style.display="",l.innerHTML="<table><tr><td></td><td>t</td></tr></table>",t=l.getElementsByTagName("td"),t[0].style.cssText="margin:0;border:0;padding:0;display:none",o=0===t[0].offsetHeight,o&&(t[0].style.display="",t[1].style.display="none",o=0===t[0].offsetHeight)),f.removeChild(u)}var n,r,i,o,a,s,u=re.createElement("div"),l=re.createElement("div");l.style&&(l.style.cssText="float:left;opacity:.5",fe.opacity="0.5"===l.style.opacity,fe.cssFloat=!!l.style.cssFloat,l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",fe.clearCloneStyle="content-box"===l.style.backgroundClip,u=re.createElement("div"),u.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",l.innerHTML="",u.appendChild(l),fe.boxSizing=""===l.style.boxSizing||""===l.style.MozBoxSizing||""===l.style.WebkitBoxSizing,pe.extend(fe,{reliableHiddenOffsets:function(){return null==n&&t(),o},boxSizingReliable:function(){return null==n&&t(),i},pixelMarginRight:function(){return null==n&&t(),r},pixelPosition:function(){return null==n&&t(),n},reliableMarginRight:function(){return null==n&&t(),a},reliableMarginLeft:function(){return null==n&&t(),s}}))}();var ht,gt,mt=/^(top|right|bottom|left)$/;e.getComputedStyle?(ht=function(t){var n=t.ownerDocument.defaultView;return n&&n.opener||(n=e),n.getComputedStyle(t)},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n.getPropertyValue(t)||n[t]:void 0,""!==a&&void 0!==a||pe.contains(e.ownerDocument,e)||(a=pe.style(e,t)),n&&!fe.pixelMarginRight()&&ft.test(a)&&ct.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o),void 0===a?a:a+""}):pt.currentStyle&&(ht=function(e){return e.currentStyle},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n[t]:void 0,null==a&&s&&s[t]&&(a=s[t]),ft.test(a)&&!mt.test(t)&&(r=s.left,i=e.runtimeStyle,o=i&&i.left,o&&(i.left=e.currentStyle.left),s.left="fontSize"===t?"1em":a,a=s.pixelLeft+"px",s.left=r,o&&(i.left=o)),void 0===a?a:a+""||"auto"});var yt=/alpha\([^)]*\)/i,vt=/opacity\s*=\s*([^)]*)/i,xt=/^(none|table(?!-c[ea]).+)/,bt=new RegExp("^("+Fe+")(.*)$","i"),wt={position:"absolute",visibility:"hidden",display:"block"},Tt={letterSpacing:"0",fontWeight:"400"},Ct=["Webkit","O","Moz","ms"],Et=re.createElement("div").style;pe.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=gt(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":fe.cssFloat?"cssFloat":"styleFloat"},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=pe.camelCase(t),u=e.style;if(t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:u[t];if(o=typeof n,"string"===o&&(i=Me.exec(n))&&i[1]&&(n=d(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(pe.cssNumber[s]?"":"px")),fe.clearCloneStyle||""!==n||0!==t.indexOf("background")||(u[t]="inherit"),!(a&&"set"in a&&void 0===(n=a.set(e,n,r)))))try{u[t]=n}catch(l){}}},css:function(e,t,n,r){var i,o,a,s=pe.camelCase(t);return t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],a&&"get"in a&&(o=a.get(e,!0,n)),void 0===o&&(o=gt(e,t,r)),"normal"===o&&t in Tt&&(o=Tt[t]),""===n||n?(i=parseFloat(o),n===!0||isFinite(i)?i||0:o):o}}),pe.each(["height","width"],function(e,t){pe.cssHooks[t]={get:function(e,n,r){if(n)return xt.test(pe.css(e,"display"))&&0===e.offsetWidth?dt(e,wt,function(){return M(e,t,r)}):M(e,t,r)},set:function(e,n,r){var i=r&&ht(e);return _(e,n,r?F(e,t,r,fe.boxSizing&&"border-box"===pe.css(e,"boxSizing",!1,i),i):0)}}}),fe.opacity||(pe.cssHooks.opacity={get:function(e,t){return vt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=pe.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===pe.trim(o.replace(yt,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=yt.test(o)?o.replace(yt,i):o+" "+i)}}),pe.cssHooks.marginRight=L(fe.reliableMarginRight,function(e,t){if(t)return dt(e,{display:"inline-block"},gt,[e,"marginRight"])}),pe.cssHooks.marginLeft=L(fe.reliableMarginLeft,function(e,t){if(t)return(parseFloat(gt(e,"marginLeft"))||(pe.contains(e.ownerDocument,e)?e.getBoundingClientRect().left-dt(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}):0))+"px"}),pe.each({margin:"",padding:"",border:"Width"},function(e,t){pe.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+Oe[r]+t]=o[r]||o[r-2]||o[0];return i}},ct.test(e)||(pe.cssHooks[e+t].set=_)}),pe.fn.extend({css:function(e,t){return Pe(this,function(e,t,n){var r,i,o={},a=0;if(pe.isArray(t)){for(r=ht(e),i=t.length;a<i;a++)o[t[a]]=pe.css(e,t[a],!1,r);return o}return void 0!==n?pe.style(e,t,n):pe.css(e,t)},e,t,arguments.length>1)},show:function(){return q(this,!0)},hide:function(){return q(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){Re(this)?pe(this).show():pe(this).hide()})}}),pe.Tween=O,O.prototype={constructor:O,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||pe.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(pe.cssNumber[n]?"":"px")},cur:function(){var e=O.propHooks[this.prop];return e&&e.get?e.get(this):O.propHooks._default.get(this)},run:function(e){var t,n=O.propHooks[this.prop];return this.options.duration?this.pos=t=pe.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):O.propHooks._default.set(this),this}},O.prototype.init.prototype=O.prototype,O.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=pe.css(e.elem,e.prop,""),t&&"auto"!==t?t:0)},set:function(e){pe.fx.step[e.prop]?pe.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[pe.cssProps[e.prop]]&&!pe.cssHooks[e.prop]?e.elem[e.prop]=e.now:pe.style(e.elem,e.prop,e.now+e.unit)}}},O.propHooks.scrollTop=O.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},pe.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},pe.fx=O.prototype.init,pe.fx.step={};var Nt,kt,St=/^(?:toggle|show|hide)$/,At=/queueHooks$/;pe.Animation=pe.extend($,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return d(n.elem,e,Me.exec(t),n),n}]},tweener:function(e,t){pe.isFunction(e)?(t=e,e=["*"]):e=e.match(De);for(var n,r=0,i=e.length;r<i;r++)n=e[r],$.tweeners[n]=$.tweeners[n]||[],$.tweeners[n].unshift(t)},prefilters:[W],prefilter:function(e,t){t?$.prefilters.unshift(e):$.prefilters.push(e)}}),pe.speed=function(e,t,n){var r=e&&"object"==typeof e?pe.extend({},e):{complete:n||!n&&t||pe.isFunction(e)&&e,duration:e,easing:n&&t||t&&!pe.isFunction(t)&&t};return r.duration=pe.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in pe.fx.speeds?pe.fx.speeds[r.duration]:pe.fx.speeds._default,null!=r.queue&&r.queue!==!0||(r.queue="fx"),r.old=r.complete,r.complete=function(){pe.isFunction(r.old)&&r.old.call(this),r.queue&&pe.dequeue(this,r.queue)},r},pe.fn.extend({fadeTo:function(e,t,n,r){return this.filter(Re).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=pe.isEmptyObject(e),o=pe.speed(t,n,r),a=function(){var t=$(this,pe.extend({},e),o);(i||pe._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,t,n){var r=function(e){var t=e.stop;delete e.stop,t(n)};return"string"!=typeof e&&(n=t,t=e,e=void 0),t&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,i=null!=e&&e+"queueHooks",o=pe.timers,a=pe._data(this);if(i)a[i]&&a[i].stop&&r(a[i]);else for(i in a)a[i]&&a[i].stop&&At.test(i)&&r(a[i]);for(i=o.length;i--;)o[i].elem!==this||null!=e&&o[i].queue!==e||(o[i].anim.stop(n),t=!1,o.splice(i,1));!t&&n||pe.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=pe._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=pe.timers,a=r?r.length:0;for(n.finish=!0,pe.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;t<a;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),pe.each(["toggle","show","hide"],function(e,t){var n=pe.fn[t];pe.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(P(t,!0),e,r,i)}}),pe.each({slideDown:P("show"),slideUp:P("hide"),slideToggle:P("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){pe.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),pe.timers=[],pe.fx.tick=function(){var e,t=pe.timers,n=0;for(Nt=pe.now();n<t.length;n++)e=t[n],e()||t[n]!==e||t.splice(n--,1);t.length||pe.fx.stop(),Nt=void 0},pe.fx.timer=function(e){pe.timers.push(e),e()?pe.fx.start():pe.timers.pop()},pe.fx.interval=13,pe.fx.start=function(){kt||(kt=e.setInterval(pe.fx.tick,pe.fx.interval))},pe.fx.stop=function(){e.clearInterval(kt),kt=null},pe.fx.speeds={slow:600,fast:200,_default:400},pe.fn.delay=function(t,n){return t=pe.fx?pe.fx.speeds[t]||t:t,n=n||"fx",this.queue(n,function(n,r){var i=e.setTimeout(n,t);r.stop=function(){e.clearTimeout(i)}})},function(){var e,t=re.createElement("input"),n=re.createElement("div"),r=re.createElement("select"),i=r.appendChild(re.createElement("option"));n=re.createElement("div"),n.setAttribute("className","t"),n.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",e=n.getElementsByTagName("a")[0],t.setAttribute("type","checkbox"),n.appendChild(t),e=n.getElementsByTagName("a")[0],e.style.cssText="top:1px",fe.getSetAttribute="t"!==n.className,fe.style=/top/.test(e.getAttribute("style")),fe.hrefNormalized="/a"===e.getAttribute("href"),fe.checkOn=!!t.value,fe.optSelected=i.selected,fe.enctype=!!re.createElement("form").enctype,r.disabled=!0,fe.optDisabled=!i.disabled,t=re.createElement("input"),t.setAttribute("value",""),fe.input=""===t.getAttribute("value"),t.value="t",t.setAttribute("type","radio"),fe.radioValue="t"===t.value}();var Dt=/\r/g,jt=/[\x20\t\r\n\f]+/g;pe.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=pe.isFunction(e),this.each(function(n){var i;1===this.nodeType&&(i=r?e.call(this,n,pe(this).val()):e,null==i?i="":"number"==typeof i?i+="":pe.isArray(i)&&(i=pe.map(i,function(e){return null==e?"":e+""})),t=pe.valHooks[this.type]||pe.valHooks[this.nodeName.toLowerCase()],t&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return t=pe.valHooks[i.type]||pe.valHooks[i.nodeName.toLowerCase()],t&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:(n=i.value,"string"==typeof n?n.replace(Dt,""):null==n?"":n)}}}),pe.extend({valHooks:{option:{get:function(e){var t=pe.find.attr(e,"value");return null!=t?t:pe.trim(pe.text(e)).replace(jt," ")}},select:{get:function(e){for(var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||i<0,a=o?null:[],s=o?i+1:r.length,u=i<0?s:o?i:0;u<s;u++)if(n=r[u],(n.selected||u===i)&&(fe.optDisabled?!n.disabled:null===n.getAttribute("disabled"))&&(!n.parentNode.disabled||!pe.nodeName(n.parentNode,"optgroup"))){if(t=pe(n).val(),o)return t;a.push(t)}return a},set:function(e,t){for(var n,r,i=e.options,o=pe.makeArray(t),a=i.length;a--;)if(r=i[a],pe.inArray(pe.valHooks.option.get(r),o)>-1)try{r.selected=n=!0}catch(s){r.scrollHeight}else r.selected=!1;return n||(e.selectedIndex=-1),i}}}}),pe.each(["radio","checkbox"],function(){pe.valHooks[this]={set:function(e,t){if(pe.isArray(t))return e.checked=pe.inArray(pe(e).val(),t)>-1}},fe.checkOn||(pe.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Lt,Ht,qt=pe.expr.attrHandle,_t=/^(?:checked|selected)$/i,Ft=fe.getSetAttribute,Mt=fe.input;pe.fn.extend({attr:function(e,t){return Pe(this,pe.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){pe.removeAttr(this,e)})}}),pe.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?pe.prop(e,t,n):(1===o&&pe.isXMLDoc(e)||(t=t.toLowerCase(),i=pe.attrHooks[t]||(pe.expr.match.bool.test(t)?Ht:Lt)),void 0!==n?null===n?void pe.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:(r=pe.find.attr(e,t),null==r?void 0:r))},attrHooks:{type:{set:function(e,t){if(!fe.radioValue&&"radio"===t&&pe.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(De);if(o&&1===e.nodeType)for(;n=o[i++];)r=pe.propFix[n]||n,pe.expr.match.bool.test(n)?Mt&&Ft||!_t.test(n)?e[r]=!1:e[pe.camelCase("default-"+n)]=e[r]=!1:pe.attr(e,n,""),e.removeAttribute(Ft?n:r)}}),Ht={set:function(e,t,n){return t===!1?pe.removeAttr(e,n):Mt&&Ft||!_t.test(n)?e.setAttribute(!Ft&&pe.propFix[n]||n,n):e[pe.camelCase("default-"+n)]=e[n]=!0,n}},pe.each(pe.expr.match.bool.source.match(/\w+/g),function(e,t){var n=qt[t]||pe.find.attr;Mt&&Ft||!_t.test(t)?qt[t]=function(e,t,r){var i,o;return r||(o=qt[t],qt[t]=i,i=null!=n(e,t,r)?t.toLowerCase():null,qt[t]=o),i}:qt[t]=function(e,t,n){if(!n)return e[pe.camelCase("default-"+t)]?t.toLowerCase():null}}),Mt&&Ft||(pe.attrHooks.value={set:function(e,t,n){return pe.nodeName(e,"input")?void(e.defaultValue=t):Lt&&Lt.set(e,t,n)}}),Ft||(Lt={set:function(e,t,n){var r=e.getAttributeNode(n);if(r||e.setAttributeNode(r=e.ownerDocument.createAttribute(n)),r.value=t+="","value"===n||t===e.getAttribute(n))return t}},qt.id=qt.name=qt.coords=function(e,t,n){var r;if(!n)return(r=e.getAttributeNode(t))&&""!==r.value?r.value:null},pe.valHooks.button={get:function(e,t){var n=e.getAttributeNode(t);if(n&&n.specified)return n.value},set:Lt.set},pe.attrHooks.contenteditable={set:function(e,t,n){Lt.set(e,""!==t&&t,n)}},pe.each(["width","height"],function(e,t){pe.attrHooks[t]={set:function(e,n){if(""===n)return e.setAttribute(t,"auto"),n}}})),fe.style||(pe.attrHooks.style={get:function(e){return e.style.cssText||void 0},set:function(e,t){return e.style.cssText=t+""}});var Ot=/^(?:input|select|textarea|button|object)$/i,Rt=/^(?:a|area)$/i;pe.fn.extend({prop:function(e,t){return Pe(this,pe.prop,e,t,arguments.length>1)},removeProp:function(e){return e=pe.propFix[e]||e,this.each(function(){try{this[e]=void 0,delete this[e]}catch(t){}})}}),pe.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&pe.isXMLDoc(e)||(t=pe.propFix[t]||t,i=pe.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=pe.find.attr(e,"tabindex");return t?parseInt(t,10):Ot.test(e.nodeName)||Rt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),fe.hrefNormalized||pe.each(["href","src"],function(e,t){pe.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),fe.optSelected||(pe.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),pe.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){pe.propFix[this.toLowerCase()]=this}),fe.enctype||(pe.propFix.enctype="encoding");var Pt=/[\t\r\n\f]/g;pe.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).addClass(e.call(this,t,z(this)))});if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)r.indexOf(" "+o+" ")<0&&(r+=o+" ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).removeClass(e.call(this,t,z(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)for(;r.indexOf(" "+o+" ")>-1;)r=r.replace(" "+o+" "," ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):pe.isFunction(e)?this.each(function(n){pe(this).toggleClass(e.call(this,n,z(this),t),t)}):this.each(function(){var t,r,i,o;if("string"===n)for(r=0,i=pe(this),o=e.match(De)||[];t=o[r++];)i.hasClass(t)?i.removeClass(t):i.addClass(t);else void 0!==e&&"boolean"!==n||(t=z(this),t&&pe._data(this,"__className__",t),pe.attr(this,"class",t||e===!1?"":pe._data(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;for(t=" "+e+" ";n=this[r++];)if(1===n.nodeType&&(" "+z(n)+" ").replace(Pt," ").indexOf(t)>-1)return!0;return!1}}),pe.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){pe.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),pe.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}});var Bt=e.location,Wt=pe.now(),It=/\?/,$t=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;pe.parseJSON=function(t){if(e.JSON&&e.JSON.parse)return e.JSON.parse(t+"");var n,r=null,i=pe.trim(t+"");return i&&!pe.trim(i.replace($t,function(e,t,i,o){return n&&t&&(r=0),0===r?e:(n=i||t,r+=!o-!i,"")}))?Function("return "+i)():pe.error("Invalid JSON: "+t)},pe.parseXML=function(t){var n,r;if(!t||"string"!=typeof t)return null;try{e.DOMParser?(r=new e.DOMParser,n=r.parseFromString(t,"text/xml")):(n=new e.ActiveXObject("Microsoft.XMLDOM"),n.async="false",n.loadXML(t))}catch(i){n=void 0}return n&&n.documentElement&&!n.getElementsByTagName("parsererror").length||pe.error("Invalid XML: "+t),n};var zt=/#.*$/,Xt=/([?&])_=[^&]*/,Ut=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Vt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Yt=/^(?:GET|HEAD)$/,Jt=/^\/\//,Gt=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Kt={},Qt={},Zt="*/".concat("*"),en=Bt.href,tn=Gt.exec(en.toLowerCase())||[];pe.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:en,type:"GET",isLocal:Vt.test(tn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Zt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":pe.parseJSON,"text xml":pe.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?V(V(e,pe.ajaxSettings),t):V(pe.ajaxSettings,e)},ajaxPrefilter:X(Kt),ajaxTransport:X(Qt),ajax:function(t,n){function r(t,n,r,i){var o,f,v,x,w,C=n;2!==b&&(b=2,u&&e.clearTimeout(u),c=void 0,s=i||"",T.readyState=t>0?4:0,o=t>=200&&t<300||304===t,r&&(x=Y(d,T,r)),x=J(d,x,T,o),o?(d.ifModified&&(w=T.getResponseHeader("Last-Modified"),w&&(pe.lastModified[a]=w),w=T.getResponseHeader("etag"),w&&(pe.etag[a]=w)),204===t||"HEAD"===d.type?C="nocontent":304===t?C="notmodified":(C=x.state,f=x.data,v=x.error,o=!v)):(v=C,!t&&C||(C="error",t<0&&(t=0))),T.status=t,T.statusText=(n||C)+"",o?g.resolveWith(p,[f,C,T]):g.rejectWith(p,[T,C,v]),T.statusCode(y),y=void 0,l&&h.trigger(o?"ajaxSuccess":"ajaxError",[T,d,o?f:v]),m.fireWith(p,[T,C]),l&&(h.trigger("ajaxComplete",[T,d]),--pe.active||pe.event.trigger("ajaxStop")))}"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,d=pe.ajaxSetup({},n),p=d.context||d,h=d.context&&(p.nodeType||p.jquery)?pe(p):pe.event,g=pe.Deferred(),m=pe.Callbacks("once memory"),y=d.statusCode||{},v={},x={},b=0,w="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!f)for(f={};t=Ut.exec(s);)f[t[1].toLowerCase()]=t[2];t=f[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?s:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=x[n]=x[n]||e,v[e]=t),this},overrideMimeType:function(e){return b||(d.mimeType=e),this},statusCode:function(e){var t;if(e)if(b<2)for(t in e)y[t]=[y[t],e[t]];else T.always(e[T.status]);return this},abort:function(e){var t=e||w;return c&&c.abort(t),r(0,t),this}};if(g.promise(T).complete=m.add,T.success=T.done,T.error=T.fail,d.url=((t||d.url||en)+"").replace(zt,"").replace(Jt,tn[1]+"//"),d.type=n.method||n.type||d.method||d.type,d.dataTypes=pe.trim(d.dataType||"*").toLowerCase().match(De)||[""],null==d.crossDomain&&(i=Gt.exec(d.url.toLowerCase()),d.crossDomain=!(!i||i[1]===tn[1]&&i[2]===tn[2]&&(i[3]||("http:"===i[1]?"80":"443"))===(tn[3]||("http:"===tn[1]?"80":"443")))),d.data&&d.processData&&"string"!=typeof d.data&&(d.data=pe.param(d.data,d.traditional)),U(Kt,d,n,T),2===b)return T;l=pe.event&&d.global,l&&0===pe.active++&&pe.event.trigger("ajaxStart"),d.type=d.type.toUpperCase(),d.hasContent=!Yt.test(d.type),a=d.url,d.hasContent||(d.data&&(a=d.url+=(It.test(a)?"&":"?")+d.data,delete d.data),d.cache===!1&&(d.url=Xt.test(a)?a.replace(Xt,"$1_="+Wt++):a+(It.test(a)?"&":"?")+"_="+Wt++)),d.ifModified&&(pe.lastModified[a]&&T.setRequestHeader("If-Modified-Since",pe.lastModified[a]),pe.etag[a]&&T.setRequestHeader("If-None-Match",pe.etag[a])),(d.data&&d.hasContent&&d.contentType!==!1||n.contentType)&&T.setRequestHeader("Content-Type",d.contentType),T.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+("*"!==d.dataTypes[0]?", "+Zt+"; q=0.01":""):d.accepts["*"]);for(o in d.headers)T.setRequestHeader(o,d.headers[o]);if(d.beforeSend&&(d.beforeSend.call(p,T,d)===!1||2===b))return T.abort();w="abort";for(o in{success:1,error:1,complete:1})T[o](d[o]);if(c=U(Qt,d,n,T)){if(T.readyState=1,l&&h.trigger("ajaxSend",[T,d]),2===b)return T;d.async&&d.timeout>0&&(u=e.setTimeout(function(){T.abort("timeout")},d.timeout));try{b=1,c.send(v,r)}catch(C){if(!(b<2))throw C;r(-1,C)}}else r(-1,"No Transport");return T},getJSON:function(e,t,n){return pe.get(e,t,n,"json")},getScript:function(e,t){return pe.get(e,void 0,t,"script")}}),pe.each(["get","post"],function(e,t){pe[t]=function(e,n,r,i){return pe.isFunction(n)&&(i=i||r,r=n,n=void 0),pe.ajax(pe.extend({url:e,type:t,dataType:i,data:n,success:r},pe.isPlainObject(e)&&e))}}),pe._evalUrl=function(e){return pe.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},pe.fn.extend({wrapAll:function(e){if(pe.isFunction(e))return this.each(function(t){pe(this).wrapAll(e.call(this,t))});if(this[0]){var t=pe(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){for(var e=this;e.firstChild&&1===e.firstChild.nodeType;)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return pe.isFunction(e)?this.each(function(t){pe(this).wrapInner(e.call(this,t))}):this.each(function(){var t=pe(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=pe.isFunction(e);return this.each(function(n){pe(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){pe.nodeName(this,"body")||pe(this).replaceWith(this.childNodes)}).end()}}),pe.expr.filters.hidden=function(e){return fe.reliableHiddenOffsets()?e.offsetWidth<=0&&e.offsetHeight<=0&&!e.getClientRects().length:K(e)},pe.expr.filters.visible=function(e){return!pe.expr.filters.hidden(e)};var nn=/%20/g,rn=/\[\]$/,on=/\r?\n/g,an=/^(?:submit|button|image|reset|file)$/i,sn=/^(?:input|select|textarea|keygen)/i;pe.param=function(e,t){var n,r=[],i=function(e,t){t=pe.isFunction(t)?t():null==t?"":t,r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(void 0===t&&(t=pe.ajaxSettings&&pe.ajaxSettings.traditional),pe.isArray(e)||e.jquery&&!pe.isPlainObject(e))pe.each(e,function(){i(this.name,this.value)});else for(n in e)Q(n,e[n],t,i);return r.join("&").replace(nn,"+")},pe.fn.extend({serialize:function(){return pe.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=pe.prop(this,"elements");return e?pe.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!pe(this).is(":disabled")&&sn.test(this.nodeName)&&!an.test(e)&&(this.checked||!Be.test(e))}).map(function(e,t){var n=pe(this).val();return null==n?null:pe.isArray(n)?pe.map(n,function(e){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),pe.ajaxSettings.xhr=void 0!==e.ActiveXObject?function(){return this.isLocal?ee():re.documentMode>8?Z():/^(get|post|head|put|delete|options)$/i.test(this.type)&&Z()||ee()}:Z;var un=0,ln={},cn=pe.ajaxSettings.xhr();e.attachEvent&&e.attachEvent("onunload",function(){for(var e in ln)ln[e](void 0,!0)}),fe.cors=!!cn&&"withCredentials"in cn,cn=fe.ajax=!!cn,cn&&pe.ajaxTransport(function(t){if(!t.crossDomain||fe.cors){var n;return{send:function(r,i){var o,a=t.xhr(),s=++un;if(a.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(o in t.xhrFields)a[o]=t.xhrFields[o];t.mimeType&&a.overrideMimeType&&a.overrideMimeType(t.mimeType),t.crossDomain||r["X-Requested-With"]||(r["X-Requested-With"]="XMLHttpRequest");for(o in r)void 0!==r[o]&&a.setRequestHeader(o,r[o]+"");a.send(t.hasContent&&t.data||null),n=function(e,r){var o,u,l;if(n&&(r||4===a.readyState))if(delete ln[s],n=void 0,a.onreadystatechange=pe.noop,r)4!==a.readyState&&a.abort();else{l={},o=a.status,"string"==typeof a.responseText&&(l.text=a.responseText);try{u=a.statusText}catch(c){u=""}o||!t.isLocal||t.crossDomain?1223===o&&(o=204):o=l.text?200:404}l&&i(o,u,l,a.getAllResponseHeaders())},t.async?4===a.readyState?e.setTimeout(n):a.onreadystatechange=ln[s]=n:n()},abort:function(){n&&n(void 0,!0)}}}}),pe.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return pe.globalEval(e),e}}}),pe.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),pe.ajaxTransport("script",function(e){if(e.crossDomain){var t,n=re.head||pe("head")[0]||re.documentElement;return{send:function(r,i){t=re.createElement("script"),t.async=!0,e.scriptCharset&&(t.charset=e.scriptCharset),t.src=e.url,t.onload=t.onreadystatechange=function(e,n){(n||!t.readyState||/loaded|complete/.test(t.readyState))&&(t.onload=t.onreadystatechange=null,t.parentNode&&t.parentNode.removeChild(t),t=null,n||i(200,"success"))},n.insertBefore(t,n.firstChild)},abort:function(){t&&t.onload(void 0,!0)}}}});var fn=[],dn=/(=)\?(?=&|$)|\?\?/;pe.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=fn.pop()||pe.expando+"_"+Wt++;return this[e]=!0,e}}),pe.ajaxPrefilter("json jsonp",function(t,n,r){var i,o,a,s=t.jsonp!==!1&&(dn.test(t.url)?"url":"string"==typeof t.data&&0===(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&dn.test(t.data)&&"data");if(s||"jsonp"===t.dataTypes[0])return i=t.jsonpCallback=pe.isFunction(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,s?t[s]=t[s].replace(dn,"$1"+i):t.jsonp!==!1&&(t.url+=(It.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return a||pe.error(i+" was not called"),a[0]},t.dataTypes[0]="json",o=e[i],e[i]=function(){a=arguments},r.always(function(){void 0===o?pe(e).removeProp(i):e[i]=o,t[i]&&(t.jsonpCallback=n.jsonpCallback,fn.push(i)),a&&pe.isFunction(o)&&o(a[0]),a=o=void 0}),"script"}),pe.parseHTML=function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||re;var r=Te.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=y([e],t,i),i&&i.length&&pe(i).remove(),pe.merge([],r.childNodes))};var pn=pe.fn.load;return pe.fn.load=function(e,t,n){if("string"!=typeof e&&pn)return pn.apply(this,arguments);var r,i,o,a=this,s=e.indexOf(" ");return s>-1&&(r=pe.trim(e.slice(s,e.length)),e=e.slice(0,s)),pe.isFunction(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),a.length>0&&pe.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?pe("<div>").append(pe.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},pe.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){pe.fn[t]=function(e){return this.on(t,e)}}),pe.expr.filters.animated=function(e){return pe.grep(pe.timers,function(t){return e===t.elem}).length},pe.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l,c=pe.css(e,"position"),f=pe(e),d={};"static"===c&&(e.style.position="relative"),s=f.offset(),o=pe.css(e,"top"),u=pe.css(e,"left"),l=("absolute"===c||"fixed"===c)&&pe.inArray("auto",[o,u])>-1,l?(r=f.position(),a=r.top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),pe.isFunction(t)&&(t=t.call(e,n,pe.extend({},s))),null!=t.top&&(d.top=t.top-s.top+a),null!=t.left&&(d.left=t.left-s.left+i),"using"in t?t.using.call(e,d):f.css(d)}},pe.fn.extend({offset:function(e){if(arguments.length)return void 0===e?this:this.each(function(t){pe.offset.setOffset(this,e,t)});var t,n,r={top:0,left:0},i=this[0],o=i&&i.ownerDocument;if(o)return t=o.documentElement,pe.contains(t,i)?("undefined"!=typeof i.getBoundingClientRect&&(r=i.getBoundingClientRect()),n=te(o),{top:r.top+(n.pageYOffset||t.scrollTop)-(t.clientTop||0),left:r.left+(n.pageXOffset||t.scrollLeft)-(t.clientLeft||0)}):r},position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===pe.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),pe.nodeName(e[0],"html")||(n=e.offset()),n.top+=pe.css(e[0],"borderTopWidth",!0),n.left+=pe.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-pe.css(r,"marginTop",!0),left:t.left-n.left-pe.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){
+for(var e=this.offsetParent;e&&!pe.nodeName(e,"html")&&"static"===pe.css(e,"position");)e=e.offsetParent;return e||pt})}}),pe.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,t){var n=/Y/.test(t);pe.fn[e]=function(r){return Pe(this,function(e,r,i){var o=te(e);return void 0===i?o?t in o?o[t]:o.document.documentElement[r]:e[r]:void(o?o.scrollTo(n?pe(o).scrollLeft():i,n?i:pe(o).scrollTop()):e[r]=i)},e,r,arguments.length,null)}}),pe.each(["top","left"],function(e,t){pe.cssHooks[t]=L(fe.pixelPosition,function(e,n){if(n)return n=gt(e,t),ft.test(n)?pe(e).position()[t]+"px":n})}),pe.each({Height:"height",Width:"width"},function(e,t){pe.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){pe.fn[r]=function(r,i){var o=arguments.length&&(n||"boolean"!=typeof r),a=n||(r===!0||i===!0?"margin":"border");return Pe(this,function(t,n,r){var i;return pe.isWindow(t)?t.document.documentElement["client"+e]:9===t.nodeType?(i=t.documentElement,Math.max(t.body["scroll"+e],i["scroll"+e],t.body["offset"+e],i["offset"+e],i["client"+e])):void 0===r?pe.css(t,n,a):pe.style(t,n,r,a)},t,o?r:void 0,o,null)}})}),pe.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),pe.fn.size=function(){return this.length},pe.fn.andSelf=pe.fn.addBack,layui.define(function(e){layui.$=pe,e("jquery",pe)}),pe});!function(e,t){"use strict";var i,n,a=e.layui&&layui.define,o={getPath:function(){var e=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,i=t.length-1,n=i;n>0;n--)if("interactive"===t[n].readyState){e=t[n].src;break}return e||t[i].src}();return e.substring(0,e.lastIndexOf("/")+1)}(),config:{},end:{},minIndex:0,minLeft:[],btn:["确定","取消"],type:["dialog","page","iframe","loading","tips"],getStyle:function(t,i){var n=t.currentStyle?t.currentStyle:e.getComputedStyle(t,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](i)},link:function(t,i,n){if(r.path){var a=document.getElementsByTagName("head")[0],s=document.createElement("link");"string"==typeof i&&(n=i);var l=(n||t).replace(/\.|\//g,""),f="layuicss-"+l,c=0;s.rel="stylesheet",s.href=r.path+t,s.id=f,document.getElementById(f)||a.appendChild(s),"function"==typeof i&&!function u(){return++c>80?e.console&&console.error("layer.css: Invalid"):void(1989===parseInt(o.getStyle(document.getElementById(f),"width"))?i():setTimeout(u,100))}()}}},r={v:"3.1.1",ie:function(){var t=navigator.userAgent.toLowerCase();return!!(e.ActiveXObject||"ActiveXObject"in e)&&((t.match(/msie\s(\d+)/)||[])[1]||"11")}(),index:e.layer&&e.layer.v?1e5:0,path:o.getPath,config:function(e,t){return e=e||{},r.cache=o.config=i.extend({},o.config,e),r.path=o.config.path||r.path,"string"==typeof e.extend&&(e.extend=[e.extend]),o.config.path&&r.ready(),e.extend?(a?layui.addcss("modules/layer/"+e.extend):o.link("theme/"+e.extend),this):this},ready:function(e){var t="layer",i="",n=(a?"modules/layer/":"theme/")+"default/layer.css?v="+r.v+i;return a?layui.addcss(n,e,t):o.link(n,e,t),this},alert:function(e,t,n){var a="function"==typeof t;return a&&(n=t),r.open(i.extend({content:e,yes:n},a?{}:t))},confirm:function(e,t,n,a){var s="function"==typeof t;return s&&(a=n,n=t),r.open(i.extend({content:e,btn:o.btn,yes:n,btn2:a},s?{}:t))},msg:function(e,n,a){var s="function"==typeof n,f=o.config.skin,c=(f?f+" "+f+"-msg":"")||"layui-layer-msg",u=l.anim.length-1;return s&&(a=n),r.open(i.extend({content:e,time:3e3,shade:!1,skin:c,title:!1,closeBtn:!1,btn:!1,resize:!1,end:a},s&&!o.config.skin?{skin:c+" layui-layer-hui",anim:u}:function(){return n=n||{},(n.icon===-1||n.icon===t&&!o.config.skin)&&(n.skin=c+" "+(n.skin||"layui-layer-hui")),n}()))},load:function(e,t){return r.open(i.extend({type:3,icon:e||0,resize:!1,shade:.01},t))},tips:function(e,t,n){return r.open(i.extend({type:4,content:[e,t],closeBtn:!1,time:3e3,shade:!1,resize:!1,fixed:!1,maxWidth:210},n))}},s=function(e){var t=this;t.index=++r.index,t.config=i.extend({},t.config,o.config,e),document.body?t.creat():setTimeout(function(){t.creat()},30)};s.pt=s.prototype;var l=["layui-layer",".layui-layer-title",".layui-layer-main",".layui-layer-dialog","layui-layer-iframe","layui-layer-content","layui-layer-btn","layui-layer-close"];l.anim=["layer-anim-00","layer-anim-01","layer-anim-02","layer-anim-03","layer-anim-04","layer-anim-05","layer-anim-06"],s.pt.config={type:0,shade:.3,fixed:!0,move:l[1],title:"信息",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,anim:0,isOutAnim:!0,icon:-1,moveType:1,resize:!0,scrollbar:!0,tips:2},s.pt.vessel=function(e,t){var n=this,a=n.index,r=n.config,s=r.zIndex+a,f="object"==typeof r.title,c=r.maxmin&&(1===r.type||2===r.type),u=r.title?'<div class="layui-layer-title" style="'+(f?r.title[1]:"")+'">'+(f?r.title[0]:r.title)+"</div>":"";return r.zIndex=s,t([r.shade?'<div class="layui-layer-shade" id="layui-layer-shade'+a+'" times="'+a+'" style="'+("z-index:"+(s-1)+"; ")+'"></div>':"",'<div class="'+l[0]+(" layui-layer-"+o.type[r.type])+(0!=r.type&&2!=r.type||r.shade?"":" layui-layer-border")+" "+(r.skin||"")+'" id="'+l[0]+a+'" type="'+o.type[r.type]+'" times="'+a+'" showtime="'+r.time+'" conType="'+(e?"object":"string")+'" style="z-index: '+s+"; width:"+r.area[0]+";height:"+r.area[1]+(r.fixed?"":";position:absolute;")+'">'+(e&&2!=r.type?"":u)+'<div id="'+(r.id||"")+'" class="layui-layer-content'+(0==r.type&&r.icon!==-1?" layui-layer-padding":"")+(3==r.type?" layui-layer-loading"+r.icon:"")+'">'+(0==r.type&&r.icon!==-1?'<i class="layui-layer-ico layui-layer-ico'+r.icon+'"></i>':"")+(1==r.type&&e?"":r.content||"")+'</div><span class="layui-layer-setwin">'+function(){var e=c?'<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>':"";return r.closeBtn&&(e+='<a class="layui-layer-ico '+l[7]+" "+l[7]+(r.title?r.closeBtn:4==r.type?"1":"2")+'" href="javascript:;"></a>'),e}()+"</span>"+(r.btn?function(){var e="";"string"==typeof r.btn&&(r.btn=[r.btn]);for(var t=0,i=r.btn.length;t<i;t++)e+='<a class="'+l[6]+t+'">'+r.btn[t]+"</a>";return'<div class="'+l[6]+" layui-layer-btn-"+(r.btnAlign||"")+'">'+e+"</div>"}():"")+(r.resize?'<span class="layui-layer-resize"></span>':"")+"</div>"],u,i('<div class="layui-layer-move"></div>')),n},s.pt.creat=function(){var e=this,t=e.config,a=e.index,s=t.content,f="object"==typeof s,c=i("body");if(!t.id||!i("#"+t.id)[0]){switch("string"==typeof t.area&&(t.area="auto"===t.area?["",""]:[t.area,""]),t.shift&&(t.anim=t.shift),6==r.ie&&(t.fixed=!1),t.type){case 0:t.btn="btn"in t?t.btn:o.btn[0],r.closeAll("dialog");break;case 2:var s=t.content=f?t.content:[t.content||"","auto"];t.content='<iframe scrolling="'+(t.content[1]||"auto")+'" allowtransparency="true" id="'+l[4]+a+'" name="'+l[4]+a+'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="'+t.content[0]+'"></iframe>';break;case 3:delete t.title,delete t.closeBtn,t.icon===-1&&0===t.icon,r.closeAll("loading");break;case 4:f||(t.content=[t.content,"body"]),t.follow=t.content[1],t.content=t.content[0]+'<i class="layui-layer-TipsG"></i>',delete t.title,t.tips="object"==typeof t.tips?t.tips:[t.tips,!0],t.tipsMore||r.closeAll("tips")}if(e.vessel(f,function(n,r,u){c.append(n[0]),f?function(){2==t.type||4==t.type?function(){i("body").append(n[1])}():function(){s.parents("."+l[0])[0]||(s.data("display",s.css("display")).show().addClass("layui-layer-wrap").wrap(n[1]),i("#"+l[0]+a).find("."+l[5]).before(r))}()}():c.append(n[1]),i(".layui-layer-move")[0]||c.append(o.moveElem=u),e.layero=i("#"+l[0]+a),t.scrollbar||l.html.css("overflow","hidden").attr("layer-full",a)}).auto(a),i("#layui-layer-shade"+e.index).css({"background-color":t.shade[1]||"#000",opacity:t.shade[0]||t.shade}),2==t.type&&6==r.ie&&e.layero.find("iframe").attr("src",s[0]),4==t.type?e.tips():e.offset(),t.fixed&&n.on("resize",function(){e.offset(),(/^\d+%$/.test(t.area[0])||/^\d+%$/.test(t.area[1]))&&e.auto(a),4==t.type&&e.tips()}),t.time<=0||setTimeout(function(){r.close(e.index)},t.time),e.move().callback(),l.anim[t.anim]){var u="layer-anim "+l.anim[t.anim];e.layero.addClass(u).one("webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",function(){i(this).removeClass(u)})}t.isOutAnim&&e.layero.data("isOutAnim",!0)}},s.pt.auto=function(e){var t=this,a=t.config,o=i("#"+l[0]+e);""===a.area[0]&&a.maxWidth>0&&(r.ie&&r.ie<8&&a.btn&&o.width(o.innerWidth()),o.outerWidth()>a.maxWidth&&o.width(a.maxWidth));var s=[o.innerWidth(),o.innerHeight()],f=o.find(l[1]).outerHeight()||0,c=o.find("."+l[6]).outerHeight()||0,u=function(e){e=o.find(e),e.height(s[1]-f-c-2*(0|parseFloat(e.css("padding-top"))))};switch(a.type){case 2:u("iframe");break;default:""===a.area[1]?a.maxHeight>0&&o.outerHeight()>a.maxHeight?(s[1]=a.maxHeight,u("."+l[5])):a.fixed&&s[1]>=n.height()&&(s[1]=n.height(),u("."+l[5])):u("."+l[5])}return t},s.pt.offset=function(){var e=this,t=e.config,i=e.layero,a=[i.outerWidth(),i.outerHeight()],o="object"==typeof t.offset;e.offsetTop=(n.height()-a[1])/2,e.offsetLeft=(n.width()-a[0])/2,o?(e.offsetTop=t.offset[0],e.offsetLeft=t.offset[1]||e.offsetLeft):"auto"!==t.offset&&("t"===t.offset?e.offsetTop=0:"r"===t.offset?e.offsetLeft=n.width()-a[0]:"b"===t.offset?e.offsetTop=n.height()-a[1]:"l"===t.offset?e.offsetLeft=0:"lt"===t.offset?(e.offsetTop=0,e.offsetLeft=0):"lb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=0):"rt"===t.offset?(e.offsetTop=0,e.offsetLeft=n.width()-a[0]):"rb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=n.width()-a[0]):e.offsetTop=t.offset),t.fixed||(e.offsetTop=/%$/.test(e.offsetTop)?n.height()*parseFloat(e.offsetTop)/100:parseFloat(e.offsetTop),e.offsetLeft=/%$/.test(e.offsetLeft)?n.width()*parseFloat(e.offsetLeft)/100:parseFloat(e.offsetLeft),e.offsetTop+=n.scrollTop(),e.offsetLeft+=n.scrollLeft()),i.attr("minLeft")&&(e.offsetTop=n.height()-(i.find(l[1]).outerHeight()||0),e.offsetLeft=i.css("left")),i.css({top:e.offsetTop,left:e.offsetLeft})},s.pt.tips=function(){var e=this,t=e.config,a=e.layero,o=[a.outerWidth(),a.outerHeight()],r=i(t.follow);r[0]||(r=i("body"));var s={width:r.outerWidth(),height:r.outerHeight(),top:r.offset().top,left:r.offset().left},f=a.find(".layui-layer-TipsG"),c=t.tips[0];t.tips[1]||f.remove(),s.autoLeft=function(){s.left+o[0]-n.width()>0?(s.tipLeft=s.left+s.width-o[0],f.css({right:12,left:"auto"})):s.tipLeft=s.left},s.where=[function(){s.autoLeft(),s.tipTop=s.top-o[1]-10,f.removeClass("layui-layer-TipsB").addClass("layui-layer-TipsT").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left+s.width+10,s.tipTop=s.top,f.removeClass("layui-layer-TipsL").addClass("layui-layer-TipsR").css("border-bottom-color",t.tips[1])},function(){s.autoLeft(),s.tipTop=s.top+s.height+10,f.removeClass("layui-layer-TipsT").addClass("layui-layer-TipsB").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left-o[0]-10,s.tipTop=s.top,f.removeClass("layui-layer-TipsR").addClass("layui-layer-TipsL").css("border-bottom-color",t.tips[1])}],s.where[c-1](),1===c?s.top-(n.scrollTop()+o[1]+16)<0&&s.where[2]():2===c?n.width()-(s.left+s.width+o[0]+16)>0||s.where[3]():3===c?s.top-n.scrollTop()+s.height+o[1]+16-n.height()>0&&s.where[0]():4===c&&o[0]+16-s.left>0&&s.where[1](),a.find("."+l[5]).css({"background-color":t.tips[1],"padding-right":t.closeBtn?"30px":""}),a.css({left:s.tipLeft-(t.fixed?n.scrollLeft():0),top:s.tipTop-(t.fixed?n.scrollTop():0)})},s.pt.move=function(){var e=this,t=e.config,a=i(document),s=e.layero,l=s.find(t.move),f=s.find(".layui-layer-resize"),c={};return t.move&&l.css("cursor","move"),l.on("mousedown",function(e){e.preventDefault(),t.move&&(c.moveStart=!0,c.offset=[e.clientX-parseFloat(s.css("left")),e.clientY-parseFloat(s.css("top"))],o.moveElem.css("cursor","move").show())}),f.on("mousedown",function(e){e.preventDefault(),c.resizeStart=!0,c.offset=[e.clientX,e.clientY],c.area=[s.outerWidth(),s.outerHeight()],o.moveElem.css("cursor","se-resize").show()}),a.on("mousemove",function(i){if(c.moveStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1],l="fixed"===s.css("position");if(i.preventDefault(),c.stX=l?0:n.scrollLeft(),c.stY=l?0:n.scrollTop(),!t.moveOut){var f=n.width()-s.outerWidth()+c.stX,u=n.height()-s.outerHeight()+c.stY;a<c.stX&&(a=c.stX),a>f&&(a=f),o<c.stY&&(o=c.stY),o>u&&(o=u)}s.css({left:a,top:o})}if(t.resize&&c.resizeStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1];i.preventDefault(),r.style(e.index,{width:c.area[0]+a,height:c.area[1]+o}),c.isResize=!0,t.resizing&&t.resizing(s)}}).on("mouseup",function(e){c.moveStart&&(delete c.moveStart,o.moveElem.hide(),t.moveEnd&&t.moveEnd(s)),c.resizeStart&&(delete c.resizeStart,o.moveElem.hide())}),e},s.pt.callback=function(){function e(){var e=a.cancel&&a.cancel(t.index,n);e===!1||r.close(t.index)}var t=this,n=t.layero,a=t.config;t.openLayer(),a.success&&(2==a.type?n.find("iframe").on("load",function(){a.success(n,t.index)}):a.success(n,t.index)),6==r.ie&&t.IE6(n),n.find("."+l[6]).children("a").on("click",function(){var e=i(this).index();if(0===e)a.yes?a.yes(t.index,n):a.btn1?a.btn1(t.index,n):r.close(t.index);else{var o=a["btn"+(e+1)]&&a["btn"+(e+1)](t.index,n);o===!1||r.close(t.index)}}),n.find("."+l[7]).on("click",e),a.shadeClose&&i("#layui-layer-shade"+t.index).on("click",function(){r.close(t.index)}),n.find(".layui-layer-min").on("click",function(){var e=a.min&&a.min(n);e===!1||r.min(t.index,a)}),n.find(".layui-layer-max").on("click",function(){i(this).hasClass("layui-layer-maxmin")?(r.restore(t.index),a.restore&&a.restore(n)):(r.full(t.index,a),setTimeout(function(){a.full&&a.full(n)},100))}),a.end&&(o.end[t.index]=a.end)},o.reselect=function(){i.each(i("select"),function(e,t){var n=i(this);n.parents("."+l[0])[0]||1==n.attr("layer")&&i("."+l[0]).length<1&&n.removeAttr("layer").show(),n=null})},s.pt.IE6=function(e){i("select").each(function(e,t){var n=i(this);n.parents("."+l[0])[0]||"none"===n.css("display")||n.attr({layer:"1"}).hide(),n=null})},s.pt.openLayer=function(){var e=this;r.zIndex=e.config.zIndex,r.setTop=function(e){var t=function(){r.zIndex++,e.css("z-index",r.zIndex+1)};return r.zIndex=parseInt(e[0].style.zIndex),e.on("mousedown",t),r.zIndex}},o.record=function(e){var t=[e.width(),e.height(),e.position().top,e.position().left+parseFloat(e.css("margin-left"))];e.find(".layui-layer-max").addClass("layui-layer-maxmin"),e.attr({area:t})},o.rescollbar=function(e){l.html.attr("layer-full")==e&&(l.html[0].style.removeProperty?l.html[0].style.removeProperty("overflow"):l.html[0].style.removeAttribute("overflow"),l.html.removeAttr("layer-full"))},e.layer=r,r.getChildFrame=function(e,t){return t=t||i("."+l[4]).attr("times"),i("#"+l[0]+t).find("iframe").contents().find(e)},r.getFrameIndex=function(e){return i("#"+e).parents("."+l[4]).attr("times")},r.iframeAuto=function(e){if(e){var t=r.getChildFrame("html",e).outerHeight(),n=i("#"+l[0]+e),a=n.find(l[1]).outerHeight()||0,o=n.find("."+l[6]).outerHeight()||0;n.css({height:t+a+o}),n.find("iframe").css({height:t})}},r.iframeSrc=function(e,t){i("#"+l[0]+e).find("iframe").attr("src",t)},r.style=function(e,t,n){var a=i("#"+l[0]+e),r=a.find(".layui-layer-content"),s=a.attr("type"),f=a.find(l[1]).outerHeight()||0,c=a.find("."+l[6]).outerHeight()||0;a.attr("minLeft");s!==o.type[3]&&s!==o.type[4]&&(n||(parseFloat(t.width)<=260&&(t.width=260),parseFloat(t.height)-f-c<=64&&(t.height=64+f+c)),a.css(t),c=a.find("."+l[6]).outerHeight(),s===o.type[2]?a.find("iframe").css({height:parseFloat(t.height)-f-c}):r.css({height:parseFloat(t.height)-f-c-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom"))}))},r.min=function(e,t){var a=i("#"+l[0]+e),s=a.find(l[1]).outerHeight()||0,f=a.attr("minLeft")||181*o.minIndex+"px",c=a.css("position");o.record(a),o.minLeft[0]&&(f=o.minLeft[0],o.minLeft.shift()),a.attr("position",c),r.style(e,{width:180,height:s,left:f,top:n.height()-s,position:"fixed",overflow:"hidden"},!0),a.find(".layui-layer-min").hide(),"page"===a.attr("type")&&a.find(l[4]).hide(),o.rescollbar(e),a.attr("minLeft")||o.minIndex++,a.attr("minLeft",f)},r.restore=function(e){var t=i("#"+l[0]+e),n=t.attr("area").split(",");t.attr("type");r.style(e,{width:parseFloat(n[0]),height:parseFloat(n[1]),top:parseFloat(n[2]),left:parseFloat(n[3]),position:t.attr("position"),overflow:"visible"},!0),t.find(".layui-layer-max").removeClass("layui-layer-maxmin"),t.find(".layui-layer-min").show(),"page"===t.attr("type")&&t.find(l[4]).show(),o.rescollbar(e)},r.full=function(e){var t,a=i("#"+l[0]+e);o.record(a),l.html.attr("layer-full")||l.html.css("overflow","hidden").attr("layer-full",e),clearTimeout(t),t=setTimeout(function(){var t="fixed"===a.css("position");r.style(e,{top:t?0:n.scrollTop(),left:t?0:n.scrollLeft(),width:n.width(),height:n.height()},!0),a.find(".layui-layer-min").hide()},100)},r.title=function(e,t){var n=i("#"+l[0]+(t||r.index)).find(l[1]);n.html(e)},r.close=function(e){var t=i("#"+l[0]+e),n=t.attr("type"),a="layer-anim-close";if(t[0]){var s="layui-layer-wrap",f=function(){if(n===o.type[1]&&"object"===t.attr("conType")){t.children(":not(."+l[5]+")").remove();for(var a=t.find("."+s),r=0;r<2;r++)a.unwrap();a.css("display",a.data("display")).removeClass(s)}else{if(n===o.type[2])try{var f=i("#"+l[4]+e)[0];f.contentWindow.document.write(""),f.contentWindow.close(),t.find("."+l[5])[0].removeChild(f)}catch(c){}t[0].innerHTML="",t.remove()}"function"==typeof o.end[e]&&o.end[e](),delete o.end[e]};t.data("isOutAnim")&&t.addClass("layer-anim "+a),i("#layui-layer-moves, #layui-layer-shade"+e).remove(),6==r.ie&&o.reselect(),o.rescollbar(e),t.attr("minLeft")&&(o.minIndex--,o.minLeft.push(t.attr("minLeft"))),r.ie&&r.ie<10||!t.data("isOutAnim")?f():setTimeout(function(){f()},200)}},r.closeAll=function(e){i.each(i("."+l[0]),function(){var t=i(this),n=e?t.attr("type")===e:1;n&&r.close(t.attr("times")),n=null})};var f=r.cache||{},c=function(e){return f.skin?" "+f.skin+" "+f.skin+"-"+e:""};r.prompt=function(e,t){var a="";if(e=e||{},"function"==typeof e&&(t=e),e.area){var o=e.area;a='style="width: '+o[0]+"; height: "+o[1]+';"',delete e.area}var s,l=2==e.formType?'<textarea class="layui-layer-input"'+a+"></textarea>":function(){return'<input type="'+(1==e.formType?"password":"text")+'" class="layui-layer-input">'}(),f=e.success;return delete e.success,r.open(i.extend({type:1,btn:["确定","取消"],content:l,skin:"layui-layer-prompt"+c("prompt"),maxWidth:n.width(),success:function(t){s=t.find(".layui-layer-input"),s.val(e.value||"").focus(),"function"==typeof f&&f(t)},resize:!1,yes:function(i){var n=s.val();""===n?s.focus():n.length>(e.maxlength||500)?r.tips("最多输入"+(e.maxlength||500)+"个字数",s,{tips:1}):t&&t(n,i,s)}},e))},r.tab=function(e){e=e||{};var t=e.tab||{},n="layui-this",a=e.success;return delete e.success,r.open(i.extend({type:1,skin:"layui-layer-tab"+c("tab"),resize:!1,title:function(){var e=t.length,i=1,a="";if(e>0)for(a='<span class="'+n+'">'+t[0].title+"</span>";i<e;i++)a+="<span>"+t[i].title+"</span>";return a}(),content:'<ul class="layui-layer-tabmain">'+function(){var e=t.length,i=1,a="";if(e>0)for(a='<li class="layui-layer-tabli '+n+'">'+(t[0].content||"no content")+"</li>";i<e;i++)a+='<li class="layui-layer-tabli">'+(t[i].content||"no content")+"</li>";return a}()+"</ul>",success:function(t){var o=t.find(".layui-layer-title").children(),r=t.find(".layui-layer-tabmain").children();o.on("mousedown",function(t){t.stopPropagation?t.stopPropagation():t.cancelBubble=!0;var a=i(this),o=a.index();a.addClass(n).siblings().removeClass(n),r.eq(o).show().siblings().hide(),"function"==typeof e.change&&e.change(o)}),"function"==typeof a&&a(t)}},e))},r.photos=function(t,n,a){function o(e,t,i){var n=new Image;return n.src=e,n.complete?t(n):(n.onload=function(){n.onload=null,t(n)},void(n.onerror=function(e){n.onerror=null,i(e)}))}var s={};if(t=t||{},t.photos){var l=t.photos.constructor===Object,f=l?t.photos:{},u=f.data||[],d=f.start||0;s.imgIndex=(0|d)+1,t.img=t.img||"img";var y=t.success;if(delete t.success,l){if(0===u.length)return r.msg("没有图片")}else{var p=i(t.photos),h=function(){u=[],p.find(t.img).each(function(e){var t=i(this);t.attr("layer-index",e),u.push({alt:t.attr("alt"),pid:t.attr("layer-pid"),src:t.attr("layer-src")||t.attr("src"),thumb:t.attr("src")})})};if(h(),0===u.length)return;if(n||p.on("click",t.img,function(){var e=i(this),n=e.attr("layer-index");r.photos(i.extend(t,{photos:{start:n,data:u,tab:t.tab},full:t.full}),!0),h()}),!n)return}s.imgprev=function(e){s.imgIndex--,s.imgIndex<1&&(s.imgIndex=u.length),s.tabimg(e)},s.imgnext=function(e,t){s.imgIndex++,s.imgIndex>u.length&&(s.imgIndex=1,t)||s.tabimg(e)},s.keyup=function(e){if(!s.end){var t=e.keyCode;e.preventDefault(),37===t?s.imgprev(!0):39===t?s.imgnext(!0):27===t&&r.close(s.index)}},s.tabimg=function(e){if(!(u.length<=1))return f.start=s.imgIndex-1,r.close(s.index),r.photos(t,!0,e)},s.event=function(){s.bigimg.hover(function(){s.imgsee.show()},function(){s.imgsee.hide()}),s.bigimg.find(".layui-layer-imgprev").on("click",function(e){e.preventDefault(),s.imgprev()}),s.bigimg.find(".layui-layer-imgnext").on("click",function(e){e.preventDefault(),s.imgnext()}),i(document).on("keyup",s.keyup)},s.loadi=r.load(1,{shade:!("shade"in t)&&.9,scrollbar:!1}),o(u[d].src,function(n){r.close(s.loadi),s.index=r.open(i.extend({type:1,id:"layui-layer-photos",area:function(){var a=[n.width,n.height],o=[i(e).width()-100,i(e).height()-100];if(!t.full&&(a[0]>o[0]||a[1]>o[1])){var r=[a[0]/o[0],a[1]/o[1]];r[0]>r[1]?(a[0]=a[0]/r[0],a[1]=a[1]/r[0]):r[0]<r[1]&&(a[0]=a[0]/r[1],a[1]=a[1]/r[1])}return[a[0]+"px",a[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,isOutAnim:!1,skin:"layui-layer-photos"+c("photos"),content:'<div class="layui-layer-phimg"><img src="'+u[d].src+'" alt="'+(u[d].alt||"")+'" layer-pid="'+u[d].pid+'"><div class="layui-layer-imgsee">'+(u.length>1?'<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>':"")+'<div class="layui-layer-imgbar" style="display:'+(a?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(u[d].alt||"")+"</a><em>"+s.imgIndex+"/"+u.length+"</em></span></div></div></div>",success:function(e,i){s.bigimg=e.find(".layui-layer-phimg"),s.imgsee=e.find(".layui-layer-imguide,.layui-layer-imgbar"),s.event(e),t.tab&&t.tab(u[d],e),"function"==typeof y&&y(e)},end:function(){s.end=!0,i(document).off("keyup",s.keyup)}},t))},function(){r.close(s.loadi),r.msg("当前图片地址异常<br>是否继续查看下一张？",{time:3e4,btn:["下一张","不看了"],yes:function(){u.length>1&&s.imgnext(!0,!0)}})})}},o.run=function(t){i=t,n=i(e),l.html=i("html"),r.open=function(e){var t=new s(e);return t.index}},e.layui&&layui.define?(r.ready(),layui.define("jquery",function(t){r.path=layui.cache.dir,o.run(layui.$),e.layer=r,t("layer",r)})):"function"==typeof define&&define.amd?define(["jquery"],function(){return o.run(e.jQuery),r}):function(){o.run(e.jQuery),r.ready()}()}(window);layui.define("jquery",function(t){"use strict";var a=layui.$,i=(layui.hint(),layui.device()),e="element",l="layui-this",n="layui-show",s=function(){this.config={}};s.prototype.set=function(t){var i=this;return a.extend(!0,i.config,t),i},s.prototype.on=function(t,a){return layui.onevent.call(this,e,t,a)},s.prototype.tabAdd=function(t,i){var e=".layui-tab-title",l=a(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.children(".layui-tab-bar"),o=l.children(".layui-tab-content"),r='<li lay-id="'+(i.id||"")+'"'+(i.attr?' lay-attr="'+i.attr+'"':"")+">"+(i.title||"unnaming")+"</li>";return s[0]?s.before(r):n.append(r),o.append('<div class="layui-tab-item">'+(i.content||"")+"</div>"),f.hideTabMore(!0),f.tabAuto(),this},s.prototype.tabDelete=function(t,i){var e=".layui-tab-title",l=a(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+i+'"]');return f.tabDelete(null,s),this},s.prototype.tabChange=function(t,i){var e=".layui-tab-title",l=a(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+i+'"]');return f.tabClick.call(s[0],null,null,s),this},s.prototype.tab=function(t){t=t||{},b.on("click",t.headerElem,function(i){var e=a(this).index();f.tabClick.call(this,i,e,null,t)})},s.prototype.progress=function(t,i){var e="layui-progress",l=a("."+e+"[lay-filter="+t+"]"),n=l.find("."+e+"-bar"),s=n.find("."+e+"-text");return n.css("width",i),s.text(i),this};var o=".layui-nav",r="layui-nav-item",c="layui-nav-bar",u="layui-nav-tree",d="layui-nav-child",y="layui-nav-more",h="layui-anim layui-anim-upbit",f={tabClick:function(t,i,s,o){o=o||{};var r=s||a(this),i=i||r.parent().children("li").index(r),c=o.headerElem?r.parent():r.parents(".layui-tab").eq(0),u=o.bodyElem?a(o.bodyElem):c.children(".layui-tab-content").children(".layui-tab-item"),d=r.find("a"),y=c.attr("lay-filter");"javascript:;"!==d.attr("href")&&"_blank"===d.attr("target")||(r.addClass(l).siblings().removeClass(l),u.eq(i).addClass(n).siblings().removeClass(n)),layui.event.call(this,e,"tab("+y+")",{elem:c,index:i})},tabDelete:function(t,i){var n=i||a(this).parent(),s=n.index(),o=n.parents(".layui-tab").eq(0),r=o.children(".layui-tab-content").children(".layui-tab-item"),c=o.attr("lay-filter");n.hasClass(l)&&(n.next()[0]?f.tabClick.call(n.next()[0],null,s+1):n.prev()[0]&&f.tabClick.call(n.prev()[0],null,s-1)),n.remove(),r.eq(s).remove(),setTimeout(function(){f.tabAuto()},50),layui.event.call(this,e,"tabDelete("+c+")",{elem:o,index:s})},tabAuto:function(){var t="layui-tab-more",e="layui-tab-bar",l="layui-tab-close",n=this;a(".layui-tab").each(function(){var s=a(this),o=s.children(".layui-tab-title"),r=(s.children(".layui-tab-content").children(".layui-tab-item"),'lay-stope="tabmore"'),c=a('<span class="layui-unselect layui-tab-bar" '+r+"><i "+r+' class="layui-icon"></i></span>');if(n===window&&8!=i.ie&&f.hideTabMore(!0),s.attr("lay-allowClose")&&o.find("li").each(function(){var t=a(this);if(!t.find("."+l)[0]){var i=a('<i class="layui-icon layui-unselect '+l+'">ဆ</i>');i.on("click",f.tabDelete),t.append(i)}}),"string"!=typeof s.attr("lay-unauto"))if(o.prop("scrollWidth")>o.outerWidth()+1){if(o.find("."+e)[0])return;o.append(c),s.attr("overflow",""),c.on("click",function(a){o[this.title?"removeClass":"addClass"](t),this.title=this.title?"":"收缩"})}else o.find("."+e).remove(),s.removeAttr("overflow")})},hideTabMore:function(t){var i=a(".layui-tab-title");t!==!0&&"tabmore"===a(t.target).attr("lay-stope")||(i.removeClass("layui-tab-more"),i.find(".layui-tab-bar").attr("title",""))},clickThis:function(){var t=a(this),i=t.parents(o),n=i.attr("lay-filter"),s=t.parent(),c=t.siblings("."+d),y="string"==typeof s.attr("lay-unselect");"javascript:;"!==t.attr("href")&&"_blank"===t.attr("target")||y||c[0]||(i.find("."+l).removeClass(l),s.addClass(l)),i.hasClass(u)&&(c.removeClass(h),c[0]&&(s["none"===c.css("display")?"addClass":"removeClass"](r+"ed"),"all"===i.attr("lay-shrink")&&s.siblings().removeClass(r+"ed"))),layui.event.call(this,e,"nav("+n+")",t)},collapse:function(){var t=a(this),i=t.find(".layui-colla-icon"),l=t.siblings(".layui-colla-content"),s=t.parents(".layui-collapse").eq(0),o=s.attr("lay-filter"),r="none"===l.css("display");if("string"==typeof s.attr("lay-accordion")){var c=s.children(".layui-colla-item").children("."+n);c.siblings(".layui-colla-title").children(".layui-colla-icon").html(""),c.removeClass(n)}l[r?"addClass":"removeClass"](n),i.html(r?"":""),layui.event.call(this,e,"collapse("+o+")",{title:t,content:l,show:r})}};s.prototype.init=function(t,e){var l=function(){return e?'[lay-filter="'+e+'"]':""}(),s={tab:function(){f.tabAuto.call({})},nav:function(){var t=200,e={},s={},p={},b=function(l,o,r){var c=a(this),f=c.find("."+d);o.hasClass(u)?l.css({top:c.position().top,height:c.children("a").outerHeight(),opacity:1}):(f.addClass(h),l.css({left:c.position().left+parseFloat(c.css("marginLeft")),top:c.position().top+c.height()-l.height()}),e[r]=setTimeout(function(){l.css({width:c.width(),opacity:1})},i.ie&&i.ie<10?0:t),clearTimeout(p[r]),"block"===f.css("display")&&clearTimeout(s[r]),s[r]=setTimeout(function(){f.addClass(n),c.find("."+y).addClass(y+"d")},300))};a(o+l).each(function(i){var l=a(this),o=a('<span class="'+c+'"></span>'),h=l.find("."+r);l.find("."+c)[0]||(l.append(o),h.on("mouseenter",function(){b.call(this,o,l,i)}).on("mouseleave",function(){l.hasClass(u)||(clearTimeout(s[i]),s[i]=setTimeout(function(){l.find("."+d).removeClass(n),l.find("."+y).removeClass(y+"d")},300))}),l.on("mouseleave",function(){clearTimeout(e[i]),p[i]=setTimeout(function(){l.hasClass(u)?o.css({height:0,top:o.position().top+o.height()/2,opacity:0}):o.css({width:0,left:o.position().left+o.width()/2,opacity:0})},t)})),h.find("a").each(function(){var t=a(this),i=(t.parent(),t.siblings("."+d));i[0]&&!t.children("."+y)[0]&&t.append('<span class="'+y+'"></span>'),t.off("click",f.clickThis).on("click",f.clickThis)})})},breadcrumb:function(){var t=".layui-breadcrumb";a(t+l).each(function(){var t=a(this),i="lay-separator",e=t.attr(i)||"/",l=t.find("a");l.next("span["+i+"]")[0]||(l.each(function(t){t!==l.length-1&&a(this).after("<span "+i+">"+e+"</span>")}),t.css("visibility","visible"))})},progress:function(){var t="layui-progress";a("."+t+l).each(function(){var i=a(this),e=i.find(".layui-progress-bar"),l=e.attr("lay-percent");e.css("width",function(){return/^.+\/.+$/.test(l)?100*new Function("return "+l)()+"%":l}()),i.attr("lay-showPercent")&&setTimeout(function(){e.html('<span class="'+t+'-text">'+l+"</span>")},350)})},collapse:function(){var t="layui-collapse";a("."+t+l).each(function(){var t=a(this).find(".layui-colla-item");t.each(function(){var t=a(this),i=t.find(".layui-colla-title"),e=t.find(".layui-colla-content"),l="none"===e.css("display");i.find(".layui-colla-icon").remove(),i.append('<i class="layui-icon layui-colla-icon">'+(l?"":"")+"</i>"),i.off("click",f.collapse).on("click",f.collapse)})})}};return s[t]?s[t]():layui.each(s,function(t,a){a()})},s.prototype.render=s.prototype.init;var p=new s,b=a(document);p.render();var v=".layui-tab-title li";b.on("click",v,f.tabClick),b.on("click",f.hideTabMore),a(window).on("resize",f.tabAuto),t(e,p)});layui.define("layer",function(e){"use strict";var i=layui.$,t=layui.layer,n=layui.hint(),a=layui.device(),o={config:{},set:function(e){var t=this;return t.config=i.extend({},t.config,e),t},on:function(e,i){return layui.onevent.call(this,r,e,i)}},l=function(){var e=this;return{upload:function(i){e.upload.call(e,i)},config:e.config}},r="upload",u="layui-upload-file",c="layui-upload-form",f="layui-upload-iframe",s="layui-upload-choose",p=function(e){var t=this;t.config=i.extend({},t.config,o.config,e),t.render()};p.prototype.config={accept:"images",exts:"",auto:!0,bindAction:"",url:"",field:"file",method:"post",data:{},drag:!0,size:0,number:0,multiple:!1},p.prototype.render=function(e){var t=this,e=t.config;e.elem=i(e.elem),e.bindAction=i(e.bindAction),t.file(),t.events()},p.prototype.file=function(){var e=this,t=e.config,n=e.elemFile=i(['<input class="'+u+'" type="file" accept="'+t.acceptMime+'" name="'+t.field+'"',t.multiple?" multiple":"",">"].join("")),o=t.elem.next();(o.hasClass(u)||o.hasClass(c))&&o.remove(),a.ie&&a.ie<10&&t.elem.wrap('<div class="layui-upload-wrap"></div>'),e.isFile()?(e.elemFile=t.elem,t.field=t.elem[0].name):t.elem.after(n),a.ie&&a.ie<10&&e.initIE()},p.prototype.initIE=function(){var e=this,t=e.config,n=i('<iframe id="'+f+'" class="'+f+'" name="'+f+'" frameborder="0"></iframe>'),a=i(['<form target="'+f+'" class="'+c+'" method="post" key="set-mine" enctype="multipart/form-data" action="'+t.url+'">',"</form>"].join(""));i("#"+f)[0]||i("body").append(n),t.elem.next().hasClass(c)||(e.elemFile.wrap(a),t.elem.next("."+c).append(function(){var e=[];return layui.each(t.data,function(i,t){t="function"==typeof t?t():t,e.push('<input type="hidden" name="'+i+'" value="'+t+'">')}),e.join("")}()))},p.prototype.msg=function(e){return t.msg(e,{icon:2,shift:6})},p.prototype.isFile=function(){var e=this.config.elem[0];if(e)return"input"===e.tagName.toLocaleLowerCase()&&"file"===e.type},p.prototype.preview=function(e){var i=this;window.FileReader&&layui.each(i.chooseFiles,function(i,t){var n=new FileReader;n.readAsDataURL(t),n.onload=function(){e&&e(i,t,this.result)}})},p.prototype.upload=function(e,t){var n,o=this,l=o.config,r=o.elemFile[0],u=function(){var t=0,n=0,a=e||o.files||o.chooseFiles||r.files,u=function(){l.multiple&&t+n===o.fileLength&&"function"==typeof l.allDone&&l.allDone({total:o.fileLength,successful:t,aborted:n})};layui.each(a,function(e,a){var r=new FormData;r.append(l.field,a),layui.each(l.data,function(e,i){i="function"==typeof i?i():i,r.append(e,i)}),i.ajax({url:l.url,type:"post",data:r,contentType:!1,processData:!1,dataType:"json",headers:l.headers||{},success:function(i){t++,d(e,i),u()},error:function(){n++,o.msg("请求上传接口出现异常"),m(e),u()}})})},c=function(){var e=i("#"+f);o.elemFile.parent().submit(),clearInterval(p.timer),p.timer=setInterval(function(){var i,t=e.contents().find("body");try{i=t.text()}catch(n){o.msg("获取上传后的响应信息出现异常"),clearInterval(p.timer),m()}i&&(clearInterval(p.timer),t.html(""),d(0,i))},30)},d=function(e,i){if(o.elemFile.next("."+s).remove(),r.value="","object"!=typeof i)try{i=JSON.parse(i)}catch(t){return i={},o.msg("请对上传接口返回有效JSON")}"function"==typeof l.done&&l.done(i,e||0,function(e){o.upload(e)})},m=function(e){l.auto&&(r.value=""),"function"==typeof l.error&&l.error(e||0,function(e){o.upload(e)})},h=l.exts,v=function(){var i=[];return layui.each(e||o.chooseFiles,function(e,t){i.push(t.name)}),i}(),g={preview:function(e){o.preview(e)},upload:function(e,i){var t={};t[e]=i,o.upload(t)},pushFile:function(){return o.files=o.files||{},layui.each(o.chooseFiles,function(e,i){o.files[e]=i}),o.files},resetFile:function(e,i,t){var n=new File([i],t);o.files=o.files||{},o.files[e]=n}},y=function(){if("choose"!==t&&!l.auto||(l.choose&&l.choose(g),"choose"!==t))return l.before&&l.before(g),a.ie?a.ie>9?u():c():void u()};if(v=0===v.length?r.value.match(/[^\/\\]+\..+/g)||[]||"":v,0!==v.length){switch(l.accept){case"file":if(h&&!RegExp("\\w\\.("+h+")$","i").test(escape(v)))return o.msg("选择的文件中包含不支持的格式"),r.value="";break;case"video":if(!RegExp("\\w\\.("+(h||"avi|mp4|wma|rmvb|rm|flash|3gp|flv")+")$","i").test(escape(v)))return o.msg("选择的视频中包含不支持的格式"),r.value="";break;case"audio":if(!RegExp("\\w\\.("+(h||"mp3|wav|mid")+")$","i").test(escape(v)))return o.msg("选择的音频中包含不支持的格式"),r.value="";break;default:if(layui.each(v,function(e,i){RegExp("\\w\\.("+(h||"jpg|png|gif|bmp|jpeg$")+")","i").test(escape(i))||(n=!0)}),n)return o.msg("选择的图片中包含不支持的格式"),r.value=""}if(o.fileLength=function(){var i=0,t=e||o.files||o.chooseFiles||r.files;return layui.each(t,function(){i++}),i}(),l.number&&o.fileLength>l.number)return o.msg("同时最多只能上传的数量为："+l.number);if(l.size>0&&!(a.ie&&a.ie<10)){var F;if(layui.each(o.chooseFiles,function(e,i){if(i.size>1024*l.size){var t=l.size/1024;t=t>=1?t.toFixed(2)+"MB":l.size+"KB",r.value="",F=t}}),F)return o.msg("文件不能超过"+F)}y()}},p.prototype.events=function(){var e=this,t=e.config,o=function(i){e.chooseFiles={},layui.each(i,function(i,t){var n=(new Date).getTime();e.chooseFiles[n+"-"+i]=t})},l=function(i,n){var a=e.elemFile,o=i.length>1?i.length+"个文件":(i[0]||{}).name||a[0].value.match(/[^\/\\]+\..+/g)||[]||"";a.next().hasClass(s)&&a.next().remove(),e.upload(null,"choose"),e.isFile()||t.choose||a.after('<span class="layui-inline '+s+'">'+o+"</span>")};t.elem.off("upload.start").on("upload.start",function(){var a=i(this),o=a.attr("lay-data");if(o)try{o=new Function("return "+o)(),e.config=i.extend({},t,o)}catch(l){n.error("Upload element property lay-data configuration item has a syntax error: "+o)}e.config.item=a,e.elemFile[0].click()}),a.ie&&a.ie<10||t.elem.off("upload.over").on("upload.over",function(){var e=i(this);e.attr("lay-over","")}).off("upload.leave").on("upload.leave",function(){var e=i(this);e.removeAttr("lay-over")}).off("upload.drop").on("upload.drop",function(n,a){var r=i(this),u=a.originalEvent.dataTransfer.files||[];r.removeAttr("lay-over"),o(u),t.auto?e.upload(u):l(u)}),e.elemFile.off("upload.change").on("upload.change",function(){var i=this.files||[];o(i),t.auto?e.upload():l(i)}),t.bindAction.off("upload.action").on("upload.action",function(){e.upload()}),t.elem.data("haveEvents")||(e.elemFile.on("change",function(){i(this).trigger("upload.change")}),t.elem.on("click",function(){e.isFile()||i(this).trigger("upload.start")}),t.drag&&t.elem.on("dragover",function(e){e.preventDefault(),i(this).trigger("upload.over")}).on("dragleave",function(e){i(this).trigger("upload.leave")}).on("drop",function(e){e.preventDefault(),i(this).trigger("upload.drop",e)}),t.bindAction.on("click",function(){i(this).trigger("upload.action")}),t.elem.data("haveEvents",!0))},o.render=function(e){var i=new p(e);return l.call(i)},e(r,o)});layui.define("jquery",function(e){"use strict";var i=layui.jquery,t={config:{},index:layui.slider?layui.slider.index+1e4:0,set:function(e){var t=this;return t.config=i.extend({},t.config,e),t},on:function(e,i){return layui.onevent.call(this,n,e,i)}},a=function(){var e=this,i=e.config;return{setValue:function(i,t){return e.slide("set",i,t||0)},config:i}},n="slider",l="layui-disabled",s="layui-slider",r="layui-slider-bar",o="layui-slider-wrap",u="layui-slider-wrap-btn",d="layui-slider-tips",v="layui-slider-input",c="layui-slider-input-txt",m="layui-slider-input-btn",p="layui-slider-hover",f=function(e){var a=this;a.index=++t.index,a.config=i.extend({},a.config,t.config,e),a.render()};f.prototype.config={type:"default",min:0,max:100,value:0,step:1,showstep:!1,tips:!0,input:!1,range:!1,height:200,disabled:!1,theme:"#009688"},f.prototype.render=function(){var e=this,t=e.config;if(t.step<1&&(t.step=1),t.max<t.min&&(t.max=t.min+t.step),t.range){t.value="object"==typeof t.value?t.value:[t.min,t.value];var a=Math.min(t.value[0],t.value[1]),n=Math.max(t.value[0],t.value[1]);t.value[0]=a>t.min?a:t.min,t.value[1]=n>t.min?n:t.min,t.value[0]=t.value[0]>t.max?t.max:t.value[0],t.value[1]=t.value[1]>t.max?t.max:t.value[1];var r=Math.floor((t.value[0]-t.min)/(t.max-t.min)*100),v=Math.floor((t.value[1]-t.min)/(t.max-t.min)*100),m=v-r+"%";r+="%",v+="%"}else{"object"==typeof t.value&&(t.value=Math.min.apply(null,t.value)),t.value<t.min&&(t.value=t.min),t.value>t.max&&(t.value=t.max);var m=Math.floor((t.value-t.min)/(t.max-t.min)*100)+"%"}var p=t.disabled?"#c2c2c2":t.theme,f='<div class="layui-slider '+("vertical"===t.type?"layui-slider-vertical":"")+'">'+(t.tips?'<div class="layui-slider-tips"></div>':"")+'<div class="layui-slider-bar" style="background:'+p+"; "+("vertical"===t.type?"height":"width")+":"+m+";"+("vertical"===t.type?"bottom":"left")+":"+(r||0)+';"></div><div class="layui-slider-wrap" style="'+("vertical"===t.type?"bottom":"left")+":"+(r||m)+';"><div class="layui-slider-wrap-btn" style="border: 2px solid '+p+';"></div></div>'+(t.range?'<div class="layui-slider-wrap" style="'+("vertical"===t.type?"bottom":"left")+":"+v+';"><div class="layui-slider-wrap-btn" style="border: 2px solid '+p+';"></div></div>':"")+"</div>",h=i(t.elem),y=h.next("."+s);if(y[0]&&y.remove(),e.elemTemp=i(f),t.range?(e.elemTemp.find("."+o).eq(0).data("value",t.value[0]),e.elemTemp.find("."+o).eq(1).data("value",t.value[1])):e.elemTemp.find("."+o).data("value",t.value),h.html(e.elemTemp),"vertical"===t.type&&e.elemTemp.height(t.height+"px"),t.showstep){for(var g=(t.max-t.min)/t.step,b="",x=1;x<g+1;x++){var T=100*x/g;T<100&&(b+='<div class="layui-slider-step" style="'+("vertical"===t.type?"bottom":"left")+":"+T+'%"></div>')}e.elemTemp.append(b)}if(t.input&&!t.range){var w=i('<div class="layui-slider-input layui-input"><div class="layui-slider-input-txt"><input type="text" class="layui-input"></div><div class="layui-slider-input-btn"><i class="layui-icon layui-icon-up"></i><i class="layui-icon layui-icon-down"></i></div></div>');h.css("position","relative"),h.append(w),h.find("."+c).children("input").val(t.value),"vertical"===t.type?w.css({left:0,top:-48}):e.elemTemp.css("margin-right",w.outerWidth()+15)}t.disabled?(e.elemTemp.addClass(l),e.elemTemp.find("."+u).addClass(l)):e.slide(),e.elemTemp.find("."+u).on("mouseover",function(){var a="vertical"===t.type?t.height:e.elemTemp[0].offsetWidth,n=e.elemTemp.find("."+o),l="vertical"===t.type?a-i(this).parent()[0].offsetTop-n.height():i(this).parent()[0].offsetLeft,s=l/a*100,r=i(this).parent().data("value"),u=t.setTips?t.setTips(r):r;e.elemTemp.find("."+d).html(u),"vertical"===t.type?e.elemTemp.find("."+d).css({bottom:s+"%","margin-bottom":"20px",display:"inline-block"}):e.elemTemp.find("."+d).css({left:s+"%",display:"inline-block"})}).on("mouseout",function(){e.elemTemp.find("."+d).css("display","none")})},f.prototype.slide=function(e,t,a){var n=this,l=n.config,s=n.elemTemp,f=function(){return"vertical"===l.type?l.height:s[0].offsetWidth},h=s.find("."+o),y=s.next("."+v),g=y.children("."+c).children("input").val(),b=100/((l.max-l.min)/Math.ceil(l.step)),x=function(e,i){e=Math.ceil(e)*b>100?Math.ceil(e)*b:Math.round(e)*b,e=e>100?100:e,h.eq(i).css("vertical"===l.type?"bottom":"left",e+"%");var t=T(h[0].offsetLeft),a=l.range?T(h[1].offsetLeft):0;"vertical"===l.type?(s.find("."+d).css({bottom:e+"%","margin-bottom":"20px"}),t=T(f()-h[0].offsetTop-h.height()),a=l.range?T(f()-h[1].offsetTop-h.height()):0):s.find("."+d).css("left",e+"%"),t=t>100?100:t,a=a>100?100:a;var n=Math.min(t,a),o=Math.abs(t-a);"vertical"===l.type?s.find("."+r).css({height:o+"%",bottom:n+"%"}):s.find("."+r).css({width:o+"%",left:n+"%"});var u=l.min+Math.round((l.max-l.min)*e/100);if(g=u,y.children("."+c).children("input").val(g),h.eq(i).data("value",u),u=l.setTips?l.setTips(u):u,s.find("."+d).html(u),l.range){var v=[h.eq(0).data("value"),h.eq(1).data("value")];v[0]>v[1]&&v.reverse()}l.change&&l.change(l.range?v:u)},T=function(e){var i=e/f()*100/b,t=Math.round(i)*b;return e==f()&&(t=Math.ceil(i)*b),t},w=i(['<div class="layui-auxiliar-moving" id="LAY-slider-moving"></div'].join("")),M=function(e,t){var a=function(){t&&t(),w.remove()};i("#LAY-slider-moving")[0]||i("body").append(w),w.on("mousemove",e),w.on("mouseup",a).on("mouseleave",a)};if("set"===e)return x(t,a);s.find("."+u).each(function(e){var t=i(this);t.on("mousedown",function(i){i=i||window.event;var a=t.parent()[0].offsetLeft,n=i.clientX;"vertical"===l.type&&(a=f()-t.parent()[0].offsetTop-h.height(),n=i.clientY);var r=function(i){i=i||window.event;var r=a+("vertical"===l.type?n-i.clientY:i.clientX-n);r<0&&(r=0),r>f()&&(r=f());var o=r/f()*100/b;x(o,e),t.addClass(p),s.find("."+d).show(),i.preventDefault()},o=function(){t.removeClass(p),s.find("."+d).hide()};M(r,o)})}),s.on("click",function(e){var t=i("."+u);if(!t.is(event.target)&&0===t.has(event.target).length&&t.length){var a,n="vertical"===l.type?f()-e.clientY+i(this).offset().top:e.clientX-i(this).offset().left;n<0&&(n=0),n>f()&&(n=f());var s=n/f()*100/b;a=l.range?"vertical"===l.type?Math.abs(n-parseInt(i(h[0]).css("bottom")))>Math.abs(n-parseInt(i(h[1]).css("bottom")))?1:0:Math.abs(n-h[0].offsetLeft)>Math.abs(n-h[1].offsetLeft)?1:0:0,x(s,a),e.preventDefault()}}),y.hover(function(){var e=i(this);e.children("."+m).fadeIn("fast")},function(){var e=i(this);e.children("."+m).fadeOut("fast")}),y.children("."+m).children("i").each(function(e){i(this).on("click",function(){g=1==e?g-l.step<l.min?l.min:Number(g)-l.step:Number(g)+l.step>l.max?l.max:Number(g)+l.step;var i=(g-l.min)/(l.max-l.min)*100/b;x(i,0)})});var q=function(){var e=this.value;e=isNaN(e)?0:e,e=e<l.min?l.min:e,e=e>l.max?l.max:e,this.value=e;var i=(e-l.min)/(l.max-l.min)*100/b;x(i,0)};y.children("."+c).children("input").on("keydown",function(e){13===e.keyCode&&(e.preventDefault(),q.call(this))}).on("change",q)},f.prototype.events=function(){var e=this;e.config},t.render=function(e){var i=new f(e);return a.call(i)},e(n,t)});layui.define("jquery",function(e){"use strict";var i=layui.jquery,o={config:{},index:layui.colorpicker?layui.colorpicker.index+1e4:0,set:function(e){var o=this;return o.config=i.extend({},o.config,e),o},on:function(e,i){return layui.onevent.call(this,"colorpicker",e,i)}},r=function(){var e=this,i=e.config;return{config:i}},t="colorpicker",n="layui-show",l="layui-colorpicker",c=".layui-colorpicker-main",a="layui-icon-down",s="layui-icon-close",f="layui-colorpicker-trigger-span",d="layui-colorpicker-trigger-i",u="layui-colorpicker-side",p="layui-colorpicker-side-slider",g="layui-colorpicker-basis",v="layui-colorpicker-alpha-bgcolor",h="layui-colorpicker-alpha-slider",m="layui-colorpicker-basis-cursor",b="layui-colorpicker-main-input",k=function(e){var i={h:0,s:0,b:0},o=Math.min(e.r,e.g,e.b),r=Math.max(e.r,e.g,e.b),t=r-o;return i.b=r,i.s=0!=r?255*t/r:0,0!=i.s?e.r==r?i.h=(e.g-e.b)/t:e.g==r?i.h=2+(e.b-e.r)/t:i.h=4+(e.r-e.g)/t:i.h=-1,r==o&&(i.h=0),i.h*=60,i.h<0&&(i.h+=360),i.s*=100/255,i.b*=100/255,i},y=function(e){var e=e.indexOf("#")>-1?e.substring(1):e;if(3==e.length){var i=e.split("");e=i[0]+i[0]+i[1]+i[1]+i[2]+i[2]}e=parseInt(e,16);var o={r:e>>16,g:(65280&e)>>8,b:255&e};return k(o)},x=function(e){var i={},o=e.h,r=255*e.s/100,t=255*e.b/100;if(0==r)i.r=i.g=i.b=t;else{var n=t,l=(255-r)*t/255,c=(n-l)*(o%60)/60;360==o&&(o=0),o<60?(i.r=n,i.b=l,i.g=l+c):o<120?(i.g=n,i.b=l,i.r=n-c):o<180?(i.g=n,i.r=l,i.b=l+c):o<240?(i.b=n,i.r=l,i.g=n-c):o<300?(i.b=n,i.g=l,i.r=l+c):o<360?(i.r=n,i.g=l,i.b=n-c):(i.r=0,i.g=0,i.b=0)}return{r:Math.round(i.r),g:Math.round(i.g),b:Math.round(i.b)}},C=function(e){var o=x(e),r=[o.r.toString(16),o.g.toString(16),o.b.toString(16)];return i.each(r,function(e,i){1==i.length&&(r[e]="0"+i)}),r.join("")},P=function(e){var i=/[0-9]{1,3}/g,o=e.match(i)||[];return{r:o[0],g:o[1],b:o[2]}},B=i(window),w=i(document),D=function(e){var r=this;r.index=++o.index,r.config=i.extend({},r.config,o.config,e),r.render()};D.prototype.config={color:"",size:null,alpha:!1,format:"hex",predefine:!1,colors:["#009688","#5FB878","#1E9FFF","#FF5722","#FFB800","#01AAED","#999","#c00","#ff8c00","#ffd700","#90ee90","#00ced1","#1e90ff","#c71585","rgb(0, 186, 189)","rgb(255, 120, 0)","rgb(250, 212, 0)","#393D49","rgba(0,0,0,.5)","rgba(255, 69, 0, 0.68)","rgba(144, 240, 144, 0.5)","rgba(31, 147, 255, 0.73)"]},D.prototype.render=function(){var e=this,o=e.config,r=i(['<div class="layui-unselect layui-colorpicker">',"<span "+("rgb"==o.format&&o.alpha?'class="layui-colorpicker-trigger-bgcolor"':"")+">",'<span class="layui-colorpicker-trigger-span" ','lay-type="'+("rgb"==o.format?o.alpha?"rgba":"torgb":"")+'" ','style="'+function(){var e="";return o.color?(e=o.color,(o.color.match(/[0-9]{1,3}/g)||[]).length>3&&(o.alpha&&"rgb"==o.format||(e="#"+C(k(P(o.color))))),"background: "+e):e}()+'">','<i class="layui-icon layui-colorpicker-trigger-i '+(o.color?a:s)+'"></i>',"</span>","</span>","</div>"].join("")),t=i(o.elem);o.size&&r.addClass("layui-colorpicker-"+o.size),t.addClass("layui-inline").html(e.elemColorBox=r),e.color=e.elemColorBox.find("."+f)[0].style.background,e.events()},D.prototype.renderPicker=function(){var e=this,o=e.config,r=e.elemColorBox[0],t=e.elemPicker=i(['<div id="layui-colorpicker'+e.index+'" data-index="'+e.index+'" class="layui-anim layui-anim-upbit layui-colorpicker-main">','<div class="layui-colorpicker-main-wrapper">','<div class="layui-colorpicker-basis">','<div class="layui-colorpicker-basis-white"></div>','<div class="layui-colorpicker-basis-black"></div>','<div class="layui-colorpicker-basis-cursor"></div>',"</div>",'<div class="layui-colorpicker-side">','<div class="layui-colorpicker-side-slider"></div>',"</div>","</div>",'<div class="layui-colorpicker-main-alpha '+(o.alpha?n:"")+'">','<div class="layui-colorpicker-alpha-bgcolor">','<div class="layui-colorpicker-alpha-slider"></div>',"</div>","</div>",function(){if(o.predefine){var e=['<div class="layui-colorpicker-main-pre">'];return layui.each(o.colors,function(i,o){e.push(['<div class="layui-colorpicker-pre'+((o.match(/[0-9]{1,3}/g)||[]).length>3?" layui-colorpicker-pre-isalpha":"")+'">','<div style="background:'+o+'"></div>',"</div>"].join(""))}),e.push("</div>"),e.join("")}return""}(),'<div class="layui-colorpicker-main-input">','<div class="layui-inline">','<input type="text" class="layui-input">',"</div>",'<div class="layui-btn-container">','<button class="layui-btn layui-btn-primary layui-btn-sm" colorpicker-events="clear">清空</button>','<button class="layui-btn layui-btn-sm" colorpicker-events="confirm">确定</button>',"</div","</div>","</div>"].join(""));e.elemColorBox.find("."+f)[0];i(c)[0]&&i(c).data("index")==e.index?e.removePicker(D.thisElemInd):(e.removePicker(D.thisElemInd),i("body").append(t)),D.thisElemInd=e.index,D.thisColor=r.style.background,e.position(),e.pickerEvents()},D.prototype.removePicker=function(e){var o=this;o.config;return i("#layui-colorpicker"+(e||o.index)).remove(),o},D.prototype.position=function(){var e=this,i=e.config,o=e.bindElem||e.elemColorBox[0],r=e.elemPicker[0],t=o.getBoundingClientRect(),n=r.offsetWidth,l=r.offsetHeight,c=function(e){return e=e?"scrollLeft":"scrollTop",document.body[e]|document.documentElement[e]},a=function(e){return document.documentElement[e?"clientWidth":"clientHeight"]},s=5,f=t.left,d=t.bottom;f-=(n-o.offsetWidth)/2,d+=s,f+n+s>a("width")?f=a("width")-n-s:f<s&&(f=s),d+l+s>a()&&(d=t.top>l?t.top-l:a()-l,d-=2*s),i.position&&(r.style.position=i.position),r.style.left=f+("fixed"===i.position?0:c(1))+"px",r.style.top=d+("fixed"===i.position?0:c())+"px"},D.prototype.val=function(){var e=this,i=(e.config,e.elemColorBox.find("."+f)),o=e.elemPicker.find("."+b),r=i[0],t=r.style.backgroundColor;if(t){var n=k(P(t)),l=i.attr("lay-type");if(e.select(n.h,n.s,n.b),"torgb"===l&&o.find("input").val(t),"rgba"===l){var c=P(t);if(3==(t.match(/[0-9]{1,3}/g)||[]).length)o.find("input").val("rgba("+c.r+", "+c.g+", "+c.b+", 1)"),e.elemPicker.find("."+h).css("left",280);else{o.find("input").val(t);var a=280*t.slice(t.lastIndexOf(",")+1,t.length-1);e.elemPicker.find("."+h).css("left",a)}e.elemPicker.find("."+v)[0].style.background="linear-gradient(to right, rgba("+c.r+", "+c.g+", "+c.b+", 0), rgb("+c.r+", "+c.g+", "+c.b+"))"}}else e.select(0,100,100),o.find("input").val(""),e.elemPicker.find("."+v)[0].style.background="",e.elemPicker.find("."+h).css("left",280)},D.prototype.side=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f),t=r.attr("lay-type"),n=e.elemPicker.find("."+u),l=e.elemPicker.find("."+p),c=e.elemPicker.find("."+g),y=e.elemPicker.find("."+m),C=e.elemPicker.find("."+v),w=e.elemPicker.find("."+h),D=l[0].offsetTop/180*360,E=100-(y[0].offsetTop+3)/180*100,H=(y[0].offsetLeft+3)/260*100,W=Math.round(w[0].offsetLeft/280*100)/100,j=e.elemColorBox.find("."+d),F=e.elemPicker.find(".layui-colorpicker-pre").children("div"),L=function(i,n,l,c){e.select(i,n,l);var f=x({h:i,s:n,b:l});if(j.addClass(a).removeClass(s),r[0].style.background="rgb("+f.r+", "+f.g+", "+f.b+")","torgb"===t&&e.elemPicker.find("."+b).find("input").val("rgb("+f.r+", "+f.g+", "+f.b+")"),"rgba"===t){var d=0;d=280*c,w.css("left",d),e.elemPicker.find("."+b).find("input").val("rgba("+f.r+", "+f.g+", "+f.b+", "+c+")"),r[0].style.background="rgba("+f.r+", "+f.g+", "+f.b+", "+c+")",C[0].style.background="linear-gradient(to right, rgba("+f.r+", "+f.g+", "+f.b+", 0), rgb("+f.r+", "+f.g+", "+f.b+"))"}o.change&&o.change(e.elemPicker.find("."+b).find("input").val())},M=i(['<div class="layui-auxiliar-moving" id="LAY-colorpicker-moving"></div'].join("")),Y=function(e){i("#LAY-colorpicker-moving")[0]||i("body").append(M),M.on("mousemove",e),M.on("mouseup",function(){M.remove()}).on("mouseleave",function(){M.remove()})};l.on("mousedown",function(e){var i=this.offsetTop,o=e.clientY,r=function(e){var r=i+(e.clientY-o),t=n[0].offsetHeight;r<0&&(r=0),r>t&&(r=t);var l=r/180*360;D=l,L(l,H,E,W),e.preventDefault()};Y(r),e.preventDefault()}),n.on("click",function(e){var o=e.clientY-i(this).offset().top;o<0&&(o=0),o>this.offsetHeight&&(o=this.offsetHeight);var r=o/180*360;D=r,L(r,H,E,W),e.preventDefault()}),y.on("mousedown",function(e){var i=this.offsetTop,o=this.offsetLeft,r=e.clientY,t=e.clientX,n=function(e){var n=i+(e.clientY-r),l=o+(e.clientX-t),a=c[0].offsetHeight-3,s=c[0].offsetWidth-3;n<-3&&(n=-3),n>a&&(n=a),l<-3&&(l=-3),l>s&&(l=s);var f=(l+3)/260*100,d=100-(n+3)/180*100;E=d,H=f,L(D,f,d,W),e.preventDefault()};layui.stope(e),Y(n),e.preventDefault()}),c.on("mousedown",function(e){var o=e.clientY-i(this).offset().top-3+B.scrollTop(),r=e.clientX-i(this).offset().left-3+B.scrollLeft();o<-3&&(o=-3),o>this.offsetHeight-3&&(o=this.offsetHeight-3),r<-3&&(r=-3),r>this.offsetWidth-3&&(r=this.offsetWidth-3);var t=(r+3)/260*100,n=100-(o+3)/180*100;E=n,H=t,L(D,t,n,W),e.preventDefault(),y.trigger(e,"mousedown")}),w.on("mousedown",function(e){var i=this.offsetLeft,o=e.clientX,r=function(e){var r=i+(e.clientX-o),t=C[0].offsetWidth;r<0&&(r=0),r>t&&(r=t);var n=Math.round(r/280*100)/100;W=n,L(D,H,E,n),e.preventDefault()};Y(r),e.preventDefault()}),C.on("click",function(e){var o=e.clientX-i(this).offset().left;o<0&&(o=0),o>this.offsetWidth&&(o=this.offsetWidth);var r=Math.round(o/280*100)/100;W=r,L(D,H,E,r),e.preventDefault()}),F.each(function(){i(this).on("click",function(){i(this).parent(".layui-colorpicker-pre").addClass("selected").siblings().removeClass("selected");var e,o=this.style.backgroundColor,r=k(P(o)),t=o.slice(o.lastIndexOf(",")+1,o.length-1);D=r.h,H=r.s,E=r.b,3==(o.match(/[0-9]{1,3}/g)||[]).length&&(t=1),W=t,e=280*t,L(r.h,r.s,r.b,t)})})},D.prototype.select=function(e,i,o,r){var t=this,n=(t.config,C({h:e,s:100,b:100})),l=C({h:e,s:i,b:o}),c=e/360*180,a=180-o/100*180-3,s=i/100*260-3;t.elemPicker.find("."+p).css("top",c),t.elemPicker.find("."+g)[0].style.background="#"+n,t.elemPicker.find("."+m).css({top:a,left:s}),"change"!==r&&t.elemPicker.find("."+b).find("input").val("#"+l)},D.prototype.pickerEvents=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f),t=e.elemPicker.find("."+b+" input"),n={clear:function(i){r[0].style.background="",e.elemColorBox.find("."+d).removeClass(a).addClass(s),e.color="",o.done&&o.done(""),e.removePicker()},confirm:function(i,n){var l=t.val(),c=l,f={};if(l.indexOf(",")>-1){if(f=k(P(l)),e.select(f.h,f.s,f.b),r[0].style.background=c="#"+C(f),(l.match(/[0-9]{1,3}/g)||[]).length>3&&"rgba"===r.attr("lay-type")){var u=280*l.slice(l.lastIndexOf(",")+1,l.length-1);e.elemPicker.find("."+h).css("left",u),r[0].style.background=l,c=l}}else f=y(l),r[0].style.background=c="#"+C(f),e.elemColorBox.find("."+d).removeClass(s).addClass(a);return"change"===n?(e.select(f.h,f.s,f.b,n),void(o.change&&o.change(c))):(e.color=l,o.done&&o.done(l),void e.removePicker())}};e.elemPicker.on("click","*[colorpicker-events]",function(){var e=i(this),o=e.attr("colorpicker-events");n[o]&&n[o].call(this,e)}),t.on("keyup",function(e){var o=i(this);n.confirm.call(this,o,13===e.keyCode?null:"change")})},D.prototype.events=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f);e.elemColorBox.on("click",function(){e.renderPicker(),i(c)[0]&&(e.val(),e.side())}),o.elem[0]&&!e.elemColorBox[0].eventHandler&&(w.on("click",function(o){if(!i(o.target).hasClass(l)&&!i(o.target).parents("."+l)[0]&&!i(o.target).hasClass(c.replace(/\./g,""))&&!i(o.target).parents(c)[0]&&e.elemPicker){if(e.color){var t=k(P(e.color));e.select(t.h,t.s,t.b)}else e.elemColorBox.find("."+d).removeClass(a).addClass(s);r[0].style.background=e.color||"",e.removePicker()}}),B.on("resize",function(){return!(!e.elemPicker||!i(c)[0])&&void e.position()}),e.elemColorBox[0].eventHandler=!0)},o.render=function(e){var i=new D(e);return r.call(i)},e(t,o)});layui.define("layer",function(e){"use strict";var t=layui.$,i=layui.layer,a=layui.hint(),n=layui.device(),l="form",r=".layui-form",s="layui-this",o="layui-hide",c="layui-disabled",u=function(){this.config={verify:{required:[/[\S]+/,"必填项不能为空"],phone:[/^1\d{10}$/,"请输入正确的手机号"],email:[/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/,"邮箱格式不正确"],url:[/(^#)|(^http(s*):\/\/[^\s]+\.[^\s]+)/,"链接格式不正确"],number:function(e){if(!e||isNaN(e))return"只能填写数字"},date:[/^(\d{4})[-\/](\d{1}|0\d{1}|1[0-2])([-\/](\d{1}|0\d{1}|[1-2][0-9]|3[0-1]))*$/,"日期格式不正确"],identity:[/(^\d{15}$)|(^\d{17}(x|X|\d)$)/,"请输入正确的身份证号"]}}};u.prototype.set=function(e){var i=this;return t.extend(!0,i.config,e),i},u.prototype.verify=function(e){var i=this;return t.extend(!0,i.config.verify,e),i},u.prototype.on=function(e,t){return layui.onevent.call(this,l,e,t)},u.prototype.val=function(e,i){var a=t(r+'[lay-filter="'+e+'"]');a.each(function(e,a){var n=t(this);layui.each(i,function(e,t){var i,a=n.find('[name="'+e+'"]');a[0]&&(i=a[0].type,"checkbox"===i?a[0].checked=t:"radio"===i?a.each(function(){this.value===t&&(this.checked=!0)}):a.val(t))})}),f.render(null,e)},u.prototype.render=function(e,i){var n=this,u=t(r+function(){return i?'[lay-filter="'+i+'"]':""}()),d={select:function(){var e,i="请选择",a="layui-form-select",n="layui-select-title",r="layui-select-none",d="",f=u.find("select"),v=function(i,l){t(i.target).parent().hasClass(n)&&!l||(t("."+a).removeClass(a+"ed "+a+"up"),e&&d&&e.val(d)),e=null},y=function(i,u,f){var y,p=t(this),m=i.find("."+n),k=m.find("input"),x=i.find("dl"),g=x.children("dd"),b=this.selectedIndex;if(!u){var C=function(){var e=i.offset().top+i.outerHeight()+5-h.scrollTop(),t=x.outerHeight();b=p[0].selectedIndex,i.addClass(a+"ed"),g.removeClass(o),y=null,g.eq(b).addClass(s).siblings().removeClass(s),e+t>h.height()&&e>=t&&i.addClass(a+"up"),$()},w=function(e){i.removeClass(a+"ed "+a+"up"),k.blur(),y=null,e||T(k.val(),function(e){var i=p[0].selectedIndex;e&&(d=t(p[0].options[i]).html(),0===i&&d===k.attr("placeholder")&&(d=""),k.val(d||""))})},$=function(){var e=x.children("dd."+s);if(e[0]){var t=e.position().top,i=x.height(),a=e.height();t>i&&x.scrollTop(t+x.scrollTop()-i+a-5),t<0&&x.scrollTop(t+x.scrollTop()-5)}};m.on("click",function(e){i.hasClass(a+"ed")?w():(v(e,!0),C()),x.find("."+r).remove()}),m.find(".layui-edge").on("click",function(){k.focus()}),k.on("keyup",function(e){var t=e.keyCode;9===t&&C()}).on("keydown",function(e){var t=e.keyCode;9===t&&w();var i=function(t,a){var n,l;e.preventDefault();var r=function(){var e=x.children("dd."+s);if(x.children("dd."+o)[0]&&"next"===t){var i=x.children("dd:not(."+o+",."+c+")"),n=i.eq(0).index();if(n>=0&&n<e.index()&&!i.hasClass(s))return i.eq(0).prev()[0]?i.eq(0).prev():x.children(":last")}return a&&a[0]?a:y&&y[0]?y:e}();return l=r[t](),n=r[t]("dd:not(."+o+")"),l[0]?(y=r[t](),n[0]&&!n.hasClass(c)||!y[0]?(n.addClass(s).siblings().removeClass(s),void $()):i(t,y)):y=null};38===t&&i("prev"),40===t&&i("next"),13===t&&(e.preventDefault(),x.children("dd."+s).trigger("click"))});var T=function(e,i,a){var n=0;layui.each(g,function(){var i=t(this),l=i.text(),r=l.indexOf(e)===-1;(""===e||"blur"===a?e!==l:r)&&n++,"keyup"===a&&i[r?"addClass":"removeClass"](o)});var l=n===g.length;return i(l),l},j=function(e){var t=this.value,i=e.keyCode;return 9!==i&&13!==i&&37!==i&&38!==i&&39!==i&&40!==i&&(T(t,function(e){e?x.find("."+r)[0]||x.append('<p class="'+r+'">无匹配项</p>'):x.find("."+r).remove()},"keyup"),""===t&&x.find("."+r).remove(),void $())};f&&k.on("keyup",j).on("blur",function(i){var a=p[0].selectedIndex;e=k,d=t(p[0].options[a]).html(),0===a&&d===k.attr("placeholder")&&(d=""),setTimeout(function(){T(k.val(),function(e){d||k.val("")},"blur")},200)}),g.on("click",function(){var e=t(this),a=e.attr("lay-value"),n=p.attr("lay-filter");return!e.hasClass(c)&&(e.hasClass("layui-select-tips")?k.val(""):(k.val(e.text()),e.addClass(s)),e.siblings().removeClass(s),p.val(a).removeClass("layui-form-danger"),layui.event.call(this,l,"select("+n+")",{elem:p[0],value:a,othis:i}),w(!0),!1)}),i.find("dl>dt").on("click",function(e){return!1}),t(document).off("click",v).on("click",v)}};f.each(function(e,l){var r=t(this),o=r.next("."+a),u=this.disabled,d=l.value,f=t(l.options[l.selectedIndex]),v=l.options[0];if("string"==typeof r.attr("lay-ignore"))return r.show();var h="string"==typeof r.attr("lay-search"),p=v?v.value?i:v.innerHTML||i:i,m=t(['<div class="'+(h?"":"layui-unselect ")+a,(u?" layui-select-disabled":"")+'">','<div class="'+n+'">','<input type="text" placeholder="'+p+'" '+('value="'+(d?f.html():"")+'"')+(h?"":" readonly")+' class="layui-input'+(h?"":" layui-unselect")+(u?" "+c:"")+'">','<i class="layui-edge"></i></div>','<dl class="layui-anim layui-anim-upbit'+(r.find("optgroup")[0]?" layui-select-group":"")+'">',function(e){var t=[];return layui.each(e,function(e,a){0!==e||a.value?"optgroup"===a.tagName.toLowerCase()?t.push("<dt>"+a.label+"</dt>"):t.push('<dd lay-value="'+a.value+'" class="'+(d===a.value?s:"")+(a.disabled?" "+c:"")+'">'+a.innerHTML+"</dd>"):t.push('<dd lay-value="" class="layui-select-tips">'+(a.innerHTML||i)+"</dd>")}),0===t.length&&t.push('<dd lay-value="" class="'+c+'">没有选项</dd>'),t.join("")}(r.find("*"))+"</dl>","</div>"].join(""));o[0]&&o.remove(),r.after(m),y.call(this,m,u,h)})},checkbox:function(){var e={checkbox:["layui-form-checkbox","layui-form-checked","checkbox"],_switch:["layui-form-switch","layui-form-onswitch","switch"]},i=u.find("input[type=checkbox]"),a=function(e,i){var a=t(this);e.on("click",function(){var t=a.attr("lay-filter"),n=(a.attr("lay-text")||"").split("|");a[0].disabled||(a[0].checked?(a[0].checked=!1,e.removeClass(i[1]).find("em").text(n[1])):(a[0].checked=!0,e.addClass(i[1]).find("em").text(n[0])),layui.event.call(a[0],l,i[2]+"("+t+")",{elem:a[0],value:a[0].value,othis:e}))})};i.each(function(i,n){var l=t(this),r=l.attr("lay-skin"),s=(l.attr("lay-text")||"").split("|"),o=this.disabled;"switch"===r&&(r="_"+r);var u=e[r]||e.checkbox;if("string"==typeof l.attr("lay-ignore"))return l.show();var d=l.next("."+u[0]),f=t(['<div class="layui-unselect '+u[0],n.checked?" "+u[1]:"",o?" layui-checkbox-disbaled "+c:"",'"',r?' lay-skin="'+r+'"':"",">",function(){var e=n.title.replace(/\s/g,""),t={checkbox:[e?"<span>"+n.title+"</span>":"",'<i class="layui-icon layui-icon-ok"></i>'].join(""),_switch:"<em>"+((n.checked?s[0]:s[1])||"")+"</em><i></i>"};return t[r]||t.checkbox}(),"</div>"].join(""));d[0]&&d.remove(),l.after(f),a.call(this,f,u)})},radio:function(){var e="layui-form-radio",i=["",""],a=u.find("input[type=radio]"),n=function(a){var n=t(this),s="layui-anim-scaleSpring";a.on("click",function(){var o=n[0].name,c=n.parents(r),u=n.attr("lay-filter"),d=c.find("input[name="+o.replace(/(\.|#|\[|\])/g,"\\$1")+"]");n[0].disabled||(layui.each(d,function(){var a=t(this).next("."+e);this.checked=!1,a.removeClass(e+"ed"),a.find(".layui-icon").removeClass(s).html(i[1])}),n[0].checked=!0,a.addClass(e+"ed"),a.find(".layui-icon").addClass(s).html(i[0]),layui.event.call(n[0],l,"radio("+u+")",{elem:n[0],value:n[0].value,othis:a}))})};a.each(function(a,l){var r=t(this),s=r.next("."+e),o=this.disabled;if("string"==typeof r.attr("lay-ignore"))return r.show();s[0]&&s.remove();var u=t(['<div class="layui-unselect '+e,l.checked?" "+e+"ed":"",(o?" layui-radio-disbaled "+c:"")+'">','<i class="layui-anim layui-icon">'+i[l.checked?0:1]+"</i>","<div>"+function(){var e=l.title||"";return"string"==typeof r.next().attr("lay-radio")&&(e=r.next().html(),r.next().remove()),e}()+"</div>","</div>"].join(""));r.after(u),n.call(this,u)})}};return e?d[e]?d[e]():a.error("不支持的"+e+"表单渲染"):layui.each(d,function(e,t){t()}),n};var d=function(){var e=t(this),a=f.config.verify,s=null,o="layui-form-danger",c={},u=e.parents(r),d=u.find("*[lay-verify]"),v=e.parents("form")[0],h=u.find("input,select,textarea"),y=e.attr("lay-filter");if(layui.each(d,function(e,l){var r=t(this),c=r.attr("lay-verify").split("|"),u=r.attr("lay-verType"),d=r.val();if(r.removeClass(o),layui.each(c,function(e,t){var c,f="",v="function"==typeof a[t];if(a[t]){var c=v?f=a[t](d,l):!a[t][0].test(d);if(f=f||a[t][1],c)return"tips"===u?i.tips(f,function(){return"string"==typeof r.attr("lay-ignore")||"select"!==l.tagName.toLowerCase()&&!/^checkbox|radio$/.test(l.type)?r:r.next()}(),{tips:1}):"alert"===u?i.alert(f,{title:"提示",shadeClose:!0}):i.msg(f,{icon:5,shift:6}),n.android||n.ios||l.focus(),r.addClass(o),s=!0}}),s)return s}),s)return!1;var p={};return layui.each(h,function(e,t){if(t.name=(t.name||"").replace(/^\s*|\s*&/,""),t.name){if(/^.*\[\]$/.test(t.name)){var i=t.name.match(/^(.*)\[\]$/g)[0];p[i]=0|p[i],t.name=t.name.replace(/^(.*)\[\]$/,"$1["+p[i]++ +"]")}/^checkbox|radio$/.test(t.type)&&!t.checked||(c[t.name]=t.value)}}),layui.event.call(this,l,"submit("+y+")",{elem:this,form:v,field:c})},f=new u,v=t(document),h=t(window);f.render(),v.on("reset",r,function(){var e=t(this).attr("lay-filter");setTimeout(function(){f.render(null,e)},50)}),v.on("submit",r,d).on("click","*[lay-submit]",d),e(l,f)});layui.define("jquery",function(e){"use strict";var o=layui.$,a=layui.hint(),i="layui-tree-enter",r=function(e){this.options=e},t={arrow:["",""],checkbox:["",""],radio:["",""],branch:["",""],leaf:""};r.prototype.init=function(e){var o=this;e.addClass("layui-box layui-tree"),o.options.skin&&e.addClass("layui-tree-skin-"+o.options.skin),o.tree(e),o.on(e)},r.prototype.tree=function(e,a){var i=this,r=i.options,n=a||r.nodes;layui.each(n,function(a,n){var l=n.children&&n.children.length>0,c=o('<ul class="'+(n.spread?"layui-show":"")+'"></ul>'),s=o(["<li "+(n.spread?'data-spread="'+n.spread+'"':"")+">",function(){return l?'<i class="layui-icon layui-tree-spread">'+(n.spread?t.arrow[1]:t.arrow[0])+"</i>":""}(),function(){return r.check?'<i class="layui-icon layui-tree-check">'+("checkbox"===r.check?t.checkbox[0]:"radio"===r.check?t.radio[0]:"")+"</i>":""}(),function(){return'<a href="'+(n.href||"javascript:;")+'" '+(r.target&&n.href?'target="'+r.target+'"':"")+">"+('<i class="layui-icon layui-tree-'+(l?"branch":"leaf")+'">'+(l?n.spread?t.branch[1]:t.branch[0]:t.leaf)+"</i>")+("<cite>"+(n.name||"未命名")+"</cite></a>")}(),"</li>"].join(""));l&&(s.append(c),i.tree(c,n.children)),e.append(s),"function"==typeof r.click&&i.click(s,n),i.spread(s,n),r.drag&&i.drag(s,n)})},r.prototype.click=function(e,o){var a=this,i=a.options;e.children("a").on("click",function(e){layui.stope(e),i.click(o)})},r.prototype.spread=function(e,o){var a=this,i=(a.options,e.children(".layui-tree-spread")),r=e.children("ul"),n=e.children("a"),l=function(){e.data("spread")?(e.data("spread",null),r.removeClass("layui-show"),i.html(t.arrow[0]),n.find(".layui-icon").html(t.branch[0])):(e.data("spread",!0),r.addClass("layui-show"),i.html(t.arrow[1]),n.find(".layui-icon").html(t.branch[1]))};r[0]&&(i.on("click",l),n.on("dblclick",l))},r.prototype.on=function(e){var a=this,r=a.options,t="layui-tree-drag";e.find("i").on("selectstart",function(e){return!1}),r.drag&&o(document).on("mousemove",function(e){var i=a.move;if(i.from){var r=(i.to,o('<div class="layui-box '+t+'"></div>'));e.preventDefault(),o("."+t)[0]||o("body").append(r);var n=o("."+t)[0]?o("."+t):r;n.addClass("layui-show").html(i.from.elem.children("a").html()),n.css({left:e.pageX+10,top:e.pageY+10})}}).on("mouseup",function(){var e=a.move;e.from&&(e.from.elem.children("a").removeClass(i),e.to&&e.to.elem.children("a").removeClass(i),a.move={},o("."+t).remove())})},r.prototype.move={},r.prototype.drag=function(e,a){var r=this,t=(r.options,e.children("a")),n=function(){var t=o(this),n=r.move;n.from&&(n.to={item:a,elem:e},t.addClass(i))};t.on("mousedown",function(){var o=r.move;o.from={item:a,elem:e}}),t.on("mouseenter",n).on("mousemove",n).on("mouseleave",function(){var e=o(this),a=r.move;a.from&&(delete a.to,e.removeClass(i))})},e("tree",function(e){var i=new r(e=e||{}),t=o(e.elem);return t[0]?void i.init(t):a.error("layui.tree 没有找到"+e.elem+"元素")})});layui.define(["laytpl","laypage","layer","form","util"],function(e){"use strict";var t=layui.$,i=layui.laytpl,a=layui.laypage,l=layui.layer,n=layui.form,o=(layui.util,layui.hint()),r=layui.device(),d={config:{checkName:"LAY_CHECKED",indexName:"LAY_TABLE_INDEX"},cache:{},index:layui.table?layui.table.index+1e4:0,set:function(e){var i=this;return i.config=t.extend({},i.config,e),i},on:function(e,t){return layui.onevent.call(this,u,e,t)}},c=function(){var e=this,t=e.config,i=t.id||t.index;return i&&(c.that[i]=e,c.config[i]=t),{reload:function(t){e.reload.call(e,t)},setColsWidth:function(){e.setColsWidth.call(e)},resize:function(){e.resize.call(e)},config:t}},s=function(e){var t=c.config[e];return t||o.error("The ID option was not found in the table instance"),t||null},u="table",h=".layui-table",y="layui-hide",f="layui-none",p="layui-table-view",v=".layui-table-tool",m=".layui-table-box",g=".layui-table-init",b=".layui-table-header",x=".layui-table-body",k=".layui-table-main",C=".layui-table-fixed",w=".layui-table-fixed-l",T=".layui-table-fixed-r",A=".layui-table-total",L=".layui-table-page",S=".layui-table-sort",N="layui-table-edit",W="layui-table-hover",_=function(e){var t='{{#if(item2.colspan){}} colspan="{{item2.colspan}}"{{#} if(item2.rowspan){}} rowspan="{{item2.rowspan}}"{{#}}}';return e=e||{},['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<thead>","{{# layui.each(d.data.cols, function(i1, item1){ }}","<tr>","{{# layui.each(item1, function(i2, item2){ }}",'{{# if(item2.fixed && item2.fixed !== "right"){ left = true; } }}','{{# if(item2.fixed === "right"){ right = true; } }}',function(){return e.fixed&&"right"!==e.fixed?'{{# if(item2.fixed && item2.fixed !== "right"){ }}':"right"===e.fixed?'{{# if(item2.fixed === "right"){ }}':""}(),"{{# var isSort = !(item2.colGroup) && item2.sort; }}",'<th data-field="{{ item2.field||i2 }}" data-key="{{d.index}}-{{i1}}-{{i2}}" {{# if( item2.parentKey){ }}data-parentkey="{{ item2.parentKey }}"{{# } }} {{# if(item2.minWidth){ }}data-minwidth="{{item2.minWidth}}"{{# } }} '+t+' {{# if(item2.unresize || item2.colGroup){ }}data-unresize="true"{{# } }} class="{{# if(item2.hide){ }}layui-hide{{# } }}{{# if(isSort){ }} layui-unselect{{# } }}{{# if(!item2.field){ }} layui-table-col-special{{# } }}">','<div class="layui-table-cell laytable-cell-',"{{# if(item2.colGroup){ }}","group","{{# } else { }}","{{d.index}}-{{i1}}-{{i2}}",'{{# if(item2.type !== "normal"){ }}'," laytable-cell-{{ item2.type }}","{{# } }}","{{# } }}",'" {{#if(item2.align){}}align="{{item2.align}}"{{#}}}>','{{# if(item2.type === "checkbox"){ }}','<input type="checkbox" name="layTableCheckbox" lay-skin="primary" lay-filter="layTableAllChoose" {{# if(item2[d.data.checkName]){ }}checked{{# }; }}>',"{{# } else { }}",'<span>{{item2.title||""}}</span>',"{{# if(isSort){ }}",'<span class="layui-table-sort layui-inline"><i class="layui-edge layui-table-sort-asc" title="升序"></i><i class="layui-edge layui-table-sort-desc" title="降序"></i></span>',"{{# } }}","{{# } }}","</div>","</th>",e.fixed?"{{# }; }}":"","{{# }); }}","</tr>","{{# }); }}","</thead>","</table>"].join("")},E=['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<tbody></tbody>","</table>"].join(""),z=['<div class="layui-form layui-border-box {{d.VIEW_CLASS}}" lay-filter="LAY-table-{{d.index}}" lay-id="{{ d.data.id }}" style="{{# if(d.data.width){ }}width:{{d.data.width}}px;{{# } }} {{# if(d.data.height){ }}height:{{d.data.height}}px;{{# } }}">',"{{# if(d.data.toolbar){ }}",'<div class="layui-table-tool">','<div class="layui-table-tool-temp"></div>','<div class="layui-table-tool-self"></div>',"</div>","{{# } }}",'<div class="layui-table-box">',"{{# if(d.data.loading){ }}",'<div class="layui-table-init" style="background-color: #fff;">','<i class="layui-icon layui-icon-loading layui-icon"></i>',"</div>","{{# } }}","{{# var left, right; }}",'<div class="layui-table-header">',_(),"</div>",'<div class="layui-table-body layui-table-main">',E,"</div>","{{# if(left){ }}",'<div class="layui-table-fixed layui-table-fixed-l">','<div class="layui-table-header">',_({fixed:!0}),"</div>",'<div class="layui-table-body">',E,"</div>","</div>","{{# }; }}","{{# if(right){ }}",'<div class="layui-table-fixed layui-table-fixed-r">','<div class="layui-table-header">',_({fixed:"right"}),'<div class="layui-table-mend"></div>',"</div>",'<div class="layui-table-body">',E,"</div>","</div>","{{# }; }}","</div>","{{# if(d.data.totalRow){ }}",'<div class="layui-table-total">','<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>','<tbody><tr><td><div class="layui-table-cell" style="visibility: hidden;">Total</div></td></tr></tbody>',"</table>","</div>","{{# } }}","{{# if(d.data.page){ }}",'<div class="layui-table-page">','<div id="layui-table-page{{d.index}}"></div>',"</div>","{{# } }}","<style>","{{# layui.each(d.data.cols, function(i1, item1){","layui.each(item1, function(i2, item2){ }}",".laytable-cell-{{d.index}}-{{i1}}-{{i2}}{ ","{{# if(item2.width){ }}","width: {{item2.width}}px;","{{# } }}"," }","{{# });","}); }}","</style>","</div>"].join(""),H=t(window),R=t(document),F=function(e){var i=this;i.index=++d.index,i.config=t.extend({},i.config,d.config,e),i.render()};F.prototype.config={limit:10,loading:!0,cellMinWidth:60,defaultToolbar:["filter","exports","print"],autoSort:!0,text:{none:"无数据"}},F.prototype.render=function(){var e=this,a=e.config;if(a.elem=t(a.elem),a.where=a.where||{},a.id=a.id||a.elem.attr("id")||e.index,a.request=t.extend({pageName:"page",limitName:"limit"},a.request),a.response=t.extend({statusName:"code",statusCode:0,msgName:"msg",dataName:"data",countName:"count"},a.response),"object"==typeof a.page&&(a.limit=a.page.limit||a.limit,a.limits=a.page.limits||a.limits,e.page=a.page.curr=a.page.curr||1,delete a.page.elem,delete a.page.jump),!a.elem[0])return e;a.height&&/^full-\d+$/.test(a.height)&&(e.fullHeightGap=a.height.split("-")[1],a.height=H.height()-e.fullHeightGap),e.setInit();var l=a.elem,n=l.next("."+p),o=e.elem=t(i(z).render({VIEW_CLASS:p,data:a,index:e.index}));if(a.index=e.index,n[0]&&n.remove(),l.after(o),e.layTool=o.find(v),e.layBox=o.find(m),e.layHeader=o.find(b),e.layMain=o.find(k),e.layBody=o.find(x),e.layFixed=o.find(C),e.layFixLeft=o.find(w),e.layFixRight=o.find(T),e.layTotal=o.find(A),e.layPage=o.find(L),e.renderToolbar(),e.fullSize(),a.cols.length>1){var r=e.layFixed.find(b).find("th");r.height(e.layHeader.height()-1-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom")))}e.pullData(e.page),e.events()},F.prototype.initOpts=function(e){var t=this,i=(t.config,{checkbox:48,radio:48,space:15,numbers:40});e.checkbox&&(e.type="checkbox"),e.space&&(e.type="space"),e.type||(e.type="normal"),"normal"!==e.type&&(e.unresize=!0,e.width=e.width||i[e.type])},F.prototype.setInit=function(e){var t=this,i=t.config;return i.clientWidth=i.width||function(){var e=function(t){var a,l;t=t||i.elem.parent(),a=t.width();try{l="none"===t.css("display")}catch(n){}return!t[0]||a&&!l?a:e(t.parent())};return e()}(),"width"===e?i.clientWidth:void layui.each(i.cols,function(e,a){layui.each(a,function(l,n){if(!n)return void a.splice(l,1);if(n.key=e+"-"+l,n.hide=n.hide||!1,n.colGroup||n.colspan>1){var o=0;layui.each(i.cols[e+1],function(t,i){i.HAS_PARENT||o>1&&o==n.colspan||(i.HAS_PARENT=!0,i.parentKey=e+"-"+l,o+=parseInt(i.colspan>1?i.colspan:1))}),n.colGroup=!0}t.initOpts(n)})})},F.prototype.renderToolbar=function(){var e=this,a=e.config,l=['<div class="layui-inline" lay-event="add"><i class="layui-icon layui-icon-add-1"></i></div>','<div class="layui-inline" lay-event="update"><i class="layui-icon layui-icon-edit"></i></div>','<div class="layui-inline" lay-event="delete"><i class="layui-icon layui-icon-delete"></i></div>'].join(""),n=e.layTool.find(".layui-table-tool-temp");if("default"===a.toolbar)n.html(l);else if("string"==typeof a.toolbar){var o=t(a.toolbar).html()||"";o&&n.html(i(o).render(a))}var r={filter:{title:"筛选列",layEvent:"LAYTABLE_COLS",icon:"layui-icon-cols"},exports:{title:"导出",layEvent:"LAYTABLE_EXPORT",icon:"layui-icon-export"},print:{title:"打印",layEvent:"LAYTABLE_PRINT",icon:"layui-icon-print"}},d=[];"object"==typeof a.defaultToolbar&&layui.each(a.defaultToolbar,function(e,t){var i=r[t];i&&d.push('<div class="layui-inline" title="'+i.title+'" lay-event="'+i.layEvent+'"><i class="layui-icon '+i.icon+'"></i></div>')}),e.layTool.find(".layui-table-tool-self").html(d.join(""))},F.prototype.setParentCol=function(e,t){var i=this,a=i.config,l=i.layHeader.find('th[data-key="'+a.index+"-"+t+'"]'),n=parseInt(l.attr("colspan"))||0;if(l[0]){var o=t.split("-"),r=a.cols[o[0]][o[1]];e?n--:n++,l.attr("colspan",n),l[n<1?"addClass":"removeClass"](y),r.colspan=n,r.hide=n<1;var d=l.data("parentkey");d&&i.setParentCol(e,d)}},F.prototype.setColsPatch=function(){var e=this,t=e.config;layui.each(t.cols,function(t,i){layui.each(i,function(t,i){i.hide&&e.setParentCol(i.hide,i.parentKey)})})},F.prototype.setColsWidth=function(){var e=this,t=e.config,i=0,a=0,l=0,n=0,o=e.setInit("width");e.eachCols(function(e,t){t.hide||i++}),o=o-function(){return"line"===t.skin||"nob"===t.skin?2:i+1}()-e.getScrollWidth(e.layMain[0])-1;var r=function(e){layui.each(t.cols,function(i,r){layui.each(r,function(i,d){var c=0,s=d.minWidth||t.cellMinWidth;return d?void(d.colGroup||d.hide||(e?l&&l<s&&(a--,c=s):(c=d.width||0,/\d+%$/.test(c)?(c=Math.floor(parseFloat(c)/100*o),c<s&&(c=s)):c||(d.width=c=0,a++)),d.hide&&(c=0),n+=c)):void r.splice(i,1)})}),o>n&&a&&(l=(o-n)/a)};r(),r(!0),e.autoColNums=a,e.eachCols(function(i,a){var n=a.minWidth||t.cellMinWidth;a.colGroup||a.hide||(0===a.width?e.getCssRule(t.index+"-"+a.key,function(e){e.style.width=Math.floor(l>=n?l:n)+"px"}):/\d+%$/.test(a.width)&&e.getCssRule(t.index+"-"+a.key,function(e){e.style.width=Math.floor(parseFloat(a.width)/100*o)+"px"}))});var d=e.layMain.width()-e.getScrollWidth(e.layMain[0])-e.layMain.children("table").outerWidth();if(e.autoColNums&&d>=-i&&d<=i){var c=function(t){var i;return t=t||e.layHeader.eq(0).find("thead th:last-child"),i=t.data("field"),!i&&t.prev()[0]?c(t.prev()):t},s=c(),u=s.data("key");e.getCssRule(u,function(t){var i=t.style.width||s.outerWidth();t.style.width=parseFloat(i)+d+"px",e.layMain.height()-e.layMain.prop("clientHeight")>0&&(t.style.width=parseFloat(t.style.width)-1+"px")})}e.loading(!0)},F.prototype.resize=function(){var e=this;e.fullSize(),e.setColsWidth(),e.scrollPatch()},F.prototype.reload=function(e){var i=this;i.config.data&&i.config.data.constructor===Array&&delete i.config.data,i.config=t.extend({},i.config,e),i.render()},F.prototype.page=1,F.prototype.pullData=function(e){var i=this,a=i.config,l=a.request,n=a.response,o=function(){"object"==typeof a.initSort&&i.sort(a.initSort.field,a.initSort.type)};if(i.startTime=(new Date).getTime(),a.url){var r={};r[l.pageName]=e,r[l.limitName]=a.limit;var d=t.extend(r,a.where);a.contentType&&0==a.contentType.indexOf("application/json")&&(d=JSON.stringify(d)),t.ajax({type:a.method||"get",url:a.url,contentType:a.contentType,data:d,dataType:"json",headers:a.headers||{},success:function(t){"function"==typeof a.parseData&&(t=a.parseData(t)||t),t[n.statusName]!=n.statusCode?(i.renderForm(),i.layMain.html('<div class="'+f+'">'+(t[n.msgName]||"返回的数据不符合规范，正确的成功状态码 ("+n.statusName+") 应为："+n.statusCode)+"</div>")):(i.renderData(t,e,t[n.countName]),o(),a.time=(new Date).getTime()-i.startTime+" ms"),i.setColsWidth(),"function"==typeof a.done&&a.done(t,e,t[n.countName])},error:function(e,t){i.layMain.html('<div class="'+f+'">数据接口请求异常：'+t+"</div>"),i.renderForm(),i.setColsWidth()}})}else if(a.data&&a.data.constructor===Array){var c={},s=e*a.limit-a.limit;c[n.dataName]=a.data.concat().splice(s,a.limit),c[n.countName]=a.data.length,i.renderData(c,e,a.data.length),o(),i.setColsWidth(),"function"==typeof a.done&&a.done(c,e,c[n.countName])}},F.prototype.eachCols=function(e){var t=this;return d.eachCols(null,e,t.config.cols),t},F.prototype.renderData=function(e,n,o,r){var c=this,s=c.config,u=e[s.response.dataName]||[],h=[],p=[],v=[],m=function(){var e;return!r&&c.sortKey?c.sort(c.sortKey.field,c.sortKey.sort,!0):(layui.each(u,function(a,l){var o=[],u=[],f=[],m=a+s.limit*(n-1)+1;0!==l.length&&(r||(l[d.config.indexName]=a),c.eachCols(function(n,r){var c=r.field||n,h=s.index+"-"+r.key,p=l[c];if(void 0!==p&&null!==p||(p=""),!r.colGroup){var v=['<td data-field="'+c+'" data-key="'+h+'" '+function(){var e=[];return r.edit&&e.push('data-edit="'+r.edit+'"'),r.align&&e.push('align="'+r.align+'"'),r.templet&&e.push('data-content="'+p+'"'),r.toolbar&&e.push('data-off="true"'),r.event&&e.push('lay-event="'+r.event+'"'),r.style&&e.push('style="'+r.style+'"'),r.minWidth&&e.push('data-minwidth="'+r.minWidth+'"'),e.join(" ")}()+' class="'+function(){var e=[];return r.hide&&e.push(y),r.field||e.push("layui-table-col-special"),e.join(" ")}()+'">','<div class="layui-table-cell laytable-cell-'+function(){return"normal"===r.type?h:h+" laytable-cell-"+r.type}()+'">'+function(){var n=t.extend(!0,{LAY_INDEX:m},l),o=d.config.checkName;switch(r.type){case"checkbox":return'<input type="checkbox" name="layTableCheckbox" lay-skin="primary" '+function(){return r[o]?(l[o]=r[o],r[o]?"checked":""):n[o]?"checked":""}()+">";case"radio":return n[o]&&(e=a),'<input type="radio" name="layTableRadio_'+s.index+'" '+(n[o]?"checked":"")+' lay-type="layTableRadio">';case"numbers":return m}return r.toolbar?i(t(r.toolbar).html()||"").render(n):r.templet?function(){return"function"==typeof r.templet?r.templet(n):i(t(r.templet).html()||String(p)).render(n)}():p}(),"</div></td>"].join("");o.push(v),r.fixed&&"right"!==r.fixed&&u.push(v),"right"===r.fixed&&f.push(v)}}),h.push('<tr data-index="'+a+'">'+o.join("")+"</tr>"),p.push('<tr data-index="'+a+'">'+u.join("")+"</tr>"),v.push('<tr data-index="'+a+'">'+f.join("")+"</tr>"))}),c.layBody.scrollTop(0),c.layMain.find("."+f).remove(),c.layMain.find("tbody").html(h.join("")),c.layFixLeft.find("tbody").html(p.join("")),c.layFixRight.find("tbody").html(v.join("")),c.renderForm(),"number"==typeof e&&c.setThisRowChecked(e),c.syncCheckAll(),c.haveInit?c.scrollPatch():setTimeout(function(){c.scrollPatch()},50),c.haveInit=!0,l.close(c.tipsIndex),s.HAS_SET_COLS_PATCH||c.setColsPatch(),void(s.HAS_SET_COLS_PATCH=!0))};return c.key=s.id||s.index,d.cache[c.key]=u,c.layPage[0==o||0===u.length&&1==n?"addClass":"removeClass"](y),r?m():0===u.length?(c.renderForm(),c.layFixed.remove(),c.layMain.find("tbody").html(""),c.layMain.find("."+f).remove(),c.layMain.append('<div class="'+f+'">'+s.text.none+"</div>")):(m(),c.renderTotal(u),void(s.page&&(s.page=t.extend({elem:"layui-table-page"+s.index,count:o,limit:s.limit,limits:s.limits||[10,20,30,40,50,60,70,80,90],groups:3,layout:["prev","page","next","skip","count","limit"],prev:'<i class="layui-icon"></i>',next:'<i class="layui-icon"></i>',jump:function(e,t){t||(c.page=e.curr,s.limit=e.limit,c.loading(),c.pullData(e.curr))}},s.page),s.page.count=o,a.render(s.page))))},F.prototype.renderTotal=function(e){var t=this,i=t.config,a={};if(i.totalRow){layui.each(e,function(e,i){0!==i.length&&t.eachCols(function(e,t){var l=t.field||e,n=i[l];t.totalRow&&(a[l]=(a[l]||0)+(parseFloat(n)||0))})});var l=[];t.eachCols(function(e,t){var n=t.field||e,o=['<td data-field="'+n+'" data-key="'+i.index+"-"+t.key+'" '+function(){var e=[];return t.align&&e.push('align="'+t.align+'"'),t.style&&e.push('style="'+t.style+'"'),t.minWidth&&e.push('data-minwidth="'+t.minWidth+'"'),e.join(" ")}()+' class="'+function(){var e=[];return t.hide&&e.push(y),t.field||e.push("layui-table-col-special"),e.join(" ")}()+'">','<div class="layui-table-cell laytable-cell-'+function(){var e=i.index+"-"+t.key;return"normal"===t.type?e:e+" laytable-cell-"+t.type}()+'">'+function(){var e=t.totalRowText||"";return t.totalRow?parseFloat(a[n]).toFixed(2)||e:e}(),"</div></td>"].join("");l.push(o)}),t.layTotal.find("tbody").html("<tr>"+l.join("")+"</tr>")}},F.prototype.getColElem=function(e,t){var i=this,a=i.config;return e.eq(0).find(".laytable-cell-"+(a.index+"-"+t)+":eq(0)")},F.prototype.renderForm=function(e){n.render(e,"LAY-table-"+this.index)},F.prototype.setThisRowChecked=function(e){var t=this,i=(t.config,"layui-table-click"),a=t.layBody.find('tr[data-index="'+e+'"]');a.addClass(i).siblings("tr").removeClass(i)},F.prototype.sort=function(e,i,a,l){var n,r,c=this,s={},h=c.config,y=h.elem.attr("lay-filter"),f=d.cache[c.key];"string"==typeof e&&c.layHeader.find("th").each(function(i,a){var l=t(this),o=l.data("field");if(o===e)return e=l,n=o,!1});try{var n=n||e.data("field"),p=e.data("key");if(c.sortKey&&!a&&n===c.sortKey.field&&i===c.sortKey.sort)return;var v=c.layHeader.find("th .laytable-cell-"+p).find(S);c.layHeader.find("th").find(S).removeAttr("lay-sort"),v.attr("lay-sort",i||null),c.layFixed.find("th")}catch(m){return o.error("Table modules: Did not match to field")}c.sortKey={field:n,sort:i},h.autoSort&&("asc"===i?r=layui.sort(f,n):"desc"===i?r=layui.sort(f,n,!0):(r=layui.sort(f,d.config.indexName),delete c.sortKey)),s[h.response.dataName]=r||f,c.renderData(s,c.page,c.count,!0),l&&layui.event.call(e,u,"sort("+y+")",{field:n,type:i})},F.prototype.loading=function(e){var i=this,a=i.config;a.loading&&(e?(i.layInit&&i.layInit.remove(),delete i.layInit,i.layBox.find(g).remove()):(i.layInit=t(['<div class="layui-table-init">','<i class="layui-icon layui-icon-loading layui-icon"></i>',"</div>"].join("")),i.layBox.append(i.layInit)))},F.prototype.setCheckData=function(e,t){var i=this,a=i.config,l=d.cache[i.key];l[e]&&l[e].constructor!==Array&&(l[e][a.checkName]=t)},F.prototype.syncCheckAll=function(){var e=this,t=e.config,i=e.layHeader.find('input[name="layTableCheckbox"]'),a=function(i){return e.eachCols(function(e,a){"checkbox"===a.type&&(a[t.checkName]=i)}),i};i[0]&&(d.checkStatus(e.key).isAll?(i[0].checked||(i.prop("checked",!0),e.renderForm("checkbox")),a(!0)):(i[0].checked&&(i.prop("checked",!1),e.renderForm("checkbox")),a(!1)))},F.prototype.getCssRule=function(e,t){var i=this,a=i.elem.find("style")[0],l=a.sheet||a.styleSheet||{},n=l.cssRules||l.rules;layui.each(n,function(i,a){if(a.selectorText===".laytable-cell-"+e)return t(a),!0})},F.prototype.fullSize=function(){var e,t=this,i=t.config,a=i.height;t.fullHeightGap&&(a=H.height()-t.fullHeightGap,a<135&&(a=135),t.elem.css("height",a)),a&&(e=parseFloat(a)-(t.layHeader.outerHeight()||38),i.toolbar&&(e-=t.layTool.outerHeight()||50),i.totalRow&&(e-=t.layTotal.outerHeight()||40),i.page&&(e=e-(t.layPage.outerHeight()||41)-2),t.layMain.css("height",e))},F.prototype.getScrollWidth=function(e){var t=0;return e?t=e.offsetWidth-e.clientWidth:(e=document.createElement("div"),e.style.width="100px",e.style.height="100px",e.style.overflowY="scroll",document.body.appendChild(e),t=e.offsetWidth-e.clientWidth,document.body.removeChild(e)),t},F.prototype.scrollPatch=function(){var e=this,i=e.layMain.children("table"),a=e.layMain.width()-e.layMain.prop("clientWidth"),l=e.layMain.height()-e.layMain.prop("clientHeight"),n=(e.getScrollWidth(e.layMain[0]),i.outerWidth()-e.layMain.width()),o=function(e){if(a&&l){if(e=e.eq(0),!e.find(".layui-table-patch")[0]){var i=t('<th class="layui-table-patch"><div class="layui-table-cell"></div></th>');i.find("div").css({width:a}),e.find("tr").append(i)}}else e.find(".layui-table-patch").remove()};o(e.layHeader),o(e.layTotal);var r=e.layMain.height(),d=r-l;e.layFixed.find(x).css("height",i.height()>=d?d:"auto"),e.layFixRight[n>0?"removeClass":"addClass"](y),e.layFixRight.css("right",a-1)},F.prototype.events=function(){var e,a=this,o=a.config,c=t("body"),s={},h=a.layHeader.find("th"),f=".layui-table-cell",p=o.elem.attr("lay-filter");a.layTool.on("click","*[lay-event]",function(e){var i=t(this),c=i.attr("lay-event"),s=function(e){var l=t(e.list),n=t('<ul class="layui-table-tool-panel"></ul>');n.html(l),o.height&&n.css("max-height",o.height-(a.layTool.outerHeight()||50)),i.find(".layui-table-tool-panel")[0]||i.append(n),a.renderForm(),n.on("click",function(e){layui.stope(e)}),e.done&&e.done(n,l)};switch(layui.stope(e),R.trigger("table.tool.panel.remove"),l.close(a.tipsIndex),c){case"LAYTABLE_COLS":s({list:function(){var e=[];return a.eachCols(function(t,i){i.field&&"normal"==i.type&&e.push('<li><input type="checkbox" name="'+i.field+'" data-key="'+i.key+'" data-parentkey="'+(i.parentKey||"")+'" lay-skin="primary" '+(i.hide?"":"checked")+' title="'+(i.title||i.field)+'" lay-filter="LAY_TABLE_TOOL_COLS"></li>')}),e.join("")}(),done:function(){n.on("checkbox(LAY_TABLE_TOOL_COLS)",function(e){var i=t(e.elem),l=this.checked,n=i.data("key"),r=i.data("parentkey");layui.each(o.cols,function(e,t){layui.each(t,function(t,i){if(e+"-"+t===n){var d=i.hide;i.hide=!l,a.elem.find('*[data-key="'+o.index+"-"+n+'"]')[l?"removeClass":"addClass"](y),d!=i.hide&&a.setParentCol(!l,r),a.resize()}})})})}});break;case"LAYTABLE_EXPORT":r.ie?l.tips("导出功能不支持 IE，请用 Chrome 等高级浏览器导出",this,{tips:3}):s({list:function(){return['<li data-type="csv">导出到 Csv 文件</li>','<li data-type="xls">导出到 Excel 文件</li>'].join("")}(),done:function(e,i){i.on("click",function(){var e=t(this).data("type");d.exportFile(o.id,null,e)})}});break;case"LAYTABLE_PRINT":var h=window.open("打印窗口","_blank"),f=["<style>","body{font-size: 12px; color: #666;}","table{width: 100%; border-collapse: collapse; border-spacing: 0;}","th,td{line-height: 20px; padding: 9px 15px; border: 1px solid #ccc; text-align: left; font-size: 12px; color: #666;}","a{color: #666; text-decoration:none;}","*.layui-hide{display: none}","</style>"].join(""),v=t(a.layHeader.html());v.append(a.layMain.find("table").html()),v.find("th.layui-table-patch").remove(),v.find(".layui-table-col-special").remove(),h.document.write(f+v.prop("outerHTML")),h.document.close(),h.print(),h.close()}layui.event.call(this,u,"toolbar("+p+")",t.extend({event:c,config:o},{}))}),h.on("mousemove",function(e){var i=t(this),a=i.offset().left,l=e.clientX-a;i.data("unresize")||s.resizeStart||(s.allowResize=i.width()-l<=10,c.css("cursor",s.allowResize?"col-resize":""))}).on("mouseleave",function(){t(this);s.resizeStart||c.css("cursor","")}).on("mousedown",function(e){var i=t(this);if(s.allowResize){var l=i.data("key");e.preventDefault(),s.resizeStart=!0,s.offset=[e.clientX,e.clientY],a.getCssRule(l,function(e){var t=e.style.width||i.outerWidth();s.rule=e,s.ruleWidth=parseFloat(t),s.minWidth=i.data("minwidth")||o.cellMinWidth})}}),R.on("mousemove",function(t){if(s.resizeStart){if(t.preventDefault(),s.rule){var i=s.ruleWidth+t.clientX-s.offset[0];i<s.minWidth&&(i=s.minWidth),s.rule.style.width=i+"px",l.close(a.tipsIndex)}e=1}}).on("mouseup",function(t){s.resizeStart&&(s={},c.css("cursor",""),a.scrollPatch()),2===e&&(e=null)}),h.on("click",function(i){var l,n=t(this),o=n.find(S),r=o.attr("lay-sort");return o[0]&&1!==e?(l="asc"===r?"desc":"desc"===r?null:"asc",void a.sort(n,l,null,!0)):e=2}).find(S+" .layui-edge ").on("click",function(e){var i=t(this),l=i.index(),n=i.parents("th").eq(0).data("field");layui.stope(e),0===l?a.sort(n,"asc",null,!0):a.sort(n,"desc",null,!0)});var v=function(e){var l=t(this),n=l.parents("tr").eq(0).data("index"),o=a.layBody.find('tr[data-index="'+n+'"]'),r=d.cache[a.key][n];return t.extend({tr:o,data:d.clearCacheKey(r),del:function(){d.cache[a.key][n]=[],o.remove(),a.scrollPatch()},update:function(e){e=e||{},layui.each(e,function(e,l){if(e in r){var n,d=o.children('td[data-field="'+e+'"]');r[e]=l,a.eachCols(function(t,i){i.field==e&&i.templet&&(n=i.templet)}),d.children(f).html(function(){return n?function(){return"function"==typeof n?n(r):i(t(n).html()||l).render(r)}():l}()),d.data("content",l)}})}},e)};a.elem.on("click",'input[name="layTableCheckbox"]+',function(){var e=t(this).prev(),i=a.layBody.find('input[name="layTableCheckbox"]'),l=e.parents("tr").eq(0).data("index"),n=e[0].checked,o="layTableAllChoose"===e.attr("lay-filter");o?(i.each(function(e,t){t.checked=n,a.setCheckData(e,n)}),a.syncCheckAll(),a.renderForm("checkbox")):(a.setCheckData(l,n),a.syncCheckAll()),layui.event.call(e[0],u,"checkbox("+p+")",v.call(e[0],{checked:n,type:o?"all":"one"}))}),a.elem.on("click",'input[lay-type="layTableRadio"]+',function(){var e=t(this).prev(),i=e[0].checked,l=d.cache[a.key],n=e.parents("tr").eq(0).data("index");layui.each(l,function(e,t){n===e?t.LAY_CHECKED=!0:delete t.LAY_CHECKED}),a.setThisRowChecked(n),layui.event.call(this,u,"radio("+p+")",v.call(this,{checked:i}))}),a.layBody.on("mouseenter","tr",function(){var e=t(this),i=e.index();a.layBody.find("tr:eq("+i+")").addClass(W)}).on("mouseleave","tr",function(){var e=t(this),i=e.index();a.layBody.find("tr:eq("+i+")").removeClass(W)}).on("click","tr",function(){m.call(this,"row")}).on("dblclick","tr",function(){m.call(this,"rowDouble")});var m=function(e){var i=t(this);layui.event.call(this,u,e+"("+p+")",v.call(i.children("td")[0]))};a.layBody.on("change","."+N,function(){var e=t(this),i=this.value,l=e.parent().data("field"),n=e.parents("tr").eq(0).data("index"),o=d.cache[a.key][n];o[l]=i,layui.event.call(this,u,"edit("+p+")",v.call(this,{value:i,field:l}))}).on("blur","."+N,function(){var e,l=t(this),n=l.parent().data("field"),o=l.parents("tr").eq(0).data("index"),r=d.cache[a.key][o];a.eachCols(function(t,i){i.field==n&&i.templet&&(e=i.templet)}),l.siblings(f).html(function(a){return e?function(){return"function"==typeof e?e(r):i(t(e).html()||this.value).render(r)}():a}(this.value)),l.parent().data("content",this.value),l.remove()}),a.layBody.on("click","td",function(e){var i=t(this),a=(i.data("field"),i.data("edit")),l=i.children(f);if(!i.data("off")&&a){var n=t('<input class="layui-input '+N+'">');return n[0].value=i.data("content")||l.text(),i.find("."+N)[0]||i.append(n),n.focus(),void layui.stope(e)}}).on("mouseenter","td",function(){b.call(this)}).on("mouseleave","td",function(){b.call(this,"hide")});var g="layui-table-grid-down",b=function(e){var i=t(this),a=i.children(f);if(e)i.find(".layui-table-grid-down").remove();else if(a.prop("scrollWidth")>a.outerWidth()){if(a.find("."+g)[0])return;i.append('<div class="'+g+'"><i class="layui-icon layui-icon-down"></i></div>')}};a.layBody.on("click","."+g,function(e){var i=t(this),n=i.parent(),d=n.children(f);a.tipsIndex=l.tips(['<div class="layui-table-tips-main" style="margin-top: -'+(d.height()+16)+"px;"+function(){return"sm"===o.size?"padding: 4px 15px; font-size: 12px;":"lg"===o.size?"padding: 14px 15px;":""}()+'">',d.html(),"</div>",'<i class="layui-icon layui-table-tips-c layui-icon-close"></i>'].join(""),d[0],{tips:[3,""],time:-1,anim:-1,maxWidth:r.ios||r.android?300:a.elem.width()/2,isOutAnim:!1,skin:"layui-table-tips",success:function(e,t){e.find(".layui-table-tips-c").on("click",function(){l.close(t)})}}),layui.stope(e)}),a.layBody.on("click","*[lay-event]",function(){var e=t(this),i=e.parents("tr").eq(0).data("index");layui.event.call(this,u,"tool("+p+")",v.call(this,{event:e.attr("lay-event")})),a.setThisRowChecked(i)}),a.layMain.on("scroll",function(){var e=t(this),i=e.scrollLeft(),n=e.scrollTop();a.layHeader.scrollLeft(i),a.layTotal.scrollLeft(i),a.layFixed.find(x).scrollTop(n),l.close(a.tipsIndex)}),R.on("click",function(){R.trigger("table.remove.tool.panel")}),R.on("table.remove.tool.panel",function(){t(".layui-table-tool-panel").remove()}),H.on("resize",function(){a.resize()})},d.init=function(e,i){i=i||{};var a=this,l=t(e?'table[lay-filter="'+e+'"]':h+"[lay-data]"),n="Table element property lay-data configuration item has a syntax error: ";return l.each(function(){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(r){o.error(n+l)}var c=[],s=t.extend({elem:this,cols:[],data:[],skin:a.attr("lay-skin"),size:a.attr("lay-size"),even:"string"==typeof a.attr("lay-even")},d.config,i,l);e&&a.hide(),a.find("thead>tr").each(function(e){s.cols[e]=[],t(this).children().each(function(i){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(r){return o.error(n+l)}var d=t.extend({title:a.text(),colspan:a.attr("colspan")||0,rowspan:a.attr("rowspan")||0},l);d.colspan<2&&c.push(d),s.cols[e].push(d)})}),a.find("tbody>tr").each(function(e){var i=t(this),a={};i.children("td").each(function(e,i){var l=t(this),n=l.data("field");if(n)return a[n]=l.html()}),layui.each(c,function(e,t){var l=i.children("td").eq(e);a[t.field]=l.html()}),s.data[e]=a}),d.render(s)}),a},c.that={},c.config={},d.eachCols=function(e,i,a){var l=c.config[e]||{},n=[],o=0;a=t.extend(!0,[],a||l.cols),layui.each(a,function(e,t){layui.each(t,function(t,i){if(i.colGroup){var l=0;o++,i.CHILD_COLS=[],layui.each(a[e+1],function(e,t){t.PARENT_COL_INDEX||l>1&&l==i.colspan||(t.PARENT_COL_INDEX=o,i.CHILD_COLS.push(t),l+=parseInt(t.colspan>1?t.colspan:1))})}i.PARENT_COL_INDEX||n.push(i)})});var r=function(e){layui.each(e||n,function(e,t){return t.CHILD_COLS?r(t.CHILD_COLS):void("function"==typeof i&&i(e,t))})};r()},d.checkStatus=function(e){var t=0,i=0,a=[],l=d.cache[e]||[];return layui.each(l,function(e,l){return l.constructor===Array?void i++:void(l[d.config.checkName]&&(t++,a.push(d.clearCacheKey(l))))}),{data:a,isAll:!!l.length&&t===l.length-i}},d.exportFile=function(e,t,i){t=t||d.clearCacheKey(d.cache[e]),i=i||"csv";var a=c.config[e]||{},l={csv:"text/csv",xls:"application/vnd.ms-excel"}[i],n=document.createElement("a");return r.ie?o.error("IE_NOT_SUPPORT_EXPORTS"):(n.href="data:"+l+";charset=utf-8,\ufeff"+encodeURIComponent(function(){var i=[],a=[];return layui.each(t,function(t,l){var n=[];"object"==typeof e?(layui.each(e,function(e,a){0==t&&i.push(a||"")}),layui.each(d.clearCacheKey(l),function(e,t){n.push(t)})):d.eachCols(e,function(e,a){a.field&&"normal"==a.type&&!a.hide&&(0==t&&i.push(a.title||""),n.push(l[a.field]))}),a.push(n.join(","))}),i.join(",")+"\r\n"+a.join("\r\n")}()),n.download=(a.title||"table_"+(a.index||""))+"."+i,document.body.appendChild(n),n.click(),void document.body.removeChild(n))},d.resize=function(e){if(e){var t=s(e);if(!t)return;c.that[e].resize()}else layui.each(c.that,function(){this.resize()})},d.reload=function(e,i){i=i||{};var a=s(e);if(a)return i.data&&i.data.constructor===Array&&delete a.data,d.render(t.extend(!0,{},a,i))},d.render=function(e){var t=new F(e);return c.call(t)},d.clearCacheKey=function(e){return e=t.extend({},e),delete e[d.config.checkName],delete e[d.config.indexName],e},d.init(),e(u,d)});layui.define("jquery",function(e){"use strict";var i=layui.$,n=(layui.hint(),layui.device(),{config:{},set:function(e){var n=this;return n.config=i.extend({},n.config,e),n},on:function(e,i){return layui.onevent.call(this,t,e,i)}}),t="carousel",a="layui-this",l=">*[carousel-item]>*",o="layui-carousel-left",r="layui-carousel-right",d="layui-carousel-prev",s="layui-carousel-next",u="layui-carousel-arrow",c="layui-carousel-ind",m=function(e){var t=this;t.config=i.extend({},t.config,n.config,e),t.render()};m.prototype.config={width:"600px",height:"280px",full:!1,arrow:"hover",indicator:"inside",autoplay:!0,interval:3e3,anim:"",trigger:"click",index:0},m.prototype.render=function(){var e=this,n=e.config;n.elem=i(n.elem),n.elem[0]&&(e.elemItem=n.elem.find(l),n.index<0&&(n.index=0),n.index>=e.elemItem.length&&(n.index=e.elemItem.length-1),n.interval<800&&(n.interval=800),n.full?n.elem.css({position:"fixed",width:"100%",height:"100%",zIndex:9999}):n.elem.css({width:n.width,height:n.height}),n.elem.attr("lay-anim",n.anim),e.elemItem.eq(n.index).addClass(a),e.elemItem.length<=1||(e.indicator(),e.arrow(),e.autoplay(),e.events()))},m.prototype.reload=function(e){var n=this;clearInterval(n.timer),n.config=i.extend({},n.config,e),n.render()},m.prototype.prevIndex=function(){var e=this,i=e.config,n=i.index-1;return n<0&&(n=e.elemItem.length-1),n},m.prototype.nextIndex=function(){var e=this,i=e.config,n=i.index+1;return n>=e.elemItem.length&&(n=0),n},m.prototype.addIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index+e,n.index>=i.elemItem.length&&(n.index=0)},m.prototype.subIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index-e,n.index<0&&(n.index=i.elemItem.length-1)},m.prototype.autoplay=function(){var e=this,i=e.config;i.autoplay&&(e.timer=setInterval(function(){e.slide()},i.interval))},m.prototype.arrow=function(){var e=this,n=e.config,t=i(['<button class="layui-icon '+u+'" lay-type="sub">'+("updown"===n.anim?"":"")+"</button>",'<button class="layui-icon '+u+'" lay-type="add">'+("updown"===n.anim?"":"")+"</button>"].join(""));n.elem.attr("lay-arrow",n.arrow),n.elem.find("."+u)[0]&&n.elem.find("."+u).remove(),n.elem.append(t),t.on("click",function(){var n=i(this),t=n.attr("lay-type");e.slide(t)})},m.prototype.indicator=function(){var e=this,n=e.config,t=e.elemInd=i(['<div class="'+c+'"><ul>',function(){var i=[];return layui.each(e.elemItem,function(e){i.push("<li"+(n.index===e?' class="layui-this"':"")+"></li>")}),i.join("")}(),"</ul></div>"].join(""));n.elem.attr("lay-indicator",n.indicator),n.elem.find("."+c)[0]&&n.elem.find("."+c).remove(),n.elem.append(t),"updown"===n.anim&&t.css("margin-top",-(t.height()/2)),t.find("li").on("hover"===n.trigger?"mouseover":n.trigger,function(){var t=i(this),a=t.index();a>n.index?e.slide("add",a-n.index):a<n.index&&e.slide("sub",n.index-a)})},m.prototype.slide=function(e,i){var n=this,l=n.elemItem,u=n.config,c=u.index,m=u.elem.attr("lay-filter");n.haveSlide||("sub"===e?(n.subIndex(i),l.eq(u.index).addClass(d),setTimeout(function(){l.eq(c).addClass(r),l.eq(u.index).addClass(r)},50)):(n.addIndex(i),l.eq(u.index).addClass(s),setTimeout(function(){l.eq(c).addClass(o),l.eq(u.index).addClass(o)},50)),setTimeout(function(){l.removeClass(a+" "+d+" "+s+" "+o+" "+r),l.eq(u.index).addClass(a),n.haveSlide=!1},300),n.elemInd.find("li").eq(u.index).addClass(a).siblings().removeClass(a),n.haveSlide=!0,layui.event.call(this,t,"change("+m+")",{index:u.index,prevIndex:c,item:l.eq(u.index)}))},m.prototype.events=function(){var e=this,i=e.config;i.elem.data("haveEvents")||(i.elem.on("mouseenter",function(){clearInterval(e.timer)}).on("mouseleave",function(){e.autoplay()}),i.elem.data("haveEvents",!0))},n.render=function(e){var i=new m(e);return i},e(t,n)});layui.define("jquery",function(e){"use strict";var a=layui.jquery,i={config:{},index:layui.rate?layui.rate.index+1e4:0,set:function(e){var i=this;return i.config=a.extend({},i.config,e),i},on:function(e,a){return layui.onevent.call(this,n,e,a)}},l=function(){var e=this,a=e.config;return{setvalue:function(a){e.setvalue.call(e,a)},config:a}},n="rate",t="layui-rate",o="layui-icon-rate",s="layui-icon-rate-solid",u="layui-icon-rate-half",r="layui-icon-rate-solid layui-icon-rate-half",c="layui-icon-rate-solid layui-icon-rate",f="layui-icon-rate layui-icon-rate-half",v=function(e){var l=this;l.index=++i.index,l.config=a.extend({},l.config,i.config,e),l.render()};v.prototype.config={length:5,text:!1,readonly:!1,half:!1,value:0,theme:""},v.prototype.render=function(){var e=this,i=e.config,l=i.theme?'style="color: '+i.theme+';"':"";i.elem=a(i.elem),parseInt(i.value)!==i.value&&(i.half||(i.value=Math.ceil(i.value)-i.value<.5?Math.ceil(i.value):Math.floor(i.value)));for(var n='<ul class="layui-rate" '+(i.readonly?"readonly":"")+">",u=1;u<=i.length;u++){var r='<li class="layui-inline"><i class="layui-icon '+(u>Math.floor(i.value)?o:s)+'" '+l+"></i></li>";i.half&&parseInt(i.value)!==i.value&&u==Math.ceil(i.value)?n=n+'<li><i class="layui-icon layui-icon-rate-half" '+l+"></i></li>":n+=r}n+="</ul>"+(i.text?'<span class="layui-inline">'+i.value+"星":"")+"</span>";var c=i.elem,f=c.next("."+t);f[0]&&f.remove(),e.elemTemp=a(n),i.span=e.elemTemp.next("span"),i.setText&&i.setText(i.value),c.html(e.elemTemp),c.addClass("layui-inline"),i.readonly||e.action()},v.prototype.setvalue=function(e){var a=this,i=a.config;i.value=e,a.render()},v.prototype.action=function(){var e=this,i=e.config,l=e.elemTemp,n=l.find("i").width();l.children("li").each(function(e){var t=e+1,v=a(this);v.on("click",function(e){if(i.value=t,i.half){var o=e.pageX-a(this).offset().left;o<=n/2&&(i.value=i.value-.5)}i.text&&l.next("span").text(i.value+"星"),i.choose&&i.choose(i.value),i.setText&&i.setText(i.value)}),v.on("mousemove",function(e){if(l.find("i").each(function(){a(this).addClass(o).removeClass(r)}),l.find("i:lt("+t+")").each(function(){a(this).addClass(s).removeClass(f)}),i.half){var c=e.pageX-a(this).offset().left;c<=n/2&&v.children("i").addClass(u).removeClass(s)}}),v.on("mouseleave",function(){l.find("i").each(function(){a(this).addClass(o).removeClass(r)}),l.find("i:lt("+Math.floor(i.value)+")").each(function(){a(this).addClass(s).removeClass(f)}),i.half&&parseInt(i.value)!==i.value&&l.children("li:eq("+Math.floor(i.value)+")").children("i").addClass(u).removeClass(c)})})},v.prototype.events=function(){var e=this;e.config},i.render=function(e){var a=new v(e);return l.call(a)},e(n,i)});layui.define("jquery",function(t){"use strict";var e=layui.$,i={fixbar:function(t){var i,a,n="layui-fixbar",r="layui-fixbar-top",o=e(document),l=e("body");t=e.extend({showHeight:200},t),t.bar1=t.bar1===!0?"":t.bar1,t.bar2=t.bar2===!0?"":t.bar2,t.bgcolor=t.bgcolor?"background-color:"+t.bgcolor:"";var c=[t.bar1,t.bar2,""],g=e(['<ul class="'+n+'">',t.bar1?'<li class="layui-icon" lay-type="bar1" style="'+t.bgcolor+'">'+c[0]+"</li>":"",t.bar2?'<li class="layui-icon" lay-type="bar2" style="'+t.bgcolor+'">'+c[1]+"</li>":"",'<li class="layui-icon '+r+'" lay-type="top" style="'+t.bgcolor+'">'+c[2]+"</li>","</ul>"].join("")),s=g.find("."+r),u=function(){var e=o.scrollTop();e>=t.showHeight?i||(s.show(),i=1):i&&(s.hide(),i=0)};e("."+n)[0]||("object"==typeof t.css&&g.css(t.css),l.append(g),u(),g.find("li").on("click",function(){var i=e(this),a=i.attr("lay-type");"top"===a&&e("html,body").animate({scrollTop:0},200),t.click&&t.click.call(this,a)}),o.on("scroll",function(){clearTimeout(a),a=setTimeout(function(){u()},100)}))},countdown:function(t,e,i){var a=this,n="function"==typeof e,r=new Date(t).getTime(),o=new Date(!e||n?(new Date).getTime():e).getTime(),l=r-o,c=[Math.floor(l/864e5),Math.floor(l/36e5)%24,Math.floor(l/6e4)%60,Math.floor(l/1e3)%60];n&&(i=e);var g=setTimeout(function(){a.countdown(t,o+1e3,i)},1e3);return i&&i(l>0?c:[0,0,0,0],e,g),l<=0&&clearTimeout(g),g},timeAgo:function(t,e){var i=this,a=[[],[]],n=(new Date).getTime()-new Date(t).getTime();return n>6912e5?(n=new Date(t),a[0][0]=i.digit(n.getFullYear(),4),a[0][1]=i.digit(n.getMonth()+1),a[0][2]=i.digit(n.getDate()),e||(a[1][0]=i.digit(n.getHours()),a[1][1]=i.digit(n.getMinutes()),a[1][2]=i.digit(n.getSeconds())),a[0].join("-")+" "+a[1].join(":")):n>=864e5?(n/1e3/60/60/24|0)+"天前":n>=36e5?(n/1e3/60/60|0)+"小时前":n>=12e4?(n/1e3/60|0)+"分钟前":n<0?"未来":"刚刚"},digit:function(t,e){var i="";t=String(t),e=e||2;for(var a=t.length;a<e;a++)i+="0";return t<Math.pow(10,e)?i+(0|t):t},toDateString:function(t,e){var i=this,a=new Date(t||new Date),n=[i.digit(a.getFullYear(),4),i.digit(a.getMonth()+1),i.digit(a.getDate())],r=[i.digit(a.getHours()),i.digit(a.getMinutes()),i.digit(a.getSeconds())];return e=e||"yyyy-MM-dd HH:mm:ss",e.replace(/yyyy/g,n[0]).replace(/MM/g,n[1]).replace(/dd/g,n[2]).replace(/HH/g,r[0]).replace(/mm/g,r[1]).replace(/ss/g,r[2])},escape:function(t){return String(t||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/'/g,"'").replace(/"/g,""")}};!function(t,e,i){"$:nomunge";function a(){n=e[l](function(){r.each(function(){var e=t(this),i=e.width(),a=e.height(),n=t.data(this,g);(i!==n.w||a!==n.h)&&e.trigger(c,[n.w=i,n.h=a])}),a()},o[s])}var n,r=t([]),o=t.resize=t.extend(t.resize,{}),l="setTimeout",c="resize",g=c+"-special-event",s="delay",u="throttleWindow";o[s]=250,o[u]=!0,t.event.special[c]={setup:function(){if(!o[u]&&this[l])return!1;var e=t(this);r=r.add(e),t.data(this,g,{w:e.width(),h:e.height()}),1===r.length&&a()},teardown:function(){if(!o[u]&&this[l])return!1;var e=t(this);r=r.not(e),e.removeData(g),r.length||clearTimeout(n)},add:function(e){function a(e,a,r){var o=t(this),l=t.data(this,g)||{};l.w=a!==i?a:o.width(),l.h=r!==i?r:o.height(),n.apply(this,arguments)}if(!o[u]&&this[l])return!1;var n;return t.isFunction(e)?(n=e,a):(n=e.handler,void(e.handler=a))}}}(e,window),t("util",i)});layui.define("jquery",function(e){"use strict";var l=layui.$,o=function(e){},t='<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon "></i>';o.prototype.load=function(e){var o,i,n,r,a=this,c=0;e=e||{};var f=l(e.elem);if(f[0]){var m=l(e.scrollElem||document),u=e.mb||50,s=!("isAuto"in e)||e.isAuto,v=e.end||"没有更多了",y=e.scrollElem&&e.scrollElem!==document,d="<cite>加载更多</cite>",h=l('<div class="layui-flow-more"><a href="javascript:;">'+d+"</a></div>");f.find(".layui-flow-more")[0]||f.append(h);var p=function(e,t){e=l(e),h.before(e),t=0==t||null,t?h.html(v):h.find("a").html(d),i=t,o=null,n&&n()},g=function(){o=!0,h.find("a").html(t),"function"==typeof e.done&&e.done(++c,p)};if(g(),h.find("a").on("click",function(){l(this);i||o||g()}),e.isLazyimg)var n=a.lazyimg({elem:e.elem+" img",scrollElem:e.scrollElem});return s?(m.on("scroll",function(){var e=l(this),t=e.scrollTop();r&&clearTimeout(r),i||(r=setTimeout(function(){var i=y?e.height():l(window).height(),n=y?e.prop("scrollHeight"):document.documentElement.scrollHeight;n-t-i<=u&&(o||g())},100))}),a):a}},o.prototype.lazyimg=function(e){var o,t=this,i=0;e=e||{};var n=l(e.scrollElem||document),r=e.elem||"img",a=e.scrollElem&&e.scrollElem!==document,c=function(e,l){var o=n.scrollTop(),r=o+l,c=a?function(){return e.offset().top-n.offset().top+o}():e.offset().top;if(c>=o&&c<=r&&!e.attr("src")){var m=e.attr("lay-src");layui.img(m,function(){var l=t.lazyimg.elem.eq(i);e.attr("src",m).removeAttr("lay-src"),l[0]&&f(l),i++})}},f=function(e,o){var f=a?(o||n).height():l(window).height(),m=n.scrollTop(),u=m+f;if(t.lazyimg.elem=l(r),e)c(e,f);else for(var s=0;s<t.lazyimg.elem.length;s++){var v=t.lazyimg.elem.eq(s),y=a?function(){return v.offset().top-n.offset().top+m}():v.offset().top;if(c(v,f),i=s,y>u)break}};if(f(),!o){var m;n.on("scroll",function(){var e=l(this);m&&clearTimeout(m),m=setTimeout(function(){f(null,e)},50)}),o=!0}return f},e("flow",new o)});layui.define(["layer","form"],function(t){"use strict";var e=layui.$,i=layui.layer,a=layui.form,l=(layui.hint(),layui.device()),n="layedit",o="layui-show",r="layui-disabled",c=function(){var t=this;t.index=0,t.config={tool:["strong","italic","underline","del","|","left","center","right","|","link","unlink","face","image"],hideTool:[],height:280}};c.prototype.set=function(t){var i=this;return e.extend(!0,i.config,t),i},c.prototype.on=function(t,e){return layui.onevent(n,t,e)},c.prototype.build=function(t,i){i=i||{};var a=this,n=a.config,r="layui-layedit",c=e("string"==typeof t?"#"+t:t),u="LAY_layedit_"+ ++a.index,d=c.next("."+r),y=e.extend({},n,i),f=function(){var t=[],e={};return layui.each(y.hideTool,function(t,i){e[i]=!0}),layui.each(y.tool,function(i,a){C[a]&&!e[a]&&t.push(C[a])}),t.join("")}(),m=e(['<div class="'+r+'">','<div class="layui-unselect layui-layedit-tool">'+f+"</div>",'<div class="layui-layedit-iframe">','<iframe id="'+u+'" name="'+u+'" textarea="'+t+'" frameborder="0"></iframe>',"</div>","</div>"].join(""));return l.ie&&l.ie<8?c.removeClass("layui-hide").addClass(o):(d[0]&&d.remove(),s.call(a,m,c[0],y),c.addClass("layui-hide").after(m),a.index)},c.prototype.getContent=function(t){var e=u(t);if(e[0])return d(e[0].document.body.innerHTML)},c.prototype.getText=function(t){var i=u(t);if(i[0])return e(i[0].document.body).text()},c.prototype.setContent=function(t,i,a){var l=u(t);l[0]&&(a?e(l[0].document.body).append(i):e(l[0].document.body).html(i),layedit.sync(t))},c.prototype.sync=function(t){var i=u(t);if(i[0]){var a=e("#"+i[1].attr("textarea"));a.val(d(i[0].document.body.innerHTML))}},c.prototype.getSelection=function(t){var e=u(t);if(e[0]){var i=m(e[0].document);return document.selection?i.text:i.toString()}};var s=function(t,i,a){var l=this,n=t.find("iframe");n.css({height:a.height}).on("load",function(){var o=n.contents(),r=n.prop("contentWindow"),c=o.find("head"),s=e(["<style>","*{margin: 0; padding: 0;}","body{padding: 10px; line-height: 20px; overflow-x: hidden; word-wrap: break-word; font: 14px Helvetica Neue,Helvetica,PingFang SC,Microsoft YaHei,Tahoma,Arial,sans-serif; -webkit-box-sizing: border-box !important; -moz-box-sizing: border-box !important; box-sizing: border-box !important;}","a{color:#01AAED; text-decoration:none;}a:hover{color:#c00}","p{margin-bottom: 10px;}","img{display: inline-block; border: none; vertical-align: middle;}","pre{margin: 10px 0; padding: 10px; line-height: 20px; border: 1px solid #ddd; border-left-width: 6px; background-color: #F2F2F2; color: #333; font-family: Courier New; font-size: 12px;}","</style>"].join("")),u=o.find("body");c.append(s),u.attr("contenteditable","true").css({"min-height":a.height}).html(i.value||""),y.apply(l,[r,n,i,a]),g.call(l,r,t,a)})},u=function(t){var i=e("#LAY_layedit_"+t),a=i.prop("contentWindow");return[a,i]},d=function(t){return 8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),t},y=function(t,a,n,o){var r=t.document,c=e(r.body);c.on("keydown",function(t){var e=t.keyCode;if(13===e){var a=m(r),l=p(a),n=l.parentNode;if("pre"===n.tagName.toLowerCase()){if(t.shiftKey)return;return i.msg("请暂时用shift+enter"),!1}r.execCommand("formatBlock",!1,"<p>")}}),e(n).parents("form").on("submit",function(){var t=c.html();8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),n.value=t}),c.on("paste",function(e){r.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){f.call(t,c),n.value=c.html()},100)})},f=function(t){var i=this;i.document;t.find("*[style]").each(function(){var t=this.style.textAlign;this.removeAttribute("style"),e(this).css({"text-align":t||""})}),t.find("table").addClass("layui-table"),t.find("script,link").remove()},m=function(t){return t.selection?t.selection.createRange():t.getSelection().getRangeAt(0)},p=function(t){return t.endContainer||t.parentElement().childNodes[0]},v=function(t,i,a){var l=this.document,n=document.createElement(t);for(var o in i)n.setAttribute(o,i[o]);if(n.removeAttribute("text"),l.selection){var r=a.text||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.pasteHTML(e(n).prop("outerHTML")),a.select()}else{var r=a.toString()||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.deleteContents(),a.insertNode(n)}},h=function(t,i){var a=this.document,l="layedit-tool-active",n=p(m(a)),o=function(e){return t.find(".layedit-tool-"+e)};i&&i[i.hasClass(l)?"removeClass":"addClass"](l),t.find(">i").removeClass(l),o("unlink").addClass(r),e(n).parents().each(function(){var t=this.tagName.toLowerCase(),e=this.style.textAlign;"b"!==t&&"strong"!==t||o("b").addClass(l),"i"!==t&&"em"!==t||o("i").addClass(l),"u"===t&&o("u").addClass(l),"strike"===t&&o("d").addClass(l),"p"===t&&("center"===e?o("center").addClass(l):"right"===e?o("right").addClass(l):o("left").addClass(l)),"a"===t&&(o("link").addClass(l),o("unlink").removeClass(r))})},g=function(t,a,l){var n=t.document,o=e(n.body),c={link:function(i){var a=p(i),l=e(a).parent();b.call(o,{href:l.attr("href"),target:l.attr("target")},function(e){var a=l[0];"A"===a.tagName?a.href=e.url:v.call(t,"a",{target:e.target,href:e.url,text:e.url},i)})},unlink:function(t){n.execCommand("unlink")},face:function(e){x.call(this,function(i){v.call(t,"img",{src:i.src,alt:i.alt},e)})},image:function(a){var n=this;layui.use("upload",function(o){var r=l.uploadImage||{};o.render({url:r.url,method:r.type,elem:e(n).find("input")[0],done:function(e){0==e.code?(e.data=e.data||{},v.call(t,"img",{src:e.data.src,alt:e.data.title},a)):i.msg(e.msg||"上传失败")}})})},code:function(e){k.call(o,function(i){v.call(t,"pre",{text:i.code,"lay-lang":i.lang},e)})},help:function(){i.open({type:2,title:"帮助",area:["600px","380px"],shadeClose:!0,shade:.1,skin:"layui-layer-msg",content:["http://www.layui.com/about/layedit/help.html","no"]})}},s=a.find(".layui-layedit-tool"),u=function(){var i=e(this),a=i.attr("layedit-event"),l=i.attr("lay-command");if(!i.hasClass(r)){o.focus();var u=m(n);u.commonAncestorContainer;l?(n.execCommand(l),/justifyLeft|justifyCenter|justifyRight/.test(l)&&n.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){o.focus()},10)):c[a]&&c[a].call(this,u),h.call(t,s,i)}},d=/image/;s.find(">i").on("mousedown",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)||u.call(this)}).on("click",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)&&u.call(this)}),o.on("click",function(){h.call(t,s),i.close(x.index)})},b=function(t,e){var l=this,n=i.open({type:1,id:"LAY_layedit_link",area:"350px",shade:.05,shadeClose:!0,moveType:1,title:"超链接",skin:"layui-layer-msg",content:['<ul class="layui-form" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">URL</label>','<div class="layui-input-block" style="margin-left: 90px">','<input name="url" lay-verify="url" value="'+(t.href||"")+'" autofocus="true" autocomplete="off" class="layui-input">',"</div>","</li>",'<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">打开方式</label>','<div class="layui-input-block" style="margin-left: 90px">','<input type="radio" name="target" value="_self" class="layui-input" title="当前窗口"'+("_self"!==t.target&&t.target?"":"checked")+">",'<input type="radio" name="target" value="_blank" class="layui-input" title="新窗口" '+("_blank"===t.target?"checked":"")+">","</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-link-yes" class="layui-btn"> 确定 </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> 取消 </button>',"</li>","</ul>"].join(""),success:function(t,n){var o="submit(layedit-link-yes)";a.render("radio"),t.find(".layui-btn-primary").on("click",function(){i.close(n),l.focus()}),a.on(o,function(t){i.close(b.index),e&&e(t.field)})}});b.index=n},x=function(t){var a=function(){var t=["[微笑]","[嘻嘻]","[哈哈]","[可爱]","[可怜]","[挖鼻]","[吃惊]","[害羞]","[挤眼]","[闭嘴]","[鄙视]","[爱你]","[泪]","[偷笑]","[亲亲]","[生病]","[太开心]","[白眼]","[右哼哼]","[左哼哼]","[嘘]","[衰]","[委屈]","[吐]","[哈欠]","[抱抱]","[怒]","[疑问]","[馋嘴]","[拜拜]","[思考]","[汗]","[困]","[睡]","[钱]","[失望]","[酷]","[色]","[哼]","[鼓掌]","[晕]","[悲伤]","[抓狂]","[黑线]","[阴险]","[怒骂]","[互粉]","[心]","[伤心]","[猪头]","[熊猫]","[兔子]","[ok]","[耶]","[good]","[NO]","[赞]","[来]","[弱]","[草泥马]","[神马]","[囧]","[浮云]","[给力]","[围观]","[威武]","[奥特曼]","[礼物]","[钟]","[话筒]","[蜡烛]","[蛋糕]"],e={};return layui.each(t,function(t,i){e[i]=layui.cache.dir+"images/face/"+t+".gif"}),e}();return x.hide=x.hide||function(t){"face"!==e(t.target).attr("layedit-event")&&i.close(x.index)},x.index=i.tips(function(){var t=[];return layui.each(a,function(e,i){t.push('<li title="'+e+'"><img src="'+i+'" alt="'+e+'"></li>')}),'<ul class="layui-clear">'+t.join("")+"</ul>"}(),this,{tips:1,time:0,skin:"layui-box layui-util-face",maxWidth:500,success:function(l,n){l.css({marginTop:-4,marginLeft:-10}).find(".layui-clear>li").on("click",function(){t&&t({src:a[this.title],alt:this.title}),i.close(n)}),e(document).off("click",x.hide).on("click",x.hide)}})},k=function(t){var e=this,l=i.open({type:1,id:"LAY_layedit_code",area:"550px",shade:.05,shadeClose:!0,moveType:1,title:"插入代码",skin:"layui-layer-msg",content:['<ul class="layui-form layui-form-pane" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label">请选择语言</label>','<div class="layui-input-block">','<select name="lang">','<option value="JavaScript">JavaScript</option>','<option value="HTML">HTML</option>','<option value="CSS">CSS</option>','<option value="Java">Java</option>','<option value="PHP">PHP</option>','<option value="C#">C#</option>','<option value="Python">Python</option>','<option value="Ruby">Ruby</option>','<option value="Go">Go</option>',"</select>","</div>","</li>",'<li class="layui-form-item layui-form-text">','<label class="layui-form-label">代码</label>','<div class="layui-input-block">','<textarea name="code" lay-verify="required" autofocus="true" class="layui-textarea" style="height: 200px;"></textarea>',"</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-code-yes" class="layui-btn"> 确定 </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> 取消 </button>',"</li>","</ul>"].join(""),success:function(l,n){var o="submit(layedit-code-yes)";a.render("select"),l.find(".layui-btn-primary").on("click",function(){i.close(n),e.focus()}),a.on(o,function(e){i.close(k.index),t&&t(e.field)})}});k.index=l},C={html:'<i class="layui-icon layedit-tool-html" title="HTML源代码" lay-command="html" layedit-event="html""></i><span class="layedit-tool-mid"></span>',strong:'<i class="layui-icon layedit-tool-b" title="加粗" lay-command="Bold" layedit-event="b""></i>',italic:'<i class="layui-icon layedit-tool-i" title="斜体" lay-command="italic" layedit-event="i""></i>',underline:'<i class="layui-icon layedit-tool-u" title="下划线" lay-command="underline" layedit-event="u""></i>',del:'<i class="layui-icon layedit-tool-d" title="删除线" lay-command="strikeThrough" layedit-event="d""></i>',"|":'<span class="layedit-tool-mid"></span>',left:'<i class="layui-icon layedit-tool-left" title="左对齐" lay-command="justifyLeft" layedit-event="left""></i>',center:'<i class="layui-icon layedit-tool-center" title="居中对齐" lay-command="justifyCenter" layedit-event="center""></i>',right:'<i class="layui-icon layedit-tool-right" title="右对齐" lay-command="justifyRight" layedit-event="right""></i>',link:'<i class="layui-icon layedit-tool-link" title="插入链接" layedit-event="link""></i>',unlink:'<i class="layui-icon layedit-tool-unlink layui-disabled" title="清除链接" lay-command="unlink" layedit-event="unlink""></i>',face:'<i class="layui-icon layedit-tool-face" title="表情" layedit-event="face""></i>',image:'<i class="layui-icon layedit-tool-image" title="图片" layedit-event="image"><input type="file" name="file"></i>',code:'<i class="layui-icon layedit-tool-code" title="插入代码" layedit-event="code"></i>',help:'<i class="layui-icon layedit-tool-help" title="帮助" layedit-event="help"></i>'},w=new c;t(n,w)});layui.define("jquery",function(e){"use strict";var a=layui.$,l="http://www.layui.com/doc/modules/code.html";e("code",function(e){var t=[];e=e||{},e.elem=a(e.elem||".layui-code"),e.about=!("about"in e)||e.about,e.elem.each(function(){t.push(this)}),layui.each(t.reverse(),function(t,i){var c=a(i),o=c.html();(c.attr("lay-encode")||e.encode)&&(o=o.replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/'/g,"'").replace(/"/g,""")),c.html('<ol class="layui-code-ol"><li>'+o.replace(/[\r\t\n]+/g,"</li><li>")+"</li></ol>"),c.find(">.layui-code-h3")[0]||c.prepend('<h3 class="layui-code-h3">'+(c.attr("lay-title")||e.title||"code")+(e.about?'<a href="'+l+'" target="_blank">layui.code</a>':"")+"</h3>");var d=c.find(">.layui-code-ol");c.addClass("layui-box layui-code-view"),(c.attr("lay-skin")||e.skin)&&c.addClass("layui-code-"+(c.attr("lay-skin")||e.skin)),(d.find("li").length/100|0)>0&&d.css("margin-left",(d.find("li").length/100|0)+"px"),(c.attr("lay-height")||e.height)&&d.css("max-height",c.attr("lay-height")||e.height)})})}).addcss("modules/code.css","skincodecss");
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/layui.js b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/layui.js
new file mode 100644
index 0000000..3cd51c2
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/layui/layui.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;!function(e){"use strict";var t=document,o={modules:{},status:{},timeout:10,event:{}},n=function(){this.v="2.4.5"},r=function(){var e=t.currentScript?t.currentScript.src:function(){for(var e,o=t.scripts,n=o.length-1,r=n;r>0;r--)if("interactive"===o[r].readyState){e=o[r].src;break}return e||o[n].src}();return e.substring(0,e.lastIndexOf("/")+1)}(),i=function(t){e.console&&console.error&&console.error("Layui hint: "+t)},a="undefined"!=typeof opera&&"[object Opera]"===opera.toString(),u={layer:"modules/layer",laydate:"modules/laydate",laypage:"modules/laypage",laytpl:"modules/laytpl",layim:"modules/layim",layedit:"modules/layedit",form:"modules/form",upload:"modules/upload",tree:"modules/tree",table:"modules/table",element:"modules/element",rate:"modules/rate",colorpicker:"modules/colorpicker",slider:"modules/slider",carousel:"modules/carousel",flow:"modules/flow",util:"modules/util",code:"modules/code",jquery:"modules/jquery",mobile:"modules/mobile","layui.all":"../layui.all"};n.prototype.cache=o,n.prototype.define=function(e,t){var n=this,r="function"==typeof e,i=function(){var e=function(e,t){layui[e]=t,o.status[e]=!0};return"function"==typeof t&&t(function(n,r){e(n,r),o.callback[n]=function(){t(e)}}),this};return r&&(t=e,e=[]),layui["layui.all"]||!layui["layui.all"]&&layui["layui.mobile"]?i.call(n):(n.use(e,i),n)},n.prototype.use=function(e,n,l){function s(e,t){var n="PLaySTATION 3"===navigator.platform?/^complete$/:/^(complete|loaded)$/;("load"===e.type||n.test((e.currentTarget||e.srcElement).readyState))&&(o.modules[f]=t,d.removeChild(v),function r(){return++m>1e3*o.timeout/4?i(f+" is not a valid module"):void(o.status[f]?c():setTimeout(r,4))}())}function c(){l.push(layui[f]),e.length>1?y.use(e.slice(1),n,l):"function"==typeof n&&n.apply(layui,l)}var y=this,p=o.dir=o.dir?o.dir:r,d=t.getElementsByTagName("head")[0];e="string"==typeof e?[e]:e,window.jQuery&&jQuery.fn.on&&(y.each(e,function(t,o){"jquery"===o&&e.splice(t,1)}),layui.jquery=layui.$=jQuery);var f=e[0],m=0;if(l=l||[],o.host=o.host||(p.match(/\/\/([\s\S]+?)\//)||["//"+location.host+"/"])[0],0===e.length||layui["layui.all"]&&u[f]||!layui["layui.all"]&&layui["layui.mobile"]&&u[f])return c(),y;if(o.modules[f])!function g(){return++m>1e3*o.timeout/4?i(f+" is not a valid module"):void("string"==typeof o.modules[f]&&o.status[f]?c():setTimeout(g,4))}();else{var v=t.createElement("script"),h=(u[f]?p+"lay/":/^\{\/\}/.test(y.modules[f])?"":o.base||"")+(y.modules[f]||f)+".js";h=h.replace(/^\{\/\}/,""),v.async=!0,v.charset="utf-8",v.src=h+function(){var e=o.version===!0?o.v||(new Date).getTime():o.version||"";return e?"?v="+e:""}(),d.appendChild(v),!v.attachEvent||v.attachEvent.toString&&v.attachEvent.toString().indexOf("[native code")<0||a?v.addEventListener("load",function(e){s(e,h)},!1):v.attachEvent("onreadystatechange",function(e){s(e,h)}),o.modules[f]=h}return y},n.prototype.getStyle=function(t,o){var n=t.currentStyle?t.currentStyle:e.getComputedStyle(t,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](o)},n.prototype.link=function(e,n,r){var a=this,u=t.createElement("link"),l=t.getElementsByTagName("head")[0];"string"==typeof n&&(r=n);var s=(r||e).replace(/\.|\//g,""),c=u.id="layuicss-"+s,y=0;return u.rel="stylesheet",u.href=e+(o.debug?"?v="+(new Date).getTime():""),u.media="all",t.getElementById(c)||l.appendChild(u),"function"!=typeof n?a:(function p(){return++y>1e3*o.timeout/100?i(e+" timeout"):void(1989===parseInt(a.getStyle(t.getElementById(c),"width"))?function(){n()}():setTimeout(p,100))}(),a)},o.callback={},n.prototype.factory=function(e){if(layui[e])return"function"==typeof o.callback[e]?o.callback[e]:null},n.prototype.addcss=function(e,t,n){return layui.link(o.dir+"css/"+e,t,n)},n.prototype.img=function(e,t,o){var n=new Image;return n.src=e,n.complete?t(n):(n.onload=function(){n.onload=null,"function"==typeof t&&t(n)},void(n.onerror=function(e){n.onerror=null,"function"==typeof o&&o(e)}))},n.prototype.config=function(e){e=e||{};for(var t in e)o[t]=e[t];return this},n.prototype.modules=function(){var e={};for(var t in u)e[t]=u[t];return e}(),n.prototype.extend=function(e){var t=this;e=e||{};for(var o in e)t[o]||t.modules[o]?i("模块名 "+o+" 已被占用"):t.modules[o]=e[o];return t},n.prototype.router=function(e){var t=this,e=e||location.hash,o={path:[],search:{},hash:(e.match(/[^#](#.*$)/)||[])[1]||""};return/^#\//.test(e)?(e=e.replace(/^#\//,""),o.href="/"+e,e=e.replace(/([^#])(#.*$)/,"$1").split("/")||[],t.each(e,function(e,t){/^\w+=/.test(t)?function(){t=t.split("="),o.search[t[0]]=t[1]}():o.path.push(t)}),o):o},n.prototype.data=function(t,o,n){if(t=t||"layui",n=n||localStorage,e.JSON&&e.JSON.parse){if(null===o)return delete n[t];o="object"==typeof o?o:{key:o};try{var r=JSON.parse(n[t])}catch(i){var r={}}return"value"in o&&(r[o.key]=o.value),o.remove&&delete r[o.key],n[t]=JSON.stringify(r),o.key?r[o.key]:r}},n.prototype.sessionData=function(e,t){return this.data(e,t,sessionStorage)},n.prototype.device=function(t){var o=navigator.userAgent.toLowerCase(),n=function(e){var t=new RegExp(e+"/([^\\s\\_\\-]+)");return e=(o.match(t)||[])[1],e||!1},r={os:function(){return/windows/.test(o)?"windows":/linux/.test(o)?"linux":/iphone|ipod|ipad|ios/.test(o)?"ios":/mac/.test(o)?"mac":void 0}(),ie:function(){return!!(e.ActiveXObject||"ActiveXObject"in e)&&((o.match(/msie\s(\d+)/)||[])[1]||"11")}(),weixin:n("micromessenger")};return t&&!r[t]&&(r[t]=n(t)),r.android=/android/.test(o),r.ios="ios"===r.os,r},n.prototype.hint=function(){return{error:i}},n.prototype.each=function(e,t){var o,n=this;if("function"!=typeof t)return n;if(e=e||[],e.constructor===Object){for(o in e)if(t.call(e[o],o,e[o]))break}else for(o=0;o<e.length&&!t.call(e[o],o,e[o]);o++);return n},n.prototype.sort=function(e,t,o){var n=JSON.parse(JSON.stringify(e||[]));return t?(n.sort(function(e,o){var n=/^-?\d+$/,r=e[t],i=o[t];return n.test(r)&&(r=parseFloat(r)),n.test(i)&&(i=parseFloat(i)),r&&!i?1:!r&&i?-1:r>i?1:r<i?-1:0}),o&&n.reverse(),n):n},n.prototype.stope=function(t){t=t||e.event;try{t.stopPropagation()}catch(o){t.cancelBubble=!0}},n.prototype.onevent=function(e,t,o){return"string"!=typeof e||"function"!=typeof o?this:n.event(e,t,null,o)},n.prototype.event=n.event=function(e,t,n,r){var i=this,a=null,u=t.match(/\((.*)\)$/)||[],l=(e+"."+t).replace(u[0],""),s=u[1]||"",c=function(e,t){var o=t&&t.call(i,n);o===!1&&null===a&&(a=!1)};return r?(o.event[l]=o.event[l]||{},o.event[l][s]=[r],this):(layui.each(o.event[l],function(e,t){return"{*}"===s?void layui.each(t,c):(""===e&&layui.each(t,c),void(s&&e===s&&layui.each(t,c)))}),a)},e.layui=new n}(window);
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/query.html b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/query.html
new file mode 100644
index 0000000..56053a0
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/main/resources/static/query.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <#assign basePath=request.contextPath>
+ <title>Influxdb-Query</title>
+ <script type="application/javascript" src="${basePath}/js/jquery.min.js"></script>
+ <script type="application/javascript" src="${basePath}/layui/layui.all.js"></script>
+ <link rel="stylesheet" href="${basePath}/layui/css/layui.css"/>
+</head>
+<body style="padding: 20px;">
+ <blockquote class="layui-elem-quote layui-quote-nm">查询</blockquote>
+ <div class="layui-container">
+ <div class="layui-row">
+ <div class="layui-col-md4">
+ <textarea id="t" cols="30" rows="10" class="layui-textarea"></textarea>
+ </div>
+ <div class="layui-col-md4">
+ <button class="layui-btn" onclick="query();">查询</button>
+ </div>
+ <div class="layui-col-md4">
+ <span id="result1" style="width: 100%;height: 100%"></span>
+ </div>
+ </div>
+ </div>
+
+ <blockquote class="layui-elem-quote layui-quote-nm">插入</blockquote>
+ <div class="layui-container">
+ <div class="layui-row">
+ <div class="layui-col-md6">
+ <button class="layui-btn" onclick="insert();">插入</button>
+ </div>
+ <div class="layui-col-md6">
+ <span id="result2" style="width: 100%;height: 100%"></span>
+ </div>
+ </div>
+ </div>
+
+
+</body>
+<script>
+ function query() {
+ var textQuery = $("#t").val();
+
+ $.ajax({
+ url: '${basePath}/influxdb/query',
+ type : 'Post',
+ data:{
+ sql : textQuery
+ }
+ }).fail(function () {
+
+ }).done(function (result) {
+ $("#result1").text(JSON.stringify(result.result));
+ })
+ }
+
+ function insert() {
+ $.ajax({
+ url: '${basePath}/influxdb/insert',
+ type : 'Post'
+ }).fail(function () {
+
+ }).done(function (result) {
+ $("#result2").text(JSON.stringify(result.result));
+ })
+ }
+</script>
+</html>
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-influxdb-app/src/test/java/com/springcloudme/serviceinfluxdbapp/ServiceInfluxdbAppApplicationTests.java b/springcloud_demo_on_k8s-master/service-influxdb-app/src/test/java/com/springcloudme/serviceinfluxdbapp/ServiceInfluxdbAppApplicationTests.java
new file mode 100644
index 0000000..6fbd256
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-influxdb-app/src/test/java/com/springcloudme/serviceinfluxdbapp/ServiceInfluxdbAppApplicationTests.java
@@ -0,0 +1,17 @@
+package com.springcloudme.serviceinfluxdbapp;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class ServiceInfluxdbAppApplicationTests {
+
+ @Test
+ public void contextLoads() {
+ }
+
+}
+
diff --git a/springcloud_demo_on_k8s-master/service-tp/.gitignore b/springcloud_demo_on_k8s-master/service-tp/.gitignore
new file mode 100644
index 0000000..c456c4a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-tp/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
diff --git a/springcloud_demo_on_k8s-master/service-tp/.mvn/wrapper/maven-wrapper.jar b/springcloud_demo_on_k8s-master/service-tp/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..01e6799
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-tp/.mvn/wrapper/maven-wrapper.jar
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-tp/.mvn/wrapper/maven-wrapper.properties b/springcloud_demo_on_k8s-master/service-tp/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..7179346
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-tp/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
diff --git a/springcloud_demo_on_k8s-master/service-tp/mvnw b/springcloud_demo_on_k8s-master/service-tp/mvnw
new file mode 100644
index 0000000..5551fde
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-tp/mvnw
@@ -0,0 +1,286 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+ # TODO classpath?
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ wget "$jarUrl" -O "$wrapperJarPath"
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ curl -o "$wrapperJarPath" "$jarUrl"
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/springcloud_demo_on_k8s-master/service-tp/mvnw.cmd b/springcloud_demo_on_k8s-master/service-tp/mvnw.cmd
new file mode 100644
index 0000000..e5cfb0a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-tp/mvnw.cmd
@@ -0,0 +1,161 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ echo Found %WRAPPER_JAR%
+) else (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
+ echo Finished downloading %WRAPPER_JAR%
+)
+@REM End of extension
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/springcloud_demo_on_k8s-master/service-tp/pom.xml b/springcloud_demo_on_k8s-master/service-tp/pom.xml
new file mode 100644
index 0000000..6731644
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-tp/pom.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>2.0.3.RELEASE</version>
+ <relativePath/>
+ </parent>
+ <groupId>com.springcloudme</groupId>
+ <artifactId>service-tp</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>service-tp</name>
+ <description>Demo project for Spring Boot</description>
+
+ <properties>
+ <java.version>1.8</java.version>
+ <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-freemarker</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- hystrix相关 -->
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-openfeign</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-dependencies</artifactId>
+ <version>${spring-cloud.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>1.2.0</version>
+ <configuration>
+ <imageName>registry.cn-hangzhou.aliyuncs.com/wooddeep/service-tp:v3</imageName>
+ <serverId>my-docker-registry</serverId>
+ <baseImage>java</baseImage>
+ <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
+ <resources>
+ <resource>
+ <targetPath>/</targetPath>
+ <directory>${project.build.directory}</directory>
+ <include>${project.build.finalName}.jar</include>
+ </resource>
+ </resources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>spring-milestones</id>
+ <name>Spring Milestones</name>
+ <url>https://repo.spring.io/milestone</url>
+ </repository>
+ </repositories>
+
+</project>
diff --git a/springcloud_demo_on_k8s-master/service-tp/src/main/java/com/springcloudme/servicetp/ServiceTpApplication.java b/springcloud_demo_on_k8s-master/service-tp/src/main/java/com/springcloudme/servicetp/ServiceTpApplication.java
new file mode 100644
index 0000000..c0a2b0d
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-tp/src/main/java/com/springcloudme/servicetp/ServiceTpApplication.java
@@ -0,0 +1,20 @@
+package com.springcloudme.servicetp;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+@SpringBootApplication
+@EnableEurekaClient
+@EnableCircuitBreaker
+@EnableFeignClients
+public class ServiceTpApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(ServiceTpApplication.class, args);
+ }
+
+}
+
diff --git a/springcloud_demo_on_k8s-master/service-tp/src/main/java/com/springcloudme/servicetp/UserClient.java b/springcloud_demo_on_k8s-master/service-tp/src/main/java/com/springcloudme/servicetp/UserClient.java
new file mode 100644
index 0000000..4ed74f2
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-tp/src/main/java/com/springcloudme/servicetp/UserClient.java
@@ -0,0 +1,13 @@
+package com.springcloudme.servicetp;
+
+import com.springcloudme.servicetp.UserClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@FeignClient(value = "service-api", fallback = UserClientFallback.class)
+public interface UserClient {
+
+ @RequestMapping("/user/hi") // 对应 service-api 服务的 /user/hi的绝对路由
+ String hi();
+
+}
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-tp/src/main/java/com/springcloudme/servicetp/UserClientFallback.java b/springcloud_demo_on_k8s-master/service-tp/src/main/java/com/springcloudme/servicetp/UserClientFallback.java
new file mode 100644
index 0000000..f406b0b
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-tp/src/main/java/com/springcloudme/servicetp/UserClientFallback.java
@@ -0,0 +1,12 @@
+package com.springcloudme.servicetp;
+
+import com.springcloudme.servicetp.UserClient;
+import org.springframework.stereotype.Component;
+
+@Component
+public class UserClientFallback implements UserClient {
+ @Override
+ public String hi() {
+ return "Oh! Error!!!";
+ }
+}
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-tp/src/main/java/com/springcloudme/servicetp/controller/ApiController.java b/springcloud_demo_on_k8s-master/service-tp/src/main/java/com/springcloudme/servicetp/controller/ApiController.java
new file mode 100644
index 0000000..4c6b15b
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-tp/src/main/java/com/springcloudme/servicetp/controller/ApiController.java
@@ -0,0 +1,26 @@
+package com.springcloudme.servicetp.controller;
+
+import com.springcloudme.servicetp.UserClient;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/user")
+public class ApiController {
+
+ @RequestMapping(value = "/me",method = RequestMethod.GET)
+ public String getUser(){
+ return "hjashdahsdha";
+ }
+
+ @Autowired
+ private UserClient userClient;
+
+ @RequestMapping("/hi")
+ public String hi() {
+ return userClient.hi();
+ }
+}
diff --git a/springcloud_demo_on_k8s-master/service-tp/src/main/resources/application.yml b/springcloud_demo_on_k8s-master/service-tp/src/main/resources/application.yml
new file mode 100644
index 0000000..ff37d6d
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-tp/src/main/resources/application.yml
@@ -0,0 +1,29 @@
+server:
+ port: 8763
+
+eureka:
+ instance:
+ preferIpAddress: true
+ client:
+ serviceUrl:
+ defaultZone: http://${EUREKA_URL:localhost}:8761/eureka
+
+spring:
+ application:
+ name: service-tp
+ resources:
+ static-locations: classpath:/static
+ freemarker:
+ template-loader-path: classpath:/static
+ cache: false
+ charset: utf-8
+ check-template-location: true
+ content-type: text/html
+ expose-request-attributes: false
+ expose-session-attributes: false
+ request-context-attribute: request
+ suffix: .html
+
+feign:
+ hystrix:
+ enabled: true
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-tp/src/test/java/com/springcloudme/servicetp/ServiceTpApplicationTests.java b/springcloud_demo_on_k8s-master/service-tp/src/test/java/com/springcloudme/servicetp/ServiceTpApplicationTests.java
new file mode 100644
index 0000000..d7385db
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-tp/src/test/java/com/springcloudme/servicetp/ServiceTpApplicationTests.java
@@ -0,0 +1,17 @@
+package com.springcloudme.servicetp;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class ServiceTpApplicationTests {
+
+ @Test
+ public void contextLoads() {
+ }
+
+}
+
diff --git a/springcloud_demo_on_k8s-master/service-zuul/.gitignore b/springcloud_demo_on_k8s-master/service-zuul/.gitignore
new file mode 100644
index 0000000..c456c4a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-zuul/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
diff --git a/springcloud_demo_on_k8s-master/service-zuul/.mvn/wrapper/maven-wrapper.jar b/springcloud_demo_on_k8s-master/service-zuul/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..01e6799
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-zuul/.mvn/wrapper/maven-wrapper.jar
Binary files differ
diff --git a/springcloud_demo_on_k8s-master/service-zuul/.mvn/wrapper/maven-wrapper.properties b/springcloud_demo_on_k8s-master/service-zuul/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..7179346
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-zuul/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
diff --git a/springcloud_demo_on_k8s-master/service-zuul/mvnw b/springcloud_demo_on_k8s-master/service-zuul/mvnw
new file mode 100644
index 0000000..5551fde
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-zuul/mvnw
@@ -0,0 +1,286 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+ # TODO classpath?
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ wget "$jarUrl" -O "$wrapperJarPath"
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ curl -o "$wrapperJarPath" "$jarUrl"
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/springcloud_demo_on_k8s-master/service-zuul/mvnw.cmd b/springcloud_demo_on_k8s-master/service-zuul/mvnw.cmd
new file mode 100644
index 0000000..e5cfb0a
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-zuul/mvnw.cmd
@@ -0,0 +1,161 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ echo Found %WRAPPER_JAR%
+) else (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
+ echo Finished downloading %WRAPPER_JAR%
+)
+@REM End of extension
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/springcloud_demo_on_k8s-master/service-zuul/pom.xml b/springcloud_demo_on_k8s-master/service-zuul/pom.xml
new file mode 100644
index 0000000..a371bea
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-zuul/pom.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>2.0.3.RELEASE</version>
+ <relativePath/>
+ </parent>
+ <groupId>com.springcloudme</groupId>
+ <artifactId>service-zuul</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>service-zuul</name>
+ <description>Demo project for Spring Boot</description>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <java.version>1.8</java.version>
+ <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-dependencies</artifactId>
+ <version>${spring-cloud.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>1.2.0</version>
+ <configuration>
+ <imageName>registry.cn-hangzhou.aliyuncs.com/wooddeep/service-zuul:v3</imageName>
+ <serverId>my-docker-registry</serverId>
+ <baseImage>java</baseImage>
+ <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
+ <resources>
+ <resource>
+ <targetPath>/</targetPath>
+ <directory>${project.build.directory}</directory>
+ <include>${project.build.finalName}.jar</include>
+ </resource>
+ </resources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>spring-milestones</id>
+ <name>Spring Milestones</name>
+ <url>https://repo.spring.io/milestone</url>
+ </repository>
+ </repositories>
+
+</project>
diff --git a/springcloud_demo_on_k8s-master/service-zuul/src/main/java/com/springcloudme/servicezuul/ServiceZuulApplication.java b/springcloud_demo_on_k8s-master/service-zuul/src/main/java/com/springcloudme/servicezuul/ServiceZuulApplication.java
new file mode 100644
index 0000000..d5f7a09
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-zuul/src/main/java/com/springcloudme/servicezuul/ServiceZuulApplication.java
@@ -0,0 +1,39 @@
+package com.springcloudme.servicezuul;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
+import org.springframework.cloud.netflix.zuul.EnableZuulServer;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.env.Environment;
+
+import javax.annotation.Resource;
+
+@SpringBootApplication
+@EnableEurekaClient
+@EnableZuulServer
+@EnableZuulProxy
+public class ServiceZuulApplication {
+
+ private static final String SPRING_BOOT_HELLO = "eureka.client.service-url.default-zone";
+
+ @Resource
+ private Environment environment;
+
+ /**
+ * 通过注入Environment获取值
+ */
+ public void getAttrByEnvironment() {
+ String property = environment.getProperty(SPRING_BOOT_HELLO);
+ System.out.println("通过注入Environment获取值: " + property);
+ }
+
+
+ public static void main(String[] args) {
+ ConfigurableApplicationContext atx = SpringApplication.run(ServiceZuulApplication.class, args);
+ ServiceZuulApplication bean = atx.getBean(ServiceZuulApplication.class);
+ bean.getAttrByEnvironment();
+ }
+}
+
diff --git a/springcloud_demo_on_k8s-master/service-zuul/src/main/java/com/springcloudme/servicezuul/api/apiController.java b/springcloud_demo_on_k8s-master/service-zuul/src/main/java/com/springcloudme/servicezuul/api/apiController.java
new file mode 100644
index 0000000..bbd9cbc
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-zuul/src/main/java/com/springcloudme/servicezuul/api/apiController.java
@@ -0,0 +1,14 @@
+package com.springcloudme.servicezuul.api;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api")
+public class apiController {
+
+ @RequestMapping("/aaa")
+ public String get(){
+ return "aaaaa";
+ }
+}
diff --git a/springcloud_demo_on_k8s-master/service-zuul/src/main/java/com/springcloudme/servicezuul/filter/MyFilter.java b/springcloud_demo_on_k8s-master/service-zuul/src/main/java/com/springcloudme/servicezuul/filter/MyFilter.java
new file mode 100644
index 0000000..f414000
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-zuul/src/main/java/com/springcloudme/servicezuul/filter/MyFilter.java
@@ -0,0 +1,55 @@
+package com.springcloudme.servicezuul.filter;
+
+import com.netflix.zuul.ZuulFilter;
+import com.netflix.zuul.context.RequestContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Email miles02@163.com
+ *
+ * @author fangzhipeng
+ * create 2018-07-09
+ **/
+@Component
+public class MyFilter extends ZuulFilter {
+
+ private static Logger log = LoggerFactory.getLogger(MyFilter.class);
+ @Override
+ public String filterType() {
+ return "pre";
+ }
+
+ @Override
+ public int filterOrder() {
+ return 0;
+ }
+
+ @Override
+ public boolean shouldFilter() {
+ return true;
+ }
+
+ @Override
+ public Object run() {
+ RequestContext ctx = RequestContext.getCurrentContext();
+ HttpServletRequest request = ctx.getRequest();
+ log.info(String.format("%s >>> %s", request.getMethod(), request.getRequestURL().toString()));
+ Object accessToken = request.getParameter("token");
+// if(accessToken == null) {
+// log.warn("token is empty");
+// ctx.setSendZuulResponse(false);
+// ctx.setResponseStatusCode(401);
+// try {
+// ctx.getResponse().getWriter().write("token is empty");
+// }catch (Exception e){}
+//
+// return null;
+// }
+ log.info("ok");
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/springcloud_demo_on_k8s-master/service-zuul/src/main/java/com/springcloudme/servicezuul/util/Utils.java b/springcloud_demo_on_k8s-master/service-zuul/src/main/java/com/springcloudme/servicezuul/util/Utils.java
new file mode 100644
index 0000000..40e801d
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-zuul/src/main/java/com/springcloudme/servicezuul/util/Utils.java
@@ -0,0 +1,16 @@
+package com.springcloudme.servicezuul.util;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+@Component
+public class Utils {
+
+ @Autowired
+ private Environment env;
+
+ public String getProps(String key){
+ return env.getProperty(key);
+ }
+}
diff --git a/springcloud_demo_on_k8s-master/service-zuul/src/main/resources/application.yml b/springcloud_demo_on_k8s-master/service-zuul/src/main/resources/application.yml
new file mode 100644
index 0000000..f579e93
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-zuul/src/main/resources/application.yml
@@ -0,0 +1,23 @@
+server:
+ port: 8762
+
+spring:
+ application:
+ name: service-zuul
+
+eureka:
+ instance:
+ preferIpAddress: true
+ client:
+ serviceUrl:
+ defaultZone: http://${EUREKA_URL:localhost}:8761/eureka
+
+zuul:
+ routes:
+ service-tp:
+ path: /service-tp/**
+ serviceId: service-tp
+ service-api:
+ path: /service-api/**
+ serviceId: service-api
+
diff --git a/springcloud_demo_on_k8s-master/service-zuul/src/test/java/com/springcloudme/servicezuul/ServiceZuulApplicationTests.java b/springcloud_demo_on_k8s-master/service-zuul/src/test/java/com/springcloudme/servicezuul/ServiceZuulApplicationTests.java
new file mode 100644
index 0000000..64c2b68
--- /dev/null
+++ b/springcloud_demo_on_k8s-master/service-zuul/src/test/java/com/springcloudme/servicezuul/ServiceZuulApplicationTests.java
@@ -0,0 +1,17 @@
+package com.springcloudme.servicezuul;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class ServiceZuulApplicationTests {
+
+ @Test
+ public void contextLoads() {
+ }
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/.gitignore b/springcloud_k8s_panzhihuazhihuishequ/applets/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/.mvn/wrapper/MavenWrapperDownloader.java b/springcloud_k8s_panzhihuazhihuishequ/applets/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 0000000..a45eb6b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+ private static final String WRAPPER_VERSION = "0.5.6";
+ /**
+ * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+ */
+ private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+ + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+ /**
+ * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+ * use instead of the default one.
+ */
+ private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+ ".mvn/wrapper/maven-wrapper.properties";
+
+ /**
+ * Path where the maven-wrapper.jar will be saved to.
+ */
+ private static final String MAVEN_WRAPPER_JAR_PATH =
+ ".mvn/wrapper/maven-wrapper.jar";
+
+ /**
+ * Name of the property which should be used to override the default download url for the wrapper.
+ */
+ private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+ public static void main(String args[]) {
+ System.out.println("- Downloader started");
+ File baseDirectory = new File(args[0]);
+ System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+ // If the maven-wrapper.properties exists, read it and check if it contains a custom
+ // wrapperUrl parameter.
+ File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+ String url = DEFAULT_DOWNLOAD_URL;
+ if (mavenWrapperPropertyFile.exists()) {
+ FileInputStream mavenWrapperPropertyFileInputStream = null;
+ try {
+ mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+ Properties mavenWrapperProperties = new Properties();
+ mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+ url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+ } catch (IOException e) {
+ System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+ } finally {
+ try {
+ if (mavenWrapperPropertyFileInputStream != null) {
+ mavenWrapperPropertyFileInputStream.close();
+ }
+ } catch (IOException e) {
+ // Ignore ...
+ }
+ }
+ }
+ System.out.println("- Downloading from: " + url);
+
+ File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+ if (!outputFile.getParentFile().exists()) {
+ if (!outputFile.getParentFile().mkdirs()) {
+ System.out.println(
+ "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+ }
+ }
+ System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+ try {
+ downloadFileFromURL(url, outputFile);
+ System.out.println("Done");
+ System.exit(0);
+ } catch (Throwable e) {
+ System.out.println("- Error downloading");
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+ private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+ if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+ String username = System.getenv("MVNW_USERNAME");
+ char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+ Authenticator.setDefault(new Authenticator() {
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(username, password);
+ }
+ });
+ }
+ URL website = new URL(urlString);
+ ReadableByteChannel rbc;
+ rbc = Channels.newChannel(website.openStream());
+ FileOutputStream fos = new FileOutputStream(destination);
+ fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+ fos.close();
+ rbc.close();
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/.mvn/wrapper/maven-wrapper.jar b/springcloud_k8s_panzhihuazhihuishequ/applets/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..2cc7d4a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/.mvn/wrapper/maven-wrapper.jar
Binary files differ
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/.mvn/wrapper/maven-wrapper.properties b/springcloud_k8s_panzhihuazhihuishequ/applets/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..642d572
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/mvnw b/springcloud_k8s_panzhihuazhihuishequ/applets/mvnw
new file mode 100644
index 0000000..a16b543
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/mvnw
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ -n "$MVNW_REPOURL" ]; then
+ jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ else
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+ fi
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+ fi
+
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/mvnw.cmd b/springcloud_k8s_panzhihuazhihuishequ/applets/mvnw.cmd
new file mode 100644
index 0000000..c8d4337
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/mvnw.cmd
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/pom.xml b/springcloud_k8s_panzhihuazhihuishequ/applets/pom.xml
new file mode 100644
index 0000000..208f5b4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/pom.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.panzhihua</groupId>
+ <artifactId>zhihuishequ</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <groupId>com.panzhihua</groupId>
+ <artifactId>applets</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>applets</name>
+ <description>小程序</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-config</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.panzhihua</groupId>
+ <artifactId>common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.netflix.hystrix</groupId>
+ <artifactId>hystrix-javanica</artifactId>
+ </dependency>
+<!-- 微信小程序-->
+ <dependency>
+ <groupId>com.github.binarywang</groupId>
+ <artifactId>weixin-java-miniapp</artifactId>
+ <version>4.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>swagger-bootstrap-ui</artifactId>
+ </dependency>
+ <!--添加监控依赖包-->
+ <dependency>
+ <groupId>io.micrometer</groupId>
+ <artifactId>micrometer-registry-prometheus</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+ <!--minio文件存储-->
+ <dependency>
+ <groupId>io.minio</groupId>
+ <artifactId>minio</artifactId>
+ <version>6.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>com.panzhihua</groupId>
+ <artifactId>UMF</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/src/main/resources/lib/UMF_SDK_V01.jar</systemPath>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+<!-- <resource>-->
+<!-- <directory>${project.basedir}/src/main/resources/lib</directory>-->
+<!-- <targetPath>/BOOT-INF/lib/</targetPath>-->
+<!-- <includes>-->
+<!-- <include>**/*.jar</include>-->
+<!-- </includes>-->
+<!-- </resource>-->
+<!-- <resource>-->
+<!-- <directory>src/main/resources</directory>-->
+<!-- <targetPath>BOOT-INF/classes/</targetPath>-->
+<!-- </resource>-->
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>2.5.0</version>
+ <configuration>
+ <mainClass>com.panzhihua.applets.AppletsApplication</mainClass>
+ <includeSystemScope>true</includeSystemScope>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>1.2.0</version>
+ <configuration>
+ <imageName>registry.cn-chengdu.aliyuncs.com/panzhihua/applets:v1</imageName>
+ <serverId></serverId>
+ <baseImage>java</baseImage>
+ <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
+ <resources>
+ <resource>
+ <targetPath>/</targetPath>
+ <directory>${project.build.directory}</directory>
+ <include>${project.build.finalName}.jar</include>
+ </resource>
+ </resources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>spring-snapshots</id>
+ <name>Spring Snapshots</name>
+ <url>https://repo.spring.io/snapshot</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>spring-milestones</id>
+ <name>Spring Milestones</name>
+ <url>https://repo.spring.io/milestone</url>
+ </repository>
+ </repositories>
+
+</project>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/AppletsApplication.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/AppletsApplication.java
new file mode 100644
index 0000000..8250afb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/AppletsApplication.java
@@ -0,0 +1,24 @@
+package com.panzhihua.applets;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@EnableSwagger2
+@SpringCloudApplication
+@EnableCircuitBreaker
+@EnableEurekaClient
+@EnableFeignClients(basePackages = {"com.panzhihua.common.service"})
+@ComponentScan({"com.panzhihua.applets", "com.panzhihua.common"})
+public class AppletsApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(AppletsApplication.class, args);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ActDynTypeApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ActDynTypeApi.java
new file mode 100644
index 0000000..dab55b4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ActDynTypeApi.java
@@ -0,0 +1,42 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
+import com.panzhihua.common.model.dtos.community.EditComActDynTypeDTO;
+import com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActDynTypeVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+import static java.util.Objects.isNull;
+
+@Slf4j
+@Api(tags = {"社区动态分类模块"})
+@RestController
+@RequestMapping("/dyn/type/")
+public class ActDynTypeApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "查询社区动态分类列表", response = ComActDynTypeVO.class)
+ @PostMapping("/list")
+ public R list(@RequestBody PageComActDynTypeDTO comActDynTypeDTO) {
+// comActDynTypeDTO.setCommunityId(this.getCommunityId()+"");
+// return communityService.getDynTypeListByAdmin(comActDynTypeDTO);
+ return communityService.pageDynTypeByAdmin(comActDynTypeDTO);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/BcRegionApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/BcRegionApi.java
new file mode 100644
index 0000000..8362d6d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/BcRegionApi.java
@@ -0,0 +1,36 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 行政区划表(BcRegion)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 行政区划表相关功能
+ *
+ * @author zzj
+ * @since 2022-04-20 14:26:14
+ */
+@Api(tags = {"行政区划"})
+@RestController
+@RequestMapping("bcRegion")
+public class BcRegionApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation("四级联动接口")
+ @GetMapping("levelList")
+ public R levelList(@RequestParam("level")Integer level,@RequestParam("code")String code){
+ return this.communityService.levelList(level,code);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ClusterApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ClusterApi.java
new file mode 100644
index 0000000..db07a88
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ClusterApi.java
@@ -0,0 +1,47 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.cluster.PageClusterMemberVo;
+import com.panzhihua.common.model.vos.community.cluster.PageClusterVo;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Objects;
+
+/**
+ * title: 群团组织接口类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 群团组织接口类
+ *
+ * @author lyq
+ * @date 2021/9/23 16:12
+ */
+@Slf4j
+@Api(tags = {"群团组织"})
+@RestController
+@RequestMapping("/cluster/")
+public class ClusterApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "群团组织成员分页查询",response = PageClusterMemberVo.class)
+ @PostMapping("/member/page")
+ public R pageMemberClusterApplets(@RequestBody PageClusterMemberDto pageClusterMemberDto) {
+ pageClusterMemberDto.setCommunityId(this.getCommunityId());
+ return communityService.pageClusterMemberApplets(pageClusterMemberDto);
+ }
+
+ @ApiOperation(value = "群团组织列表",response = PageClusterVo.class)
+ @GetMapping("list")
+ public R listClusterApplets() {
+ return communityService.listClusterApplets(this.getCommunityId());
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidCheckRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidCheckRecordApi.java
new file mode 100644
index 0000000..03c7102
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidCheckRecordApi.java
@@ -0,0 +1,82 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.acid.ComActAcidCheckRecordDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 排查跟进表(ComActAcidCheckRecord)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 排查跟进表相关功能
+ *
+ * @author zzj
+ * @since 2022-04-24 16:14:27
+ */
+@Api(tags = {"排查跟进"})
+@RestController
+@RequestMapping("comActAcidCheckRecord")
+public class ComActAcidCheckRecordApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 列表查询
+ *
+ * @param comActAcidCheckRecordDTO 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = ComActAcidCheckRecordVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody ComActAcidCheckRecordDTO comActAcidCheckRecordDTO) {
+ return this.communityService.selectAllComActAcidCheckRecord(comActAcidCheckRecordDTO);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation(value = "通过主键查询单条数据",response = ComActAcidCheckRecordVO.class)
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.selectOneComActAcidCheckRecord(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActAcidCheckRecordVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation(value = "新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO) {
+ comActAcidCheckRecordVO.setUsername(this.getLoginUserInfo().getName());
+ return this.communityService.insertComActAcidCheckRecord(comActAcidCheckRecordVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActAcidCheckRecordVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation(value = "修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO) {
+ return this.communityService.updateComActAcidCheckRecord(comActAcidCheckRecordVO);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidDangerMemberApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidDangerMemberApi.java
new file mode 100644
index 0000000..405af64
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidDangerMemberApi.java
@@ -0,0 +1,51 @@
+package com.panzhihua.applets.api;
+
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import com.panzhihua.common.model.dtos.community.acid.PageDangerMemberDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsTeamDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidDangerMemberVO;
+import com.panzhihua.common.model.vos.community.fms.ComFmsTeamVO;
+import io.swagger.annotations.ApiOperation;
+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 com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+
+/**
+ * @title: ComActAcidDangerMemberApi
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description:
+ * @author: hans
+ * @date: 2022/04/27 15:54
+ */
+@Slf4j
+@Api(tags = {"风险人员"})
+@RestController
+@RequestMapping("comActAcidDangerMember")
+public class ComActAcidDangerMemberApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "分页查询风险人员", response = ComActAcidDangerMemberVO.class)
+ @PostMapping("/page")
+ public R pageDangerMember(@RequestBody @Valid PageDangerMemberDTO pageDangerMemberDTO) {
+ return communityService.pageDangerMember(pageDangerMemberDTO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java
new file mode 100644
index 0000000..b580850
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java
@@ -0,0 +1,146 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidCharts;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordTimeVO;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
+import com.panzhihua.common.model.vos.community.reserve.FiveCount;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * (ComActAcidRecord)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 相关功能
+ *
+ * @author zzj
+ * @since 2022-04-12 15:29:59
+ */
+@Slf4j
+@Api(tags = {"防疫登记"})
+@RestController
+@RequestMapping("comActAcidRecord")
+public class ComActAcidRecordApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param comActAcidRecordDTO 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = ComActAcidRecordVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO) {
+ return this.communityService.selectAllComActAcidRecord(comActAcidRecordDTO);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation(value = "通过主键查询单条数据",response = ComActAcidRecordVO.class)
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.selectOneComActAcidRecord(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActAcidRecord 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation(value = "新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActAcidRecordTimeVO comActAcidRecord) {
+ ComActAcidRecordVO comActAcidRecordVO=new ComActAcidRecordVO();
+ BeanUtils.copyProperties(comActAcidRecord,comActAcidRecordVO);
+ comActAcidRecordVO.setUserId(this.getUserId());
+ comActAcidRecordVO.setCreateTime(new Date());
+ return this.communityService.insertComActAcidRecord(comActAcidRecordVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActAcidRecordVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation(value = "修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
+ comActAcidRecordVO.setUserId(this.getUserId());
+ return this.communityService.updateComActAcidRecord(comActAcidRecordVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActAcidRecordVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation(value = "修改数据")
+ @PostMapping("/updateApplets")
+ public R updateApplets(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
+ comActAcidRecordVO.setUserId(this.getUserId());
+ return this.communityService.updateApplets(comActAcidRecordVO);
+ }
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation(value = "删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.deleteComActAcidRecord(id);
+ }
+
+ /**
+ * 5项常规统计
+ * @return
+ */
+ @ApiOperation(value = "7项常规统计",response = FiveCount.class)
+ @GetMapping("fiveCountPlus")
+ public R fiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity") String localCity){
+ return this.communityService.comActAcidRecordFiveCountPlus(date,localCity,null);
+ }
+ @ApiOperation(value = "新版查看详情",response = ComActAcidRecordVO.class)
+ @GetMapping("/detailByApp")
+ public R detailByApp(@RequestParam("id")Long id,@RequestParam("localCity")String localCity){
+ return this.communityService.detailByApp(id,localCity);
+ }
+
+ /**
+ * 图标统计
+ * @return
+ */
+ @ApiOperation(value = "图标统计",response = ComActAcidCharts.class)
+ @GetMapping("charts")
+ public R charts(@RequestParam("date")String date,@RequestParam("localCity")String localCity){
+ return this.communityService.charts(date,localCity);
+ }
+ @GetMapping("/checkCommit")
+ public R checkCommit(){
+ return this.communityService.checkCommit(this.getUserId());
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActActivityCodeApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActActivityCodeApi.java
new file mode 100644
index 0000000..3315041
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActActivityCodeApi.java
@@ -0,0 +1,57 @@
+package com.panzhihua.applets.api;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 签到二维码表(ComActActivityCode)表控制层
+ *
+ * @author makejava
+ * @since 2021-10-15 15:23:10
+ */
+@Slf4j
+@Api(tags = {"活动二维码"})
+@RestController
+@RequestMapping("comActActivityCode")
+public class ComActActivityCodeApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 查看二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @ApiOperation("查看二维码")
+ @PostMapping("/getQRCode")
+ public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO){
+ return this.communityService.getQRCode(qrCodeVO);
+ }
+
+ /**
+ * 重置二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @ApiOperation("重置二维码")
+ @PostMapping("/resetQRCode")
+ public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO){
+ return this.communityService.resetQRCode(qrCodeVO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAnnouncementApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAnnouncementApi.java
new file mode 100644
index 0000000..2dae60b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAnnouncementApi.java
@@ -0,0 +1,96 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * (ComActAnnouncement)表控制层
+ *
+ * @author makejava
+ * @since 2021-11-01 13:45:55
+ */
+@Slf4j
+@Api(tags = {"通知公告"})
+@RestController
+@RequestMapping("comActAnnouncement")
+public class ComActAnnouncementApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询所有数据",response = ComActAnnouncementVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setCommunityId(this.getCommunityId());
+ return this.communityService.comActAnnouncementSelectAll(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("通过主键查询单条数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.comActAnnouncementSelectOne(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActAnnouncementVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActAnnouncementVO comActAnnouncementVO) {
+ comActAnnouncementVO.setCreateTime(new Date());
+ comActAnnouncementVO.setCommunityId(this.getCommunityId());
+ return this.communityService.comActAnnouncementInsert(comActAnnouncementVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActAnnouncementVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActAnnouncementVO comActAnnouncementVO) {
+ return this.communityService.comActAnnouncementUpdate(comActAnnouncementVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.comActAnnouncementDelete(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActColumnApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActColumnApi.java
new file mode 100644
index 0000000..f5fed00
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActColumnApi.java
@@ -0,0 +1,103 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActColumnVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * 分类列表(ComActColumn)表控制层
+ *
+ * @author makejava
+ * @since 2021-10-20 17:28:14
+ */
+@Slf4j
+@Api(tags = {"分类管理"})
+@RestController
+@RequestMapping("comActColumn")
+public class ComActColumnApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询所有数据",response = ComActColumnVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.communityService.comActColumnSelectAll(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("通过主键查询单条数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.comActColumnSelectOne(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActColumnVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActColumnVO comActColumnVO) {
+ comActColumnVO.setStatus(1);
+ comActColumnVO.setCreateTime(new Date());
+ if(StringUtils.isNotEmpty(this.getLoginUserInfo().getName())){
+ comActColumnVO.setCreateBy(this.getLoginUserInfo().getName());
+ }
+ return communityService.comActColumnInsert(comActColumnVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActColumnVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActColumnVO comActColumnVO) {
+ comActColumnVO.setUpdateTime(new Date());
+ if(StringUtils.isNotEmpty(this.getLoginUserInfo().getName())){
+ comActColumnVO.setUpdateBy(this.getLoginUserInfo().getName());
+ }
+ return this.communityService.comActColumnUpdate(comActColumnVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.comActColumnDelete(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActDpcApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActDpcApi.java
new file mode 100644
index 0000000..6f7b648
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActDpcApi.java
@@ -0,0 +1,126 @@
+package com.panzhihua.applets.api;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActDpcVO;
+import com.panzhihua.common.model.vos.community.ComActEasyPhotoFeedbackVO;
+import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+
+/**
+ * @title: ComActDpcApi
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 人大代表
+ * @author: hans
+ * @date: 2022/06/07 10:57
+ */
+@Slf4j
+@Api(tags = {"人大代表相关"})
+@RestController
+@RequestMapping("/dpc")
+public class ComActDpcApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private UserService userService;
+
+ @ApiOperation(value = "获取人大代表详情", response = ComActDpcVO.class)
+ @ApiImplicitParam(name = "id", value = "人大代表id", required = true)
+ @GetMapping("/detail")
+ public R detailDpc(@RequestParam("id") Long id) {
+ return communityService.detailDpc(id);
+ }
+
+ @ApiOperation(value = "分页查询人大代表", response = ComActDpcVO.class)
+ @PostMapping("/page")
+ public R pageDpc(@RequestBody @Valid PageDpcDTO pageDpcDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (nonNull(loginUserInfo)) {
+ pageDpcDTO.setCommunityId(loginUserInfo.getCommunityId());
+ } else if (isNull(pageDpcDTO.getCommunityId())) {
+ return R.fail("未指定社区");
+ }
+ return communityService.pageDpc(pageDpcDTO);
+ }
+
+ @ApiOperation(value = "获取人大代表反馈记录", response = ComActEasyPhotoFeedbackVO.class)
+ @ApiImplicitParam(name = "id", value = "随手拍id", required = true)
+ @GetMapping("/feedback")
+ public R getFeedbackList(@RequestParam("id") Long id) {
+ return communityService.getFeedbackList(id);
+ }
+
+ @ApiOperation(value = "人大代表反馈随手拍")
+ @PostMapping("/feedback")
+ public R addFeedback(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
+ LoginUserInfoVO loginUserInfo = userService.getUserInfoByUserId(this.getLoginUserInfo().getUserId().toString()).getData();
+ Integer isDpcMember = loginUserInfo.getIsDpcMember();
+ if (isNull(isDpcMember) || !isDpcMember.equals(1)) {
+ return R.fail("暂无权限");
+ }
+ Long userId = loginUserInfo.getUserId();
+ Integer type = comActEasyPhotoVO.getType();
+ if (null == type || type != 3) {
+ return R.fail("操作类型错误");
+ }
+ Long id = comActEasyPhotoVO.getId();
+ if (ObjectUtils.isEmpty(id)) {
+ return R.fail("随手拍主键不能为空");
+ }
+ comActEasyPhotoVO.setUserId(userId);
+ R r = communityService.addEasyPhotoFeedbackForDpc(comActEasyPhotoVO);
+ if (R.isOk(r)) {
+ R r1 = communityService.detailEasyPhoto(id, userId);
+ if (R.isOk(r1)) {
+ ComActEasyPhotoVO comActEasyPhotoVO1 =
+ JSONObject.parseObject(JSONObject.toJSONString(r1.getData()), ComActEasyPhotoVO.class);
+ SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
+ sysUserNoticeVO.setUserId(comActEasyPhotoVO1.getSponsorId());
+ sysUserNoticeVO.setType(2);
+ sysUserNoticeVO.setBusinessType(4);
+ sysUserNoticeVO.setBusinessTime(comActEasyPhotoVO1.getExamineAt());
+ sysUserNoticeVO.setBusinessId(id);
+ sysUserNoticeVO.setStatus(0);
+ if (type.intValue() == 3) {
+ sysUserNoticeVO.setTitle("随手拍有反馈");
+ sysUserNoticeVO.setBusinessTitle(comActEasyPhotoVO.getHandleResult());
+ sysUserNoticeVO.setBusinessContent("社区已经处理好了具体的事宜，将变成现在更好看的样子找到更好的自己……");
+ sysUserNoticeVO.setBusinessStatus(2);
+ R r2 = userService.addNotice(sysUserNoticeVO);
+ if (R.isOk(r2)) {
+ log.info("新增随手拍有反馈通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
+ }
+ }
+ }
+ return r;
+ }
+
+}
+
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActEnterpriseApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActEnterpriseApi.java
new file mode 100644
index 0000000..9777b3b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActEnterpriseApi.java
@@ -0,0 +1,65 @@
+package com.panzhihua.applets.api;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseDTO;
+import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseDTO;
+import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActEnterpriseVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @title: ComActEnterpriseApi
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 社区企业管理
+ * @author: hans
+ * @date: 2022/05/31 10:22
+ */
+@Slf4j
+@Api(tags = {"社区企业管理"})
+@RestController
+@RequestMapping("/enterprise")
+public class ComActEnterpriseApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation("获取社区企业详情")
+ @ApiImplicitParam(name = "id", value = "社区企业id", required = true)
+ @GetMapping("/detail")
+ public R detailEnterprise(@RequestParam("id") Long id) {
+ return communityService.detailEnterprise(id);
+ }
+
+ @ApiOperation(value = "分页查询社区企业", response = ComActEnterpriseVO.class)
+ @PostMapping("/page")
+ public R pageEnterprise(@RequestBody @Valid PageEnterpriseDTO pageEnterpriseDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (nonNull(loginUserInfo)) {
+ pageEnterpriseDTO.setCommunityId(loginUserInfo.getCommunityId());
+ } else if (isNull(pageEnterpriseDTO.getCommunityId())) {
+ return R.fail("未指定社区");
+ }
+ return communityService.pageEnterprise(pageEnterpriseDTO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActFourMemberApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActFourMemberApi.java
new file mode 100644
index 0000000..8b06be0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActFourMemberApi.java
@@ -0,0 +1,164 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * (ComActFourMember)表控制层
+ *
+ * @author makejava
+ * @since 2021-09-23 10:13:31
+ */
+@Slf4j
+@Api(tags = {"四长四员"})
+@RestController
+@RequestMapping("comActFourMember")
+public class ComActFourMemberApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = ComActFourMemberVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setParamId(this.getCommunityId());
+ commonPage.setStatus(1);
+ return this.communityService.comActFourMemberSelectAll(commonPage);
+ }
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = ComMngPopulationVO.class)
+ @PostMapping("queryMember")
+ public R selectMember(@RequestBody CommonPage commonPage) {
+ commonPage.setParamId(this.getCommunityId());
+ return this.communityService.comActFourMemberQueryMember(commonPage);
+ }
+
+ /**
+ *居民数据详情
+ */
+ @ApiOperation(value = "居民数据详情",response = FourMemberDetailVO.class)
+ @GetMapping("/memberDetail")
+ public R memberDetail(@RequestParam("id")Long id){
+ return this.communityService.comActFourMemberMemberDetail(id);
+ }
+
+ @ApiOperation(value = "房屋级联菜单查询")
+ @PostMapping("/cascade/list")
+ public R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
+ // 获取登陆用户绑定社区id
+ LoginUserInfoVO loginUser = this.getLoginUserInfo();
+ if (loginUser != null) {
+ cascadeHouseDTO.setCommunityId(loginUser.getCommunityId());
+ }
+ return communityService.getCascadeHouseAddress(cascadeHouseDTO);
+ }
+
+ /**
+ * 查询房屋二级级联菜单
+ *
+ * @param cascadeHouseDTO
+ * 请求参数
+ * @return 菜单列表
+ */
+ @ApiOperation(value = "房屋级联菜单查询")
+ @PostMapping("/second/list")
+ public R getSecondHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
+ cascadeHouseDTO.setCommunityId(this.getCommunityId());
+ return communityService.getSecondHouseAddress(cascadeHouseDTO);
+ }
+
+ @ApiOperation(value = "分页查询实有房屋列表", response = ComMngPopulationHouseAdminVO.class)
+ @PostMapping("/pageHouse")
+ public R pageHouse(@RequestBody ComMngPopulationHouseAdminDTO populationHouseAdminDTO) {
+ // 获取登陆用户绑定社区id
+ LoginUserInfoVO loginUser = this.getLoginUserInfo();
+ if (loginUser != null) {
+ populationHouseAdminDTO.setCommunityId(loginUser.getCommunityId());
+ }
+ return communityService.pageHouse(populationHouseAdminDTO);
+ }
+
+ @ApiOperation(value = "查询实有房屋详情", response = ComMngPopulationHouseDetailAdminVO.class)
+ @PostMapping("/house/detail")
+ public R getHouseDetail(@RequestParam(value = "houseId") Long houseId) {
+ return communityService.getHouseDetail(houseId);
+ }
+
+ /**
+ * 编辑实有房屋信息
+ *
+ * @param comMngPopulationHouseUserVO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @ApiOperation(value = "编辑实有房屋信息")
+ @PostMapping("/population/house/user/edit")
+ public R editHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
+ return communityService.editHouseUser(comMngPopulationHouseUserVO);
+ }
+
+ /**
+ * 新增实有房屋信息
+ *
+ * @param comMngPopulationHouseUserVO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @ApiOperation(value = "新增实有房屋信息")
+ @PostMapping("/population/house/user/insert")
+ public R insertHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
+ return communityService.insertHouseUser(comMngPopulationHouseUserVO);
+ }
+
+ /**
+ * 根据房屋id列表删除房屋信息
+ *
+ * @param comMngPopulationHouseUserVO
+ * 请求参数
+ * @return 删除结果
+ */
+ @ApiOperation(value = "删除实有房屋信息")
+ @PostMapping("/population/house/user/delete")
+ public R deleteHousesUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
+ return communityService.deleteHousesUser(comMngPopulationHouseUserVO);
+ }
+
+ /**
+ * 根据id查询
+ *
+ * @param id
+ * 请求参数
+ * @return 删除结果
+ */
+ @ApiOperation(value = "id查询信息")
+ @GetMapping("/population/house/user/detail")
+ public R detailHousesUser(@RequestParam("id") Long id) {
+ return communityService.detailHousesUser(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActIntegralUserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActIntegralUserApi.java
new file mode 100644
index 0000000..4d4aa95
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActIntegralUserApi.java
@@ -0,0 +1,98 @@
+package com.panzhihua.applets.api;
+
+import javax.annotation.Resource;
+
+import com.panzhihua.common.model.vos.community.integral.IntegralTradeVO;
+import io.swagger.annotations.ApiImplicitParam;
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.integral.ComActIntegralCommunityRankDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.integral.ComActIntegralCommunityRankVO;
+import com.panzhihua.common.model.vos.community.integral.ComActIntegralCommunityTradeVO;
+import com.panzhihua.common.model.vos.community.integral.ComActIntegralUserRuleVO;
+import com.panzhihua.common.model.vos.community.integral.ComActIntegralUserVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequestMapping("/integral/")
+@Api(tags = {"用户积分模块"})
+public class ComActIntegralUserApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "查询积分说明")
+ @GetMapping("/explain")
+ public R getIntegralExplain() {
+ return communityService.getIntegralExplainApplets();
+ }
+
+ @ApiOperation(value = "查询社区领取积分列表", response = ComActIntegralUserRuleVO.class)
+ @PostMapping("/receive")
+ public R getIntegralReceive() {
+ LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
+ if (userInfoVO == null) {
+ return R.fail("请先登录");
+ }
+ return communityService.getIntegralReceiveApplets(userInfoVO.getUserId(), userInfoVO.getCommunityId());
+ }
+
+ @ApiOperation(value = "积分统计", response = ComActIntegralUserVO.class)
+ @ApiImplicitParam(name = "communityId", value = "社区id")
+ @GetMapping("/user/statistics")
+ public R getIntegralUserList(@RequestParam(value = "communityId", required = false) Long communityId) {
+ LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
+ if (userInfoVO == null) {
+ return R.fail("请先登录");
+ }
+ return communityService.getIntegralUserListApplets(userInfoVO.getUserId(), communityId);
+ }
+
+ @ApiOperation(value = "查询我的积分余额", response = ComActIntegralUserVO.class)
+ @ApiImplicitParam(name = "communityId", value = "社区id", required = true)
+ @GetMapping("/user/balance")
+ public R getUserIntegralBalance(@RequestParam("communityId") Long communityId) {
+ LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
+ if (userInfoVO == null) {
+ return R.fail("请先登录");
+ }
+ return communityService.getUserIntegralBalance(userInfoVO.getUserId(), communityId);
+ }
+
+ @ApiOperation(value = "获取积分详情", response = IntegralTradeVO.class)
+ @ApiImplicitParam(name = "id", value = "积分明细id", required = true)
+ @GetMapping("/user/detail")
+ public R getUserIntegralDetail(@RequestParam("id") Long id) {
+ return communityService.getUserIntegralDetail(id);
+ }
+
+ @ApiOperation(value = "查询社区积分排行榜", response = ComActIntegralCommunityRankVO.class)
+ @PostMapping("/community/rank")
+ public R getIntegralCommunityRank(@RequestBody ComActIntegralCommunityRankDTO communityRankDTO) {
+ LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
+ if (userInfoVO == null) {
+ return R.fail("请先登录");
+ }
+ return communityService.getIntegralCommunityRankApplets(communityRankDTO);
+ }
+
+ @ApiOperation(value = "查询用户积分明细", response = ComActIntegralCommunityTradeVO.class)
+ @PostMapping("/community/trade")
+ public R getIntegralCommunityTrade(@RequestBody ComActIntegralCommunityRankDTO communityTradeDTO) {
+ LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
+ if (userInfoVO == null) {
+ return R.fail("请先登录");
+ }
+ communityTradeDTO.setUserId(userInfoVO.getUserId());
+ return communityService.getIntegralCommunityTradeApplets(communityTradeDTO);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActProceedings.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActProceedings.java
new file mode 100644
index 0000000..3a9d2ea
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActProceedings.java
@@ -0,0 +1,26 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/proceedings")
+@Api(tags = "议事委员会")
+public class ComActProceedings {
+ @Resource
+ private CommunityService communityService;
+
+ @GetMapping("/list")
+ @ApiOperation("议事委员会列表")
+ public R list(@RequestParam("page")Integer page,@RequestParam("size")Integer size){
+ return communityService.proceedingsList(page,size ,null );
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActRaffleApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActRaffleApi.java
new file mode 100644
index 0000000..572bca7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActRaffleApi.java
@@ -0,0 +1,97 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 抽奖活动表(ComActRaffle)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:31:20
+ */
+@Slf4j
+@Api(tags = {"抽奖活动"})
+@RestController
+@RequestMapping("comActRaffle")
+public class ComActRaffleApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = ComActRaffleVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setType(1);
+ return this.communityService.selectAllComActRaffle(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation(value = "详情",response = ComActRaffleVO.class)
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.selectOneComActRaffle(id,this.getUserId());
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActRaffleVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation(value = "新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActRaffleVO comActRaffleVO) {
+ comActRaffleVO.setCommunityId(this.getCommunityId());
+ comActRaffleVO.setCreateBy(this.getUserId());
+ return this.communityService.insertComActRaffle(comActRaffleVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActRaffleVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation(value = "修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActRaffleVO comActRaffleVO) {
+ return this.communityService.updateComActRaffle(comActRaffleVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation(value = "删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.deleteComActRaffle(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActRaffleRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActRaffleRecordApi.java
new file mode 100644
index 0000000..ce24e63
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActRaffleRecordApi.java
@@ -0,0 +1,105 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
+import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * 抽奖活动中奖记录表(ComActRaffleRecord)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动中奖记录表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:32:02
+ */
+@Slf4j
+@Api(tags = {"获奖记录"})
+@RestController
+@RequestMapping("comActRaffleRecord")
+public class ComActRaffleRecordApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = ComActRaffleRecordVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.communityService.selectAllComActRaffleRecord(commonPage);
+ }
+ @ApiOperation(value = "根据抽奖活动id获取奖品统计")
+ @GetMapping("/queryPrize")
+ public R queryPrize(@RequestParam("id")Long id){
+ return this.communityService.queryPrize(id);
+ }
+
+ /**
+ * 生成二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @ApiOperation("生成二维码")
+ @PostMapping("/getQRCode")
+ public R getQRCode(@RequestBody QRCodeVO qrCodeVO){
+ return this.communityService.getRaffleQRCode(qrCodeVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActRaffleRecordVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("核销接口")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO) {
+ comActRaffleRecordVO.setStaffId(this.getUserId());
+ comActRaffleRecordVO.setStaffTime(new Date());
+ comActRaffleRecordVO.setStatus(2);
+ return this.communityService.updateRaffleRecord(comActRaffleRecordVO);
+ }
+ /**
+ * 新增数据
+ *
+ * @param comActRaffleRecordVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("参加活动")
+ @PostMapping
+ public R insert(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO) {
+ comActRaffleRecordVO.setCreateTime(new Date());
+ comActRaffleRecordVO.setUserId(this.getUserId());
+ comActRaffleRecordVO.setStatus(0);
+ return communityService.insertRaffleRecord(comActRaffleRecordVO);
+ }
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("详情")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.selectOneRaffleRecord(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialMemberApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialMemberApi.java
new file mode 100644
index 0000000..927e5aa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialMemberApi.java
@@ -0,0 +1,92 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.ComActSocialMemberVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 社会组织成员表(ComActSocialMember)表控制层
+ *
+ * @author makejava
+ * @since 2021-10-22 09:52:47
+ */
+@Slf4j
+@Api(tags = {"社会组织成员"})
+@RestController
+@RequestMapping("comActSocialMember")
+public class ComActSocialMemberApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询所有数据",response = ComActSocialMemberVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.communityService.comActSocialMemberSelectAll(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("详情")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.comActSocialMemberSelectOne(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActSocialMemberVO comActSocialMember) {
+ return this.communityService.comActSocialMemberInsert(comActSocialMember);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialMemberVO comActSocialMember) {
+ return this.communityService.comActSocialMemberUpdate(comActSocialMember);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.comActSocialMemberDelete(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialOrgApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialOrgApi.java
new file mode 100644
index 0000000..e552177
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialOrgApi.java
@@ -0,0 +1,105 @@
+package com.panzhihua.applets.api;
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
+import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+
+/**
+ * @author zzj
+ */
+@Slf4j
+@Api(tags = {"社会组织"})
+@RestController
+@RequestMapping("/comActSocialOrg")
+public class ComActSocialOrgApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "社会组织列表", response = ComActSocialOrgVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ LoginUserInfoVO loginUserInfoSureNoLogin = this.getLoginUserInfoSureNoLogin();
+ if (nonNull(loginUserInfoSureNoLogin)) {
+ commonPage.setCommunityId(loginUserInfoSureNoLogin.getCommunityId());
+ } else if (isNull(commonPage.getCommunityId())) {
+ return R.fail("缺少社区id");
+ }
+ R r = communityService.detailCommunity(commonPage.getCommunityId());
+ if (R.isOk(r)) {
+ ComActVO comActVO = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), ComActVO.class);
+ if (comActVO != null) {
+ commonPage.setStreetId(comActVO.getStreetId());
+ }
+ }
+ commonPage.setCommunityId(null);
+ return this.communityService.comActSocialOrgSelectAll(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("通过主键查询单条数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id){
+ return this.communityService.comActSocialOrgSelectOne(id);
+ }
+ /**
+ * 新增数据
+ *
+ * @param comActSocialOrg 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增社会组织")
+ @PostMapping
+ public R insert(@RequestBody ComActSocialOrgVO comActSocialOrg) {
+ comActSocialOrg.setCommunityId(this.getCommunityId());
+ return this.communityService.comActSocialOrgInsert(comActSocialOrg);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialOrg 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改社会组织")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialOrgVO comActSocialOrg) {
+ return this.communityService.comActSocialOrgUpdate(comActSocialOrg);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除社会组织")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.comActSocialOrgDelete(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialOrgHatchAuditApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialOrgHatchAuditApi.java
new file mode 100644
index 0000000..e2994db
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialOrgHatchAuditApi.java
@@ -0,0 +1,72 @@
+package com.panzhihua.applets.api;
+
+
+import javax.annotation.Resource;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.social.HatchAuditProcessDTO;
+import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchAuditDTO;
+import com.panzhihua.common.model.dtos.community.social.SocialOrgHatchAuditDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.social.SocialOrgHatchAuditVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @title: ComActSocialOrgHatchAuditApi
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 社会组织孵化申请相关
+ * @author: hans
+ * @date: 2022/04/18 14:14
+ */
+@Slf4j
+@Api(tags = {"社会组织孵化申请"})
+@RestController
+@RequestMapping("/comActSocialOrgHatchAudit")
+public class ComActSocialOrgHatchAuditApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "新增孵化申请")
+ @PostMapping("/add")
+ public R addHatchAudit(@RequestBody SocialOrgHatchAuditDTO hatchAuditDTO) {
+ hatchAuditDTO.setUserId(this.getUserId());
+ return communityService.addHatchAudit(hatchAuditDTO);
+ }
+
+ @ApiOperation(value = "查看孵化申请审核进度", response = SocialOrgHatchAuditVO.class)
+ @GetMapping("/schedule")
+ public R getHatchAuditSchedule() {
+ return communityService.getHatchAuditSchedule(this.getUserId());
+ }
+
+ @ApiOperation(value = "修改孵化申请")
+ @PostMapping("/update")
+ public R updateHatchAudit(@RequestBody @Validated(PutGroup.class) SocialOrgHatchAuditDTO hatchAuditDTO) {
+ return communityService.updateHatchAudit(hatchAuditDTO);
+ }
+
+ @ApiOperation(value = "获取孵化流程配置", response = String.class)
+ @GetMapping("/process")
+ public R getHatchAuditProcess() {
+ return communityService.getHatchAuditProcess();
+ }
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectApi.java
new file mode 100644
index 0000000..4393699
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectApi.java
@@ -0,0 +1,135 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.social.PageProjectSignListDTO;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
+import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+
+/**
+ * 三社联动项目表(ComActSocialProject)表控制层
+ *
+ * @author zzj
+ * @since 2021-12-22 14:02:48
+ */
+@Slf4j
+@Api(tags = {"项目管理"})
+@RestController
+@RequestMapping("comActSocialProject")
+public class ComActSocialProjectApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询接口",response =SocialProjectVO.class )
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ LoginUserInfoVO loginUserInfoSureNoLogin = this.getLoginUserInfoSureNoLogin();
+ if (nonNull(loginUserInfoSureNoLogin)) {
+ commonPage.setCommunityId(loginUserInfoSureNoLogin.getCommunityId());
+ commonPage.setStreetId(loginUserInfoSureNoLogin.getStreetId());
+ } else if (isNull(commonPage.getCommunityId())) {
+ return R.fail("缺少社区id");
+ }
+ commonPage.setParamId2(0);
+// commonPage.setIsPublicity(1);
+ return communityService.selectAllComActSocialProject(commonPage);
+ }
+
+ /**
+ * 平台详情接口
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation(value = "平台详情接口",response =SocialProjectVO.class )
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ LoginUserInfoVO userInfo = this.getLoginUserInfoSureNoLogin();
+ Long userId = null;
+ if (nonNull(userInfo)) {
+ userId = userInfo.getUserId();
+ }
+ return communityService.getAppletComActSocialProject(id, userId);
+ }
+ /**
+ * 根据项目id分页获取关联项目
+ */
+ @ApiOperation(value = "根据项目id分页获取关联项目")
+ @PostMapping("/getRelation")
+ public R getRelation(@RequestBody CommonPage commonPage){
+ return communityService.getRelationComActSocialProject(commonPage);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param socialProjectVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation(value = "新增数据")
+ @PostMapping
+ public R insert(@RequestBody SocialProjectVO socialProjectVO) {
+ return communityService.insertComActSocialProject(socialProjectVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param socialProjectVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation(value = "修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody SocialProjectVO socialProjectVO) {
+ return communityService.updateComActSocialProject(socialProjectVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation(value = "删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return communityService.deleteComActSocialProject(id);
+ }
+
+ @ApiOperation(value = "项目公开报名")
+ @ApiImplicitParam(name = "projectId", value = "项目id", required = true)
+ @GetMapping("/sign")
+ public R signProject(@RequestParam("projectId") Long projectId) {
+ return communityService.signProject(projectId, this.getUserId());
+ }
+
+ @ApiOperation(value = "分页查询项目报名列表", response = ComActSocialOrgVO.class)
+ @PostMapping("signList")
+ public R pageProjectSignList(@RequestBody @Valid PageProjectSignListDTO pageProjectSignListDTO) {
+ return communityService.pageProjectSignList(pageProjectSignListDTO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectMemberApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectMemberApi.java
new file mode 100644
index 0000000..3769b77
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectMemberApi.java
@@ -0,0 +1,91 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 项目人员(ComActSocialProjectMember)表控制层
+ *
+ * @author makejava
+ * @since 2021-12-23 15:16:43
+ */
+@Slf4j
+@Api(tags = {"项目成员管理"})
+@RestController
+@RequestMapping("comActSocialProjectMember")
+public class ComActSocialProjectMemberApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation("分页查询所有数据")
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return communityService.selectAllComActSocialProjectMember(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("通过主键查询单条数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return communityService.selectOneComActSocialProjectMember(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectMemberVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
+ return communityService.insertComActSocialProjectMember(comActSocialProjectMemberVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectMemberVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
+ return communityService.updateComActSocialProjectMember(comActSocialProjectMemberVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return communityService.deleteComActSocialProjectMember(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectPublicityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectPublicityApi.java
new file mode 100644
index 0000000..aad7e21
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectPublicityApi.java
@@ -0,0 +1,114 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+
+/**
+ * 项目宣传表(ComActSocialProjectPublicity)表控制层
+ *
+ * @author makejava
+ * @since 2021-12-23 14:30:55
+ */
+@Slf4j
+@Api(tags = {"项目宣传管理"})
+@RestController
+@RequestMapping("comActSocialProjectPublicity")
+public class ComActSocialProjectPublicityApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = ComActSocialProjectPublicityVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ LoginUserInfoVO loginUserInfoSureNoLogin = this.getLoginUserInfoSureNoLogin();
+ if (nonNull(loginUserInfoSureNoLogin)) {
+ commonPage.setCommunityId(loginUserInfoSureNoLogin.getCommunityId());
+ } else if (isNull(commonPage.getCommunityId())) {
+ return R.fail("缺少社区id");
+ }
+ return communityService.selectAllComActSocialProjectPublicity(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("通过主键查询单条数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return communityService.selectOneComActSocialProjectPublicity(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectPublicityVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO) {
+ return communityService.insertComActSocialProjectPublicity(comActSocialProjectPublicityVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectPublicityVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO) {
+ return communityService.updateComActSocialProjectPublicity(comActSocialProjectPublicityVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return communityService.deleteComActSocialProjectPublicity(id);
+ }
+ /**
+ * 多条删除数据
+ *
+ * @param ids 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("多条删除数据")
+ @PostMapping("delBatch")
+ public R delBatch(@RequestBody List<Long> ids) {
+ return communityService.delBatchComActSocialProjectPublicity(ids);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectScheduleApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectScheduleApi.java
new file mode 100644
index 0000000..e026c6f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectScheduleApi.java
@@ -0,0 +1,91 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectScheduleVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 项目进度表(ComActSocialProjectSchedule)表控制层
+ *
+ * @author makejava
+ * @since 2021-12-23 14:31:16
+ */
+@Slf4j
+@Api(tags = {"项目进度管理"})
+@RestController
+@RequestMapping("comActSocialProjectSchedule")
+public class ComActSocialProjectScheduleApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 根据projectId查询所有进度
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation("分页查询")
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return communityService.selectAllComActSocialProjectSchedule(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("通过主键查询单条数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return communityService.selectOneComActSocialProjectSchedule(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectScheduleVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO) {
+ return communityService.insertComActSocialProjectSchedule(comActSocialProjectScheduleVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectScheduleVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO) {
+ return communityService.updateComActSocialProjectSchedule(comActSocialProjectScheduleVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return communityService.deleteComActSocialProjectSchedule(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java
new file mode 100644
index 0000000..c9d9680
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java
@@ -0,0 +1,147 @@
+package com.panzhihua.applets.api;
+
+import com.alibaba.excel.EasyExcel;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.listen.ComActSocialWorkerExcelListen;
+import com.panzhihua.common.model.dtos.civil.*;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
+import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ClazzUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.io.InputStream;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-03
+ * */
+@Slf4j
+@RestController
+@RequestMapping("/comactsocialworker")
+@Api(tags = {"社工"})
+public class ComActSocialWorkerApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+// @Value("${excel.comactsocialworkerUrl}")
+// private String comactsocialworkerUrl;
+ /**
+ * 新增社工
+ * @param {classNameFirstLower}AddDTO 添加社工传递对象
+ * @return 新增结果
+ */
+ @PostMapping()
+ @ApiOperation(value = "新增社工", response = R.class)
+ R add(@Validated @RequestBody ComActSocialWorkerAddDTO comActSocialWorkerAddDTO){
+ ClazzUtils.setIfStringIsEmpty(comActSocialWorkerAddDTO);
+ comActSocialWorkerAddDTO.setUserId(getUserId());
+ comActSocialWorkerAddDTO.setCommunityId(getCommunityId());
+ return communityService.addComactsocialworker(comActSocialWorkerAddDTO);
+ }
+
+ /**
+ * 修改
+ * @param comActSocialWorkerEditDTO 修改社工传递对象
+ * @return 修改结果
+ */
+ @PutMapping()
+ @ApiOperation(value = "编辑社工", response = R.class)
+ R edit(@Validated @RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO){
+ comActSocialWorkerEditDTO.setUserId(getUserId());
+ return communityService.editComactsocialworker(comActSocialWorkerEditDTO);
+ }
+
+ /**
+ * 分页查找
+ * @param pageComActSocialWorkerDTO 查找社工传递对象
+ * @return 查找结果
+ */
+ @GetMapping()
+ @ApiOperation(value = "查询社工", response= ComActSocialWorkerVO.class)
+ R query(@Validated @ModelAttribute PageComActSocialWorkerDTO pageComActSocialWorkerDTO){
+ ClazzUtils.setIfStringIsEmpty(pageComActSocialWorkerDTO);
+ LoginUserInfoVO loginUserInfoSureNoLogin = this.getLoginUserInfoSureNoLogin();
+ if (nonNull(loginUserInfoSureNoLogin)) {
+ pageComActSocialWorkerDTO.setCommunityId(loginUserInfoSureNoLogin.getCommunityId());
+ } else if (isNull(pageComActSocialWorkerDTO.getCommunityId())) {
+ return R.fail("缺少社区id");
+ }
+ return communityService.queryComactsocialworker(pageComActSocialWorkerDTO);
+ }
+
+ /**
+ * 删除
+ * @param comActSocialWorkerDeleteDTO 删除社工传递对象
+ * @return 删除结果
+ */
+ @DeleteMapping()
+ @ApiOperation(value = "删除社工", response = R.class)
+ R delete(@Validated @RequestBody ComActSocialWorkerDeleteDTO comActSocialWorkerDeleteDTO){
+ ClazzUtils.setIfStringIsEmpty(comActSocialWorkerDeleteDTO);
+ return communityService.deleteComactsocialworker(comActSocialWorkerDeleteDTO);
+ }
+
+ /**
+ * 查询社工详细信息
+ * @param id 社工 id
+ * @return 查找结果
+ */
+ @GetMapping("/{id}")
+ @ApiOperation(value = "查询社工详细信息")
+ R<ComActSocialWorkerVO> details(@PathVariable("id") Long id){
+ return communityService.comActSocialWorkerDetails(id);
+ }
+
+ /**
+ * 导入社工名单
+ * @return
+ */
+ @ApiOperation(value = "导入社工名单")
+ @PostMapping(value = "/import", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+ public R downloadTemplate(@RequestParam MultipartFile file, HttpServletRequest request) {
+ String fileName = file.getOriginalFilename(); //获取文件名
+ log.info("传入文件名字【{}】",fileName);
+ InputStream inputStream = null;
+ try {
+ inputStream = file.getInputStream();
+ EasyExcel.read(inputStream, ComActSocialWorkerExcelVO.class, new ComActSocialWorkerExcelListen(communityService,this.getCommunityId())).sheet().doRead();
+ } catch (IOException e) {
+ e.printStackTrace();
+ log.error("导入模板失败【{}】", e.getMessage());
+ return R.fail("信息有误");
+ }
+ return R.ok();
+ }
+
+
+ // @GetMapping("/getTemplate")
+// @ApiOperation("获取模板")
+// public R getTemplate(){
+// return R.ok(comactsocialworkerUrl);
+// }
+ @ApiOperation("根据社工获取活动")
+ @PostMapping("/activityList")
+ R activityList(@RequestBody CommonPage commonPage){
+ return communityService.activityList(commonPage);
+ }
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerServiceApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerServiceApi.java
new file mode 100644
index 0000000..6ddd83b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerServiceApi.java
@@ -0,0 +1,70 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.social.ComActSocialWorkerServiceVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 社工服务表(ComActSocialWorkerService)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 社工服务表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-16 15:59:42
+ */
+@RestController
+@RequestMapping("comActSocialWorkerService")
+@Api(tags = {"社工服务"})
+public class ComActSocialWorkerServiceApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = ComActSocialWorkerServiceVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setUserId(this.getUserId());
+ return this.communityService.selectAllComActSocialWorkerService(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation(value = "分页查询",response = ComActSocialWorkerServiceVO.class)
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.selectOneComActSocialWorkerService(id);
+ }
+
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialWorkerServiceVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialWorkerServiceVO comActSocialWorkerServiceVO) {
+ return communityService.updateComActSocialWorkerService(comActSocialWorkerServiceVO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseApplyApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseApplyApi.java
new file mode 100644
index 0000000..5d97c50
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseApplyApi.java
@@ -0,0 +1,135 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.warehouse.ApplyStatistics;
+import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyVO;
+import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * 物品申请表(ComActWarehouseApply)表控制层
+ *
+ * @author makejava
+ * @since 2021-10-09 17:13:53
+ */
+@Slf4j
+@Api(tags = {"爱心义仓申领记录接口"})
+@RestController
+@RequestMapping("comActWarehouseApply")
+public class ComActWarehouseApplyApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询所有数据",response = ComActWarehouseApplyVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setParamId(this.getCommunityId());
+ return this.communityService.comActWarehouseApplySelectAll(commonPage);
+ }
+
+ /**
+ * 统计查询
+ *
+ * @return 所有数据
+ */
+ @ApiOperation(value = "统计查询",response = ApplyStatistics.class)
+ @GetMapping("selectStatics")
+ public R selectAll() {
+ return this.communityService.comActWarehouseApplySelectAll(this.getCommunityId());
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation(value = "通过主键查询单条数据",response = ComActWarehouseApplyVO.class)
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Integer id) {
+ return this.communityService.comActWarehouseApplySelectOne(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActWarehouseApply 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActWarehouseApplyVO comActWarehouseApply) {
+ comActWarehouseApply.setCommunityId(this.getCommunityId());
+ comActWarehouseApply.setCreateTime(new Date());
+ comActWarehouseApply.setApplyUserId(this.getUserId());
+ comActWarehouseApply.setStatus(ComActWarehouseApplyVO.status.dcl);
+ comActWarehouseApply.setApplyName(this.getLoginUserInfo().getName()!=null?this.getLoginUserInfo().getName():"");
+ comActWarehouseApply.setApplyPhone(this.getLoginUserInfo().getPhone()!=null?this.getLoginUserInfo().getPhone():"");
+ return this.communityService.comActWarehouseApplyInsert(comActWarehouseApply);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActWarehouseApply 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActWarehouseApplyVO comActWarehouseApply) {
+ if(comActWarehouseApply.getStatus().equals(ComActWarehouseApplyVO.status.yqx)){
+ comActWarehouseApply.setCancelTime(new Date());
+ }
+ if(comActWarehouseApply.getStatus().equals(ComActWarehouseApplyVO.status.dlq)||comActWarehouseApply.getStatus().equals(ComActWarehouseApplyVO.status.ybh)){
+ comActWarehouseApply.setSolveTime(new Date());
+ comActWarehouseApply.setSolveUserId(this.getUserId());
+ }
+ if(comActWarehouseApply.getStatus().equals(ComActWarehouseApplyVO.status.ylq)){
+ comActWarehouseApply.setActualTime(new Date());
+ comActWarehouseApply.setWriteOffUserId(this.getUserId());
+ }
+ return this.communityService.comActWarehouseApplyUpdate(comActWarehouseApply);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.comActWarehouseApplyDelete(id);
+ }
+
+ /**
+ * 生成二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @ApiOperation("生成二维码")
+ @PostMapping("/getQRCode")
+ public R getQRCode(@RequestBody QRCodeVO qrCodeVO){
+ return this.communityService.comActWarehouseApplyGetQRCode(qrCodeVO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseBaseApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseBaseApi.java
new file mode 100644
index 0000000..6f0e450
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseBaseApi.java
@@ -0,0 +1,43 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseBaseVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 义仓基础设置表(ComActWarehouseBase)表控制层
+ *
+ * @author makejava
+ * @since 2021-10-11 09:21:53
+ */
+@Slf4j
+@Api(tags = {"爱心义仓基础记录接口"})
+@RestController
+@RequestMapping("comActWarehouseBase")
+public class ComActWarehouseBaseApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 通过社区id查询单条数据
+ *
+ * @return 单条数据
+ */
+ @ApiOperation(value = "查询单条数据",response = ComActWarehouseBaseVO.class)
+ @GetMapping
+ public R selectOne() {
+ return this.communityService.comActWarehouseBaseSelectOne(this.getCommunityId());
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseDonatesApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseDonatesApi.java
new file mode 100644
index 0000000..59c7517
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseDonatesApi.java
@@ -0,0 +1,126 @@
+package com.panzhihua.applets.api;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.panzhihua.common.constants.HttpStatus;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseDonatesDTO;
+import com.panzhihua.common.model.dtos.community.warehouse.PageDonatesDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseDonatesVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @title: ComActWarehouseApi
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 爱心义仓捐赠小程序相关接口
+ * @author: hans
+ * @date: 2021/10/11 15:45
+ */
+
+@Slf4j
+@Api(tags = {"爱心义仓捐赠相关"})
+@RestController
+@RequestMapping("/warehouse/donates")
+public class ComActWarehouseDonatesApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "分页查询捐赠物品", response = ComActWarehouseDonatesVO.class)
+ @PostMapping("/page")
+ public R pageDonates(@RequestBody PageDonatesDTO pageDonatesDTO) {
+ LoginUserInfoVO loginUserInfo = getLoginUserInfoSureNoLogin();
+ Integer isWhich = pageDonatesDTO.getIsWhich();
+ if (isNull(isWhich)) {
+ return R.fail("缺少isWhich参数");
+ }
+ if (isNull(pageDonatesDTO.getCommunityId())) {
+ return R.fail("社区id不能为空");
+ }
+ if (isNull(loginUserInfo) && isWhich.intValue() != 3) {
+ return R.fail(HttpStatus.UNAUTHORIZED, "未登录");
+ }
+ if (isWhich.intValue() == 2 && loginUserInfo.getIsCommunityWorker().intValue() != 1) {
+ return R.fail("非社区工作人员");
+ }
+ if (nonNull(loginUserInfo)) {
+ pageDonatesDTO.setUserId(loginUserInfo.getUserId());
+ }
+ return communityService.pageDonates(pageDonatesDTO);
+ }
+
+ @ApiOperation(value = "新增物品捐赠")
+ @PostMapping("/add")
+ public R addDonates(@RequestBody @Validated(AddGroup.class) ComActWarehouseDonatesDTO comActWarehouseDonatesDTO) {
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ comActWarehouseDonatesDTO.setCommunityId(loginUserInfo.getCommunityId());
+ comActWarehouseDonatesDTO.setRegisterBy(userId);
+ comActWarehouseDonatesDTO.setUserId(userId);
+ comActWarehouseDonatesDTO.setName(loginUserInfo.getName());
+ comActWarehouseDonatesDTO.setPhone(loginUserInfo.getPhone());
+ return communityService.addDonates(comActWarehouseDonatesDTO);
+ }
+
+ @ApiOperation(value = "查看物品捐赠详情", response = ComActWarehouseDonatesVO.class)
+ @ApiImplicitParam(name = "isWhich", value = "1.个人中心捐赠详情 2.捐赠物品管理详情 3.爱心义仓捐赠列表详情", required = true)
+ @GetMapping("/get")
+ public R getDonates(@RequestParam("donatesId") Long donatesId, @RequestParam("isWhich") Integer isWhich) {
+ LoginUserInfoVO loginUserInfo = getLoginUserInfoSureNoLogin();
+ if (isNull(isWhich)) {
+ return R.fail("缺少isWhich参数");
+ }
+ if (isNull(loginUserInfo) && isWhich.intValue() != 3) {
+ return R.fail(HttpStatus.UNAUTHORIZED, "未登录");
+ }
+ if (isWhich.intValue() == 2 && loginUserInfo.getIsCommunityWorker().intValue() != 1) {
+ return R.fail("非社区工作人员");
+ }
+ Long userId = 0L;
+ if (nonNull(loginUserInfo)) {
+ userId = loginUserInfo.getUserId();
+ }
+ return communityService.getDonates(donatesId, isWhich, userId);
+ }
+
+ @ApiOperation(value = "捐赠物品签收")
+ @PostMapping("/signing")
+ public R signingDonates(@RequestBody @Validated(PutGroup.class) ComActWarehouseDonatesDTO comActWarehouseDonatesDTO) {
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ Integer isCommunityWorker = loginUserInfo.getIsCommunityWorker();
+ if (isCommunityWorker.intValue() == 2) {
+ return R.fail("非社区工作人员");
+ }
+ comActWarehouseDonatesDTO.setSigningBy(loginUserInfo.getUserId());
+ return communityService.signingDonates(comActWarehouseDonatesDTO);
+ }
+
+ @ApiOperation(value = "用户取消捐赠")
+ @GetMapping("/cancel")
+ public R cancelDonates(@RequestParam("donatesId") Long donatesId) {
+ return communityService.cancelDonates(donatesId, getUserId());
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseOperationApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseOperationApi.java
new file mode 100644
index 0000000..4b6b3c7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseOperationApi.java
@@ -0,0 +1,46 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseBaseVO;
+import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseOperationVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 义仓基础设置表(ComActWarehouseBase)表控制层
+ *
+ * @author makejava
+ * @since 2021-10-11 09:21:53
+ */
+@Slf4j
+@Api(tags = {"爱心义仓爱心接力接口"})
+@RestController
+@RequestMapping("comActWarehouseOperation")
+public class ComActWarehouseOperationApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页
+ *
+ * @return
+ */
+ @ApiOperation(value = "分页",response = ComActWarehouseOperationVO.class)
+ @PostMapping("queryAll")
+ public R queryAll(@RequestBody CommonPage commonPage) {
+ commonPage.setCommunityId(this.getCommunityId());
+ return this.communityService.comActWarehouseOperationSelectAll(commonPage);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComAreaTownCommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComAreaTownCommunityApi.java
new file mode 100644
index 0000000..70eb01a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComAreaTownCommunityApi.java
@@ -0,0 +1,36 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.acid.ComAreaCounty;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * (ComAreaTownCommunity)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 相关功能
+ *
+ * @author zzj
+ * @since 2022-04-10 17:37:33
+ */
+@Api(tags = {"区县联动列表"})
+@RestController
+@RequestMapping("comAreaTownCommunity")
+public class ComAreaTownCommunityApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+ @ApiOperation(value = "列表查询",response = ComAreaCounty.class)
+ @GetMapping("/areaTownCommunity")
+ public R test(){
+ return communityService.areaTownCommunity("panzhihua",this.getUserId());
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java
new file mode 100644
index 0000000..665b19a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java
@@ -0,0 +1,177 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComBatteryCommodityActivityVo;
+import com.panzhihua.common.model.vos.common.ComBatteryCommodityOrderBargainVo;
+import com.panzhihua.common.model.vos.common.ComBatteryCommodityOrderCollageTeamVo;
+import com.panzhihua.common.service.community.ComBatteryCommodityActivityFeign;
+import com.panzhihua.common.service.community.ComBatteryCommodityOrderCollageTeamFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * title: 电动车商城-商家活动表(ComBatteryCommodityActivity) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-商家活动表
+ *
+ * @author lyq
+ * @date 2022-03-29 13:17:38
+ */
+@Slf4j
+@Api(tags = {"电动车商城-活动管理"})
+@RestController
+@RequestMapping("/comBatteryCommodityActivity")
+public class ComBatteryCommodityActivityApi extends BaseController {
+
+ @Resource
+ private ComBatteryCommodityActivityFeign comBatteryCommodityActivityService;
+ @Resource
+ private ComBatteryCommodityOrderCollageTeamFeign orderCollageTeamService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryCommodityActivity 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-03-29 13:17:38
+ */
+ @ApiOperation(value = "分页查询活动列表",response = ComBatteryCommodityActivityVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComBatteryCommodityActivityDto comBatteryCommodityActivity) {
+ comBatteryCommodityActivity.setIsApplets(1);
+ if(comBatteryCommodityActivity.getIsUser().equals(1)){
+ comBatteryCommodityActivity.setUserId(this.getUserId());
+ }
+ return this.comBatteryCommodityActivityService.queryByPage(comBatteryCommodityActivity);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-29 13:17:38
+ */
+ @ApiOperation(value = "查询活动详情",response = ComBatteryCommodityActivityVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ Long userId = 0L;
+ if(loginUserInfo != null){
+ userId = loginUserInfo.getUserId();
+ }
+ return this.comBatteryCommodityActivityService.detailById(id,userId);
+ }
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comBatteryCommodityActivity 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-03-29 13:17:38
+ */
+ @ApiOperation(value = "查询活动列表",response = ComBatteryCommodityActivityVo.class)
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComBatteryCommodityActivityDto comBatteryCommodityActivity) {
+ comBatteryCommodityActivity.setIsApplets(1);
+ return this.comBatteryCommodityActivityService.queryByList(comBatteryCommodityActivity);
+ }
+
+ @ApiOperation(value = "查询拼团团队列表",response = ComBatteryCommodityOrderCollageTeamVo.class)
+ @PostMapping("/assorted/dough")
+ public R queryByAssortedDoughList(@RequestBody PageComBatteryCommodityOrderCollageTeamDto orderCollageTeamDto) {
+ orderCollageTeamDto.setStatus(1);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ orderCollageTeamDto.setUserId(loginUserInfo.getUserId());
+ }
+ return this.orderCollageTeamService.queryByPage(orderCollageTeamDto);
+ }
+
+ @ApiOperation(value = "查询拼团团队详情",response = ComBatteryCommodityOrderCollageTeamVo.class)
+ @GetMapping("/assorted/dough/detail")
+ public R queryByAssortedDoughDetail(@RequestParam("id") Long id) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ Long userId = 0L;
+ if(loginUserInfo != null){
+ userId = loginUserInfo.getUserId();
+ }
+ return this.orderCollageTeamService.detailById(id,userId);
+ }
+
+ /**
+ * 创建拼团订单
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @ApiOperation(value = "创建拼团订单")
+ @PostMapping("/start/fight")
+ public R startFight(@RequestBody StartFightOrderDto orderDto){
+ orderDto.setUserId(this.getUserId());
+ return this.comBatteryCommodityActivityService.startFight(orderDto);
+ }
+
+ /**
+ * 创建砍价订单
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @ApiOperation(value = "创建砍价订单")
+ @PostMapping("/start/bargain")
+ public R startBargain(@RequestBody StartBargainOrderDto orderDto){
+ orderDto.setUserId(this.getUserId());
+ return this.comBatteryCommodityActivityService.startBargain(orderDto);
+ }
+
+ /**
+ * 帮好友砍价
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @ApiOperation(value = "帮好友砍价")
+ @PostMapping("/start/user/bargain")
+ public R startUserBargain(@RequestBody StartUserBargainOrderDto orderDto){
+ orderDto.setUserId(this.getUserId());
+ return this.comBatteryCommodityActivityService.startUserBargain(orderDto);
+ }
+
+ /**
+ * 查询砍价记录详情
+ * @param id 砍价记录id
+ * @return 创建订单结果
+ */
+ @ApiOperation(value = "查询砍价记录详情",response = ComBatteryCommodityOrderBargainVo.class)
+ @GetMapping("/user/bargain")
+ public R getUserBargain(@RequestParam("id") Long id){
+ return this.comBatteryCommodityActivityService.getUserBargain(id);
+ }
+
+ /**
+ * 创建秒杀订单
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @ApiOperation(value = "创建秒杀订单")
+ @PostMapping("/start/seckill")
+ public R startSeckill(@RequestBody StartSeckillOrderDto orderDto){
+ orderDto.setUserId(this.getUserId());
+ return this.comBatteryCommodityActivityService.startSeckill(orderDto);
+ }
+
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityApi.java
new file mode 100644
index 0000000..7bd498f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityApi.java
@@ -0,0 +1,89 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.AddComBatteryCommodityDto;
+import com.panzhihua.common.model.dtos.common.EditComBatteryCommodityDto;
+import com.panzhihua.common.model.dtos.common.PageComBatteryCommodityDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComBatteryCommodityVo;
+import com.panzhihua.common.service.community.ComBatteryCommodityFeign;
+import com.panzhihua.common.service.community.ComBatteryCommoditySpecsFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * title: 电动车商城-商品表(ComBatteryCommodity) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-商品表
+ *
+ * @author lyq
+ * @date 2022-03-28 14:59:58
+ */
+@Slf4j
+@Api(tags = {"电动车商城-商品管理"})
+@RestController
+@RequestMapping("/comBatteryCommodity")
+public class ComBatteryCommodityApi extends BaseController {
+
+ @Resource
+ private ComBatteryCommodityFeign comBatteryCommodityService;
+ @Resource
+ private ComBatteryCommoditySpecsFeign comBatteryCommoditySpecsService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryCommodity 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-03-28 14:59:58
+ */
+ @ApiOperation(value = "分页查询商品列表",response = ComBatteryCommodityVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComBatteryCommodityDto comBatteryCommodity) {
+ return this.comBatteryCommodityService.queryByPage(comBatteryCommodity);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-28 14:59:58
+ */
+ @ApiOperation(value = "查询商品详情",response = ComBatteryCommodityVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comBatteryCommodityService.detailById(id);
+ }
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comBatteryCommodity 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-03-28 14:59:58
+ */
+ @ApiOperation(value = "查询商品列表",response = ComBatteryCommodityVo.class)
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComBatteryCommodityDto comBatteryCommodity) {
+ comBatteryCommodity.setStoreId(this.getCommunityId());
+ return this.comBatteryCommodityService.queryByList(comBatteryCommodity);
+ }
+
+ @ApiOperation(value = "查询商品规格详情",response = ComBatteryCommodityVo.class)
+ @GetMapping("/specs/detail")
+ public R specsDetailById(@RequestParam("id") Long id) {
+ return this.comBatteryCommoditySpecsService.detailById(id);
+ }
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityOrderApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityOrderApi.java
new file mode 100644
index 0000000..43762c7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityOrderApi.java
@@ -0,0 +1,81 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.EditOrderAddressDto;
+import com.panzhihua.common.model.dtos.common.EditOrderLogisticsDto;
+import com.panzhihua.common.model.dtos.common.PageComBatteryCommodityOrderDto;
+import com.panzhihua.common.model.dtos.common.UserCreateOrderDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComBatteryCommodityOrderVo;
+import com.panzhihua.common.service.community.ComBatteryCommodityOrderFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * title: 电动车商城-订单表(ComBatteryCommodityOrder) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-订单表
+ *
+ * @author lyq
+ * @date 2022-03-29 16:05:04
+ */
+@Slf4j
+@Api(tags = {"电动车商城-订单管理"})
+@RestController
+@RequestMapping("/comBatteryCommodityOrder")
+public class ComBatteryCommodityOrderApi extends BaseController {
+
+ @Resource
+ private ComBatteryCommodityOrderFeign comBatteryCommodityOrderService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryCommodityOrder 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-03-29 16:05:04
+ */
+ @ApiOperation(value = "分页查询订单列表",response = ComBatteryCommodityOrderVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComBatteryCommodityOrderDto comBatteryCommodityOrder) {
+ comBatteryCommodityOrder.setUserId(this.getUserId());
+ comBatteryCommodityOrder.setIsApplets(1);
+ return this.comBatteryCommodityOrderService.queryByPage(comBatteryCommodityOrder);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-29 16:05:04
+ */
+ @ApiOperation(value = "查询订单详情",response = ComBatteryCommodityOrderVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comBatteryCommodityOrderService.detailById(id);
+ }
+
+ @ApiOperation(value = "创建订单")
+ @PostMapping("/create")
+ public R appletsOrderCreate(@RequestBody UserCreateOrderDto createOrderDto) {
+ createOrderDto.setUserId(this.getUserId());
+ return this.comBatteryCommodityOrderService.appletsOrderCreate(createOrderDto);
+ }
+
+
+ @ApiOperation(value = "用户确认收货")
+ @GetMapping("/receiving")
+ public R appletsOrderReceiving(@RequestParam("id") Long id){
+ return this.comBatteryCommodityOrderService.appletsOrderReceiving(id,this.getUserId());
+ }
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryStoreApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryStoreApi.java
new file mode 100644
index 0000000..4979515
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryStoreApi.java
@@ -0,0 +1,49 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.EditComBatteryStoreDto;
+import com.panzhihua.common.model.dtos.common.PageComBatteryStoreDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComBatteryStoreVo;
+import com.panzhihua.common.service.community.ComBatteryStoreFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * title: 电动车商城-商家表(ComBatteryStore) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-商家表
+ *
+ * @author lyq
+ * @date 2022-03-28 13:44:43
+ */
+@Slf4j
+@Api(tags = {"电动车商城-商家管理"})
+@RestController
+@RequestMapping("/comBatteryStore")
+public class ComBatteryStoreApi extends BaseController {
+
+ @Resource
+ private ComBatteryStoreFeign comBatteryStoreService;
+
+ @ApiOperation(value = "分页查询商家列表",response = ComBatteryStoreVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComBatteryStoreDto comBatteryStore) {
+ return this.comBatteryStoreService.queryByPage(comBatteryStore);
+ }
+
+ @ApiOperation(value = "查询商家详情",response = ComBatteryStoreVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comBatteryStoreService.detailById(id);
+ }
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryStoreClassApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryStoreClassApi.java
new file mode 100644
index 0000000..c616907
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryStoreClassApi.java
@@ -0,0 +1,82 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.AddComBatteryStoreClassDto;
+import com.panzhihua.common.model.dtos.common.EditComBatteryStoreClassDto;
+import com.panzhihua.common.model.dtos.common.PageComBatteryStoreClassDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComBatteryStoreClassVo;
+import com.panzhihua.common.service.community.ComBatteryStoreClassFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * title: 电动车商城-商家分类表(ComBatteryStoreClass) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-商家分类表
+ *
+ * @author lyq
+ * @date 2022-03-29 11:01:55
+ */
+@Slf4j
+@Api(tags = {"电动车商城-商家分类管理"})
+@RestController
+@RequestMapping("/comBatteryStoreClass")
+public class ComBatteryStoreClassApi extends BaseController {
+
+ @Resource
+ private ComBatteryStoreClassFeign comBatteryStoreClassService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryStoreClass 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-03-29 11:01:55
+ */
+ @ApiOperation(value = "分页查询商家分类列表",response = ComBatteryStoreClassVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComBatteryStoreClassDto comBatteryStoreClass) {
+ comBatteryStoreClass.setStatus(1);
+ return this.comBatteryStoreClassService.queryByPage(comBatteryStoreClass);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-29 11:01:55
+ */
+ @ApiOperation(value = "查询商家分类详情",response = ComBatteryStoreClassVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comBatteryStoreClassService.detailById(id);
+ }
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comBatteryStoreClass 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-03-29 11:01:55
+ */
+ @ApiOperation(value = "查询商家分类列表",response = ComBatteryStoreClassVo.class)
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComBatteryStoreClassDto comBatteryStoreClass) {
+ comBatteryStoreClass.setStatus(1);
+ return this.comBatteryStoreClassService.queryByAppletsList(comBatteryStoreClass);
+ }
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryUserAddressApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryUserAddressApi.java
new file mode 100644
index 0000000..190708c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryUserAddressApi.java
@@ -0,0 +1,135 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.AddComBatteryUserAddressDto;
+import com.panzhihua.common.model.dtos.common.EditComBatteryUserAddressDto;
+import com.panzhihua.common.model.dtos.common.PageComBatteryUserAddressDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComBatteryUserAddressVo;
+import com.panzhihua.common.service.community.ComBatteryUserAddressFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * title: 电动车商城-用户收货地址表(ComBatteryUserAddress) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-用户收货地址表
+ *
+ * @author lyq
+ * @date 2022-03-29 13:18:19
+ */
+@Slf4j
+@Api(tags = {"电动车商城-用户收货地址管理"})
+@RestController
+@RequestMapping("/comBatteryUserAddress")
+public class ComBatteryUserAddressApi extends BaseController {
+
+ @Resource
+ private ComBatteryUserAddressFeign comBatteryUserAddressService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryUserAddress 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-03-29 13:18:19
+ */
+ @ApiOperation(value = "分页查询用户收货地址列表",response = ComBatteryUserAddressVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComBatteryUserAddressDto comBatteryUserAddress) {
+ comBatteryUserAddress.setUserId(this.getUserId());
+ return this.comBatteryUserAddressService.queryByPage(comBatteryUserAddress);
+ }
+
+ /**
+ * description add 新增数据
+ *
+ * @param comBatteryUserAddress 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-03-29 13:18:19
+ */
+ @ApiOperation(value = "新增用户收货地址")
+ @PostMapping("/add")
+ public R add(@RequestBody AddComBatteryUserAddressDto comBatteryUserAddress) {
+ comBatteryUserAddress.setUserId(this.getUserId());
+ return this.comBatteryUserAddressService.insert(comBatteryUserAddress);
+ }
+
+ /**
+ * description edit 编辑数据
+ *
+ * @param comBatteryUserAddress 请求参数
+ * @return 编辑结果
+ * @author lyq
+ * @date 2022-03-29 13:18:19
+ */
+ @ApiOperation(value = "编辑用户收货地址")
+ @PutMapping("/edit")
+ public R edit(@RequestBody EditComBatteryUserAddressDto comBatteryUserAddress) {
+ comBatteryUserAddress.setUserId(this.getUserId());
+ return this.comBatteryUserAddressService.update(comBatteryUserAddress);
+ }
+
+ /**
+ * description deleteById 删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-03-29 13:18:19
+ */
+ @ApiOperation(value = "删除用户收货地址")
+ @GetMapping("/delete")
+ public R deleteById(@RequestParam("id") Long id) {
+ return this.comBatteryUserAddressService.deleteById(id);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-29 13:18:19
+ */
+ @ApiOperation(value = "查询用户收货地址详情",response = ComBatteryUserAddressVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comBatteryUserAddressService.detailById(id);
+ }
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comBatteryUserAddress 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-03-29 13:18:19
+ */
+ @ApiOperation(value = "查询用户收货地址列表",response = ComBatteryUserAddressVo.class)
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComBatteryUserAddressDto comBatteryUserAddress) {
+ comBatteryUserAddress.setUserId(this.getUserId());
+ return this.comBatteryUserAddressService.queryByList(comBatteryUserAddress);
+ }
+
+ /**
+ * 查询用户默认收货地址
+ * @return 用户默认收货地址
+ */
+ @ApiOperation(value = "查询用户默认收货地址",response = ComBatteryUserAddressVo.class)
+ @GetMapping("/default/address")
+ public R getDefaultAddress() {
+ return this.comBatteryUserAddressService.getDefaultAddress(this.getUserId());
+ }
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarBrandApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarBrandApi.java
new file mode 100644
index 0000000..d61ab0f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarBrandApi.java
@@ -0,0 +1,81 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.AddComChangeCarBrandDto;
+import com.panzhihua.common.model.dtos.common.EditComChangeCarBrandDto;
+import com.panzhihua.common.model.dtos.common.PageComChangeCarBrandDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComChangeCarBrandVo;
+import com.panzhihua.common.service.community.ComChangeCarBrandFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * title: 换新车-品牌表(ComChangeCarBrand) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-品牌表
+ *
+ * @author lyq
+ * @date 2022-04-07 13:37:22
+ */
+@Slf4j
+@Api(tags = {"换新车-品牌管理"})
+@RestController
+@RequestMapping("/comChangeCarBrand")
+public class ComChangeCarBrandApi extends BaseController {
+
+ @Resource
+ private ComChangeCarBrandFeign comChangeCarBrandService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comChangeCarBrand 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-04-07 13:37:22
+ */
+ @ApiOperation(value = "分页查询品牌列表",response = ComChangeCarBrandVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComChangeCarBrandDto comChangeCarBrand) {
+ comChangeCarBrand.setStatus(1);
+ return this.comChangeCarBrandService.queryByPage(comChangeCarBrand);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-04-07 13:37:22
+ */
+ @ApiOperation(value = "查询品牌详情",response = ComChangeCarBrandVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comChangeCarBrandService.detailById(id);
+ }
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comChangeCarBrand 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-04-07 13:37:22
+ */
+ @ApiOperation(value = "查询品牌列表",response = ComChangeCarBrandVo.class)
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComChangeCarBrandDto comChangeCarBrand) {
+ return this.comChangeCarBrandService.queryByList(comChangeCarBrand);
+ }
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarInquiryApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarInquiryApi.java
new file mode 100644
index 0000000..95cb71e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarInquiryApi.java
@@ -0,0 +1,55 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.AddComChangeCarInquiryDto;
+import com.panzhihua.common.model.dtos.common.EditComChangeCarInquiryDto;
+import com.panzhihua.common.model.dtos.common.PageComChangeCarInquiryDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComChangeCarInquiryVo;
+import com.panzhihua.common.service.community.ComChangeCarInquiryFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * title: 换新车-分期询价表(ComChangeCarInquiry) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-分期询价表
+ *
+ * @author lyq
+ * @date 2022-04-07 13:39:06
+ */
+@Slf4j
+@Api(tags = {"换新车-分期询价管理"})
+@RestController
+@RequestMapping("/comChangeCarInquiry")
+public class ComChangeCarInquiryApi extends BaseController {
+
+ @Resource
+ private ComChangeCarInquiryFeign comChangeCarInquiryService;
+
+ /**
+ * description add 新增数据
+ *
+ * @param comChangeCarInquiry 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-04-07 13:39:06
+ */
+ @ApiOperation(value = "新增分期询价")
+ @PostMapping("/add")
+ public R add(@RequestBody AddComChangeCarInquiryDto comChangeCarInquiry) {
+ comChangeCarInquiry.setCreateAt(new Date());
+ comChangeCarInquiry.setCreateBy(this.getUserId());
+ comChangeCarInquiry.setUserId(this.getUserId());
+ return this.comChangeCarInquiryService.insert(comChangeCarInquiry);
+ }
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarModelApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarModelApi.java
new file mode 100644
index 0000000..69f4041
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarModelApi.java
@@ -0,0 +1,91 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComChangeCarModelSpecsVo;
+import com.panzhihua.common.model.vos.common.ComChangeCarModelVo;
+import com.panzhihua.common.service.community.ComChangeCarModelFeign;
+import com.panzhihua.common.service.community.ComChangeCarModelRelationFeign;
+import com.panzhihua.common.service.community.ComChangeCarModelSpecsFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * title: 换新车-车型管理表(ComChangeCarModel) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-车型管理表
+ *
+ * @author lyq
+ * @date 2022-04-07 13:41:54
+ */
+@Slf4j
+@Api(tags = {"换新车-车型管理"})
+@RestController
+@RequestMapping("/comChangeCarModel")
+public class ComChangeCarModelApi extends BaseController {
+
+ @Resource
+ private ComChangeCarModelFeign comChangeCarModelService;
+ @Resource
+ private ComChangeCarModelSpecsFeign carModelSpecsService;
+ @Resource
+ private ComChangeCarModelRelationFeign carModelRelationService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comChangeCarModelRelation 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-04-07 13:41:54
+ */
+ @ApiOperation(value = "分页查询车型管理列表",response = ComChangeCarModelVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComChangeCarModelRelationDto comChangeCarModelRelation) {
+ return this.carModelRelationService.queryByAppletsPage(comChangeCarModelRelation);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-04-07 13:41:54
+ */
+ @ApiOperation(value = "查询车型管理详情",response = ComChangeCarModelVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comChangeCarModelService.detailById(id);
+ }
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comChangeCarModel 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-04-07 13:41:54
+ */
+ @ApiOperation(value = "查询车型管理列表",response = ComChangeCarModelVo.class)
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComChangeCarModelDto comChangeCarModel) {
+ return this.comChangeCarModelService.queryByList(comChangeCarModel);
+ }
+
+ @ApiOperation(value = "查询规格管理级联列表",response = ComChangeCarModelSpecsVo.class)
+ @PostMapping("/specs/list")
+ public R getSpecsList(@RequestBody PageComChangeCarModelSpecsDto comChangeCarModel) {
+ return this.carModelSpecsService.queryByList(comChangeCarModel);
+ }
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarModelSpecsChildrenApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarModelSpecsChildrenApi.java
new file mode 100644
index 0000000..28e0d83
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComChangeCarModelSpecsChildrenApi.java
@@ -0,0 +1,51 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.AddComChangeCarModelSpecsChildrenDto;
+import com.panzhihua.common.model.dtos.common.EditComChangeCarModelSpecsChildrenDto;
+import com.panzhihua.common.model.dtos.common.PageComChangeCarModelSpecsChildrenDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComChangeCarModelSpecsChildrenVo;
+import com.panzhihua.common.service.community.ComChangeCarModelSpecsChildrenFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * title: 换新车-车型子规格表(ComChangeCarModelSpecsChildren) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-车型子规格表
+ *
+ * @author lyq
+ * @date 2022-04-07 13:55:33
+ */
+@Slf4j
+@Api(tags = {"换新车-车型规格下子规格管理"})
+@RestController
+@RequestMapping("/comChangeCarModelSpecsChildren")
+public class ComChangeCarModelSpecsChildrenApi extends BaseController {
+
+ @Resource
+ private ComChangeCarModelSpecsChildrenFeign comChangeCarModelSpecsChildrenService;
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comChangeCarModelSpecsChildren 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-04-07 13:55:33
+ */
+ @ApiOperation(value = "查询车型规格下子规格管理列表",response = ComChangeCarModelSpecsChildrenVo.class)
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComChangeCarModelSpecsChildrenDto comChangeCarModelSpecsChildren) {
+ return this.comChangeCarModelSpecsChildrenService.queryByList(comChangeCarModelSpecsChildren);
+ }
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComFmsApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComFmsApi.java
new file mode 100644
index 0000000..076ba33
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComFmsApi.java
@@ -0,0 +1,216 @@
+package com.panzhihua.applets.api;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import com.panzhihua.common.model.dtos.community.fms.AddFmsServiceAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.ApplyFmsServiceDTO;
+import com.panzhihua.common.model.dtos.community.fms.ApprovalFmsServiceAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.EvaluationFmsServiceDTO;
+import com.panzhihua.common.model.dtos.community.fms.FeedbackFmsServiceDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
+import com.panzhihua.common.model.vos.community.fms.CascadeCommVO;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsClassroomAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsEventAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAppletsDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsTeamDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.fms.ComFmsClassroomVO;
+import com.panzhihua.common.model.vos.community.fms.ComFmsServiceVO;
+import com.panzhihua.common.model.vos.community.fms.ComFmsTeamTypeVO;
+import com.panzhihua.common.model.vos.community.fms.ComFmsTeamVO;
+import com.panzhihua.common.model.vos.grid.EventDetailsVO;
+import com.panzhihua.common.model.vos.grid.EventVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.grid.GridService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @title: ComFmsApi
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务相关接口
+ * @author: hans
+ * @date: 2022/02/11 13:23
+ */
+@Slf4j
+@Api(tags = {"五微服务"})
+@RestController
+@RequestMapping("/fms")
+public class ComFmsApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private GridService gridService;
+
+ @ApiOperation(value = "获取团队类型列表", response = ComFmsTeamTypeVO.class)
+ @ApiImplicitParam(name = "communityId", value = "社区id", required = true)
+ @GetMapping("/teamType/list")
+ public R listFmsTeamType(@RequestParam(value = "communityId", required = false) Long communityId) {
+ LoginUserInfoVO userInfo = this.getLoginUserInfoSureNoLogin();
+ if (isNull(userInfo) && isNull(communityId)) {
+ return R.fail("社区id不能为空");
+ }
+ if (nonNull(userInfo)) {
+ communityId = userInfo.getCommunityId();
+ }
+ return communityService.listFmsTeamType(communityId);
+ }
+
+ @ApiOperation(value = "分页/全部查询团队信息", response = ComFmsTeamVO.class)
+ @PostMapping("/team/page")
+ public R pageFmsTeam(@RequestBody PageFmsTeamDTO pageFmsTeamDTO) {
+ LoginUserInfoVO userInfo = this.getLoginUserInfoSureNoLogin();
+ if (isNull(userInfo) && isNull(pageFmsTeamDTO.getCommunityId())) {
+ return R.fail("社区id不能为空");
+ }
+ if (nonNull(userInfo)) {
+ pageFmsTeamDTO.setCommunityId(userInfo.getCommunityId());
+ }
+ return communityService.pageFmsTeamApplets(pageFmsTeamDTO);
+ }
+
+ @ApiOperation(value = "分页查询微讲堂", response = ComFmsClassroomVO.class)
+ @PostMapping("/classroom/page")
+ public R pageFmsClassroom(@RequestBody @Valid PageFmsClassroomAdminDTO adminDTO) {
+ LoginUserInfoVO userInfo = this.getLoginUserInfoSureNoLogin();
+ if (isNull(userInfo) && isNull(adminDTO.getCommunityId())) {
+ return R.fail("社区id不能为空");
+ }
+ if (nonNull(userInfo)) {
+ adminDTO.setCommunityId(userInfo.getCommunityId());
+ }
+ return communityService.pageFmsClassroomAdmin(adminDTO);
+ }
+
+ @ApiOperation(value = "获取微讲堂详情", response = ComFmsClassroomVO.class)
+ @ApiImplicitParam(name = "id", value = "微讲堂id", required = true)
+ @GetMapping("/classroom/detail")
+ public R detailFmsClassroom(@RequestParam("id") Long id) {
+ return communityService.detailFmsClassroomApplets(id);
+ }
+
+ @ApiOperation(value = "分页查询微调节/微防控", response = EventVO.class)
+ @PostMapping("/event/page")
+ public R pageFmsEvent(@RequestBody @Valid PageFmsEventAdminDTO adminDTO) {
+ LoginUserInfoVO userInfo = this.getLoginUserInfoSureNoLogin();
+ if (isNull(userInfo) && isNull(adminDTO.getCommunityId())) {
+ return R.fail("社区id不能为空");
+ }
+ if (nonNull(userInfo)) {
+ adminDTO.setCommunityId(userInfo.getCommunityId());
+ }
+ return communityService.pageFmsEventApplets(adminDTO);
+ }
+
+ @ApiOperation(value = "微调节/微防控事件详情", response = EventDetailsVO.class)
+ @ApiImplicitParam(name = "eventId", value = "事件id", required = true)
+ @GetMapping("/event/detail")
+ public R detailFmsEvent(@RequestParam("eventId") Long eventId) {
+ return gridService.eventDetails(eventId);
+ }
+
+ @ApiOperation(value = "分页查询微服务", response = ComFmsServiceVO.class)
+ @PostMapping("/service/page")
+ public R pageFmsService(@RequestBody @Valid PageFmsServiceAppletsDTO adminDTO) {
+ LoginUserInfoVO userInfo = this.getLoginUserInfoSureNoLogin();
+ if (isNull(userInfo) && isNull(adminDTO.getCommunityId())) {
+ return R.fail("社区id不能为空");
+ }
+ if (nonNull(userInfo)) {
+ adminDTO.setCommunityId(userInfo.getCommunityId());
+ }
+ return communityService.pageFmsServiceApplets(adminDTO);
+ }
+
+ @ApiOperation(value = "查看微服务详情", response = ComFmsServiceVO.class)
+ @ApiImplicitParam(name = "serviceId", value = "服务id", required = true)
+ @GetMapping("/service/detail")
+ public R detailFmsService(@RequestParam("serviceId") Long serviceId) {
+ LoginUserInfoVO userInfo = this.getLoginUserInfoSureNoLogin();
+ Long userId = null;
+ if (nonNull(userInfo)) {
+ userId = userInfo.getUserId();
+ }
+ return communityService.detailFmsServiceApplets(serviceId, userId);
+ }
+
+ @ApiOperation("微服务申请")
+ @PostMapping("/service/apply")
+ public R applyFmsService(@RequestBody @Valid ApplyFmsServiceDTO adminDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ adminDTO.setUserInfo(loginUserInfo);
+ return communityService.applyFmsService(adminDTO);
+ }
+
+ @ApiOperation(value = "分页查询我的微服务", response = ComFmsServiceVO.class)
+ @PostMapping("/service/pageMy")
+ public R pageMyFmsService(@RequestBody @Valid PageFmsServiceAppletsDTO adminDTO) {
+ adminDTO.setCommunityId(this.getCommunityId());
+ adminDTO.setUserId(this.getUserId());
+ return communityService.pageMyFmsService(adminDTO);
+ }
+
+ @ApiOperation(value = "微服务评价")
+ @PostMapping("/service/evaluate")
+ public R evaluateFmsService(@RequestBody @Valid EvaluationFmsServiceDTO evaluationFmsServiceDTO) {
+ evaluationFmsServiceDTO.setUserId(this.getUserId());
+ return communityService.evaluateFmsService(evaluationFmsServiceDTO);
+ }
+
+ @ApiOperation(value = "微团队成员分页查询服务处理", response = ComFmsServiceVO.class)
+ @PostMapping("/service/pageDeal")
+ public R pageDealFmsService(@RequestBody @Valid PageFmsServiceAppletsDTO adminDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ adminDTO.setCommunityId(loginUserInfo.getCommunityId());
+ adminDTO.setUserId(loginUserInfo.getUserId());
+ adminDTO.setUserInfo(loginUserInfo);
+ return communityService.pageDealFmsService(adminDTO);
+ }
+
+ @ApiOperation(value = "微团队成员服务反馈", response = ComFmsServiceVO.class)
+ @PostMapping("/service/feedback")
+ public R feedbackFmsService(@RequestBody @Valid FeedbackFmsServiceDTO adminDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ adminDTO.setUserId(loginUserInfo.getUserId());
+ adminDTO.setUserInfo(loginUserInfo);
+ return communityService.feedbackFmsService(adminDTO);
+ }
+
+ @ApiOperation("核实微服务")
+ @PostMapping("/service/approval")
+ public R approvalFmsService(@RequestBody @Valid ApprovalFmsServiceAdminDTO adminDTO) {
+ if (adminDTO.getIsPass() && isNull(adminDTO.getMemberId())) {
+ return R.fail("未分配服务人员");
+ }
+ adminDTO.setUpdatedBy(this.getUserId());
+ return communityService.approvalFmsService(adminDTO);
+ }
+
+ @ApiOperation("后台新增微服务")
+ @PostMapping("/service/add")
+ public R addFmsService(@RequestBody @Valid AddFmsServiceAdminDTO adminDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ adminDTO.setCommunityId(loginUserInfo.getCommunityId());
+ adminDTO.setCreatedBy(loginUserInfo.getUserId());
+ adminDTO.setUpdatedBy(loginUserInfo.getUserId());
+ return communityService.addFmsServiceAdmin(adminDTO);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPbCheckUnitApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPbCheckUnitApi.java
new file mode 100644
index 0000000..40a1550
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPbCheckUnitApi.java
@@ -0,0 +1,91 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.AddComPbCheckUnitDto;
+import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
+import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+
+/**
+ * title: 党建-报到单位(ComPbCheckUnit) 控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 党建-报到单位
+ *
+ * @author lyq
+ * @date 2022-02-16 16:22:18
+ */
+
+@Slf4j
+@Api(tags = {"党建-报到单位"})
+@RestController
+@RequestMapping("/checkUnit")
+public class ComPbCheckUnitApi extends BaseController {
+
+ @Resource
+ private ComPbCheckUnitFeign comPbCheckUnitService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comPbCheckUnit 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-02-16 16:22:18
+ */
+ @ApiOperation(value = "分页查询报道单位", response = ComPbCheckUnitVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
+ comPbCheckUnit.setCommunityId(this.getCommunityId());
+ return this.comPbCheckUnitService.queryByPage(comPbCheckUnit);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-02-16 16:22:18
+ */
+ @ApiOperation(value = "查询报道单位", response = ComPbCheckUnitVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comPbCheckUnitService.detailById(id);
+ }
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comPbCheckUnit 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-02-16 16:22:18
+ */
+ @ApiOperation(value = "查询报道单位列表", response = ComPbCheckUnitVo.class)
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
+ //comPbCheckUnit.setCommunityId(this.getCommunityId());
+ comPbCheckUnit.setCommunityId(null);
+ return this.comPbCheckUnitService.queryByList(comPbCheckUnit);
+ }
+
+ @ApiOperation(value = "新增报道单位")
+ @PostMapping("/add")
+ public R add(@RequestBody AddComPbCheckUnitDto comPbCheckUnit) {
+ comPbCheckUnit.setCommunityId(this.getCommunityId());
+ comPbCheckUnit.setCreateAt(new Date());
+ comPbCheckUnit.setCreateBy(this.getUserId());
+ return this.comPbCheckUnitService.insert(comPbCheckUnit);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyApi.java
new file mode 100644
index 0000000..f874911
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyApi.java
@@ -0,0 +1,77 @@
+package com.panzhihua.applets.api;
+
+import javax.annotation.Resource;
+
+import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
+import com.panzhihua.common.service.user.UserService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComPropertyVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author zzj
+ */
+@Slf4j
+@Api(tags = {"物业公司"})
+@RestController
+@RequestMapping("/comProperty")
+public class ComPropertyApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private UserService userService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "物业公司列表",response = ComPropertyVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setParamId(this.getCommunityId());
+ return this.communityService.comPropertySelectAll(commonPage);
+ }
+
+ @ApiOperation(value = "物业公司详情", response = ComPropertyVO.class)
+ @ApiImplicitParam(name = "id", value = "物业公司id", required = true)
+ @GetMapping("detail")
+ public R detailProperty(@RequestParam("id") Long id) {
+ return this.communityService.detailProperty(id);
+ }
+
+ @ApiOperation("新增投诉建议或问题留言")
+ @PostMapping("addFeedBack")
+ public R addFeedBack(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){
+ return userService.addFeedback(sysUserFeedbackDTO);
+ }
+
+ @ApiOperation("查看自己的投诉建议或问题留言记录")
+ @GetMapping("myFeedBack")
+ public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type,@RequestParam(value = "propertyId",required = false)Long propertyId){
+ return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type,propertyId);
+ }
+
+ @ApiOperation("通知公告列表")
+ @GetMapping("notice")
+ public R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId){
+ return communityService.noticeList(page,size,propertyId);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyHelpApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyHelpApi.java
new file mode 100644
index 0000000..00710ed
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyHelpApi.java
@@ -0,0 +1,98 @@
+package com.panzhihua.applets.api;
+
+
+import cn.hutool.core.date.DateUtil;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComPropertyVO;
+import com.panzhihua.common.model.vos.property.ComPropertyHelpVO;
+import com.panzhihua.common.service.property.PropertyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+
+/**
+ * (ComPropertyHelp)表控制层
+ *
+ * @author makejava
+ * @since 2021-09-18 16:43:12
+ */
+@Slf4j
+@Api(tags = {"一件求助人员"})
+@RestController
+@RequestMapping("/comPropertyHelp")
+public class ComPropertyHelpApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private PropertyService propertyService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询所有数据",response = ComPropertyVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setStatus(1);
+ return this.propertyService.comPropertyHelpSelectAll(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation(value = "主键查询")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Serializable id) {
+ return this.propertyService.comPropertyHelpSelectOne(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comPropertyHelp 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation(value = "新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComPropertyHelpVO comPropertyHelp) {
+ comPropertyHelp.setCommunityId(this.getCommunityId());
+ comPropertyHelp.setCreateTime(DateUtil.date());
+ return this.propertyService.comPropertyHelpInsert(comPropertyHelp);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comPropertyHelp 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation(value = "修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComPropertyHelpVO comPropertyHelp) {
+ return this.propertyService.comPropertyHelpUpdate(comPropertyHelp);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation(value = "删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.propertyService.comPropertyHelpDelete(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyPublicityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyPublicityApi.java
new file mode 100644
index 0000000..9bbdb17
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyPublicityApi.java
@@ -0,0 +1,71 @@
+package com.panzhihua.applets.api;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.PageComPropertyPublicityDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngVillageVO;
+import com.panzhihua.common.model.vos.community.ComPropertyPublicityVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+
+/**
+ * @title: ComPropertyPublicityApi
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 物业宣传相关接口
+ * @author: hans
+ * @date: 2021/11/11 10:08
+ */
+@Slf4j
+@Api(tags = {"物业宣传相关接口"})
+@RestController
+@RequestMapping("/property/publicity")
+public class ComPropertyPublicityApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "分页物业宣传信息", response = ComPropertyPublicityVO.class)
+ @PostMapping("/page")
+ public R pageComPropertyPublicity(@RequestBody @Valid PageComPropertyPublicityDTO pageComPropertyPublicityDTO) {
+ if (isNull(pageComPropertyPublicityDTO.getCommunityId())) {
+ return R.fail("社区id不能为空");
+ }
+ LoginUserInfoVO loginUserInfoSureNoLogin = getLoginUserInfoSureNoLogin();
+ if (nonNull(loginUserInfoSureNoLogin)) {
+ pageComPropertyPublicityDTO.setCommunityId(loginUserInfoSureNoLogin.getCommunityId());
+ }
+ return communityService.pageComPropertyPublicityApplet(pageComPropertyPublicityDTO);
+ }
+
+ @ApiOperation(value = "查看物业宣传信息", response = ComPropertyPublicityVO.class)
+ @GetMapping("/get")
+ @ApiImplicitParam(name = "id", value = "物业宣传id", required = true)
+ public R getComPropertyPublicity(@RequestParam("id") Long id) {
+ return communityService.getComPropertyPublicity(id);
+ }
+
+ @ApiOperation(value = "增加物业宣传浏览量")
+ @GetMapping("/incr-view")
+ @ApiImplicitParam(name = "id", value = "物业宣传id", required = true)
+ public R incrPropertyPublicityView(@RequestParam("id") Long id) {
+ return communityService.incrPropertyPublicityView(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java
new file mode 100644
index 0000000..158c5a2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java
@@ -0,0 +1,159 @@
+package com.panzhihua.applets.api;
+
+import cn.hutool.core.date.DateUtil;
+import com.panzhihua.applets.model.dtos.IDTO;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.property.ComPropertyRepairVO;
+import com.panzhihua.common.service.property.PropertyService;
+import com.panzhihua.common.utlis.RSAUtils;
+import com.panzhihua.common.utlis.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@RestController
+@RequestMapping("propertyRepair")
+@Api(tags = "物业报修api")
+public class ComPropertyRepairApi extends BaseController {
+ @Resource
+ private PropertyService propertyService;
+
+ /**
+ * 分页查询所有数据
+ * @return 所有数据
+ */
+ @ApiOperation("小程序列表接口")
+ @PostMapping("/queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setUserId(this.getUserId());
+ return this.propertyService.comPropertyRepairSelectAll(commonPage);
+ }
+
+ /**
+ * 分页查询所有数据
+ * @return 所有数据
+ */
+ @ApiOperation("小程序列表接口-脱敏")
+ @PostMapping("/desensitize/queryAll")
+ public R selectAllDesensitize(@RequestBody CommonPage commonPage) {
+ commonPage.setUserId(this.getUserId());
+ return this.propertyService.comPropertyRepairSelectAllDesensitize(commonPage);
+ }
+
+
+ /**
+ * 小程序添加报修
+ * @param comPropertyRepairVO
+ * @return
+ */
+ @ApiOperation("小程序添加报修")
+ @PostMapping
+ public R insert(@RequestBody ComPropertyRepairVO comPropertyRepairVO) {
+ comPropertyRepairVO.setCreateTime(DateUtil.date());
+ comPropertyRepairVO.setCreateBy(this.getUserId());
+ comPropertyRepairVO.setRepairStatus(ComPropertyRepairVO.status.dcl);
+ return this.propertyService.comPropertyRepairInsert(comPropertyRepairVO);
+ }
+
+ /**
+ * 小程序添加报修 脱敏
+ * @param comPropertyRepairVO
+ * @return
+ */
+ @ApiOperation("小程序添加报修-脱敏")
+ @PostMapping("desensitizeInsert")
+ public R desensitizeInsert(@RequestBody ComPropertyRepairVO comPropertyRepairVO) {
+ comPropertyRepairVO.setCreateTime(DateUtil.date());
+ comPropertyRepairVO.setCreateBy(this.getUserId());
+ comPropertyRepairVO.setRepairStatus(ComPropertyRepairVO.status.dcl);
+ try {
+ comPropertyRepairVO.setRepairName(RSAUtils.decrypt(comPropertyRepairVO.getRepairName(), Constants.PRIVATE_KEY));
+ comPropertyRepairVO.setRepairPhone(RSAUtils.decrypt(comPropertyRepairVO.getRepairPhone(), Constants.PRIVATE_KEY));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return this.propertyService.comPropertyRepairInsert(comPropertyRepairVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comPropertyRepairVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("小程序修改报修")
+ @PostMapping("/update")
+ public R update(@RequestBody ComPropertyRepairVO comPropertyRepairVO) {
+ if(comPropertyRepairVO!=null&& StringUtils.isNotEmpty(comPropertyRepairVO.getFeedbackContent())){
+ comPropertyRepairVO.setFeedbackBy(this.getUserId());
+ comPropertyRepairVO.setFeedbackTime(DateUtil.date());
+ comPropertyRepairVO.setRepairStatus(ComPropertyRepairVO.status.dpj);
+ }
+ if(comPropertyRepairVO!=null&&StringUtils.isNotEmpty(comPropertyRepairVO.getReplyContent())){
+ comPropertyRepairVO.setReplyTime(DateUtil.date());
+ comPropertyRepairVO.setRepairStatus(ComPropertyRepairVO.status.yjs);
+ }
+ return this.propertyService.comPropertyRepairUpdate(comPropertyRepairVO);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("详情接口")
+ @PostMapping("/detail")
+ public R selectDetail(@RequestBody IDTO idto) {
+ return this.propertyService.comPropertyRepairSelectOne(idto.getId());
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("详情接口")
+ @GetMapping("/{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.propertyService.comPropertyRepairSelectOne(id);
+ }
+
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("详情接口")
+ @PostMapping("desensitize")
+ public R selectOneDesensitize(Long id) {
+ return this.propertyService.comPropertyRepairSelectOneDesensitize(id);
+ }
+
+
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除接口")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.propertyService.comPropertyRepairDelete(id);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyWorkerApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyWorkerApi.java
new file mode 100644
index 0000000..7900b25
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyWorkerApi.java
@@ -0,0 +1,53 @@
+package com.panzhihua.applets.api;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.PagePropertyWorkerDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.property.ComPropertyWorkerVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 物业公司工作人员(ComPropertyWorker)表控制层
+ *
+ * @author makejava
+ * @since 2022-04-26 09:54:07
+ */
+@Slf4j
+@Api(tags = "物业工作人员")
+@RestController
+@RequestMapping("comPropertyWorker")
+public class ComPropertyWorkerApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "分页查询物业工作人员", response = ComPropertyWorkerVO.class)
+ @PostMapping("/page")
+ public R pagePropertyWorker(@RequestBody @Valid PagePropertyWorkerDTO pagePropertyWorkerDTO) {
+ return communityService.pagePropertyWorker(pagePropertyWorkerDTO);
+ }
+
+ @ApiOperation(value = "物业工作人员详情", response = ComPropertyWorkerVO.class)
+ @ApiImplicitParam(name = "id", value = "物业工作人员id", required = true)
+ @GetMapping("/detail")
+ public R detailPropertyWorker(@RequestParam("id") Long id) {
+ return communityService.detailPropertyWorker(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComReserveApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComReserveApi.java
new file mode 100644
index 0000000..a21f673
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComReserveApi.java
@@ -0,0 +1,87 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.CancelRecordDTO;
+import com.panzhihua.common.model.dtos.community.OperationDetailDTO;
+import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
+import com.panzhihua.common.model.vos.community.ComActReserveIndexVo;
+import com.panzhihua.common.model.vos.community.reserve.ComActReserveAppletsVO;
+import com.panzhihua.common.model.vos.community.reserve.ComActReserveDetailVO;
+import com.panzhihua.common.model.vos.community.reserve.ComOperationDetailVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 预约/登记服务
+ */
+@Slf4j
+@RestController
+@RequestMapping("reserve")
+@Api(tags = "预约/登记服务")
+public class ComReserveApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "详情",response = ComActReserveDetailVO.class)
+ @GetMapping("/detail")
+ public R detail(@RequestParam("id") Long id,@RequestParam("recordId") Long recordId,@RequestParam("isBack") Integer isBack){
+ return communityService.reserveDetail(id,this.getUserId(),recordId,isBack);
+ }
+
+ @ApiOperation("用户提交数据")
+ @PostMapping("/commit")
+ public R commit(@RequestBody ComActReserveCommitVO comActReserveCommitVO){
+ comActReserveCommitVO.setCommunityId(this.getCommunityId());
+ comActReserveCommitVO.setUserId(this.getUserId());
+ return communityService.reserveCommit(comActReserveCommitVO);
+ }
+
+ /**
+ * 我的预约/登记
+ * @param pageUserReserveDTO
+ * @return
+ */
+ @ApiOperation(value = "我的预约/登记",response = ComActReserveAppletsVO.class)
+ @PostMapping("/userReserveList")
+ public R userReserveList(@RequestBody PageUserReserveDTO pageUserReserveDTO){
+ pageUserReserveDTO.setUserId(this.getUserId());
+ return communityService.userReserveList(pageUserReserveDTO);
+ }
+ /**
+ * 取消预约/登记
+ */
+ @ApiOperation("取消预约/登记")
+ @PostMapping("/cancelReserve")
+ public R userCancelReserve(@RequestBody CancelRecordDTO cancelRecordDTO){
+ cancelRecordDTO.setUserId(this.getUserId());
+ return communityService.userCancelReserve(cancelRecordDTO);
+ }
+
+ /**
+ * 预约详情操作记录
+ */
+ @ApiOperation(value = "预约详情操作记录",response = ComOperationDetailVO.class)
+ @PostMapping("/detailOperation")
+ public R reserveOperation(@RequestBody OperationDetailDTO comActReserveOperationRecordDO){
+ comActReserveOperationRecordDO.setUserId(this.getUserId());
+ return communityService.reserveOperation(comActReserveOperationRecordDO);
+ }
+
+ @ApiOperation(value = "预约登记列表",response = ComActReserveIndexVo.class)
+ @GetMapping("/list")
+ public R list(@RequestParam("communityId") Long communityId){
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ communityId = loginUserInfo.getCommunityId();
+ }
+ return communityService.reserveListApplets(communityId);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoApi.java
new file mode 100644
index 0000000..de250be
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoApi.java
@@ -0,0 +1,73 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.sanshuo.*;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@RestController
+@RequestMapping("sanshuo")
+@Api(tags = "三说会堂小程序接口")
+public class ComSanShuoApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "小程序获取可选择行业分中心列表",response = ComSanShuoIndustryCenterVO.class )
+ @GetMapping("/industryCenter/appletsList")
+ public R industryCenterAppList(){
+ return communityService.industryCenterAppList();
+ }
+
+ @ApiOperation(value = "小程序获取可选择行专家列表",response = ComSanshuoExpertVO.class )
+ @GetMapping("/expert/appletsList")
+ public R expertAppList(@RequestParam (value = "type",required = false)Integer type,@RequestParam(value = "id",required = false)Long id){
+ return communityService.expertAppList(type,id);
+ }
+
+ @ApiOperation(value = "专家风采",response = ExpertShowVO.class)
+ @GetMapping("/expert/expertShow")
+ public R expertShow(){
+ return communityService.expertShow();
+ }
+
+ @ApiOperation("专家详情")
+ @GetMapping("/expert/{id}")
+ public R expertDetail(@PathVariable("id")Long id){
+ return communityService.expertDetail(id);
+ }
+
+ @ApiOperation(value = "事件类型列表",response = ComMediaTypeVO.class)
+ @GetMapping("/mediateType/list")
+ public R mediateTypeList(){
+ return communityService.eventAppList();
+ }
+
+ @ApiOperation(value = "业务中心详情",response = ComSanShuoIndustryCenterVO.class)
+ @GetMapping("/industryCenter/detail")
+ public R industryCenterDetail(@RequestParam("id") Long id){
+ return communityService.industryCenterDetail(id);
+ }
+
+ @GetMapping("/expert/expertShowList")
+ @ApiOperation(value = "专家风采列表",response = ComSanshuoExpertVO.class)
+ public R expertShowList(@RequestParam(value = "level",required = false) @ApiParam("对应的level，1三说会堂2行业分中心3街道4社区")Integer level,
+ @RequestParam(value = "id",required = false) @ApiParam("id，level=1不传2行业分中心id 3街道id 4社区id")Long id){
+ return communityService.expertShowList(level,id);
+ }
+
+
+ @ApiOperation("专家详情展示")
+ @GetMapping("/expert/detail")
+ public R expertInfo(@RequestParam("id")Long id){
+ return communityService.expertShowList(7,id );
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java
new file mode 100644
index 0000000..67cc2e9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoEventController.java
@@ -0,0 +1,183 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.sanshuo.*;
+import com.panzhihua.common.service.community.CommunitySanShuoService;
+import com.panzhihua.common.utlis.CopyUtil;
+import com.panzhihua.common.utlis.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.HashMap;
+
+import static java.util.Objects.nonNull;
+
+/**
+ * ClassName ComEventController
+ * Description 三说会堂事件表控制层
+ *
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+@Slf4j
+@Api(tags = {"三说会堂事件表控制层"})
+@RestController
+@RequestMapping("/sanshuo/comEvent")
+public class ComSanShuoEventController extends BaseController {
+
+ @Resource
+ private CommunitySanShuoService comEventService;
+
+
+ /**
+ * description 新增三说会堂事件表
+ *
+ * @param comSanRequestVO 对象
+ * @return R 新增结果对象
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @ApiOperation("新增三说会堂事件表")
+ @PostMapping("/add")
+ public R insertComEvent(@RequestBody @Valid ComSanRequestVO comSanRequestVO, @ApiIgnore BindingResult results) {
+ if (results.hasErrors()) {
+ return R.fail(results.getFieldError().getDefaultMessage());
+ }
+ return comEventService.insertComEvent(comSanRequestVO);
+ }
+
+
+ /**
+ * description 根据ID获取三说会堂事件表信息
+ *
+ * @param id 主键id
+ * @return R<ComEvent> comEvent 对象
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @ApiOperation("根据ID获取三说会堂事件详情信息，返回事件信息和图片信息")
+ @GetMapping("/detail/{id}")
+ public R<HashMap> detail(@PathVariable(value = "id") String id) {
+ if (StringUtils.isEmpty(id)) {
+ throw new RuntimeException("参数不能为空");
+ }
+ return comEventService.detail(id);
+ }
+
+
+ /**
+ * description page 三说会堂事件表分页列表数据
+ *
+ * @param comEventPageRequestVO 对象
+ * @return PageResult<List < ComEvent>> 三说会堂事件表分页列表数据
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @ApiOperation(value = "三说会堂事件表分页列表数据", notes = "三说会堂事件表分页列表数据")
+ @PostMapping("/page")
+ public R page(@RequestBody ComEventPageRequestVO comEventPageRequestVO) {
+ log.info("================appId="+comEventPageRequestVO);
+ ComEventVO comEventVO = new ComEventVO();
+ BeanUtils.copyProperties(comEventPageRequestVO,comEventVO);
+ comEventPageRequestVO.setCreateBy(getUserId());
+ if (nonNull(comEventPageRequestVO.getAppId())){
+ comEventVO.setAppId(comEventPageRequestVO.getAppId());
+ }
+ return comEventService.page(comEventVO, comEventVO.getPageNo(), comEventVO.getPageSize());
+ }
+
+
+ /**
+ * description 修改三说会堂事件表状态
+ *
+ * @param id 主键id
+ * @return Result 修改成功和失败
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @ApiOperation("取消申请")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long"),
+ })
+ @PutMapping("/cancelRequest")
+ public R cancelRequest(@RequestParam("id") Long id) {
+ return comEventService.cancelRequest(id);
+ }
+
+ /**
+ * description 修改三说会堂事件表状态
+ *
+ * @param id 主键id
+ * @return Result 修改成功和失败
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @ApiOperation("专家受理")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "事件ID", required = true, dataType = "Long"),
+ @ApiImplicitParam(name = "specterId", value = "专家ID", required = true, dataType = "Long"),
+ })
+ @PutMapping("/accept/Request")
+ public R acceptRequest( Long id, Long specterId) {
+ return comEventService.acceptRequest(id, specterId);
+ }
+
+ /**
+ * description 修改三说会堂事件表状态
+ *
+ * @param id 主键id
+ * @return Result 修改成功和失败
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @ApiOperation("专家不受理，转其他专家处理")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long"),
+ })
+ @PutMapping("/reject/Request")
+ public R rejectRequest(@RequestParam("id") Long id) {
+ return comEventService.rejectRequest(id);
+ }
+
+ /**
+ * description 专家调解处理
+ *
+ * @param comEventConciliationVO 主键id
+ * @return Result 修改成功和失败
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @ApiOperation("专家调解处理")
+ @PutMapping("/conciliation/Request")
+ public R conciliationRequest(@RequestBody ComEventConciliationVO comEventConciliationVO) {
+ return comEventService.conciliationRequest(comEventConciliationVO);
+ }
+
+ /**
+ * description 专家归档
+ *
+ * @param comEventArchiveVO 归档对象
+ * @return Result 修改成功和失败
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @ApiOperation("事件专家归档")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long"),
+ @ApiImplicitParam(name = "result", value = "归档结论", required = true, dataType = "String"),
+ })
+ @PutMapping("/archive/Request")
+ public R archiveRequest(@RequestBody ComEventArchiveVO comEventArchiveVO) {
+ return comEventService.archiveRequest(comEventArchiveVO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java
new file mode 100644
index 0000000..9e0e17e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java
@@ -0,0 +1,207 @@
+package com.panzhihua.applets.api;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
+import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
+import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComSwDangerReportVO;
+import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
+import com.panzhihua.common.model.vos.community.ComSwSafetyWorkRecordVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.partybuilding.PartyBuildingService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @auther txb
+ * @create 2021-07-23 14:38:38
+ * @describe 社区》安全工作》巡查记录前端控制器
+ */
+@Slf4j
+@Api(tags = {"社区管理/安全工作"})
+@RestController
+@RequestMapping("/patrolRecord")
+public class ComSwPatrolRecordApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @Resource
+ private PartyBuildingService partyBuildingService;
+
+ /**
+ * 分页查询巡查记录
+ *
+ * @param comSwPatrolRecordPageDTO
+ * 查询参数
+ * @return 分页集合
+ */
+ @ApiOperation(value = "分页查询巡查记录", response = ComSwPatrolRecordVO.class)
+ @PostMapping("/app/pagePatrolRecord")
+ public R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
+ Long communityId = this.getCommunityId();
+ if (!comSwPatrolRecordPageDTO.getSelectPerson().equals(1)) {
+ comSwPatrolRecordPageDTO.setPatrolPerson(String.valueOf(this.getLoginUserInfo().getPhone()));
+ }
+ comSwPatrolRecordPageDTO.setCommunityId(communityId);
+ comSwPatrolRecordPageDTO.setAreaCode(this.getAreaCode());
+ return communityService.pagePatrolRecord(comSwPatrolRecordPageDTO);
+ }
+
+ /**
+ * 新增巡查记录
+ *
+ * @param comSwPatrolRecordAddDTO
+ * 新增参数
+ * @return 新增结果
+ */
+ @ApiOperation(value = "新增巡查记录")
+ @PostMapping("/app/addPatrolRecord")
+ public R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO) {
+ Long communityId = this.getCommunityId();
+ comSwPatrolRecordAddDTO.setCommunityId(communityId);
+ comSwPatrolRecordAddDTO.setCreateBy(this.getUserId());
+ return communityService.addPatrolRecord(comSwPatrolRecordAddDTO);
+ }
+
+ /**
+ * 根据巡查记录id查询详情
+ *
+ * @param patrolRecordId
+ * 巡查记录id
+ * @return 巡查记录详情查询结果
+ */
+ @ApiOperation(value = "根据巡查记录id查询详情", response = ComSwPatrolRecordVO.class)
+ @GetMapping("/app/detailPatrolRecord")
+ public R detailPatrolRecord(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
+ return communityService.detailPatrolRecord(patrolRecordId);
+ }
+
+ /**
+ * 分页查询安全工作记录
+ *
+ * @param comSwPatrolRecordPageDTO
+ * 查询参数
+ * @return 安全工作记录分页集合
+ */
+ @ApiOperation(value = "分页查询安全工作记录", response = ComSwSafetyWorkRecordVO.class)
+ @PostMapping("/app/pageSafetyWorkRecord")
+ public R pageSafetyWorkRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
+ Long communityId = this.getCommunityId();
+ comSwPatrolRecordPageDTO.setCommunityId(communityId);
+ return communityService.pageSafetyWorkRecord(comSwPatrolRecordPageDTO);
+ }
+
+ /**
+ * 根据安全工作记录id查询详情
+ *
+ * @param safetyWorkRecordId
+ * 安全工作记录
+ * @return 安全工作记录详情查询结果
+ */
+ @ApiOperation(value = "根据安全工作记录id查询详情", response = ComSwSafetyWorkRecordVO.class)
+ @GetMapping("/app/detailSafetyWorkRecord")
+ public R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId) {
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ return communityService.detailSafetyWorkRecord(safetyWorkRecordId, communityId);
+ }
+
+ /**
+ * 分页查询隐患报告
+ *
+ * @param comSwPatrolRecordPageDTO
+ * 查询参数
+ * @return 隐患报告分页集合
+ */
+ @ApiOperation(value = "分页查询隐患报告", response = ComSwDangerReportVO.class)
+ @PostMapping("/app/pageDangerReport")
+ public R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
+ Long communityId = this.getCommunityId();
+ comSwPatrolRecordPageDTO.setCommunityId(communityId);
+ comSwPatrolRecordPageDTO.setAreaCode(this.getAreaCode());
+ return communityService.pageDangerReport(comSwPatrolRecordPageDTO);
+ }
+
+ /**
+ * 根据隐患报告id查询详情
+ *
+ * @param dangerReportId
+ * 隐患报告id
+ * @return 隐患报告详情查询结果
+ */
+ @ApiOperation(value = "根据隐患报告id查询详情", response = ComSwDangerReportVO.class)
+ @GetMapping("/app/detailDangerReport")
+ public R detailDangerReport(@RequestParam(value = "dangerReportId") Long dangerReportId) {
+ return communityService.detailDangerReport(dangerReportId);
+ }
+
+ /**
+ * 根据巡查记录id查询隐患报告详情
+ *
+ * @param patrolRecordId
+ * 巡查记录id
+ * @return 隐患报告详情查询结果
+ */
+ @ApiOperation(value = "根据巡查记录id查询隐患报告详情", response = ComSwDangerReportVO.class)
+ @GetMapping("/app/detailDangerReportByPrId")
+ public R detailDangerReportByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
+ return communityService.detailDangerReportByPrId(patrolRecordId);
+ }
+
+ /**
+ * 整改隐患报告
+ *
+ * @param comSwDangerReportRectifyDTO
+ * 隐患报告整改参数
+ * @return 整改结果
+ */
+ @ApiOperation(value = "整改隐患报告")
+ @PostMapping("/app/rectifyDangerReport")
+ public R rectifyDangerReport(@RequestBody ComSwDangerReportRectifyDTO comSwDangerReportRectifyDTO) {
+ return communityService.rectifyDangerReport(comSwDangerReportRectifyDTO);
+ }
+
+ /**
+ * 根据日期查询值班人员
+ *
+ * @return 查询结果
+ */
+ @ApiOperation(value = "根据日期查询值班人员")
+ @GetMapping("/app/getRotaPersonByDate")
+ public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate) {
+ return communityService.getRotaPersonByDate(rotaDate,this.getCommunityId());
+ }
+
+ /**
+ * 根据日期查询值班领导
+ *
+ * @return 查询结果
+ */
+ @ApiOperation(value = "根据日期查询值班领导")
+ @GetMapping("/app/getRotaLeaderByDate")
+ public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate) {
+ return communityService.getRotaLeaderByDate(rotaDate,this.getCommunityId());
+ }
+
+ /**
+ * 选择人员
+ *
+ * @param param
+ * 查询条件
+ * @return 查询结果
+ */
+ @ApiOperation(value = "选择人员")
+ @PostMapping("/app/getTotlePerson")
+ public R getTotlePerson(@RequestParam(value = "param", required = false) String param) {
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ return partyBuildingService.getTotlePerson(param, communityId);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
new file mode 100644
index 0000000..b0cf792
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
@@ -0,0 +1,356 @@
+package com.panzhihua.applets.api;
+
+import cn.binarywang.wx.miniapp.api.WxMaSecCheckService;
+import com.alibaba.fastjson.JSON;
+import com.panzhihua.applets.config.MinioUtil;
+import com.panzhihua.applets.config.WxMaConfiguration;
+import com.panzhihua.applets.umf.UmfPayUtil;
+import com.panzhihua.applets.unionpay.*;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.constants.FtpConstants;
+import com.panzhihua.common.constants.UserConstants;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.bracelet.BraceletEarlyWarningDO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.Base64File;
+import com.panzhihua.common.model.vos.community.WeatherVO;
+import com.panzhihua.common.model.vos.user.UserPhoneVO;
+import com.panzhihua.common.service.bracelet.CommunityBraceletService;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import net.coobird.thumbnailator.Thumbnails;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang3.RandomUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;
+import static com.panzhihua.common.utlis.PayUtil.makeUUID;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 公共接口
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-10 15:41
+ **/
+@Slf4j
+@RestController
+@RequestMapping("/common/")
+@Api(tags = {"公共接口"})
+public class CommonApi extends BaseController {
+ /**
+ * 允许的图片文件后缀
+ */
+ private static List<String> fileExtensionAllow = Arrays.asList("gif", "jpg", "png", "jpeg");
+ /**
+ * 允许的视频文件后缀
+ */
+ private static List<String> videoExtensionAllow = Arrays.asList("mp4", "mov");
+ @Resource
+ private StringRedisTemplate stringRedisTemplate;
+ // FTP 登录用户名
+ @Value("${ftp.username}")
+ private String userName;
+ // FTP 登录密码
+ @Value("${ftp.password}")
+ private String password;
+ // FTP 服务器地址IP地址
+ @Value("${ftp.host}")
+ private String host;
+ // FTP 端口
+ @Value("${ftp.port}")
+ private int port;
+ @Value("${ftp.url}")
+ private String url;
+ @Value("${minio.url}")
+ private String minUrl;
+ @Resource
+ private WxMaConfiguration wxMaConfiguration;
+ @Resource
+ private CommunityService communityService;
+
+ @Resource
+ private CommunityBraceletService communityBraceletService;
+ @Resource
+ private MinioUtil minioUtil;
+ @Resource
+ private UmfPayUtil umfPayUtil;
+
+ public static void main(String[] args) {
+ // int nextInt = RandomUtils.nextInt(99999, 1000000);
+ // System.out.println(nextInt);
+ String basicStr =
+ "2092261934651932672" + ":" + "de1c0dbb-9197-4724-9cc2-aa94e30a072f" + ":" + System.currentTimeMillis();
+ String s = Base64.getEncoder().encodeToString(basicStr.getBytes());
+ System.out.println(s);
+
+ }
+
+ @ApiOperation(value = "上传照片/视频 (jpg/jpeg/png/mp4/mov)")
+ @PostMapping(value = "uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-date")
+ public R uploadImage(@RequestParam MultipartFile file, HttpServletRequest request) throws IOException {
+ // 微信图片内容校验
+ WxMaSecCheckService wxMaSecCheckService = wxMaConfiguration.getMaService(this.getAppId()).getSecCheckService();
+ String property = System.getProperty("user.dir");
+
+ String fileExtension = ".jpg";
+
+ String originName = file.getOriginalFilename();
+ AtomicBoolean isVideo = new AtomicBoolean(false);
+ videoExtensionAllow.forEach(ext -> {
+ String originNameLowerCase = originName.toLowerCase();
+ if (originNameLowerCase.endsWith("." + ext)) {
+ isVideo.set(true);
+ }
+ });
+ if (isVideo.get()) {
+ fileExtension = ".mp4";
+ }
+
+ String fileName = property + File.separator + UUID.randomUUID().toString().replace("-", "") + fileExtension;
+ File file1 = new File(fileName);
+
+ String name = file.getOriginalFilename();
+ name = UUID.randomUUID().toString().replaceAll("-", "") + fileExtension;
+ try {
+ SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+ sftp.login();
+ InputStream is = file.getInputStream();
+ file.transferTo(file1);
+ try {
+ // boolean b = wxMaSecCheckService.checkImage(file1);
+ boolean delete = file1.delete();
+ log.info("临时文件删除【{}】", delete);
+ // if (!b) {
+ // return R.fail("图片内容违规");
+ // }
+ } catch (Exception e) {
+ log.error("微信审核图片出错【{}】", e.getMessage());
+ return R.fail("图片上传失败");
+ // e.printStackTrace();
+ }
+ sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
+ sftp.logout();
+ return R.ok(url + "/idcard/" + name);
+ } catch (Exception e) {
+ log.error("上传照片失败【{}】", e.getMessage());
+ return R.fail();
+ }
+
+ }
+
+ @ApiOperation(value = "新上传照片接口")
+ @PostMapping(value = "/uploadimages", consumes = "multipart/*", headers = "content-type=multipart/form-date")
+ public R uploadImages(@RequestParam MultipartFile file, HttpServletRequest request) {
+ try {
+ assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+ String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+ String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
+ String imageUrl = minioUtil.upload(file, name);
+ return R.ok(imageUrl);
+ } catch (Exception e) {
+ log.error("上传照片失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+
+ @ApiOperation(value = "文件流上传接口")
+ @PostMapping(value = "/uploadImagesInputStream")
+ public R uploadImagesInputStream(@RequestBody Base64File file, HttpServletRequest request) {
+ if(StringUtils.isEmpty(file.getFile())){
+ return R.fail("文件不能为Null");
+ }
+ try {
+ String name = UUID.randomUUID().toString().replaceAll("-", "") + ".jpg";
+ InputStream is = minioUtil.base64StrToInputStream(file.getFile().replace("data:image/png;base64,","").replace("data:image/jpg;base64,","").replace("data:image/jpeg;base64,",""));
+ String imageUrl = minioUtil.uploadInputStream(is, name);
+ return R.ok(imageUrl);
+ } catch (Exception e) {
+ log.error("上传照片失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+
+ @ApiOperation(value = "新上传照片压缩接口")
+ @PostMapping(value = "/uploadimagescompress", consumes = "multipart/*", headers = "content-type=multipart/form-date")
+ public R uploadImagesComPress(@RequestParam MultipartFile file, HttpServletRequest request) {
+ try {
+ assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+ String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+ String uuid=UUID.randomUUID().toString().replaceAll("-", "");
+ String name = uuid + "."+ extension;
+ String fileName = minioUtil.uploadRetFileName(file, name);
+ Thumbnails.of(file.getInputStream()).scale(0.5).outputQuality(0.71).outputFormat("jpg").toFile(uuid+"_compress");
+ File file1=new File(uuid+"_compress.jpg");
+ String imageUrl = minioUtil.uploadFile(file1, uuid+"_compress.jpg");
+ //上传完压缩图后把原图清理，防止文件服务器资源爆满
+ minioUtil.removeMinio(fileName);
+ return R.ok(imageUrl);
+ } catch (Exception e) {
+ log.error("上传照片失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+
+ @ApiOperation(value = "发送验证码")
+ @PostMapping(value = "smscode")
+ public R smscode(@RequestBody UserPhoneVO userPhoneVO) {
+ String newPhone = userPhoneVO.getNewPhone();
+ if (ObjectUtils.isEmpty(newPhone)) {
+ return R.fail("新手机号不能为空");
+ }
+ // todo 发送验证码接第三方
+ int nextInt = RandomUtils.nextInt(99999, 1000000);
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ valueOperations.set(UserConstants.PHONE_PUT + newPhone, nextInt + "", 3, TimeUnit.MINUTES);
+ return R.ok(nextInt);
+ }
+
+ @ApiOperation(value = "获取天气", response = WeatherVO.class)
+ @GetMapping(value = "/getWeather/noToken")
+ public R getWeather() {
+ // 获取请求url
+ String url = Constants.G_D_WEATHER_URL;
+ // 获取请求参数
+ String param = "key=" + Constants.G_D_WEATHER_KEY + "&city=510400";
+ String result = HttpUtils.sendGet(url, param);
+ return R.ok(JSON.parseObject(result));
+ }
+
+ @ApiOperation(value = "获取安全知识培训跳转url")
+ @GetMapping(value = "getSafety")
+ public R getSafety()
+ {
+ return R.ok("https://pzh.axhpx.com/Wechat/");
+ }
+
+
+ @ApiOperation("uu洗车下单接口")
+ @GetMapping("/uuPay")
+ public R uuPay(@RequestParam("orderid") String orderid,@RequestParam("openid")String openid,@RequestParam("amount")String amount){
+ Map map=umfPayUtil.pay(orderid, DateUtils.getCurrentDateString(),openid,amount);
+ return R.ok(map);
+ }
+
+ @ApiOperation("无水洗车下单接口")
+ @GetMapping("/wsPay")
+ public R wsPay(@RequestParam("orderid") String orderid,@RequestParam("openid")String openid,@RequestParam("amount")String amount){
+ Map map=umfPayUtil.pay2(orderid, DateUtils.getCurrentDateString(),openid,amount);
+ return R.ok(map);
+ }
+
+
+
+
+
+ @ApiOperation("uu洗车银联下单接口")
+ @GetMapping("/uuUnionpayPay")
+ public R uuUnionpayPay(@RequestParam("amount")String amount,
+ @RequestParam("productId")String productId,
+ @RequestParam("openId")String openId){
+
+ LocalDateTime time=DateUtils.getCurrentDate();
+ String merOrderId= UnionpayContent.TOP4+time.format(DateUtils.format_ymdhms_yyyyMMddmmHHssSSS)+makeUUID(7);
+ String map= UnifiedOrder.sendOrder(amount,"uu洗车下单",productId,openId,time,merOrderId);
+ communityService.add(productId,merOrderId,amount);
+ return R.ok(map);
+ }
+
+ @ApiOperation("无水洗车银联下单接口")
+ @GetMapping("/wsUnionpayPay")
+ public R wsUnionpayPay(@RequestParam("amount")String amount,
+ @RequestParam("productId")String productId,
+ @RequestParam("openId")String openId){
+ LocalDateTime time=DateUtils.getCurrentDate();
+ String merOrderId= UnionpayContent.TOP4+time.format(DateUtils.format_ymdhms_yyyyMMddmmHHssSSS)+makeUUID(7);
+ String map= UnifiedOrder.sendOrder(amount,"无水洗车下单",productId,openId,time,merOrderId);
+ communityService.add(productId,merOrderId,amount);
+ return R.ok(map);
+ }
+
+ @ApiOperation("uu洗车银联退款接口")
+ @GetMapping("/uuUnionpayRefund")
+ public R uuUnionpayRefundPay(@RequestParam("refundAmount")String refundAmount,
+ @RequestParam("refundOrderId")String refundOrderId){
+ String map= Refund.sendOrder(refundAmount,refundOrderId);
+ return R.ok(map);
+ }
+
+ @ApiOperation("无水洗车银联退款接口")
+ @GetMapping("/wsUnionpayRefund")
+ public R wsUnionpayRefundPay(@RequestParam("refundAmount")String refundAmount,
+ @RequestParam("refundOrderId")String refundOrderId){
+ String map= Refund.sendOrder(refundAmount,refundOrderId);
+ return R.ok(map);
+ }
+
+
+ @ApiOperation("银联支付查询接口")
+ @GetMapping("/unionpayQuery")
+ public R unionpayRefundPay(@RequestParam("merOrderId")String merOrderId){
+ String map= Query.query(merOrderId);
+ return R.ok(map);
+ }
+
+ @ApiOperation("银联退款查询接口")
+ @GetMapping("/unionpayRefundQuery")
+ public R unionpayRefundQuery(@RequestParam("merOrderId")String merOrderId){
+ String map= RefundQuery.refundQuery(merOrderId);
+ return R.ok(map);
+ }
+
+
+ /**
+ * 获取预警数据
+ * @param communityId
+ * @return
+ */
+ @ApiOperation("微信手环人员处理工单列表")
+ @GetMapping("bracelet/getEarlyWarningList")
+ public R getList(@RequestParam("pageNum") Integer pageNum,
+ @RequestParam("pageSize") Integer pageSize,
+ @RequestParam("communityId") String communityId,
+ @RequestParam("disposeUserId") String disposeUserId,
+ @RequestParam("type") String type)
+ {
+ return communityBraceletService.getList(pageNum,pageSize,communityId,"",disposeUserId,type,"","");
+ }
+
+ /**
+ * 微信处理接口
+ * @param braceletEarlyWarningDO
+ * @return
+ */
+ @PostMapping("bracelet/WXdispose")
+ public R WXdispose(@RequestBody BraceletEarlyWarningDO braceletEarlyWarningDO)
+ {
+ if(StringUtils.isEmpty(braceletEarlyWarningDO.getDisposeText()))
+ {
+ return R.fail("处理内容不能为空");
+ }
+ braceletEarlyWarningDO.setDisposeType("2");
+ return communityBraceletService.WXdispose(braceletEarlyWarningDO);
+ }
+
+
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
new file mode 100644
index 0000000..0b2dd31
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -0,0 +1,494 @@
+package com.panzhihua.applets.api;
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
+import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
+import com.panzhihua.common.model.dtos.common.PageComMngVolunteerSkillDto;
+import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComMngVolunteerOrgTeamVo;
+import com.panzhihua.common.model.vos.common.ComMngVolunteerServiceTypeVo;
+import com.panzhihua.common.model.vos.common.ComMngVolunteerSkillVo;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.neighbor.ActivityAnalysisVO;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.community.CommunityWestService;
+import com.panzhihua.common.service.partybuilding.PartyBuildingService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PageGroup;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
+
+import static java.util.Objects.isNull;
+import static org.apache.commons.lang3.ObjectUtils.isEmpty;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 社区服务
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-10 10:04
+ **/
+@Slf4j
+@RestController
+@RequestMapping("/community/")
+@Api(tags = {"社区服务"})
+public class CommunityApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private CommunityWestService communityWestService;
+ @Resource
+ private UserService userService;
+ @Resource
+ private PartyBuildingService partyBuildingService;
+ @Resource
+ private CheckService checkService;
+
+ @ApiOperation(value = "分页查询小区", response = ComMngStructAreaVO.class)
+ @PostMapping("pagearea")
+ public R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO) {
+ return communityService.pageArea(comMngStructAreaVO);
+ }
+
+ @ApiOperation(value = "新分页查询小区", response = ComMngVillageVO.class)
+ @PostMapping("pagevillage")
+ public R pageVillage(@RequestBody PageComMngVillageDTO pageComMngVillageDTO) {
+ return communityService.pageVillage(pageComMngVillageDTO);
+ }
+
+ @ApiOperation(value = "分页获取社区动态", response = ComActDynVO.class)
+ @PostMapping("pagedynamic")
+ public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
+// LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+// if (loginUserInfo != null) {
+// comActDynVO.setCommunityId(loginUserInfo.getCommunityId()+"");
+// }
+ comActDynVO.setIsTopping(null);
+ comActDynVO.setStatus(1);
+ Integer category = comActDynVO.getCategory();
+ if (isNull(category)) {
+ comActDynVO.setCategory(1);
+ }
+ return communityService.pageDynamic(comActDynVO);
+ }
+
+ @ApiOperation(value = "分页查项目活动")
+ @PostMapping("projectPageActivity")
+ public R projectPageActivity(@RequestBody ComActActivityVO comActActivityVO) {
+ Long projectId = comActActivityVO.getProjectId();
+ if (isNull(projectId)) {
+ Long communityId = this.getCommunityId();
+ comActActivityVO.setCommunityId(communityId);
+ }
+ // return communityService.pageActivity(ComActActivityVO);
+ return communityService.pageActivityCommunityBack(comActActivityVO);
+ }
+
+
+ @ApiOperation(value = "社区动态详情", response = ComActDynVO.class)
+ @GetMapping("detaildynamic")
+ @ApiImplicitParam(name = "id", value = "社区动态主键", required = true)
+ public R detailDynamic(@RequestParam("id") Long id) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ Long userId = null;
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+ R r = communityService.detailDynamic(id);
+ if (R.isOk(r)) {
+ Object data = r.getData();
+ ComActDynVO comActDynVO = JSONObject.parseObject(JSONObject.toJSONString(data), ComActDynVO.class);
+ if (userId != null) {
+ // 增加浏览记录
+ R r1 = communityService.addDynamicUser(id, userId);
+ if (R.isOk(r1)) {
+ comActDynVO.setIsAdd(1);
+ } else {
+ comActDynVO.setIsAdd(0);
+ }
+ }
+ return R.ok(comActDynVO);
+ }
+ return r;
+ }
+
+ @ApiOperation(value = "分页查询社区活动", response = ComActActivityVO.class)
+ @PostMapping("pageactivity")
+ public R pageActivity(@RequestBody ComActActivityVO comActActivityVO)
+ {
+ if(comActActivityVO.getCommunityId()<=0)
+ {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ comActActivityVO.setCommunityId(loginUserInfo.getCommunityId());
+ }
+ }
+
+ comActActivityVO.setIsApplets(1);
+ Integer status = comActActivityVO.getStatus();
+ if (null != status && status.intValue() == 4) {
+ comActActivityVO.setIsIng(1);
+ }
+ return communityService.pageActivity(comActActivityVO);
+ }
+
+ @ApiOperation(value = "社区活动/志愿者活动详情", response = ComActActivityVO.class)
+ @GetMapping("detailactivity")
+ @ApiImplicitParam(name = "id", value = "社区活动主键", required = true)
+ public R detailActivity(@RequestParam("id") Long id) {
+ Long userId = null;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+ return communityService.detailActivity(id, userId, null, null);
+ }
+
+ @ApiOperation(value = "分页查询活动评价记录", response = ComActActEvaluateVO.class)
+ @PostMapping("evaluate/page")
+ public R pageActivityEvaluates(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
+ return communityService.pageActivityEvaluates(comActActEvaluateVO);
+ }
+
+ @ApiOperation(value = "社区活动/志愿者活动签到")
+ @PostMapping("activity/sign-in")
+ public R activitySignIn(@RequestBody ComActActRegistVO comActActRegistVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ comActActRegistVO.setUserId(loginUserInfo.getUserId());
+ return communityService.activitySignIn(comActActRegistVO);
+ }
+
+ @ApiOperation(value = "社区活动/志愿者活动评价")
+ @PostMapping("activity/evaluate")
+ public R activityEvaluate(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ comActActEvaluateVO.setUserId(loginUserInfo.getUserId());
+ String openid = this.getLoginUserInfo().getOpenid();
+ String appId = this.getAppId();
+ // 微信内容审核
+ String evaluateContent = comActActEvaluateVO.getEvaluateContent();
+ if (StrUtil.isNotBlank(evaluateContent)) {
+ String result = checkService.checkMessageBy(evaluateContent, openid, appId);
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
+
+ //微信图片审核
+ String photo = comActActEvaluateVO.getPhoto();
+ if (StrUtil.isNotBlank(photo)) {
+ if (!checkService.checkImageBy(photo, appId)) {
+ return R.fail(501, "上传图片存在违规信息");
+ }
+ }
+ return communityService.activityEvaluate(comActActEvaluateVO);
+ }
+
+ @ApiOperation(value = "我的评价", response = MyActivityEvaluateVO.class)
+ @GetMapping("activity/my-evaluate")
+ public R listMyActivityEvaluate(@RequestParam("activityId") Long activityId) {
+ return communityService.listMyActivityEvaluate(getUserId(), activityId);
+ }
+
+ @ApiOperation(value = "报名/取消报名社区活动")
+ @PutMapping("signactivity")
+ public R signActivity(@RequestBody @Validated(AddGroup.class) SignactivityVO signactivityVO) {
+ Long userId = this.getUserId();
+ Long activityId = signactivityVO.getActivityId();
+ signactivityVO.setUserId(userId);
+ R r = communityService.signActivity(signactivityVO);
+ if (R.isOk(r) && signactivityVO.getType().intValue() == 1) {
+ R r2 = communityService.detailActivity(activityId, userId, null, null);
+ ComActActivityVO comActActivityVO =
+ JSONObject.parseObject(JSONObject.toJSONString(r2.getData()), ComActActivityVO.class);
+ Integer isVolunteer = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), Integer.class);
+ SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
+ sysUserNoticeVO.setUserId(userId);
+ sysUserNoticeVO.setType(1);
+ sysUserNoticeVO.setTitle("报名成功");
+ sysUserNoticeVO.setBusinessType(1);
+ sysUserNoticeVO.setBusinessTitle(comActActivityVO.getActivityName());
+ Date beginAt = comActActivityVO.getBeginAt();
+ sysUserNoticeVO.setBusinessContent(String.format("活动将于%tF %tT 开始，请按时参加", beginAt, beginAt));
+ sysUserNoticeVO.setBusinessId(activityId);
+ sysUserNoticeVO.setStatus(0);
+ sysUserNoticeVO.setActivityType(comActActivityVO.getType());
+ sysUserNoticeVO.setBusinessStatus(2);
+ R r1 = userService.addNotice(sysUserNoticeVO);
+ if (R.isOk(r1)) {
+ log.info("新增用户报名社区活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
+ }
+ return r;
+ }
+
+ @ApiOperation(value = "活动人员列表", response = ActivitySignVO.class)
+ @ApiImplicitParams({@ApiImplicitParam(name = "type", value = "人员类型 1 普通居民 2 志愿者", required = true),
+ @ApiImplicitParam(name = "id", value = "社区活动主键", required = true)})
+ @GetMapping("listactivitysign")
+ public R listActivitySign(@RequestParam("id") Long id, @RequestParam("type") Integer type) {
+ ActivitySignVO activitySignVO = new ActivitySignVO();
+ activitySignVO.setActivityId(id);
+ if (null == type || 0 == type || type > 2) {
+ return R.fail("人员类型错误");
+ }
+ activitySignVO.setType(type);
+ return communityService.listActivitySign(activitySignVO);
+ }
+
+ @ApiOperation(value = "活动报名签到情况", response = ActivitySignInRecordVO.class)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "社区活动主键", required = true),
+ @ApiImplicitParam(name = "type", value = "活动类型，1.居民/志愿者活动 2.党员活动", required = true)
+ })
+ @GetMapping("activity/sign-in/list")
+ public R listSignInRecord(@RequestParam("id") Long id, @RequestParam("type") Integer type) {
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ if (loginUserInfo.getIsCommunityWorker().intValue() != 1) {
+ return R.fail("非社区工作人员");
+ }
+ if (type.intValue() == 1) {
+ return communityService.listSignInRecord(id);
+ }
+ return R.fail("type不存在");
+ }
+
+ @ApiOperation(value = "活动签到记录", response = ComActActRegistVO.class)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "活动主键", required = true),
+ @ApiImplicitParam(name = "type", value = "活动类型，1.居民/志愿者活动 2.党员活动", required = true),
+ @ApiImplicitParam(name = "userId", value = "用户id", required = true)
+ })
+ @GetMapping("activity/regist/list")
+ public R listRegistRecord(@RequestParam("id") Long id,
+ @RequestParam("type") Integer type,
+ @RequestParam("userId") Long userId) {
+ if (type.intValue() == 1) {
+ return communityService.listRegistRecord(id, userId);
+ }
+ return R.fail("type不存在");
+ }
+
+ @ApiOperation(value = "活动邀请列表", response = ActivityInviteVO.class)
+ @PostMapping("activity/invite/list")
+ public R pageActivityInviteList(@RequestBody @Valid PageActivityInviteDTO pageActivityInviteDTO) {
+ return communityService.pageActivityInviteList(pageActivityInviteDTO);
+ }
+
+ @ApiOperation(value = "添加邀请人员")
+ @PostMapping("activity/invite/add")
+ public R activityInviteAdd(@RequestBody @Valid List<ActivityInviteDTO> list) {
+ if (!isEmpty(list)) {
+ list.forEach(e -> e.setCreatedBy(this.getUserId()));
+ } else {
+ return R.fail("列表为空");
+ }
+ return communityService.activityInviteAdd(list);
+ }
+
+
+ @ApiOperation(value = "删除邀请人员")
+ @ApiImplicitParam(name = "id", value = "邀请主键id", required = true)
+ @DeleteMapping("activity/invite/delete")
+ public R activityInviteDelete(@RequestParam("id") Long id) {
+ return communityService.activityInviteDelete(id);
+ }
+
+ // @ApiOperation(value = "新增社区动态浏览记录")
+ // @PostMapping("dynamicuser")
+ // public R addDynamicUser(@RequestBody ComActDynVO comActDynVO){
+ // Long id = comActDynVO.getId();
+ // if (null==id||id==0) {
+ // return R.fail("社区动态不存在");
+ // }
+ // Long userId = this.getUserId();
+ // return communityService.addDynamicUser(id,userId);
+ // }
+
+ @ApiOperation(value = "志愿者申请")
+ @PostMapping("volunteer")
+ public R addVolunteer(@RequestBody @Validated(AddGroup.class) ComMngVolunteerMngVO comMngVolunteerMngVO) {
+ comMngVolunteerMngVO.setState(1);
+ comMngVolunteerMngVO.setCommunityId(this.getCommunityId());
+ comMngVolunteerMngVO.setSubmitUserId(this.getUserId());
+ return communityService.addVolunteer(comMngVolunteerMngVO);
+ }
+
+ @ApiOperation(value = "分页查询志愿者团队", response = ComMngVolunteerMngVO.class)
+ @PostMapping("pagevolunteer")
+ public R pageVolunteer(@RequestBody @Validated(PageGroup.class) PageVolunteerDTO pageVolunteerDTO) {
+ ComMngVolunteerMngVO comMngVolunteerMngVO = new ComMngVolunteerMngVO();
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ comMngVolunteerMngVO.setCommunityId(loginUserInfo.getCommunityId());
+ } else {
+ comMngVolunteerMngVO.setCommunityId(pageVolunteerDTO.getCommunityId());
+ }
+ comMngVolunteerMngVO.setPageNum(pageVolunteerDTO.getPageNum());
+ comMngVolunteerMngVO.setPageSize(pageVolunteerDTO.getPageSize());
+ return communityService.pageVolunteer(comMngVolunteerMngVO);
+ }
+
+ @ApiOperation(value = "志愿者详情", response = ComMngVolunteerMngAppletsVO.class)
+ @GetMapping("volunteer")
+ public R detailVolunteer(@RequestParam("id") Long id) {
+ return communityService.detailVolunteer(id);
+ }
+
+ @ApiOperation(value = "查询志愿者组织列表", response = ComMngVolunteerOrgTeamVo.class)
+ @GetMapping("/volunteer/org/list")
+ public R listVolunteerOrgAdmin() {
+ PageComMngVolunteerOrgTeamDto orgTeamDto = new PageComMngVolunteerOrgTeamDto();
+ orgTeamDto.setParentId(0L);
+ orgTeamDto.setCommunityId(this.getCommunityId());
+ return communityService.listVolunteerOrgAdmin(orgTeamDto);
+ }
+
+ @ApiOperation(value = "查询志愿者服务类型列表", response = ComMngVolunteerServiceTypeVo.class)
+ @GetMapping("/volunteer/service/type/list")
+ public R listVolunteerServiceTypeAdmin() {
+ PageComMngVolunteerServiceTypeDto serviceTypeDto = new PageComMngVolunteerServiceTypeDto();
+ serviceTypeDto.setCommunityId(this.getCommunityId());
+ return communityService.listServiceTypeAdmin(serviceTypeDto);
+ }
+
+ @ApiOperation(value = "查询志愿者技能列表", response = ComMngVolunteerSkillVo.class)
+ @GetMapping("/volunteer/skill/list")
+ public R listVolunteerSkillAdmin() {
+ PageComMngVolunteerSkillDto volunteerSkillDto = new PageComMngVolunteerSkillDto();
+ volunteerSkillDto.setCommunityId(this.getCommunityId());
+ return communityService.listVolunteerSkillAdmin(volunteerSkillDto);
+ }
+
+ @ApiOperation(value = "车辆登记")
+ @PostMapping("car/register")
+ public R addComMngCar(@Validated(AddGroup.class) @RequestBody ComMngCarAppletDTO comMngCarAppletDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long communityId = loginUserInfo.getCommunityId();
+ if (null != communityId && 0 != communityId) {
+ comMngCarAppletDTO.setCommunityId(communityId);
+ comMngCarAppletDTO.setAreaId(loginUserInfo.getAreaId());
+ comMngCarAppletDTO.setUserName(loginUserInfo.getName());
+ comMngCarAppletDTO.setUserId(loginUserInfo.getUserId());
+ comMngCarAppletDTO.setMobile(loginUserInfo.getPhone());
+ comMngCarAppletDTO.setSource(1);
+ }
+ return communityService.addComMngCarApplet(comMngCarAppletDTO);
+ }
+
+ @ApiOperation(value = "登记车辆列表", response = ComMngCarVO.class)
+ @GetMapping("car/list")
+ public R comMngCarList() {
+ return communityService.userComMngCarList(this.getUserId());
+ }
+
+ @ApiOperation(value = "获取树结构区域信息")
+ @GetMapping(value = "arealist")
+ public R getAllArea(@ApiParam(name = "城市编码:四川510000",
+ required = true) @RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
+ return communityService.getCityTreeByProvinceCode(provinceAdcode, null);
+ }
+
+ @ApiOperation(value = "社区详情", response = ComActVO.class)
+ @GetMapping("community")
+ public R detailCommunity() {
+ return communityService.detailCommunity(this.getCommunityId());
+ }
+
+ @ApiOperation(value = "查询活动报名名单集合", response = ActivitySignVO.class)
+ @PostMapping("listactivitysign")
+ public R listActivitySign(@RequestBody ActivitySignVO activitySignVO) {
+ if (ObjectUtils.isEmpty(activitySignVO.getActivityId())) {
+ return R.fail("活动id主键不能为空");
+ }
+ return communityService.listActivitySign(activitySignVO);
+ }
+
+ @ApiOperation(value = "查询社区列表")
+ @GetMapping("actList")
+ public R getWestCommunityLists() {
+ return communityService.getWestCommunityLists(this.getAreaCode());
+ }
+
+ @ApiOperation(value = "分页查询街道", response = PageComStreetDTO.class)
+ @PostMapping("pagestreet")
+ public R pageStreet(@RequestBody PageComStreetDTO pageComStreetDTO) {
+ pageComStreetDTO.setAreaCode(this.getAreaCode());
+ return communityService.pageStreet(pageComStreetDTO);
+ }
+
+ @ApiOperation(value = "新增服务活动")
+ @PostMapping("activity")
+ public R addActivity(@RequestBody @Validated(AddGroup.class) ComActActivityVO comActActivityVO) {
+ Long communityId = this.getCommunityId();
+ comActActivityVO.setCommunityId(communityId);
+ comActActivityVO.setUserId(this.getLoginUserInfo().getUserId());
+ comActActivityVO.setStatus(2);
+ comActActivityVO.setHasPrize(0);
+ return communityService.addActivity(comActActivityVO);
+ }
+
+ @ApiOperation(value = "单位活动统计", response = ActivityAnalysisVO.class)
+ @GetMapping("activity/analysis")
+ public R activityUnitAnalysis(@RequestParam(value = "year", required = false) Integer year,
+ @RequestParam(value = "type", required = false) Integer type,
+ @RequestParam(value = "range", required = false) Integer range,
+ @RequestParam(value = "communityId", required = false) Long communityId,
+ @RequestParam(value = "page", required = false) Integer page,
+ @RequestParam(value = "size", required = false) Integer size,
+ @RequestParam(value = "belongTo", required = false) String belongTo,
+ @RequestParam(value = "unitId", required = false) Long unitId,
+ @RequestParam(value = "searchContent",required = false) String searchContent) {
+ return communityService.institutionalUnitServiceAnalysis(year, type, range, communityId, page,
+ size, belongTo, unitId, this.getLoginUserInfo().getAccount(),searchContent);
+ }
+
+
+ @ApiOperation(value = "分页查询服务范围数据", response = ComActColumnVO.class)
+ @PostMapping("comActColumn/queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ if (this.getLoginUserInfo().getStreetId() != null) {
+ commonPage.setStreetId(this.getLoginUserInfo().getStreetId());
+ } else {
+ commonPage.setCommunityId(this.getCommunityId());
+ }
+ return this.communityService.comActColumnSelectAll(commonPage);
+ }
+
+ @ApiOperation(value = "街道详情", response = ComStreetVO.class)
+ @ApiImplicitParam(name = "id", value = "街道id", required = true)
+ @GetMapping("street")
+ public R detailStreet(@RequestParam("id") Long id) {
+ return communityWestService.detailStreet(id);
+ }
+
+ @ApiOperation(value = "根据id查询社区详情", response = ComActVO.class)
+ @ApiImplicitParam(name = "id", value = "社区id", required = true)
+ @GetMapping("detail")
+ public R detailCommunity(@RequestParam("id") Long id) {
+ return communityService.detailCommunity(id);
+ }
+
+ @ApiOperation(value = "获取问题清单，需求清单，报道服务活动数量",response = DataCount.class)
+ @GetMapping("/dataCount")
+ public R dataCount(){
+ return communityService.dataCount();
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java
new file mode 100644
index 0000000..01560a6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java
@@ -0,0 +1,136 @@
+package com.panzhihua.applets.api;
+
+import java.util.Objects;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComCvtBusinessDetailVO;
+import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientProductLevelInfoVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientProductVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 社区便民服务商家接口
+ * @author: Null
+ * @date: 2021/3/11 13:26
+ */
+@Slf4j
+@Api(tags = {"社区运营/便民服务"})
+@RestController
+@RequestMapping("/convenient")
+public class CommunityConvenientApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @Deprecated
+ @ApiOperation(value = "分页查询便民服务商家", response = ComCvtBusinessVO.class)
+ @PostMapping("/business/area/page")
+ public R pageComCvtBusiness(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ comCvtBusinessAppletsDTO.setCommunityId(loginUserInfo.getCommunityId());
+ }
+ return communityService.pageComCvtBusinessByServiceArea(comCvtBusinessAppletsDTO);
+ }
+
+ @Deprecated
+ @ApiOperation(value = "查询便民服务商家详情", response = ComCvtBusinessDetailVO.class)
+ @GetMapping("/business/get")
+ public R getComCvtBusinessServeDetail(@RequestParam("id") Long id) {
+ return communityService.getComCvtBusinessServeDetail(id);
+ }
+
+ @ApiOperation(value = "获取商家数量大于0的服务类型", response = ConvenientServiceCategoryVO.class)
+ @GetMapping("/service-category/suitable")
+ public R getSuitableServiceCategories(@RequestParam("communityId") Long communityId) {
+ if (Objects.isNull(communityId)) {
+ return R.fail("社区id不能为空");
+ }
+ return communityService.getSuitableServiceCategories(communityId,this.getAreaCode());
+ }
+
+ @ApiOperation(value = "分页获取热门商家", response = ConvenientMerchantVO.class)
+ @PostMapping("/merchant/popular")
+ public R getPopularMerchants(@RequestBody @Valid PagePopularMerchantDTO pagePopularMerchantDTO) {
+ pagePopularMerchantDTO.setAreaCode(this.getAreaCode());
+ return communityService.getPopularMerchants(pagePopularMerchantDTO);
+ }
+
+ @ApiOperation(value = "分页获取服务类型下商家", response = ConvenientMerchantVO.class)
+ @PostMapping("/merchant/classify")
+ public R getClassifyMerchants(@RequestBody @Valid PageClassifyMerchantDTO pageClassifyMerchantDTO) {
+ pageClassifyMerchantDTO.setAreaCode(this.getAreaCode());
+ return communityService.getClassifyMerchants(pageClassifyMerchantDTO);
+ }
+
+ @ApiOperation(value = "商家详情", response = ConvenientMerchantVO.class)
+ @GetMapping("/merchant/detail")
+ public R getMerchantDetail(@RequestParam("merchantId") Long merchantId) {
+ return communityService.getMerchantDetail(merchantId);
+ }
+
+ @ApiOperation(value = "获取商家产品", response = ConvenientProductLevelInfoVO.class)
+ @GetMapping("/product/list")
+ public R getMerchantProduct(@RequestParam("merchantId") Long merchantId) {
+ return communityService.getMerchantProduct(merchantId);
+ }
+
+ @ApiOperation(value = "获取产品详情", response = ConvenientProductVO.class)
+ @GetMapping("/product/detail")
+ public R getProductDetail(@RequestParam("productId") Long productId) {
+ return communityService.getProductDetail(productId);
+ }
+
+ @ApiOperation(value = "商家分页搜索", response = ConvenientMerchantVO.class)
+ @PostMapping("/merchant/search")
+ public R pageSearchMerchant(@RequestBody @Valid PageSearchDTO pageSearchDTO) {
+ return communityService.pageSearchMerchant(pageSearchDTO);
+ }
+
+ @ApiOperation(value = "商品分页搜索", response = ConvenientProductVO.class)
+ @PostMapping("/product/search")
+ public R pageSearchProduct(@RequestBody @Valid PageSearchDTO pageSearchDTO) {
+ return communityService.pageSearchProduct(pageSearchDTO);
+ }
+
+ @ApiOperation(value = "增加商家咨询量")
+ @GetMapping("/merchant/incr-consult")
+ public R incrMerchantConsult(@RequestParam("merchantId") Long merchantId) {
+ return communityService.consultMerchant(merchantId);
+ }
+
+ @ApiOperation(value = "增加商家浏览量")
+ @GetMapping("/merchant/incr-view")
+ public R incrMerchantView(@RequestParam("merchantId") Long merchantId) {
+ return communityService.incrMerchantView(merchantId);
+ }
+
+ @ApiOperation(value = "增加产品浏览量")
+ @GetMapping("/product/incr-view")
+ public R incrProductView(@RequestParam("productId") Long productId) {
+ return communityService.incrProductView(productId);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
new file mode 100644
index 0000000..15fcbec
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
@@ -0,0 +1,87 @@
+package com.panzhihua.applets.api;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
+import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.questnaire.QuestnaireListVo;
+import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
+import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 社区通/调查问卷接口
+ * @author: cedoo
+ * @date: 2021-4-8
+ */
+@Slf4j
+@Api(tags = {"社区通/调查问卷"})
+@RestController
+@RequestMapping("/questnaire")
+public class CommunityQuestnaireApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "分页查询社区调查问卷", response = QuestnaireListVo.class)
+ @PostMapping("/pageUser")
+ public R pageUser(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail(401, "请先登录");
+ }
+ pageQuestnaireDTO.setCommunityId(loginUserInfo.getCommunityId());
+ pageQuestnaireDTO.setUserId(loginUserInfo.getUserId());
+ return communityService.pageQuestnaire(pageQuestnaireDTO);
+ }
+
+ @ApiOperation(value = "查询调查问卷详情", response = UsersAnswerVO.class)
+ @GetMapping("/detail")
+ public R viewQuestnaire(@RequestParam("questId") Long questId) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail(401, "请先登录");
+ }
+ return communityService.viewDetail(questId,loginUserInfo.getUserId());
+ }
+
+ @ApiOperation(value = "居民填写问卷调查问卷")
+ @PostMapping("/stat/answer")
+ public R usersAnswerQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ usersAnswerQuestnaireVO.setUserId(loginUserInfo.getUserId());
+ // 填写调查问卷发放积分
+ communityService.addIntegralTradeAdmin(new AddComActIntegralUserDTO(usersAnswerQuestnaireVO.getQuestId(),
+ AddComActIntegralUserDTO.integralType.cydcwj, loginUserInfo.getCommunityId(), loginUserInfo.getUserId()));
+ return communityService.usersAnsweQuestnaire(usersAnswerQuestnaireVO);
+
+ }
+
+ @ApiOperation(value = "添加浏览量")
+ @GetMapping("/add/view")
+ public R addView(@RequestParam("questId") Long questId) {
+ return communityService.addView(questId);
+ }
+
+ @ApiOperation(value = "用户弹窗添加不在提醒接口")
+ @GetMapping("/add/noNotice")
+ public R addNoNotice(@RequestParam("questId") Long questId) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ return communityService.addNoNotice(questId, loginUserInfo.getUserId());
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunitySwitchApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunitySwitchApi.java
new file mode 100644
index 0000000..2e8ffc4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunitySwitchApi.java
@@ -0,0 +1,45 @@
+package com.panzhihua.applets.api;
+
+import javax.annotation.Resource;
+
+import com.panzhihua.common.controller.BaseController;
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.switchs.CommunitySwitchAllAppletsVO;
+import com.panzhihua.common.model.vos.community.switchs.StreetAllAppletsVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequestMapping("/switch/")
+@Api(tags = {"切换社区模块"})
+public class CommunitySwitchApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "查询所有社区", response = StreetAllAppletsVO.class)
+ @GetMapping("/list/noToken")
+ public R list() {
+ return communityService.communitySwitchList(this.getAppId());
+ }
+
+ @ApiOperation(value = "根据名字搜索社区", response = CommunitySwitchAllAppletsVO.class)
+ @GetMapping("/search/noToken")
+ public R search(@RequestParam(value = "name") String name) {
+ return communityService.communitySwitchSearchList(name,this.getAppId());
+ }
+
+ @ApiOperation(value = "根据距离搜索社区", response = CommunitySwitchAllAppletsVO.class)
+ @PostMapping("/distance/noToken")
+ public R searchDistance(@RequestBody SearchCommunityDTO communityDTO) {
+ return communityService.communitySwitchSearchDistanceList(communityDTO);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
new file mode 100644
index 0000000..f8a74a1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
@@ -0,0 +1,312 @@
+package com.panzhihua.applets.api;
+
+import cn.hutool.core.util.StrUtil;
+import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActDiscussCommentVO;
+import com.panzhihua.common.model.vos.community.ComActDiscussVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 一起议
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-22 15:30
+ **/
+@Slf4j
+@Api(tags = {"一起议"})
+@RestController
+@RequestMapping("/")
+public class DiscussApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private CheckService checkService;
+
+ @ApiOperation(value = "一起议-新增")
+ @PostMapping("discuss")
+ public R addDiscuss(@RequestBody @Validated(AddGroup.class) ComActDiscussDTO comActDiscussDTO) {
+ String openid = this.getLoginUserInfo().getOpenid();
+ String appId = this.getAppId();
+ // 微信内容审核
+ String discussSubject = comActDiscussDTO.getDiscussSubject();
+ if (StrUtil.isNotBlank(discussSubject)) {
+ String result = checkService.checkMessageBy(discussSubject, openid, appId);
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
+
+ //微信图片审核
+ String photoPah = comActDiscussDTO.getPhotoPah();
+ if (StrUtil.isNotBlank(photoPah)) {
+ if (!checkService.checkImageBy(photoPah, appId)) {
+ return R.fail(501, "上传图片存在违规信息");
+ }
+ }
+
+ Integer type = comActDiscussDTO.getType();
+ String voteTitle = comActDiscussDTO.getVoteTitle();
+ List<ComActDiscussOptionDTO> discussOptions = comActDiscussDTO.getDiscussOptions();
+ if (type.equals(2)) {
+ if (ObjectUtils.isEmpty(voteTitle)) {
+ return R.fail("投票标题不能为空");
+ }
+ if (ObjectUtils.isEmpty(discussOptions)) {
+ return R.fail("选项不能为空");
+ }
+ if (discussOptions.size() < 2) {
+ return R.fail("请至少设置两个投票选项");
+ }
+ //设置投票开始时间 nowDate
+ comActDiscussDTO.setStartTime(DateUtils.format(new Date(), DateUtils.ymdhms_format));
+ }
+ String address = comActDiscussDTO.getAddress();
+ if (ObjectUtils.isEmpty(address)) {
+ return R.fail("地址不能为空");
+ } else if (address.contains("null")) {
+ comActDiscussDTO.setAddress(null);
+ }
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ Long communityId = loginUserInfo.getCommunityId();
+ comActDiscussDTO.setUserId(userId);
+ comActDiscussDTO.setCommunityId(communityId);
+ comActDiscussDTO.setIsApplets(true);
+ comActDiscussDTO.setLoginUserInfo(loginUserInfo);
+ return communityService.addDiscuss(comActDiscussDTO);
+ }
+
+ @ApiOperation(value = "一起议-分页查询", response = ComActDiscussVO.class)
+ @PostMapping("pagediscuss")
+ public R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO) {
+ if (Objects.isNull(pageComActDiscussDTO.getType())) {
+ return R.fail("查询类型不能为空");
+ }
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ pageComActDiscussDTO.setLoginUserId(loginUserInfo.getUserId());
+
+ Integer isMy = pageComActDiscussDTO.getIsMy();
+ if (null != isMy && isMy.intValue() == 1) {
+ pageComActDiscussDTO.setUserId(loginUserInfo.getUserId());
+ }
+ }
+ return communityService.pageDiscussApplets(pageComActDiscussDTO);
+ }
+
+ @ApiOperation(value = "一起议-分页查询-脱敏", response = ComActDiscussVO.class)
+ @PostMapping("pageDiscussDesensitize")
+ public R pageDiscussDesensitize(@RequestBody PageComActDiscussDTO pageComActDiscussDTO) {
+ if (Objects.isNull(pageComActDiscussDTO.getType())) {
+ return R.fail("查询类型不能为空");
+ }
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ pageComActDiscussDTO.setCommunityId(loginUserInfo.getCommunityId());
+ pageComActDiscussDTO.setLoginUserId(loginUserInfo.getUserId());
+
+ Integer isMy = pageComActDiscussDTO.getIsMy();
+ if (null != isMy && isMy.intValue() == 1) {
+ pageComActDiscussDTO.setUserId(loginUserInfo.getUserId());
+ }
+ }
+ return communityService.pageDiscussAppletsDesensitize(pageComActDiscussDTO);
+ }
+
+
+ @ApiOperation(value = "一起议-回复")
+ @PostMapping("discusscomment")
+ public R addDiscussComment(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO) {
+ String comment = comActDiscussCommentDTO.getComment();
+ if (ObjectUtils.isEmpty(comment)) {
+ return R.fail("回复不能为空");
+ }
+ Long discussId = comActDiscussCommentDTO.getDiscussId();
+ if (null == discussId || 0 == discussId) {
+ return R.fail("一起议主键不能为空");
+ }
+ String result = checkService.checkMessageBy(comment, this.getLoginUserInfo().getOpenid(), this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ comActDiscussCommentDTO.setUserId(this.getUserId());
+ // 议事投票计算积分
+ AddComActIntegralUserDTO integralUserDTO = new AddComActIntegralUserDTO(discussId,
+ AddComActIntegralUserDTO.integralType.cyystp, this.getCommunityId(), this.getUserId());
+ integralUserDTO.setIsComment(1);
+ communityService.addIntegralTradeAdmin(integralUserDTO);
+ return communityService.addDiscussComment(comActDiscussCommentDTO);
+
+ }
+
+ @ApiOperation(value = "一起议-点赞、取消点赞")
+ @PutMapping("discussuser")
+ public R putDiscussUser(@RequestBody @Validated ComActDiscussUserDTO comActDiscussUserDTO) {
+ comActDiscussUserDTO.setUserId(this.getUserId());
+ return communityService.putDiscussUser(comActDiscussUserDTO);
+ }
+
+ @ApiOperation(value = "一起议-评论-点赞、取消点赞")
+ @PutMapping("discusscommentuser")
+ public R putDiscussCommentUser(@RequestBody @Validated ComActDiscussCommentUserDTO comActDiscussUserDTO) {
+ comActDiscussUserDTO.setUserId(this.getUserId());
+ return communityService.putDiscussCommentUser(comActDiscussUserDTO);
+ }
+
+ @ApiOperation(value = "一起议-详情", response = ComActDiscussVO.class)
+ @GetMapping("discuss")
+ @ApiImplicitParam(name = "id", value = "一起议主键", required = true)
+ public R detailDiscuss(@RequestParam("id") Long id) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+ return communityService.detailDiscussApplets(id, userId);
+ }
+
+ @ApiOperation(value = "一起议-详情-脱敏", response = ComActDiscussVO.class)
+ @GetMapping("discussDesensitize")
+ @ApiImplicitParam(name = "id", value = "一起议主键", required = true)
+ public R detailDiscussDesensitize(@RequestParam("id") Long id) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+ return communityService.detailDiscussAppletsDesensitize(id, userId);
+ }
+
+ @ApiOperation(value = "一起议-评论-分页查询", response = ComActDiscussCommentVO.class)
+ @PostMapping("pagediscusscomment")
+ public R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
+ Long id = pageComActDiscussCommentDTO.getId();
+ if (null == id || 0 == id) {
+ return R.fail("一起议主键不能为空");
+ }
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+ pageComActDiscussCommentDTO.setLoginUserId(userId);
+ return communityService.pageDiscussCommentApplets(pageComActDiscussCommentDTO);
+ }
+
+ /**
+ * 议事投票-评论-删除 小程序
+ *
+ * 分页参数
+ * @return ComActDiscussCommentVO
+ */
+ @ApiOperation(value = "一起议-评论-删除接口")
+ @DeleteMapping("deleteCommentApplets")
+ public R deleteCommentApplets(@RequestParam("id") String id)
+ {
+ return communityService.deleteCommentApplets(id);
+ }
+
+
+
+ @ApiOperation(value = "一起议-评论-分页查询-脱敏", response = ComActDiscussCommentVO.class)
+ @PostMapping("pageDiscussCommentDesensitize")
+ public R pageDiscussCommentDesensitize(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
+ Long id = pageComActDiscussCommentDTO.getId();
+ if (null == id || 0 == id) {
+ return R.fail("一起议主键不能为空");
+ }
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+ pageComActDiscussCommentDTO.setLoginUserId(userId);
+ return communityService.pageDiscussCommentAppletsDesensitize(pageComActDiscussCommentDTO);
+ }
+
+ @ApiOperation(value = "一起议-评论-回复")
+ @PostMapping("discusscommentback")
+ public R addDiscussCommentBack(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO) {
+ String comment = comActDiscussCommentDTO.getComment();
+ if (ObjectUtils.isEmpty(comment)) {
+ return R.fail("回复不能为空");
+ }
+ Long id = comActDiscussCommentDTO.getId();
+ if (null == id || 0 == id) {
+ return R.fail("评论主键不能为空");
+ }
+ String result = checkService.checkMessageBy(comment, this.getLoginUserInfo().getOpenid(), this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ comActDiscussCommentDTO.setUserId(this.getUserId());
+ return communityService.addDiscussCommentBack(comActDiscussCommentDTO);
+ }
+
+ @ApiOperation(value = "一起议-投票")
+ @PostMapping("discussoptionuser")
+ public R addDiscussOptionUser(@RequestBody @Valid DiscussVoteOptionDTO discussVoteOptionDTO) {
+ List<ComActDiscussVoteOptionDTO> options = discussVoteOptionDTO.getOptions();
+ if (options.isEmpty()) {
+ return R.fail("选项内容不能为空");
+ }
+ discussVoteOptionDTO.setUserId(this.getUserId());
+ options.forEach(option -> {
+ // 议事投票计算积分
+ AddComActIntegralUserDTO integralUserDTO = new AddComActIntegralUserDTO(option.getId(),
+ AddComActIntegralUserDTO.integralType.cyystp, this.getCommunityId(), this.getUserId());
+ integralUserDTO.setIsComment(2);
+ communityService.addIntegralTradeAdmin(integralUserDTO);
+ });
+ return communityService.addDiscussOptionUser(discussVoteOptionDTO);
+ }
+
+ @ApiOperation(value = "一起议-增加浏览量")
+ @PostMapping("discuss/increase-view-num")
+ public void increaseViewNum(@RequestParam("discussId")
+ @ApiParam(value = "一起议主键id", required = true)
+ Long discussId) {
+ communityService.increaseViewNum(discussId);
+ }
+
+ @ApiOperation(value = "一起议-公布/编辑投票结果")
+ @PostMapping("discuss/edit-result")
+ public R editDiscussResult(@RequestBody @Validated(PutGroup.class) ComActDiscussDTO comActDiscussDTO) {
+ comActDiscussDTO.setUserId(this.getUserId());
+ return communityService.editDiscussResult(comActDiscussDTO);
+ }
+
+ @ApiOperation(value = "一起议-获取是否有发布权限", response = Boolean.class)
+ @GetMapping("discuss/permissions")
+ public R getDiscussPermissions() {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ ComActDiscussDTO comActDiscussDTO = new ComActDiscussDTO();
+ comActDiscussDTO.setLoginUserInfo(loginUserInfo);
+ comActDiscussDTO.setIsApplets(true);
+ comActDiscussDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.getDiscussPermissions(comActDiscussDTO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/EldersAuthApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/EldersAuthApi.java
new file mode 100644
index 0000000..6d7eba2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/EldersAuthApi.java
@@ -0,0 +1,235 @@
+package com.panzhihua.applets.api;
+
+import javax.annotation.Resource;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.EldersAuthAddByFamilyDTO;
+import com.panzhihua.common.model.dtos.community.EldersAuthTypeQueryDTO;
+import com.panzhihua.common.model.dtos.community.PageComEldersRecordsDTO;
+import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
+import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
+import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
+import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
+import com.panzhihua.common.model.vos.IPageVO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
+import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
+import com.panzhihua.common.model.vos.community.EldersAuthVO;
+import com.panzhihua.common.model.vos.elders.ComElderAuthUserAppVO;
+import com.panzhihua.common.model.vos.elders.ComElderAuthUserDetailVO;
+import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.ClazzUtils;
+import com.panzhihua.common.utlis.TencentUtils;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/eldersauth")
+@Api(tags = {"高龄认证"})
+public class EldersAuthApi extends BaseController {
+
+ @Resource
+ private CommunityService eldersAuthService;
+ @Resource
+ private UserService userService;
+
+ /**
+ * 分页查找
+ *
+ * @param pageEldersAuthDTO
+ * 查找高龄认证传递对象
+ * @return 查找结果
+ */
+ @PostMapping("/page")
+ @ApiOperation(value = "查询高龄认证@已过期", response = EldersAuthVO.class)
+ R query(@Validated @RequestBody PageEldersAuthDTO pageEldersAuthDTO) {
+ ClazzUtils.setIfStringIsEmpty(pageEldersAuthDTO);
+ pageEldersAuthDTO.setSumitUserId(this.getUserId());
+ return eldersAuthService.query(pageEldersAuthDTO);
+ }
+
+ /**
+ * 查询高龄认证详细信息
+ *
+ * @param id
+ * 高龄认证 id
+ * @return 查找结果
+ */
+ @GetMapping("/{id}")
+ @ApiOperation(value = "查询高龄认证详细信息@已过期", response = EldersAuthDetailsVO.class)
+ R<EldersAuthDetailsVO> details(@PathVariable("id") Long id) {
+ return eldersAuthService.eldersAuthDetails(id);
+ }
+
+ @GetMapping("/family")
+ @ApiOperation(value = "我的家庭成员@已过期", response = R.class)
+ R<IPageVO<ComMngFamilyInfoVO>> family() {
+ return eldersAuthService.getMyfamilyElders(getUserId());
+ }
+
+ /**
+ * 新增高龄认证
+ *
+ * @param eldersAuthAddByFamilyDTO
+ * 添加高龄认证传递对象
+ * @return 新增结果
+ */
+ @PostMapping("/addByFamily")
+ @ApiOperation(value = "新增高龄认证", response = R.class)
+ R addByFamily(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO) {
+ eldersAuthAddByFamilyDTO.setSumitUserId(getUserId());
+ eldersAuthAddByFamilyDTO.setUserId(getUserId());
+ return eldersAuthService.addByFamilyUser(eldersAuthAddByFamilyDTO);
+ }
+
+ @GetMapping("/authtype")
+ @ApiOperation(value = "查询社区认证方式", response = R.class)
+ R communityAuthtype() {
+ Long communityId = this.getCommunityId();
+ EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO = new EldersAuthTypeQueryDTO();
+ eldersAuthTypeQueryDTO.setCommunityId(communityId);
+ return eldersAuthService.communityElderAuthType(eldersAuthTypeQueryDTO);
+ }
+
+ @PostMapping("/getEidToken")
+ @ApiOperation(value = "高龄认证获取EidToken接口")
+ public R getEidToken(@RequestParam("authUserId") Long authUserId) {
+ if (authUserId == null) {
+ return R.fail("参数错误");
+ }
+
+ R isOk = eldersAuthService.getEldersAuthUserByApp(authUserId);
+ if (R.isOk(isOk)) {
+ ComElderAuthUserDetailVO authUserDetailVO =
+ JSONObject.parseObject(JSONObject.toJSONString(isOk.getData()), ComElderAuthUserDetailVO.class);
+ // 获取EidToken接口
+ String result = TencentUtils.getEidToken(authUserDetailVO.getName(), authUserDetailVO.getIdCard());
+ return R.ok(result);
+ } else {
+ log.error("查询老人信息失败，错误信息：" + isOk.getMsg());
+ return isOk;
+ }
+ }
+
+ @PostMapping("/getEidResult")
+ @ApiOperation(value = "高龄认证获取核验结果接口")
+ public R getEidResult(@Validated @RequestBody ComEldersAuthGetResultDTO authGetResultDTO) {
+
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ authGetResultDTO.setUserId(loginUserInfo.getUserId());
+
+ String result = TencentUtils.getEidResult(authGetResultDTO.getEidToken());
+ JSONObject object = JSON.parseObject(result);
+ if (object == null) {
+ return R.fail("核验失败");
+ }
+
+ JSONObject textObject = object.getJSONObject("Text");
+
+ String code = textObject.getString("ErrCode");
+ if (!code.equals("0")) {
+ log.error("人脸核验失败，错误原因：" + textObject.toJSONString());
+ return R.fail("核验失败");
+ }
+
+ authGetResultDTO.setVerificationResult(object.toJSONString());
+ return eldersAuthService.addEldersAuthByApp(authGetResultDTO);
+ }
+
+ @PostMapping("/page/old")
+ @ApiOperation(value = "高龄认证分页接口", response = ComElderAuthUserAppVO.class)
+ public R pageElders(@RequestBody ComEldersAuthPageDTO authPageDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ authPageDTO.setUserId(loginUserInfo.getUserId());
+ authPageDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return eldersAuthService.pageEldersByApp(authPageDTO);
+ }
+
+ @PostMapping("/add")
+ @ApiOperation(value = "高龄认证添加老人接口")
+ public R addElders(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ authUserAddAppDTO.setUserId(loginUserInfo.getUserId());
+ authUserAddAppDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return eldersAuthService.addEldersByApp(authUserAddAppDTO);
+ }
+
+ @PostMapping("/edit")
+ @ApiOperation(value = "高龄认证修改老人接口")
+ public R editElders(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ authUserAddAppDTO.setUserId(loginUserInfo.getUserId());
+ authUserAddAppDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return eldersAuthService.editEldersByApp(authUserAddAppDTO);
+ }
+
+ /**
+ * 分页查找
+ *
+ * @param pageComEldersRecordsDTO
+ * 查找高龄认证记录
+ * @return 查找结果
+ */
+ @PostMapping("/records")
+ @ApiOperation(value = "生存认证记录", response = EldersAuthVO.class)
+ R query(@Validated @RequestBody PageComEldersRecordsDTO pageComEldersRecordsDTO) {
+ ClazzUtils.setIfStringIsEmpty(pageComEldersRecordsDTO);
+ LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
+ pageComEldersRecordsDTO.setOperUserId(loginUserInfoVO.getUserId());
+ pageComEldersRecordsDTO.setOperUserName(loginUserInfoVO.getNickName());
+ return eldersAuthService.queryEldersRecord(pageComEldersRecordsDTO);
+ }
+
+ /**
+ * 查询高龄老人库详细信息
+ *
+ * @param id
+ * 高龄老人库 id
+ * @return 查找结果
+ */
+ @GetMapping("/records/{id}")
+ @ApiOperation(value = "认证详情详细信息")
+ R<ComEldersAuthElderlyDetailsVO> detail(@PathVariable("id") Long id) {
+ return eldersAuthService.comEldersAuthElderlyDetails(id);
+ }
+
+ @GetMapping("/no/tips")
+ @ApiOperation(value = "高龄认证不再显示提示")
+ public R noTips() {
+ LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
+ if (loginUserInfoVO == null) {
+ return R.fail("请先登录");
+ }
+ return userService.noTips(loginUserInfoVO.getUserId());
+ }
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java
new file mode 100644
index 0000000..8e4a651
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java
@@ -0,0 +1,100 @@
+package com.panzhihua.applets.api;
+
+import javax.annotation.Resource;
+
+import cn.hutool.core.util.StrUtil;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
+import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComOpsHouseUndercarriageVO;
+import com.panzhihua.common.model.vos.community.ComOpsHouseVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 房屋租售
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-22 15:30
+ **/
+@Slf4j
+@Api(tags = {"房屋租售"})
+@RestController
+@RequestMapping("/")
+public class HouseApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private CheckService checkService;
+
+ @ApiOperation(value = "房屋租售-新增")
+ @PostMapping("house")
+ public R addHouse(@RequestBody @Validated(AddGroup.class) ComOpsHouseDTO comOpsHouseDTO) {
+ // 微信内容审核
+ String introduction = comOpsHouseDTO.getIntroduction();
+ if (StrUtil.isNotBlank(introduction)) {
+ String result = checkService.checkMessageBy(introduction, this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ Long communityId = loginUserInfo.getCommunityId();
+ comOpsHouseDTO.setUserId(userId);
+ comOpsHouseDTO.setCommunityId(communityId);
+ comOpsHouseDTO.setUserType(1);
+ return communityService.addOpsHouse(comOpsHouseDTO);
+ }
+
+ @ApiOperation(value = "房屋租售-分页查询", response = ComOpsHouseVO.class)
+ @PostMapping("pagehouse")
+ public R pageHouse(@RequestBody PageComOpsHouseDTO pageComOpsHouseDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ Integer isMy = pageComOpsHouseDTO.getIsMy();
+ if (null != isMy && isMy.equals(1)) {
+ pageComOpsHouseDTO.setUserId(loginUserInfo.getUserId());
+ }
+ return communityService.pageOpsHouse(pageComOpsHouseDTO);
+ }
+
+ @ApiOperation(value = "房屋租售-详情", response = ComOpsHouseVO.class)
+ @GetMapping("house")
+ @ApiImplicitParam(name = "id", value = "房屋租售主键", required = true)
+ public R detailHouse(@RequestParam("id") Long id) {
+ return communityService.detailOpsHouse(id);
+ }
+
+ @ApiOperation(value = "房屋租售-修改")
+ @PostMapping("putHouse")
+ public R updateHouse(@RequestBody @Validated(PutGroup.class) ComOpsHouseVO comOpsHouseVO) {
+ return communityService.putOpsHouseByApplets(comOpsHouseVO);
+ }
+
+ @ApiOperation(value = "房屋租售-删除")
+ @GetMapping("delHouse")
+ @ApiImplicitParam(name = "id", value = "房屋租售主键", required = true)
+ public R delHouse(@RequestParam("id") Long id) {
+ return communityService.deleteOpsHouse(id);
+ }
+
+ @ApiOperation(value = "房屋租售-上下架")
+ @PostMapping("undercarriageHouse")
+ public R undercarriageHouse(@RequestBody @Validated(PutGroup.class) ComOpsHouseUndercarriageVO comOpsHouseVO) {
+ return communityService.undercarriageHouse(comOpsHouseVO);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IdentityAuthApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IdentityAuthApi.java
new file mode 100644
index 0000000..2cd1415
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IdentityAuthApi.java
@@ -0,0 +1,87 @@
+package com.panzhihua.applets.api;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.AddIdentityAuthDTO;
+import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
+import com.panzhihua.common.model.dtos.community.PageIdentityAuthRecordDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.IdentityAuthRecordDetailVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @title: IdentityAuthApi 身份认证相关API
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 小程序端身份认证相关
+ * @author: hans
+ * @date: 2021/09/01 16:00
+ */
+@Slf4j
+@RestController
+@RequestMapping("/identity-auth")
+@Api(tags = {"身份认证"})
+public class IdentityAuthApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "查询社区身份认证方式", response = R.class)
+ @GetMapping("/mode")
+ public R getIdentityAuthMode(@RequestParam(value = "communityId")
+ @ApiParam(value = "社区id", required = true)
+ Long communityId,
+ @RequestParam(value = "identityAuthType")
+ @ApiParam(value = "身份认证类型", required = true)
+ Integer identityAuthType) {
+ return communityService.getIdentityAuthMode(communityId, identityAuthType);
+ }
+
+ @ApiOperation(value = "身份认证获取EidToken接口")
+ @PostMapping("/getEidToken")
+ public R getEidToken(@RequestBody @Valid GetIdentityEidTokenDTO getIdentityEidTokenDTO) {
+ return communityService.getEidToken(getIdentityEidTokenDTO);
+ }
+
+ @ApiOperation(value = "新增身份认证")
+ @PostMapping("/add")
+ public R addIdentityAuth(@RequestBody @Valid AddIdentityAuthDTO addIdentityAuthDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ addIdentityAuthDTO.setSubmitUserId(loginUserInfo.getUserId());
+ addIdentityAuthDTO.setCommunityId(loginUserInfo.getCommunityId());
+ addIdentityAuthDTO.setAreaCode(this.getAreaCode());
+ return communityService.addIdentityAuth(addIdentityAuthDTO);
+ }
+
+ @ApiOperation(value = "分页查询身份认证记录", response = IdentityAuthRecordDetailVO.class)
+ @PostMapping("/record/page")
+ public R queryRecordWithPage(@RequestBody @Valid PageIdentityAuthRecordDTO pageIdentityAuthRecordDTO) {
+ pageIdentityAuthRecordDTO.setSubmitUserId(this.getUserId());
+ return communityService.queryRecordWithPage(pageIdentityAuthRecordDTO);
+ }
+
+ @ApiOperation(value = "获取身份认证详情", response = IdentityAuthRecordDetailVO.class)
+ @GetMapping("/detail")
+ public R retrieveIdentityAuthDetail(@RequestParam("authType")
+ @ApiParam(value = "身份认证类型（1.高龄认证 2.养老认证）", required = true, allowableValues = "1,2", example = "1")
+ Integer authType,
+ @RequestParam("identityAuthId")
+ @ApiParam(value = "身份认证id", required = true, example = "1")
+ Long identityAuthId) {
+ return communityService.retrieveIdentityAuthDetail(authType, identityAuthId);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
new file mode 100644
index 0000000..522cb3a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -0,0 +1,613 @@
+package com.panzhihua.applets.api;
+
+import cn.hutool.core.util.StrUtil;
+import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.CommonDTO;
+import com.panzhihua.common.model.dtos.PageDTO;
+import com.panzhihua.common.model.dtos.common.EditComActEasyPhotoHandlerDto;
+import com.panzhihua.common.model.dtos.common.EvaluateEasyDto;
+import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoHandlerDto;
+import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
+import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
+import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
+import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.advertisement.ComOpsAdvVO;
+import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
+import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO;
+import com.panzhihua.common.model.vos.user.NoticeUnReadVO;
+import com.panzhihua.common.model.vos.user.SysUserAgreementVO;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.service.community.ComActEasyPhotoEvaluateFeign;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PageGroup;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 首页
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-10 14:39
+ **/
+@RestController
+@RequestMapping("/index/")
+@Api(tags = {"首页"})
+public class IndexApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private UserService userService;
+ @Resource
+ private CheckService checkService;
+ @Resource
+ private ComActEasyPhotoEvaluateFeign easyPhotoEvaluateFeign;
+
+ @ApiOperation(value = "分页展示社区随手拍", response = ComActEasyPhotoVO.class)
+ @PostMapping("pageeasyphoto")
+ public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+// comActEasyPhotoVO.setCommunityId(loginUserInfo.getCommunityId());
+ comActEasyPhotoVO.setLogInUserId(loginUserInfo.getUserId());
+ comActEasyPhotoVO.setIsDpcMember(loginUserInfo.getIsDpcMember());
+ }
+ return communityService.pageEasyPhotoApplets(comActEasyPhotoVO);
+ }
+
+ @ApiOperation(value = "分页展示社区随手拍-脱敏", response = ComActEasyPhotoVO.class)
+ @PostMapping("pageEasyPhotoDesensitize")
+ public R pageEasyPhotoDesensitize(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ comActEasyPhotoVO.setCommunityId(loginUserInfo.getCommunityId());
+ comActEasyPhotoVO.setLogInUserId(loginUserInfo.getUserId());
+ comActEasyPhotoVO.setIsDpcMember(loginUserInfo.getIsDpcMember());
+ }
+ return communityService.pageEasyPhotoAppletsDesensitize(comActEasyPhotoVO);
+ }
+
+ @ApiOperation("上传随手拍")
+ @PostMapping("easyphoto")
+ public R addEasyPhoto(@RequestBody @Validated(AddGroup.class) ComActEasyPhotoVO comActEasyPhotoVO) {
+ // 微信内容审核
+ String openid = this.getLoginUserInfo().getOpenid();
+ String appId = this.getAppId();
+ // 微信内容审核
+ String detail = comActEasyPhotoVO.getDetail();
+ if (StrUtil.isNotBlank(detail)) {
+ String result = checkService.checkMessageBy(detail, openid, appId);
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
+
+ //微信图片审核
+ String photoPathList = comActEasyPhotoVO.getPhotoPathList();
+ if (StrUtil.isNotBlank(photoPathList)) {
+ if (!checkService.checkImageBy(photoPathList, appId)) {
+ return R.fail(501, "上传图片存在违规信息");
+ }
+ }
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long communityId = loginUserInfo.getCommunityId();
+ if (null == communityId || 0 == communityId) {
+ return R.fail("用户未绑定社区");
+ }
+ Long userId = loginUserInfo.getUserId();
+ comActEasyPhotoVO.setCommunityId(communityId);
+ comActEasyPhotoVO.setSponsorId(userId);
+ comActEasyPhotoVO.setStatus(1);
+ return communityService.addEasyPhoto(comActEasyPhotoVO);
+ }
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comActEasyPhotoHandler 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-03-01 13:45:10
+ */
+ @ApiOperation(value = "查询处理列表", response = ComActEasyPhotoHandlerVo.class)
+ @PostMapping("/handleList")
+ public R handleList(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
+ comActEasyPhotoHandler.setUserId(this.getUserId());
+ return this.communityService.queryEasyPhotoHandler(comActEasyPhotoHandler);
+ }
+
+ /**
+ * description edit 编辑数据
+ *
+ * @param comActEasyPhotoHandler 请求参数
+ * @return 编辑结果
+ * @author lyq
+ * @date 2022-03-01 13:45:10
+ */
+ @ApiOperation(value = "提交反馈")
+ @PostMapping("/editEasyPhotoHandler")
+ public R editEasyPhotoHandler(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
+ return this.communityService.editEasyPhotoHandler(comActEasyPhotoHandler);
+ }
+
+ @ApiOperation(value = "查询处理详情", response = ComActEasyPhotoHandlerVo.class)
+ @ApiImplicitParam(name = "id", value = "处理id", required = true)
+ @GetMapping("/easyPhotoHandler")
+ public R detailEasyPhotoHandler(@RequestParam("id") Long id) {
+ return this.communityService.detailEasyPhotoHandler(id);
+ }
+
+ @ApiOperation(value = "查询随手拍是否有活动", response = ComActEasyPhotoActivityVO.class)
+ @PostMapping("getEasyPhotoActivity")
+ public R getEasyPhotoActivity(@RequestBody CommonDTO commonDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ Long communityId = commonDTO.getCommunityId();
+ if (loginUserInfo != null) {
+ communityId = loginUserInfo.getCommunityId();
+ }
+ return communityService.getEasyPhotoActivity(communityId);
+ }
+
+ @ApiOperation(value = "随手拍详情", response = ComActEasyPhotoVO.class)
+ @GetMapping("detaileasyphoto")
+ @ApiImplicitParam(name = "id", value = "随手拍主键")
+ public R detailEasyPhoto(@RequestParam("id") Long id) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+ return communityService.detailEasyPhoto(id, userId);
+ }
+
+
+ /**
+ * 随手拍删除
+ *
+ * @param id
+ * 随手拍主键
+ * 登录用户id
+ * @return 详情内容
+ */
+ @ApiOperation(value = "删除随手拍", response = ComActEasyPhotoVO.class)
+ @DeleteMapping("easyphoto/{id}")
+ public R deleteEasyPhoto(@PathVariable("id") Long id) {
+ Long userId = this.getUserId();
+ return communityService.deleteEasyPhoto(id, userId);
+ }
+
+
+
+ @ApiOperation(value = "随手拍详情-脱敏", response = ComActEasyPhotoVO.class)
+ @GetMapping("detailEasyPhotoDesensitize")
+ @ApiImplicitParam(name = "id", value = "随手拍主键")
+ public R detailEasyPhotoDesensitize(@RequestParam("id") Long id) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+ return communityService.detailEasyPhotoDesensitize(id, userId);
+ }
+
+ @ApiOperation(value = "随手拍--评论--分页查询", response = ComActEasyPhotoCommentVO.class)
+ @PostMapping("pagecomacteasyphotocomment")
+ public R pageComActEasyPhotoComment(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+ pageComActEasyPhotoCommentDTO.setUserId(userId);
+ return communityService.pageComActEasyPhotoComment(pageComActEasyPhotoCommentDTO);
+ }
+
+ @ApiOperation(value = "随手拍--评论--分页查询-脱敏", response = ComActEasyPhotoCommentVO.class)
+ @PostMapping("pageComActEasyPhotoCommentDesensitize")
+ public R pageComActEasyPhotoCommentDesensitize(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+ pageComActEasyPhotoCommentDTO.setUserId(userId);
+ return communityService.pageComActEasyPhotoCommentDesensitize(pageComActEasyPhotoCommentDTO);
+ }
+
+ @ApiOperation(value = "随手拍--评论--新增评论")
+ @PostMapping("comacteasyphotocomment")
+ public R addComActEasyPhotoComment(@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO) {
+ // 微信内容审核
+ String openid = this.getLoginUserInfo().getOpenid();
+ String appId = this.getAppId();
+ // 微信内容审核
+ String comment = comActEasyPhotoCommentDTO.getComment();
+ if (StrUtil.isNotBlank(comment)) {
+ String result = checkService.checkMessageBy(comment, openid, appId);
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
+ comActEasyPhotoCommentDTO.setUserId(this.getUserId());
+ return communityService.addComActEasyPhotoComment(comActEasyPhotoCommentDTO);
+ }
+
+ @ApiOperation(value = "随手拍--评论--点赞/取消点赞")
+ @PostMapping("commentsign")
+ public R commentSign(@RequestBody ComActEasyPhotoCommentUserDTO comActEasyPhotoCommentUserDTO) {
+ comActEasyPhotoCommentUserDTO.setUserId(this.getUserId());
+ return communityService.commentSign(comActEasyPhotoCommentUserDTO);
+ }
+
+ @ApiOperation("点赞/取消点赞随手拍")
+ @PutMapping("easyphoto")
+ public R putEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
+ Long id = comActEasyPhotoVO.getId();
+ if (null == id || id == 0) {
+ return R.fail("随手拍主键不能为空");
+ }
+ Integer haveGiveThumbsUp = comActEasyPhotoVO.getHaveGiveThumbsUp();
+ if (null == haveGiveThumbsUp) {
+ return R.fail("操作类型不能为空");
+ }
+ Long userId = this.getUserId();
+ comActEasyPhotoVO.setSponsorId(userId);
+ return communityService.putEasyPhoto(comActEasyPhotoVO);
+ }
+
+ @ApiOperation(value = "分页展示社区微心愿", response = ComActMicroWishVO.class)
+ @PostMapping("pagemicrowish")
+ public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO)
+ {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ comActMicroWishVO.setCommunityId(loginUserInfo.getCommunityId());
+ comActMicroWishVO.setResponsibleId(loginUserInfo.getUserId());// 责任人暂时放登录用户id
+ }
+
+ if(!StringUtils.isEmpty(comActMicroWishVO.getHandleId()))
+ {
+ comActMicroWishVO.setCommunityId(null);
+ }
+ comActMicroWishVO.setIsApplets(1);
+ comActMicroWishVO.setIsPageMyWish(null);
+ return communityService.pageMicroWishApplets(comActMicroWishVO);
+ }
+
+ @ApiOperation(value = "分页展示社区微心愿-脱敏", response = ComActMicroWishVO.class)
+ @PostMapping("pageMicroWishDesensitize")
+ public R pageMicroWishDesensitize(@RequestBody ComActMicroWishVO comActMicroWishVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ comActMicroWishVO.setCommunityId(loginUserInfo.getCommunityId());
+ comActMicroWishVO.setResponsibleId(loginUserInfo.getUserId());// 责任人暂时放登录用户id
+ }
+ comActMicroWishVO.setIsApplets(1);
+ comActMicroWishVO.setIsPageMyWish(null);
+ return communityService.pageMicroWishAppletsDesensitize(comActMicroWishVO);
+ }
+
+ @ApiOperation("发布微心愿")
+ @PostMapping("microwish")
+ public R addMicroWish(@RequestBody @Validated(AddGroup.class) ComActMicroWishVO comActMicroWishVO) {
+ // 微信内容审核
+ String msg = comActMicroWishVO.getDetail();
+ if (StrUtil.isNotBlank(msg)) {
+ String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long communityId = loginUserInfo.getCommunityId();
+ if (null == communityId || 0 == communityId) {
+ return R.fail("用户未绑定社区");
+ }
+ Long userId = loginUserInfo.getUserId();
+ String phone = loginUserInfo.getPhone();
+ if (ObjectUtils.isEmpty(phone)) {
+ // return R.fail("用户绑定手机号后才能发布微心愿");
+ phone = "18228784579";
+ }
+ comActMicroWishVO.setSponsorPhone(phone);
+ comActMicroWishVO.setCommunityId(communityId);
+ comActMicroWishVO.setSponsorId(userId);
+ return communityService.addMicroWish(comActMicroWishVO);
+ }
+
+ @ApiOperation(value = "心愿详情", response = ComActMicroWishVO.class)
+ @GetMapping("microwish")
+ @ApiImplicitParam(name = "id", value = "微心愿主键")
+ public R detailMicroWish(@RequestParam("id") Long id) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+ return communityService.detailMicroWish(id, userId);
+ }
+
+
+ @ApiOperation(value = "删除心愿")
+ @PostMapping("deletemicrowish")
+ public R deleteMicrowish(@RequestParam("id") Long id) {
+ return communityService.deletemicrowish(id);
+ }
+
+
+ @ApiOperation(value = "心愿详情-脱敏", response = ComActMicroWishVO.class)
+ @GetMapping("microwishDesensitize")
+ @ApiImplicitParam(name = "id", value = "微心愿主键")
+ public R detailMicroWishDesensitize(@RequestParam("id") Long id) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+ return communityService.detailMicroWishDesensitize(id, userId);
+ }
+
+ @ApiOperation("点赞/取消点赞微心愿")
+ @PutMapping("microwish")
+ public R putMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
+ Long id = comActMicroWishVO.getId();
+ if (null == id || id == 0) {
+ return R.fail("微心愿主键不能为空");
+ }
+ Long userId = this.getUserId();
+ comActMicroWishVO.setSponsorId(userId);// 发起人字段暂时存放userId
+ return communityService.putMicroWish(comActMicroWishVO);
+ }
+
+ @ApiOperation(value = "首页广告banner", response = ComOpsAdvVO.class)
+ @GetMapping("listadvertisement/noToken")
+ public R listAdvertisement(@RequestParam(value = "type",required = false,defaultValue = "1") Integer type) {
+ return communityService.listAdvertisement(type);
+ }
+
+ @ApiOperation(value = "分页通知列表", response = SysUserNoticeVO.class)
+ @PostMapping("pagenotice")
+ public R pageNotice(@RequestBody @Validated(PageGroup.class) PageDTO pageDTO) {
+ Long userId = this.getUserId();
+ pageDTO.setUserId(userId);
+ return userService.pageNotice(pageDTO);
+ }
+
+ @ApiOperation(value = "通知已读")
+ @PutMapping("notice")
+ public R putNotice(@RequestBody NoticeReadDTO noticeReadDTO) {
+ Long userId = this.getUserId();
+ noticeReadDTO.setUserId(userId);
+ return userService.putNotice(noticeReadDTO);
+ }
+
+ @ApiOperation(value = "未读消息汇总", response = NoticeUnReadVO.class)
+ @GetMapping("noticeunreadnum")
+ public R noticeUnreadNum() {
+ Long userId = this.getUserId();
+ return userService.noticeUnreadNum(userId);
+ }
+
+ @ApiOperation(value = "获取各种协议", response = SysUserAgreementVO.class)
+ @GetMapping("agreement")
+ @ApiImplicitParam(name = "type", value = "1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策")
+ public R agreement(@RequestParam("type") Integer type) {
+ return userService.agreement(type, this.getAppId());
+ }
+
+ @ApiOperation("发布留言")
+ @PostMapping("addmessage")
+ public R addMessage(@RequestBody @Validated(AddGroup.class) ComActMessageVO comActMessageVO) {
+ // 微信内容审核
+ String msg = comActMessageVO.getMsgContent();
+ if (StrUtil.isNotBlank(msg)) {
+ String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long communityId = loginUserInfo.getCommunityId();
+ if (null == communityId || 0 == communityId) {
+ return R.fail("用户未绑定社区");
+ }
+ Integer type = loginUserInfo.getType();
+ if (null == type || (type != 1 && type != 2)) {
+ return R.fail("留言对象类型错误！");
+ }
+ Long userId = loginUserInfo.getUserId();
+ comActMessageVO.setCommunityId(communityId);
+ comActMessageVO.setUserId(userId);
+ comActMessageVO.setUserName(loginUserInfo.getName());
+ comActMessageVO.setUserAccount(loginUserInfo.getAccount());
+ comActMessageVO.setIspublic(1);
+ comActMessageVO.setStatus(1);
+ return communityService.addMessage(comActMessageVO);
+ }
+
+ @ApiOperation("发布留言回复")
+ @PostMapping("addmessageback")
+ public R addMessageBack(@RequestBody @Validated(AddGroup.class) ComActMessageBackVO comActMessageBackVO) {
+ // 微信内容审核
+ String msg = comActMessageBackVO.getMsgContent();
+ if (StrUtil.isNotBlank(msg)) {
+ String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long communityId = loginUserInfo.getCommunityId();
+ if (null == communityId || 0 == communityId) {
+ return R.fail("用户未绑定社区");
+ }
+ Integer type = loginUserInfo.getType();
+ if (null == type || (type != 1 && type != 2)) {
+ return R.fail("留言对象类型错误！");
+ }
+ Long userId = loginUserInfo.getUserId();
+ comActMessageBackVO.setCommunityId(communityId);
+ comActMessageBackVO.setUserId(userId);
+ comActMessageBackVO.setUserName(loginUserInfo.getName());
+ comActMessageBackVO.setUserAccount(loginUserInfo.getAccount());
+ comActMessageBackVO.setIspublic(1);
+ comActMessageBackVO.setStatus(1);
+ return communityService.addMessageBack(comActMessageBackVO);
+ }
+
+ @ApiOperation(value = "分页显示我的留言", response = ComActMessageVO.class)
+ @PostMapping("pagemymessage")
+ public R pageMyMessage(@RequestBody ComActMessageVO comActMessageVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long communityId = loginUserInfo.getCommunityId();
+ if (null == communityId || 0 == communityId) {
+ return R.fail("用户未绑定社区");
+ }
+ comActMessageVO.setCommunityId(communityId);
+ comActMessageVO.setUserId(loginUserInfo.getUserId());
+ return communityService.pageMyMessageApplets(comActMessageVO);
+ }
+
+ @ApiOperation(value = "分页显示居民给我的留言", response = ComActMessageVO.class)
+ @PostMapping("pagesendtomemessage")
+ public R pageSendToMessage(@RequestBody ComActMessageVO comActMessageVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long communityId = loginUserInfo.getCommunityId();
+ if (null == communityId || 0 == communityId) {
+ return R.fail("用户未绑定社区");
+ }
+ comActMessageVO.setCommunityId(communityId);
+ comActMessageVO.setUserId(loginUserInfo.getUserId());
+ comActMessageVO.setPhone(loginUserInfo.getPhone());
+ return communityService.pageSendToMessageApplets(comActMessageVO);
+ }
+
+ @ApiOperation(value = "分页显示指定用户的留言", response = ComActMessageVO.class)
+ @PostMapping("pagemessagebyuser")
+ public R pageMessageByUser(@RequestBody ComActMessageVO comActMessageVO) {
+ return communityService.pageMessageByUser(comActMessageVO);
+ }
+
+ @ApiOperation(value = "留言详情", response = ComActMessageVO.class)
+ @GetMapping("detailmessage")
+ @ApiImplicitParam(name = "id", value = "随手拍主键")
+ public R detailMessage(@RequestParam("id") Long id) {
+ return communityService.detailMessage(id);
+ }
+
+ @ApiOperation(value = "首页商城开关接口")
+ @GetMapping("isShop")
+ public R isShop() {
+ return R.ok(Constants.IS_SHOP_OPEN);
+ }
+
+ @ApiOperation(value = "获取最新活动和用户最新收益", response = BannerVO.class)
+ @GetMapping("getUserReward")
+ public R getUserReward(@RequestParam("communityId") Long communityId) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ if (loginUserInfo.getCommunityId() != null) {
+ communityId = loginUserInfo.getCommunityId();
+ }
+ }
+ return communityService.getUserReward(userId, communityId);
+ }
+
+ @ApiOperation(value = "获取首页弹窗接口", response = ComActEasyPhotoRewardVO.class)
+ @GetMapping("getUserRewards")
+ public R getUserRewards(@RequestParam("communityId") Long communityId) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ communityId = loginUserInfo.getCommunityId();
+ }
+ return communityService.getUserRewards(userId, communityId);
+ }
+
+ @ApiOperation(value = "获取普达首页弹窗接口", response = ComActEasyPhotoRewardVO.class)
+ @GetMapping("getUserRewardsNew")
+ public R getUserRewardsNew(@RequestParam("communityId") Long communityId) {
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ communityId = loginUserInfo.getCommunityId();
+ }
+ return communityService.getUserRewardsNew(userId, communityId);
+ }
+
+ @ApiOperation(value = "读取用户随手拍奖励")
+ @PostMapping("readUserReward")
+ public R readUserReward() {
+ return communityService.readUserReward(this.getUserId(), this.getCommunityId());
+ }
+
+ @ApiOperation(value = "随手拍分类列表", response = ComActEasyPhotoClassifyVO.class)
+ @GetMapping("easyphoto/classify/list")
+ public R easyPhotoClassifyList() {
+ return communityService.listPhotoClassify(this.getAreaCode());
+ }
+
+ @ApiOperation(value = "随手拍评价")
+ @PostMapping("easyphoto/whistle/evaluate")
+ public R evaluateEasyPhotoWhistle(@RequestBody EvaluateEasyDto whistleDto) {
+ whistleDto.setUserId(this.getUserId());
+ return easyPhotoEvaluateFeign.evaluateEasyApplets(whistleDto);
+ }
+
+
+
+ /*****************************************************************************************************************
+ *
+ * 社区宣传
+ *
+ ******************************************************************************************************************/
+ @ApiOperation(value = "获取社区宣传", response = CommunityPublicityVO.class)
+ @GetMapping("/getCommunityPublicityData")
+ public R getCommunityPublicityData(@RequestParam("communityId") String communityId)
+ {
+ return communityService.getCommunityPublicityData(communityId);
+ }
+
+
+// @ApiOperation(value = "添加社区宣传")
+// @PostMapping("/addCommunityPublicityDate")
+// public R addCommunityPublicityDate(@RequestBody CommunityPublicityVO item)
+// {
+// return communityService.addCommunityPublicityDate(item);
+// }
+//
+// @ApiOperation(value = "编辑社区宣传")
+// @PostMapping("/editCommunityPublicityDate")
+// public R editCommunityPublicityDate(@RequestBody CommunityPublicityVO item)
+// {
+// return communityService.editCommunityPublicityDate(item);
+// }
+//
+// @ApiOperation(value = "删除社区宣传")
+// @DeleteMapping("/deleteCommunityPublicityData")
+// public R deleteCommunityPublicityData(@RequestParam("communityId") String communityId)
+// {
+// return communityService.deleteCommunityPublicityData(communityId);
+// }
+//
+//
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
new file mode 100644
index 0000000..a8c69c9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -0,0 +1,955 @@
+package com.panzhihua.applets.api;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.bracelet.BraceletEarlyWarningDO;
+import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
+import com.panzhihua.common.model.dtos.community.convenient.JinhuiPageConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO;
+import com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO;
+import com.panzhihua.common.model.vos.jinhui.*;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.service.bracelet.CommunityBraceletService;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.jinhui.JinhuiCommunityService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.validated.AddGroup;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+@Slf4j
+@RestController
+@RequestMapping("/jin_hui/")
+@Api(tags = {"小程序-金汇社区api"})
+public class JinHuiCommnuityApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @Resource
+ private JinhuiCommunityService jinhuiCommunityService;
+
+ @Resource
+ private UserService userService;
+
+ @ApiOperation(value = "新增服务活动")
+ @PostMapping("add/activity")
+ public R addActivity(@RequestBody @Validated(AddGroup.class) ComActActivityVO comActActivityVO) {
+ Long communityId = this.getCommunityId();
+ comActActivityVO.setCommunityId(communityId);
+ comActActivityVO.setUserId(this.getLoginUserInfo().getUserId());
+ comActActivityVO.setStatus(2);
+ comActActivityVO.setHasPrize(0);
+ comActActivityVO.setHaveIntegralReward(2);
+ return communityService.addActivity(comActActivityVO);
+ }
+
+
+ @ApiOperation(value = "用户签到")
+ @PostMapping("activitySignIn")
+ public R jinhuiactivitySignIn(@RequestBody @Validated(AddGroup.class) ComActActRegistVO comActActRegistVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ comActActRegistVO.setUserId(loginUserInfo.getUserId());
+ return communityService.jinhuiActivitySignIn(comActActRegistVO);
+ }
+
+ @ApiOperation(value = "报名/取消报名社区活动")
+ @PutMapping("signactivity")
+ public R signActivity(@RequestBody @Validated(AddGroup.class) SignactivityVO signactivityVO) {
+ Long userId = this.getUserId();
+ Long activityId = signactivityVO.getActivityId();
+ signactivityVO.setUserId(userId);
+ R r = communityService.jinhuiSignActivity(signactivityVO);
+ if (R.isOk(r) && signactivityVO.getType().intValue() == 1) {
+ R r2 = communityService.detailActivity(activityId, userId, null, null);
+ ComActActivityVO comActActivityVO =
+ JSONObject.parseObject(JSONObject.toJSONString(r2.getData()), ComActActivityVO.class);
+ Integer isVolunteer = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), Integer.class);
+ SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
+ sysUserNoticeVO.setUserId(userId);
+ sysUserNoticeVO.setType(1);
+ sysUserNoticeVO.setTitle("报名成功");
+ sysUserNoticeVO.setBusinessType(1);
+ sysUserNoticeVO.setBusinessTitle(comActActivityVO.getActivityName());
+ Date beginAt = comActActivityVO.getBeginAt();
+ sysUserNoticeVO.setBusinessContent(String.format("活动将于%tF %tT 开始，请按时参加", beginAt, beginAt));
+ sysUserNoticeVO.setBusinessId(activityId);
+ sysUserNoticeVO.setStatus(0);
+ sysUserNoticeVO.setActivityType(comActActivityVO.getType());
+ sysUserNoticeVO.setBusinessStatus(2);
+ R r1 = userService.addNotice(sysUserNoticeVO);
+ if (R.isOk(r1)) {
+ log.info("新增用户报名社区活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
+ }
+ return r;
+ }
+
+
+ @ApiOperation(value = "获取个人金汇币总币", response = JinhuiCoinGeneralTableVO.class)
+ @GetMapping("goldCoin/getDetails")
+ public R coinTableGetDetails() {
+ return jinhuiCommunityService.coinTableGetDetails(this.getUserId() + "");
+ }
+
+
+ @ApiOperation(value = "获取个人金汇币明细", response = JinhuiGoldCoinRecordVO.class)
+ @GetMapping("/record/getList")
+ public R recordGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize) {
+ return jinhuiCommunityService.recordGetList(pageNum, pageSize, this.getUserId() + "");
+ }
+
+ @ApiOperation(value = "获取个人金汇币明细详情", response = JinhuiGoldCoinRecordVO.class)
+ @GetMapping("/jinhuiRecord/getDetails")
+ public R recordGetDetails(@RequestParam("id") String id) {
+ return jinhuiCommunityService.recordGetDetails(id);
+ }
+
+ @ApiOperation(value = "删除金汇币记录")
+ @PostMapping("/record/expurgateData")
+ public R recordExpurgateData(@RequestParam("id") String id) {
+ return jinhuiCommunityService.recordExpurgateData(id);
+ }
+
+
+ /**
+ * 办事指南_详情
+ *
+ * @param workGuideId
+ * @return 详情
+ */
+ @ApiOperation(value = "办事指南_详情", response = ComActWorkGuideVO.class)
+ @GetMapping("/detailworkguide")
+ public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId) {
+ return jinhuiCommunityService.detailWorkGuide(workGuideId, getCommunityId() + "");
+ }
+
+ /**
+ * 办事指南_分页
+ *
+ * @param pageActWorkGuideDTO 查询参数
+ * @return 分页集合
+ */
+ @ApiOperation(value = "办事指南_分页", response = ComActWorkGuideVO.class)
+ @PostMapping("/pageworkguide")
+ public R pageWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) {
+ return jinhuiCommunityService.pageWorkGuide(pageActWorkGuideDTO);
+ }
+
+
+ /**
+ * 删除便民服务商家
+ *
+ * @param merchantId
+ * @return
+ */
+ @ApiOperation(value = "删除便民服务商家")
+ @DeleteMapping("/merchant/delete")
+ public R deleteMerchant(@RequestParam("merchantId") String merchantId) {
+ return jinhuiCommunityService.deleteMerchant(merchantId);
+ }
+
+ /**
+ * 分页查询便民服务商家 运营后台
+ *
+ * @param pageConvenientMerchantDTO
+ * @return
+ */
+ @ApiOperation(value = "分页查询便民服务商家", response = ConvenientMerchantVO.class)
+ @PostMapping("/merchant/page")
+ public R pageMerchant(@RequestBody JinhuiPageConvenientMerchantDTO pageConvenientMerchantDTO)
+ {
+ pageConvenientMerchantDTO.setAuditType("2");
+ return jinhuiCommunityService.pageMerchant(pageConvenientMerchantDTO);
+ }
+
+ /**
+ * 获取便民服务商家详情
+ *
+ * @param merchantId
+ * @return
+ */
+ @ApiOperation(value = "获取便民服务商家详情", response = ConvenientMerchantVO.class)
+ @GetMapping("/merchant/get")
+ public R getMerchant(@RequestParam("merchantId") String merchantId) {
+ return jinhuiCommunityService.getMerchant(merchantId);
+ }
+
+
+ /**
+ * 分页查询 商家类别
+ *
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "获取便民服务商家类别列表", response = ConvenientServiceCategoryVO.class)
+ @GetMapping("/getCategories")
+ public R getListCategories(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize) {
+ return jinhuiCommunityService.getListCategories(pageNum, pageSize);
+ }
+
+
+
+ @ApiOperation(value = "便民服务商家入驻")
+ @PostMapping("/merchant/addData")
+ public R merchantAddData(@RequestBody JinhuiConvenientMerchantVO item)
+ {
+ item.setAuditType("1");
+ item.setCreatedBy(getUserId()+"");
+ return jinhuiCommunityService.merchantAddData(item);
+ }
+
+ /***************************************************************************************************
+ *
+ *
+ * 商家评论
+ *
+ *
+ **************************************************************************************************/
+ /**
+ * 商家评论列表
+ *
+ * @param pageNum
+ * @param pageSize
+ * @param merchantId
+ * @return
+ */
+ @ApiOperation(value = "商家评论列表", response = JinghuiMerchantEvaluateVO.class)
+ @GetMapping("/merchantEvaluate/getList")
+ public R merchantEvaluateGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("merchantId") String merchantId) {
+ return jinhuiCommunityService.merchantEvaluateGetList(pageNum, pageSize, merchantId);
+ }
+
+ /**
+ * 商家评论列单个详情
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "商家评论列单个详情", response = JinghuiMerchantEvaluateVO.class)
+ @GetMapping("/merchantEvaluate/getDetails")
+ public R merchantEvaluateGetDetails(@RequestParam("id") String id) {
+ return jinhuiCommunityService.merchantEvaluateGetDetails(id);
+ }
+
+ /**
+ * 商家评论列添加
+ *
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "商家评论列添加")
+ @PostMapping("/merchantEvaluate/addData")
+ public R merchantEvaluateAddData(@RequestBody JinghuiMerchantEvaluateVO item) {
+ item.setUserId(getUserId()+"");
+ return jinhuiCommunityService.merchantEvaluateAddData(item);
+ }
+
+ /**
+ * 商家评论列编辑
+ *
+ * @param item
+ * @return
+ */
+ @ApiOperation(value = "商家评论列编辑")
+ @PostMapping("/merchantEvaluate/editData")
+ public R merchantEvaluateEditData(@RequestBody JinghuiMerchantEvaluateVO item) {
+ return jinhuiCommunityService.merchantEvaluateEditData(item);
+ }
+
+ /**
+ * 商家评论列删除
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "商家评论列删除")
+ @PostMapping("/merchantEvaluate/expurgateData")
+ public R merchantEvaluateExpurgateData(@RequestParam("id") String id) {
+ return jinhuiCommunityService.merchantEvaluateExpurgateData(id);
+ }
+
+
+ @ApiOperation(value = "办事指南列表-按分类查询", response = ComActWorkGuideAppletsVO.class)
+ @PostMapping("wx/list")
+ public R listWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) {
+ return jinhuiCommunityService.listWorkGuide(pageActWorkGuideDTO);
+ }
+
+
+ @ApiOperation(value = "办事指南_分页", response = ComActWorkGuideVO.class)
+ @PostMapping("wx/pageworkguide")
+ public R detailWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) {
+ return jinhuiCommunityService.pageWorkGuide(pageActWorkGuideDTO);
+ }
+
+
+ /************************************************************************************************
+ *
+ *
+ * 金汇预约空间模块
+ *
+ *
+ **********************************************************************************************/
+ /**
+ * 金汇空间预约模块分页查询
+ *
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "金汇空间预约模块分页查询", response = JinhuiInterspaceVO.class)
+ @GetMapping("/interspaceGetList")
+ public R interspaceGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "intendantType", required = false) String intendantType) {
+ return jinhuiCommunityService.interspaceGetList(pageNum, pageSize, intendantType);
+ }
+
+ /**
+ * 金汇空间预约模块单个详情
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "金汇空间详情", response = JinhuiInterspaceVO.class)
+ @GetMapping("/interspaceGetDetails")
+ public R interspaceGetDetails(@RequestParam("id") String id) {
+ return jinhuiCommunityService.interspaceGetDetails(id);
+ }
+
+
+ /**
+ * 空间预约分类分页查询
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "空间预约分类分页查询", response = JinhuiInterspaceTypeVO.class)
+ @GetMapping("/interspaceTypeGetList")
+ public R interspaceTypeGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize)
+ {
+ return jinhuiCommunityService.interspaceTypeGetList(pageNum,pageSize);
+ }
+
+
+ /***************************************************************************************************************
+ *
+ *
+ * 空间预约申请
+ *
+ *
+ **************************************************************************************************************/
+ /**
+ * 空间预约申请分页查询
+ *
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "空间预约申请分页", response = JinhuiInterspaceApplyForVO.class)
+ @GetMapping("/applyFor/getList")
+ public R applyForGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "intendantType", required = false) String intendantType,
+ @RequestParam(value = "state", required = false) String state,
+ @RequestParam(value = "interspaceTime",required = false) String interspaceTime,
+ @RequestParam(value = "subscribeTimeFrame",required = false) String subscribeTimeFrame,
+ @RequestParam(value = "interspaceId",required = false) String interspaceId,
+ @RequestParam(value = "userId",required = false) String userId) {
+ return jinhuiCommunityService.applyForGetList(pageNum, pageSize, intendantType,
+ state,interspaceTime,subscribeTimeFrame,interspaceId,userId);
+ }
+
+ /**
+ * 空间预约申请详情
+ *
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "空间预约申请详情", response = JinhuiInterspaceApplyForVO.class)
+ @GetMapping("/applyFor/getDetails")
+ public R applyForGetDetails(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.applyForGetDetails(id);
+ }
+
+ /**
+ * 空间预约申请新增
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "空间预约申请新增")
+ @PostMapping("/applyFor/addData")
+ public R applyForAddData(@RequestBody JinhuiInterspaceApplyForVO item)
+ {
+ return jinhuiCommunityService.applyForAddData(item);
+ }
+
+ /**
+ * 空间预约申请编辑
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "空间预约申请编辑")
+ @PostMapping("/applyFor/editData")
+ public R applyForEditData(@RequestBody JinhuiInterspaceApplyForVO item)
+ {
+ return jinhuiCommunityService.applyForEditData(item);
+ }
+
+ /**
+ * 空间预约申请删除
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "空间预约申请删除")
+ @DeleteMapping("/applyFor/expurgateData")
+ public R applyForExpurgateData(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.applyForExpurgateData(id);
+ }
+
+
+/******************************************************************************************************************
+ *
+ *
+ * 金汇微心愿
+ *
+ *
+ ******************************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "金汇微心愿列表", response = JinhuiMicroVolunteeringVO.class)
+ @GetMapping("/volunteering/getList")
+ public R volunteeringGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "state", required = false)String state)
+ {
+ return jinhuiCommunityService.volunteeringGetList(pageNum,pageSize,getUserId()+"",state);
+ }
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "金汇微心愿详情", response = JinhuiMicroVolunteeringVO.class)
+ @GetMapping("/volunteering/getDetails")
+ public R volunteeringGetDetails(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.volunteeringGetDetails(id);
+ }
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "金汇微心愿新增")
+ @PostMapping("/volunteering/addData")
+ public R volunteeringAddData(@RequestBody JinhuiMicroVolunteeringVO item)
+ {
+ item.setUserId(getUserId()+"");
+ return jinhuiCommunityService.volunteeringAddData(item);
+ }
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @ApiOperation(value = "金汇微心愿编辑")
+ @PostMapping("/volunteering/editData")
+ public R volunteeringEditData(@RequestBody JinhuiMicroVolunteeringVO item)
+ {
+ return jinhuiCommunityService.volunteeringEditData(item);
+ }
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "金汇微心愿删除")
+ @DeleteMapping("/volunteering/expurgateData")
+ public R volunteeringExpurgateData(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.volunteeringExpurgateData(id);
+ }
+
+
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "金汇微心愿分类列表", response = JinhuiMicroVolunteeringTypeVO.class)
+ @GetMapping("/micro/type/getList")
+ public R volunteeringTypeGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize) {
+ return jinhuiCommunityService.volunteeringTypeGetList(pageNum, pageSize);
+ }
+
+ /*********************************************************************************************************
+ *
+ *
+ * 金汇商城商品
+ *
+ *
+ *********************************************************************************************************/
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "金汇商城商品列表表", response = JinhuiShoppingVO.class)
+ @GetMapping("/shoppingGetList")
+ public R shoppingGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "goodName", required = false) String goodName,
+ @RequestParam(value = "id", required = false) String id)
+ {
+ return jinhuiCommunityService.shoppingGetList(pageNum,pageSize,goodName,"1",id);
+ }
+
+
+ @ApiOperation(value = "金汇商城商品详情", response = JinhuiShoppingVO.class)
+ @GetMapping("/shoppingGetDetails")
+ public R shoppingGetDetails(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.shoppingGetDetails(id,getCommunityId()+"");
+ }
+
+
+
+ /********************************************************************************************************
+ *
+ *
+ * 金汇商城商品订单
+ *
+ *
+ ********************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "订单列表", response = JinhuiShoppingOrderVO.class)
+ @GetMapping("/orderGetList")
+ public R orderGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "goodsId", required = false)String goodsId,
+ @RequestParam(value = "orderNumber", required = false)String orderNumber,
+ @RequestParam(value = "goodName", required = false)String goodName,
+ @RequestParam(value = "name", required = false)String name,
+ @RequestParam(value = "cancelType", required = false)String cancelType)
+ {
+ return jinhuiCommunityService.orderGetList(pageNum,pageSize,getUserId()+"",
+ goodsId,orderNumber,goodName,name,cancelType);
+ }
+
+ /**
+ * 分页详情
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "订单详情", response = JinhuiShoppingOrderVO.class)
+ @GetMapping("/orderGetDetails")
+ public R orderGetDetails(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.orderGetDetails(id);
+ }
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "订单新增")
+ @PostMapping("/orderAddData")
+ public R orderAddData(@RequestBody JinhuiShoppingOrderVO item)
+ {
+ return jinhuiCommunityService.orderAddData(item);
+ }
+
+ /**
+ * 取消
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "订单取消")
+ @GetMapping("/orderCancelOrder")
+ public R orderCancelOrder(@RequestParam("orderId") String orderId)
+ {
+ return jinhuiCommunityService.orderCancelOrder(orderId);
+ }
+
+
+ /**
+ * 删除
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "订单删除")
+ @DeleteMapping("/orderExpurgateData")
+ public R orderExpurgateData(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.orderExpurgateData(id);
+ }
+
+
+ @ApiOperation(value = "订单核销")
+ @GetMapping("/orderCheck")
+ public R orderEditData(@RequestParam("id") String id)
+ {
+
+ if(StringUtils.isEmpty(id))
+ {
+ return R.fail("订单id不能为空");
+ }
+
+ JinhuiShoppingOrderVO vo=new JinhuiShoppingOrderVO();
+ vo.setId(id);
+ vo.setCancelType("1");
+ vo.setCancelTime(new Date());
+ return jinhuiCommunityService.orderEditData(vo);
+ }
+
+
+ /******************************************************************************************************
+ *
+ * 金汇文章
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "金汇文章列表", response = JinhuiArticleManagementVO.class)
+ @GetMapping("/articleGetList")
+ public R articleGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize)
+ {
+ return jinhuiCommunityService.articleGetList(pageNum,pageSize,"1","1");
+ }
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "金汇文章详情", response = JinhuiArticleManagementVO.class)
+ @GetMapping("/articleGetDetails")
+ public R articleGetDetails(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.articleGetDetails(id);
+ }
+
+
+
+ /*************************************************************************************************************
+ *
+ * 金汇体验活动
+ *
+ ***************************************************************************************************************/
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "体验活动列表", response = JinhuiExperienceActivityVO.class)
+ @GetMapping("/experienceGetList")
+ public R experienceGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "activityName", required = false) String activityName,
+ @RequestParam(value = "activityType", required = false) String activityType,
+ @RequestParam(value = "starTime", required = false) Date starTime,
+ @RequestParam(value = "endTime", required = false) Date endTime)
+ {
+ return jinhuiCommunityService.experienceGetList(pageNum,pageSize,activityName,activityType,starTime,endTime);
+ }
+
+ /**
+ * 单个详情
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "体验活动单个详情", response = JinhuiExperienceActivityVO.class)
+ @GetMapping("/experienceGetDetails")
+ public R experienceGetDetails(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.experienceGetDetails(id,getUserId()+"");
+ }
+
+
+
+
+ /*******************************************************************************************************
+ *
+ * 金汇报名体验
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "金汇报名体验列表", response = JinhuiApplyExperienceVO.class)
+ @GetMapping("/applyExperienceGetList")
+ public R applyExperienceGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "isFeedback", required = false) String isFeedback,
+ @RequestParam(value = "activityId", required = false) String activityId)
+ {
+ return jinhuiCommunityService.applyExperienceGetList(pageNum,pageSize,getUserId()+"",isFeedback,activityId);
+ }
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "金汇报名体验详情", response = JinhuiApplyExperienceVO.class)
+ @GetMapping("/applyExperienceGetDetails")
+ public R applyExperienceGetDetails(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.applyExperienceGetDetails(id,null,null);
+ }
+
+ /**
+ * 新增
+ *
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "金汇报名体验新增")
+ @PostMapping("/applyExperienceAddData")
+ public R applyExperienceAddData(@RequestBody JinhuiApplyExperienceVO item)
+ {
+ item.setUserId(getUserId()+"");
+ return jinhuiCommunityService.applyExperienceAddData(item);
+ }
+
+
+ /**
+ * 填写反馈接口
+ * @return
+ */
+ @ApiOperation(value = "金汇报名体验填写反馈接口")
+ @GetMapping("/applyExperienceFilIn")
+ public R filIn(@RequestParam("activityId") String activityId,
+ @RequestParam("content") String content)
+ {
+ return jinhuiCommunityService.filIn(getUserId()+"",activityId,content);
+ }
+
+
+ /******************************************************************************************************
+ *
+ * 金汇家园
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "金汇家园列表", response = JinhuiArticleManagementVO.class)
+ @GetMapping("/homeGetList")
+ public R homeGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize)
+ {
+ return jinhuiCommunityService.articleGetList(pageNum,pageSize,null,"2");
+ }
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "金汇家园详情", response = JinhuiArticleManagementVO.class)
+ @GetMapping("/homeGetDetails")
+ public R homeGetDetails(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.articleGetDetails(id);
+ }
+
+
+ /************************************************************************************************************
+ *
+ *
+ * 用户提交办理 /JinhuiWorkGuide/
+ *
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "我的提交办事指南列表",response = JinhuiQuestnaireUserAnswerVO.class)
+ @GetMapping("/answer/getList")
+ public R answerGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "transactType", required = false) String transactType)
+ {
+ return jinhuiCommunityService.answerGetList(pageNum,pageSize,getUserId()+"",transactType);
+ }
+
+ /**
+ * 获取详情
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "我的提交办事指南详情",response = JinhuiQuestnaireUserAnswerVO.class)
+ @GetMapping("/answer/getDetails")
+ public R answerGetDetails(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.answerGetDetails(id);
+ }
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "我的提交办事指南申请办理")
+ @PostMapping("/answer/addData")
+ public R answerAddData(@RequestBody JinhuiQuestnaireUserAnswerVO item)
+ {
+ item.setUserId(getUserId()+"");
+ item.setTransactType("0");
+ return jinhuiCommunityService.answerAddData(item);
+ }
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @ApiOperation(value = "我的提交办事指南申请编辑")
+ @PostMapping("/answer/editData")
+ public R answerEditData(@RequestBody JinhuiQuestnaireUserAnswerVO item)
+ {
+ return jinhuiCommunityService.answerEditData(item);
+ }
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "我的提交办事指南申请删除")
+ @DeleteMapping("/answer/expurgateData")
+ public R answerExpurgateData(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.answerExpurgateData(id);
+ }
+
+
+ /****************************************************************************************************************
+ *
+ *
+ * 金汇慈善公益
+ *
+ *
+ ******************************************************************************************************************/
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+
+ @ApiOperation(value = "金汇慈善公益列表",response = JinhuiCharityVO.class)
+ @GetMapping("/getCharityList")
+ public R getCharityList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "title", required = false) String title,
+ @RequestParam(value = "label", required = false) String label,
+ @RequestParam(value = "state", required = false) String state)
+ {
+ return jinhuiCommunityService.getCharityList(pageNum,pageSize,title,label,state);
+ }
+
+
+ /**
+ * 获取详情
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "金汇慈善公益详情",response = JinhuiCharityVO.class)
+ @GetMapping("/getCharityDetails")
+ public R getCharityDetails(@RequestParam("id") String id)
+ {
+ return jinhuiCommunityService.getCharityDetails(id);
+ }
+
+
+ /******************************************************************************************************************
+ *
+ * 手环处理
+ *
+ *****************************************************************************************************************/
+
+ @Resource
+ private CommunityBraceletService communityBraceletService;
+ /**
+ * 微信处理接口
+ * @param braceletEarlyWarningDO
+ * @return
+ */
+ @PostMapping("/WXdispose")
+ public R WXdispose(@RequestBody BraceletEarlyWarningDO braceletEarlyWarningDO)
+ {
+ if(com.panzhihua.common.utlis.StringUtils.isEmpty(braceletEarlyWarningDO.getDisposeText()))
+ {
+ return R.fail("处理内容不能为空");
+ }
+ braceletEarlyWarningDO.setDisposeType("2");
+ return communityBraceletService.WXdispose(braceletEarlyWarningDO);
+ }
+
+ /**
+ * 微信我的预警数据
+ * @return
+ */
+ @GetMapping("/braceletApi/getEarlyWarningList")
+ public R getList(@RequestParam("pageNum") Integer pageNum,
+ @RequestParam("pageSize") Integer pageSize,
+ @RequestParam(value = "equipmentNumber",required = false) String equipmentNumber,
+ @RequestParam(value = "type",required = false) String type,
+ @RequestParam(value = "userName",required = false) String userName,
+ @RequestParam(value = "phone",required = false) String phone)
+ {
+ return communityBraceletService.getList(pageNum,pageSize,getCommunityId()+"",equipmentNumber,
+ getUserId()+"",type,userName,phone);
+ }
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
new file mode 100644
index 0000000..085ef2b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
@@ -0,0 +1,376 @@
+package com.panzhihua.applets.api;
+
+import javax.annotation.Resource;
+
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.utlis.RSAUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.applets.config.WxMaConfiguration;
+import com.panzhihua.applets.model.vos.LoginRequest;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.exceptions.UnAuthenticationException;
+import com.panzhihua.common.model.vos.LoginReturnVO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
+import com.panzhihua.common.model.vos.user.SysUserAgreementVO;
+import com.panzhihua.common.model.vos.user.UuLoginVO;
+import com.panzhihua.common.service.auth.TokenService;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.validated.PutGroup;
+
+import cn.binarywang.wx.miniapp.api.WxMaQrcodeService;
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
+import cn.hutool.core.codec.Base64;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 登录
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-19 16:35
+ **/
+@Slf4j
+@Api(tags = {"登录模块"})
+@RestController("/")
+public class LoginApi extends BaseController {
+ @Resource
+ private UserService userService;
+ @Resource
+ private WxMaConfiguration wxMaConfiguration;
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "登录", response = LoginReturnVO.class)
+ @PostMapping("login")
+ public R login(@RequestBody LoginRequest loginRequest) {
+ String code = loginRequest.getCode();
+ if (ObjectUtils.isEmpty(code)) {
+ return R.fail("缺少登录参数");
+ }
+ log.info(code);
+ WxMaService maService = wxMaConfiguration.getMaService(loginRequest.getAppid());
+ WxMaJscode2SessionResult sessionInfo = null;
+ try {
+ sessionInfo = maService.getUserService().getSessionInfo(code);
+ } catch (Exception e) {
+ log.error("微信登录失败【{}】", e.getMessage());
+ if (code.equals("22")) {
+ sessionInfo = new WxMaJscode2SessionResult();
+ sessionInfo.setOpenid("88888888");
+ sessionInfo.setSessionKey("9999999");
+ } else {
+ return R.fail("微信登录失败");
+ }
+ }
+ log.info("微信登录成功【{}】", JSONObject.toJSONString(sessionInfo));
+ log.info("loginRequest参数【{}】", JSONObject.toJSONString(loginRequest));
+ String openid = sessionInfo.getOpenid();
+ String sessionKey = sessionInfo.getSessionKey();
+ String unionid = sessionInfo.getUnionid();
+ if (ObjectUtils.isEmpty(unionid)) {
+ unionid = "无";
+ }
+ userService.addOrUpdate(openid, sessionKey, unionid,this.getAppId());
+ return tokenService.loginApplets(openid,this.getAppId());
+ }
+ @PostMapping("/loginTest")
+ public R loginTest(@RequestBody LoginRequest loginRequest){
+ return tokenService.loginApplets(loginRequest.getCode(),this.getAppId());
+ }
+
+ @ApiOperation(value = "H5登录", response = LoginReturnVO.class)
+ @PostMapping("loginH5")
+ public R loginH5(@RequestBody LoginRequest loginRequest) {
+ String code = loginRequest.getCode();
+ if (ObjectUtils.isEmpty(code)) {
+ return R.fail("缺少登录参数");
+ }
+ log.info(code);
+ WxMaService maService = wxMaConfiguration.getMaH5Service();
+ WxMaJscode2SessionResult sessionInfo = null;
+ try {
+ sessionInfo = maService.getUserService().getSessionInfo(code);
+ } catch (Exception e) {
+ log.error("微信登录失败【{}】", e.getMessage());
+ if (code.equals("22")) {
+ sessionInfo = new WxMaJscode2SessionResult();
+ sessionInfo.setOpenid("88888888");
+ sessionInfo.setSessionKey("9999999");
+ } else {
+ return R.fail("微信登录失败");
+ }
+ }
+ log.info("微信登录成功【{}】", JSONObject.toJSONString(sessionInfo));
+ log.info("loginRequest参数【{}】", JSONObject.toJSONString(loginRequest));
+ // 解密用户信息
+// WxMaUserInfo wxUserInfo = maService.getUserService().getUserInfo(sessionInfo.getSessionKey(),
+// loginRequest.getEncryptedData(), loginRequest.getIv());
+// log.info("wxUserInfo信息【{}】", JSONObject.toJSONString(wxUserInfo));
+// if (null == wxUserInfo) {
+// return R.fail("获取用户信息失败");
+// }
+// String unionId = wxUserInfo.getUnionId();
+ String unionId = sessionInfo.getUnionid();
+ //通过unionId去匹配user
+ R r1 = userService.getUserInfoByUnionId(unionId);
+ if (R.isOk(r1)) {
+ LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(r1.getData()), LoginUserInfoVO.class);
+ return tokenService.loginApplets(loginUserInfoVO.getOpenid(),this.getAppId());
+ }
+ return r1;
+ }
+
+ @ApiOperation(value = "仁和区登录", response = LoginReturnVO.class)
+ @PostMapping("/renHe/login")
+ public R renHeLogin(@RequestBody LoginRequest loginRequest) {
+ String code = loginRequest.getCode();
+ if (ObjectUtils.isEmpty(code)) {
+ return R.fail("缺少登录参数");
+ }
+ log.info(code);
+ WxMaService maService = wxMaConfiguration.getMaRhService();
+ WxMaJscode2SessionResult sessionInfo = null;
+ try {
+ sessionInfo = maService.getUserService().getSessionInfo(code);
+ } catch (Exception e) {
+ log.error("微信登录失败【{}】", e.getMessage());
+ if (code.equals("22")) {
+ sessionInfo = new WxMaJscode2SessionResult();
+ sessionInfo.setOpenid("88888888");
+ sessionInfo.setSessionKey("9999999");
+ } else {
+ return R.fail("微信登录失败");
+ }
+ }
+ log.info("微信登录成功【{}】", JSONObject.toJSONString(sessionInfo));
+ log.info("loginRequest参数【{}】", JSONObject.toJSONString(loginRequest));
+ String openid = sessionInfo.getOpenid();
+ String sessionKey = sessionInfo.getSessionKey();
+ String unionid = sessionInfo.getUnionid();
+ if (ObjectUtils.isEmpty(unionid)) {
+ unionid = "无";
+ }
+ userService.addOrUpdate(openid, sessionKey, unionid,this.getAppId());
+ return tokenService.loginApplets(openid,this.getAppId());
+ }
+
+ @ApiOperation(value = "维护用户基本信息（昵称、性别、头像）")
+ @PostMapping("updateUserWeiXinInfo")
+ public R updateUserWeiXinInfo(@RequestBody LoginRequest loginRequest) {
+ Long userId = this.getUserId();
+ if (userId == null) {
+ return R.fail(401, "请先登录");
+ }
+ boolean empty2 = ObjectUtils.isEmpty(userId);
+ if (empty2) {
+ throw new UnAuthenticationException();
+ }
+ WxMaUserInfo wxUserInfo = loginRequest.getUserInfo();
+ if (null == wxUserInfo) {
+ return R.fail("缺少基本信息参数");
+ }
+ String avatarUrl = wxUserInfo.getAvatarUrl();
+ String gender = wxUserInfo.getGender();
+ String nickName = wxUserInfo.getNickName();
+ return userService.updateUserWeiXinInfo(userId, nickName, Integer.parseInt(gender), avatarUrl);
+ }
+
+ @ApiOperation(value = "维护微信用户手机号")
+ @PostMapping("updateUserWeiXinPhone")
+ public R updateUserWeiXinPhone(@RequestBody LoginRequest loginRequest) {
+ String encryptedData = loginRequest.getEncryptedData();
+ String iv = loginRequest.getIv();
+ boolean empty = ObjectUtils.isEmpty(iv);
+ boolean empty1 = ObjectUtils.isEmpty(encryptedData);
+ if (empty || empty1) {
+ return R.fail("微信用户参数不全");
+ }
+ WxMaService maService = wxMaConfiguration.getMaService(this.getAppId());
+ Long userId = this.getUserId();
+ R<LoginUserInfoVO> r = userService.getUserInfoByUserId(userId + "");
+ LoginUserInfoVO loginUserInfoVO = r.getData();
+ WxMaPhoneNumberInfo wxMaPhoneNumberInfo =
+ maService.getUserService().getPhoneNoInfo(loginUserInfoVO.getSessionKey(), encryptedData, iv);
+ if (ObjectUtils.isEmpty(wxMaPhoneNumberInfo) || ObjectUtils.isEmpty(wxMaPhoneNumberInfo.getPhoneNumber())) {
+ return R.fail("微信解析手机号失败");
+ }
+ String purePhoneNumber = wxMaPhoneNumberInfo.getPurePhoneNumber();
+ return userService.updateUserWeiXinPhone(userId, purePhoneNumber);
+ }
+
+ @ApiOperation(value = "维护微信用户手机号")
+ @PostMapping("updateUserWeiXinPhone2")
+ public R updateUserWeiXinPhone2(@RequestBody LoginRequest loginRequest) {
+ String code = loginRequest.getCode();
+ if (ObjectUtils.isEmpty(code)) {
+ return R.fail("缺少登录参数");
+ }
+ log.info(code);
+ WxMaService maService = wxMaConfiguration.getMaService(this.getAppId());
+ WxMaJscode2SessionResult sessionInfo = null;
+ try {
+ sessionInfo = maService.getUserService().getSessionInfo(code);
+ } catch (Exception e) {
+ log.error("微信登录失败【{}】", e.getMessage());
+ if (code.equals("22")) {
+ sessionInfo = new WxMaJscode2SessionResult();
+ sessionInfo.setOpenid("88888888");
+ sessionInfo.setSessionKey("9999999");
+ } else {
+ return R.fail("微信登录失败");
+ }
+ }
+ log.info("微信登录成功【{}】", JSONObject.toJSONString(sessionInfo));
+
+ String encryptedData = loginRequest.getEncryptedData();
+ String iv = loginRequest.getIv();
+ boolean empty = ObjectUtils.isEmpty(iv);
+ boolean empty1 = ObjectUtils.isEmpty(encryptedData);
+ if (empty || empty1) {
+ return R.fail("微信用户参数不全");
+ }
+ // WxMaService maService = wxMaConfiguration.getMaService();
+ Long userId = this.getUserId();
+ // R<LoginUserInfoVO> r = userService.getUserInfoByUserId(userId + "");
+ // LoginUserInfoVO loginUserInfoVO = r.getData();
+ WxMaPhoneNumberInfo wxMaPhoneNumberInfo =
+ maService.getUserService().getPhoneNoInfo(sessionInfo.getSessionKey(), encryptedData, iv);
+ if (ObjectUtils.isEmpty(wxMaPhoneNumberInfo) || ObjectUtils.isEmpty(wxMaPhoneNumberInfo.getPhoneNumber())) {
+ return R.fail("微信解析手机号失败");
+ }
+ String purePhoneNumber = wxMaPhoneNumberInfo.getPurePhoneNumber();
+ return userService.updateUserWeiXinPhone(userId, purePhoneNumber);
+ }
+
+ @ApiOperation(value = "用户登出")
+ @PostMapping("logout")
+ public R updateUserWeiXinPhone() {
+ String token = this.getToken();
+ boolean empty2 = ObjectUtils.isEmpty(token);
+ if (empty2) {
+ return R.ok();
+ }
+ return tokenService.logout(token);
+ }
+
+ @ApiOperation(value = "刷新token", response = LoginReturnVO.class)
+ @GetMapping("refreshToken")
+ @ApiImplicitParam(name = "refreshToken", value = "登录返回的刷新token")
+ public R refreshToken(@RequestParam("refreshToken") String refreshToken) {
+ return tokenService.refreshToken(refreshToken);
+ }
+
+ @ApiOperation(value = "刷新token", response = LoginReturnVO.class)
+ @PostMapping("getNewToken")
+ public R getNewToken(@RequestBody LoginUserInfoVO loginUserInfoVO)
+ {
+ return tokenService.getNewToken(loginUserInfoVO);
+ }
+
+ @ApiOperation(value = "查询社区")
+ @PostMapping("listcommunity")
+ public R listCommunity(@RequestBody ComActVO comActVO) {
+ return communityService.listCommunity(comActVO);
+ }
+
+ @ApiOperation(value = "查询小区", response = ComMngStructAreaVO.class)
+ @GetMapping("listarea")
+ @ApiImplicitParam(name = "communityId", value = "社区id", required = true)
+ public R listArea(@RequestParam("communityId") Long communityId) {
+ return communityService.listArea(communityId);
+ }
+
+ @ApiOperation(value = "用户绑定社区、小区")
+ @PutMapping("putusercommunityarea")
+ public R putUserCommunityArea(@RequestBody @Validated(PutGroup.class) LoginUserInfoVO loginUserInfoVO) {
+ Long userId = this.getUserId();
+ loginUserInfoVO.setUserId(userId);
+ return userService.putUserCommunityArea(loginUserInfoVO);
+ }
+
+ @ApiOperation(value = "用户协议和隐私政策", response = SysUserAgreementVO.class)
+ @GetMapping("useragreement")
+ public R userAgreement() {
+ int type = 1;
+ return userService.userAgreement(type,this.getAppId());
+ }
+ @ApiOperation("uu洗车登录")
+ @PostMapping("uuLogin")
+ public R uuLogin(@RequestBody UuLoginVO uuLoginVO){
+ return userService.uuLogin(uuLoginVO);
+ }
+
+ @ApiOperation("uu洗车获取小程序码")
+ @ApiImplicitParam(name = "couponId", value = "优惠券id", required = true)
+ @GetMapping("uu/getQRCode")
+ public R uuLogin(@RequestParam("couponId") String couponId) {
+ try {
+ //i小懒
+ WxMaQrcodeService wsCodeService = wxMaConfiguration.getMaService("wx98d62711dfbd8425").getQrcodeService();
+ byte[] bytes = wsCodeService.createWxaCodeUnlimitBytes("couponId=" + couponId,
+ "pages/user/getCoupon/getCoupon", true, "release", 30, true, null, false);
+ String res = String.format("data:image/png;base64,%s", Base64.encode(bytes));
+
+ //花城
+ WxMaQrcodeService uuCodeService = wxMaConfiguration.getMaService("wx118de8a734d269f0").getQrcodeService();
+ byte[] hcBytes = uuCodeService.createWxaCodeUnlimitBytes("couponId=" + couponId,
+ "packageD/pages/user/getCoupon/getCoupon", true, "release", 30, true, null, false);
+ String hcRes = String.format("data:image/png;base64,%s", Base64.encode(hcBytes));
+
+ Map<String,String> retMap = new HashMap<>();
+ retMap.put("ixiaolan",res);
+ retMap.put("huacheng",hcRes);
+ return R.ok(retMap);
+ } catch (Exception e) {
+ log.error("generate QRCode failed:" + e.getMessage());
+ return R.fail("generate QRCode failed");
+ }
+ }
+
+ @ApiOperation("天府通办登录")
+ @PostMapping("tfLogin")
+ public R tfLogin(@RequestBody UuLoginVO uuLoginVO){
+ try {
+ log.info("天府通办登录【{}】", JSONObject.toJSONString(uuLoginVO.getMobile()));
+ String str=RSAUtils.decrypt(uuLoginVO.getMobile(), Constants.PRIVATE_KEY);
+ log.info("天府通办登录【{}】", JSONObject.toJSONString(str));
+ uuLoginVO.setMobile(str);
+ //测试是否能正常添加用户
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.fail();
+ }
+ userService.tfLogin(uuLoginVO);
+ R r=tokenService.tfLogin(uuLoginVO.getMobile(),"Huacheng@123","wx118de8a734d269f0");
+ return r;
+ }
+ @ApiOperation("用户授权")
+ @GetMapping("/accept")
+ public R accept(){
+ return userService.accept(this.getUserId());
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
new file mode 100644
index 0000000..9a370ce
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
@@ -0,0 +1,323 @@
+package com.panzhihua.applets.api;
+
+import cn.hutool.core.util.StrUtil;
+import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.constants.NeighborCircleConstants;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.neighbor.*;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.neighbor.*;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:49
+ * @describe 邻里圈模块API
+ */
+@Slf4j
+@RestController
+@RequestMapping("/neighbor/")
+@Api(tags = {"邻里圈服务"})
+public class NeighborApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private CheckService checkService;
+
+ @ApiOperation(value = "分页查询邻里圈列表", response = ComActNeighborCircleAppVO.class)
+ @PostMapping("pageApp")
+ public R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ neighborCircleAppDTO.setPhone(loginUserInfo.getPhone());
+ neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
+ }
+ return communityService.pageNeighborByApp(neighborCircleAppDTO);
+ }
+
+ @ApiOperation(value = "分页查询可关联清单列表", response = ComActNeighborCircleAppVO.class)
+ @PostMapping("pageRelationList")
+ public R pageRelationList(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ neighborCircleAppDTO.setPhone(loginUserInfo.getPhone());
+ neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
+ neighborCircleAppDTO.setCheckUnitId(loginUserInfo.getCheckUnitId());
+ }
+ return communityService.pageRelationList(neighborCircleAppDTO);
+ }
+
+ @ApiOperation(value = "用户发布邻里圈审核")
+ @PostMapping("addNeighborByApp")
+ public R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO) {
+ LoginUserInfoVO loginUser = this.getLoginUserInfo();
+ Long userId = loginUser.getUserId();
+ Long communityId = loginUser.getCommunityId();
+ if (userId == null) {
+ return R.fail("请重新登录");
+ }
+ if (!this.getAppId().equals("wx118de8a734d269f0")){
+ String releaseContent = addNeighborCircleAppDTO.getReleaseContent();
+ if (StrUtil.isNotBlank(releaseContent)) {
+ String result = checkService.checkMessageBy(releaseContent, this.getLoginUserInfo().getOpenid(), this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
+ /* String releaseImages = addNeighborCircleAppDTO.getReleaseImages();
+ if (StrUtil.isNotBlank(releaseImages)) {
+ if (checkService.checkImageBy(releaseImages, this.getAppId())) {
+ return R.fail(501, "上传图片存在违规信息");
+ }
+ }*/
+ }
+ addNeighborCircleAppDTO.setUserId(userId);
+ if (StringUtils.isNotEmpty(loginUser.getPhone())) {
+ addNeighborCircleAppDTO.setPhone(this.getLoginUserInfo().getPhone());
+ }
+ if (communityId != null) {
+ addNeighborCircleAppDTO.setCommunityId(communityId);
+ }
+
+ //查询社区自动审核是否开着
+
+ if (this.getAppId().equals("wx118de8a734d269f0")) {
+ //花城直接通过
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
+ addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.yes);
+
+ } else {
+ //西区
+ String key = NeighborCircleConstants.NEIGHBOR_CIRCLE_AUTO_EXAMINE;
+ R isOk = communityService.getSysConfValue(key + communityId, communityId);
+ if (R.isOk(isOk)) {
+ if (isOk.getData() != null) {
+ String value = isOk.getData().toString();
+ if (value.equals("1")) {
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
+ String msg = addNeighborCircleAppDTO.getReleaseContent();
+ if (StrUtil.isEmpty(checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(), this.getAppId()))) {
+ addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.yes);
+ } else {
+ addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.no);
+ }
+ } else {
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
+ }
+ } else {
+ communityService.addSysConfValue(key + communityId, communityId, "社区邻里圈自动审核参数", "1");
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
+ }
+ } else {
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
+ }
+ }
+
+ return communityService.addNeighborByApp(addNeighborCircleAppDTO);
+ }
+
+ @ApiOperation(value = "查询邻里圈详情", response = ComActNeighborCircleDetailAppVO.class)
+ @PostMapping("detail")
+ public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
+ }
+ // Long userId = this.getLoginUserInfo().getUserId();
+ // if(userId == null){
+ // return R.fail("请先登录");
+ // }
+ // neighborCircleAppDTO.setUserId(userId);
+ return communityService.neighborDetailByApp(neighborCircleAppDTO);
+ }
+
+ @ApiOperation(value = "分页查询用户邻里圈审核列表", response = ComActNeighborCircleAppVO.class)
+ @PostMapping("user/page")
+ public R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if (userId == null) {
+ return R.fail("请先登录");
+ }
+ neighborCircleAppDTO.setUserId(userId);
+ return communityService.neighborExamineByApp(neighborCircleAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈点赞")
+ @PostMapping("fabulous")
+ public R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if (userId == null) {
+ return R.fail("请先登录");
+ }
+ fabulousAppDTO.setUserId(userId);
+ return communityService.neighborFabulousByApp(fabulousAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈转发")
+ @PostMapping("forward")
+ public R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ forwardAppDTO.setUserId(loginUserInfo.getUserId());
+ }
+ // Long userId = this.getLoginUserInfo().getUserId();
+ // if(userId == null){
+ // return R.fail("请先登录");
+ // }
+ // forwardAppDTO.setUserId(userId);
+ return communityService.neighborForwardByApp(forwardAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈评论")
+ @PostMapping("comment")
+ public R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if (userId == null) {
+ return R.fail("请先登录");
+ }
+ String content = commentAppDTO.getContent();
+ if (StrUtil.isNotBlank(content)) {
+ String result = checkService.checkMessageBy(content, this.getLoginUserInfo().getOpenid(), this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
+ commentAppDTO.setUserId(userId);
+ return communityService.neighborCommentByApp(commentAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈回复")
+ @PostMapping("reply")
+ public R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if (userId == null) {
+ return R.fail("请先登录");
+ }
+ String content = replyAppDTO.getContent();
+ if (StrUtil.isNotBlank(content)) {
+ String result = checkService.checkMessageBy(content, this.getLoginUserInfo().getOpenid(), this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
+ replyAppDTO.setUserId(userId);
+ return communityService.neighborReplyByApp(replyAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈取消点赞")
+ @PostMapping("cancel/fabulous")
+ public R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if (userId == null) {
+ return R.fail("请先登录");
+ }
+ fabulousAppDTO.setUserId(userId);
+ return communityService.neighborFabulousCancelByApp(fabulousAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈添加浏览记录")
+ @PostMapping("add/browse")
+ public R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if (userId == null) {
+ return R.fail("请先登录");
+ }
+ addBrowseAppDTO.setUserId(userId);
+ return communityService.neighborAddBrowseByApp(addBrowseAppDTO);
+ }
+
+ @ApiOperation(value = "分页查询评论下所有回复", response = ComActNeighborCommentReplyAppVO.class)
+ @PostMapping("comment/reply")
+ public R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ commentReplyAppDTO.setUserId(loginUserInfo.getUserId());
+ }
+ // Long userId = this.getLoginUserInfo().getUserId();
+ // if(userId == null){
+ // return R.fail("请先登录");
+ // }
+ // commentReplyAppDTO.setUserId(userId);
+ return communityService.neighborCommentReplyByApp(commentReplyAppDTO);
+ }
+
+ @ApiOperation(value = "查询社区邻里圈话题列表", response = ComActNeighborCircleTopicAppVO.class)
+ @GetMapping("topic/list")
+ public R getNeighborTopicByApp(
+ @RequestParam(value = "name", defaultValue = "", required = false) String name) {
+ return communityService.getNeighborTopicByApp(name);
+ }
+
+ @GetMapping("topic/list/new")
+ public R getNeighborTopicByAppNew(@RequestParam(value = "name", defaultValue = "", required = false) String name){
+ return communityService.getNeighborTopicByAppNew(name);
+ }
+
+ @ApiOperation(value = "用户删除邻里圈")
+ @PostMapping("delete")
+ public R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo == null) {
+ return R.fail(401, "请先登录");
+ }
+ circleTopicAppDTO.setUserId(loginUserInfo.getUserId());
+ circleTopicAppDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.deleteNeighborByApp(circleTopicAppDTO);
+ }
+
+ /**
+ * 分页查询邻里圈列表
+ *
+ * @param neighborCircleAppDTO 请求参数
+ * @return 邻里圈列表
+ */
+ @ApiOperation(value = "新版接单问题", response = ComActNeighborCircleAppVO.class)
+ @PostMapping("selectSolve")
+ public R selectSolve(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ neighborCircleAppDTO.setUserId(this.getUserId());
+ return communityService.selectSolve(neighborCircleAppDTO);
+ }
+
+
+ /**
+ * 修改数据
+ *
+ * @param editNeighborCircleAdminVO
+ * @return
+ */
+ @ApiOperation(value = "接单 反馈", response = ComActNeighborCircleAppVO.class)
+ @PostMapping("update")
+ public R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO) {
+ return this.communityService.order(editNeighborCircleAdminVO);
+ }
+
+ @ApiOperation(value = "服务统计", response = ServiceStaticsVO.class)
+ @PostMapping("/serviceStatic")
+ public R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO) {
+ return this.communityService.serviceStatic(serviceStaticDTO);
+ }
+
+ /**
+ * 求助我的问题数量统计
+ *
+ * @param type
+ * @param phone
+ * @return
+ */
+ @ApiOperation(value = "求助我的问题数量统计")
+ @GetMapping("/selectCount")
+ public R selectCount(@RequestParam("type") Integer type, @RequestParam(value = "phone", required = false) String phone, @RequestParam("communityId") Long communityId) {
+ return this.communityService.selectCount(type, phone, communityId);
+ }
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborWestApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborWestApi.java
new file mode 100644
index 0000000..12620c7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborWestApi.java
@@ -0,0 +1,283 @@
+package com.panzhihua.applets.api;
+
+import cn.hutool.core.util.StrUtil;
+import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.constants.NeighborCircleConstants;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.neighbor.*;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAppVO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyAppVO;
+import com.panzhihua.common.service.community.CommunityWestService;
+import com.panzhihua.common.utlis.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:49
+ * @describe 邻里圈模块API
+ */
+@Slf4j
+@RestController
+@RequestMapping("/neighborWest/")
+@Api(tags = {"邻里圈服务"})
+public class NeighborWestApi extends BaseController {
+
+ @Resource
+ private CommunityWestService communityWestService;
+ @Resource
+ private CheckService checkService;
+
+ @ApiOperation(value = "分页查询邻里圈列表", response = ComActNeighborCircleAppVO.class)
+ @PostMapping("pageApp")
+ public R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ neighborCircleAppDTO.setCommunityId(loginUserInfo.getCommunityId());
+ neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
+ }
+ return communityWestService.pageNeighborByApp(neighborCircleAppDTO);
+ }
+
+ @ApiOperation(value = "用户发布邻里圈审核")
+ @PostMapping("addNeighborByApp")
+ public R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO) {
+ LoginUserInfoVO loginUser = this.getLoginUserInfo();
+ Long userId = loginUser.getUserId();
+ Long communityId = loginUser.getCommunityId();
+
+ if (userId == null) {
+ return R.fail("请重新登录");
+ }
+ addNeighborCircleAppDTO.setUserId(userId);
+ String openid = this.getLoginUserInfo().getOpenid();
+ String appId = this.getAppId();
+ // 微信内容审核
+ String releaseContent = addNeighborCircleAppDTO.getReleaseContent();
+ if (StrUtil.isNotBlank(releaseContent)) {
+ String result = checkService.checkMessageBy(releaseContent, openid, appId);
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
+
+ //微信图片审核
+ String releaseImages = addNeighborCircleAppDTO.getReleaseImages();
+ if (StrUtil.isNotBlank(releaseImages)) {
+ if (!checkService.checkImageBy(releaseImages, appId)) {
+ return R.fail(501, "上传图片存在违规信息");
+ }
+ }
+
+ if (StringUtils.isNotEmpty(loginUser.getPhone())) {
+ addNeighborCircleAppDTO.setPhone(this.getLoginUserInfo().getPhone());
+ }
+ if (communityId != null) {
+ addNeighborCircleAppDTO.setCommunityId(communityId);
+ }
+
+ if(this.getAppId().equals("wx118de8a734d269f0")){
+ //花城直接通过
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
+ addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.yes);
+ }else {
+ //查询社区自动审核是否开着
+ String key = NeighborCircleConstants.NEIGHBOR_CIRCLE_AUTO_EXAMINE;
+ R isOk = communityWestService.getSysConfValue(key + communityId, communityId);
+ if (R.isOk(isOk)) {
+ if (isOk.getData() != null) {
+ String value = isOk.getData().toString();
+ if (value.equals("1")) {
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
+ String msg = addNeighborCircleAppDTO.getReleaseContent();
+ if (StrUtil.isEmpty(checkService.checkMessageBy(msg,this.getLoginUserInfo().getOpenid(),this.getAppId()))) {
+ addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.yes);
+ } else {
+ addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.no);
+ }
+ } else {
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
+ }
+ } else {
+ communityWestService.addSysConfValue(key + communityId, communityId, "社区邻里圈自动审核参数", "1");
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
+ }
+ } else {
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
+ }
+ }
+
+
+ return communityWestService.addNeighborByApp(addNeighborCircleAppDTO);
+ }
+
+ @ApiOperation(value = "查询邻里圈详情", response = ComActNeighborCircleDetailAppVO.class)
+ @PostMapping("detail")
+ public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
+ }
+ // Long userId = this.getLoginUserInfo().getUserId();
+ // if(userId == null){
+ // return R.fail("请先登录");
+ // }
+ // neighborCircleAppDTO.setUserId(userId);
+ return communityWestService.neighborDetailByApp(neighborCircleAppDTO);
+ }
+
+ @ApiOperation(value = "分页查询用户邻里圈审核列表", response = ComActNeighborCircleAppVO.class)
+ @PostMapping("user/page")
+ public R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if (userId == null) {
+ return R.fail("请先登录");
+ }
+ neighborCircleAppDTO.setUserId(userId);
+ return communityWestService.neighborExamineByApp(neighborCircleAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈点赞")
+ @PostMapping("fabulous")
+ public R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if (userId == null) {
+ return R.fail("请先登录");
+ }
+ fabulousAppDTO.setUserId(userId);
+ return communityWestService.neighborFabulousByApp(fabulousAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈转发")
+ @PostMapping("forward")
+ public R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ forwardAppDTO.setUserId(loginUserInfo.getUserId());
+ }
+ // Long userId = this.getLoginUserInfo().getUserId();
+ // if(userId == null){
+ // return R.fail("请先登录");
+ // }
+ // forwardAppDTO.setUserId(userId);
+ return communityWestService.neighborForwardByApp(forwardAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈评论")
+ @PostMapping("comment")
+ public R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if (userId == null) {
+ return R.fail("请先登录");
+ }
+ commentAppDTO.setUserId(userId);
+ String openid = this.getLoginUserInfo().getOpenid();
+ String appId = this.getAppId();
+ // 微信内容审核
+ String content = commentAppDTO.getContent();
+ if (StrUtil.isNotBlank(content)) {
+ String result = checkService.checkMessageBy(content, openid, appId);
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
+ return communityWestService.neighborCommentByApp(commentAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈回复")
+ @PostMapping("reply")
+ public R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if (userId == null) {
+ return R.fail("请先登录");
+ }
+ replyAppDTO.setUserId(userId);
+ return communityWestService.neighborReplyByApp(replyAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈取消点赞")
+ @PostMapping("cancel/fabulous")
+ public R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if (userId == null) {
+ return R.fail("请先登录");
+ }
+ fabulousAppDTO.setUserId(userId);
+ return communityWestService.neighborFabulousCancelByApp(fabulousAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈添加浏览记录")
+ @PostMapping("add/browse")
+ public R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if (userId == null) {
+ return R.fail("请先登录");
+ }
+ addBrowseAppDTO.setUserId(userId);
+ return communityWestService.neighborAddBrowseByApp(addBrowseAppDTO);
+ }
+
+ @ApiOperation(value = "分页查询评论下所有回复", response = ComActNeighborCommentReplyAppVO.class)
+ @PostMapping("comment/reply")
+ public R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ commentReplyAppDTO.setUserId(loginUserInfo.getUserId());
+ }
+ // Long userId = this.getLoginUserInfo().getUserId();
+ // if(userId == null){
+ // return R.fail("请先登录");
+ // }
+ // commentReplyAppDTO.setUserId(userId);
+ return communityWestService.neighborCommentReplyByApp(commentReplyAppDTO);
+ }
+
+ @ApiOperation(value = "查询社区邻里圈话题列表", response = ComActNeighborCircleTopicAppVO.class)
+ @GetMapping("topic/list")
+ public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId
+ , @RequestParam(value = "isZero", defaultValue = "2", required = false) Integer isZero
+ , @RequestParam(value = "name", defaultValue = "", required = false) String name) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ communityId = loginUserInfo.getCommunityId();
+ }
+ if (isZero == null) {
+ isZero = 2;
+ }
+ return communityWestService.getNeighborTopicByApp(communityId, isZero, name);
+ }
+
+ @ApiOperation(value = "用户新增邻里圈话题")
+ @PostMapping("topic/add")
+ public R addNeighborTopicByApp(@RequestBody AddNeighborCircleTopicAppDTO circleTopicAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo == null) {
+ return R.fail(401, "请先登录");
+ }
+ circleTopicAppDTO.setUserId(loginUserInfo.getUserId());
+ circleTopicAppDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityWestService.addNeighborTopicByApp(circleTopicAppDTO);
+ }
+
+ @ApiOperation(value = "用户删除邻里圈")
+ @PostMapping("delete")
+ public R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo == null) {
+ return R.fail(401, "请先登录");
+ }
+ circleTopicAppDTO.setUserId(loginUserInfo.getUserId());
+ circleTopicAppDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityWestService.deleteNeighborByApp(circleTopicAppDTO);
+ }
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
new file mode 100644
index 0000000..8ad62eb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
@@ -0,0 +1,857 @@
+package com.panzhihua.applets.api;
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.partybuilding.*;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
+import com.panzhihua.common.model.vos.community.building.IntegratingTaskVO;
+import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO;
+import com.panzhihua.common.model.vos.community.building.NewFightShoppingOrderVO;
+import com.panzhihua.common.model.vos.community.building.NewFightShoppingVO;
+import com.panzhihua.common.model.vos.jinhui.JinhuiShoppingOrderVO;
+import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.model.vos.user.SysUserVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.partybuilding.NewStriveForFeign;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.common.utlis.WxUtil;
+import com.panzhihua.common.utlis.WxXCXTempSend;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Slf4j
+@Api(tags = {"双挣双评新模块-小程序"})
+@RestController
+@RequestMapping("/StriveFor/")
+public class NewStriveAppApi extends BaseController
+{
+
+ @Resource
+ private NewStriveForFeign newStriveForFeign;
+
+ @ApiOperation(value = "获取党员个人排名", response = UserRankDTO.class)
+ @GetMapping("/NewStriveFor/getUserRank")
+ public R getUserRank()
+ {
+ return newStriveForFeign.getUserRank(getUserId()+"");
+ }
+
+
+ @ApiOperation(value = "获取党员排名列表", response = UserRankDTO.class)
+ @GetMapping("/NewStriveFor/getUserRankList")
+ public R getUserRankList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize)
+ {
+ return newStriveForFeign.getUserRankList(pageNum,pageSize,getUserId()+"");
+ }
+
+
+ @ApiOperation(value = "获取累计积分")
+ @GetMapping("/getAllintegral")
+ public R getAllintegral(@RequestParam("type") String type,
+ @RequestParam("userId") String userId)
+ {
+ return newStriveForFeign.getAllintegral(type,userId);
+ }
+
+
+ /*****************************************************************************************************************
+ *
+ * 任务需求清单
+ *
+ ******************************************************************************************************************/
+ @ApiOperation(value = "任务需求清单列表", response = NeedProblemInventoryDTO.class)
+ @GetMapping("/NeedProblem/getList")
+ public R getNeedProblemList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "search", required = false)String search,
+ @RequestParam(value = "classifyId", required = false)String classifyId,
+ @RequestParam(value = "status", required = false)String status,
+ @RequestParam(value = "kind", required = false)String kind,
+ @RequestParam(value = "userId", required = false)String userId,
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "startTime", required = false) String startTime,
+ @RequestParam(value = "endTime", required = false) String endTime)
+ {
+ Date start=null;
+ Date end=null;
+
+ try {
+ if(!StringUtils.isEmpty(startTime)) {
+ start = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime);
+ }
+ if(!StringUtils.isEmpty(startTime)) {
+ end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(endTime);
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,classifyId,status,kind,userId,getUserId()+"",communityId,"1",start,end);
+ }
+
+
+ @ApiOperation(value = "任务需求清单我认领的列表", response = NeedProblemInventoryDTO.class)
+ @GetMapping("/getMyJoinNeedProblemList")
+ public R getMyJoinNeedProblemList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "search", required = false)String search,
+ @RequestParam(value = "status", required = false)String status,
+ @RequestParam(value = "kind", required = false)String kind,
+ @RequestParam(value = "isDisplay", required = false)String isDisplay,
+ @RequestParam(value = "startTime", required = false) String startTime,
+ @RequestParam(value = "endTime", required = false) String endTime)
+ {
+ Date start=null;
+ Date end=null;
+
+ try {
+ if(!StringUtils.isEmpty(startTime)) {
+ start = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime);
+ }
+ if(!StringUtils.isEmpty(startTime)) {
+ end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(endTime);
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
+
+
+ return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,search,status,kind,getUserId()+"",getUserId()+"",isDisplay,start,end);
+ }
+
+
+
+ @ApiOperation(value = "任务需求清单详情", response = NeedProblemInventoryDTO.class)
+ @GetMapping("/NeedProblem/getDetails")
+ public R getNeedProblemDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getNeedProblemDetails(id,getUserId()+"");
+ }
+
+ @ApiOperation(value = "新增任务需求")
+ @PostMapping("/NeedProblem/addData")
+ public R addNeedProblemData(@RequestBody NeedProblemInventoryDTO item)
+ {
+ return newStriveForFeign.addNeedProblemData(item);
+ }
+
+ @ApiOperation(value = "编辑任务需求")
+ @PostMapping("/NeedProblem/editData")
+ public R editNeedProblemData(@RequestBody NeedProblemInventoryDTO item)
+ {
+ return newStriveForFeign.editNeedProblemData(item);
+ }
+
+ @ApiOperation(value = "删除任务需求")
+ @DeleteMapping("/NeedProblem/expurgateData")
+ public R expurgateNeedProblemData(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.expurgateNeedProblemData(id);
+ }
+
+
+ /*******************************************************************************************************
+ *
+ * 任务需求报名
+ *
+ *******************************************************************************************************/
+ @ApiOperation(value = "任务报名列表", response = NeedProblemClaimDTO.class)
+ @GetMapping("/getNeedClaimList")
+ public R getNeedClaimList(@RequestParam(value = "taskId", required = false) String taskId,
+ @RequestParam(value = "userId", required = false) String userId,
+ @RequestParam(value = "unitId", required = false) String unitId)
+ {
+ return newStriveForFeign.getNeedClaimList(taskId,userId,unitId);
+ }
+
+ @ApiOperation(value = "任务报名详情", response = NeedProblemClaimDTO.class)
+ @GetMapping("/getNeedClaimDetails")
+ public R getNeedClaimDetails(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "taskId", required = false) String taskId,
+ @RequestParam(value = "userId", required = false) String userId)
+ {
+ return newStriveForFeign.getNeedClaimDetails(id,taskId,userId);
+ }
+
+ @ApiOperation(value = "任务报名")
+ @PostMapping("/addNeedClaimData")
+ public R addNeedClaimData(@RequestBody NeedProblemClaimDTO item)
+ {
+ return newStriveForFeign.addNeedClaimData(item);
+ }
+
+ @ApiOperation(value = "修改任务报名")
+ @PostMapping("/editNeedClaimData")
+ public R editNeedClaimData(@RequestBody NeedProblemClaimDTO item)
+ {
+ return newStriveForFeign.editNeedClaimData(item);
+ }
+
+ @ApiOperation(value = "取消报名")
+ @DeleteMapping("/expurgateNeedClaimData")
+ public R expurgateNeedClaimData(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "taskId", required = false) String taskId,
+ @RequestParam(value = "userId", required = false) String userId)
+ {
+ return newStriveForFeign.expurgateNeedClaimData(id,taskId,userId);
+ }
+
+
+ @ApiOperation(value = "打卡")
+ @GetMapping("/needClaimSignIn")
+ public R needClaimSignIn(@RequestParam("taskId") String taskId,
+ @RequestParam("userId") String userId,
+ @RequestParam("type") String type)
+ {
+
+ return newStriveForFeign.needClaimSignIn(taskId,userId,type);
+ }
+
+ /***************************************************************************************************************
+ *
+ * 代单位接受
+ *
+ *************************************************************************************************************/
+ @ApiOperation(value = "代单位任务报名列表", response = NeedProblemUnitTaskDTO.class)
+ @GetMapping("/getNeedTaskList")
+ public R getNeedTaskList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "unitId", required = false) String unitId,
+ @RequestParam(value = "kind", required = false) String kind,
+ @RequestParam(value = "status", required = false) String status)
+ {
+ return newStriveForFeign.getNeedTaskList(pageNum,pageSize,unitId,kind,status);
+ }
+
+ @ApiOperation(value = "代单位任务报名详情", response = NeedProblemUnitTaskDTO.class)
+ @GetMapping("/getNeedTaskDetails")
+ public R getNeedTaskDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getNeedTaskDetails(id);
+ }
+
+ @ApiOperation(value = "代单位任务添加")
+ @PostMapping("/addNeedTaskData")
+ public R addNeedTaskData(@RequestBody NeedProblemUnitTaskDTO item)
+ {
+ return newStriveForFeign.addNeedTaskData(item);
+ }
+
+ @ApiOperation(value = "代单位任务修改")
+ @PostMapping("/editNeedTaskData")
+ public R editNeedTaskData(@RequestBody NeedProblemUnitTaskDTO item)
+ {
+ return newStriveForFeign.editNeedTaskData(item);
+ }
+
+ @ApiOperation(value = "代单位任务删除")
+ @DeleteMapping("/expurgateNeedTaskData")
+ public R expurgateNeedTaskData(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.expurgateNeedTaskData(id);
+ }
+
+
+ /*******************************************************************************************************************
+ *
+ * 新双争双评社区共建
+ *
+ ****************************************************************************************************************/
+
+ @ApiOperation(value = "社区共建项目列表", response = NewFightCommunityConstructionDTO.class)
+ @GetMapping("/getNewFightCommunityList")
+ public R getNewFightCommunityList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "communityId", required = false) String communityId)
+ {
+ if(StringUtils.isEmpty(communityId))
+ {
+ communityId=getCommunityId()+"";
+ }
+ return newStriveForFeign.getNewFightCommunityList(pageNum,pageSize,
+ communityId,null);
+ }
+
+ @ApiOperation(value = "社区共建项目详情", response = NewFightCommunityConstructionDTO.class)
+ @GetMapping("/getNewFightCommunityDetails")
+ public R getNewFightCommunityDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getNewFightCommunityDetails(id,getUserId()+"");
+ }
+
+ @ApiOperation(value = "社区共建项目添加")
+ @PostMapping("/addNewFightCommunityData")
+ public R addNewFightCommunityData(@RequestBody NewFightCommunityConstructionDTO item)
+ {
+ return newStriveForFeign.addNewFightCommunityData(item);
+ }
+
+ @ApiOperation(value = "社区共建项目编辑")
+ @PostMapping("/editNewFightCommunityData")
+ public R editNewFightCommunityData(@RequestBody NewFightCommunityConstructionDTO item)
+ {
+ return newStriveForFeign.editNewFightCommunityData(item);
+ }
+
+ @ApiOperation(value = "社区共建项目删除")
+ @DeleteMapping("/expurgateNewFightCommunityData")
+ public R expurgateNewFightCommunityData(@RequestParam(value = "id", required = false) String id)
+ {
+ return newStriveForFeign.expurgateNewFightCommunityData(id);
+ }
+
+
+ /**************************************************************************************************************
+ *
+ * 项目规划
+ *
+ ****************************************************************************************************************/
+ @ApiOperation(value = "项目规划列表", response = NewFightCommunityConstructionDTO.class)
+ @GetMapping("/getProjectPlanList")
+ public R getProjectPlanList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("projectId") String projectId)
+ {
+ return newStriveForFeign.getProjectPlanList(pageNum,pageSize,projectId);
+ }
+
+ @ApiOperation(value = "项目规划详情", response = NewFightCommunityConstructionDTO.class)
+ @GetMapping("/getProjectPlanDetails")
+ public R getProjectPlanDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getProjectPlanDetails(id);
+ }
+
+ @ApiOperation(value = "项目规划添加")
+ @PostMapping("/addProjectPlanData")
+ public R addProjectPlanData(@RequestBody NewFightProjectPlanDTO item)
+ {
+ return newStriveForFeign.addProjectPlanData(item);
+ }
+
+ @ApiOperation(value = "项目规划编辑")
+ @PostMapping("/editProjectPlanData")
+ public R editProjectPlanData(@RequestBody NewFightProjectPlanDTO item)
+ {
+ return newStriveForFeign.editProjectPlanData(item);
+ }
+
+
+ @ApiOperation(value = "项目规划确认完工")
+ @PostMapping("/editProjectPlanAccomplish")
+ public R editProjectPlanAccomplish(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.editProjectPlanAccomplish(id);
+ }
+
+
+ @ApiOperation(value = "项目规划删除")
+ @DeleteMapping("/expurgateProjectPlanData")
+ public R expurgateProjectPlanData(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.expurgateProjectPlanData(id);
+ }
+
+
+ /********************************************************************************************************
+ *
+ * 项目参与
+ *
+ ******************************************************************************************************/
+
+ @ApiOperation(value = "项目参与人员列表", response = NewFightProjectJoinDTO.class)
+ @GetMapping("/getJoinList")
+ public R getJoinList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("projectId") String projectId)
+ {
+ return newStriveForFeign.getJoinList(pageNum,pageSize,projectId);
+ }
+
+ @ApiOperation(value = "项目参与人员详情", response = NewFightProjectJoinDTO.class)
+ @GetMapping("/getJoinDetails")
+ public R getJoinDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getJoinDetails(id);
+ }
+
+ @ApiOperation(value = "项目参与人员报名")
+ @PostMapping("/addJoinData")
+ public R addJoinData(@RequestBody NewFightProjectJoinDTO item)
+ {
+ return newStriveForFeign.addJoinData(item);
+ }
+
+ @ApiOperation(value = "项目参与人员修改")
+ @PostMapping("/editJoinData")
+ public R editJoinData(@RequestBody NewFightProjectJoinDTO item)
+ {
+ return newStriveForFeign.editJoinData(item);
+ }
+
+ @ApiOperation(value = "项目参与人员取消报名")
+ @DeleteMapping("/expurgateJoinData")
+ public R expurgateJoinData(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "projectId", required = false) String projectId,
+ @RequestParam(value = "userId", required = false) String userId)
+ {
+ return newStriveForFeign.expurgateJoinData(id,projectId,userId);
+ }
+
+
+ /********************************************************************************************************
+ *
+ * 项目评论
+ *
+ ******************************************************************************************************/
+
+ @ApiOperation(value = "项目评论列表", response = NewFightProjectEvaluateDTO.class)
+ @GetMapping("/getEvaluateList")
+ public R getEvaluateList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("projectId") String projectId)
+ {
+ return newStriveForFeign.getEvaluateList(pageNum,pageSize,projectId);
+ }
+
+ @ApiOperation(value = "项目评论详情", response = NewFightProjectEvaluateDTO.class)
+ @GetMapping("/getEvaluateDetails")
+ public R getEvaluateDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getEvaluateDetails(id);
+ }
+
+ @ApiOperation(value = "项目评论新增")
+ @PostMapping("/addEvaluateData")
+ public R addEvaluateData(@RequestBody NewFightProjectEvaluateDTO item)
+ {
+ return newStriveForFeign.addEvaluateData(item);
+ }
+
+ @ApiOperation(value = "项目评论编辑")
+ @PostMapping("/editEvaluateData")
+ public R editEvaluateData(@RequestBody NewFightProjectEvaluateDTO item)
+ {
+ return newStriveForFeign.editEvaluateData(item);
+ }
+
+ @ApiOperation(value = "项目评论删除")
+ @DeleteMapping("/expurgateEvaluateData")
+ public R expurgateEvaluateData(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.expurgateEvaluateData(id);
+ }
+
+
+ /*******************************************************************************************************************
+ *
+ * 微心愿app
+ *
+ * ****************************************************************************************************************/
+
+ @Resource
+ private UserService userService;
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "微心愿app一键认领")
+ @PutMapping("/putmicrowish")
+ public R putlMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
+ Long id = comActMicroWishVO.getId();
+ Long userId = this.getUserId();
+ if (ObjectUtils.isEmpty(id)) {
+ return R.fail("心愿主键不能为空");
+ }
+ Integer type = comActMicroWishVO.getType();
+ if (ObjectUtils.isEmpty(type) || type > 5 || type < 1) {
+ return R.fail("操作类型不对");
+ }
+ comActMicroWishVO.setUserId(userId);
+ R r = communityService.putlMicroWish(comActMicroWishVO);
+ if (R.isOk(r)) {
+ if (R.isOk(r)) {
+ // 1 审核通过 2驳回 3分配人员 4发起活动 5反馈
+ R r1 = communityService.detailMicroWish(id, userId);
+ Object data = r1.getData();
+ ComActMicroWishVO comActMicroWishVO1 =
+ JSONObject.parseObject(JSONObject.toJSONString(data), ComActMicroWishVO.class);
+ // 查询用户openid
+ R userResult = userService.getUserOpenId(comActMicroWishVO1.getSponsorId());
+ if (R.isOk(r1)) {
+ SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
+ sysUserNoticeVO.setUserId(comActMicroWishVO1.getSponsorId());
+ sysUserNoticeVO.setType(2);
+ sysUserNoticeVO.setBusinessType(3);
+ sysUserNoticeVO.setBusinessTitle(comActMicroWishVO1.getWishName());
+ sysUserNoticeVO.setBusinessTime(comActMicroWishVO1.getExamineAt());
+ sysUserNoticeVO.setBusinessId(id);
+ sysUserNoticeVO.setStatus(0);
+ if (type.intValue() == 2) {
+ sysUserNoticeVO.setTitle("微心愿未通过审核");
+ sysUserNoticeVO
+ .setBusinessContent(String.format("驳回原因：%s", comActMicroWishVO1.getRejectReason()));
+ sysUserNoticeVO.setBusinessStatus(1);
+ R r2 = userService.addNotice(sysUserNoticeVO);
+ if (R.isOk(r2)) {
+ log.info("新增微心愿未通过审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
+ if (R.isOk(userResult)) {
+ String openid = userResult.getData().toString();
+ WxXCXTempSend util = new WxXCXTempSend();
+ try {
+ String result = comActMicroWishVO1.getRejectReason();
+ if (StringUtils.isNotEmpty(result)) {
+ result = result.substring(0, 4);
+ result += "…";
+ }
+ R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),4);
+ WxUtil.sendSubscribeSHZT(openid, util.getAccessToken(), "微心愿",
+ DateUtils.format(comActMicroWishVO1.getExamineAt(), DateUtils.ymdhms_format),
+ result,sysTemplateConfigVO.getData().getTemplateId());
+ } catch (Exception e) {
+ log.error("消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+ } else if (type.intValue() == 5) {
+ sysUserNoticeVO.setTitle("微心愿已完成");
+ sysUserNoticeVO.setBusinessContent(comActMicroWishVO.getFeedback());
+ sysUserNoticeVO.setBusinessStatus(2);
+ R r2 = userService.addNotice(sysUserNoticeVO);
+ if (R.isOk(r2)) {
+ log.info("新增微心愿已完成通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
+ } else if (type.intValue() == 3) {
+ sysUserNoticeVO.setTitle("微心愿已分配负责人");
+ sysUserNoticeVO.setBusinessContent("负责人会在近日和你联系，请保持电话畅通");
+ sysUserNoticeVO.setBusinessStatus(2);
+ R r2 = userService.addNotice(sysUserNoticeVO);
+ if (R.isOk(r2)) {
+ log.info("新增微心愿已分配负责人通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
+ } else if (type.intValue() == 4) {
+ sysUserNoticeVO.setTitle("微心愿发起了活动");
+ sysUserNoticeVO.setBusinessContent("请关注活动页面及时参加，并邀请你的朋友一起支持我们的活动");
+ sysUserNoticeVO.setBusinessStatus(2);
+ R r2 = userService.addNotice(sysUserNoticeVO);
+ if (R.isOk(r2)) {
+ log.info("新增微心愿发起了活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
+ }
+
+// if (type.equals(1)) {// 审核通过给用户增加积分
+// communityService.addIntegralTradeAdmin(
+// new AddComActIntegralUserDTO(id, AddComActIntegralUserDTO.integralType.fbwxy,
+// this.getCommunityId(), comActMicroWishVO1.getSponsorId()));
+// if (R.isOk(userResult)) {
+// String openid = userResult.getData().toString();
+// WxXCXTempSend util = new WxXCXTempSend();
+// R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(this.getAreaCode(),4);
+// try {
+// WxUtil.sendSubscribeSHZT(openid, util.getAccessToken(), "微心愿",
+// DateUtils.format(comActMicroWishVO1.getExamineAt(), DateUtils.ymdhms_format),
+// "审核通过",sysTemplateConfigVO.getData().getTemplateId());
+// } catch (Exception e) {
+// log.error("消息推送失败，失败原因：" + e.getMessage());
+// }
+// }
+// }
+ }
+ }
+ }
+ return r;
+ }
+
+
+ /************************************************************************************************************
+ *
+ * 资源共享
+ *
+ *************************************************************************************************************/
+
+ @ApiOperation(value = "资源共享列表", response = NewFightResourceSharingDTO.class)
+ @GetMapping("/getResourceSharingList")
+ public R getResourceSharingList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "unitId", required = false)String unitId,
+ @RequestParam(value = "meritId", required = false) String meritId)
+ {
+ return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,unitId,meritId);
+ }
+
+ @ApiOperation(value = "资源共享详情", response = NewFightResourceSharingDTO.class)
+ @GetMapping("/getResourceSharingDetails")
+ public R getResourceSharingDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getResourceSharingDetails(id);
+ }
+
+
+ /*******************************************************************************************************
+ *
+ * 积分商城
+ *
+ *******************************************************************************************************/
+ @ApiOperation(value = "积分商品列表", response = NewFightShoppingVO.class)
+ @GetMapping("/getFightShoppingList")
+ public R getFightShoppingList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "goodName", required = false)String goodName,
+ @RequestParam(value = "goodType", required = false)String goodType,
+ @RequestParam(value = "id", required = false)String id)
+ {
+ return newStriveForFeign.getFightShoppingList(pageNum,pageSize,getCommunityId()+"",
+ goodName,goodType,id);
+ }
+
+
+ @ApiOperation(value = "积分商品详情", response = NewFightShoppingVO.class)
+ @GetMapping("/getFightShoppingDetails")
+ public R getFightShoppingDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getFightShoppingDetails(id);
+ }
+
+
+ /*******************************************************************************************************
+ *
+ * 商家模块
+ *
+ * ********************************************************************************************************/
+
+ @ApiOperation(value = "商家列表", response = NewFightConvenientMerchantVO.class)
+ @GetMapping("/pageMerchant")
+ public R pageMerchant(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "keyword", required = false)String keyword)
+ {
+ return newStriveForFeign.pageMerchant(pageNum,pageSize,getCommunityId()+"","0",
+ keyword,"1");
+ }
+
+ /**
+ * 查询商家信息
+ *
+ * @param merchantId
+ * @return
+ */
+ @ApiOperation(value = "商家详情", response = NewFightConvenientMerchantVO.class)
+ @GetMapping("/selectMerchantById")
+ public R selectMerchantById(@RequestParam("merchantId") String merchantId)
+ {
+ return newStriveForFeign.selectMerchantById(merchantId);
+ }
+
+
+
+ /*****************************************************************************************************
+ *
+ * 用户积分任务完成情况
+ *
+ *******************************************************************************************************/
+ /**
+ * 列表
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "用户积分任务列表", response = IntegratingTaskVO.class)
+ @GetMapping("/getTaskList")
+ public R getIntegratingTaskList()
+ {
+ return newStriveForFeign.getIntegratingTaskList(getUserId()+"",
+ getCommunityId()+"");
+ }
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "用户积分任务去完成 只传 status ")
+ @PostMapping("/addIntegratingTaskData")
+ public R addIntegratingTaskData(@RequestBody IntegratingTaskVO item)
+ {
+ item.setIsDraw("1");
+ item.setUserId(getUserId()+"");
+ item.setCommunityId(getCommunityId()+"");
+ return newStriveForFeign.addIntegratingTaskData(item);
+ }
+
+
+ /**
+ * 每日签到记录列表 前15条
+ * @return
+ */
+ @ApiOperation(value = "每日签到记录列表 前15条", response = IntegratingTaskVO.class)
+ @GetMapping("/IntegratingTask/getEverydayList")
+ public R getEverydayList()
+ {
+ return newStriveForFeign.getEverydayList(getUserId()+"",getCommunityId()+"");
+ }
+
+
+
+ /**
+ * 添加或者修改积分
+ * @param item
+ * @return
+ */
+ @ApiOperation(value = "用户领取积分")
+ @PostMapping("/IntegratingTask/upIntegral")
+ public R upIntegral(@RequestBody NewFightIntegral item)
+ {
+ return newStriveForFeign.upIntegral(item);
+ }
+
+
+ /*******************************************************************************************************************
+ *
+ * 商品订单
+ *
+ ****************************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "订单列表", response = NewFightShoppingOrderVO.class)
+ @GetMapping("/orderGetList")
+ public R orderGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "userId", required = false)String userId,
+ @RequestParam(value = "goodsId", required = false)String goodsId,
+ @RequestParam(value = "orderNumber", required = false)String orderNumber,
+ @RequestParam(value = "goodName", required = false)String goodName,
+ @RequestParam(value = "name", required = false)String name,
+ @RequestParam(value = "cancelType", required = false)String cancelType,
+ @RequestParam(value = "merchantId", required = false) String merchantId,
+ @RequestParam(value = "orderType", required = false) String orderType)
+ {
+ return newStriveForFeign.orderGetList(pageNum,pageSize,userId,goodsId,orderNumber,
+ goodName,name,cancelType,getCommunityId()+"",merchantId,orderType);
+ }
+
+ /**
+ * 分页详情
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "订单详情", response = NewFightShoppingOrderVO.class)
+ @GetMapping("/orderGetDetails")
+ public R orderGetDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.orderGetDetails(id,getCommunityId()+"");
+ }
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "订单添加")
+ @PostMapping("/orderAddData")
+ public R orderAddData(@RequestBody NewFightShoppingOrderVO item)
+ {
+// item.setCommunityId(getCommunityId()+"");
+// item.setUserId(getUserId()+"");
+// item.setOrderType("1");
+ return newStriveForFeign.orderAddData(item);
+ }
+
+
+ /**
+ * 编辑
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "订单编辑", response = NewFightShoppingOrderVO.class)
+ @PostMapping("/NewFightOrder/orderEditData")
+ public R orderEditData(@RequestBody NewFightShoppingOrderVO item)
+ {
+ return newStriveForFeign.orderEditData(item);
+ }
+
+
+ /**
+ * 取消
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "订单取消")
+ @GetMapping("/orderCancelOrder")
+ public R orderCancelOrder(@RequestParam("orderId") String orderId)
+ {
+ return newStriveForFeign.orderCancelOrder(orderId,getCommunityId()+"");
+ }
+
+
+ /**
+ * 删除
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "订单删除")
+ @DeleteMapping("/orderExpurgateData")
+ public R orderExpurgateData(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.orderExpurgateData(id,getCommunityId()+"");
+ }
+
+
+ @ApiOperation(value = "订单核销")
+ @GetMapping("/orderCheck")
+ public R orderEditData(@RequestParam("id") String id)
+ {
+
+ if(org.apache.commons.lang3.StringUtils.isEmpty(id))
+ {
+ return R.fail("订单id不能为空");
+ }
+
+ NewFightShoppingOrderVO vo=new NewFightShoppingOrderVO();
+ vo.setId(id);
+ vo.setCancelType("1");
+ vo.setCancelTime(new Date());
+ return newStriveForFeign.orderEditData(vo);
+ }
+
+
+ @ApiOperation(value = "获取社区积分排名")
+ @GetMapping("/getIntegralUserRank")
+ public R getIntegralUserRank()
+ {
+ return communityService.getIntegralUserRank(getCommunityId(),getUserId());
+ }
+
+
+ @ApiOperation(value = "是否是商家 如果是商家返回商家id")
+ @GetMapping("/selectUserBind")
+ public R selectUserBind()
+ {
+ return newStriveForFeign.selectUserBind(getCommunityId()+"",getUserId()+"");
+ }
+
+
+
+ @ApiOperation(value = "搜索用户", response = SysUserVO.class)
+ @GetMapping("/selectUserList")
+ public R selectUserList(@RequestParam("phoneOrname") String phoneOrname)
+ {
+ return newStriveForFeign.selectUserList(getCommunityId()+"",phoneOrname);
+ }
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
new file mode 100644
index 0000000..0872bf9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -0,0 +1,353 @@
+package com.panzhihua.applets.api;
+
+import java.util.Date;
+
+import javax.annotation.Resource;
+
+import cn.hutool.core.util.StrUtil;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.interfaces.OperLog;
+import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
+import com.panzhihua.common.model.dtos.community.PageMemberForInviteDTO;
+import com.panzhihua.common.model.dtos.partybuilding.*;
+import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
+import com.panzhihua.common.model.vos.grid.EventGridCommunityAdminVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign;
+import com.panzhihua.common.service.partybuilding.PartyBuildingWestService;
+import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.partybuilding.*;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.service.partybuilding.PartyBuildingService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 党群服务
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-02 16:19
+ **/
+@Slf4j
+@RestController
+@RequestMapping("/partybuilding/")
+@Api(tags = {"党群服务"})
+public class PartyBuildingApi extends BaseController {
+ @Resource
+ private PartyBuildingService partyBuildingService;
+ @Resource
+ private PartyBuildingWestService partyBuildingWestService;
+ @Resource
+ private UserService userService;
+ @Resource
+ private CheckService checkService;
+ @Resource
+ private ComPbCheckUnitFeign pbCheckUnitFeign;
+ @Resource
+ private CommunityService communityService;
+
+ public static void main(String[] args) {
+ Date date = new Date();
+ String dateFormat = String.format("%tF %tT ", date, date);
+ System.out.println(dateFormat);
+ }
+
+ @ApiOperation(value = "分页党建动态/政策文件", response = PartyBuildingComPbDynVO.class)
+ @PostMapping("pagedynamic")
+ public R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ partyBuildingComPbDynVO.setCommunityId(loginUserInfo.getCommunityId());
+ }
+ Integer type = partyBuildingComPbDynVO.getType();
+ if (ObjectUtils.isEmpty(type)) {
+ return R.fail("类型不能为空");
+ }
+ partyBuildingComPbDynVO.setStatus(2);
+ return partyBuildingWestService.pageYnamic(partyBuildingComPbDynVO);
+ }
+
+ @ApiOperation(value = "分页查询党员活动", response = PageActivityMembersVO.class)
+ @PostMapping("pageactivity")
+ public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ partyBuildingActivityVO.setCommunityId(loginUserInfo.getCommunityId());
+ }
+ // Long communityId = this.getCommunityId();
+ // partyBuildingActivityVO.setCommunityId(communityId);
+ Integer status = partyBuildingActivityVO.getStatus();
+ if (null != status && status.intValue() == 4) {
+ partyBuildingActivityVO.setIsAppliets(1);
+ }
+ return partyBuildingService.pageActivity(partyBuildingActivityVO);
+ }
+
+ // @ApiOperation(value = "增加阅读记录")
+ // @PostMapping("adddynuser")
+ // public R addDynUser(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
+ // Long id = partyBuildingComPbDynVO.getId();
+ // if (ObjectUtils.isEmpty(id)||0==id) {
+ // return R.fail("主键id不能为空");
+ // }
+ // Long userId = this.getUserId();
+ // ComPbDynUserVO comPbDynUserVO=new ComPbDynUserVO();
+ // comPbDynUserVO.setCreateAt(new Date());
+ // comPbDynUserVO.setDynId(id);
+ // comPbDynUserVO.setUserId(userId);
+ // return partyBuildingService.addDynUser(comPbDynUserVO);
+ // }
+
+ @ApiOperation(value = "动态/政策文件详情", response = PartyBuildingComPbDynVO.class)
+ @GetMapping("infodynamic")
+ public R infoYnamic(@RequestParam("id") Long id) {
+ R r = partyBuildingWestService.infoYnamic(id);
+ if (R.isOk(r)) {
+ if (ObjectUtils.isEmpty(id) || 0 == id) {
+ return R.fail("主键id不能为空");
+ }
+ Long userId = null;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+
+ PartyBuildingComPbDynVO partyBuildingComPbDynVO =
+ JSONObject.parseObject(JSONObject.toJSONString(r.getData()), PartyBuildingComPbDynVO.class);
+ if (userId != null) {
+ ComPbDynUserVO comPbDynUserVO = new ComPbDynUserVO();
+ comPbDynUserVO.setCreateAt(new Date());
+ comPbDynUserVO.setDynId(id);
+ comPbDynUserVO.setUserId(userId);
+ R r1 = partyBuildingWestService.addDynUser(comPbDynUserVO);
+ if (R.isOk(r1)) {
+ partyBuildingComPbDynVO.setIsAdd(1);
+ } else {
+ partyBuildingComPbDynVO.setIsAdd(0);
+ }
+ } else {
+ partyBuildingComPbDynVO.setIsAdd(0);
+ }
+ return R.ok(partyBuildingComPbDynVO);
+ }
+ return r;
+ }
+
+ @ApiOperation(value = "分页党委查询", response = PartyCommitteeVO.class)
+ @PostMapping("pagepartycommittee")
+ public R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
+ // Long communityId =this.getCommunityId();
+ // partyCommitteeVO.setCommunityId(communityId);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ partyCommitteeVO.setCommunityId(loginUserInfo.getCommunityId());
+ }
+ return partyBuildingService.pagePartyCommittee(partyCommitteeVO);
+ }
+
+ @ApiOperation(value = "活动详情", response = PartyBuildingActivityVO.class)
+ @GetMapping("activityinfo")
+ public R activityinfo(@RequestParam("id") Long id) {
+ Long userId = this.getUserId();
+ return partyBuildingService.activityinfo(id, userId);
+ }
+
+ @ApiOperation(value = "党员活动人员参入列表", response = PartyBuildingMemberVO.class)
+ @GetMapping("listpartybuildingmember")
+ public R listPartyBuildingMember(@RequestParam("id") Long id) {
+ return partyBuildingService.listPartyBuildingMember(id);
+ }
+
+ @ApiOperation(value = "报名、取消报名党员活动")
+ @PutMapping("activitysignup")
+ public R putActivitySignUp(@RequestBody @Validated ActivitySignUpDTO activitySignUpDTO) {
+ Long userId = this.getUserId();
+ activitySignUpDTO.setUserId(userId);
+ Long id = activitySignUpDTO.getId();
+ R r = partyBuildingService.putActivitySignUp(activitySignUpDTO);
+ if (R.isOk(r) && activitySignUpDTO.getType().intValue() == 1) {
+ R r2 = partyBuildingService.activityinfo(id, userId);
+ PartyBuildingActivityVO partyBuildingActivityVO =
+ JSONObject.parseObject(JSONObject.toJSONString(r2.getData()), PartyBuildingActivityVO.class);
+ SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
+ sysUserNoticeVO.setUserId(userId);
+ sysUserNoticeVO.setType(1);
+ sysUserNoticeVO.setTitle("报名成功");
+ sysUserNoticeVO.setBusinessType(2);
+ sysUserNoticeVO.setBusinessTitle(partyBuildingActivityVO.getName());
+ Date activityTimeBegin = partyBuildingActivityVO.getActivityTimeBegin();
+ sysUserNoticeVO
+ .setBusinessContent(String.format("活动将于 %tF %tT 开始，请按时参加", activityTimeBegin, activityTimeBegin));
+ sysUserNoticeVO.setBusinessId(id);
+ sysUserNoticeVO.setStatus(0);
+ sysUserNoticeVO.setBusinessStatus(2);
+ R r1 = userService.addNotice(sysUserNoticeVO);
+ if (R.isOk(r1)) {
+ log.info("新增用户报名党建活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
+ }
+ return r;
+ }
+
+ @ApiOperation(value = "创建党员活动")
+ @PostMapping("activityinfo")
+ public R addActivityinfo(@RequestBody @Validated(AddGroup.class) ComPbActivityDTO comPbActivityDTO) {
+ // 微信内容审核
+ String msg = comPbActivityDTO.getRichText();
+ if (StrUtil.isNotBlank(msg)) {
+ String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ Long communityId = loginUserInfo.getCommunityId();
+ comPbActivityDTO.setCreateBy(userId);
+ comPbActivityDTO.setCommunityId(communityId);
+ Date date = new Date();
+ comPbActivityDTO.setReleaseTime(date);
+ Date activityTimeBegin = comPbActivityDTO.getActivityTimeBegin();
+ Date activityTimeEnd = comPbActivityDTO.getActivityTimeEnd();
+ boolean before = activityTimeEnd.before(activityTimeBegin);
+ if (before) {
+ return R.fail("活动结束时间不能早于开始时间");
+ }
+ // 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消
+ int status = 2;
+ Date enrollTimeBegin = comPbActivityDTO.getEnrollTimeBegin();
+ Date enrollTimeEnd = comPbActivityDTO.getEnrollTimeEnd();
+ if (enrollTimeEnd.before(enrollTimeBegin)) {
+ return R.fail("报名结束时间不能早于报名开始时间");
+ }
+ if (enrollTimeBegin.before(date)) {
+ status = 3;
+ }
+ comPbActivityDTO.setStatus(status);
+ return partyBuildingService.addActivityApplets(comPbActivityDTO);
+ }
+
+ @ApiOperation(value = "分页查询服务团队成员", response = ComPbServiceTeamVO.class)
+ @PostMapping("pageserviceteam")
+ public R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ pageComPbServiceTeamDTO.setCommunityId(loginUserInfo.getCommunityId());
+ }
+ // pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId());
+ return partyBuildingService.pageServiceTeam(pageComPbServiceTeamDTO);
+ }
+
+ @ApiOperation(value = "社区所有启用的党组织列表", response = PartyOrganizationVO.class)
+ @PostMapping("listpartyorganization")
+ public R listPartyOrganization(@RequestBody ComListPartyDTO comListPartyDTO) {
+ // Long communityId = this.getCommunityId();
+ // log.info("社区所有党组织社区id【{}】", communityId);
+ // if(communityId != null){
+ // comListPartyDTO.setCommunityId(communityId);
+ // }
+ return partyBuildingService.listPartyOrganizationByApp(comListPartyDTO);
+ }
+
+ @OperLog(operModul = "党员管理", operType = 2)
+ @ApiOperation(value = "编辑党员")
+ @PutMapping("updatepartybuildingmember")
+ public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
+ return partyBuildingService.updatePartyBuildingMember(partyBuildingMemberVO);
+ }
+
+ @ApiOperation(value = "查询社区下所有党员报到单位", response = ComPbCheckUnitVo.class)
+ @PostMapping("/comPbCheckUnit/list")
+ public R getPbCheckUnitList(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
+ if (comPbCheckUnit.getCommunityId() == null) {
+ comPbCheckUnit.setCommunityId(this.getCommunityId());
+ }
+ return pbCheckUnitFeign.queryByList(comPbCheckUnit);
+ }
+
+ @OperLog(operModul = "党员管理", operType = 1)
+ @ApiOperation(value = "新增党员")
+ @PostMapping("addpartybuildingmember")
+ public R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
+ Long userId = this.getUserId();
+ partyBuildingMemberVO.setUserId(userId);
+ R r = partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
+ if (R.isOk(r)) {
+ R r1 = userService.updateUserPartyStatus(this.getUserId());
+ }
+ return r;
+ }
+
+ @OperLog(operModul = "党员管理", operType = 1)
+ @ApiOperation(value = "分页查询党员列表",response = PartyBuildingMemberVO.class)
+ @PostMapping("/page/member")
+ public R pageMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
+ //partyBuildingMemberVO.setCommunityId(this.getCommunityId());
+ return partyBuildingService.getPagePbMember(partyBuildingMemberVO);
+ }
+
+ @PostMapping("/getProject/list")
+ public R getProjectList(@RequestBody ProjectVO projectVO){
+ return partyBuildingService.getProjectList(projectVO);
+ }
+
+ @PostMapping("/add/project")
+ public R addProject(@RequestBody ProjectVO projectVO){
+ return partyBuildingService.addProject(projectVO);
+ }
+
+ @PostMapping("/update/project")
+ public R updateProject(@RequestBody ProjectVO projectVO){
+ return partyBuildingService.updateProject(projectVO);
+ }
+
+ @PostMapping("/delete/project")
+ public R deleteProject(@RequestBody ProjectVO projectVO){
+ return partyBuildingService.deleteProject(projectVO);
+ }
+
+ @ApiOperation(value = "分页查询注册党员列表",response = PartyBuildingMemberVO.class)
+ @PostMapping("/page/registerMember")
+ public R pageRegisterMember(@RequestBody PageMemberForInviteDTO pageMemberForInviteDTO) {
+ pageMemberForInviteDTO.setAppid(this.getAppId());
+ return partyBuildingService.pageRegisterMember(pageMemberForInviteDTO);
+ }
+
+ @ApiOperation(value = "查询所有社区列表", response = EventGridCommunityAdminVO.class)
+ @GetMapping("/community/list")
+ public R getCommunityLists() {
+ return communityService.getCommunityLists();
+ }
+
+ @ApiOperation(value = "查询当前用户党员信息")
+ @GetMapping("/getPartyMember")
+ public R getPartyMember(@RequestParam("type")Integer type){
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (StrUtil.isEmpty(loginUserInfo.getPhone())){
+ return R.fail("请先实名认证");
+ }
+ return partyBuildingService.getPartyMember(loginUserInfo.getPhone(),type);
+ }
+ @ApiOperation(value = "查询报道单位详情")
+ @GetMapping("/comPbCheckUnit/detailByPhone")
+ public R detailById(@RequestParam("phone") String phone) {
+ return partyBuildingService.detailByPhone(phone);
+ }
+ @ApiOperation(value = "党员详情",response =PartyBuildingMemberVO.class)
+ @GetMapping("/memberDetail")
+ public R memberDetail(@RequestParam("id")Long id){
+ return partyBuildingService.memberDetail(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingWestApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingWestApi.java
new file mode 100644
index 0000000..9466d42
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingWestApi.java
@@ -0,0 +1,284 @@
+package com.panzhihua.applets.api;
+
+import java.util.Date;
+
+import javax.annotation.Resource;
+
+import cn.hutool.core.util.StrUtil;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.interfaces.OperLog;
+import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
+import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
+import com.panzhihua.common.model.vos.partybuilding.*;
+import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign;
+import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
+import com.panzhihua.common.model.dtos.partybuilding.ComListPartyDTO;
+import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO;
+import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.service.partybuilding.PartyBuildingWestService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 党群服务
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-02 16:19
+ **/
+@Slf4j
+@RestController
+@RequestMapping("/partybuildingWest/")
+@Api(tags = {"党群服务"})
+public class PartyBuildingWestApi extends BaseController {
+ @Resource
+ private PartyBuildingWestService partyBuildingWestService;
+ @Resource
+ private UserService userService;
+ @Resource
+ private CheckService checkService;
+ @Resource
+ private ComPbCheckUnitFeign pbCheckUnitFeign;
+
+ public static void main(String[] args) {
+ Date date = new Date();
+ String dateFormat = String.format("%tF %tT ", date, date);
+ System.out.println(dateFormat);
+ }
+
+ @ApiOperation(value = "分页党建动态/政策文件", response = PartyBuildingComPbDynVO.class)
+ @PostMapping("pagedynamic")
+ public R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ partyBuildingComPbDynVO.setCommunityId(loginUserInfo.getCommunityId());
+ }
+ Integer type = partyBuildingComPbDynVO.getType();
+ if (ObjectUtils.isEmpty(type)) {
+ return R.fail("类型不能为空");
+ }
+ partyBuildingComPbDynVO.setStatus(2);
+ return partyBuildingWestService.pageYnamic(partyBuildingComPbDynVO);
+ }
+
+ @ApiOperation(value = "分页查询党员活动", response = PageActivityMembersVO.class)
+ @PostMapping("pageactivity")
+ public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ partyBuildingActivityVO.setCommunityId(loginUserInfo.getCommunityId());
+ }
+ // Long communityId = this.getCommunityId();
+ // partyBuildingActivityVO.setCommunityId(communityId);
+ Integer status = partyBuildingActivityVO.getStatus();
+ if (null != status && status.intValue() == 4) {
+ partyBuildingActivityVO.setIsAppliets(1);
+ }
+ return partyBuildingWestService.pageActivity(partyBuildingActivityVO);
+ }
+
+ // @ApiOperation(value = "增加阅读记录")
+ // @PostMapping("adddynuser")
+ // public R addDynUser(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
+ // Long id = partyBuildingComPbDynVO.getId();
+ // if (ObjectUtils.isEmpty(id)||0==id) {
+ // return R.fail("主键id不能为空");
+ // }
+ // Long userId = this.getUserId();
+ // ComPbDynUserVO comPbDynUserVO=new ComPbDynUserVO();
+ // comPbDynUserVO.setCreateAt(new Date());
+ // comPbDynUserVO.setDynId(id);
+ // comPbDynUserVO.setUserId(userId);
+ // return partyBuildingService.addDynUser(comPbDynUserVO);
+ // }
+
+ @ApiOperation(value = "动态/政策文件详情", response = PartyBuildingComPbDynVO.class)
+ @GetMapping("infodynamic")
+ public R infoYnamic(@RequestParam("id") Long id) {
+ R r = partyBuildingWestService.infoYnamic(id);
+ if (R.isOk(r)) {
+ if (ObjectUtils.isEmpty(id) || 0 == id) {
+ return R.fail("主键id不能为空");
+ }
+ Long userId = null;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ userId = loginUserInfo.getUserId();
+ }
+
+ PartyBuildingComPbDynVO partyBuildingComPbDynVO =
+ JSONObject.parseObject(JSONObject.toJSONString(r.getData()), PartyBuildingComPbDynVO.class);
+ if (userId != null) {
+ ComPbDynUserVO comPbDynUserVO = new ComPbDynUserVO();
+ comPbDynUserVO.setCreateAt(new Date());
+ comPbDynUserVO.setDynId(id);
+ comPbDynUserVO.setUserId(userId);
+ R r1 = partyBuildingWestService.addDynUser(comPbDynUserVO);
+ if (R.isOk(r1)) {
+ partyBuildingComPbDynVO.setIsAdd(1);
+ } else {
+ partyBuildingComPbDynVO.setIsAdd(0);
+ }
+ } else {
+ partyBuildingComPbDynVO.setIsAdd(0);
+ }
+ return R.ok(partyBuildingComPbDynVO);
+ }
+ return r;
+ }
+
+ @ApiOperation(value = "分页党委查询", response = PartyCommitteeVO.class)
+ @PostMapping("pagepartycommittee")
+ public R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
+ // Long communityId =this.getCommunityId();
+ // partyCommitteeVO.setCommunityId(communityId);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ partyCommitteeVO.setCommunityId(loginUserInfo.getCommunityId());
+ }
+ return partyBuildingWestService.pagePartyCommittee(partyCommitteeVO);
+ }
+
+ @ApiOperation(value = "活动详情", response = PartyBuildingActivityVO.class)
+ @GetMapping("activityinfo")
+ public R activityinfo(@RequestParam("id") Long id) {
+ Long userId = this.getUserId();
+ return partyBuildingWestService.activityinfo(id, userId);
+ }
+
+ @ApiOperation(value = "党员活动人员参入列表", response = PartyBuildingMemberVO.class)
+ @GetMapping("listpartybuildingmember")
+ public R listPartyBuildingMember(@RequestParam("id") Long id) {
+ return partyBuildingWestService.listPartyBuildingMember(id);
+ }
+
+ @ApiOperation(value = "报名、取消报名党员活动")
+ @PutMapping("activitysignup")
+ public R putActivitySignUp(@RequestBody @Validated ActivitySignUpDTO activitySignUpDTO) {
+ Long userId = this.getUserId();
+ activitySignUpDTO.setUserId(userId);
+ Long id = activitySignUpDTO.getId();
+ R r = partyBuildingWestService.putActivitySignUp(activitySignUpDTO);
+ if (R.isOk(r) && activitySignUpDTO.getType().intValue() == 1) {
+ R r2 = partyBuildingWestService.activityinfo(id, userId);
+ PartyBuildingActivityVO partyBuildingActivityVO =
+ JSONObject.parseObject(JSONObject.toJSONString(r2.getData()), PartyBuildingActivityVO.class);
+ SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
+ sysUserNoticeVO.setUserId(userId);
+ sysUserNoticeVO.setType(1);
+ sysUserNoticeVO.setTitle("报名成功");
+ sysUserNoticeVO.setBusinessType(2);
+ sysUserNoticeVO.setBusinessTitle(partyBuildingActivityVO.getName());
+ Date activityTimeBegin = partyBuildingActivityVO.getActivityTimeBegin();
+ sysUserNoticeVO
+ .setBusinessContent(String.format("活动将于 %tF %tT 开始，请按时参加", activityTimeBegin, activityTimeBegin));
+ sysUserNoticeVO.setBusinessId(id);
+ sysUserNoticeVO.setStatus(0);
+ sysUserNoticeVO.setBusinessStatus(2);
+ R r1 = userService.addNotice(sysUserNoticeVO);
+ if (R.isOk(r1)) {
+ log.info("新增用户报名党建活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
+ }
+ return r;
+ }
+
+ @ApiOperation(value = "创建党员活动")
+ @PostMapping("activityinfo")
+ public R addActivityinfo(@RequestBody @Validated(AddGroup.class) ComPbActivityDTO comPbActivityDTO) {
+ // 微信内容审核
+ String msg = comPbActivityDTO.getRichText();
+ if (StrUtil.isNotBlank(msg)) {
+ String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ Long communityId = loginUserInfo.getCommunityId();
+ comPbActivityDTO.setCreateBy(userId);
+ comPbActivityDTO.setCommunityId(communityId);
+ Date date = new Date();
+ comPbActivityDTO.setReleaseTime(date);
+ Date activityTimeBegin = comPbActivityDTO.getActivityTimeBegin();
+ Date activityTimeEnd = comPbActivityDTO.getActivityTimeEnd();
+ boolean before = activityTimeEnd.before(activityTimeBegin);
+ if (before) {
+ return R.fail("活动结束时间不能早于开始时间");
+ }
+ // 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消
+ int status = 2;
+ Date enrollTimeBegin = comPbActivityDTO.getEnrollTimeBegin();
+ Date enrollTimeEnd = comPbActivityDTO.getEnrollTimeEnd();
+ if (enrollTimeEnd.before(enrollTimeBegin)) {
+ return R.fail("报名结束时间不能早于报名开始时间");
+ }
+ if (enrollTimeBegin.before(date)) {
+ status = 3;
+ }
+ comPbActivityDTO.setStatus(status);
+ return partyBuildingWestService.addActivityApplets(comPbActivityDTO);
+ }
+
+ @ApiOperation(value = "分页查询服务团队成员", response = ComPbServiceTeamVO.class)
+ @PostMapping("pageserviceteam")
+ public R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ pageComPbServiceTeamDTO.setCommunityId(loginUserInfo.getCommunityId());
+ }
+ // pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId());
+ return partyBuildingWestService.pageServiceTeam(pageComPbServiceTeamDTO);
+ }
+
+ @ApiOperation(value = "社区所有启用的党组织列表", response = PartyOrganizationVO.class)
+ @PostMapping("listpartyorganization")
+ public R listPartyOrganization(@RequestBody ComListPartyDTO comListPartyDTO) {
+ // Long communityId = this.getCommunityId();
+ // log.info("社区所有党组织社区id【{}】", communityId);
+ // if(communityId != null){
+ // comListPartyDTO.setCommunityId(communityId);
+ // }
+ return partyBuildingWestService.listPartyOrganizationByApp(comListPartyDTO);
+ }
+
+ @OperLog(operModul = "党员管理", operType = 2)
+ @ApiOperation(value = "编辑党员")
+ @PutMapping("updatepartybuildingmember")
+ public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
+ if(partyBuildingMemberVO.getIsPb()!=null){
+ Long id = partyBuildingMemberVO.getId();
+ if(partyBuildingMemberVO.getIsPb()==1){
+ if (null == id || 0 == id) {
+ return partyBuildingWestService.addPartyBuildingMember(partyBuildingMemberVO);
+ }
+ return partyBuildingWestService.updatePartyBuildingMember(partyBuildingMemberVO);
+ }
+ return partyBuildingWestService.deleteprepartybuildingmember(id);
+ }
+ return R.fail();
+ }
+
+ @ApiOperation(value = "查询社区下所有党员报到单位", response = ComPbCheckUnitVo.class)
+ @PostMapping("/comPbCheckUnit/list")
+ public R getPbCheckUnitList(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
+ if(comPbCheckUnit.getCommunityId() == null){
+ comPbCheckUnit.setCommunityId(this.getCommunityId());
+ }
+ return pbCheckUnitFeign.queryByList(comPbCheckUnit);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/RentingHourseOrderApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/RentingHourseOrderApi.java
new file mode 100644
index 0000000..987002f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/RentingHourseOrderApi.java
@@ -0,0 +1,114 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.rentHouse.RentingHourseOrderVO;
+import com.panzhihua.common.model.vos.community.rentHouse.WxPayNotifyOrderVO;
+import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 房屋租赁-房屋订单表(RentingHourseOrder)表控制层
+ *
+ * @author makejava
+ * @since 2021-11-23 10:46:57
+ */
+@RestController
+@Slf4j
+@Api(tags = {"房屋租赁普通订单相关接口"})
+@RequestMapping("rentingHourseOrder")
+public class RentingHourseOrderApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询所有数据",response = RentingHourseOrderVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setCommunityId(this.getCommunityId());
+ return communityService.selectRentingHourseOrderAll(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation(value = "分页查询所有数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return communityService.selectRentingHourseOrderOne(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param rentingHourseOrder 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("创建订单")
+ @PostMapping
+ public R insert(@RequestBody RentingHourseOrderVO rentingHourseOrder) {
+ rentingHourseOrder.setCommunityId(this.getCommunityId());
+ return communityService.insertRentingHourseOrder(rentingHourseOrder);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param rentingHourseOrdervo 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/update")
+ public R update(@RequestBody RentingHourseOrderVO rentingHourseOrdervo) {
+ return communityService.updateRentingHourseOrder(rentingHourseOrdervo);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return communityService.deleteRentingHourseOrder(id);
+ }
+
+ /**
+ * 支付回调处理订单状态以及房屋状态
+ */
+ @ApiOperation("支付回调处理订单状态以及房屋状态")
+ @PostMapping("/wxNotify")
+ public R wxNotify(@RequestBody WxPayNotifyOrderVO wxPayNotifyOrderVO){
+ return communityService.wxNotifyRentingHourseOrder(wxPayNotifyOrderVO);
+ }
+
+ /**
+ * 支付付款
+ */
+ @ApiOperation("支付付款")
+ @PostMapping("/wxPay")
+ public R wxPay(@RequestBody WxPayOrderVO wxPayOrderVO){
+ return communityService.wxPayRentingHourseOrder(wxPayOrderVO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/RentingHoursePreOrderApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/RentingHoursePreOrderApi.java
new file mode 100644
index 0000000..33a5f03
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/RentingHoursePreOrderApi.java
@@ -0,0 +1,95 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.rentHouse.RentingHoursePreOrderVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 房屋租赁-房屋定金订单表(RentingHoursePreOrder)表控制层
+ *
+ * @author makejava
+ * @since 2021-11-23 10:47:54
+ */
+@RestController
+@Slf4j
+@Api(tags = {"房屋租赁定金订单相关接口"})
+@RequestMapping("rentingHoursePreOrder")
+public class RentingHoursePreOrderApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = RentingHoursePreOrderVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setCommunityId(this.getCommunityId());
+ return communityService.selectAllRentingHoursePreOrder(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation(value = "详情",response = RentingHoursePreOrderVO.class)
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return communityService.selectOneRentingHoursePreOrder(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param rentingHoursePreOrderVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation(value = "创建定金订单")
+ @PostMapping
+ public R insert(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO) {
+ rentingHoursePreOrderVO.setCommunityId(this.getCommunityId());
+ return communityService.insertRentingHoursePreOrder(rentingHoursePreOrderVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param rentingHoursePreOrderVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改")
+ @PostMapping("/update")
+ public R update(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO) {
+ return communityService.updateRentingHoursePreOrder(rentingHoursePreOrderVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return communityService.deleteRentingHoursePreOrder(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/RentingHousesApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/RentingHousesApi.java
new file mode 100644
index 0000000..7c4fa04
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/RentingHousesApi.java
@@ -0,0 +1,210 @@
+package com.panzhihua.applets.api;
+
+import java.util.Objects;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.dtos.community.rentingHouses.NearbyDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHouseRegisterDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.ReleaseOrCancelHouseDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHouseRegisterDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.rentingHouses.RentingHouseRegisterVO;
+import com.panzhihua.common.model.vos.community.rentingHouses.RentingHousesConfigVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.TencentUtils;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @title: RentingHousesApi
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 房屋租赁相关接口
+ * @author: hans
+ * @date: 2021/11/24 10:18
+ */
+@RestController
+@Slf4j
+@Api(tags = {"房屋租赁相关接口"})
+@RequestMapping("/renting/houses")
+public class RentingHousesApi extends BaseController {
+
+ private static final int NOT_COMMUNITY_WORKER = 2;
+
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private UserService userService;
+
+ @ApiOperation("新增房源信息")
+ @PostMapping("/register")
+ public R registerRentingHouse(@RequestBody @Validated(AddGroup.class) RentingHouseRegisterDTO registerDTO) {
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ checkIsCommunityWorker(loginUserInfo);
+ registerDTO.setUserId(loginUserInfo.getUserId());
+ registerDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.registerRentingHouse(registerDTO);
+ }
+
+ @ApiOperation("编辑房源信息")
+ @PostMapping("/update")
+ public R updateRentingHouse(@RequestBody @Validated(PutGroup.class) RentingHouseRegisterDTO registerDTO) {
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ checkIsCommunityWorker(loginUserInfo);
+ registerDTO.setUserId(loginUserInfo.getUserId());
+ registerDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.updateRentingHouse(registerDTO);
+ }
+
+ @ApiOperation(value = "工作人员-分页获取房源信息", response = RentingHouseRegisterVO.class)
+ @PostMapping("/pageAdmin")
+ public R pageRentingHouse(@RequestBody @Valid PageRentingHouseRegisterDTO pageRegisterDTO) {
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ pageRegisterDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.pageRentingHouse(pageRegisterDTO);
+ }
+
+ @ApiOperation("发布/取消发布 房源信息")
+ @PutMapping("/releaseOrCancel")
+ public R releaseOrCancelHouse(@RequestBody @Valid ReleaseOrCancelHouseDTO releaseOrCancelHouseDTO) {
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ checkIsCommunityWorker(loginUserInfo);
+ return communityService.releaseOrCancelHouse(releaseOrCancelHouseDTO);
+ }
+
+ @ApiOperation(value = "获取详情-房源信息", response = RentingHouseRegisterVO.class)
+ @GetMapping("/get")
+ @ApiImplicitParam(name = "registerId", value = "房源登记id", required = true)
+ public R getRentingHouse(@RequestParam("registerId") Long registerId) {
+ LoginUserInfoVO loginUserInfoSureNoLogin = getLoginUserInfoSureNoLogin();
+ Integer isLandlord = 2;
+ R rentingHouseR = communityService.getRentingHouse(registerId);
+ if (R.isOk(rentingHouseR)) {
+ RentingHouseRegisterVO houseRegisterVO = JSONObject.parseObject(JSONObject.toJSONString(rentingHouseR.getData()), RentingHouseRegisterVO.class);
+ if (Objects.nonNull(loginUserInfoSureNoLogin)) {
+ String userId = loginUserInfoSureNoLogin.getUserId().toString();
+ R<LoginUserInfoVO> infoVOR = userService.getUserInfoByUserId(userId);
+ if (R.isOk(infoVOR)) {
+ LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(infoVOR.getData()), LoginUserInfoVO.class);
+ if (houseRegisterVO.getHourseIdCard().equals(loginUserInfoVO.getIdCard())) {
+ isLandlord = 1;
+ }
+ }
+ }
+ houseRegisterVO.setIsLandlord(isLandlord);
+ return R.ok(houseRegisterVO);
+ }
+ return rentingHouseR;
+ }
+ @ApiOperation("房源认证获取eidToken")
+ @GetMapping("/getEidToken")
+ public R getEidToken(@RequestParam("registerId") Long registerId){
+ R r=communityService.getRentingHouse(registerId);
+ if(R.isOk(r)){
+ RentingHouseRegisterVO registerVO=JSONObject.parseObject(JSONObject.toJSONString(r.getData()),RentingHouseRegisterVO.class);
+ String result=TencentUtils.getEidToken(registerVO.getHourseOwnerName(),registerVO.getHourseIdCard());
+ return R.ok(result);
+ }
+ return R.fail();
+ }
+ @ApiOperation("房源认证")
+ @GetMapping("/auth")
+ public R authHouse(@RequestParam("registerId") Long registerId,@RequestParam("result")String result){
+ R r=communityService.getRentingHouse(registerId);
+ if(R.isOk(r)){
+ String response=TencentUtils.getEidResult(result);
+ JSONObject object = JSON.parseObject(response);
+ if (object == null) {
+ return R.fail("核验失败");
+ }
+ JSONObject textObject = object.getJSONObject("Text");
+
+ String code = textObject.getString("ErrCode");
+ if (!code.equals("0")) {
+ log.error("人脸核验失败，错误原因：" + textObject.toJSONString());
+ return R.fail("核验失败");
+ }
+ RentingHouseRegisterDTO registerDTO=new RentingHouseRegisterDTO();
+ registerDTO.setId(registerId);
+ registerDTO.setAuthStatus(2);
+ registerDTO.setDetailStatus(2);
+ registerDTO.setHourseOwnerUserId(getUserId());
+ return communityService.updateRentingHouse(registerDTO);
+ }
+ return R.fail();
+ }
+
+ /**
+ * 附近的房源
+ */
+ @ApiOperation(value = "附近的房源",response =RentingHouseRegisterVO.class)
+ @PostMapping("/nearby")
+ public R nearby(@RequestBody NearbyDTO nearbyDTO){
+ LoginUserInfoVO loginUserInfoSureNoLogin = getLoginUserInfoSureNoLogin();
+ if (Objects.nonNull(loginUserInfoSureNoLogin)) {
+ nearbyDTO.setCommunityId(loginUserInfoSureNoLogin.getCommunityId());
+ }
+ return communityService.nearby(nearbyDTO);
+ }
+
+ /**
+ * 小程序分页获取房源信息
+ * @param pageRegisterDTO
+ * @return
+ */
+ @ApiOperation(value = "小程序分页获取房源信息",response =RentingHouseRegisterVO.class)
+ @PostMapping("/houseList")
+ public R pageRentingHouseApplet(@RequestBody PageRentingHouseRegisterDTO pageRegisterDTO) {
+ Integer isMy = pageRegisterDTO.getIsMy();
+ if (Objects.nonNull(isMy) && isMy.intValue() == 1) {
+ pageRegisterDTO.setCurrentUserId(getUserId());
+ }
+ return communityService.pageRentingHouseApplet(pageRegisterDTO);
+ }
+
+
+ @ApiOperation(value = "获取房屋租赁配置",response = RentingHousesConfigVO.class)
+ @GetMapping("/getConfig")
+ @ApiImplicitParam(name = "type", value = "配置类型（1.房屋租赁合同 2.租赁合同变更协议 3.定金协议 4.房屋委托代理合同" +
+ "5.平台须知 6.房源标签）", required = true)
+ public R getRentingHouseConfig(@RequestParam("type") Integer type) {
+ return communityService.getRentingHouseConfig(type);
+ }
+
+ @ApiOperation("删除房源信息")
+ @DeleteMapping("/delete")
+ @ApiImplicitParam(name = "registerId", value = "房源登记id", required = true)
+ public R deleteRentingHouse(@RequestParam("registerId") Long registerId) {
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ checkIsCommunityWorker(loginUserInfo);
+ return communityService.deleteRentingHouse(registerId);
+ }
+
+ private void checkIsCommunityWorker(LoginUserInfoVO loginUserInfo) {
+ if (loginUserInfo.getIsCommunityWorker().intValue() == NOT_COMMUNITY_WORKER) {
+ throw new ServiceException("401", "暂无权限");
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java
new file mode 100644
index 0000000..e7e43e8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java
@@ -0,0 +1,258 @@
+package com.panzhihua.applets.api;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.applets.config.WxMaProperties;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.shop.*;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.shop.*;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:49
+ * @describe 商城模块API
+ */
+@Slf4j
+@RestController
+@RequestMapping("/shop/")
+@Api(tags = {"商城服务"})
+public class ShopApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private WxMaProperties properties;
+
+ @ApiOperation(value = "分页查询店铺", response = PageShopStoreVO.class)
+ @PostMapping("pageshopstore")
+ public R pageShopStore(@RequestBody PageComShopStoreDTO comShopStoreDTO) {
+ PageComShopSysConfDTO pageComShopSysConfDTO = new PageComShopSysConfDTO();
+ R conf = communityService.pageShopSysConf(pageComShopSysConfDTO);
+ if (R.isOk(conf) && conf.getData() != null) {
+ ComShopSysConfVO comShopSysConfVO =
+ JSONObject.parseObject(JSONObject.toJSONString(conf.getData()), ComShopSysConfVO.class);
+ if ("1".equals(comShopSysConfVO.getVal()) && "1".equals(comShopSysConfVO.getEnabled())) {
+ return R.ok();
+ }
+ }
+ return communityService.pageShopStore(comShopStoreDTO);
+ }
+
+ @ApiOperation(value = "查询店铺详情", response = PageShopStoreVO.class)
+ @PostMapping("shopstoredetail")
+ public R shopStoreDetail(@RequestBody PageComShopStoreDTO comShopStoreDTO) {
+ if (comShopStoreDTO == null || comShopStoreDTO.getStoreId() == null) {
+ return R.fail("参数错误");
+ }
+ return communityService.shopStoreDetail(comShopStoreDTO);
+ }
+
+ @ApiOperation(value = "分页查询商品列表", response = ComShopGoodsVO.class)
+ @PostMapping("pageShopGoods")
+ public R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO) {
+ return communityService.pageShopGoods(comShopGoodsDTO);
+ }
+
+ @ApiOperation(value = "查询商品详情", response = ComShopGoodsVO.class)
+ @PostMapping("shopGoodsDetail")
+ @ApiImplicitParam(name = "goodsId", value = "商品id", required = true)
+ public R shopGoodsDetail(@RequestParam("goodsId") Long goodsId) {
+ return communityService.shopGoodsDetail(goodsId);
+ }
+
+ @ApiOperation(value = "查询用户购物车列表", response = ComShopCartVO.class)
+ @PostMapping("shopCartList")
+ public R shopCartList() {
+ Long userId = this.getUserId();
+ if (userId == null) {
+ return R.fail("请重新登陆");
+ }
+ return communityService.shopCartList(userId);
+ }
+
+ @ApiOperation(value = "查询用户购物车商品数量")
+ @PostMapping("shopCartUserTotal")
+ public R shopCartUserTotal() {
+ Long userId = this.getUserId();
+ if (userId == null) {
+ return R.fail("请重新登陆");
+ }
+ PageComShopSysConfDTO pageComShopSysConfDTO = new PageComShopSysConfDTO();
+ R conf = communityService.pageShopSysConf(pageComShopSysConfDTO);
+ if (R.isOk(conf) && conf.getData() != null) {
+ ComShopSysConfVO comShopSysConfVO =
+ JSONObject.parseObject(JSONObject.toJSONString(conf.getData()), ComShopSysConfVO.class);
+ if ("1".equals(comShopSysConfVO.getVal()) && "1".equals(comShopSysConfVO.getEnabled())) {
+ return R.ok(0);
+ }
+ }
+ return communityService.shopCartUserTotal(userId);
+ }
+
+ @ApiOperation(value = "购物车添加")
+ @PostMapping("shopAddCart")
+ public R shopAddCart(@RequestBody ComShopCartDTO comShopCartDTO) {
+ Long userId = this.getUserId();
+ if (userId == null) {
+ return R.fail("请重新登陆");
+ }
+ comShopCartDTO.setUserId(userId);
+ return communityService.shopAddCart(comShopCartDTO);
+ }
+
+ @ApiOperation(value = "购物车修改")
+ @PostMapping("shopEditNubCart")
+ public R shopEditNubCart(@RequestBody ComShopEditNubCartDTO shopEditNubCartDTO) {
+ return communityService.shopEditNubCart(shopEditNubCartDTO);
+ }
+
+ @ApiOperation(value = "购物车删除")
+ @PostMapping("shopDelCart")
+ public R shopDelCart(@RequestBody List<Long> Ids) {
+ return communityService.shopDelCart(Ids);
+ }
+
+ @ApiOperation(value = "查询用户收货地址列表", response = ComShopUserAddressVO.class)
+ @PostMapping("shopUserAddressList")
+ public R shopUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO) {
+ Long userId = this.getUserId();
+ if (userId == null) {
+ return R.fail("请重新登陆");
+ }
+ comShopAddressDTO.setUserId(userId);
+ return communityService.shopUserAddressList(comShopAddressDTO);
+ }
+
+ @ApiOperation(value = "添加用户收货地址列表")
+ @PostMapping("shopAddUserAddress")
+ public R shopAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
+ Long userId = this.getUserId();
+ if (userId == null) {
+ return R.fail("请重新登陆");
+ }
+ comShopAddressDTO.setUserId(userId);
+ return communityService.shopAddUserAddress(comShopAddressDTO);
+ }
+
+ @ApiOperation(value = "修改用户收货地址列表")
+ @PostMapping("shopEditUserAddress")
+ public R shopEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
+ Long userId = this.getUserId();
+ if (userId == null) {
+ return R.fail("请重新登陆");
+ }
+ comShopAddressDTO.setUserId(userId);
+ return communityService.shopEditUserAddress(comShopAddressDTO);
+ }
+
+ @ApiOperation(value = "删除用户收货地址列表")
+ @PostMapping("shopDelUserAddress")
+ @ApiImplicitParam(name = "addressId", value = "收货地址id", required = true)
+ public R shopDelUserAddress(@RequestParam("addressId") Long addressId) {
+ return communityService.shopDelUserAddress(addressId);
+ }
+
+ @ApiOperation(value = "订单预览", response = ComShopOrderPreviewVO.class)
+ @PostMapping("orderPreview")
+ public R orderPreview(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO) {
+ Long userId = this.getUserId();
+ if (userId == null) {
+ return R.fail("请重新登陆");
+ }
+ orderPreviewDTO.setUserId(userId);
+ return communityService.orderPreview(orderPreviewDTO);
+ }
+
+ @ApiOperation(value = "创建订单", response = ComShopOrderVO.class)
+ @PostMapping("orderCreate")
+ public R orderCreate(@RequestBody ComShopOrderCreateDTO orderCreateDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请重新登陆");
+ }
+ orderCreateDTO.setUserId(loginUserInfo.getUserId());
+ orderCreateDTO.setPhone(loginUserInfo.getPhone());
+ orderCreateDTO.setOpenId(loginUserInfo.getOpenid());
+ return communityService.orderCreate(orderCreateDTO);
+ }
+
+ @ApiOperation(value = "分页查询订单列表", response = ComShopOrderPageVO.class)
+ @PostMapping("pageOrderList")
+ public R pageOrderList(@RequestBody PageComOrderListDTO comOrderListDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请重新登陆");
+ }
+ comOrderListDTO.setUserId(loginUserInfo.getUserId());
+ return communityService.pageOrderList(comOrderListDTO);
+ }
+
+ @ApiOperation(value = "查询订单详情", response = ComShopOrderPageVO.class)
+ @PostMapping("orderDetail")
+ @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
+ public R orderDetail(@RequestParam("orderId") Long orderId) {
+ return communityService.orderDetail(orderId);
+ }
+
+ @ApiOperation(value = "取消订单")
+ @PostMapping("orderCancel")
+ public R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请重新登陆");
+ }
+ return communityService.orderCancel(comShopOrderQueryDTO);
+ }
+
+ @ApiOperation(value = "删除订单")
+ @PostMapping("orderDelete")
+ @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
+ public R orderDelete(@RequestParam("orderId") Long orderId) {
+ return communityService.orderDelete(orderId);
+ }
+
+ @ApiOperation(value = "订单确认收货")
+ @PostMapping("orderConfirm")
+ public R orderConfirm(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请重新登陆");
+ }
+ return communityService.orderConfirm(comShopOrderQueryDTO);
+ }
+
+ @ApiOperation(value = "统计当前用户订单", response = OrderStatisticsVO.class)
+ @PostMapping("orderStatistics")
+ public R orderStatistics() {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请重新登陆");
+ }
+ return communityService.orderStatistics(loginUserInfo.getUserId());
+ }
+
+ @ApiOperation(value = "小程序微信调起支付")
+ @PostMapping("wxpay")
+ public R wxPay(@RequestBody OrderPayDTO orderPayDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请重新登陆");
+ }
+ orderPayDTO.setOpenId(loginUserInfo.getOpenid());
+ return communityService.wxPay(orderPayDTO);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
new file mode 100644
index 0000000..6bc3eb8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
@@ -0,0 +1,575 @@
+package com.panzhihua.applets.api;
+
+import cn.hutool.core.util.StrUtil;
+import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageConvenientServiceCategoryDTO;
+import com.panzhihua.common.model.dtos.shop.*;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointOrderVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO;
+import com.panzhihua.common.model.vos.shop.*;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @auther yh
+ * @create 2022-11-08 17:25:45
+ * @describe 商城模块API
+ */
+@Slf4j
+@RestController
+@RequestMapping("/shopFlower/")
+@Api(tags = {"花城商城服务"})
+public class ShopFlowerApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private CheckService checkService;
+
+
+ @ApiOperation(value = "查询便民服务商家详情", response = ConvenientMerchantVO.class)
+ @GetMapping("/merchant/getMerchantByUserId")
+ public R getMerchant(@RequestParam("userId") Long userId) {
+ return communityService.getMerchantByUserId(userId);
+ }
+
+ @ApiOperation(value = "编辑便民服务商家")
+ @PutMapping("/merchant/put")
+ public R putMerchant(@RequestBody @Validated(PutGroup.class) ConvenientMerchantDTO convenientMerchantDTO) {
+ convenientMerchantDTO.setUpdatedBy(this.getUserId());
+ return communityService.putMerchant(convenientMerchantDTO);
+ }
+
+ @ApiOperation(value = "分页查询商品列表", response = ComShopFlowerGoodsVO.class)
+ @PostMapping("pageShopGoods")
+ public R pageShopGoods(@RequestBody ComShopFlowerGoodsDTO comShopGoodsDTO) {
+ return communityService.pageShopFlowerGoodsByApp(comShopGoodsDTO);
+ }
+
+ @ApiOperation(value = "查询商品详情", response = ComShopFlowerGoodsVO.class)
+ @GetMapping("shopGoodsDetail")
+ @ApiImplicitParam(name = "goodsId", value = "商品id", required = true)
+ public R shopGoodsDetail(@RequestParam("goodsId") Long goodsId) {
+ return communityService.shopFlowerGoodsDetail(goodsId);
+ }
+
+ @ApiOperation(value = "删除商品")
+ @DeleteMapping("/goods/delete")
+ public R deleteShopGoods(@RequestParam("goodsId") Long goodsId) {
+ return communityService.deleteFlowerShopGoods(goodsId);
+ }
+
+ @ApiOperation(value = "商品上下架")
+ @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "商品Id"),
+ @ApiImplicitParam(name = "status", value = "1.上架 2.下架 ")})
+ @GetMapping("/goods/changeStatus")
+ public R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) {
+ return communityService.changeFlowerStatus(id, status);
+ }
+
+ @ApiOperation(value = "编辑商品")
+ @PostMapping("/goods/edit/{id}")
+ public R editShopGoods(@PathVariable("id") Long id,
+ @RequestBody @Validated(AddGroup.class) AddShopFlowerGoodsVO addShopGoodsVO) {
+ return communityService.editFlowerShopGoods(id, addShopGoodsVO);
+ }
+
+ @ApiOperation(value = "新增商品")
+ @PostMapping("/goods/save")
+ public R saveShopGoods(@RequestBody @Validated(AddGroup.class) AddShopFlowerGoodsVO addShopGoodsVO) {
+ return communityService.saveFlowerShopGoods(addShopGoodsVO);
+ }
+
+ @ApiOperation(value = "查询用户收货地址列表", response = ComShopUserAddressVO.class)
+ @PostMapping("shopUserAddressList")
+ public R shopUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO) {
+ Long userId = this.getUserId();
+ if (userId == null) {
+ return R.fail("请重新登陆");
+ }
+ comShopAddressDTO.setUserId(userId);
+ return communityService.shopFlowerUserAddressList(comShopAddressDTO);
+ }
+
+ @ApiOperation(value = "添加用户收货地址列表")
+ @PostMapping("shopAddUserAddress")
+ public R shopAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
+ Long userId = this.getUserId();
+ if (userId == null) {
+ return R.fail("请重新登陆");
+ }
+ comShopAddressDTO.setUserId(userId);
+ return communityService.shopFlowerAddUserAddress(comShopAddressDTO);
+ }
+
+ @ApiOperation(value = "修改用户收货地址列表")
+ @PostMapping("shopEditUserAddress")
+ public R shopEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
+ Long userId = this.getUserId();
+ if (userId == null) {
+ return R.fail("请重新登陆");
+ }
+ comShopAddressDTO.setUserId(userId);
+ return communityService.shopFlowerEditUserAddress(comShopAddressDTO);
+ }
+
+ @ApiOperation(value = "删除用户收货地址列表")
+ @DeleteMapping("shopDelUserAddress")
+ @ApiImplicitParam(name = "addressId", value = "收货地址id", required = true)
+ public R shopDelUserAddress(@RequestParam("addressId") Long addressId) {
+ return communityService.shopFlowerDelUserAddress(addressId);
+ }
+
+ @ApiOperation(value = "订单预览", response = ComShopOrderPreviewVO.class)
+ @PostMapping("orderPreview")
+ public R orderPreview(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO) {
+ Long userId = this.getUserId();
+ if (userId == null) {
+ return R.fail("请重新登陆");
+ }
+ orderPreviewDTO.setUserId(userId);
+ return communityService.orderPreviewFlower(orderPreviewDTO);
+ }
+
+ @ApiOperation(value = "创建订单", response = ComShopOrderVO.class)
+ @PostMapping("orderCreate")
+ public R orderCreate(@RequestBody ComShopOrderCreateDTO orderCreateDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请重新登陆");
+ }
+ orderCreateDTO.setUserId(loginUserInfo.getUserId());
+ orderCreateDTO.setPhone(loginUserInfo.getPhone());
+ orderCreateDTO.setOpenId(loginUserInfo.getOpenid());
+ return communityService.orderCreateFlower(orderCreateDTO);
+ }
+
+ @ApiOperation(value = "分页查询订单列表", response = ComShopFlowerOrderPageVO.class)
+ @PostMapping("pageOrderList")
+ public R pageOrderList(@RequestBody PageComFlowerOrderListDTO comOrderListDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请重新登陆");
+ }
+ comOrderListDTO.setUserId(loginUserInfo.getUserId());
+ return communityService.pageOrderListFlower(comOrderListDTO);
+ }
+
+ @ApiOperation(value = "查询订单详情", response = ComShopFlowerOrderPageVO.class)
+ @GetMapping("orderDetail")
+ @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
+ public R orderDetail(@RequestParam("orderId") Long orderId) {
+ return communityService.orderDetailFlower(orderId,null);
+ }
+
+ @ApiOperation(value = "自提点查询订单详情", response = ComShopFlowerOrderPageVO.class)
+ @GetMapping("pointOrderDetail")
+ @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
+ public R pointOrderDetail(@RequestParam("orderId") Long orderId) {
+ String phone = this.getLoginUserInfo().getPhone();
+ return communityService.orderDetailFlower(orderId,phone);
+ }
+
+ @ApiOperation(value = "取消订单")
+ @PostMapping("orderCancel")
+ public R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请重新登陆");
+ }
+ return communityService.orderCancelFlower(comShopOrderQueryDTO);
+ }
+
+ @ApiOperation(value = "删除订单")
+ @DeleteMapping("orderDelete")
+ @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
+ public R orderDelete(@RequestParam("orderId") Long orderId) {
+ return communityService.orderDeleteFlower(orderId);
+ }
+
+ @ApiOperation(value = "订单确认收货")
+ @PostMapping("orderConfirm")
+ public R orderConfirm(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请重新登陆");
+ }
+ return communityService.orderConfirmFlower(comShopOrderQueryDTO);
+ }
+
+
+ @ApiOperation(value = "小程序微信调起支付")
+ @PostMapping("wxpay")
+ public R wxPay(@RequestBody OrderPayDTO orderPayDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请重新登陆");
+ }
+ orderPayDTO.setOpenId(loginUserInfo.getOpenid());
+ return communityService.wxPayFlower(orderPayDTO);
+ }
+
+ /**
+ * 获取当前商铺周围的自提点信息以及距离手机距离
+ *
+ * @param merchantId
+ * @return
+ */
+ @ApiOperation(value = "获取自提点",response = ConvenientElevatingPointVO.class)
+ @ApiImplicitParams({@ApiImplicitParam(name = "merchantId", value = "商家Id", required = true),
+ @ApiImplicitParam(name = "lat", value = "经度", required = true), @ApiImplicitParam(name = "lng", value = "纬度", required = true)})
+ @GetMapping("/point/findPointByMerchantId")
+ public R findPointByMerchantId(@RequestParam("merchantId") Long merchantId, @RequestParam("lat") String lat, @RequestParam("lng") String lng) {
+ return communityService.findPointByMerchantId(merchantId, lat, lng);
+ }
+ /**
+ * 获取商家周围 n(km)的自提点数量
+ *
+ * @param distance
+ * @return
+ */
+ @ApiOperation(value = "获取商家周围 n(km)的自提点数量")
+ @ApiImplicitParams({@ApiImplicitParam(name = "distance", value = "距离", required = false),
+ @ApiImplicitParam(name = "lat", value = "经度", required = true), @ApiImplicitParam(name = "lng", value = "纬度", required = true)})
+ @GetMapping("/point/findPointNumByDistance")
+ public R findPointNumByDistance(@RequestParam(value = "distance",required = false) Integer distance, @RequestParam("lat") String lat, @RequestParam("lng") String lng) {
+ if (null == distance){
+ return R.ok(0);
+ }
+ return communityService.findPointNumByDistance(distance, lat, lng);
+ }
+
+ /**
+ * 保存评价
+ *
+ * @param comShopFlowerEvaluateDTO
+ * @return
+ */
+ @ApiOperation(value = "保存评价")
+ @PostMapping("/saveEvaluate")
+ public R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO) {
+ String evaluateContent = comShopFlowerEvaluateDTO.getEvaluateContent();
+ if (StrUtil.isNotBlank(evaluateContent)) {
+ String result = checkService.checkMessageBy(evaluateContent, this.getLoginUserInfo().getOpenid(), this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
+ comShopFlowerEvaluateDTO.setUserId(this.getUserId());
+ return communityService.saveEvaluate(comShopFlowerEvaluateDTO);
+ }
+
+ /**
+ * 分页查询评价
+ *
+ * @param pageComShopFlowerEvaluateDTO
+ * @return
+ */
+ @ApiOperation(value = "分页查询评价", response = ComShopFlowerEvaluateVO.class)
+ @PostMapping("/pageEvaluate")
+ public R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO) {
+ return communityService.pageEvaluate(pageComShopFlowerEvaluateDTO);
+ }
+
+ /**
+ * 评价详情
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "评价详情")
+ @GetMapping("/detailEvaluate")
+ public R detailEvaluate(@RequestParam("id") Long id) {
+ return communityService.detailEvaluate(id);
+ }
+
+ /**
+ * 删除评价
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "删除评价")
+ @DeleteMapping("deleteEvaluate")
+ public R deleteEvaluate(@RequestParam("id") Long id) {
+ return communityService.deleteEvaluate(id);
+ }
+
+ /**
+ * 取货码
+ *
+ * @param orderId
+ * @return
+ */
+ @ApiOperation(value = "取货码")
+ @GetMapping("getQRCode")
+ @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
+ public R getQRCode(@RequestParam("orderId") Long orderId) {
+ return communityService.getQRCode(orderId);
+ }
+
+ /**
+ * 保存配送单
+ *
+ * @param comShopFlowerOrderDeliveryDTO
+ */
+ @PostMapping("saveDelivery")
+ @ApiOperation(value = "保存配送单")
+ public R saveDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
+ return communityService.saveDelivery(comShopFlowerOrderDeliveryDTO);
+ }
+
+ /**
+ * 更新配送单
+ *
+ * @param comShopFlowerOrderDeliveryDTO
+ */
+ @PostMapping("updateDelivery")
+ @ApiOperation(value = "更新配送单")
+ public R updateDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
+ return communityService.updateDelivery(comShopFlowerOrderDeliveryDTO);
+ }
+
+ /**
+ * 已配送、已送达 分页查询
+ *
+ * @param pageComFlowerOrderDeliveryDTO
+ * @return
+ */
+ @PostMapping("pageDelivery")
+ @ApiOperation(value = "已配送、已送达 分页查询", response = ComShopFlowerOrderDeliveryVO.class)
+ public R pageDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
+ return communityService.pageDelivery(pageComFlowerOrderDeliveryDTO);
+ }
+
+ /**
+ * 未配送 分页查询
+ *
+ * @param pageComFlowerOrderDeliveryDTO
+ * @return
+ */
+ @ApiOperation(value = "未配送 分页查询", response = ConvenientElevatingPointVO.class)
+ @PostMapping("pageNoDelivery")
+ public R pageNoDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
+ return communityService.pageNoDelivery(pageComFlowerOrderDeliveryDTO);
+ }
+
+ /**
+ * 未配送-开始配送-订单列表
+ *
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @ApiOperation(value = "未配送-开始配送-订单列表", response = ConvenientElevatingPointOrderVO.class)
+ @PostMapping("pageNoDeliveryOrderList")
+ public R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
+ return communityService.pageNoDeliveryOrderList(pageComFlowerOrderListDTO);
+ }
+
+ /**
+ * 根据商家id查询商家的订单
+ *
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @ApiOperation(value = "根据商家id分页查询商家的订单", response = ComShopFlowerOrderStoreListVO.class)
+ @PostMapping("pageOrderByStoreId")
+ public R pageOrderByStoreId(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
+ return communityService.pageOrderByStoreId(pageComFlowerOrderListDTO);
+ }
+
+ /**
+ * 查询我的店铺各类统计数据
+ *
+ * @param storeId
+ * @return
+ */
+ @ApiOperation(value = "查询我的店铺各类统计数据")
+ @GetMapping("/selectCountByStoreId")
+ public R selectCountByUserId(Long storeId) {
+ return communityService.selectCountByUserId(storeId);
+ }
+
+
+ /**
+ * 创建退款订单
+ *
+ * @param comShopFlowerRefundOrderDTO
+ * @return
+ */
+ @PostMapping("createRefundOrder")
+ @ApiOperation(value = "创建退款订单")
+ public R createRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO) {
+ comShopFlowerRefundOrderDTO.setUserId(this.getUserId());
+ return communityService.createRefundOrder(comShopFlowerRefundOrderDTO);
+ }
+
+ /**
+ * 用户 分页查询退款订单
+ *
+ * @param pageComOrderRefundDTO
+ * @return
+ */
+ @PostMapping("pageRefundOrder")
+ @ApiOperation(value = "退款订单分页查询 用户", response = ComShopFlowerRefundOrderVO.class)
+ public R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO) {
+ pageComOrderRefundDTO.setUserId(this.getUserId());
+ return communityService.pageRefundOrder(pageComOrderRefundDTO);
+ }
+
+ /**
+ * 商家 分页查询退款订单
+ *
+ * @param pageComOrderRefundDTO
+ * @return
+ */
+ @PostMapping("pageRefundOrderStore")
+ @ApiOperation(value = "退款订单分页查询 商家", response = ComShopFlowerRefundOrderVO.class)
+ public R pageRefundOrderStore(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ pageComOrderRefundDTO.setStoreId(loginUserInfo.getStoreIdId());
+ return communityService.pageRefundOrder(pageComOrderRefundDTO);
+ }
+
+ /**
+ * 修改退款订单
+ *
+ * @param comShopFlowerRefundOrderDTO
+ * @return
+ */
+ @PostMapping("updateRefundOrder")
+ @ApiOperation(value = "修改退款订单")
+ public R updateRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO) {
+ return communityService.updateRefundOrder(comShopFlowerRefundOrderDTO);
+ }
+
+
+ /**
+ * 商家后台-退款申请统计
+ *
+ * @param storeId
+ * @return
+ */
+ @GetMapping("selectCountGroupStatus")
+ @ApiOperation(value = "商家后台-退款申请统计")
+ public R selectCountGroupStatus(Long storeId) {
+ return communityService.selectCountGroupStatus(storeId);
+ }
+
+ @ApiOperation(value = "商品分类")
+ @GetMapping("/goodsCategory/getAllGoodsCategories")
+ public R getAllGoodsCategories() {
+ return communityService.getAllGoodsCategories();
+ }
+
+ @ApiOperation(value = "分页查询便民服务分类", response = ConvenientServiceCategoryVO.class)
+ @PostMapping("/service-category/page")
+ public R pageServiceCategory(@RequestBody PageConvenientServiceCategoryDTO pageConvenientServiceCategoryDTO) {
+ pageConvenientServiceCategoryDTO.setAreaCode(this.getAreaCode());
+ return communityService.pageServiceCategory(pageConvenientServiceCategoryDTO);
+ }
+
+ /**
+ * 新增商品浏览量
+ *
+ * @param goodsId
+ * @return
+ */
+ @GetMapping("incrGoodsView")
+ @ApiOperation(value = "新增商品浏览量")
+ public R incrGoodsView(@RequestParam("goodsId") Long goodsId) {
+ return communityService.incrGoodsView(goodsId);
+ }
+
+ @ApiOperation(value = "增加商家咨询量")
+ @GetMapping("/merchant/incr-consult")
+ public R incrMerchantConsult(@RequestParam("merchantId") Long merchantId) {
+ return communityService.consultMerchant(merchantId);
+ }
+
+ @ApiOperation(value = "增加商家浏览量")
+ @GetMapping("/merchant/incr-view")
+ public R incrMerchantView(@RequestParam("merchantId") Long merchantId) {
+ return communityService.incrMerchantView(merchantId);
+ }
+
+ @ApiOperation(value = "出入账分页", response = ComShopFlowerOrderPayVO.class)
+ @PostMapping("pageOrderPay")
+ public R pageOrderPay(@RequestBody PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO) {
+ return communityService.pageOrderPay(pageComShopFlowerOrderPayDTO);
+ }
+
+ /**
+ * 获取商家的营业额和可结算金额
+ * @param storeId
+ * @return
+ */
+ @ApiOperation(value = "获取商家的营业额和可结算金额")
+ @GetMapping("getQuota")
+ public R getQuota(@RequestParam("storeId") Long storeId){
+ return communityService.getQuota(storeId);
+ }
+
+ /**
+ * 取消退款
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "取消退款")
+ @GetMapping("refundOrderCancel")
+ public R refundOrderCancel(@RequestParam("id") Long id){
+ return communityService.refundOrderCancel(id);
+ }
+
+ /**
+ * 退款订单详情
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "退款订单详情",response = ComShopFlowerRefundOrderVO.class)
+ @GetMapping("refundOrderDetail")
+ public R refundOrderDetail(Long id){
+ return communityService.refundOrderDetail(id);
+ }
+
+ /**
+ * 清点商品 确认送达详情
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("pageOrderByDeliveryNo")
+ @ApiOperation(value = "清点商品 确认送达详情",response = ComShopFlowerOrderDeliveryNoListVO.class)
+ public R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO){
+ return communityService.pageOrderByDeliveryNo(pageComFlowerOrderListDTO);
+ }
+
+
+ /**
+ * 订单发货
+ *
+ * @param orderShipDTO 发货信息
+ * @return 发货结果
+ */
+ @PostMapping("/shipOrderFlower")
+ @ApiOperation(value = "订单发货")
+ public R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO) {
+ orderShipDTO.setOperUserAccount(this.getLoginUserInfo().getAccount());
+ return communityService.shipOrderFlower(orderShipDTO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/TestApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/TestApi.java
new file mode 100644
index 0000000..2b64108
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/TestApi.java
@@ -0,0 +1,34 @@
+package com.panzhihua.applets.api;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.user.UserService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 调试接口
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-06 16:32
+ **/
+@RestController
+@RequestMapping("/test/")
+@Api(tags = {"调试接口"})
+public class TestApi {
+
+ @Resource
+ private UserService userService;
+
+ @ApiOperation(value = "维护用户持续登录天数")
+ @GetMapping("timedtaskcontinuouslandingdays")
+ public R timedTaskContinuousLandingDays() {
+ return userService.timedTaskContinuousLandingDays();
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionDoorApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionDoorApi.java
new file mode 100644
index 0000000..2283fab
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionDoorApi.java
@@ -0,0 +1,34 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.applets.config.UnionDoorUtil;
+import com.panzhihua.common.model.vos.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/unionDoor/")
+@Api(tags = {"户外劳工站接口"})
+public class UnionDoorApi {
+
+ @Resource
+ private UnionDoorUtil unionDoorUtil;
+
+
+ /**
+ * (二期)用户开门(通过电话)(主花城e+使用)
+ *
+ * @return 总工会户外劳共用户
+ */
+ @GetMapping("/openDoorByPhone")
+ @ApiOperation("(二期)用户开门(通过电话)(主花城e+使用)")
+ public R openDoorByPhone(@RequestParam(value = "qRCode") String qRCode, @RequestParam(value = "phone") String phone) throws Exception {
+ return unionDoorUtil.openDoorByPhone(qRCode, phone);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionInspectionApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionInspectionApi.java
new file mode 100644
index 0000000..1a69cac
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionInspectionApi.java
@@ -0,0 +1,65 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.equipment.UnionInspectionDto;
+import com.panzhihua.common.model.dtos.equipment.UnionReportDto;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.community.ComEquipmentUnionInspectionFeign;
+import com.panzhihua.common.service.community.ComEquipmentUnionRePortFeign;
+import com.panzhihua.common.service.user.UserService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+
+@Slf4j
+@RestController
+@RequestMapping("/unionInspection/")
+@Api(tags = {"户外劳工站巡查"})
+public class UnionInspectionApi extends BaseController {
+
+ @Resource
+ private ComEquipmentUnionInspectionFeign comEquipmentUnionInspectionFeign;
+
+ @Resource
+ private UserService userService;
+
+
+ /**
+ * 新增户外劳工站巡查
+ *
+ * @param unionInspectionDto
+ * @return 新增结果
+ */
+ @PostMapping("/add")
+ public R add(@RequestBody UnionInspectionDto unionInspectionDto) {
+// LoginUserInfoVO loginUser = this.getLoginUserInfo();
+// LoginUserInfoVO userInfoByUserId = userService.getUserInfoByUserId(loginUser.getUserId().toString()).getData();
+ LoginUserInfoVO userInfoByUserId = userService.getUserInfoByUserId("1588095866109984769").getData();
+ unionInspectionDto.setCreateUserId(userInfoByUserId.getUserId());
+ return comEquipmentUnionInspectionFeign.add(unionInspectionDto);
+ }
+
+ /**
+ * 分页户外劳工站巡查
+ *
+ * @param unionInspectionDto
+ * @return 动态结果
+ */
+ @PostMapping("/query")
+ public R query(@RequestBody UnionInspectionDto unionInspectionDto) {
+ // LoginUserInfoVO loginUser = this.getLoginUserInfo();
+// LoginUserInfoVO userInfoByUserId = userService.getUserInfoByUserId(loginUser.getUserId().toString()).getData();
+ LoginUserInfoVO userInfoByUserId = userService.getUserInfoByUserId("1588095866109984769").getData();
+ unionInspectionDto.setCreateUserId(userInfoByUserId.getUserId());
+ unionInspectionDto.setIsApplets(1);
+ return comEquipmentUnionInspectionFeign.query(unionInspectionDto);
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionOutdoorLaborDynamicApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionOutdoorLaborDynamicApi.java
new file mode 100644
index 0000000..96e4566
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionOutdoorLaborDynamicApi.java
@@ -0,0 +1,58 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.model.dtos.equipment.UnionOutdoorLaborDynamicDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngStructAreaDistrictVO;
+import com.panzhihua.common.service.community.ComEquipmentUnionOutdoorLaborDynamicFeign;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+
+@Slf4j
+@RestController
+@RequestMapping("/unionOutdoorLaborDynamic/")
+@Api(tags = {"户外劳工动态服务"})
+public class UnionOutdoorLaborDynamicApi {
+
+ @Resource
+ private ComEquipmentUnionOutdoorLaborDynamicFeign comEquipmentUnionOutdoorLaborDynamicFeign;
+
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页总工会-户外劳工站-动态
+ *
+ * @param unionOutdoorLaborDynamicDto
+ * @return 动态结果
+ */
+ @PostMapping("page")
+ R query(@RequestBody UnionOutdoorLaborDynamicDto unionOutdoorLaborDynamicDto) {
+ return comEquipmentUnionOutdoorLaborDynamicFeign.query(unionOutdoorLaborDynamicDto);
+ }
+
+ /**
+ * 查询总工会-户外劳工站-动态
+ *
+ * @param id
+ * 动态 id
+ * @return 查找结果
+ */
+ @GetMapping("/{id}")
+ R eventMainMemberDetails(@PathVariable("id") Long id) {
+ return comEquipmentUnionOutdoorLaborDynamicFeign.unionOutdoorLaborDynamicDetail(id);
+ }
+
+ @ApiOperation(value = "所在地地址下拉列表(攀枝花)", response = ComMngStructAreaDistrictVO.class)
+ @PostMapping("listarea")
+ public R listArea() {
+ Long cityAdcode = 510400l;
+ return communityService.listAreaDistrict(cityAdcode);
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionOutdoorSiteApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionOutdoorSiteApi.java
new file mode 100644
index 0000000..583f10a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionOutdoorSiteApi.java
@@ -0,0 +1,52 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.model.dtos.equipment.UnionOutdoorLaborDynamicDto;
+import com.panzhihua.common.model.dtos.equipment.UnionOutdoorSiteDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngStructAreaDistrictVO;
+import com.panzhihua.common.service.community.ComEquipmentUnionOutdoorLaborDynamicFeign;
+import com.panzhihua.common.service.community.ComEquipmentUnionOutdoorSiteFeign;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+
+@Slf4j
+@RestController
+@RequestMapping("/unionOutdoorSite/")
+@Api(tags = {"户外劳工站"})
+public class UnionOutdoorSiteApi {
+
+ @Resource
+ private ComEquipmentUnionOutdoorSiteFeign comEquipmentUnionOutdoorSiteFeign;
+
+
+ /**
+ * 分页总工会户外劳工站
+ *
+ * @param unionOutdoorSiteDto
+ * @return 动态结果
+ */
+ @PostMapping("page")
+ R query(@RequestBody UnionOutdoorSiteDto unionOutdoorSiteDto) {
+ return comEquipmentUnionOutdoorSiteFeign.query(unionOutdoorSiteDto);
+ }
+
+ /**
+ * 查询总工会户外劳工站
+ *
+ * @param id
+ * 户外劳工站 id
+ * @return 查找结果
+ */
+ @GetMapping("/{id}")
+ R eventMainMemberDetails(@PathVariable("id") Long id) {
+ return comEquipmentUnionOutdoorSiteFeign.unionOutdoorSiteDetail(id);
+ }
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionReportApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionReportApi.java
new file mode 100644
index 0000000..ad7ef73
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionReportApi.java
@@ -0,0 +1,61 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.equipment.UnionReportDto;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.community.ComEquipmentUnionRePortFeign;
+import com.panzhihua.common.service.community.ComEquipmentUnionUserFeign;
+import com.panzhihua.common.service.user.UserService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+
+@Slf4j
+@RestController
+@RequestMapping("/unionReport/")
+@Api(tags = {"户外劳工站上报"})
+public class UnionReportApi extends BaseController {
+
+ @Resource
+ private ComEquipmentUnionRePortFeign comEquipmentUnionRePortFeign;
+
+ @Resource
+ private UserService userService;
+
+
+ /**
+ * 户外劳工站上报表
+ *
+ * @param unionReportDto
+ * @return 新增结果
+ */
+ @PostMapping("/add")
+ public R add(@RequestBody UnionReportDto unionReportDto) {
+// LoginUserInfoVO loginUser = this.getLoginUserInfo();
+// LoginUserInfoVO userInfoByUserId = userService.getUserInfoByUserId(loginUser.getUserId().toString()).getData();
+ LoginUserInfoVO userInfoByUserId = userService.getUserInfoByUserId("1588095866109984769").getData();
+ unionReportDto.setCreateUserId(userInfoByUserId.getUserId());
+ return comEquipmentUnionRePortFeign.add(unionReportDto);
+ }
+
+ /**
+ * 分页户外劳工站上报表
+ *
+ * @param unionReportDto
+ * @return 动态结果
+ */
+ @PostMapping("/query")
+ public R query(@RequestBody UnionReportDto unionReportDto) {
+ // LoginUserInfoVO loginUser = this.getLoginUserInfo();
+// LoginUserInfoVO userInfoByUserId = userService.getUserInfoByUserId(loginUser.getUserId().toString()).getData();
+ LoginUserInfoVO userInfoByUserId = userService.getUserInfoByUserId("1588095866109984769").getData();
+ unionReportDto.setCreateUserId(userInfoByUserId.getUserId());
+ unionReportDto.setIsApplets(1);
+ return comEquipmentUnionRePortFeign.query(unionReportDto);
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionUserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionUserApi.java
new file mode 100644
index 0000000..73c0677
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionUserApi.java
@@ -0,0 +1,70 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.constants.TokenConstant;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.equipment.UnionOutdoorSiteDto;
+import com.panzhihua.common.model.dtos.equipment.UnionUserDto;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
+import com.panzhihua.common.service.community.ComEquipmentUnionOutdoorSiteFeign;
+import com.panzhihua.common.service.community.ComEquipmentUnionUserFeign;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.JWTTokenUtil;
+import io.jsonwebtoken.Claims;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+
+@Slf4j
+@RestController
+@RequestMapping("/unionUser/")
+@Api(tags = {"户外劳工站登录"})
+public class UnionUserApi extends BaseController {
+
+ @Resource
+ private ComEquipmentUnionUserFeign comEquipmentUnionUserFeign;
+
+ @Resource
+ private UserService userService;
+
+
+ /**
+ * 总工会户外劳登录
+ *
+ *
+ * @return 总工会户外劳共用户
+ */
+ @ApiOperation(value = "总工会户外劳登录",response = UnionUserDto.class)
+ @GetMapping("/login")
+ public R login(){
+// LoginUserInfoVO loginUser = this.getLoginUserInfo();
+// LoginUserInfoVO userInfoByUserId = userService.getUserInfoByUserId(loginUser.getUserId().toString()).getData();
+ LoginUserInfoVO userInfoByUserId = userService.getUserInfoByUserId("1588095866109984769").getData();
+ return comEquipmentUnionUserFeign.login(userInfoByUserId);
+ }
+
+ /**
+ * 总工会户外劳工站用户认证
+ *
+ * @param unionUserDto
+ * @return 总工会户外劳共用户
+ */
+ @ApiOperation(value = "总工会户外劳工站用户认证",response = UnionUserDto.class)
+ @PostMapping("/authentication")
+ public R authentication(@RequestBody UnionUserDto unionUserDto){
+ unionUserDto.setIsApplets(1);
+ // LoginUserInfoVO loginUser = this.getLoginUserInfo();
+// LoginUserInfoVO userInfoByUserId = userService.getUserInfoByUserId(loginUser.getUserId().toString()).getData();
+ LoginUserInfoVO userInfoByUserId = userService.getUserInfoByUserId("1588095866109984769").getData();
+ unionUserDto.setUserId(userInfoByUserId.getUserId());
+// unionUserDto.setId(userInfoByUserId.getId);
+ return comEquipmentUnionUserFeign.authentication(unionUserDto);
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
new file mode 100644
index 0000000..2145e69
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -0,0 +1,564 @@
+package com.panzhihua.applets.api;
+
+import static java.util.stream.Collectors.toList;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import cn.hutool.core.util.StrUtil;
+import com.panzhihua.applets.umf.UmfPayUtil;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.constants.HttpStatus;
+import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
+import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
+import com.panzhihua.common.utlis.DateUtils;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.applets.model.dtos.ComPbMemberCertificationDTO;
+import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.constants.SecurityConstants;
+import com.panzhihua.common.constants.UserConstants;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
+import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
+import com.panzhihua.common.model.vos.community.ComActActRegistVO;
+import com.panzhihua.common.model.vos.community.ComActActivityVO;
+import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
+import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
+import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
+import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
+import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
+import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.model.vos.user.UpdateUserArchivesVO;
+import com.panzhihua.common.model.vos.user.UserArchivesVO;
+import com.panzhihua.common.model.vos.user.UserPhoneVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.partybuilding.PartyBuildingService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 用户
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 12:03
+ **/
+@Slf4j
+@RestController
+@RequestMapping("/user/")
+@Api(tags = {"我的模块"})
+public class UserApi extends BaseController {
+ @Resource
+ private UserService userService;
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private PartyBuildingService partyBuildingService;
+ @Resource
+ private CheckService checkService;
+ @Resource
+ private StringRedisTemplate stringRedisTemplate;
+
+ @ApiOperation(value = "当前登录用户信息", response = LoginUserInfoVO.class)
+ @GetMapping("info")
+ public R getUserInfo() {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long communityId = loginUserInfo.getCommunityId();
+ Long userId = loginUserInfo.getUserId();
+ Long areaId = loginUserInfo.getAreaId();
+ R<LoginUserInfoVO> r = userService.getUserInfoByUserId(userId + "");
+ String phone = loginUserInfo.getPhone();
+ if (R.isOk(r)) {
+ Object data = r.getData();
+ if (!ObjectUtils.isEmpty(data)) {
+ LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO)data;
+ //是否保存unionid
+// if (Objects.isNull(loginUserInfoVO.getUnionid()) || "无".equals(loginUserInfoVO.getUnionid())) {
+// return R.fail(HttpStatus.UNAUTHORIZED, "token过期");
+// }
+ R r1 = communityService.detailHouse(userId);
+ if(StringUtils.isNotEmpty(loginUserInfoVO.getIdCard())){
+ //查询实名用户绑定的实有人口地址
+ R r4=communityService.selectByIdCard(loginUserInfoVO.getIdCard());
+ if(R.isOk(r4)){
+ String address= (String) r4.getData();
+ if(StringUtils.isNotEmpty(address)){
+ loginUserInfoVO.setAddress(address);
+ r.setData(loginUserInfoVO);
+ }
+ }
+ }
+ if (null != communityId && 0 != communityId) {
+ R r2 = communityService.detailCommunity(communityId);
+ if (R.isOk(r2)) {
+ Object data1 = r2.getData();
+ if (!ObjectUtils.isEmpty(data1)) {
+ loginUserInfoVO
+ .setComActVO(JSONObject.parseObject(JSONObject.toJSONString(data1), ComActVO.class));
+ r.setData(loginUserInfoVO);
+ }
+ }
+ }
+ if (null != areaId && areaId != 0) {
+ R r3 = communityService.detailArea(areaId);
+ if (R.isOk(r3)) {
+ Object data1 = r3.getData();
+ if (!ObjectUtils.isEmpty(data1)) {
+ loginUserInfoVO.setComMngStructAreaVO(
+ JSONObject.parseObject(JSONObject.toJSONString(data1), ComMngStructAreaVO.class));
+ r.setData(loginUserInfoVO);
+ }
+ }
+ }
+ if (R.isOk(r1)) {
+ Object data1 = r1.getData();
+ if (!ObjectUtils.isEmpty(data1)) {
+ loginUserInfoVO.setComMngStructHouseVOS((List<ComMngStructHouseVO>)data1);
+ r.setData(loginUserInfoVO);
+ }
+ }
+ }
+ }
+ return r;
+ }
+
+ @ApiOperation(value = "用户实名认证")
+ @PutMapping("putuserauthentication")
+ public R putUserAuthentication(@RequestBody @Validated(AddGroup.class) LoginUserInfoVO loginUserInfoVO) {
+ Long userId = this.getUserId();
+ loginUserInfoVO.setUserId(userId);
+ loginUserInfoVO.setCommunityId(this.getCommunityId());
+ R r = userService.putUserAuthentication(loginUserInfoVO);
+ if (R.isOk(r)) {
+ // 通过发通知
+ SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
+ sysUserNoticeVO.setUserId(userId);
+ sysUserNoticeVO.setType(3);
+ sysUserNoticeVO.setTitle("实名制审核通过");
+ sysUserNoticeVO.setBusinessType(6);
+ sysUserNoticeVO.setBusinessContent("恭喜你，你已经通过了实名制认证");
+ sysUserNoticeVO.setStatus(0);
+ sysUserNoticeVO.setBusinessStatus(2);
+ R r1 = userService.addNotice(sysUserNoticeVO);
+ if (R.isOk(r1)) {
+ log.info("新增实名认证未通过通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
+ // 清空缓存
+ String userRoleKey = UserConstants.LOGIN_USER_INFO + this.getLoginUserInfo().getUserId();
+ String userAppletRoleKey = SecurityConstants.ROLE_APPLETS_USER + this.getLoginUserInfo().getUserId();
+ stringRedisTemplate.delete(userRoleKey);
+ stringRedisTemplate.delete(userAppletRoleKey);
+ } else {
+ // 未通过发通知
+ /**
+ * SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO(); sysUserNoticeVO.setUserId(userId);
+ * sysUserNoticeVO.setType(3); sysUserNoticeVO.setTitle("实名制审核未通过"); sysUserNoticeVO.setBusinessType(6);
+ * sysUserNoticeVO.setBusinessContent(String.format("驳回原因：%s",r.getMsg())); sysUserNoticeVO.setStatus(0);
+ * sysUserNoticeVO.setBusinessStatus(1); R r1 = userService.addNotice(sysUserNoticeVO); if (R.isOk(r1)) {
+ * log.info("新增实名认证未通过通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO)); }
+ */
+ }
+ return r;
+ }
+
+ @ApiOperation(value = "修改用户手机号")
+ @PutMapping("userphone")
+ public R putUserphone(@RequestBody UserPhoneVO userPhoneVO) {
+ Long userId = this.getUserId();
+ userPhoneVO.setUserId(userId);
+ R r = userService.putUserphone(userPhoneVO);
+ if (R.isOk(r)) {
+ communityService.putVolunteerPhone(userPhoneVO);
+ }
+ return r;
+ }
+
+ @ApiOperation(value = "修改用户信息")
+ @PutMapping("user")
+ public R putUser(@RequestBody LoginUserInfoVO loginUserInfoVO) {
+ Long userId = this.getUserId();
+ loginUserInfoVO.setUserId(userId);
+ return userService.putUser(loginUserInfoVO);
+ }
+
+ @ApiOperation(value = "修改用户首页活动提示")
+ @PostMapping("editUserTips")
+ public R putUserTips(@RequestBody SysUserEditTipsDTO userEditTipsDTO) {
+ Long userId = this.getUserId();
+ if (userId == null) {
+ return R.fail("请重新登录");
+ }
+ userEditTipsDTO.setUserId(userId);
+ return userService.editUserTips(userEditTipsDTO);
+ }
+
+ @ApiOperation(value = "房屋地址下拉列表")
+ @GetMapping("listhouse")
+ @ApiImplicitParam(name = "parentCode", value = "父级地址编码", required = false)
+ public R listHouses(String parentCode) {
+ Long areaId = this.getAreaId();
+ if (ObjectUtils.isEmpty(parentCode)) {
+ parentCode = "";
+ }
+ return communityService.listHouses(parentCode, areaId);
+ }
+
+ @ApiOperation(value = "新增房屋")
+ @PostMapping("houses")
+ public R addHouses(@RequestBody @Validated(AddGroup.class) ComMngStructHouseVO comMngStructHouseVO) {
+ String houseCode = comMngStructHouseVO.getHouseCode();
+ if (ObjectUtils.isEmpty(houseCode)) {
+ return R.fail("房屋地址编码不能为空");
+ }
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ comMngStructHouseVO.setUserId(loginUserInfo.getUserId());
+ comMngStructHouseVO.setAreaId(loginUserInfo.getAreaId());
+ return communityService.addHouses(comMngStructHouseVO);
+ }
+
+ @ApiOperation(value = "家庭成员列表")
+ @GetMapping("listfamily")
+ public R listFamily(@RequestParam(value = "pageNum") Long pageNum, @RequestParam("pageSize") Long pageSize) {
+ Long userId = this.getUserId();
+ return userService.listFamily(userId, pageNum, pageSize);
+ }
+
+ @ApiOperation(value = "新增家庭成员")
+ @PostMapping("addfamily")
+ public R addFamily(@RequestBody @Validated(AddGroup.class) ComMngFamilyInfoVO comMngFamilyInfoVO) {
+ Long userId = this.getUserId();
+ comMngFamilyInfoVO.setUserId(userId);
+ return userService.addFamily(comMngFamilyInfoVO);
+ }
+
+ @ApiOperation(value = "编辑家庭成员")
+ @PutMapping("putfamily")
+ public R putFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO) {
+ Long id = comMngFamilyInfoVO.getId();
+ if (null == id || 0 == id) {
+ return R.fail("成员主键不能为空");
+ }
+ comMngFamilyInfoVO.setUserId(this.getUserId());
+ return userService.putFamily(comMngFamilyInfoVO);
+ }
+
+ @ApiOperation(value = "我的活动", response = ComActActivityVO.class)
+ @GetMapping("listactivity")
+ public R listActivity(@RequestParam(value = "status", required = false) Integer status,
+ @RequestParam(value = "type", required = false) Integer type) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ Long communityId = loginUserInfo.getCommunityId();
+ List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
+ R r = communityService.listActivity(userId, status,type);
+ if (R.isOk(r)&&r.getData()!=null) {
+ comActActivityVOS = (List<ComActActivityVO>)r.getData();
+ }
+// R r1 = partyBuildingService.listActivity(userId, communityId, status);
+// if (R.isOk(r1)&&r1.getData()!=null) {
+// List<ComActActivityVO> data = (List<ComActActivityVO>)r1.getData();
+// comActActivityVOS.addAll(data);
+// }
+ if (!ObjectUtils.isEmpty(comActActivityVOS)) {
+ String s = JSONArray.toJSONString(comActActivityVOS);
+ List<ComActActivityVO> comActActivityVOS1 = new ArrayList<>();
+ comActActivityVOS1 = JSONArray.parseArray(s, ComActActivityVO.class);
+ List<ComActActivityVO> collect = comActActivityVOS1.stream()
+ .sorted(Comparator.comparing(ComActActivityVO::getBeginAt).reversed()).collect(Collectors.toList());
+ comActActivityVOS = collect;
+ }
+ if (!ObjectUtils.isEmpty(comActActivityVOS)) {
+ List<ComActActivityVO> collect = comActActivityVOS.stream()
+ .sorted(Comparator.comparing(ComActActivityVO::getSingDate).reversed()).collect(Collectors.toList());
+ //当前用户签到记录列表
+ R r2 = communityService.listSignInActivity(userId);
+ if (R.isOk(r2) && !ObjectUtils.isEmpty(r2.getData())) {
+ List<ComActActRegistVO> comActActRegistVOS = JSONArray.parseArray(JSONArray.toJSONString(r2.getData()), ComActActRegistVO.class).stream()
+ .sorted(Comparator.comparing(ComActActRegistVO::getCreateAt).reversed()).collect(toList());
+ collect.forEach(comActActivityVO -> {
+ ArrayList<ComActActRegistVO> currentList = new ArrayList<>();
+ comActActRegistVOS.forEach(activitySignInVO -> {
+ if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
+ currentList.add(activitySignInVO);
+ if(activitySignInVO.getEndTime()!=null){
+ comActActivityVO.setIsComment(1);
+ if(comActActivityVO.getTimes()==null){
+ comActActivityVO.setTimes(1);
+ comActActivityVO.setAward(activitySignInVO.getAward());
+ }
+ else {
+ comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
+ comActActivityVO.setAward(comActActivityVO.getAward() + activitySignInVO.getAward());
+ }
+ }
+ }
+ });
+ if (currentList.size() > 10) {
+ comActActivityVO.setActivitySignInList(currentList.subList(0, 10));
+ } else {
+ comActActivityVO.setActivitySignInList(currentList);
+ }
+ Integer limit = comActActivityVO.getLimit();
+ if(limit != null && limit>0 &¤tList.size()>0){
+ if(limit==currentList.size()&¤tList.get(currentList.size()-1).getEndTime()!=null){
+ comActActivityVO.setIsRegist(1);
+ }
+ }
+ });
+ }
+ //当前用户活动评分
+ R r3 = communityService.listEvaluate(userId);
+ if (R.isOk(r3) && !ObjectUtils.isEmpty(r3.getData())) {
+ List<ComActActEvaluateVO> comActActEvaluateVOS = JSONArray.parseArray(JSONArray.toJSONString(r3.getData()), ComActActEvaluateVO.class);
+ collect.forEach(comActActivityVO -> {
+ List<ComActActEvaluateVO> evaluateVOS=comActActEvaluateVOS.stream().filter(comActActEvaluateVO -> comActActEvaluateVO.getActivityId().equals(comActActivityVO.getId())).collect(toList());
+ if(comActActivityVO.getSignCount()<=evaluateVOS.size()){
+ comActActivityVO.setIsComment(0);
+ }
+ comActActivityVO.setComActActEvaluateVOList(evaluateVOS);
+ });
+ }
+ return R.ok(collect);
+ }
+ return R.ok(comActActivityVOS);
+ }
+
+ @ApiOperation(value = "分页查询我的随手拍", response = ComActEasyPhotoVO.class)
+ @PostMapping("pageeasyphoto")
+ public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
+ Long userId = this.getUserId();
+ comActEasyPhotoVO.setSponsorId(userId);
+ comActEasyPhotoVO.setCommunityId(null);
+ return communityService.pageEasyPhotoApplets(comActEasyPhotoVO);
+ }
+
+ @ApiOperation(value = "分页查询我的微心愿", response = ComActMicroWishVO.class)
+ @PostMapping("pagemicrowish")
+ public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
+ Long userId = this.getUserId();
+ comActMicroWishVO.setUserId(userId);
+ comActMicroWishVO.setCommunityId(null);
+ Integer status = comActMicroWishVO.getStatus();
+ if (null != status && status == 1) {
+ comActMicroWishVO.setIsPageMyWish(1);
+ } else {
+ comActMicroWishVO.setIsPageMyWish(null);
+ }
+
+ return communityService.pageMicroWish(comActMicroWishVO);
+ }
+
+ @ApiOperation(value = "用户确认心愿")
+ @PutMapping("microwishconfirm")
+ public R putMicroWishConfirm(@RequestBody ComActMicroWishVO comActMicroWishVO) {
+ Long userId = this.getUserId();
+ comActMicroWishVO.setUserId(userId);
+ comActMicroWishVO.setCommunityId(null);
+ Long id = comActMicroWishVO.getId();
+ if (null == id || 0 == id) {
+ return R.fail("心愿主键不能为空");
+ }
+ Integer score = comActMicroWishVO.getScore();
+ if (null == score || 0 == score) {
+ return R.fail("评分不能为空");
+ }
+ comActMicroWishVO.setEvaluateAt(new Date());
+ comActMicroWishVO.setStatus(6);
+ return communityService.putMicroWishConfirm(comActMicroWishVO);
+ }
+
+ @ApiOperation(value = "调试接口--清除昵称、社区、小区")
+ @DeleteMapping("usertest")
+ public R deleteUserTest() {
+ Long userId = this.getUserId();
+ return userService.deleteUserTest(userId);
+ }
+
+ @ApiOperation(value = "意见反馈")
+ @PostMapping("feedback")
+ public R addFeedback(@RequestBody @Validated(AddGroup.class) SysUserFeedbackDTO sysUserFeedbackDTO) {
+ // 微信内容审核
+ String msg = sysUserFeedbackDTO.getContent();
+ if (StrUtil.isNotBlank(msg)) {
+ String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ Long communityId = loginUserInfo.getCommunityId();
+ Long areaId = loginUserInfo.getAreaId();
+ if (null == communityId || 0 == communityId) {
+ return R.fail("未绑定社区");
+ }
+ sysUserFeedbackDTO.setCommunityId(communityId);
+ sysUserFeedbackDTO.setAreaId(areaId);
+ sysUserFeedbackDTO.setUserId(userId);
+ return userService.addFeedback(sysUserFeedbackDTO);
+ }
+
+ @ApiOperation(value = "党员认证")
+ @PostMapping("partybuildingembercertification")
+ public R partybuildingembercertification(
+ @RequestBody @Validated(AddGroup.class) ComPbMemberCertificationDTO comPbMemberCertificationDTO) {
+ // 党员认证
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ Long communityId = loginUserInfo.getCommunityId();
+ if (null == communityId || 0 == communityId) {
+ return R.fail("未绑定社区");
+ }
+
+ // 判断用户是否已认证成功
+ R certUser = partyBuildingService.userCertification(userId,communityId);
+
+ Object certUserInfo = certUser.getData();
+ AtomicBoolean userCertified = new AtomicBoolean(false);
+ if (R.isOk(certUser) && certUserInfo != null) {
+ try {
+ List<PartyBuildingMemberVO> partyBuildingMemberVOList =
+ JSONArray.parseArray(JSONArray.toJSONString(certUser.getData()), PartyBuildingMemberVO.class);
+ // 已认证党员身份，直接返回
+ if (partyBuildingMemberVOList != null && partyBuildingMemberVOList.size() > 0) {
+ partyBuildingMemberVOList.forEach(vo -> {
+ userCertified.set(vo.getAuditResult() == 1);
+ });
+ }
+ } catch (Exception e) {
+ }
+ }
+ // 匹配手机，验证是否进行自动确认
+ if (userCertified.get()) {
+ return R.fail("您已审核通过，无需重复提交");
+ }
+
+ PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();
+ BeanUtils.copyProperties(comPbMemberCertificationDTO, partyBuildingMemberVO);
+ partyBuildingMemberVO.setAuditResult(0);
+ partyBuildingMemberVO.setCommunityId(communityId);
+
+ // 用户实名认证信息判断
+ String idCard = loginUserInfo.getIdCard();
+ partyBuildingMemberVO.setUserId(userId);
+ if (idCard == null) {
+ return R.fail("用户未完成实名认证");
+ } else {
+ partyBuildingMemberVO.setIdCard(loginUserInfo.getIdCard());
+ partyBuildingMemberVO.setName(loginUserInfo.getName());
+ partyBuildingMemberVO.setPhone(loginUserInfo.getPhone());
+ }
+
+ R r = partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
+ return r;
+ }
+
+ @ApiOperation(value = "党员认证查询")
+ @GetMapping("partybuildingembercertification")
+ public R partybuildingembercertification() {
+ // 党员认证查询
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ R r = partyBuildingService.userCertification(userId,this.getCommunityId());
+
+ if (R.isOk(r)) {
+ List<PartyBuildingMemberVO> partyBuildingMemberVOList =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), PartyBuildingMemberVO.class);
+ if (partyBuildingMemberVOList != null && partyBuildingMemberVOList.size() > 0) {
+ Optional<PartyBuildingMemberVO> ot = partyBuildingMemberVOList.stream()
+ .filter(partyBuildingMemberVO -> partyBuildingMemberVO.getAuditResult() == 1).findFirst();
+ if (ot.isPresent()) {
+ return R.ok(ot.get());
+ } else {
+ return R.ok(partyBuildingMemberVOList.get(0));
+ }
+ }
+ }
+ return R.ok();
+ }
+
+ /**
+ * 获取动作人员详情
+ * @param communityId
+ * @param phone
+ * @return
+ */
+ @ApiOperation(value = "社区工做人员详情")
+ @GetMapping("/getComPbServiceTeamData")
+ public R getComPbServiceTeamData(@RequestParam("communityId") String communityId,
+ @RequestParam("phone") String phone)
+ {
+ return partyBuildingService.getComPbServiceTeamData(communityId,phone);
+ }
+
+
+ @ApiOperation(value = "获取用户电子档案", response = UserArchivesVO.class)
+ @PostMapping("getUserArchives")
+ public R getUserArchives() {
+ Long userId = this.getUserId();
+ if (userId == null) {
+ return R.fail("请重新登录");
+ }
+ return userService.getUserArchives(userId);
+ }
+
+ @ApiOperation(value = "编辑用户电子档案")
+ @PostMapping("updateUserArchives")
+ public R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO) {
+ Long userId = this.getUserId();
+ if (userId == null) {
+ return R.fail("请重新登录");
+ }
+ userArchivesVO.setUserId(userId);
+ return userService.updateUserArchives(userArchivesVO);
+ }
+
+ @ApiOperation(value = "分页查询用户报名的项目")
+ @PostMapping("project")
+ public R pageProjectWhichIsSignedByUser(@RequestBody @Valid PageProjectDTO pageProjectDTO) {
+ pageProjectDTO.setUserId(this.getUserId());
+ return communityService.pageProjectWhichIsSignedByUser(pageProjectDTO);
+ }
+
+ @ApiOperation("获取用户")
+ @GetMapping("selectAutomessageSysUserById")
+ public R selectAutomessageSysUserById(@RequestParam("id")Long id){
+ return communityService.selectAutomessageSysUserById(id);
+ }
+
+ @ApiOperation("新增投诉建议或问题留言")
+ @PostMapping("addFeedBack")
+ public R addFeedBack(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){
+ sysUserFeedbackDTO.setCommunityId(null);
+ return userService.addFeedback(sysUserFeedbackDTO);
+ }
+
+ @ApiOperation("查看自己的投诉建议或问题留言记录")
+ @GetMapping("myFeedBack")
+ public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type,@RequestParam("propertyId")Long propertyId){
+ return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type,propertyId);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VaccinesApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VaccinesApi.java
new file mode 100644
index 0000000..390be52
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VaccinesApi.java
@@ -0,0 +1,77 @@
+package com.panzhihua.applets.api;
+
+import javax.annotation.Resource;
+
+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 com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.vaccines.VaccinesByAppVO;
+import com.panzhihua.common.model.vos.vaccines.VaccinesEnrollUserByAppVO;
+import com.panzhihua.common.model.vos.vaccines.VaccinesUserInoculationByAppVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @auther lyq
+ * @create 2021-05-19 14:25:49
+ * @describe 疫苗服务API
+ */
+@Slf4j
+@RestController
+@RequestMapping("/vaccines/")
+@Api(tags = {"疫苗服务"})
+public class VaccinesApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "疫苗分类列表", response = VaccinesByAppVO.class)
+ @PostMapping("list")
+ public R getVaccinesListByApp() {
+ return communityService.getVaccinesListByApp();
+ }
+
+ @ApiOperation(value = "疫苗类型对应家庭成员接种列表", response = VaccinesEnrollUserByAppVO.class)
+ @PostMapping("user/list")
+ public R getVaccinesUserListByApp(@RequestBody VaccinesEnrollUserByAppDTO enrollUserByAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ enrollUserByAppDTO.setUserId(loginUserInfo.getUserId());
+ return communityService.getVaccinesUserListByApp(enrollUserByAppDTO);
+ }
+
+ @ApiOperation(value = "用户疫苗报名")
+ @PostMapping("enroll")
+ public R VaccinesEnrollByApp(@RequestBody VaccinesEnrollByAppDTO enrollByAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ enrollByAppDTO.setUserId(loginUserInfo.getUserId());
+ enrollByAppDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.VaccinesEnrollByApp(enrollByAppDTO);
+ }
+
+ @ApiOperation(value = "用户家庭接种记录", response = VaccinesUserInoculationByAppVO.class)
+ @PostMapping("user/inoculation/list")
+ public R getVaccinesUserInoculationListByApp() {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ return communityService.getVaccinesUserInoculationListByApp(loginUserInfo.getUserId());
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VillageApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VillageApi.java
new file mode 100644
index 0000000..5833f9b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VillageApi.java
@@ -0,0 +1,52 @@
+package com.panzhihua.applets.api;
+
+import com.alibaba.excel.EasyExcel;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.listen.ComMngVillageServeExcelListen;
+import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngVillageRegionVO;
+import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngVillageTotalVO;
+import com.panzhihua.common.model.vos.community.ComMngVillageVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+/**
+ * @description: 小区管理
+ * @author: llming
+ **/
+@Slf4j
+@Api(tags = {"小区管理"})
+@RestController
+@RequestMapping("/villagemanager/")
+public class VillageApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private UserService userService;
+
+ @ApiOperation(value = "查询小区", response = ComMngVillageVO.class)
+ @PostMapping("listvillage")
+ public R listVillage(@RequestBody ComMngVillageVO comMngVillageVO) {
+ return communityService.listVillage(comMngVillageVO);
+ }
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
new file mode 100644
index 0000000..d8a2672
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
@@ -0,0 +1,333 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.VolunteerActivitiesPeopleVO;
+import com.panzhihua.common.model.vos.community.VolunteerIntegralMerchantVO;
+import com.panzhihua.common.model.vos.community.VolunteerIntegralRecordVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+@Slf4j
+@RestController
+@RequestMapping("/VolunteerActivitiesPeople")
+public class VolunteerActivitiesPeopleApi extends BaseController
+{
+ @Resource
+ private CommunityService volunteerActivitiesPeople;
+
+ /**
+ * 志愿者单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/vapGetById")
+ public R vapGetById(@RequestParam("id") String id)
+ {
+ if(StringUtils.isEmpty(id))
+ {
+ return R.fail("id不能为空");
+ }
+ return R.ok(volunteerActivitiesPeople.vapGetById(id));
+ }
+
+ /**
+ * 参与人员列表
+ * @param activityId
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/vapGetList")
+ public R vapGetList(@RequestParam("activityId") String activityId,
+ @RequestParam("communityId") String communityId)
+ {
+ if(StringUtils.isEmpty(activityId))
+ {
+ return R.fail("活动id不能为空");
+ }
+
+ if(StringUtils.isEmpty(communityId))
+ {
+ communityId=getLoginUserInfo().getCommunityId()+"";
+ }
+
+ return R.ok(volunteerActivitiesPeople.vapGetList(activityId, communityId));
+ }
+
+ /**
+ * 添加参与人员
+ * @param volunteerActivitiesPeopleVO
+ * @return
+ */
+ @PostMapping("/vapInsert")
+ public R vapInsert(@RequestBody VolunteerActivitiesPeopleVO volunteerActivitiesPeopleVO)
+ {
+ if(volunteerActivitiesPeopleVO==null)
+ {
+ return R.fail("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(volunteerActivitiesPeopleVO.getUserId()))
+ {
+ return R.fail("用户id不能为空");
+ }
+
+ if(StringUtils.isEmpty(volunteerActivitiesPeopleVO.getActivityId()))
+ {
+ return R.fail("活动id不能为空");
+ }
+
+ if(StringUtils.isEmpty(volunteerActivitiesPeopleVO.getCommunityId()))
+ {
+ volunteerActivitiesPeopleVO.setCommunityId(getLoginUserInfo().getCommunityId()+"");
+ }
+
+ return volunteerActivitiesPeople.vapInsert(volunteerActivitiesPeopleVO);
+ }
+
+ /**
+ * 修改参与人员
+ * @param volunteerActivitiesPeopleVO
+ * @return
+ */
+ @PostMapping("/vapUpdate")
+ public R vapUpdate(@RequestBody VolunteerActivitiesPeopleVO volunteerActivitiesPeopleVO)
+ {
+ if(volunteerActivitiesPeopleVO==null)
+ {
+ return R.fail("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(volunteerActivitiesPeopleVO.getId()))
+ {
+ return R.fail("id不能为空");
+ }
+
+ if(StringUtils.isEmpty(volunteerActivitiesPeopleVO.getActivityId()))
+ {
+ return R.fail("活动id不能为空");
+ }
+
+ if(StringUtils.isEmpty(volunteerActivitiesPeopleVO.getVolunteerId()))
+ {
+ return R.fail("志愿者id不能为空");
+ }
+
+ if(StringUtils.isEmpty(volunteerActivitiesPeopleVO.getCommunityId()))
+ {
+ volunteerActivitiesPeopleVO.setCommunityId(getLoginUserInfo().getCommunityId()+"");
+ }
+
+ return volunteerActivitiesPeople.vapUpdate(volunteerActivitiesPeopleVO);
+ }
+
+ /**
+ * 删除参与人员
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/vapDelete")
+ public R vapDelete(@RequestParam("id") String id)
+ {
+ if(StringUtils.isEmpty(id))
+ {
+ return R.fail("id不能为空");
+ }
+ return volunteerActivitiesPeople.vapDelete(id);
+ }
+
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/queryList")
+ R queryList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "acState", required = false) String acState,
+ @RequestParam(value = "acType", required = false) String acType,
+ @RequestParam(value = "actityBeginTime", required = false) Date actityBeginTime,
+ @RequestParam(value = "actityEndTime", required = false) Date actityEndTime)
+ {
+ return volunteerActivitiesPeople.volunteerQueryList(pageNum, pageSize, name, acState, acType, actityBeginTime, actityEndTime);
+ }
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/volunteerTypeGetList")
+ public R volunteerTypeGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize)
+ {
+ return volunteerActivitiesPeople.volunteerTypeGetList(pageNum,pageSize,"1");
+ }
+
+ /**************************************************************************************************
+ *
+ * 积分明细
+ *
+ ***************************************************************************************************/
+ /**
+ * 获取单个详情
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("/IntegralRecord/getId")
+ public R VolunteerIntegralRecordGetId(@RequestParam("id") String id)
+ {
+ return volunteerActivitiesPeople.VolunteerIntegralRecordGetId(id);
+ }
+
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/IntegralRecord/getList")
+ public R VolunteerIntegralRecordGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("userId") String userId)
+ {
+ return volunteerActivitiesPeople.VolunteerIntegralRecordGetList(pageNum,pageSize,userId);
+ }
+
+ /**
+ * 新增
+ *
+ * @param
+ * @return
+ */
+ @PostMapping("/IntegralRecord/insertVolunteer")
+ public R VolunteerIntegralRecordInsertVolunteer(@RequestBody() VolunteerIntegralRecordVO volunteerIntegralRecordVO)
+ {
+ return volunteerActivitiesPeople.VolunteerIntegralRecordInsertVolunteer(volunteerIntegralRecordVO);
+ }
+
+ /**
+ * 便捷
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralRecord/updateId")
+ public R VolunteerIntegralRecordUpdateId(@RequestBody() VolunteerIntegralRecordVO volunteerIntegralRecordVO)
+ {
+ return volunteerActivitiesPeople.VolunteerIntegralRecordUpdateId(volunteerIntegralRecordVO);
+ }
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/IntegralRecord/deleteId")
+ public R VolunteerIntegralRecordDeleteId(@RequestParam("id") String id)
+ {
+ return volunteerActivitiesPeople.VolunteerIntegralRecordDeleteId(id);
+ }
+
+ /****************************************************************************************************
+ *
+ *
+ * 路北积分商城
+ *
+ *
+ ***************************************************************************************************/
+
+ /**
+ * 获取单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/queryById")
+ public R VolunteerIntegralMerchantQueryById(@RequestParam("id") String id)
+ {
+ return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryById(id);
+ }
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/queryList")
+ public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "state", required = false) String state)
+ {
+ return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"0",null);
+ }
+
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/merchantQueryList")
+ public R MerchantQueryList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "state", required = false) String state,
+ @RequestParam(value = "merchantId", required = false) String merchantId)
+ {
+ return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"1",merchantId);
+ }
+
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralMerchant/insertVolunteer")
+ public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO)
+ {
+ if(StringUtils.isEmpty(vimVO.getMerchantId()))
+ {
+ return R.fail("商家id不能为空");
+ }
+
+ vimVO.setGoodType("1");
+ return volunteerActivitiesPeople.VolunteerIntegralMerchantInsertVolunteer(vimVO);
+ }
+
+ @PostMapping("/VolunteerIntegralMerchant/updateById")
+ public R VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO)
+ {
+ if(StringUtils.isEmpty(vimVO.getMerchantId()))
+ {
+ return R.fail("商家id不能为空");
+ }
+
+ vimVO.setGoodType("1");
+ return volunteerActivitiesPeople.VolunteerIntegralMerchantUpdateById(vimVO);
+ }
+
+
+ @PostMapping("/VolunteerIntegralMerchant/unmount")
+ public R VolunteerIntegralMerchantUnmount(@RequestBody VolunteerIntegralMerchantVO vimVO)
+ {
+ vimVO.setGoodType("1");
+ return volunteerActivitiesPeople.VolunteerIntegralMerchantUnmount(vimVO);
+ }
+
+
+ @DeleteMapping("/VolunteerIntegralMerchant/deleteById")
+ public R VolunteerIntegralMerchantDeleteById(@RequestParam("id") String id)
+ {
+ return volunteerActivitiesPeople.VolunteerIntegralMerchantDeleteById(id);
+ }
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WalletApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WalletApi.java
new file mode 100644
index 0000000..fdf1095
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WalletApi.java
@@ -0,0 +1,74 @@
+package com.panzhihua.applets.api;
+
+import javax.annotation.Resource;
+
+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 com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
+import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.wallet.ComActWalletRankingVO;
+import com.panzhihua.common.model.vos.community.wallet.ComActWalletTradeVO;
+import com.panzhihua.common.model.vos.community.wallet.ComActWalletVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@RequestMapping("/wallet/")
+@Api(tags = {"钱包模块"})
+public class WalletApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "查询我的钱包", response = ComActWalletVO.class)
+ @PostMapping("/get/my")
+ public R getWallet() {
+ ComActWalletDetailDTO walletDetailDTO = new ComActWalletDetailDTO();
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ walletDetailDTO.setUserId(loginUserInfo.getUserId());
+ Long communityId = loginUserInfo.getCommunityId();
+ if (null == communityId || 0 == communityId) {
+ return R.fail("用户未绑定社区");
+ }
+ walletDetailDTO.setCommunityId(communityId);
+ return communityService.getUserWalletDetail(walletDetailDTO);
+ }
+
+ @ApiOperation(value = "查询我的收支记录", response = ComActWalletTradeVO.class)
+ @PostMapping("/get/trade")
+ public R getWalletTrade(@RequestBody PageComActWalletTradeDTO walletTradeDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ walletTradeDTO.setUserId(loginUserInfo.getUserId());
+ Long communityId = loginUserInfo.getCommunityId();
+ if (null == communityId || 0 == communityId) {
+ return R.fail("用户未绑定社区");
+ }
+ walletTradeDTO.setCommunityId(communityId);
+ return communityService.getUserWalletTrade(walletTradeDTO);
+ }
+
+ @ApiOperation(value = "查询收益排行榜", response = ComActWalletRankingVO.class)
+ @PostMapping("/get/ranking")
+ public R getWalletRanking(@RequestBody PageComActWalletTradeDTO walletTradeDTO) {
+ Long communityId = this.getCommunityId();
+ if (null == communityId || 0 == communityId) {
+ return R.fail("用户未绑定社区");
+ }
+ walletTradeDTO.setCommunityId(communityId);
+ return communityService.getWalletRanking(walletTradeDTO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java
new file mode 100644
index 0000000..4b4c083
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java
@@ -0,0 +1,66 @@
+package com.panzhihua.applets.api;
+
+import javax.annotation.Resource;
+
+import com.panzhihua.common.model.vos.community.ComActWorkGuideAppletsVO;
+import com.panzhihua.common.model.vos.community.ComActWorkGuideDetailAppletsVO;
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @auther llming
+ * @describe 办事指南API
+ */
+@Slf4j
+@RestController
+@RequestMapping("/workguide/")
+@Api(tags = {"办事指南API"})
+public class WorkGuideApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "办事指南_分页", response = ComActWorkGuideVO.class)
+ @PostMapping("pageworkguide")
+ public R detailWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) {
+ pageActWorkGuideDTO.setAreaCode(this.getAreaCode());
+ return communityService.pageWorkGuide(pageActWorkGuideDTO);
+ }
+
+ @ApiOperation(value = "办事指南_详情", response = ComActWorkGuideVO.class)
+ @GetMapping("detailworkguide")
+ public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId,
+ @RequestParam(value = "communityId", required = false) Long communityId) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ communityId = loginUserInfo.getCommunityId();
+ }
+ if(communityId==null || communityId<0)
+ {
+ return communityService.detailWorkGuide(workGuideId, "");
+ }
+ return communityService.detailWorkGuide(workGuideId, communityId+"");
+ }
+
+ @ApiOperation(value = "办事指南列表-按分类查询", response = ComActWorkGuideAppletsVO.class)
+ @PostMapping("list")
+ public R listWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) {
+ pageActWorkGuideDTO.setAreaCode(this.getAreaCode());
+ return communityService.listWorkGuide(pageActWorkGuideDTO);
+ }
+
+ @ApiOperation(value = "办事指南列表-按分类查询", response = ComActWorkGuideDetailAppletsVO.class)
+ @GetMapping("list/classify")
+ public R listWorkGuideByClassifyId(@RequestParam("classifyId") Long classifyId) {
+ return communityService.listWorkGuideByClassifyId(classifyId);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java
new file mode 100644
index 0000000..f83f4e9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java
@@ -0,0 +1,501 @@
+package com.panzhihua.applets.api;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.panzhihua.applets.umf.MyAESUtil;
+import com.panzhihua.applets.umf.UmfPayUtil;
+import com.panzhihua.applets.unionpay.Query;
+import com.panzhihua.applets.unionpay.QueryEntiy;
+import com.panzhihua.applets.unionpay.Refund;
+import com.panzhihua.common.model.dtos.wx.UnionpayCarWash;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.utlis.HttpClientUtil;
+import com.umf.api.service.UmfService;
+import com.umf.api.service.UmfServiceImpl;
+import io.swagger.annotations.ApiOperation;
+import com.panzhihua.common.service.community.ComBatteryCommodityOrderFeign;
+import org.json.XML;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.model.dtos.shop.WxPayNotifyOrderDTO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.StringUtils;
+
+import lombok.extern.slf4j.Slf4j;
+
+import static com.umf.api.service.UmfServiceImpl.printResult;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:49
+ * @describe 微信支付回到函数
+ */
+@Slf4j
+@RestController
+@RequestMapping("/wx/")
+public class WxCallbackApi {
+
+ private static final String SUCCESS="SUCCESS";
+
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private UmfPayUtil umfPayUtil;
+ @Value("${umf.file}")
+ private String file;
+ @Resource
+ private UserService userService;
+ @Resource
+ private ComBatteryCommodityOrderFeign commodityOrderFeign;
+
+
+ @PostMapping("wxNotify")
+ public void payCallback(HttpServletRequest request, HttpServletResponse response) {
+ log.error("微信支付回调start");
+ String inputLine = "";
+ String notityXml = "";
+ try {
+ while ((inputLine = request.getReader().readLine()) != null) {
+ notityXml += inputLine;
+ }
+ // 关闭流
+ request.getReader().close();
+ log.error("微信回调内容信息：" + notityXml);
+ // 解析成Json
+ org.json.JSONObject xmlJson = XML.toJSONObject(notityXml);
+ if (StringUtils.isNotEmpty(xmlJson.toString())) {
+ JSONObject resultData = JSON.parseObject(xmlJson.get("xml").toString());
+ // 成功支付订单
+ if (resultData.getString("result_code").equals("SUCCESS")
+ && resultData.getString("return_code").equals("SUCCESS")) {
+ WxPayNotifyOrderDTO notifyOrderDTO = new WxPayNotifyOrderDTO();
+ // 订单号
+ String orderTradeNo = resultData.getString("out_trade_no");
+ notifyOrderDTO.setOrderTradeNo(orderTradeNo);
+ // 微信支付订单号
+ String wxTradeNo = resultData.getString("transaction_id");
+ notifyOrderDTO.setWxTradeNo(wxTradeNo);
+ // 订单金额
+ String totalFee = resultData.getString("total_fee");
+ notifyOrderDTO.setTotalFee(totalFee);
+ // 支付完成时间
+ String payTime = resultData.getString("time_end");
+ notifyOrderDTO.setPayTime(payTime);
+ // 现金支付金额
+ String cashFee = resultData.getString("cash_fee");
+ notifyOrderDTO.setCashFee(cashFee);
+
+ // 根据订单号修改订单信息
+ communityService.wxOrderPayNotify(notifyOrderDTO);
+
+ // 封装 返回值
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("<xml>");
+ buffer.append("<return_code>SUCCESS</return_code>");
+ buffer.append("<return_msg>OK</return_msg>");
+ buffer.append("</xml>");
+
+ // 给微信服务器返回 成功标示 否则会一直询问 咱们服务器 是否回调成功
+ PrintWriter writer = response.getWriter();
+ // 返回
+ writer.print(buffer.toString());
+ } else {// 未成功支付订单
+ // 封装 返回值
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("<xml>");
+ buffer.append("<return_code>FAIL</return_code>");
+ buffer.append("<return_msg>FAIL</return_msg>");
+ buffer.append("</xml>");
+
+ // 给微信服务器返回 成功标示 否则会一直询问 咱们服务器 是否回调成功
+ PrintWriter writer = response.getWriter();
+ // 返回
+ writer.print(buffer.toString());
+ }
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @GetMapping("wxNotifyAll")
+ public void payCallbackAll(HttpServletRequest request, HttpServletResponse response) {
+ //获取联动发送请求的参数
+ String requestParam = request.getQueryString();
+ System.out.println("花城洗车请求参数 :" + requestParam);
+ //调用异步通知解析方法
+ UmfService service = new UmfServiceImpl("53461",file);
+ Map respMap = null;
+ try {
+ respMap = service.notifyDataParserMap(requestParam);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ if(respMap.get("error_code").equals("0000")){
+ //调用uu洗车支付成功回调
+ Map map=new HashMap();
+ map.put("orderId",respMap.get("order_id"));
+ HttpClientUtil.sendPostByJson("https://uu-api.imashuo.com/notify/wx/pzh-pay",JSONObject.toJSONString(map),
+ 1,"appid","10000");
+ log.error("花城洗车回调成功 ：" + respMap.get("order_id"));
+ }
+ //调用SDK生成返回联动平台字符串，加到CONTENT中
+ String resMetaData = service.responseUMFMap(respMap);
+ response.setContentType("text/html;charset=utf-8");
+ PrintWriter out = null;
+ try {
+ out = response.getWriter();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ out.println("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">");
+ out.println("<HTML>");
+ out.println("<HEAD><META NAME=\"MobilePayPlatform\" CONTENT=\"" + resMetaData + "\" /></HEAD>");
+ out.println("<BODY>");
+ out.println("</BODY>");
+ out.println("</HTML>");
+ out.flush();
+ out.close();
+ }
+
+
+ /**
+ * 银联支付回调专用 银联方面只能是有个post
+ * @param response
+ */
+ @PostMapping("wxNotifyAllUnionpay")
+ public void payCallbackAllUnionpay(@RequestParam("merOrderId") String merOrderId, HttpServletResponse response)
+ {
+ //获取联动发送请求的参数
+ log.error("花城洗车请求参数 :" + merOrderId);
+ log.error("花城洗车请求参数response :" + response.toString());
+ //调用异步通知解析方法
+ String content=Query.query(merOrderId);
+ QueryEntiy queryEntiy=JSONObject.parseObject(content,QueryEntiy.class);
+ log.error("花城洗车请求参数queryEntiy :" + queryEntiy.toString());
+ if(queryEntiy.getErrCode().equals("SUCCESS"))
+ {
+ //查询银联单号对应的洗车单号
+ R r=communityService.carWashById(merOrderId);
+ if(r.getCode()==200)
+ {
+
+ HashMap unionpayCarWash= (HashMap) r.getData();
+ //调用uu洗车支付成功回调
+ Map map=new HashMap();
+ map.put("orderId",unionpayCarWash.get("carWashId"));
+ HttpClientUtil.sendPostByJson("https://uu-api.imashuo.com/notify/wx/pzh-pay",JSONObject.toJSONString(map),
+ 1,"appid","10000");
+ log.error("花城洗车回调成功 ：" + queryEntiy.getMerOrderId()+" : 洗车号"
+ +unionpayCarWash.get("carWashId")+" : 银联号"+unionpayCarWash.get("unionpayOrderId"));
+ }
+
+ }
+ //调用SDK生成返回联动平台字符串，加到CONTENT中
+ response.setContentType("text/html;charset=utf-8");
+ PrintWriter out = null;
+ try {
+ out = response.getWriter();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ out.println("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">");
+ out.println("<HTML>");
+ out.println("<HEAD><META NAME=\"MobilePayPlatform\" CONTENT=\"" + content + "\" /></HEAD>");
+ out.println("<BODY>");
+ out.println("</BODY>");
+ out.println("</HTML>");
+ out.flush();
+ out.close();
+ }
+
+
+ @ApiOperation("uu洗车退款接口")
+ @PostMapping("/uuRepay")
+ public R uuRepay(@RequestBody String aesString)
+ {
+ try {
+ Map<String, String> aesMap= (Map<String, String>) JSON.parse(aesString);
+ String desString=MyAESUtil.Decrypt(aesMap.get("aesString"),"Ryo7M3n8loC5Abcd");
+ Map<String,String> desMap= (Map) JSON.parse(desString);
+ Map map=umfPayUtil.repay(desMap.get("orderId"),desMap.get("merdate"), DateUtils.getDateFormatString(new Date(),
+ "yyMMddHHmmss")+"0001",desMap.get("refundAmount"),desMap.get("orgAmount"));
+
+ if(desMap.get("orderId")!=null)
+ {
+ R r=communityService.queryById(desMap.get("orderId"));
+ if(r.getCode()==200)
+ {
+ HashMap wash= (HashMap) r.getData();
+ if(wash!=null)
+ {
+ String re=Refund.sendOrder(wash.get("money").toString(),
+ wash.get("unionpayOrderId").toString());
+ map.put("unionpay","退款成功");
+ log.error("花城洗车银联退款成功 ：" + re);
+ }
+
+ }
+ }
+ return R.ok(map);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.fail("加密验证失败");
+ }
+
+ }
+ @ApiOperation("uu洗车推送")
+ @PostMapping("/uuPush")
+ public R uuPush(@RequestBody String aesString){
+ try {
+ Map<String, String> aesMap= (Map<String, String>) JSON.parse(aesString);
+ String desString=MyAESUtil.Decrypt(aesMap.get("aesString"),"Ryo7M3n8loC5Abcd");
+ Map<String,String> desMap= (Map) JSON.parse(desString);
+ return userService.uuPush(desMap.get("washer_mobile"),desMap.get("phone"),desMap.get("washer_name"),Integer.parseInt(desMap.get("order_status")));
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.fail("推送失败");
+ }
+
+ }
+ @ApiOperation("ws洗车推送")
+ @PostMapping("/wsPush")
+ public R wsPush(@RequestBody String aesString){
+ try {
+ Map<String, String> aesMap= (Map<String, String>) JSON.parse(aesString);
+ String desString=MyAESUtil.Decrypt(aesMap.get("aesString"),"Ryo7M3n8loC5Abcd");
+ Map<String,String> desMap= (Map) JSON.parse(desString);
+ return userService.wsPush(desMap.get("washer_mobile"),desMap.get("phone"),desMap.get("washer_name"),Integer.parseInt(desMap.get("order_status")));
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.fail("推送失败");
+ }
+
+ }
+
+ /**
+ * 电动车商城商品购买支付回调
+ * @param request 请求参数
+ * @param response 返回参数
+ */
+ @PostMapping("/batteryPayNotify")
+ public void batteryPayNotify(HttpServletRequest request, HttpServletResponse response) {
+ log.info("钱包充值微信支付回调start");
+ String inputLine = "";
+ String notityXml = "";
+ try {
+ while ((inputLine = request.getReader().readLine()) != null) {
+ notityXml += inputLine;
+ }
+ // 关闭流
+ request.getReader().close();
+ log.info("钱包充值微信回调内容信息：" + notityXml);
+ // 解析成Json
+ org.json.JSONObject xmlJson = XML.toJSONObject(notityXml);
+ if (StringUtils.isNotEmpty(xmlJson.toString())) {
+ JSONObject resultData = JSON.parseObject(xmlJson.get("xml").toString());
+ // 成功支付订单
+ if (SUCCESS.equals(resultData.getString("result_code")) && SUCCESS.equals(resultData.getString("result_code"))){
+ WxPayNotifyOrderDTO notifyOrderDTO = getWxNotify(resultData);
+
+ // 根据订单号修改订单信息
+ commodityOrderFeign.batteryPayNotify(notifyOrderDTO);
+ // 给微信服务器返回 成功标示 否则会一直询问 咱们服务器 是否回调成功
+ PrintWriter writer = response.getWriter();
+ // 返回
+ writer.print(getWxSuccessString());
+ } else {// 未成功支付订单
+ // 给微信服务器返回 成功标示 否则会一直询问 咱们服务器 是否回调成功
+ PrintWriter writer = response.getWriter();
+ // 返回
+ writer.print(getWxFailString());
+ }
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @PostMapping("/batteryActivityPayNotify")
+ public void batteryActivityPayNotify(HttpServletRequest request, HttpServletResponse response) {
+ log.info("购买活动商品微信支付回调start");
+ String inputLine = "";
+ String notityXml = "";
+ try {
+ while ((inputLine = request.getReader().readLine()) != null) {
+ notityXml += inputLine;
+ }
+ // 关闭流
+ request.getReader().close();
+ log.info("购买活动商品微信回调内容信息：" + notityXml);
+ // 解析成Json
+ org.json.JSONObject xmlJson = XML.toJSONObject(notityXml);
+ if (StringUtils.isNotEmpty(xmlJson.toString())) {
+ JSONObject resultData = JSON.parseObject(xmlJson.get("xml").toString());
+ // 成功支付订单
+ if (SUCCESS.equals(resultData.getString("result_code")) && SUCCESS.equals(resultData.getString("result_code"))){
+ WxPayNotifyOrderDTO notifyOrderDTO = getWxNotify(resultData);
+
+ // 根据订单号修改订单信息
+ commodityOrderFeign.batteryActivityPayNotify(notifyOrderDTO);
+ // 给微信服务器返回 成功标示 否则会一直询问 咱们服务器 是否回调成功
+ PrintWriter writer = response.getWriter();
+ // 返回
+ writer.print(getWxSuccessString());
+ } else {// 未成功支付订单
+ // 给微信服务器返回 成功标示 否则会一直询问 咱们服务器 是否回调成功
+ PrintWriter writer = response.getWriter();
+ // 返回
+ writer.print(getWxFailString());
+ }
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 将微信支付回调的请求参数转义为对象
+ * @param resultData 微信支付回调请求参数
+ * @return 转义为支付请求参数
+ */
+ private WxPayNotifyOrderDTO getWxNotify(JSONObject resultData){
+ WxPayNotifyOrderDTO notifyOrderDTO = new WxPayNotifyOrderDTO();
+ notifyOrderDTO.setResult(resultData.toJSONString());
+ // 订单号
+ String orderTradeNo = resultData.getString("out_trade_no");
+ notifyOrderDTO.setOrderTradeNo(orderTradeNo);
+ // 微信支付订单号
+ String wxTradeNo = resultData.getString("transaction_id");
+ notifyOrderDTO.setWxTradeNo(wxTradeNo);
+ // 订单金额
+ String totalFee = resultData.getString("total_fee");
+ notifyOrderDTO.setTotalFee(totalFee);
+ // 支付完成时间
+ String payTime = resultData.getString("time_end");
+ notifyOrderDTO.setPayTime(payTime);
+ // 现金支付金额
+ String cashFee = resultData.getString("cash_fee");
+ notifyOrderDTO.setCashFee(cashFee);
+ //附加数据
+ String attach = resultData.getString("attach");
+ notifyOrderDTO.setAttach(attach);
+ return notifyOrderDTO;
+ }
+
+ /**
+ * 封装微信成功返回值
+ * @return 成功返回值
+ */
+ private String getWxSuccessString(){
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("<xml>");
+ buffer.append("<return_code>SUCCESS</return_code>");
+ buffer.append("<return_msg>OK</return_msg>");
+ buffer.append("</xml>");
+ return buffer.toString();
+ }
+
+ /**
+ * 封装微信失败返回值
+ * @return 失败返回值
+ */
+ private String getWxFailString(){
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("<xml>");
+ buffer.append("<return_code>FAIL</return_code>");
+ buffer.append("<return_msg>FAIL</return_msg>");
+ buffer.append("</xml>");
+ return buffer.toString();
+ }
+
+ @GetMapping("/settle")
+ public R settle(String settleDate){
+ return R.ok(umfPayUtil.settle(settleDate));
+ }
+
+
+ @PostMapping("/flower/wxNotify")
+ @ApiOperation("花城支付回调")
+ public void flowerWxNotify(HttpServletRequest request, HttpServletResponse response) {
+ log.error("微信支付回调start");
+ String inputLine = "";
+ String notityXml = "";
+ try {
+ while ((inputLine = request.getReader().readLine()) != null) {
+ notityXml += inputLine;
+ }
+ // 关闭流
+ request.getReader().close();
+ log.error("微信回调内容信息：" + notityXml);
+ // 解析成Json
+ org.json.JSONObject xmlJson = XML.toJSONObject(notityXml);
+ if (StringUtils.isNotEmpty(xmlJson.toString())) {
+ JSONObject resultData = JSON.parseObject(xmlJson.get("xml").toString());
+ // 成功支付订单
+ if (resultData.getString("result_code").equals("SUCCESS")
+ && resultData.getString("return_code").equals("SUCCESS")) {
+ WxPayNotifyOrderDTO notifyOrderDTO = new WxPayNotifyOrderDTO();
+ // 订单号
+ String orderTradeNo = resultData.getString("out_trade_no");
+ notifyOrderDTO.setOrderTradeNo(orderTradeNo);
+ // 微信支付订单号
+ String wxTradeNo = resultData.getString("transaction_id");
+ notifyOrderDTO.setWxTradeNo(wxTradeNo);
+ // 订单金额
+ String totalFee = resultData.getString("total_fee");
+ notifyOrderDTO.setTotalFee(totalFee);
+ // 支付完成时间
+ String payTime = resultData.getString("time_end");
+ notifyOrderDTO.setPayTime(payTime);
+ // 现金支付金额
+ String cashFee = resultData.getString("cash_fee");
+ notifyOrderDTO.setCashFee(cashFee);
+
+ // 根据订单号修改订单信息
+ communityService.wxOrderPayNotifyFlower(notifyOrderDTO);
+
+ // 封装 返回值
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("<xml>");
+ buffer.append("<return_code>SUCCESS</return_code>");
+ buffer.append("<return_msg>OK</return_msg>");
+ buffer.append("</xml>");
+
+ // 给微信服务器返回 成功标示 否则会一直询问 咱们服务器 是否回调成功
+ PrintWriter writer = response.getWriter();
+ // 返回
+ writer.print(buffer.toString());
+ } else {// 未成功支付订单
+ // 封装 返回值
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("<xml>");
+ buffer.append("<return_code>FAIL</return_code>");
+ buffer.append("<return_msg>FAIL</return_msg>");
+ buffer.append("</xml>");
+
+ // 给微信服务器返回 成功标示 否则会一直询问 咱们服务器 是否回调成功
+ PrintWriter writer = response.getWriter();
+ // 返回
+ writer.print(buffer.toString());
+ }
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxMessagePushApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxMessagePushApi.java
new file mode 100644
index 0000000..eef70f7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxMessagePushApi.java
@@ -0,0 +1,156 @@
+package com.panzhihua.applets.api;
+
+import java.io.PrintWriter;
+import java.security.MessageDigest;
+import java.util.Arrays;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.common.utlis.WxUtil;
+import com.panzhihua.common.utlis.WxXCXTempSend;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequestMapping("/wx/push/")
+public class WxMessagePushApi {
+
+ private String token = "01A9CB2234D7CBD0AC61B75EB1263805";
+
+ private String url = "www.taobao.com";// 图文跳转地址
+
+ private String thumbUrl = "https://www.psciio.com//idcard/f986ba3ae7a241d9bce5cb568adec7da.jpg";// 图片地址
+
+ @Resource
+ private WxXCXTempSend wxXCXTempSend;
+
+ /**
+ * 微信接口配置信息认证接口<br>
+ * 需要正确响应微信发送的Token验证。 加密/校验流程如下：<br>
+ * 1. 将token、timestamp、nonce三个参数进行字典序排序<br>
+ * 2. 将三个参数字符串拼接成一个字符串进行sha1加密<br>
+ * 3. 开发者获得加密后的字符串可与signature对比，标识该请求来源于微信
+ */
+ @RequestMapping("/cgi")
+ public void cgi(HttpServletRequest request, HttpServletResponse response) {
+ boolean isGet = request.getMethod().toLowerCase().equals("get");
+ // 微信加密签名，signature结合了开发者填写的token参数和请求中的timestamp参数、nonce参数。
+ try {
+ if (isGet) {
+ String signature = request.getParameter("signature");
+ // 时间戳
+ String timestamp = request.getParameter("timestamp");
+ // 随机数
+ String nonce = request.getParameter("nonce");
+ // 随机字符串
+ String echostr = request.getParameter("echostr");
+ log.info("signature = " + signature + " , timestamp = " + timestamp + " , nonce = " + nonce
+ + " , echostr = " + echostr);
+ String[] strArray = new String[] {token, timestamp, nonce};
+ Arrays.sort(strArray);
+ StringBuilder sb = new StringBuilder();
+ for (String str : strArray) {
+ sb.append(str);
+ }
+ // SHA1签名生成
+ MessageDigest md = MessageDigest.getInstance("SHA-1");
+ md.update(sb.toString().getBytes());
+ byte[] digest = md.digest();
+
+ StringBuffer hexstr = new StringBuffer();
+ String shaHex = "";
+ for (int i = 0; i < digest.length; i++) {
+ shaHex = Integer.toHexString(digest[i] & 0xFF);
+ if (shaHex.length() < 2) {
+ hexstr.append(0);
+ }
+ hexstr.append(shaHex);
+ }
+
+ if (hexstr.toString().equals(signature)) {
+ response.getOutputStream().write(echostr.getBytes());
+ }
+
+ } else {
+ // 进入POST聊天处理
+ // 将请求、响应的编码均设置为UTF-8（防止中文乱码）
+ request.setCharacterEncoding("UTF-8");
+ response.setCharacterEncoding("UTF-8");
+ // 接收消息并返回消息
+ String result = acceptMessage(request, response);
+
+ // 响应消息
+ PrintWriter out = response.getWriter();
+ out.print(result);
+ out.close();
+ }
+ } catch (Exception ex) {
+ log.error("微信帐号接口配置失败！", ex);
+ ex.printStackTrace();
+ }
+ }
+
+ /**
+ * 接受到微信接口数据
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ private String acceptMessage(HttpServletRequest request, HttpServletResponse response) {
+ String respMessage = "";
+ String inputLine = "";
+ String notityXml = "";
+ try {
+ // 接收数据
+ while ((inputLine = request.getReader().readLine()) != null) {
+ notityXml += inputLine;
+ }
+
+ // xml请求解析
+ JSONObject requestJson = JSON.parseObject(notityXml);
+ log.info(">>>>>>>>>>>>>" + requestJson.toString());
+ // 发送方帐号（open_id）
+ String fromUserName = requestJson.get("FromUserName").toString();
+ // 公众帐号
+ String toUserName = requestJson.get("ToUserName").toString();
+ // 消息类型
+ String msgType = requestJson.get("MsgType").toString();
+ // String Event = requestJson.get("Event").toString(); //SCAN 为扫描信息 VIEW 公众号底部点击事件
+ log.info("fromUserName = " + fromUserName + " , ToUserName = " + toUserName + " , msgType = " + msgType);
+
+ String access_token = wxXCXTempSend.getAccessToken();// 获取access_token
+
+ // 公众号关注事件消息
+ if (msgType.equals("event")) {
+ // log.info("公众号被关注事件..........");
+ } else if (msgType.equals("text")) {
+ // if(StringUtils.isNotEmpty(access_token)){
+ // String mediaId = wxXCXTempSend.getMediaId(access_token);//获取mediaId
+ // WxUtil.sendKfImagesMessage(fromUserName,access_token,mediaId);
+ // }
+ // log.info("公众号接受文字..........");
+ } else if (msgType.equals("image")) {
+ // log.info("公众号接受图片..........");
+ } else if (msgType.equals("miniprogrampage")) {
+ if (StringUtils.isNotEmpty(access_token)) {
+ String mediaId = wxXCXTempSend.getMediaId(access_token);// 获取mediaId
+ WxUtil.sendKfImagesMessage(fromUserName, access_token, mediaId);
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return respMessage;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java
new file mode 100644
index 0000000..32c450d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java
@@ -0,0 +1,228 @@
+package com.panzhihua.applets.api;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.applets.config.WxMaConfiguration;
+import com.panzhihua.common.constants.UserConstants;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.utlis.HttpClientUtil;
+import com.panzhihua.common.utlis.StringUtils;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+@Slf4j
+@RestController
+@RequestMapping("/official")
+public class WxOfficialApi {
+
+ @Resource
+ private StringRedisTemplate stringRedisTemplate;
+ // 公众号appid
+ private List<String> appidList = new ArrayList<String>() {
+ {
+ this.add("wx7c733ebbf6c55ecf");
+ this.add("wxc94f0cddf13577d5");
+ }
+ };
+ // 公众号secret
+ private List<String> secretList = new ArrayList<String>() {
+ {
+ this.add("500290552cbfdd1c1c18131c5807b6ae");
+ this.add("3418127405845701497a09f65678953f");
+ }
+ };
+
+ /**
+ * 微信公众号请求头设置
+ */
+ public static Map<String, String> getWxHeaderMap() {
+ Map<String, String> map = new HashMap<>(new LinkedHashMap());
+ map.put("Accept", "text/html, application/xhtml+xml, image/jxr, */*");
+ map.put("Accept-Encoding", "gzip, deflate");
+ map.put("Accept-Language", "zh-Hans-CN, zh-Hans; q=0.8, en-US; q=0.5, en; q=0.3");
+ map.put("Host", "mp.weixin.qq.com");
+ map.put("If-Modified-Since", "Sat, 04 Jan 2020 12:23:43 GMT");
+ map.put("User-Agent", "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko");
+ return map;
+ }
+
+ /**
+ * 根据文章链接抓取文章内容
+ *
+ * @param url 文章链接
+ * @return 文章内容
+ */
+ public static String getActicle(String url) {
+ // post发送的参数
+ Map<String, Object> map = new HashMap<>();
+ map.put("type", "news"); // news表示图文类型的素材，具体看API文档
+ map.put("offset", 0);
+ map.put("count", 5);
+ // 将map转换成json字符串
+ String paramBody = JSON.toJSONString(map);
+ return HttpClientUtil.get(url, getWxHeaderMap(), paramBody);
+ }
+
+ /**
+ * 获取token
+ *
+ * @param appid 公众号appid
+ * @param secret 公众号secret
+ * @return token
+ */
+ private String getToken(String appid, String secret) throws IOException {
+ // access_token接口https请求方式: GET
+ // https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET
+
+ String path = " https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential";
+ URL url = new URL(path + "&appid=" + appid + "&secret=" + secret);
+ HttpURLConnection connection = (HttpURLConnection)url.openConnection();
+ connection.setRequestMethod("GET");
+ connection.connect();
+
+ InputStream in = connection.getInputStream();
+ byte[] b = new byte[100];
+ int len = -1;
+ StringBuffer sb = new StringBuffer();
+ while ((len = in.read(b)) != -1) {
+ sb.append(new String(b, 0, len));
+ }
+
+ in.close();
+
+
+ return sb.toString();
+
+ }
+
+ /**
+ * 通过token获取公众号文章
+ *
+ * @param token token
+ * @return 获取的文章列表结果
+ */
+ private String getContentList(String token) throws IOException {
+ String path = " https://api.weixin.qq.com/cgi-bin/material/batchget_material?access_token=" + token;
+ URL url = new URL(path);
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setRequestMethod("POST");
+ connection.setDoOutput(true);
+ connection.setRequestProperty("content-type", "application/json;charset=utf-8");
+ connection.connect();
+ // post发送的参数
+ Map<String, Object> map = new HashMap<>();
+ map.put("type", "news"); // news表示图文类型的素材，具体看API文档
+ map.put("offset", 0);
+ map.put("count", 5);
+ // 将map转换成json字符串
+ String paramBody = JSON.toJSONString(map); // 这里用了Alibaba的fastjson
+
+ OutputStream out = connection.getOutputStream();
+ BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8));
+ bw.write(paramBody); // 向流中写入参数字符串
+ bw.flush();
+
+ InputStream in = connection.getInputStream();
+ byte[] b = new byte[100];
+ int len = -1;
+ StringBuffer sb = new StringBuffer();
+ while ((len = in.read(b)) != -1) {
+ sb.append(new String(b, 0, len, StandardCharsets.UTF_8));
+ }
+
+ in.close();
+ return sb.toString();
+ }
+
+ @ApiOperation(value = "拉取公众号列表")
+ @GetMapping(value = "/list/noToken", produces = "application/json;charset=utf-8")
+ public R pageDiscuss() throws Exception {
+ WxOfficialApi officialApi = new WxOfficialApi();
+
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ List<String> tokenList = new ArrayList<>();
+ if (!appidList.isEmpty()) {
+ for (int i = 0; i < appidList.size(); i++) {
+ String token = officialApi.getToken(appidList.get(i), secretList.get(i));
+ JSONObject tokenJson = JSON.parseObject(token);
+ if (StringUtils.isNotEmpty(tokenJson)) {
+ tokenList.add(tokenJson.getString("access_token"));
+ if (StringUtils.isNotEmpty(token)) {
+ tokenList.add(token);
+ }
+ }
+ }
+ }
+ List<JSONObject> resultList = new ArrayList<>();
+ Boolean newsListKey = stringRedisTemplate.hasKey(UserConstants.NEWS_LIST);
+ if (newsListKey != null && newsListKey) {
+ String json = valueOperations.get(UserConstants.NEWS_LIST);
+ resultList = JSON.parseArray(json, JSONObject.class);
+ return R.ok(resultList);
+ }
+ if (!tokenList.isEmpty()) {
+ for (String token : tokenList) {
+ try {
+ String url = "https://api.weixin.qq.com/cgi-bin/material/batchget_material?access_token=" + token;
+ String result = getActicle(url);
+ // log.info("通过token获取文章列表成功,返回结果：" + result);
+
+ JSONObject resultJson = JSON.parseObject(result);
+ if (resultJson != null) {
+ List<JSONObject> itemList = JSON.parseArray(resultJson.getString("item"), JSONObject.class);
+ if (!itemList.isEmpty()) {
+ for (JSONObject object : itemList) {
+ String newsId = object.getString("media_id");
+ JSONObject contentJson = JSON.parseObject(object.getString("content"));
+ List<JSONObject> newsItemList =
+ JSON.parseArray(contentJson.getString("news_item"), JSONObject.class);
+ String newsUrl = newsItemList.get(0).getString("url");
+ newsItemList.get(0).put("news_id", newsId);
+ contentJson.put("news_item", newsItemList);
+ object.put("content", contentJson);
+
+ valueOperations.set(UserConstants.NEWS_ID + newsId, newsUrl + "", 2, TimeUnit.DAYS);
+ }
+ }
+ resultJson.put("item", itemList);
+ }
+ resultList.add(resultJson);
+ } catch (Exception e) {
+ log.error("通过token获取文章列表失败，错误原因：" + e.getMessage());
+ }
+ valueOperations.set(UserConstants.NEWS_LIST, resultList.toString(), 12, TimeUnit.HOURS);
+ }
+ }
+ return R.ok(resultList);
+ }
+
+ @ApiOperation(value = "获取公众号文章链接")
+ @GetMapping(value = "/get/noToken")
+ public R getDiscuss(@RequestParam("mediaId") String mediaId) {
+
+ String key = UserConstants.NEWS_ID + mediaId;
+ Boolean hasKey = stringRedisTemplate.hasKey(key);
+ if (!hasKey) {
+ return R.fail("未找到该文章的链接地址");
+ }
+
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String url = valueOperations.get(key);
+ return R.ok(url);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
new file mode 100644
index 0000000..b6881a9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
@@ -0,0 +1,557 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.VolunteerCreditsExchangeVO;
+import com.panzhihua.common.model.vos.community.VolunteerMerchantEvaluateVO;
+import com.panzhihua.common.model.vos.community.VolunteerMerchantVO;
+import com.panzhihua.common.model.vos.community.VolunteerMerchantWithdrawVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.StringUtils;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@RestController
+@RequestMapping("/XmostBeautiful")
+@Api(tags = {"小程序志愿者活动"})
+public class XmostBeautifulApi extends BaseController
+{
+
+ @Resource
+ private CommunityService communityService;
+
+
+ @Resource
+ private UserService userService;
+
+ /**
+ * 查询单个
+ * @param Id
+ * @return
+ */
+ @GetMapping("/queryById")
+ public R queryById(@RequestParam("id") String Id)
+ {
+ if(StringUtils.isEmpty(Id))
+ {
+ return R.fail("id不能为空");
+ }
+ return communityService.queryById2(Id);
+ }
+
+
+ /**
+ * 分页查询
+ * @param name
+ * @param unmountType
+ * @return
+ */
+ @GetMapping("/getqueryList")
+ public R queryList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize")int pageSize,
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "unmountType", required = false) String unmountType)
+ {
+ return communityService.queryList(pageNum,pageSize,name,unmountType);
+ }
+
+
+ /**
+ * 查询单个志愿者活动详情
+ * @param Id
+ * @return
+ */
+ @GetMapping("/volunteerQueryById")
+ public R volunteerQueryById(@RequestParam("id") String Id)
+ {
+ if(StringUtils.isEmpty(Id))
+ {
+ return R.fail("id不能为空");
+ }
+ return communityService.volunteerQueryById(Id);
+ }
+
+ /***********************************************************************************************************
+ *
+ *
+ * 订单兑换
+ *
+ *
+ ***********************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/order/getList")
+ public R orderMerchantGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "goodsId", required = false) String goodsId,
+ @RequestParam(value = "orderNumber", required = false) String orderNumber,
+ @RequestParam(value = "goodsName", required = false) String goodsName,
+ @RequestParam(value = "condition", required = false) String condition,
+ @RequestParam(value = "userName", required = false) String userName,
+ @RequestParam(value = "communityId", required = false) String communityId,
+ @RequestParam(value = "orderType", required = false) String orderType,
+ @RequestParam(value = "merchantId", required = false) String merchantId)
+ {
+ if(StringUtils.isEmpty(communityId))
+ {
+ communityId=getCommunityId()+"";
+ }
+
+ String userId=null;
+
+ if(StringUtils.isEmpty(merchantId))
+ {
+ userId=getUserId()+"";
+ }
+
+ return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
+ condition,userName,communityId,userId,orderType,merchantId);
+ }
+
+ /**
+ * 新增用户购买商家商品记录
+ * @param
+ * @return
+ */
+ @PostMapping("/order/insertMerchantData")
+ public R insertMerchantData(@RequestBody VolunteerCreditsExchangeVO item)
+ {
+
+ if(StringUtils.isEmpty(item.getPalyIntegral()))
+ {
+ return R.fail("请输入兑换积分");
+ }
+
+ LoginUserInfoVO userInfoVO= getLoginUserInfo();
+ if(StringUtils.isEmpty(item.getCommunityId()))
+ {
+ item.setCommunityId(userInfoVO.getCommunityId()+"");
+ }
+ item.setOrderType("2");
+ item.setUserId(userInfoVO.getUserId()+"");
+ item.setNeedScore(userInfoVO.getLoveIntegral());
+ return communityService.insertMerchantData(item);
+ }
+
+
+
+ /**
+ * 更新商家订单
+ * @param item
+ * @return
+ */
+ @PostMapping("/order/MerchantUpdate")
+ public R orderMerchantUpdate(@RequestBody VolunteerCreditsExchangeVO item)
+ {
+ item.setOrderType("2");
+ return communityService.update(item);
+ }
+
+ /**
+ * 查询详情
+ * @param id
+ * @return
+ */
+ @GetMapping("order/getData")
+ public R getData(@RequestParam("id") String id)
+ {
+ if(StringUtils.isEmpty(id))
+ {
+ return R.fail("订单id不能为空");
+ }
+ return communityService.getData(id);
+ }
+
+ /**
+ * 新增社区
+ * @param
+ * @return
+ */
+ @PostMapping("/order/insertData")
+ public R insertData(@RequestBody VolunteerCreditsExchangeVO item)
+ {
+ LoginUserInfoVO userInfoVO= getLoginUserInfo();
+ if(StringUtils.isEmpty(item.getCommunityId()))
+ {
+ item.setCommunityId(userInfoVO.getCommunityId()+"");
+ }
+ item.setOrderType("1");
+ item.setUserId(userInfoVO.getUserId()+"");
+ item.setNeedScore(userInfoVO.getLoveIntegral());
+ return communityService.insertData(item);
+ }
+
+ /**
+ * 更新社区
+ * @param item
+ * @return
+ */
+ @PostMapping("/order/update")
+ public R update(@RequestBody VolunteerCreditsExchangeVO item)
+ {
+ item.setOrderType("1");
+ return communityService.update(item);
+ }
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/order/delete")
+ public R delete(@RequestParam("id") String id)
+ {
+ if(StringUtils.isEmpty(id))
+ {
+ return R.fail("订单id不能为空");
+ }
+ return communityService.delete(id);
+ }
+
+ /**
+ * 核销社区
+ * @param id
+ * @return
+ */
+ @GetMapping("/order/conditionData")
+ public R conditionData(@RequestParam("id") String id)
+ {
+ if(StringUtils.isEmpty(id))
+ {
+ return R.fail("订单id不能为空");
+ }
+ return communityService.conditionData(id);
+ }
+
+ /*************************************************************************************
+ *
+ * 路北社区商家模块
+ *
+ **************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/getList")
+ public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "merchantState", required = false) String merchantState,
+ @RequestParam(value = "merchantType", required = false) String merchantType,
+ @RequestParam(value = "name", required = false) String name)
+ {
+ return communityService.volunteerMerchantGetList(pageNum, pageSize,merchantState,merchantType,name,getCommunityId()+"");
+ }
+
+ /**
+ * 分页查询商家分类
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/getList")
+ public R merchantvolunteerTypeGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize)
+ {
+ return communityService.volunteerTypeGetList(pageNum,pageSize,"2");
+ }
+
+ /**
+ * 修改商家
+ * @param vtvo
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/update")
+ public R updateVolunteerMerchant(@RequestBody VolunteerMerchantVO vtvo)
+ {
+ return communityService.updateVolunteerMerchant(vtvo);
+ }
+
+ /**
+ * 获取商家详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/getById")
+ public R volunteerMerchantGetById(@RequestParam("id") String id)
+ {
+ return communityService.volunteerMerchantGetById(id);
+ }
+
+
+ /**
+ * 是否是商家
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/isMerchant")
+ public R isMerchant(@RequestParam("userId") String userId)
+ {
+ return communityService.isMerchant(userId);
+ }
+
+
+ /**
+ * 社区取消订单
+ * @param id
+ * @return
+ */
+ @GetMapping("/order/communityCancellation")
+ public R communityCancellation(@RequestParam("id") String id)
+ {
+ return communityService.communityCancellation(id);
+ }
+
+ /**
+ * 用户设置积分支付密码
+ * @param userId
+ * @param pwd
+ * @return
+ */
+ @GetMapping("/setUserPlayPwd")
+ public R setUserPlayPwd(@RequestParam("userId") String userId,@RequestParam("pwd") String pwd)
+ {
+ if (StringUtils.isEmpty(userId))
+ {
+ return R.fail("userId不能为空");
+ }
+
+ if(StringUtils.isEmpty(pwd))
+ {
+ return R.fail("密码不能为空");
+ }
+
+ LoginUserInfoVO loginUserInfoVO=new LoginUserInfoVO();
+ loginUserInfoVO.setUserId(Long.valueOf(userId));
+ loginUserInfoVO.setPlayPwd(pwd);
+ return userService.putUser(loginUserInfoVO);
+ }
+
+
+ /**
+ * 判断密码是否正确
+ * @param userId
+ * @param pwd
+ * @return
+ */
+ @GetMapping("/passwordIsCorrect")
+ public R passwordIsCorrect(@RequestParam("userId") String userId,@RequestParam("pwd") String pwd)
+ {
+ if (StringUtils.isEmpty(userId))
+ {
+ return R.fail("userId不能为空");
+ }
+
+ if(StringUtils.isEmpty(pwd))
+ {
+ return R.fail("密码不能为空");
+ }
+ LoginUserInfoVO loginUserInfoVO=userService.getUserInfoByUserId(userId).getData();
+ if(StringUtils.isEmpty(loginUserInfoVO.getPlayPwd()))
+ {
+ return R.fail(304,"您还未设置密码！");
+ }
+
+
+ if(StringUtils.equals(pwd,loginUserInfoVO.getPlayPwd()))
+ {
+ return R.ok();
+ }
+ return R.fail("密码错误");
+ }
+
+
+
+
+ /****************************************************************************************************************
+ *
+ * 商家评论
+ *
+ ***************************************************************************************************************/
+
+ /**
+ * 商家评论分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/evaluate/getList")
+ public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("communityId") String communityId,
+ @RequestParam("merchantId") String merchantId)
+ {
+ if(StringUtils.isEmpty(communityId))
+ {
+ communityId=getCommunityId()+"";
+ }
+ if(StringUtils.isEmpty(merchantId))
+ {
+ return R.fail("商家id不能为空");
+ }
+ return communityService.volunteerMerchantGetList(pageNum,pageSize,communityId,merchantId);
+ }
+
+ /**
+ * 商家评论获取详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/evaluate/getData")
+ public R volunteerMerchantGetData(@RequestParam("id") String id)
+ {
+ return communityService.volunteerMerchantGetData(id);
+ }
+
+ /**
+ * 商家评论新增评价
+ * @return
+ */
+ @PostMapping("/evaluate/insert")
+ public R volunteerMerchantInsert(@RequestBody VolunteerMerchantEvaluateVO item)
+ {
+ if(item==null)
+ {
+ return R.fail("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(item.getCommunityId()))
+ {
+ item.setCommunityId(getCommunityId()+"");
+ }
+
+ if(StringUtils.isEmpty(item.getMerchantId()))
+ {
+ return R.fail("商家id不能为空");
+ }
+
+ if(StringUtils.isEmpty(item.getOrderId()))
+ {
+ return R.fail("订单id不能为空");
+ }
+
+ if(StringUtils.isEmpty(item.getUserId()))
+ {
+ return R.fail("评论人id不能为空");
+ }
+
+ if(StringUtils.isEmpty(item.getEvaluateGrade()))
+ {
+ return R.fail("评论分数不能为空");
+ }
+
+ return communityService.volunteerMerchantInsert(item);
+ }
+
+ /**
+ * 商家评论更新评价
+ * @return
+ */
+ @PostMapping("/evaluate/update")
+ public R volunteerMerchantUpdate(@RequestBody VolunteerMerchantEvaluateVO item)
+ {
+ return communityService.volunteerMerchantUpdate(item);
+ }
+
+
+ /**
+ * 商家评论删除评价
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/evaluate/delete")
+ public R volunteerMerchantDelete(@RequestParam("id") String id)
+ {
+ return communityService.volunteerMerchantDelete(id);
+ }
+
+
+ /***************************************************************************************************************
+ *
+ * 路北社区商家提现
+ *
+ ****************************************************************************************************************/
+
+ /**
+ * 新增商家提现
+ * @param item
+ * @return
+ */
+ @PostMapping("/withdraw/insert")
+ public R WithdrawInsert(@RequestBody VolunteerMerchantWithdrawVO item)
+ {
+ return communityService.WithdrawInsert(item);
+ }
+
+ /**
+ * 商家提现列表
+ * @param disposeType
+ * @return
+ */
+ @GetMapping("/withdraw/getList")
+ public R WithdrawGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "disposeType", required = false) String disposeType,
+ @RequestParam(value = "merchantName", required = false) String merchantName,
+ @RequestParam(value = "merchantId", required = false) String merchantId,
+ @RequestParam(value = "communityId", required = false) String communityId)
+ {
+ if(StringUtils.isEmpty(communityId))
+ {
+ communityId=getCommunityId()+"";
+ }
+
+ if(StringUtils.isEmpty(merchantId))
+ {
+ return R.fail("商家id不能为空");
+ }
+
+ return communityService.WithdrawGetList(pageNum,pageSize,disposeType, merchantName,merchantId,communityId);
+ }
+
+
+ /***************************************************************************************************************
+ *
+ * 路北社区系统配置 商家折扣 兑换地点信息
+ *
+ ****************************************************************************************************************/
+
+ /**
+ * 详情
+ * @param
+ * @return
+ */
+ @GetMapping("/Community/Config/getData")
+ public R ConfiggetData(@RequestParam("communityId") String communityId)
+ {
+ return communityService.ConfiggetData(communityId);
+ }
+
+
+ /*******************************************************************************************************************
+ *
+ *
+ * 社区折扣
+ *
+ *
+ ******************************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/community/discount/getList")
+ public R CommunityDiscountgetList(@RequestParam("communityId") String communityId)
+ {
+ return communityService.CommunityDiscountgetList(communityId);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/JacksonConfig.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/JacksonConfig.java
new file mode 100644
index 0000000..e37e497
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/JacksonConfig.java
@@ -0,0 +1,31 @@
+package com.panzhihua.applets.config;
+
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+
+@Configuration
+public class JacksonConfig {
+
+ @Bean
+ @Primary
+ @ConditionalOnMissingBean(ObjectMapper.class)
+ public ObjectMapper jacksonObjectMapper(Jackson2ObjectMapperBuilder builder)
+ {
+ ObjectMapper objectMapper = builder.createXmlMapper(false).build();
+
+ // 全局配置序列化返回 JSON 处理
+ SimpleModule simpleModule = new SimpleModule();
+ //JSON Long ==> String
+ simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
+ objectMapper.registerModule(simpleModule);
+ return objectMapper;
+ }
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioConfig.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioConfig.java
new file mode 100644
index 0000000..829f684
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioConfig.java
@@ -0,0 +1,28 @@
+package com.panzhihua.applets.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * program 攀枝花智慧社区项目 description minio存储信息配置
+ *
+ * @author manailin Date 2021-08-19 15:30
+ **/
+@Data
+@ConfigurationProperties(prefix = "minio")
+public class MinioConfig {
+
+ private String host;
+
+ private String accessKey;
+
+ private String secretKey;
+
+ private String url;
+
+ private String bucket;
+
+ private String aliasName;
+
+ private String aliasPCName;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioUtil.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioUtil.java
new file mode 100644
index 0000000..67e65cc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioUtil.java
@@ -0,0 +1,255 @@
+package com.panzhihua.applets.config;
+
+import com.panzhihua.common.utlis.DateUtils;
+import io.minio.MinioClient;
+import io.minio.ObjectStat;
+import org.apache.commons.io.IOUtils;
+import org.bouncycastle.util.encoders.Base64;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URLEncoder;
+import java.util.UUID;
+
+/**
+ * program 攀枝花智慧社区项目 description minio工具类
+ *
+ * @author manailin Date 2021-08-19 15:30
+ **/
+@Component
+@EnableConfigurationProperties(MinioConfig.class)
+public class MinioUtil {
+
+ @Resource
+ private MinioConfig minioProperties;
+
+ public static byte[] toByteArray(InputStream input) throws IOException {
+ ByteArrayOutputStream output = new ByteArrayOutputStream();
+ byte[] buffer = new byte[4096];
+ int n = 0;
+ while (-1 != (n = input.read(buffer))) {
+ output.write(buffer, 0, n);
+ }
+ return output.toByteArray();
+ }
+
+ /**
+ * 文件上传
+ *
+ * @param file 要上传的文件
+ * @return
+ */
+ public String upload(MultipartFile file, String name) {
+ if (null != file) {
+ try {
+ UUID uuid = UUID.randomUUID();
+ StringBuilder s = new StringBuilder();
+ s.append(DateUtils.getCurrentDateyymd()).append("-original").append("/");
+ MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(),
+ minioProperties.getSecretKey());
+ // bucket 不存在，创建
+ if (!minioClient.bucketExists(minioProperties.getBucket())) {
+ minioClient.makeBucket(minioProperties.getBucket());
+ }
+ // 得到文件流
+ InputStream input = file.getInputStream();
+ // 文件名
+ // String fileName = uuid + "/images." + FilenameUtils.getExtension(file.getOriginalFilename());
+ String fileName = s.append(name).toString();
+ String contentType = file.getContentType();
+ minioClient.putObject(minioProperties.getBucket(), fileName, input, contentType);
+ StringBuilder fileUrl = new StringBuilder(minioProperties.getUrl());
+ String url = fileUrl.append(fileName).toString();
+ return url;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 文件上传
+ *
+ * @param input
+ * 要上传的文件
+ * @return
+ */
+ public String uploadInputStream(InputStream input, String name) {
+ if (null != input) {
+ try {
+ UUID uuid = UUID.randomUUID();
+ StringBuilder s = new StringBuilder();
+ s.append(DateUtils.getCurrentDateyymd()).append("/");
+ MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(),
+ minioProperties.getSecretKey());
+ if (!minioClient.bucketExists(minioProperties.getBucket())) {
+ minioClient.makeBucket(minioProperties.getBucket());
+ }
+ String fileName = s.append(name).toString();
+ minioClient.putObject(minioProperties.getBucket(), fileName, input, "application/octet-stream");
+ StringBuilder fileUrl = new StringBuilder(minioProperties.getUrl());
+ String url = fileUrl.append(fileName).toString();
+ return url;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return null;
+ }
+ /**
+ * 文件上传
+ *
+ * @param file 要上传的文件
+ * @return
+ */
+ public String uploadRetFileName(MultipartFile file, String name) {
+ if (null != file) {
+ try {
+ UUID uuid = UUID.randomUUID();
+ StringBuilder s = new StringBuilder();
+ s.append(DateUtils.getCurrentDateyymd()).append("-original").append("/");
+ MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(),
+ minioProperties.getSecretKey());
+ // bucket 不存在，创建
+ if (!minioClient.bucketExists(minioProperties.getBucket())) {
+ minioClient.makeBucket(minioProperties.getBucket());
+ }
+ // 得到文件流
+ InputStream input = file.getInputStream();
+ // 文件名
+ // String fileName = uuid + "/images." + FilenameUtils.getExtension(file.getOriginalFilename());
+ String fileName = s.append(name).toString();
+ String contentType = file.getContentType();
+ minioClient.putObject(minioProperties.getBucket(), fileName, input, "application/octet-stream");
+ StringBuilder fileUrl = new StringBuilder(minioProperties.getUrl());
+ String url = fileUrl.append(fileName).toString();
+ return fileName;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 文件上传
+ *
+ * @param file 要上传的文件
+ * @return
+ */
+ public String uploadFile(File file, String name) {
+ if (null != file) {
+ try {
+ StringBuilder s = new StringBuilder();
+ s.append(DateUtils.getCurrentDateyymd()).append("/");
+ MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(),
+ minioProperties.getSecretKey());
+ // bucket 不存在，创建
+ if (!minioClient.bucketExists(minioProperties.getBucket())) {
+ minioClient.makeBucket(minioProperties.getBucket());
+ }
+ // 得到文件流
+ InputStream input = new FileInputStream(file);
+ // 文件名
+ // String fileName = uuid + "/images." + FilenameUtils.getExtension(file.getOriginalFilename());
+ String fileName = s.append(name).toString();
+ minioClient.putObject(minioProperties.getBucket(), fileName, input, "");
+ StringBuilder fileUrl = new StringBuilder(minioProperties.getUrl());
+ String url = fileUrl.append(fileName).toString();
+ return url;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 文件下载
+ *
+ * @param response
+ * @param url
+ */
+ public void download(HttpServletResponse response, String url) {
+ // 从链接中得到文件名
+ String replace = url.replace(minioProperties.getBucket() + "/", "#");
+ String fileName = replace.split("#")[1];
+ InputStream inputStream;
+ try {
+ MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(),
+ minioProperties.getSecretKey());
+ ObjectStat stat = minioClient.statObject(minioProperties.getBucket(), fileName);
+ inputStream = minioClient.getObject(minioProperties.getBucket(), fileName);
+ response.setContentType(stat.contentType());
+ response.setCharacterEncoding("UTF-8");
+ response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
+ IOUtils.copy(inputStream, response.getOutputStream());
+ inputStream.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ /**
+ * 文件下载
+ *
+ * @param response
+ * @param url
+ */
+ public byte[] getBytes(HttpServletResponse response, String url) {
+ // 从链接中得到文件名
+ String replace = url.replace(minioProperties.getBucket() + "/", "#");
+ String fileName = replace.split("#")[1];
+ InputStream inputStream;
+ byte[] bytes = new byte[0];
+ try {
+ MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(),
+ minioProperties.getSecretKey());
+ inputStream = minioClient.getObject(minioProperties.getBucket(), fileName);
+ bytes = toByteArray(inputStream);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return bytes;
+ }
+
+
+ /**
+ * 删除
+ *
+ * @param fileName
+ * @return
+ * @throws Exception
+ */
+ public String removeMinio(String fileName) {
+ try {
+ //创建MinioClient对象
+ //fileName = "6edbdf8c2a1146ddaf4fbfcb30f804ad/72b2a44c18a54802854931a65b604576.jpg"
+ MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(),
+ minioProperties.getSecretKey());
+ minioClient.removeObject(minioProperties.getBucket(), fileName);
+ return "success";
+ } catch (Exception e) {
+ e.printStackTrace();
+ return e.getMessage();
+ }
+
+ }
+
+ public InputStream base64StrToInputStream(String base64string) {
+ ByteArrayInputStream stream = null;
+ try {
+ byte[] bytes = Base64.decode(base64string);
+ stream = new ByteArrayInputStream(bytes);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return stream;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/SwaggerConfig.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/SwaggerConfig.java
new file mode 100644
index 0000000..c19f4ab
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/SwaggerConfig.java
@@ -0,0 +1,34 @@
+package com.panzhihua.applets.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import io.swagger.annotations.ApiOperation;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: swagger3
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-19 16:08
+ **/
+@Configuration
+public class SwaggerConfig {
+ @Bean
+ public Docket createRestApi() {
+ return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).enable(true).select()
+// .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+ .apis(RequestHandlerSelectors.basePackage("com.panzhihua.applets")).build();
+ }
+
+ private ApiInfo apiInfo() {
+ return new ApiInfoBuilder().title("攀枝花小程序开发文档").description("。").contact(new Contact("huanghongfa", "", ""))
+ .version("1.0").build();
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/UnionDoorUtil.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/UnionDoorUtil.java
new file mode 100644
index 0000000..b7b9ea1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/UnionDoorUtil.java
@@ -0,0 +1,25 @@
+package com.panzhihua.applets.config;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.model.vos.R;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import static com.panzhihua.common.utlis.HttpClientUtil.httpGet;
+
+@Slf4j
+@Service
+public class UnionDoorUtil {
+
+
+ /**
+ * 户外劳工站
+ *
+ * @return token
+ * @throws Exception
+ */
+ public R openDoorByPhone(String qRCode,String phone) throws Exception {
+ String url = "https://userinner.pzhszgh.cn/unionOutdoor/unionUser/openDoorByPhone?qRCode="+qRCode+"&phone="+phone;
+ return JSONObject.parseObject(httpGet(url, null), R.class);
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxH5Properties.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxH5Properties.java
new file mode 100644
index 0000000..cf91adf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxH5Properties.java
@@ -0,0 +1,58 @@
+package com.panzhihua.applets.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 微信配置
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-23 14:52
+ **/
+@Data
+@Component
+@ConfigurationProperties(prefix = "wx.h5")
+public class WxH5Properties {
+
+ /**
+ * 设置微信小程序的appid
+ */
+ private String appid;
+
+ /**
+ * 设置微信小程序的Secret
+ */
+ private String secret;
+
+ /**
+ * 设置微信小程序消息服务器配置的token
+ */
+ private String token;
+
+ /**
+ * 设置微信小程序消息服务器配置的EncodingAESKey
+ */
+ private String aesKey;
+
+ /**
+ * 消息格式，XML或者JSON
+ */
+ private String msgDataFormat;
+
+ /**
+ * 商户号
+ */
+ private String mchId;
+
+ /**
+ * 微信支付密钥
+ */
+ private String payKey;
+
+ /**
+ * 微信支付回调地址
+ */
+ private String notifyUrl;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaConfiguration.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaConfiguration.java
new file mode 100644
index 0000000..8fb4ec9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaConfiguration.java
@@ -0,0 +1,90 @@
+package com.panzhihua.applets.config;
+
+import javax.annotation.Resource;
+
+import cn.binarywang.wx.miniapp.config.WxMaConfig;
+import cn.binarywang.wx.miniapp.config.impl.WxMaRedisBetterConfigImpl;
+import cn.binarywang.wx.miniapp.config.impl.WxMaRedisConfigImpl;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.user.SysAppConfigVO;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.StringUtils;
+import me.chanjar.weixin.common.redis.RedisTemplateWxRedisOps;
+import me.chanjar.weixin.common.redis.WxRedisOps;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: wexin
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-23 15:07
+ **/
+@Slf4j
+@Component
+public class WxMaConfiguration {
+
+ @Resource
+ private WxMaProperties properties;
+
+ @Resource
+ private WxH5Properties wxH5Properties;
+
+ @Resource
+ private WxMaRHProperties wxMaRHProperties;
+
+ @Resource
+ private StringRedisTemplate stringRedisTemplate;
+
+ @Resource
+ private UserService userService;
+
+ public WxMaService getMaService(String appid) {
+ WxRedisOps redisOps = new RedisTemplateWxRedisOps(stringRedisTemplate);
+ WxMaRedisBetterConfigImpl config = new WxMaRedisBetterConfigImpl(redisOps, "access_token");
+ if(StringUtils.isNotEmpty(appid)){
+ R<SysAppConfigVO> r=userService.selectByAppid(appid);
+ if(R.isOk(r)){
+ SysAppConfigVO sysAppConfigVO= r.getData();
+ config.setAppid(sysAppConfigVO.getAppId());
+ config.setSecret(sysAppConfigVO.getSecret());
+ config.setMsgDataFormat(properties.getMsgDataFormat());
+ }
+ }
+ else{
+ config.setAppid(properties.getAppid());
+ config.setSecret(properties.getSecret());
+ config.setMsgDataFormat(properties.getMsgDataFormat());
+ }
+ WxMaService wxMaService = new WxMaServiceImpl();
+ wxMaService.setWxMaConfig(config);
+ return wxMaService;
+ }
+
+ public WxMaService getMaH5Service() {
+ WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+ config.setAppid(wxH5Properties.getAppid());
+ config.setSecret(wxH5Properties.getSecret());
+ config.setMsgDataFormat(wxH5Properties.getMsgDataFormat());
+ WxMaService wxMaService = new WxMaServiceImpl();
+ wxMaService.setWxMaConfig(config);
+ return wxMaService;
+ }
+
+ public WxMaService getMaRhService() {
+ WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+ config.setAppid(wxMaRHProperties.getAppid());
+ config.setSecret(wxMaRHProperties.getSecret());
+ config.setMsgDataFormat(wxMaRHProperties.getMsgDataFormat());
+ WxMaService wxMaService = new WxMaServiceImpl();
+ wxMaService.setWxMaConfig(config);
+ return wxMaService;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaProperties.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaProperties.java
new file mode 100644
index 0000000..d7cdfe3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaProperties.java
@@ -0,0 +1,58 @@
+package com.panzhihua.applets.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 微信配置
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-23 14:52
+ **/
+@Data
+@Component
+@ConfigurationProperties(prefix = "wx.miniapp")
+public class WxMaProperties {
+
+ /**
+ * 设置微信小程序的appid
+ */
+ private String appid;
+
+ /**
+ * 设置微信小程序的Secret
+ */
+ private String secret;
+
+ /**
+ * 设置微信小程序消息服务器配置的token
+ */
+ private String token;
+
+ /**
+ * 设置微信小程序消息服务器配置的EncodingAESKey
+ */
+ private String aesKey;
+
+ /**
+ * 消息格式，XML或者JSON
+ */
+ private String msgDataFormat;
+
+ /**
+ * 商户号
+ */
+ private String mchId;
+
+ /**
+ * 微信支付密钥
+ */
+ private String payKey;
+
+ /**
+ * 微信支付回调地址
+ */
+ private String notifyUrl;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaRHProperties.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaRHProperties.java
new file mode 100644
index 0000000..1a26b43
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/WxMaRHProperties.java
@@ -0,0 +1,57 @@
+package com.panzhihua.applets.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 微信配置
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-23 14:52
+ **/
+@Data
+@Component
+@ConfigurationProperties(prefix = "wx.rh")
+public class WxMaRHProperties {
+
+ /**
+ * 设置微信小程序的appid
+ */
+ private String appid;
+
+ /**
+ * 设置微信小程序的Secret
+ */
+ private String secret;
+
+ /**
+ * 设置微信小程序消息服务器配置的token
+ */
+ private String token;
+
+ /**
+ * 设置微信小程序消息服务器配置的EncodingAESKey
+ */
+ private String aesKey;
+
+ /**
+ * 消息格式，XML或者JSON
+ */
+ private String msgDataFormat;
+
+ /**
+ * 商户号
+ */
+ private String mchId;
+
+ /**
+ * 微信支付密钥
+ */
+ private String payKey;
+
+ /**
+ * 微信支付回调地址
+ */
+ private String notifyUrl;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/dtos/ComPbMemberCertificationDTO.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/dtos/ComPbMemberCertificationDTO.java
new file mode 100644
index 0000000..ff7ca62
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/dtos/ComPbMemberCertificationDTO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.applets.model.dtos;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 党员认证
+ */
+@Data
+@ApiModel("我的》党员认证")
+public class ComPbMemberCertificationDTO {
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "入党时间")
+ private Date joinTime;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty(value = "转正时间")
+ private Date employmentTime;
+ @ApiModelProperty(value = "所属党组织id")
+ private Long orgId;
+ @ApiModelProperty(value = "头像图片路径")
+ private String photoPath;
+
+ @ApiModelProperty(value = "党员类型（1.预备党员 2.正式党员）")
+ private Integer type;
+ @ApiModelProperty(value = "报道单位id")
+ private Long checkUnitId;
+ @ApiModelProperty(value = "职位")
+ private String position;
+ @ApiModelProperty(value = "职能")
+ private String function;
+ @ApiModelProperty(value = "特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）")
+ private Integer specialtyCategory;
+ @ApiModelProperty(value = "特长描述")
+ private String specialtyName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/dtos/IDTO.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/dtos/IDTO.java
new file mode 100644
index 0000000..108a52b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/dtos/IDTO.java
@@ -0,0 +1,8 @@
+package com.panzhihua.applets.model.dtos;
+
+import lombok.Data;
+
+@Data
+public class IDTO {
+ private Long id;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/vos/LoginRequest.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/vos/LoginRequest.java
new file mode 100644
index 0000000..56067bd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/model/vos/LoginRequest.java
@@ -0,0 +1,38 @@
+package com.panzhihua.applets.model.vos;
+
+import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 微信登录
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-23 14:12
+ **/
+@Data
+@ApiModel(value = "小程序登录")
+public class LoginRequest {
+
+ @ApiModelProperty(name = "code", value = "登录时获取的 code")
+ String code;
+
+ @ApiModelProperty(name = "signature", value = "使用 sha1( rawData + sessionkey ) 得到字符串，用于校验用户信息")
+ String signature;
+
+ @ApiModelProperty(name = "rawData", value = "不包括敏感信息的原始数据字符串，用于计算签名")
+ String rawData;
+
+ @ApiModelProperty(name = "encryptedData", value = "包括敏感数据在内的完整用户信息的加密数据")
+ String encryptedData;
+
+ @ApiModelProperty(name = "iv", value = "加密算法的初始向量")
+ String iv;
+
+ @ApiModelProperty(name = "userInfo", value = "用户基本信息")
+ WxMaUserInfo userInfo;
+
+ @ApiModelProperty("appid")
+ String appid;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/MyAESUtil.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/MyAESUtil.java
new file mode 100644
index 0000000..271c229
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/MyAESUtil.java
@@ -0,0 +1,61 @@
+package com.panzhihua.applets.umf;
+
+import sun.misc.BASE64Decoder;
+import sun.misc.BASE64Encoder;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.SecretKeySpec;
+
+public class MyAESUtil {
+
+ // 加密
+ public static String Encrypt(String sSrc, String sKey) throws Exception {
+ if (sKey == null) {
+ System.out.print("Key为空null");
+ return null;
+ }
+ // 判断Key是否为16位
+ if (sKey.length() != 16) {
+ System.out.print("Key长度不是16位");
+ return null;
+ }
+ byte[] raw = sKey.getBytes("utf-8");
+ SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
+ Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");//"算法/模式/补码方式"
+ cipher.init(Cipher.ENCRYPT_MODE, skeySpec);
+ byte[] encrypted = cipher.doFinal(sSrc.getBytes("utf-8"));
+ return new BASE64Encoder().encode(encrypted);//此处使用BASE64做转码功能，同时能起到2次加密的作用。
+ }
+
+ // 解密
+ public static String Decrypt(String sSrc, String sKey) throws Exception {
+ try {
+
+ byte[] raw = sKey.getBytes("utf-8");
+ SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
+ Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+ cipher.init(Cipher.DECRYPT_MODE, skeySpec);
+ byte[] encrypted1 = new BASE64Decoder().decodeBuffer(sSrc);//先用base64解密
+ try {
+ byte[] original = cipher.doFinal(encrypted1);
+ String originalString = new String(original,"utf-8");
+ return originalString;
+ } catch (Exception e) {
+ System.out.println(e.toString());
+ return null;
+ }
+ } catch (Exception ex) {
+ System.out.println(ex.toString());
+ return null;
+ }
+ }
+
+ public static void main(String[] args) throws Exception{
+ String ryo7M3n8loC5Abcd = MyAESUtil.Encrypt("{\"order_status\":\"6\",\"wash_name\":null,\"wash_mobile\":null,\"phone\":\"13699017236\"}", "Ryo7M3n8loC5Abcd");
+// String ryo7M3n8loC5Abcd = MyAESUtil.Decrypt("Ixp8WMuJ9bnKhiBKmKWq\\/rQXQ7SaWc3fHLB1e\\/PzAvIEN0CH1nXtMCBzMegT49on31S+3Itop388Yc0EGVx30GGVlG81p7ssiqHlLRna2i903Rid9hqbjZdrBomiy2jp", "Ryo7M3n8loC5Abcd");
+// String ryo7M3n8loC5Abcd = MyAESUtil.Decrypt("0H4upa36EW9AFSNcoF9rVX6D5enB9T/9P1hWxLf/NgiGCueg159vz7Ex6+tPAR83aQLPyGeuF74Y5C9VpzQjL7brj8aWdMmnWJp/W1i5lpM=", "Ryo7M3n8loC5Abcd");
+// 订单完成13980596944 {"aesString":"0H4upa36EW9AFSNcoF9rVX6D5enB9T\/9P1hWxLf\/NgiGCueg159vz7Ex6+tPAR83aQLPyGeuF74Y5C9VpzQjL2IYlgC9A6hhT82p\/kQTjTk="}
+// 取消订单13980596944 {"aesString":"0H4upa36EW9AFSNcoF9rVfYjNQ0z81u6AWDcCU9O9DqGCueg159vz7Ex6+tPAR83aQLPyGeuF74Y5C9VpzQjL2IYlgC9A6hhT82p\/kQTjTk="}
+ System.out.println(ryo7M3n8loC5Abcd);
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/UmfPayUtil.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/UmfPayUtil.java
new file mode 100644
index 0000000..b5a0092
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/UmfPayUtil.java
@@ -0,0 +1,98 @@
+package com.panzhihua.applets.umf;
+
+import com.umf.api.service.UmfService;
+import com.umf.api.service.UmfServiceImpl;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.umf.api.service.UmfServiceImpl.printResult;
+
+/**
+ * @author zzj
+ */
+@Component
+public class UmfPayUtil {
+ @Value("${umf.file}")
+ private String file;
+ @Value("${umf.notify_url}")
+ private String notifyUrl;
+ public Map pay(String orderid,String merdate,String openid,String amount){
+ Map reqMapPublic = preparePublic(orderid,merdate,openid,amount,notifyUrl);
+ UmfService instance = new UmfServiceImpl("53461",file);
+ Map respMap = instance.miniProgramPayMap(reqMapPublic);
+ return respMap;
+ }
+ public Map pay2(String orderid,String merdate,String openid,String amount){
+ Map reqMapPublic = preparePublic2(orderid,merdate,openid,amount,notifyUrl);
+ UmfService instance = new UmfServiceImpl("53461",file);
+ Map respMap = instance.miniProgramPayMap(reqMapPublic);
+ return respMap;
+ }
+ public Map repay(String orderid,String merdate,String refundNo,String refundAmount,String orgAmount){
+ Map reqMapPublic=prepareRepay(orderid,merdate,refundNo,refundAmount,orgAmount);
+ UmfService instance = new UmfServiceImpl("53461",file);
+ Map respMap=instance.generalRefundMap(reqMapPublic);
+ return respMap;
+ }
+
+ public boolean settle(String settleDate){
+ Map reqMapPublic=prepareDownloadSettle(settleDate);
+ UmfService instance = new UmfServiceImpl("53461",file);
+ boolean bo=instance.reconciliationDownloadMap(reqMapPublic);
+ return bo;
+ }
+
+
+
+
+ //小程序支付请求参数
+ public static Map preparePublic(String orderid,String merdate,String openid,String amount,String notifyUrl) {
+ Map reqMap = new HashMap();
+ reqMap.put("mer_id","53461");
+ reqMap.put("notify_url",notifyUrl);
+ reqMap.put("goods_inf","uu洗车服务");
+ reqMap.put("order_id",orderid);
+ reqMap.put("mer_date",merdate);
+ reqMap.put("amount",amount);
+ reqMap.put("app_id","wx118de8a734d269f0");
+ reqMap.put("open_id",openid);
+ reqMap.put("scancode_type","WECHAT");
+ return reqMap;
+ }
+ //小程序支付请求参数
+ public static Map preparePublic2(String orderid,String merdate,String openid,String amount,String notifyUrl) {
+ Map reqMap = new HashMap();
+ reqMap.put("mer_id","53461");
+ reqMap.put("notify_url",notifyUrl);
+ reqMap.put("goods_inf","无水洗车服务");
+ reqMap.put("order_id",orderid);
+ reqMap.put("mer_date",merdate);
+ reqMap.put("amount",amount);
+ reqMap.put("app_id","wx98d62711dfbd8425");
+ reqMap.put("open_id",openid);
+ reqMap.put("scancode_type","WECHAT");
+ return reqMap;
+ }
+ //小程序支付请求参数
+ public static Map prepareRepay(String orderid,String merdate,String refundNo,String refundAmount,String orgAmount) {
+ Map reqMap = new HashMap();
+ reqMap.put("mer_id","53461");
+ reqMap.put("order_id",orderid);
+ reqMap.put("mer_date",merdate);
+ reqMap.put("refund_no",refundNo);
+ reqMap.put("refund_amount",refundAmount);
+ reqMap.put("org_amount",orgAmount);
+ return reqMap;
+ }
+
+ public static Map prepareDownloadSettle(String settleDate){
+ Map reqMap = new HashMap();
+ reqMap.put("mer_id","53461");
+ reqMap.put("settle_date",settleDate);//对账日期
+ reqMap.put("settle_path","D:/");//Windows下为---D:/tecent，Linux下为---/opt/tecent
+ return reqMap;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/Close.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/Close.java
new file mode 100644
index 0000000..eaf56ab
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/Close.java
@@ -0,0 +1,147 @@
+package com.panzhihua.applets.unionpay;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.digest.DigestUtils;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+
+/**
+ * @author kkqiao
+ * 全民付移动支付小程序支付订单关闭接口
+ * 说明：
+ * 用户创建订单之后，对未支付的订单进行关闭操作
+ * 测试环境：http://58.247.0.18:29015/v1/netpay/close
+ * 生产环境：https://api-mop.chinaums.com/v1/netpay/close
+ */
+public class Close {
+
+// static String url = "https://test-api-open.chinaums.com/v1/netpay/query";
+ static String url = "https://api-mop.chinaums.com/v1/netpay/close";
+
+ public static void main(String[] args) throws Exception{
+ //1. 组建请求报文
+ CloseBody reqBody = new CloseBody();
+ reqBody.requestTimestamp = "2019-08-09 17:12:55";
+ reqBody.mid = "898460107420248";
+ reqBody.tid = "00000001";
+ reqBody.instMid = "MINIDEFAULT";
+ reqBody.merOrderId = "101771307dc89764b477474";
+ System.out.println("request body:\n"+reqBody);
+
+ //2. 获取认证报文，timestamp为当前日期，老旧日期无法请求成功
+ String authorization = getAuthorization(UnionpayContent.APPID,UnionpayContent.APPKEY,
+ "20190809171200","nonce",reqBody.toString());
+ System.out.println("authorization:\n"+authorization);
+
+ //3. 发送http请求，并解析返回信息
+ String response = request(url,authorization,reqBody.toString());
+ System.out.println("response:\n"+response);
+ }
+
+ /**
+ * 发送http请求
+ * @param url 请求url
+ * @param authorization 认证报文
+ * @param reqBody 请求体
+ * @return response
+ */
+ static String request(String url, String authorization, String reqBody){
+ String response = "";
+ PrintWriter out = null;
+ BufferedReader in = null;
+ try{
+ URL realUrl = new URL(url);
+ URLConnection conn = realUrl.openConnection();
+ HttpURLConnection httpUrlConnection = (HttpURLConnection) conn;
+ httpUrlConnection.setRequestProperty("Content-Type", "application/json");
+ httpUrlConnection.setRequestProperty("authorization",authorization);
+ httpUrlConnection.setDoOutput(true);
+ httpUrlConnection.setDoInput(true);
+ out = new PrintWriter(httpUrlConnection.getOutputStream());
+ out.write(reqBody);
+ out.flush();
+ httpUrlConnection.connect();
+ in = new BufferedReader(new InputStreamReader(httpUrlConnection.getInputStream()));
+ String line;
+ while ((line = in.readLine()) != null) {
+ response += line;
+ }
+ }catch(Exception e){
+ e.printStackTrace();
+ } finally {
+ try {
+ if (out != null) { out.close();}
+ if (in != null) {in.close();}
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ return response;
+ }
+
+ /**
+ * 获取签名头
+ * @param appid
+ * @param appkey
+ * @param timestamp 格式:"yyyyMMddHHmmss"
+ * @param nonce 随机字符串，
+ * @param body 请求体
+ * @return authorization 认证报文
+ * @throws Exception
+ */
+ static String getAuthorization(String appid, String appkey, String timestamp, String nonce, String body) throws Exception {
+ byte[] data = body.getBytes("utf-8");
+ InputStream is = new ByteArrayInputStream(data);
+ String testSH = DigestUtils.sha256Hex(is);
+ String s1 = appid+timestamp+nonce+testSH;
+ Mac mac = Mac.getInstance("HmacSHA256");
+ mac.init(new SecretKeySpec(appkey.getBytes("utf-8"),"HmacSHA256"));
+ byte[] localSignature = mac.doFinal(s1.getBytes("utf-8"));
+ String localSignatureStr = Base64.encodeBase64String(localSignature);
+ return "OPEN-BODY-SIG AppId="+"\""+appid+"\""+", Timestamp="+"\""+timestamp+"\""+", Nonce="+"\""+nonce+"\""+", Signature="+"\""+localSignatureStr+"\"";
+ }
+
+ static class CloseBody{
+ //消息ID
+ String msgId;
+ //报文请求时间，格式yyyy-MM-ddHH:mm:ss
+ String requestTimestamp;
+ //请求系统预留字段
+ String srcReserve;
+ //商户号
+ String mid;
+ //终端号
+ String tid;
+ //业务类型
+ String instMid;
+ //商户订单号
+ String merOrderId;
+
+ String toJson(){
+ StringBuilder sb = new StringBuilder();
+ sb.append("{");
+ if (this.msgId != null) sb.append("\"msgId\":\"" + this.msgId + "\",");
+ if (this.requestTimestamp != null) sb.append("\"requestTimestamp\":\"" + this.requestTimestamp + "\",");
+ if (this.srcReserve != null) sb.append("\"srcReserve\":\"" + this.srcReserve + "\",");
+ if (this.mid != null) sb.append("\"mid\":\"" + this.mid + "\",");
+ if (this.tid != null) sb.append("\"tid\":\"" + this.tid + "\",");
+ if (this.instMid != null) sb.append("\"instMid\":\"" + this.instMid + "\",");
+ if (this.merOrderId != null) sb.append("\"merOrderId\":\"" + this.merOrderId + "\",");
+ if (sb.charAt(sb.length() - 1) == ',')
+ sb.deleteCharAt(sb.length() - 1);
+ sb.append("}");
+ return sb.toString();
+ }
+
+ public String toString(){
+ return this.toJson();
+ }
+
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/Query.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/Query.java
new file mode 100644
index 0000000..6c50da1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/Query.java
@@ -0,0 +1,162 @@
+package com.panzhihua.applets.unionpay;
+
+import com.panzhihua.common.utlis.DateUtils;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.digest.DigestUtils;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+import java.time.LocalDateTime;
+
+/**
+ * @author kkqiao0
+ * 全民付移动支付小程序支付订单交易查询接口
+ * 说明：
+ * 钱包支付时，因通讯故障、服务器故障等原因，造成收银机最终没有收到支付结果通知，收银员不确定
+ * 该笔支付后台处理结果，可以在收银机上发起“查询”交易，查询该笔交易订单在钱包后台的支付结果，
+ * 并将支付结果返回给收银机。
+ * 测试环境：http://58.247.0.18:29015/v1/netpay/query
+ * 生产环境：https://api-mop.chinaums.com/v1/netpay/query
+ */
+public class Query {
+ static String url = "https://api-mop.chinaums.com/v1/netpay/query";
+
+ /**
+ * 查询接口
+ * @return
+ */
+ public static String query(String merOrderId)
+ {
+ //1. 组建请求报文
+ LocalDateTime time= DateUtils.getCurrentDate();
+ QueryBody reqBody = new QueryBody();
+ reqBody.requestTimestamp = time.format(DateUtils.format_ymdhms);//"2019-08-09 17:32:55";
+ reqBody.mid = UnionpayContent.MID;
+ reqBody.tid = UnionpayContent.TID;
+ reqBody.instMid = UnionpayContent.INSTMID;
+ reqBody.merOrderId = merOrderId;
+ System.out.println("request body:\n"+reqBody);
+
+ //2. 获取认证报文，timestamp为当前日期，老旧日期无法请求成功
+ String authorization = null;
+ try {
+ authorization = getAuthorization(UnionpayContent.APPID,UnionpayContent.APPKEY,
+ time.format(DateUtils.format_ymdhms_string),"nonce",reqBody.toString());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return "订单交易查询失败";
+ }
+ System.out.println("authorization:\n"+authorization);
+
+ //3. 发送http请求，并解析返回信息
+ String response = request(url,authorization,reqBody.toString());
+ System.out.println("response:\n"+response);
+ return response;
+ }
+
+ /**
+ * 发送http请求
+ * @param url 请求url
+ * @param authorization 认证报文
+ * @param reqBody 请求体
+ * @return response
+ */
+ static String request(String url, String authorization, String reqBody){
+ String response = "";
+ PrintWriter out = null;
+ BufferedReader in = null;
+ try{
+ URL realUrl = new URL(url);
+ URLConnection conn = realUrl.openConnection();
+ HttpURLConnection httpUrlConnection = (HttpURLConnection) conn;
+ httpUrlConnection.setRequestProperty("Content-Type", "application/json");
+ httpUrlConnection.setRequestProperty("authorization",authorization);
+ httpUrlConnection.setDoOutput(true);
+ httpUrlConnection.setDoInput(true);
+ out = new PrintWriter(httpUrlConnection.getOutputStream());
+ out.write(reqBody);
+ out.flush();
+ httpUrlConnection.connect();
+ in = new BufferedReader(new InputStreamReader(httpUrlConnection.getInputStream()));
+ String line;
+ while ((line = in.readLine()) != null) {
+ response += line;
+ }
+ }catch(Exception e){
+ e.printStackTrace();
+ } finally {
+ try {
+ if (out != null) { out.close();}
+ if (in != null) {in.close();}
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ return response;
+ }
+
+ /**
+ * 获取签名头
+ * @param appid
+ * @param appkey
+ * @param timestamp 格式:"yyyyMMddHHmmss"
+ * @param nonce 随机字符串，
+ * @param body 请求体
+ * @return authorization 认证报文
+ * @throws Exception
+ */
+ static String getAuthorization(String appid, String appkey, String timestamp, String nonce, String body) throws Exception {
+ byte[] data = body.getBytes("utf-8");
+ InputStream is = new ByteArrayInputStream(data);
+ String testSH = DigestUtils.sha256Hex(is);
+ String s1 = appid+timestamp+nonce+testSH;
+ Mac mac = Mac.getInstance("HmacSHA256");
+ mac.init(new SecretKeySpec(appkey.getBytes("utf-8"),"HmacSHA256"));
+ byte[] localSignature = mac.doFinal(s1.getBytes("utf-8"));
+ String localSignatureStr = Base64.encodeBase64String(localSignature);
+ return "OPEN-BODY-SIG AppId="+"\""+appid+"\""+", Timestamp="+"\""+timestamp+"\""+", Nonce="+"\""+nonce+"\""+", Signature="+"\""+localSignatureStr+"\"";
+ }
+
+ static class QueryBody{
+ //消息ID
+ String msgId;
+ //报文请求时间，格式yyyy-MM-ddHH:mm:ss
+ String requestTimestamp;
+ //请求系统预留字段
+ String srcReserve;
+ //商户号
+ String mid;
+ //终端号
+ String tid;
+ //业务类型
+ String instMid;
+ //商户订单号
+ String merOrderId;
+
+ String toJson(){
+ StringBuilder sb = new StringBuilder();
+ sb.append("{");
+ if (this.msgId != null) sb.append("\"msgId\":\"" + this.msgId + "\",");
+ if (this.requestTimestamp != null) sb.append("\"requestTimestamp\":\"" + this.requestTimestamp + "\",");
+ if (this.srcReserve != null) sb.append("\"srcReserve\":\"" + this.srcReserve + "\",");
+ if (this.mid != null) sb.append("\"mid\":\"" + this.mid + "\",");
+ if (this.tid != null) sb.append("\"tid\":\"" + this.tid + "\",");
+ if (this.instMid != null) sb.append("\"instMid\":\"" + this.instMid + "\",");
+ if (this.merOrderId != null) sb.append("\"merOrderId\":\"" + this.merOrderId + "\",");
+ if (sb.charAt(sb.length() - 1) == ',')
+ sb.deleteCharAt(sb.length() - 1);
+ sb.append("}");
+ return sb.toString();
+ }
+
+ public String toString(){
+ return this.toJson();
+ }
+
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/QueryEntiy.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/QueryEntiy.java
new file mode 100644
index 0000000..054455f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/QueryEntiy.java
@@ -0,0 +1,80 @@
+package com.panzhihua.applets.unionpay;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class QueryEntiy implements Serializable
+{
+ private String payTime;//\":\"2023-03-20 10:36:03\"," +
+ private String buyerCashPayAmt;//\":1," +
+ private String connectSys;//\":\"UNIONPAY\"," +
+ private String errMsg;//\":\"查询成功\"," +
+ private String merName;//\":\"攀枝花智慧城市产业投资发展有限责任公司\"," +
+ private String mid;//\":\"898510475429005\"," +
+ private String invoiceAmount;//\":1," +
+ private String settleDate;//\":\"2023-03-20\"," +
+ private String billFunds;//\":\"现金:1\"," +
+ private String buyerId;//\":\"otdJ_uJt6Zwt8aM_OSi_diSKl6Mo\"," +
+ private String tid;//\":\"50525310\"," +
+ private String receiptAmount;//\":1," +
+ private String couponAmount;//\":0," +
+ private String targetMid;//\":\"551736231\"," +
+ private String cardAttr;//\":\"BALANCE\"," +
+ private String targetOrderId;//\":\"4200001757202303209762431062\"," +
+ private String billFundsDesc;//\":\"现金支付0.01元。\"," +
+ private String subBuyerId;//\":\"oaRh15RWphPEvJoN6Vi1ancdmhLY\"," +
+ private String targetStatus;//\":\"SUCCESS\"," +
+ private String seqId;//\":\"32912479295N\"," +
+ private String merOrderId;//\":\"33ZV20230320321044506d97ce39\"," +
+ private String refundAmount;//\":0," +
+ private String targetSys;//\":\"WXPay\"," +
+ private String bankInfo;//\":\"OTHERS\"," +
+ private String delegatedFlag;//\":\"N\"," +
+ private String settleRefId;//\":\"32912479295N\"," +
+ private String totalAmount;//\":1," +
+ private String chnlCost;//\":\"758\"," +
+ private String responseTimestamp;//\":\"2023-03-20 11:06:42\"," +
+ private String errCode;//\":\"SUCCESS\"," +
+ private String buyerPayAmount;//\":1," +
+ private String status;//\":\"TRADE_SUCCESS\"}"
+
+ @Override
+ public String toString() {
+ return "QueryEntiy{" +
+ "payTime='" + payTime + '\'' +
+ ", buyerCashPayAmt='" + buyerCashPayAmt + '\'' +
+ ", connectSys='" + connectSys + '\'' +
+ ", errMsg='" + errMsg + '\'' +
+ ", merName='" + merName + '\'' +
+ ", mid='" + mid + '\'' +
+ ", invoiceAmount='" + invoiceAmount + '\'' +
+ ", settleDate='" + settleDate + '\'' +
+ ", billFunds='" + billFunds + '\'' +
+ ", buyerId='" + buyerId + '\'' +
+ ", tid='" + tid + '\'' +
+ ", receiptAmount='" + receiptAmount + '\'' +
+ ", couponAmount='" + couponAmount + '\'' +
+ ", targetMid='" + targetMid + '\'' +
+ ", cardAttr='" + cardAttr + '\'' +
+ ", targetOrderId='" + targetOrderId + '\'' +
+ ", billFundsDesc='" + billFundsDesc + '\'' +
+ ", subBuyerId='" + subBuyerId + '\'' +
+ ", targetStatus='" + targetStatus + '\'' +
+ ", seqId='" + seqId + '\'' +
+ ", merOrderId='" + merOrderId + '\'' +
+ ", refundAmount='" + refundAmount + '\'' +
+ ", targetSys='" + targetSys + '\'' +
+ ", bankInfo='" + bankInfo + '\'' +
+ ", delegatedFlag='" + delegatedFlag + '\'' +
+ ", settleRefId='" + settleRefId + '\'' +
+ ", totalAmount='" + totalAmount + '\'' +
+ ", chnlCost='" + chnlCost + '\'' +
+ ", responseTimestamp='" + responseTimestamp + '\'' +
+ ", errCode='" + errCode + '\'' +
+ ", buyerPayAmount='" + buyerPayAmount + '\'' +
+ ", status='" + status + '\'' +
+ '}';
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/Refund.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/Refund.java
new file mode 100644
index 0000000..32533cc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/Refund.java
@@ -0,0 +1,217 @@
+package com.panzhihua.applets.unionpay;
+
+import com.panzhihua.common.utlis.DateUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.digest.DigestUtils;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static com.panzhihua.common.utlis.PayUtil.makeUUID;
+
+/**
+ * @author kkqiao
+ * 全民付移动支付小程序支付退款接口
+ * 说明：
+ * 当成功交易之后一段时间内，由于买家或商户的原因需要退款时，商户可以通过本接口将支付款退还给
+ * 买家，退款请求验证成功之后，银商将通知支付渠道方按照退款规则把支付款按原路退回到买家帐号
+ * 上。
+ * 退款订单号refundOrderId也需遵循商户订单号生成规范，即以银商分配的4位来源编号作为账单号的前
+ * 4位，且在商户系统中此账单号保证唯一。总长度需大于6位，小于28位。银商的推荐规则为（无特殊情
+ * 况下，建议遵守此规则）：
+ * {来源编号(4位)}{时间(yyyyMMddmmHHssSSS)(17位)}{7位随机数}
+ * 测试环境：http://58.247.0.18:29015/v1/netpay/refund
+ * 生产环境：https://api-mop.chinaums.com/v1/netpay/refund
+ */
+@Slf4j
+public class Refund {
+
+ static String url = "https://api-mop.chinaums.com/v1/netpay/refund";
+
+ public static String sendOrder(String refundAmount,String refundOrderId)
+ {
+ //1. 组建请求报文
+ LocalDateTime time= DateUtils.getCurrentDate();
+ RefundBody reqBody = new RefundBody();
+ reqBody.requestTimestamp = time.format(DateUtils.format_ymdhms);// "2019-08-09 17:30:55";
+ reqBody.merOrderId =refundOrderId;
+ reqBody.mid =UnionpayContent.MID;
+ reqBody.tid = UnionpayContent.TID;
+ reqBody.instMid = UnionpayContent.INSTMID;
+ reqBody.refundAmount = refundAmount;
+
+ log.error("银联退款参数 ：" + reqBody);
+ //2. 获取认证报文，timestamp为当前日期，老旧日期无法请求成功
+ String authorization = null;
+ try {
+ authorization = getAuthorization(UnionpayContent.APPID,UnionpayContent.APPKEY,
+ time.format(DateUtils.format_ymdhms_string),"nonce",reqBody.toString());
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("退款失败");
+ return "退款失败";
+ }
+ log.error("银联退款参数authorization ：" + authorization);
+ //3. 发送http请求，并解析返回信息
+ String response = request(url,authorization,reqBody.toString());
+ log.error("银联退款参数response ：" + response);
+ return response;
+ }
+
+ /**
+ * 发送http请求
+ * @param url 请求url
+ * @param authorization 认证报文
+ * @param reqBody 请求体
+ * @return response
+ */
+ static String request(String url, String authorization, String reqBody){
+ String response = "";
+ PrintWriter out = null;
+ BufferedReader in = null;
+ try{
+ URL realUrl = new URL(url);
+ URLConnection conn = realUrl.openConnection();
+ HttpURLConnection httpUrlConnection = (HttpURLConnection) conn;
+ httpUrlConnection.setRequestProperty("Content-Type", "application/json");
+ httpUrlConnection.setRequestProperty("authorization",authorization);
+ httpUrlConnection.setDoOutput(true);
+ httpUrlConnection.setDoInput(true);
+ out = new PrintWriter(httpUrlConnection.getOutputStream());
+ out.write(reqBody);
+ out.flush();
+ httpUrlConnection.connect();
+ in = new BufferedReader(new InputStreamReader(httpUrlConnection.getInputStream()));
+ String line;
+ while ((line = in.readLine()) != null) {
+ response += line;
+ }
+ }catch(Exception e){
+ e.printStackTrace();
+ } finally {
+ try {
+ if (out != null) { out.close();}
+ if (in != null) {in.close();}
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ return response;
+ }
+
+ /**
+ * 获取签名头
+ * @param appid
+ * @param appkey
+ * @param timestamp 格式:"yyyyMMddHHmmss"
+ * @param nonce 随机字符串，
+ * @param body 请求体
+ * @return authorization 认证报文
+ * @throws Exception
+ */
+ static String getAuthorization(String appid, String appkey, String timestamp, String nonce, String body) throws Exception {
+ byte[] data = body.getBytes("utf-8");
+ InputStream is = new ByteArrayInputStream(data);
+ String testSH = DigestUtils.sha256Hex(is);
+ String s1 = appid+timestamp+nonce+testSH;
+ Mac mac = Mac.getInstance("HmacSHA256");
+ mac.init(new SecretKeySpec(appkey.getBytes("utf-8"),"HmacSHA256"));
+ byte[] localSignature = mac.doFinal(s1.getBytes("utf-8"));
+ String localSignatureStr = Base64.encodeBase64String(localSignature);
+ return "OPEN-BODY-SIG AppId="+"\""+appid+"\""+", Timestamp="+"\""+timestamp+"\""+", Nonce="+"\""+nonce+"\""+", Signature="+"\""+localSignatureStr+"\"";
+ }
+
+ static class RefundBody{
+ //消息ID
+ String msgId;
+ //报文请求时间，格式yyyy-MM-ddHH:mm:ss
+ String requestTimestamp;
+ //报文系统预留字段
+ String srcReserve;
+ //商户订单号
+ String merOrderId;
+ //商户号
+ String mid;
+ //终端号
+ String tid;
+ //业务类型
+ String instMid;
+ //要退货的金额
+ String refundAmount;
+ //要退款的订单号
+ String refundOrderId;
+ //平台商户退款分账金额
+ String platformAmount;
+ //子订单信息
+ List<SubOrderItem> subOrders;
+ //退货说明
+ String refundDesc;
+
+ String toJson(){
+ StringBuilder sb = new StringBuilder();
+ sb.append("{");
+ if (this.msgId != null) sb.append("\"msgId\":\"" + this.msgId + "\",");
+ if (this.requestTimestamp != null) sb.append("\"requestTimestamp\":\"" + this.requestTimestamp + "\",");
+ if (this.merOrderId != null) sb.append("\"merOrderId\":\"" + this.merOrderId + "\",");
+ if (this.srcReserve != null) sb.append("\"srcReserve\":\"" + this.srcReserve + "\",");
+ if (this.mid != null) sb.append("\"mid\":\"" + this.mid + "\",");
+ if (this.tid != null) sb.append("\"tid\":\"" + this.tid + "\",");
+ if (this.instMid != null) sb.append("\"instMid\":\"" + this.instMid + "\",");
+ if (this.refundAmount != null) sb.append("\"refundAmount\":\"" + this.refundAmount + "\",");
+ if (this.refundOrderId != null) sb.append("\"refundOrderId\":\"" + this.refundOrderId + "\",");
+ if (this.platformAmount != null) sb.append("\"platformAmount\":\"" + this.platformAmount + "\",");
+ if (this.subOrders != null && this.subOrders.size()>0) {
+ sb.append("\"subOrders\":[");
+ for(int i=0;i<subOrders.size();i++){
+ sb.append(subOrders.get(i));
+ sb.append(",");
+ }
+ if (sb.charAt(sb.length() - 1) == ',')
+ sb.deleteCharAt(sb.length() - 1);
+ sb.append("],");
+ }
+ if (this.refundDesc != null) sb.append("\"refundDesc\":\"" + this.refundDesc + "\",");
+ if (sb.charAt(sb.length() - 1) == ',')
+ sb.deleteCharAt(sb.length() - 1);
+ sb.append("}");
+ return sb.toString();
+ }
+
+ public String toString(){
+ return this.toJson();
+ }
+ static class SubOrderItem{
+ //子商户号
+ String mid;
+ //子商户分账金额
+ int totalAmount;
+ String toJson() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("{");
+ if (this.mid != null) {
+ sb.append("\"mid\":\"" + this.mid + "\",");
+ }
+ if (this.totalAmount != 0) {
+ sb.append("\"totalAmount\":\"" + this.totalAmount + "\",");
+ }
+ if (sb.charAt(sb.length() - 1) == ',')
+ sb.deleteCharAt(sb.length() - 1);
+ sb.append("}");
+ return sb.toString();
+ }
+
+ public String toString(){
+ return this.toJson();
+ }
+ }
+
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/RefundQuery.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/RefundQuery.java
new file mode 100644
index 0000000..cda7ce1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/RefundQuery.java
@@ -0,0 +1,164 @@
+package com.panzhihua.applets.unionpay;
+
+import com.panzhihua.common.utlis.DateUtils;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.digest.DigestUtils;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+import java.time.LocalDateTime;
+
+/**
+ * @author kkqiao
+ * 全民付移动支付小程序支付退款查询接口
+ * 说明：
+ * 钱包支付时，因通讯故障、服务器故障等原因，造成收银机最终没有收到退货结果通知，收银员不确定
+ * 该笔退货后台处理结果，查询该笔退货交易订单在钱包后台的支付结果，并将退货结果返回给收银机。
+ * 测试环境：http://58.247.0.18:29015/v1/netpay/refund-query
+ * 生产环境：https://api-mop.chinaums.com/v1/netpay/refund-query
+ */
+public class RefundQuery {
+
+// static String url = "https://test-api-open.chinaums.com/v1/netpay/refund-query";
+ static String url = "https://api-mop.chinaums.com/v1/netpay/refund-query";
+
+ /**
+ * 退款查询接口
+ * @param args
+ * @return
+ */
+ public static String refundQuery(String merOrderId)
+ {
+ //1. 组建请求报文
+ LocalDateTime time= DateUtils.getCurrentDate();
+ RefundQueryBody reqBody = new RefundQueryBody();
+ reqBody.requestTimestamp =time.format(DateUtils.format_ymdhms);// "2019-08-09 14:45:55";
+ reqBody.mid = UnionpayContent.MID;
+ reqBody.tid = UnionpayContent.TID;
+ reqBody.instMid = UnionpayContent.INSTMID;
+ reqBody.merOrderId = merOrderId;
+ System.out.println("request body:\n"+reqBody);
+
+ //2. 获取认证报文，timestamp为当前日期，老旧日期无法请求成功
+ String authorization = null;
+ try {
+ authorization = getAuthorization(UnionpayContent.APPID,UnionpayContent.APPKEY,
+ time.format(DateUtils.format_ymdhms_string),"nonce",reqBody.toString());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return "退款查询失败";
+ }
+ System.out.println("authorization:\n"+authorization);
+
+ //3. 发送http请求，并解析返回信息
+ String response = request(url,authorization,reqBody.toString());
+ System.out.println("response:\n"+response);
+ return response;
+ }
+
+ /**
+ * 发送http请求
+ * @param url 请求url
+ * @param authorization 认证报文
+ * @param reqBody 请求体
+ * @return response
+ */
+ static String request(String url, String authorization, String reqBody){
+ String response = "";
+ PrintWriter out = null;
+ BufferedReader in = null;
+ try{
+ URL realUrl = new URL(url);
+ URLConnection conn = realUrl.openConnection();
+ HttpURLConnection httpUrlConnection = (HttpURLConnection) conn;
+ httpUrlConnection.setRequestProperty("Content-Type", "application/json");
+ httpUrlConnection.setRequestProperty("authorization",authorization);
+ httpUrlConnection.setDoOutput(true);
+ httpUrlConnection.setDoInput(true);
+ out = new PrintWriter(httpUrlConnection.getOutputStream());
+ out.write(reqBody);
+ out.flush();
+ httpUrlConnection.connect();
+ in = new BufferedReader(new InputStreamReader(httpUrlConnection.getInputStream()));
+ String line;
+ while ((line = in.readLine()) != null) {
+ response += line;
+ }
+ }catch(Exception e){
+ e.printStackTrace();
+ } finally {
+ try {
+ if (out != null) { out.close();}
+ if (in != null) {in.close();}
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ return response;
+ }
+
+ /**
+ * 获取签名头
+ * @param appid
+ * @param appkey
+ * @param timestamp 格式:"yyyyMMddHHmmss"
+ * @param nonce 随机字符串，
+ * @param body 请求体
+ * @return authorization 认证报文
+ * @throws Exception
+ */
+ static String getAuthorization(String appid, String appkey, String timestamp, String nonce, String body) throws Exception {
+ byte[] data = body.getBytes("utf-8");
+ InputStream is = new ByteArrayInputStream(data);
+ String testSH = DigestUtils.sha256Hex(is);
+ String s1 = appid+timestamp+nonce+testSH;
+ Mac mac = Mac.getInstance("HmacSHA256");
+ mac.init(new SecretKeySpec(appkey.getBytes("utf-8"),"HmacSHA256"));
+ byte[] localSignature = mac.doFinal(s1.getBytes("utf-8"));
+ String localSignatureStr = Base64.encodeBase64String(localSignature);
+ return "OPEN-BODY-SIG AppId="+"\""+appid+"\""+", Timestamp="+"\""+timestamp+"\""+", Nonce="+"\""+nonce+"\""+", Signature="+"\""+localSignatureStr+"\"";
+ }
+
+ static class RefundQueryBody{
+ //消息ID
+ String msgId;
+ //报文请求时间，格式yyyy-MM-ddHH:mm:ss
+ String requestTimestamp;
+ //请求系统预留字段
+ String srcReserve;
+ //商户号
+ String mid;
+ //终端号
+ String tid;
+ //业务类型
+ String instMid;
+ //商户订单号
+ String merOrderId;
+
+ String toJson(){
+ StringBuilder sb = new StringBuilder();
+ sb.append("{");
+ if (this.msgId != null) sb.append("\"msgId\":\"" + this.msgId + "\",");
+ if (this.requestTimestamp != null) sb.append("\"requestTimestamp\":\"" + this.requestTimestamp + "\",");
+ if (this.srcReserve != null) sb.append("\"srcReserve\":\"" + this.srcReserve + "\",");
+ if (this.mid != null) sb.append("\"mid\":\"" + this.mid + "\",");
+ if (this.tid != null) sb.append("\"tid\":\"" + this.tid + "\",");
+ if (this.instMid != null) sb.append("\"instMid\":\"" + this.instMid + "\",");
+ if (this.merOrderId != null) sb.append("\"merOrderId\":\"" + this.merOrderId + "\",");
+ if (sb.charAt(sb.length() - 1) == ',')
+ sb.deleteCharAt(sb.length() - 1);
+ sb.append("}");
+ return sb.toString();
+ }
+
+ public String toString(){
+ return this.toJson();
+ }
+
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/SecureCancel.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/SecureCancel.java
new file mode 100644
index 0000000..eed530e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/SecureCancel.java
@@ -0,0 +1,146 @@
+package com.panzhihua.applets.unionpay;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.digest.DigestUtils;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+
+/**
+ * @author kkqiao
+ * 全民付移动支付小程序支付担保撤销接口
+ * 说明：
+ * 对于担保交易（下单接口请求参数中上送了担保交易标识并置true），用户支付成功后，商户可调用此
+ * 接口来进行担保撤销操作。
+ * 测试环境：http://58.247.0.18:29015/v1/netpay/secure-cancel
+ * 生产环境：https://api-mop.chinaums.com/v1/netpay/secure-cancel
+ */
+public class SecureCancel {
+
+ static String url = "https://test-api-open.chinaums.com/v1/netpay/secure-cancel";
+
+ public static void main(String[] args) throws Exception{
+ //1. 组建请求报文
+ SecureCancelBody reqBody = new SecureCancelBody();
+ reqBody.requestTimestamp = "2019-08-09 17:12:55";
+ reqBody.mid = "898460107420248";
+ reqBody.tid = "00000001";
+ reqBody.instMid = "MINIDEFAULT";
+ reqBody.merOrderId = "101771305dc89764b477474";
+ System.out.println("request body:\n"+reqBody);
+
+ //2. 获取认证报文，timestamp为当前日期，老旧日期无法请求成功
+ String authorization = getAuthorization(UnionpayContent.APPID,UnionpayContent.APPKEY,"20190809171200","nonce",reqBody.toString());
+ System.out.println("authorization:\n"+authorization);
+
+ //3. 发送http请求，并解析返回信息
+ String response = request(url,authorization,reqBody.toString());
+ System.out.println("response:\n"+response);
+ }
+
+ /**
+ * 发送http请求
+ * @param url 请求url
+ * @param authorization 认证报文
+ * @param reqBody 请求体
+ * @return response
+ */
+ static String request(String url, String authorization, String reqBody){
+ String response = "";
+ PrintWriter out = null;
+ BufferedReader in = null;
+ try{
+ URL realUrl = new URL(url);
+ URLConnection conn = realUrl.openConnection();
+ HttpURLConnection httpUrlConnection = (HttpURLConnection) conn;
+ httpUrlConnection.setRequestProperty("Content-Type", "application/json");
+ httpUrlConnection.setRequestProperty("authorization",authorization);
+ httpUrlConnection.setDoOutput(true);
+ httpUrlConnection.setDoInput(true);
+ out = new PrintWriter(httpUrlConnection.getOutputStream());
+ out.write(reqBody);
+ out.flush();
+ httpUrlConnection.connect();
+ in = new BufferedReader(new InputStreamReader(httpUrlConnection.getInputStream()));
+ String line;
+ while ((line = in.readLine()) != null) {
+ response += line;
+ }
+ }catch(Exception e){
+ e.printStackTrace();
+ } finally {
+ try {
+ if (out != null) { out.close();}
+ if (in != null) {in.close();}
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ return response;
+ }
+
+ /**
+ * 获取签名头
+ * @param appid
+ * @param appkey
+ * @param timestamp 格式:"yyyyMMddHHmmss"
+ * @param nonce 随机字符串，
+ * @param body 请求体
+ * @return authorization 认证报文
+ * @throws Exception
+ */
+ static String getAuthorization(String appid, String appkey, String timestamp, String nonce, String body) throws Exception {
+ byte[] data = body.getBytes("utf-8");
+ InputStream is = new ByteArrayInputStream(data);
+ String testSH = DigestUtils.sha256Hex(is);
+ String s1 = appid+timestamp+nonce+testSH;
+ Mac mac = Mac.getInstance("HmacSHA256");
+ mac.init(new SecretKeySpec(appkey.getBytes("utf-8"),"HmacSHA256"));
+ byte[] localSignature = mac.doFinal(s1.getBytes("utf-8"));
+ String localSignatureStr = Base64.encodeBase64String(localSignature);
+ return "OPEN-BODY-SIG AppId="+"\""+appid+"\""+", Timestamp="+"\""+timestamp+"\""+", Nonce="+"\""+nonce+"\""+", Signature="+"\""+localSignatureStr+"\"";
+ }
+
+ static class SecureCancelBody{
+ //消息ID
+ String msgId;
+ //报文请求时间，格式yyyy-MM-ddHH:mm:ss
+ String requestTimestamp;
+ //请求系统预留字段
+ String srcReserve;
+ //商户号
+ String mid;
+ //终端号
+ String tid;
+ //业务类型
+ String instMid;
+ //商户订单号
+ String merOrderId;
+
+ String toJson(){
+ StringBuilder sb = new StringBuilder();
+ sb.append("{");
+ if (this.msgId != null) sb.append("\"msgId\":\"" + this.msgId + "\",");
+ if (this.requestTimestamp != null) sb.append("\"requestTimestamp\":\"" + this.requestTimestamp + "\",");
+ if (this.srcReserve != null) sb.append("\"srcReserve\":\"" + this.srcReserve + "\",");
+ if (this.mid != null) sb.append("\"mid\":\"" + this.mid + "\",");
+ if (this.tid != null) sb.append("\"tid\":\"" + this.tid + "\",");
+ if (this.instMid != null) sb.append("\"instMid\":\"" + this.instMid + "\",");
+ if (this.merOrderId != null) sb.append("\"merOrderId\":\"" + this.merOrderId + "\",");
+ if (sb.charAt(sb.length() - 1) == ',')
+ sb.deleteCharAt(sb.length() - 1);
+ sb.append("}");
+ return sb.toString();
+ }
+
+ public String toString(){
+ return this.toJson();
+ }
+
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/SecureComplete.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/SecureComplete.java
new file mode 100644
index 0000000..2540425
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/SecureComplete.java
@@ -0,0 +1,150 @@
+package com.panzhihua.applets.unionpay;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.digest.DigestUtils;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+
+/**
+ * @author kkqiao
+ * 全民付移动支付小程序支付担保完成接口
+ * 说明：
+ * 对于担保交易（下单接口请求参数中上送了担保交易标识并置true），用户支付成功后，商户可调用此
+ * 接口来进行担保完成操作。
+ * 测试环境：http://58.247.0.18:29015/v1/netpay/secure-complete
+ * 生产环境：https://api-mop.chinaums.com/v1/netpay/secure-complete
+ */
+public class SecureComplete {
+
+ static String url = "https://test-api-open.chinaums.com/v1/netpay/secure-complete";
+
+ public static void main(String[] args) throws Exception{
+ //1. 组建请求报文
+ SecureCompleteBody reqBody = new SecureCompleteBody();
+ reqBody.requestTimestamp = "2019-08-09 17:12:55";
+ reqBody.mid = "898460107420248";
+ reqBody.tid = "00000001";
+ reqBody.instMid = "MINIDEFAULT";
+ reqBody.merOrderId = "101771306dc89764b477474";
+ reqBody.completedAmount = "1";
+ System.out.println("request body:\n"+reqBody);
+
+ //2. 获取认证报文，timestamp为当前日期，老旧日期无法请求成功
+ String authorization = getAuthorization(UnionpayContent.APPID,UnionpayContent.APPKEY,"20190809171200","nonce",reqBody.toString());
+ System.out.println("authorization:\n"+authorization);
+
+ //3. 发送http请求，并解析返回信息
+ String response = request(url,authorization,reqBody.toString());
+ System.out.println("response:\n"+response);
+ }
+
+ /**
+ * 发送http请求
+ * @param url 请求url
+ * @param authorization 认证报文
+ * @param reqBody 请求体
+ * @return response
+ */
+ static String request(String url, String authorization, String reqBody){
+ String response = "";
+ PrintWriter out = null;
+ BufferedReader in = null;
+ try{
+ URL realUrl = new URL(url);
+ URLConnection conn = realUrl.openConnection();
+ HttpURLConnection httpUrlConnection = (HttpURLConnection) conn;
+ httpUrlConnection.setRequestProperty("Content-Type", "application/json");
+ httpUrlConnection.setRequestProperty("authorization",authorization);
+ httpUrlConnection.setDoOutput(true);
+ httpUrlConnection.setDoInput(true);
+ out = new PrintWriter(httpUrlConnection.getOutputStream());
+ out.write(reqBody);
+ out.flush();
+ httpUrlConnection.connect();
+ in = new BufferedReader(new InputStreamReader(httpUrlConnection.getInputStream()));
+ String line;
+ while ((line = in.readLine()) != null) {
+ response += line;
+ }
+ }catch(Exception e){
+ e.printStackTrace();
+ } finally {
+ try {
+ if (out != null) { out.close();}
+ if (in != null) {in.close();}
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ return response;
+ }
+
+ /**
+ * 获取签名头
+ * @param appid
+ * @param appkey
+ * @param timestamp 格式:"yyyyMMddHHmmss"
+ * @param nonce 随机字符串，
+ * @param body 请求体
+ * @return authorization 认证报文
+ * @throws Exception
+ */
+ static String getAuthorization(String appid, String appkey, String timestamp, String nonce, String body) throws Exception {
+ byte[] data = body.getBytes("utf-8");
+ InputStream is = new ByteArrayInputStream(data);
+ String testSH = DigestUtils.sha256Hex(is);
+ String s1 = appid+timestamp+nonce+testSH;
+ Mac mac = Mac.getInstance("HmacSHA256");
+ mac.init(new SecretKeySpec(appkey.getBytes("utf-8"),"HmacSHA256"));
+ byte[] localSignature = mac.doFinal(s1.getBytes("utf-8"));
+ String localSignatureStr = Base64.encodeBase64String(localSignature);
+ return "OPEN-BODY-SIG AppId="+"\""+appid+"\""+", Timestamp="+"\""+timestamp+"\""+", Nonce="+"\""+nonce+"\""+", Signature="+"\""+localSignatureStr+"\"";
+ }
+
+ static class SecureCompleteBody{
+ //消息ID
+ String msgId;
+ //报文请求时间，格式yyyy-MM-ddHH:mm:ss
+ String requestTimestamp;
+ //请求系统预留字段
+ String srcReserve;
+ //商户号
+ String mid;
+ //终端号
+ String tid;
+ //业务类型
+ String instMid;
+ //商户订单号
+ String merOrderId;
+ //担保完成金额
+ String completedAmount;
+
+ String toJson(){
+ StringBuilder sb = new StringBuilder();
+ sb.append("{");
+ if (this.msgId != null) sb.append("\"msgId\":\"" + this.msgId + "\",");
+ if (this.requestTimestamp != null) sb.append("\"requestTimestamp\":\"" + this.requestTimestamp + "\",");
+ if (this.srcReserve != null) sb.append("\"srcReserve\":\"" + this.srcReserve + "\",");
+ if (this.mid != null) sb.append("\"mid\":\"" + this.mid + "\",");
+ if (this.tid != null) sb.append("\"tid\":\"" + this.tid + "\",");
+ if (this.instMid != null) sb.append("\"instMid\":\"" + this.instMid + "\",");
+ if (this.merOrderId != null) sb.append("\"merOrderId\":\"" + this.merOrderId + "\",");
+ if (this.completedAmount != null) sb.append("\"completedAmount\":\"" + this.completedAmount + "\",");
+ if (sb.charAt(sb.length() - 1) == ',')
+ sb.deleteCharAt(sb.length() - 1);
+ sb.append("}");
+ return sb.toString();
+ }
+
+ public String toString(){
+ return this.toJson();
+ }
+
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/UnifiedOrder.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/UnifiedOrder.java
new file mode 100644
index 0000000..797eff6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/UnifiedOrder.java
@@ -0,0 +1,334 @@
+package com.panzhihua.applets.unionpay;
+
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.DateUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.UUID;
+
+import static com.panzhihua.common.utlis.PayUtil.makeUUID;
+
+/**
+ * @author kkqiao
+ * 全民付移动支付小程序支付下单接口
+ * 说明：
+ * 本接口为商户的订单信息发向银商网络支付前置系统以获取支付要素商户需遵循商户订单号生成规范，即以银商分配的4位来源编号作为账单号的前4位，且在商户系统中此
+ * 账单号保证唯一。总长度需大于6位，小于28位。银商的推荐规则为（无特殊情况下，建议遵守此规
+ * 则）：
+ * {来源编号(4位)}{时间(yyyyMMddmmHHssSSS)(17位)}{7位随机数}
+ * 微信下单成功后，使用返回数据中的miniPayRequest 即可调用支付。
+ * 支付需要集成微信小程序，需要第三方自行配置。
+ * 支付宝下单成功后，使用返回数据中的targetOrderId 即可调用支付。 支付需要集成支付宝支付环境，
+ * 需要第三方自行配置。
+ * 微信：
+ * 测试环境：http://58.247.0.18:29015/v1/netpay/wx/unified-order
+ * 生产环境：https://api-mop.chinaums.com/v1/netpay/wx/unified-order
+ * 支付宝：
+ * 测试环境：http://58.247.0.18:29015/v1/netpay/trade/create
+ * 生产环境：https://api-mop.chinaums.com/v1/netpay/trade/create
+ */
+@Slf4j
+@Component
+public class UnifiedOrder {
+// static String url = "https://test-api-open.chinaums.com/v1/netpay/wx/unified-order";
+ static String url = "https://api-mop.chinaums.com/v1/netpay/wx/unified-order";
+
+ public static String sendOrder(String totalAmount,String orderDesc,String productId,String OpenId,LocalDateTime time,String merOrderId)
+ {
+ //1. 组建请求报文
+ UnifiedOrderBody reqBody = new UnifiedOrderBody();
+ reqBody.requestTimestamp = time.format(DateUtils.format_ymdhms);// "2019-08-09 17:30:55";
+ reqBody.merOrderId = merOrderId;
+ reqBody.mid = UnionpayContent.MID;
+ reqBody.tid = UnionpayContent.TID;
+ reqBody.instMid = UnionpayContent.INSTMID;
+ reqBody.totalAmount = totalAmount;
+ reqBody.secureTransaction = "false";
+ reqBody.orderDesc = orderDesc;
+ reqBody.productId = productId;
+ reqBody.notifyUrl = "https://huacheng.psciio.com/api/huacheng-applets/wx/wxNotifyAllUnionpay?merOrderId="+reqBody.merOrderId;
+ reqBody.tradeType = "MINI";
+ reqBody.subOpenId = OpenId;
+
+ log.info("银联支付参数:\n"+reqBody);
+
+ //2. 获取认证报文，timestamp为当前日期，老旧日期无法请求成功
+ String authorization = null;
+ try {
+ authorization = getAuthorization(UnionpayContent.APPID,UnionpayContent.APPKEY,
+ time.format(DateUtils.format_ymdhms_string),"nonce",reqBody.toString());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return "下单失败";
+ }
+ System.out.println("authorization:\n"+authorization);
+
+ //3. 发送http请求，并解析返回信息
+ String response = request(url,authorization,reqBody.toString());
+ System.out.println("response:\n"+response);
+ return response;
+ }
+
+ /**
+ * 发送http请求
+ * @param url 请求url
+ * @param authorization 认证报文
+ * @param reqBody 请求体
+ * @return response
+ */
+ static String request(String url, String authorization, String reqBody){
+ String response = "";
+ PrintWriter out = null;
+ BufferedReader in = null;
+ try{
+ URL realUrl = new URL(url);
+ URLConnection conn = realUrl.openConnection();
+ HttpURLConnection httpUrlConnection = (HttpURLConnection) conn;
+ httpUrlConnection.setRequestProperty("Content-Type", "application/json");
+ httpUrlConnection.setRequestProperty("authorization",authorization);
+ httpUrlConnection.setDoOutput(true);
+ httpUrlConnection.setDoInput(true);
+ out = new PrintWriter(httpUrlConnection.getOutputStream());
+ out.write(reqBody);
+ out.flush();
+ httpUrlConnection.connect();
+ in = new BufferedReader(new InputStreamReader(httpUrlConnection.getInputStream()));
+ String line;
+ while ((line = in.readLine()) != null) {
+ response += line;
+ }
+ }catch(Exception e){
+ e.printStackTrace();
+ } finally {
+ try {
+ if (out != null) { out.close();}
+ if (in != null) {in.close();}
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ return response;
+ }
+
+ /**
+ * 获取签名头
+ * @param appid
+ * @param appkey
+ * @param timestamp 格式:"yyyyMMddHHmmss"
+ * @param nonce 随机字符串，
+ * @param body 请求体
+ * @return authorization 认证报文
+ * @throws Exception
+ */
+ static String getAuthorization(String appid, String appkey, String timestamp, String nonce, String body) throws Exception {
+ byte[] data = body.getBytes("utf-8");
+ InputStream is = new ByteArrayInputStream(data);
+ String testSH = DigestUtils.sha256Hex(is);
+ String s1 = appid+timestamp+nonce+testSH;
+ Mac mac = Mac.getInstance("HmacSHA256");
+ mac.init(new SecretKeySpec(appkey.getBytes("utf-8"),"HmacSHA256"));
+ byte[] localSignature = mac.doFinal(s1.getBytes("utf-8"));
+ String localSignatureStr = Base64.encodeBase64String(localSignature);
+ return "OPEN-BODY-SIG AppId="+"\""+appid+"\""+", Timestamp="+"\""+timestamp+"\""+", Nonce="+"\""+nonce+"\""+", Signature="+"\""+localSignatureStr+"\"";
+ }
+
+ static class UnifiedOrderBody{
+ //消息ID
+ String msgId;
+ //报文请求时间，格式yyyy-MM-ddHH:mm:ss
+ String requestTimestamp;
+ //商户订单号
+ String merOrderId;
+ //请求系统预留字段
+ String srcReserve;
+ //商户号
+ String mid;
+ //终端号
+ String tid;
+ //业务类型
+ String instMid;
+ //商品信息
+ List<GoodsItem> goods;
+ //商户附加数据
+ String attachedData;
+ //订单过期时间
+ String expireTime;
+ //商品标记
+ String goodsTag;
+ //商品交易单号
+ String goodsTradeNo;
+ //账单描述
+ String orderDesc;
+ //订单原始金额
+ String originalAmount;
+ //商品ID
+ String productId;
+ //支付总金额
+ String totalAmount;
+ //分账标记
+ String divisionFlag;
+ //平台商户分账金额
+ String platformAmount;
+ //子订单信息
+ List<SubOrderItem> subOrders;
+ //支付结果通知地址
+ String notifyUrl;
+ //订单展示页面
+ String showUrl;
+ //担保交易标识
+ String secureTransaction;
+ //用户子标识
+ String tradeType;
+ //交易类型
+ String subOpenId;
+ //商户用户号
+ String merchantUserId;
+ //用户Id
+ String userId;
+ //实名认证手机号
+ String mobile;
+ //是否需要限制信用卡支付
+ String limitCreditCard;
+
+ String toJson(){
+ StringBuilder sb = new StringBuilder();
+ sb.append("{");
+ if (this.userId != null) sb.append("\"userId\":\"" + this.userId + "\",");
+ if (this.msgId != null) sb.append("\"msgId\":\"" + this.msgId + "\",");
+ if (this.requestTimestamp != null) sb.append("\"requestTimestamp\":\"" + this.requestTimestamp + "\",");
+ if (this.merOrderId != null) sb.append("\"merOrderId\":\"" + this.merOrderId + "\",");
+ if (this.srcReserve != null) sb.append("\"srcReserve\":\"" + this.srcReserve + "\",");
+ if (this.mid != null) sb.append("\"mid\":\"" + this.mid + "\",");
+ if (this.tid != null) sb.append("\"tid\":\"" + this.tid + "\",");
+ if (this.instMid != null) sb.append("\"instMid\":\"" + this.instMid + "\",");
+ if (this.goods != null && this.goods.size()>0) {
+ sb.append("\"goods\":[");
+ for(int i=0;i<goods.size();i++){
+ sb.append(goods.get(i));
+ sb.append(",");
+ }
+ if (sb.charAt(sb.length() - 1) == ',')
+ sb.deleteCharAt(sb.length() - 1);
+ sb.append("],");
+ }
+ if (this.attachedData != null) sb.append("\"attachedData\":\"" + this.attachedData + "\",");
+ if (this.expireTime != null) sb.append("\"expireTime\":\"" + this.expireTime + "\",");
+ if (this.goodsTag != null) sb.append("\"goodsTag\":\"" + this.goodsTag + "\",");
+ if (this.goodsTradeNo != null) sb.append("\"goodsTradeNo\":\"" + this.goodsTradeNo + "\",");
+ if (this.orderDesc != null) sb.append("\"orderDesc\":\"" + this.orderDesc + "\",");
+ if (this.originalAmount != null) sb.append("\"originalAmount\":\"" + this.originalAmount + "\",");
+ if (this.productId != null) sb.append("\"productId\":\"" + this.productId + "\",");
+ if (this.totalAmount != null) sb.append("\"totalAmount\":\"" + this.totalAmount + "\",");
+ if (this.divisionFlag != null) sb.append("\"divisionFlag\":\"" + this.divisionFlag + "\",");
+ if (this.platformAmount != null) sb.append("\"platformAmount\":\"" + this.platformAmount + "\",");
+ if (this.subOrders != null && this.subOrders.size()>0) {
+ sb.append("\"subOrders\":[");
+ for(int i=0;i<subOrders.size();i++){
+ sb.append(subOrders.get(i));
+ sb.append(",");
+ }
+ if (sb.charAt(sb.length() - 1) == ',')
+ sb.deleteCharAt(sb.length() - 1);
+ sb.append("],");
+ }
+ if (this.notifyUrl != null) sb.append("\"notifyUrl\":\"" + this.notifyUrl + "\",");
+ if (this.showUrl != null) sb.append("\"showUrl\":\"" + this.showUrl + "\",");
+ if (this.secureTransaction != null) sb.append("\"secureTransaction\":\"" + this.secureTransaction + "\",");
+ if (this.subOpenId != null) sb.append("\"subOpenId\":\"" + this.subOpenId + "\",");
+ if (this.tradeType != null) sb.append("\"tradeType\":\"" + this.tradeType + "\",");
+ if (this.merchantUserId != null) sb.append("\"merchantUserId\":\"" + this.merchantUserId + "\",");
+ if (this.mobile != null) sb.append("\"mobile\":\"" + this.mobile + "\",");
+ if (this.limitCreditCard != null) sb.append("\"limitCreditCard\":\"" + this.limitCreditCard + "\",");
+ if (sb.charAt(sb.length() - 1) == ',')
+ sb.deleteCharAt(sb.length() - 1);
+ sb.append("}");
+ return sb.toString();
+ }
+
+ public String toString(){
+ return this.toJson();
+ }
+ static class GoodsItem {
+ //商品ID
+ String goodsId;
+ //商品名称
+ String goodsName;
+ //商品数量
+ String quantity;
+ //商品单价（分）
+ String price;
+ //商品分类
+ String goodsCategory;
+ //商品说明
+ String body;
+ //商品单位
+ int unit;
+ //商品折扣
+ int discount;
+ //子商户号
+ String subMerchantId;
+ //子商户商品总额
+ int subOrderAmount;
+
+ String toJson(){
+ StringBuilder sb = new StringBuilder();
+ sb.append("{");
+ if(this.goodsId!=null) sb.append("\"goodsId\":\""+this.goodsId+"\",");
+ if(this.goodsName!=null) sb.append("\"goodsName\":\""+this.goodsName+"\",");
+ if(this.quantity!=null) sb.append("\"quantity\":\""+this.quantity+"\",");
+ if(this.price!=null) sb.append("\"price\":\""+this.price+"\",");
+ if(this.goodsCategory!=null) sb.append("\"goodsCategory\":\""+this.goodsCategory+"\",");
+ if(this.body!=null) sb.append("\"body\":\""+this.body+"\",");
+ if(this.unit!=0) sb.append("\"unit\":\""+this.unit+"\",");
+ if(this.discount!=0) sb.append("\"discount\":\""+this.discount+"\",");
+ if(this.subMerchantId!=null) sb.append("\"subMerchantId\":\""+this.subMerchantId+"\",");
+ if(this.subOrderAmount!=0) sb.append("\"subOrderAmount\":\""+this.subOrderAmount+"\",");
+ if(sb.charAt(sb.length()-1) == ',')
+ sb.deleteCharAt(sb.length()-1);
+ sb.append("}");
+ return sb.toString();
+ }
+ public String toString(){
+ return this.toJson();
+ }
+ }
+ static class SubOrderItem{
+ //子商户号
+ String mid;
+ //子商户分账金额
+ int totalAmount;
+ String toJson() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("{");
+ if (this.mid != null) {
+ sb.append("\"mid\":\"" + this.mid + "\",");
+ }
+ if (this.totalAmount != 0) {
+ sb.append("\"totalAmount\":\"" + this.totalAmount + "\",");
+ }
+ if (sb.charAt(sb.length() - 1) == ',')
+ sb.deleteCharAt(sb.length() - 1);
+ sb.append("}");
+ return sb.toString();
+ }
+
+ public String toString(){
+ return this.toJson();
+ }
+ }
+
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/UnionpayContent.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/UnionpayContent.java
new file mode 100644
index 0000000..2132e82
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/unionpay/UnionpayContent.java
@@ -0,0 +1,17 @@
+package com.panzhihua.applets.unionpay;
+
+public class UnionpayContent
+{
+
+ public static String APPID = "8a81c1bf831e72e30185755c7a0a3156";
+ public static String APPKEY = "1697b2de76d547858699a45e2420c089";
+ //商户号
+ public static String MID = "898510475429005";
+ //终端号
+ public static String TID = "50525310";
+ //机构商户号
+ public static String INSTMID = "MINIDEFAULT";
+ //订单号前4位{来源编号(4位)
+ public static String TOP4 = "33ZV";
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/weixin/CheckService.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/weixin/CheckService.java
new file mode 100644
index 0000000..7ead3bb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/weixin/CheckService.java
@@ -0,0 +1,131 @@
+package com.panzhihua.applets.weixin;
+
+import cn.binarywang.wx.miniapp.api.WxMaSecCheckService;
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.security.WxMaMsgSecCheckCheckRequest;
+import cn.binarywang.wx.miniapp.bean.security.WxMaMsgSecCheckCheckResponse;
+import cn.binarywang.wx.miniapp.config.WxMaConfig;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.panzhihua.applets.config.WxMaConfiguration;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 微信内容审查
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-02-25 10:57
+ **/
+@Slf4j
+@Service
+public class CheckService {
+ @Resource
+ private WxMaConfiguration wxMaConfiguration;
+
+ public boolean checkMessage(String msg) {
+ WxMaService maService = wxMaConfiguration.getMaService("");
+
+ WxMaConfig wxMaConfig = maService.getWxMaConfig();
+ WxMaMsgSecCheckCheckRequest wxMaMsgSecCheckCheckRequest = WxMaMsgSecCheckCheckRequest.builder().version("2").openid(wxMaConfig.getAppid()).scene(2).content(msg).build();
+ WxMaSecCheckService wxMaSecCheckService = maService.getSecCheckService();
+ try {
+ WxMaMsgSecCheckCheckResponse wxMaMsgSecCheckCheckResponse = wxMaSecCheckService.checkMessage(wxMaMsgSecCheckCheckRequest);
+ wxMaMsgSecCheckCheckResponse.getResult();
+ return true;
+ } catch (WxErrorException e) {
+ log.error("微信审核文字内容出错【{}】", e.getMessage());
+ e.printStackTrace();
+ }
+ return false;
+ }
+
+ public String checkMessageBy(String msg, String openId, String appId) {
+ WxMaMsgSecCheckCheckRequest wxMaMsgSecCheckCheckRequest = WxMaMsgSecCheckCheckRequest.builder().version("2").openid(openId).scene(2).content(msg).build();
+ WxMaSecCheckService wxMaSecCheckService = wxMaConfiguration.getMaService(appId).getSecCheckService();
+ try {
+ WxMaMsgSecCheckCheckResponse result = wxMaSecCheckService.checkMessage(wxMaMsgSecCheckCheckRequest);
+ return this.handleResult(result);
+ } catch (WxErrorException e) {
+ log.error("微信审核文字内容出错【{}】", e.getMessage());
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public boolean checkImageBy(String url, String appId) {
+ String[] imageUrlArr = url.split(",");
+ for (String imageUrl : imageUrlArr) {
+ WxMaSecCheckService wxMaSecCheckService = wxMaConfiguration.getMaService(appId).getSecCheckService();
+ try {
+ return wxMaSecCheckService.checkImage(imageUrl);
+ } catch (WxErrorException e) {
+ log.error("微信审核图片内容出错【{}】", e.getMessage());
+ e.printStackTrace();
+ }
+ }
+ return true;
+ }
+
+ /**
+ * 处理微信返回的违规结果
+ *
+ * @param result
+ * @return
+ */
+ private String handleResult(WxMaMsgSecCheckCheckResponse result) {
+ List<WxMaMsgSecCheckCheckResponse.DetailBean> detailBeanList = result.getDetail();
+ if (null != detailBeanList && detailBeanList.size() > 0) {
+ List<String> resultMsgs = new ArrayList<>();
+ for (WxMaMsgSecCheckCheckResponse.DetailBean detailBean : detailBeanList) {
+ if (0 == detailBean.getErrcode()) {
+ String label = detailBean.getLabel();
+ if (StrUtil.isNotBlank(label)) {
+ switch (label) {
+ case "100":
+ continue;
+ case "10001":
+ resultMsgs.add("广告");
+ continue;
+ case "20001":
+ resultMsgs.add("时政");
+ continue;
+ case "20002":
+ resultMsgs.add("色情");
+ continue;
+ case "20003":
+ resultMsgs.add("辱骂");
+ continue;
+ case "20006":
+ resultMsgs.add("违法犯罪");
+ continue;
+ case "20008":
+ resultMsgs.add("欺诈");
+ continue;
+ case "20012":
+ resultMsgs.add("低俗");
+ continue;
+ case "20013":
+ resultMsgs.add("版权");
+ continue;
+ case "21000":
+ resultMsgs.add("其他");
+ }
+ }
+
+ }
+ }
+ if (CollUtil.isNotEmpty(resultMsgs)) {
+ return StringUtils.join(resultMsgs, ",");
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..b2fa9bc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml
@@ -0,0 +1,45 @@
+spring:
+ application:
+ name: huacheng-applets
+ cloud:
+ config:
+ discovery:
+ enabled: true
+ service-id: huacheng-config # 注册中心的服务名
+ profile: ${ENV:dev} # 指定配置文件的环境
+ uri: http://${CONFIG_URL:localhost}:6193/
+ profiles:
+ active: ${ENV:dev}
+ servlet:
+ multipart:
+ max-file-size: 200MB
+ max-request-size: 200MB
+
+server:
+ max-http-header-size: 10MB
+
+eureka:
+ client:
+ service-url:
+ defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
+
+wx:
+ miniapp:
+ appid: wx0cef797390444b75
+ secret: c7ea9aaa7e391a487e8a5b9ba61045d1
+ msgDataFormat: JSON
+
+management:
+ endpoints:
+ web:
+ exposure:
+ include: '*'
+
+ endpoint:
+ health:
+ show-details: always
+
+ metrics:
+ tags:
+ application: huacheng-applets
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/lib/UMF_SDK_V01.jar b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/lib/UMF_SDK_V01.jar
new file mode 100644
index 0000000..fa538e0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/lib/UMF_SDK_V01.jar
Binary files differ
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/logback-spring.xml b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..99cb522
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/logback-spring.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+ <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+ <springProfile name="dev">
+ <property name="LOG_HOME" value="F:/log" />
+ </springProfile>
+ <springProfile name="test">
+ <property name="LOG_HOME" value="/mnt/data/gocd/log" />
+ </springProfile>
+<property name="LOG_HOME" value="/mnt/data/gocd/log" />
+ <!-- 控制台输出 -->
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+ </encoder>
+ </appender>
+ <!-- 按照每天生成日志文件 -->
+ <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!--日志文件输出的文件名-->
+ <FileNamePattern>${LOG_HOME}/huachengapplets.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+ <!--日志文件保留天数-->
+ <MaxHistory>30</MaxHistory>
+ </rollingPolicy>
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+ </encoder>
+ <!--日志文件最大的大小-->
+ <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+ <MaxFileSize>10MB</MaxFileSize>
+ </triggeringPolicy>
+ </appender>
+
+ <!--myibatis log configure-->
+ <logger name="com.apache.ibatis" level="TRACE"/>
+ <logger name="java.sql.Connection" level="DEBUG"/>
+ <logger name="java.sql.Statement" level="DEBUG"/>
+ <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+ <logger name="com.panzhihua.applets" level="DEBUG"/>
+
+ <!-- 日志输出级别 -->
+ <root level="DEBUG">
+ <appender-ref ref="STDOUT" />
+ </root>
+ <root level="INFO">
+ <appender-ref ref="STDOUT" />
+ <appender-ref ref="FILE" />
+ </root>
+</configuration>
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/template/53461_.key.p8 b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/template/53461_.key.p8
new file mode 100644
index 0000000..6b52b7f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/template/53461_.key.p8
Binary files differ
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/.gitignore b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/.mvn/wrapper/MavenWrapperDownloader.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 0000000..a45eb6b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+ private static final String WRAPPER_VERSION = "0.5.6";
+ /**
+ * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+ */
+ private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+ + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+ /**
+ * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+ * use instead of the default one.
+ */
+ private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+ ".mvn/wrapper/maven-wrapper.properties";
+
+ /**
+ * Path where the maven-wrapper.jar will be saved to.
+ */
+ private static final String MAVEN_WRAPPER_JAR_PATH =
+ ".mvn/wrapper/maven-wrapper.jar";
+
+ /**
+ * Name of the property which should be used to override the default download url for the wrapper.
+ */
+ private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+ public static void main(String args[]) {
+ System.out.println("- Downloader started");
+ File baseDirectory = new File(args[0]);
+ System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+ // If the maven-wrapper.properties exists, read it and check if it contains a custom
+ // wrapperUrl parameter.
+ File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+ String url = DEFAULT_DOWNLOAD_URL;
+ if (mavenWrapperPropertyFile.exists()) {
+ FileInputStream mavenWrapperPropertyFileInputStream = null;
+ try {
+ mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+ Properties mavenWrapperProperties = new Properties();
+ mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+ url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+ } catch (IOException e) {
+ System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+ } finally {
+ try {
+ if (mavenWrapperPropertyFileInputStream != null) {
+ mavenWrapperPropertyFileInputStream.close();
+ }
+ } catch (IOException e) {
+ // Ignore ...
+ }
+ }
+ }
+ System.out.println("- Downloading from: " + url);
+
+ File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+ if (!outputFile.getParentFile().exists()) {
+ if (!outputFile.getParentFile().mkdirs()) {
+ System.out.println(
+ "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+ }
+ }
+ System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+ try {
+ downloadFileFromURL(url, outputFile);
+ System.out.println("Done");
+ System.exit(0);
+ } catch (Throwable e) {
+ System.out.println("- Error downloading");
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+ private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+ if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+ String username = System.getenv("MVNW_USERNAME");
+ char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+ Authenticator.setDefault(new Authenticator() {
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(username, password);
+ }
+ });
+ }
+ URL website = new URL(urlString);
+ ReadableByteChannel rbc;
+ rbc = Channels.newChannel(website.openStream());
+ FileOutputStream fos = new FileOutputStream(destination);
+ fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+ fos.close();
+ rbc.close();
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/.mvn/wrapper/maven-wrapper.jar b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..2cc7d4a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/.mvn/wrapper/maven-wrapper.jar
Binary files differ
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/.mvn/wrapper/maven-wrapper.properties b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..642d572
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/mvnw b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/mvnw
new file mode 100644
index 0000000..a16b543
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/mvnw
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ -n "$MVNW_REPOURL" ]; then
+ jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ else
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+ fi
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+ fi
+
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/mvnw.cmd b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/mvnw.cmd
new file mode 100644
index 0000000..c8d4337
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/mvnw.cmd
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/pom.xml b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/pom.xml
new file mode 100644
index 0000000..b996605
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/pom.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.panzhihua</groupId>
+ <artifactId>zhihuishequ</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <groupId>com.panzhihua</groupId>
+ <artifactId>applets_backstage</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>applets_backstage</name>
+ <description>小程序后台管理</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-config</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>swagger-bootstrap-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.panzhihua</groupId>
+ <artifactId>common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-openfeign</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.netflix.hystrix</groupId>
+ <artifactId>hystrix-javanica</artifactId>
+ </dependency>
+
+ <!--添加监控依赖包-->
+ <dependency>
+ <groupId>io.micrometer</groupId>
+ <artifactId>micrometer-registry-prometheus</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+
+ <!--minio文件存储-->
+ <dependency>
+ <groupId>io.minio</groupId>
+ <artifactId>minio</artifactId>
+ <version>6.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.penggle</groupId>
+ <artifactId>kaptcha</artifactId>
+ <version>2.3.2</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>2.5.0</version>
+ <configuration>
+ <mainClass>com.panzhihua.applets_backstage.AppletsBackstageApplication</mainClass>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>1.2.0</version>
+ <configuration>
+ <imageName>registry.cn-chengdu.aliyuncs.com/panzhihua/applets_backstage:v1</imageName>
+ <serverId></serverId>
+ <baseImage>java</baseImage>
+ <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
+ <resources>
+ <resource>
+ <targetPath>/</targetPath>
+ <directory>${project.build.directory}</directory>
+ <include>${project.build.finalName}.jar</include>
+ </resource>
+ </resources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>spring-snapshots</id>
+ <name>Spring Snapshots</name>
+ <url>https://repo.spring.io/snapshot</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>spring-milestones</id>
+ <name>Spring Milestones</name>
+ <url>https://repo.spring.io/milestone</url>
+ </repository>
+ </repositories>
+
+</project>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/AppletsBackstageApplication.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/AppletsBackstageApplication.java
new file mode 100644
index 0000000..d4ca382
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/AppletsBackstageApplication.java
@@ -0,0 +1,26 @@
+package com.panzhihua.applets_backstage;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@EnableSwagger2
+@SpringCloudApplication
+@EnableCircuitBreaker
+@EnableEurekaClient
+@EnableFeignClients(basePackages = {"com.panzhihua.common.service"})
+@EnableAspectJAutoProxy(proxyTargetClass = true)
+@ComponentScan({"com.panzhihua.applets_backstage", "com.panzhihua.common"})
+public class AppletsBackstageApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(AppletsBackstageApplication.class, args);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/aop/OperLogAspect.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/aop/OperLogAspect.java
new file mode 100644
index 0000000..108e62c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/aop/OperLogAspect.java
@@ -0,0 +1,237 @@
+package com.panzhihua.applets_backstage.aop;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.constants.TokenConstant;
+import com.panzhihua.common.interfaces.OperLog;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.user.SysOperLogVO;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.AES;
+import com.panzhihua.common.utlis.IPUtil;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 切面处理类，操作日志异常日志记录处理
+ *
+ * @author wu
+ * @date 2019/03/21
+ */
+@Slf4j
+@Aspect
+@Component
+public class OperLogAspect {
+
+ @Resource
+ private UserService userService;
+
+ /**
+ * 设置操作日志切入点 记录操作日志 在注解的位置切入代码
+ */
+ @Pointcut("@annotation(com.panzhihua.common.interfaces.OperLog)")
+ public void operLogPoinCut() {}
+
+ // /**
+ // * 设置操作异常切入点记录异常日志 扫描所有controller包下操作
+ // */
+ // @Pointcut("execution(* com.hyd.zcar.cms.controller..*.*(..))")
+ // public void operExceptionLogPoinCut() {
+ // }
+
+ /**
+ * 正常返回通知，拦截用户操作日志，连接点正常执行完成后执行， 如果连接点抛出异常，则不会执行
+ *
+ * @param joinPoint
+ * 切入点
+ * @param keys
+ * 返回结果
+ */
+ @AfterReturning(value = "operLogPoinCut()", returning = "keys")
+ public void saveOperLog(JoinPoint joinPoint, Object keys) {
+ log.info("进入切面");
+ // 获取RequestAttributes
+ RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+ // 从获取RequestAttributes中获取HttpServletRequest的信息
+ HttpServletRequest request =
+ (HttpServletRequest)requestAttributes.resolveReference(RequestAttributes.REFERENCE_REQUEST);
+ // 登录对象信息
+ String userInfo = request.getHeader(TokenConstant.TOKEN_USERINFO);
+ boolean empty = ObjectUtils.isEmpty(userInfo);
+ if (empty) {
+ log.error("操作日志获取登录用户信息失败【{}】", joinPoint);
+ return;
+ }
+ byte[] bytes = AES.parseHexStr2Byte(userInfo);
+ byte[] decrypt = AES.decrypt(bytes, Constants.AES_KEY);
+ userInfo = new String(decrypt);
+ LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(userInfo, LoginUserInfoVO.class);
+
+ SysOperLogVO operlog = new SysOperLogVO();
+ try {
+
+ // 从切面织入点处通过反射机制获取织入点处的方法
+ MethodSignature signature = (MethodSignature)joinPoint.getSignature();
+ // 获取切入点所在的方法
+ Method method = signature.getMethod();
+ // 获取操作
+ OperLog opLog = method.getAnnotation(OperLog.class);
+ if (opLog != null) {
+ String operModul = opLog.operModul();
+ int operType = opLog.operType();
+ operlog.setTitle(operModul); // 操作模块
+ operlog.setBusinessType(operType); // 操作类型
+ }
+ // 获取请求的类名
+ String className = joinPoint.getTarget().getClass().getName();
+ // 获取请求的方法名
+ String methodName = method.getName();
+ methodName = className + "." + methodName;
+
+ operlog.setMethod(methodName); // 请求方法
+
+ if (joinPoint.getArgs().length > 0) {
+ for (Object o : joinPoint.getArgs()) {
+ if (o instanceof HttpServletRequest || o instanceof HttpServletResponse|| o instanceof MultipartFile) {
+ continue;
+ }
+ operlog.setOperParam(JSONObject.toJSONString(o)); // 请求参数
+ }
+ }
+
+ operlog.setJsonResult(JSONObject.toJSONString(keys)); // 返回结果
+ operlog.setAccount(loginUserInfoVO.getAccount());
+ operlog.setOperName(loginUserInfoVO.getName()); // 请求用户名称
+ operlog.setOperIp(IPUtil.getIpAddress(request)); // 请求IP
+ operlog.setOperUrl(request.getRequestURI()); // 请求URI
+ operlog.setRequestMethod(request.getMethod());
+ operlog.setOperLocation(IPUtil.getIpBelongAddress(request));
+ operlog.setOperTime(new Date()); // 创建时间
+ operlog.setAccount(loginUserInfoVO.getAccount());
+ Long communityId = loginUserInfoVO.getCommunityId();
+ operlog.setAreaCode(communityId==0 ? "510423" : loginUserInfoVO.getAreaCode());
+ operlog.setCommunityId(null == communityId ? 0 : communityId);
+ userService.addOperLog(operlog);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ // /**
+ // * 异常返回通知，用于拦截异常日志信息 连接点抛出异常后执行
+ // *
+ // * @param joinPoint 切入点
+ // * @param e 异常信息
+ // */
+ // @AfterThrowing(pointcut = "operExceptionLogPoinCut()", throwing = "e")
+ // public void saveExceptionLog(JoinPoint joinPoint, Throwable e) {
+ // // 获取RequestAttributes
+ // RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+ // // 从获取RequestAttributes中获取HttpServletRequest的信息
+ // HttpServletRequest request = (HttpServletRequest) requestAttributes
+ // .resolveReference(RequestAttributes.REFERENCE_REQUEST);
+ //
+ // ExceptionLog excepLog = new ExceptionLog();
+ // try {
+ // // 从切面织入点处通过反射机制获取织入点处的方法
+ // MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+ // // 获取切入点所在的方法
+ // Method method = signature.getMethod();
+ // excepLog.setExcId(UuidUtil.get32UUID());
+ // // 获取请求的类名
+ // String className = joinPoint.getTarget().getClass().getName();
+ // // 获取请求的方法名
+ // String methodName = method.getName();
+ // methodName = className + "." + methodName;
+ // // 请求的参数
+ // Map<String, String> rtnMap = converMap(request.getParameterMap());
+ // // 将参数所在的数组转换成json
+ // String params = JSON.toJSONString(rtnMap);
+ // excepLog.setExcRequParam(params); // 请求参数
+ // excepLog.setOperMethod(methodName); // 请求方法名
+ // excepLog.setExcName(e.getClass().getName()); // 异常名称
+ // excepLog.setExcMessage(stackTraceToString(e.getClass().getName(), e.getMessage(), e.getStackTrace())); // 异常信息
+ // excepLog.setOperUserId(UserShiroUtil.getCurrentUserLoginName()); // 操作员ID
+ // excepLog.setOperUserName(UserShiroUtil.getCurrentUserName()); // 操作员名称
+ // excepLog.setOperUri(request.getRequestURI()); // 操作URI
+ // excepLog.setOperIp(IPUtil.getRemortIP(request)); // 操作员IP
+ // excepLog.setOperVer(operVer); // 操作版本号
+ // excepLog.setOperCreateTime(new Date()); // 发生异常时间
+ //
+ // exceptionLogService.insert(excepLog);
+ //
+ // } catch (Exception e2) {
+ // e2.printStackTrace();
+ // }
+ //
+ // }
+
+ /**
+ * 转换request 请求参数
+ *
+ * @param paramMap
+ * request获取的参数数组
+ */
+ public Map<String, String> converMap(Map<String, String[]> paramMap) {
+ Map<String, String> rtnMap = new HashMap<String, String>();
+ for (String key : paramMap.keySet()) {
+ rtnMap.put(key, paramMap.get(key)[0]);
+ }
+ return rtnMap;
+ }
+
+ private String getPostData(HttpServletRequest request) {
+ StringBuffer data = new StringBuffer();
+ String line = null;
+ BufferedReader reader = null;
+ try {
+ reader = request.getReader();
+ while (null != (line = reader.readLine()))
+ data.append(line);
+ } catch (IOException e) {
+ } finally {
+ }
+ return data.toString();
+ }
+
+ /**
+ * 转换异常信息为字符串
+ *
+ * @param exceptionName
+ * 异常名称
+ * @param exceptionMessage
+ * 异常信息
+ * @param elements
+ * 堆栈信息
+ */
+ public String stackTraceToString(String exceptionName, String exceptionMessage, StackTraceElement[] elements) {
+ StringBuffer strbuff = new StringBuffer();
+ for (StackTraceElement stet : elements) {
+ strbuff.append(stet + "\n");
+ }
+ String message = exceptionName + ":" + exceptionMessage + "\n\t" + strbuff.toString();
+ return message;
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ActDynTypeApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ActDynTypeApi.java
new file mode 100644
index 0000000..8e694cb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ActDynTypeApi.java
@@ -0,0 +1,135 @@
+package com.panzhihua.applets_backstage.api;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import com.panzhihua.common.model.vos.community.ComActDynVO;
+import io.swagger.annotations.ApiImplicitParam;
+import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
+import com.panzhihua.common.model.dtos.community.EditComActDynTypeDTO;
+import com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActDynTypeVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Api(tags = {"花城资讯模块"})
+@RestController
+@RequestMapping("/dyn")
+public class ActDynTypeApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "分页查询花城资讯分类列表", response = ComActDynTypeVO.class)
+ @PostMapping("/type/page")
+ public R page(@RequestBody PageComActDynTypeDTO comActDynTypeDTO) {
+ comActDynTypeDTO.setCommunityId("0");
+ return communityService.pageDynTypeByAdmin(comActDynTypeDTO);
+ }
+
+ @ApiOperation(value = "查询花城资讯分类列表", response = ComActDynTypeVO.class)
+ @PostMapping("/type/list")
+ public R list(@RequestBody PageComActDynTypeDTO comActDynTypeDTO) {
+ comActDynTypeDTO.setCommunityId("0");
+ return communityService.getDynTypeListByAdmin(comActDynTypeDTO);
+ }
+
+ @ApiOperation(value = "新增花城资讯分类")
+ @PostMapping("/type/add")
+ public R add(@Validated @RequestBody AddComActDynTypeDTO comActDynTypeDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ comActDynTypeDTO.setCommunityId(0L);
+ comActDynTypeDTO.setUserId(loginUserInfo.getUserId());
+ return communityService.addDynTypeByAdmin(comActDynTypeDTO);
+ }
+
+ @ApiOperation(value = "编辑花城资讯分类")
+ @PostMapping("/type/edit")
+ public R add(@Validated @RequestBody EditComActDynTypeDTO comActDynTypeDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ comActDynTypeDTO.setUserId(loginUserInfo.getUserId());
+ return communityService.editDynTypeByAdmin(comActDynTypeDTO);
+ }
+
+ @ApiOperation(value = "删除花城资讯分类")
+ @PostMapping("/type/delete")
+ public R delete(@RequestBody List<Long> ids) {
+ if (ids == null || ids.size() <= 0) {
+ return R.fail("参数错误");
+ }
+ return communityService.deleteDynTypeByAdmin(ids);
+ }
+
+ @ApiOperation(value = "分页查询花城资讯", response = ComActDynVO.class)
+ @PostMapping("/pagedynamic")
+ public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
+ comActDynVO.setCommunityId("0");
+ return communityService.pageDynamicByAdmin(comActDynVO);
+ }
+
+ @ApiOperation(value = "花城资讯详情", response = ComActDynVO.class)
+ @GetMapping("/detaildynamic")
+ @ApiImplicitParam(name = "id", value = "花城资讯主键", required = true)
+ public R detailDynamic(@RequestParam("id") Long id) {
+ return communityService.detailDynamic(id);
+ }
+
+ @ApiOperation(value = "删除花城资讯")
+ @DeleteMapping("/dynamic")
+ public R deleteDynamic(@RequestBody ComActDynVO comActDynVO) {
+ Long id = comActDynVO.getId();
+ if (ObjectUtils.isEmpty(id)) {
+ return R.fail("花城资讯主键不能为空");
+ }
+ return communityService.deleteDynamic(comActDynVO);
+ }
+
+ @ApiOperation(value = "编辑花城资讯、取消置顶、设置置顶")
+ @PutMapping("/dynamic")
+ public R putDynamic(@RequestBody ComActDynVO comActDynVO) {
+ Long id = comActDynVO.getId();
+ if (ObjectUtils.isEmpty(id)) {
+ return R.fail("花城资讯主键不能为空");
+ }
+ comActDynVO.setCommunityId("0");
+ return communityService.putDynamic(comActDynVO);
+ }
+
+ @ApiOperation(value = "新增花城资讯")
+ @PostMapping("/dynamic")
+ public R addDynamic(@RequestBody ComActDynVO comActDynVO) {
+ comActDynVO.setCommunityId("0");
+ Date publishAt = comActDynVO.getPublishAt();
+ if (null == publishAt) {
+ publishAt = new Date();
+ comActDynVO.setPublishAt(publishAt);
+ }
+ long time = publishAt.getTime();
+ long l = System.currentTimeMillis();
+ if (l >= time) {
+ comActDynVO.setStatus(1);
+ }
+ return communityService.addDynamic(comActDynVO);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/AdvertisingManagementApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/AdvertisingManagementApi.java
new file mode 100644
index 0000000..6728a2a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/AdvertisingManagementApi.java
@@ -0,0 +1,178 @@
+package com.panzhihua.applets_backstage.api;
+
+import java.io.InputStream;
+import java.util.UUID;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import com.panzhihua.applets_backstage.config.MinioUtil;
+import com.panzhihua.common.utlis.MimeTypeUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.panzhihua.common.constants.FtpConstants;
+import com.panzhihua.common.interfaces.OperLog;
+import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
+import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.advertisement.ComOpsAdvJumpVO;
+import com.panzhihua.common.model.vos.advertisement.ComOpsAdvPosVO;
+import com.panzhihua.common.model.vos.advertisement.ComOpsAdvVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.SFTPUtil;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 广告管理
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-04 09:28
+ **/
+@Slf4j
+@Api(tags = {"广告管理"})
+@RestController
+@RequestMapping("/advertisingmanagement/")
+public class AdvertisingManagementApi {
+ @Resource
+ private CommunityService communityService;
+ // FTP 登录用户名
+ @Value("${ftp.username}")
+ private String userName;
+ // FTP 登录密码
+ @Value("${ftp.password}")
+ private String password;
+ // FTP 服务器地址IP地址
+ @Value("${ftp.host}")
+ private String host;
+ // FTP 端口
+ @Value("${ftp.port}")
+ private int port;
+ @Value("${ftp.url}")
+ private String url;
+
+ @Resource
+ private MinioUtil minioUtil;
+
+ @ApiOperation("新增广告")
+ @PostMapping("advertisement")
+ @OperLog(operModul = "广告管理", operType = 1)
+ public R addAdvertisement(@RequestBody @Validated(AddGroup.class) ComOpsAdvDTO comOpsAdvDTO) {
+ Integer linkType = comOpsAdvDTO.getLinkType();
+ if (linkType.intValue() == 1) {
+ Long jumpId = comOpsAdvDTO.getJumpId();
+ if (null == jumpId || 0 == jumpId.intValue()) {
+ return R.fail("跳转内容不能为空");
+ }
+ } else {
+ String jumpUrl = comOpsAdvDTO.getJumpUrl();
+ if (ObjectUtils.isEmpty(jumpUrl)) {
+ return R.fail("跳转url地址不能为空");
+ }
+ comOpsAdvDTO.setJumpId(null);
+ }
+ return communityService.addAdvertisement(comOpsAdvDTO);
+ }
+
+ @ApiOperation("编辑广告")
+ @PutMapping("advertisement")
+ @OperLog(operModul = "广告管理", operType = 2)
+ public R putAdvertisement(@RequestBody ComOpsAdvDTO comOpsAdvDTO) {
+ Long posId = comOpsAdvDTO.getPosId();
+ if (null != posId && posId == 0) {
+ comOpsAdvDTO.setPosId(null);
+ }
+ Long id = comOpsAdvDTO.getId();
+ if (null == id || id.intValue() == 0) {
+ return R.fail("广告主键不能为空");
+ }
+ Integer linkType = comOpsAdvDTO.getLinkType();
+ if (linkType.intValue() == 1) {
+ Long jumpId = comOpsAdvDTO.getJumpId();
+ if (null == jumpId || 0 == jumpId.intValue()) {
+ return R.fail("跳转内容不能为空");
+ }
+ } else {
+ String jumpUrl = comOpsAdvDTO.getJumpUrl();
+ if (ObjectUtils.isEmpty(jumpUrl)) {
+ return R.fail("跳转url地址不能为空");
+ }
+ comOpsAdvDTO.setJumpId(null);
+ }
+ return communityService.putAdvertisement(comOpsAdvDTO);
+ }
+
+ @ApiOperation(value = "广告位置下拉列表", response = ComOpsAdvPosVO.class)
+ @GetMapping("listadvpos")
+ public R listadvpos() {
+ return communityService.listAdvpos();
+ }
+
+ @ApiOperation(value = "跳转内容下拉列表", response = ComOpsAdvJumpVO.class)
+ @GetMapping("listadvjump")
+ public R listadvjump() {
+ return communityService.listAdvjump();
+ }
+
+ @ApiOperation(value = "分页查询广告", response = ComOpsAdvVO.class)
+ @PostMapping("pageadvertisement")
+ public R pageAdvertisement(@RequestBody PageComOpsAdvDTO pageComOpsAdvDTO) {
+ return communityService.pageAdvertisement(pageComOpsAdvDTO);
+ }
+
+ @ApiOperation(value = "广告详情", response = ComOpsAdvVO.class)
+ @GetMapping("advertisement")
+ public R detailAdvertisement(@RequestParam("id") Long id) {
+ return communityService.detailAdvertisement(id);
+ }
+
+ @ApiOperation(value = "上传照片")
+ @PostMapping(value = "uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-date")
+ public R uploadImage(@RequestParam MultipartFile file, HttpServletRequest request) {
+ String name = file.getOriginalFilename();
+ name = UUID.randomUUID().toString().replaceAll("-", "") + ".jpg";
+ try {
+ SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+ sftp.login();
+ InputStream is = file.getInputStream();
+ sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
+ sftp.logout();
+ return R.ok(url + "/idcard/" + name);
+ } catch (Exception e) {
+ log.error("上传照片失败【{}】", e.getMessage());
+ return R.fail();
+ }
+
+ }
+
+ @ApiOperation(value = "新上传照片接口")
+ @PostMapping(value = "/uploadimages", consumes = "multipart/*", headers = "content-type=multipart/form-date")
+ public R uploadImages(@RequestParam MultipartFile file, HttpServletRequest request) {
+ try {
+ assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+ String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+ String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
+ String imageUrl = minioUtil.upload(file, name);
+ return R.ok(imageUrl);
+ } catch (Exception e) {
+ log.error("上传照片失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+
+ @ApiOperation(value = "删除广告")
+ @DeleteMapping("advertisement")
+ public R deleteAdvertisement(@RequestParam("id") Long id) {
+ return communityService.deleteAdvertisement(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryCommodityActivityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryCommodityActivityApi.java
new file mode 100644
index 0000000..c841551
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryCommodityActivityApi.java
@@ -0,0 +1,106 @@
+package com.panzhihua.applets_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.AddComBatteryCommodityActivityDto;
+import com.panzhihua.common.model.dtos.common.EditComBatteryCommodityActivityDto;
+import com.panzhihua.common.model.dtos.common.PageComBatteryCommodityActivityDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComBatteryCommodityActivityVo;
+import com.panzhihua.common.service.community.ComBatteryCommodityActivityFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * title: 电动车商城-商家活动表(ComBatteryCommodityActivity) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-商家活动表
+ *
+ * @author lyq
+ * @date 2022-03-29 13:17:38
+ */
+@Slf4j
+@Api(tags = {"电动车商城-活动管理"})
+@RestController
+@RequestMapping("/comBatteryCommodityActivity")
+public class ComBatteryCommodityActivityApi extends BaseController {
+
+ @Resource
+ private ComBatteryCommodityActivityFeign comBatteryCommodityActivityService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryCommodityActivity 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-03-29 13:17:38
+ */
+ @ApiOperation(value = "分页查询活动列表",response = ComBatteryCommodityActivityVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComBatteryCommodityActivityDto comBatteryCommodityActivity) {
+ return this.comBatteryCommodityActivityService.queryByPage(comBatteryCommodityActivity);
+ }
+
+ /**
+ * description deleteById 删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-03-29 13:17:38
+ */
+ @ApiOperation(value = "删除活动")
+ @GetMapping("/delete")
+ public R deleteById(@RequestParam("id") Long id) {
+ return this.comBatteryCommodityActivityService.deleteById(id);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-29 13:17:38
+ */
+ @ApiOperation(value = "查询活动详情",response = ComBatteryCommodityActivityVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comBatteryCommodityActivityService.detailById(id,0L);
+ }
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comBatteryCommodityActivity 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-03-29 13:17:38
+ */
+ @ApiOperation(value = "查询活动列表",response = ComBatteryCommodityActivityVo.class)
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComBatteryCommodityActivityDto comBatteryCommodityActivity) {
+ return this.comBatteryCommodityActivityService.queryByList(comBatteryCommodityActivity);
+ }
+
+ /**
+ * 修改活动状态
+ * @param id 活动id
+ * @param status 状态
+ * @return 修改结果
+ */
+ @ApiOperation(value = "修改活动状态")
+ @GetMapping("/updateStatus")
+ public R updateStatus(@RequestParam("id") Long id,@RequestParam("status") Integer status) {
+ return this.comBatteryCommodityActivityService.updateStatus(id,status);
+ }
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryCommodityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryCommodityApi.java
new file mode 100644
index 0000000..5f84bd7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryCommodityApi.java
@@ -0,0 +1,105 @@
+package com.panzhihua.applets_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.AddComBatteryCommodityDto;
+import com.panzhihua.common.model.dtos.common.EditComBatteryCommodityDto;
+import com.panzhihua.common.model.dtos.common.PageComBatteryCommodityDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComBatteryCommodityVo;
+import com.panzhihua.common.service.community.ComBatteryCommodityFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * title: 电动车商城-商品表(ComBatteryCommodity) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-商品表
+ *
+ * @author lyq
+ * @date 2022-03-28 14:59:58
+ */
+@Slf4j
+@Api(tags = {"电动车商城-商品管理"})
+@RestController
+@RequestMapping("/comBatteryCommodity")
+public class ComBatteryCommodityApi extends BaseController {
+
+ @Resource
+ private ComBatteryCommodityFeign comBatteryCommodityService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryCommodity 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-03-28 14:59:58
+ */
+ @ApiOperation(value = "分页查询商品列表",response = ComBatteryCommodityVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComBatteryCommodityDto comBatteryCommodity) {
+ return this.comBatteryCommodityService.queryByPage(comBatteryCommodity);
+ }
+
+ /**
+ * description deleteById 删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-03-28 14:59:58
+ */
+ @ApiOperation(value = "删除商品")
+ @GetMapping("/delete")
+ public R deleteById(@RequestParam("id") Long id) {
+ return this.comBatteryCommodityService.deleteById(id);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-28 14:59:58
+ */
+ @ApiOperation(value = "查询商品详情",response = ComBatteryCommodityVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comBatteryCommodityService.detailById(id);
+ }
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comBatteryCommodity 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-03-28 14:59:58
+ */
+ @ApiOperation(value = "查询商品列表",response = ComBatteryCommodityVo.class)
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComBatteryCommodityDto comBatteryCommodity) {
+ return this.comBatteryCommodityService.queryByList(comBatteryCommodity);
+ }
+
+ /**
+ * 修改商品状态
+ * @param id 商品id
+ * @param status 商品状态
+ * @return 修改结果
+ */
+ @ApiOperation(value = "修改商品状态")
+ @GetMapping("/updateStatus")
+ public R updateStatus(@RequestParam("id") Long id,@RequestParam("status") Integer status) {
+ return this.comBatteryCommodityService.updateStatus(id,status);
+ }
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryCommodityOrderApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryCommodityOrderApi.java
new file mode 100644
index 0000000..ca8eeca
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryCommodityOrderApi.java
@@ -0,0 +1,86 @@
+package com.panzhihua.applets_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.EditOrderAddressDto;
+import com.panzhihua.common.model.dtos.common.PageComBatteryCommodityOrderDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComBatteryCommodityOrderVo;
+import com.panzhihua.common.service.community.ComBatteryCommodityOrderFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * title: 电动车商城-订单表(ComBatteryCommodityOrder) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-订单表
+ *
+ * @author lyq
+ * @date 2022-03-29 16:05:04
+ */
+@Slf4j
+@Api(tags = {"电动车商城-订单管理"})
+@RestController
+@RequestMapping("/comBatteryCommodityOrder")
+public class ComBatteryCommodityOrderApi extends BaseController {
+
+ @Resource
+ private ComBatteryCommodityOrderFeign comBatteryCommodityOrderService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryCommodityOrder 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-03-29 16:05:04
+ */
+ @ApiOperation(value = "分页查询订单列表",response = ComBatteryCommodityOrderVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComBatteryCommodityOrderDto comBatteryCommodityOrder) {
+ comBatteryCommodityOrder.setIsAdmin(1);
+ return this.comBatteryCommodityOrderService.queryByPage(comBatteryCommodityOrder);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-29 16:05:04
+ */
+ @ApiOperation(value = "查询订单详情",response = ComBatteryCommodityOrderVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comBatteryCommodityOrderService.detailById(id);
+ }
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comBatteryCommodityOrder 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-03-29 16:05:04
+ */
+ @ApiOperation(value = "查询订单列表",response = ComBatteryCommodityOrderVo.class)
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComBatteryCommodityOrderDto comBatteryCommodityOrder) {
+ return this.comBatteryCommodityOrderService.queryByList(comBatteryCommodityOrder);
+ }
+
+ @ApiOperation(value = "修改订单收货地址")
+ @PutMapping("/update/address")
+ public R updateOrderAddress(@RequestBody EditOrderAddressDto editOrderAddressDto) {
+ return this.comBatteryCommodityOrderService.updateOrderAddress(editOrderAddressDto);
+ }
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryStoreApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryStoreApi.java
new file mode 100644
index 0000000..d7e2f62
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComBatteryStoreApi.java
@@ -0,0 +1,137 @@
+package com.panzhihua.applets_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.AddComBatteryStoreDto;
+import com.panzhihua.common.model.dtos.common.EditComBatteryStoreDto;
+import com.panzhihua.common.model.dtos.common.PageComBatteryStoreDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComBatteryStoreVo;
+import com.panzhihua.common.service.community.ComBatteryStoreFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * title: 电动车商城-商家表(ComBatteryStore) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-商家表
+ *
+ * @author lyq
+ * @date 2022-03-28 13:44:43
+ */
+@Slf4j
+@Api(tags = {"电动车商城-商家管理"})
+@RestController
+@RequestMapping("/comBatteryStore")
+public class ComBatteryStoreApi extends BaseController {
+
+ @Resource
+ private ComBatteryStoreFeign comBatteryStoreService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryStore 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-03-28 13:44:43
+ */
+ @ApiOperation(value = "分页查询商家列表",response = ComBatteryStoreVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComBatteryStoreDto comBatteryStore) {
+ return this.comBatteryStoreService.queryByPage(comBatteryStore);
+ }
+
+ /**
+ * description add 新增数据
+ *
+ * @param comBatteryStore 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-03-28 13:44:43
+ */
+ @ApiOperation(value = "新增商家")
+ @PostMapping("/add")
+ public R add(@RequestBody AddComBatteryStoreDto comBatteryStore) {
+ comBatteryStore.setCreateAt(new Date());
+ comBatteryStore.setCreateBy(this.getUserId());
+ return this.comBatteryStoreService.insert(comBatteryStore);
+ }
+
+ /**
+ * description edit 编辑数据
+ *
+ * @param comBatteryStore 请求参数
+ * @return 编辑结果
+ * @author lyq
+ * @date 2022-03-28 13:44:43
+ */
+ @ApiOperation(value = "修改商家")
+ @PutMapping("/edit")
+ public R edit(@RequestBody EditComBatteryStoreDto comBatteryStore) {
+ comBatteryStore.setUpdateAt(new Date());
+ comBatteryStore.setUpdateBy(this.getUserId());
+ return this.comBatteryStoreService.update(comBatteryStore);
+ }
+
+ /**
+ * description deleteById 删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-03-28 13:44:43
+ */
+ @ApiOperation(value = "删除商家")
+ @GetMapping("/delete")
+ public R deleteById(@RequestParam("id") Long id) {
+ return this.comBatteryStoreService.deleteById(id);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-28 13:44:43
+ */
+ @ApiOperation(value = "查询商家详情",response = ComBatteryStoreVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comBatteryStoreService.detailById(id);
+ }
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comBatteryStore 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-03-28 13:44:43
+ */
+ @ApiOperation(value = "查询商家列表",response = ComBatteryStoreVo.class)
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComBatteryStoreDto comBatteryStore) {
+ return this.comBatteryStoreService.queryByList(comBatteryStore);
+ }
+
+ /**
+ * 修改电动车商家后台用户密码
+ * @param storeId 商家后台用户id
+ * @param passWord 用户需要修改的密码
+ * @return 重置密码结果
+ */
+ @ApiOperation(value = "修改商家密码")
+ @GetMapping("/resetPassword")
+ public R resetPassword(@RequestParam("storeId") Long storeId,@RequestParam("passWord") String passWord) {
+ return this.comBatteryStoreService.resetPassword(storeId,passWord);
+ }
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarBrandApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarBrandApi.java
new file mode 100644
index 0000000..1392d22
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarBrandApi.java
@@ -0,0 +1,129 @@
+package com.panzhihua.applets_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.AddComChangeCarBrandDto;
+import com.panzhihua.common.model.dtos.common.EditComChangeCarBrandDto;
+import com.panzhihua.common.model.dtos.common.PageComChangeCarBrandDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComChangeCarBrandVo;
+import com.panzhihua.common.service.community.ComChangeCarBrandFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * title: 换新车-品牌表(ComChangeCarBrand) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-品牌表
+ *
+ * @author lyq
+ * @date 2022-04-07 13:37:22
+ */
+@Slf4j
+@Api(tags = {"换新车-品牌管理"})
+@RestController
+@RequestMapping("/comChangeCarBrand")
+public class ComChangeCarBrandApi extends BaseController {
+
+ @Resource
+ private ComChangeCarBrandFeign comChangeCarBrandService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comChangeCarBrand 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-04-07 13:37:22
+ */
+ @ApiOperation(value = "分页查询品牌列表",response = ComChangeCarBrandVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComChangeCarBrandDto comChangeCarBrand) {
+ return this.comChangeCarBrandService.queryByPage(comChangeCarBrand);
+ }
+
+ /**
+ * description add 新增数据
+ *
+ * @param comChangeCarBrand 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-04-07 13:37:22
+ */
+ @ApiOperation(value = "新增品牌")
+ @PostMapping("/add")
+ public R add(@RequestBody AddComChangeCarBrandDto comChangeCarBrand) {
+ Date nowDate = new Date();
+ comChangeCarBrand.setCreateAt(nowDate);
+ comChangeCarBrand.setCreateBy(this.getUserId());
+ comChangeCarBrand.setUpdateAt(nowDate);
+ comChangeCarBrand.setUpdateBy(this.getUserId());
+ return this.comChangeCarBrandService.insert(comChangeCarBrand);
+ }
+
+ /**
+ * description edit 编辑数据
+ *
+ * @param comChangeCarBrand 请求参数
+ * @return 编辑结果
+ * @author lyq
+ * @date 2022-04-07 13:37:22
+ */
+ @ApiOperation(value = "编辑品牌")
+ @PutMapping("/edit")
+ public R edit(@RequestBody EditComChangeCarBrandDto comChangeCarBrand) {
+ comChangeCarBrand.setUpdateAt(new Date());
+ comChangeCarBrand.setUpdateBy(this.getUserId());
+ return this.comChangeCarBrandService.update(comChangeCarBrand);
+ }
+
+ /**
+ * description deleteById 删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-04-07 13:37:22
+ */
+ @ApiOperation(value = "删除品牌")
+ @GetMapping("/delete")
+ public R deleteById(@RequestParam("id") Long id) {
+ return this.comChangeCarBrandService.deleteById(id);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-04-07 13:37:22
+ */
+ @ApiOperation(value = "查询品牌详情",response = ComChangeCarBrandVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comChangeCarBrandService.detailById(id);
+ }
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comChangeCarBrand 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-04-07 13:37:22
+ */
+ @ApiOperation(value = "查询品牌列表",response = ComChangeCarBrandVo.class)
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComChangeCarBrandDto comChangeCarBrand) {
+ return this.comChangeCarBrandService.queryByList(comChangeCarBrand);
+ }
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarInquiryApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarInquiryApi.java
new file mode 100644
index 0000000..1a26392
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarInquiryApi.java
@@ -0,0 +1,80 @@
+package com.panzhihua.applets_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.AddComChangeCarInquiryDto;
+import com.panzhihua.common.model.dtos.common.EditComChangeCarInquiryDto;
+import com.panzhihua.common.model.dtos.common.PageComChangeCarInquiryDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComChangeCarInquiryVo;
+import com.panzhihua.common.service.community.ComChangeCarInquiryFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * title: 换新车-分期询价表(ComChangeCarInquiry) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-分期询价表
+ *
+ * @author lyq
+ * @date 2022-04-07 13:39:06
+ */
+@Slf4j
+@Api(tags = {"换新车-分期询价管理"})
+@RestController
+@RequestMapping("/comChangeCarInquiry")
+public class ComChangeCarInquiryApi extends BaseController {
+
+ @Resource
+ private ComChangeCarInquiryFeign comChangeCarInquiryService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comChangeCarInquiry 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-04-07 13:39:06
+ */
+ @ApiOperation(value = "分页查询分期询价列表",response = ComChangeCarInquiryVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComChangeCarInquiryDto comChangeCarInquiry) {
+ return this.comChangeCarInquiryService.queryByPage(comChangeCarInquiry);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-04-07 13:39:06
+ */
+ @ApiOperation(value = "查询分期询价详情",response = ComChangeCarInquiryVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comChangeCarInquiryService.detailById(id);
+ }
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comChangeCarInquiry 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-04-07 13:39:06
+ */
+ @ApiOperation(value = "查询分期询价列表",response = ComChangeCarInquiryVo.class)
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComChangeCarInquiryDto comChangeCarInquiry) {
+ return this.comChangeCarInquiryService.queryByList(comChangeCarInquiry);
+ }
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarModelApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarModelApi.java
new file mode 100644
index 0000000..1c8b194
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarModelApi.java
@@ -0,0 +1,141 @@
+package com.panzhihua.applets_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.AddComChangeCarModelDto;
+import com.panzhihua.common.model.dtos.common.EditComChangeCarModelDto;
+import com.panzhihua.common.model.dtos.common.PageComChangeCarModelDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComChangeCarModelVo;
+import com.panzhihua.common.service.community.ComChangeCarModelFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * title: 换新车-车型管理表(ComChangeCarModel) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-车型管理表
+ *
+ * @author lyq
+ * @date 2022-04-07 13:41:54
+ */
+@Slf4j
+@Api(tags = {"换新车-车型管理"})
+@RestController
+@RequestMapping("/comChangeCarModel")
+public class ComChangeCarModelApi extends BaseController {
+
+ @Resource
+ private ComChangeCarModelFeign comChangeCarModelService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comChangeCarModel 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-04-07 13:41:54
+ */
+ @ApiOperation(value = "分页查询车型管理列表",response = ComChangeCarModelVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComChangeCarModelDto comChangeCarModel) {
+ return this.comChangeCarModelService.queryByPage(comChangeCarModel);
+ }
+
+ /**
+ * description add 新增数据
+ *
+ * @param comChangeCarModel 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-04-07 13:41:54
+ */
+ @ApiOperation(value = "新增车型管理")
+ @PostMapping("/add")
+ public R add(@RequestBody AddComChangeCarModelDto comChangeCarModel) {
+ Date nowDate = new Date();
+ comChangeCarModel.setCreateAt(nowDate);
+ comChangeCarModel.setCreateBy(this.getUserId());
+ comChangeCarModel.setUpdateAt(nowDate);
+ comChangeCarModel.setUpdateBy(this.getUserId());
+ return this.comChangeCarModelService.insert(comChangeCarModel);
+ }
+
+ /**
+ * description edit 编辑数据
+ *
+ * @param comChangeCarModel 请求参数
+ * @return 编辑结果
+ * @author lyq
+ * @date 2022-04-07 13:41:54
+ */
+ @ApiOperation(value = "修改车型管理")
+ @PutMapping("/edit")
+ public R edit(@RequestBody EditComChangeCarModelDto comChangeCarModel) {
+ comChangeCarModel.setUpdateAt(new Date());
+ comChangeCarModel.setUpdateBy(this.getUserId());
+ return this.comChangeCarModelService.update(comChangeCarModel);
+ }
+
+ /**
+ * description deleteById 删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-04-07 13:41:54
+ */
+ @ApiOperation(value = "删除车型管理")
+ @GetMapping("/delete")
+ public R deleteById(@RequestParam("id") Long id) {
+ return this.comChangeCarModelService.deleteById(id);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-04-07 13:41:54
+ */
+ @ApiOperation(value = "查询车型管理详情",response = ComChangeCarModelVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comChangeCarModelService.detailById(id);
+ }
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comChangeCarModel 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-04-07 13:41:54
+ */
+ @ApiOperation(value = "查询车型管理列表",response = ComChangeCarModelVo.class)
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComChangeCarModelDto comChangeCarModel) {
+ return this.comChangeCarModelService.queryByList(comChangeCarModel);
+ }
+
+ /**
+ * 修改车型状态
+ * @param id 车型id
+ * @param status 车型状态
+ * @return 修改结果
+ */
+ @ApiOperation(value = "修改车型管理状态")
+ @GetMapping("/updateStatus")
+ public R updateStatus(@RequestParam("id") Long id,@RequestParam("status") Integer status) {
+ return this.comChangeCarModelService.updateStatus(id,status);
+ }
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarModelRelationApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarModelRelationApi.java
new file mode 100644
index 0000000..e5cebde
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarModelRelationApi.java
@@ -0,0 +1,121 @@
+package com.panzhihua.applets_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.AddComChangeCarModelRelationDto;
+import com.panzhihua.common.model.dtos.common.EditComChangeCarModelRelationDto;
+import com.panzhihua.common.model.dtos.common.PageComChangeCarModelRelationDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComChangeCarModelRelationVo;
+import com.panzhihua.common.service.community.ComChangeCarModelRelationFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * title: 换新车-车型与规格关联表(ComChangeCarModelRelation) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-车型与规格关联表
+ *
+ * @author lyq
+ * @date 2022-04-07 13:55:29
+ */
+@Slf4j
+@Api(tags = {"换新车-车型与规格关联管理"})
+@RestController
+@RequestMapping("/comChangeCarModelRelation")
+public class ComChangeCarModelRelationApi extends BaseController {
+
+ @Resource
+ private ComChangeCarModelRelationFeign comChangeCarModelRelationService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comChangeCarModelRelation 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-04-07 13:55:29
+ */
+ @ApiOperation(value = "分页查询车型与规格关联管理列表",response = ComChangeCarModelRelationVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComChangeCarModelRelationDto comChangeCarModelRelation) {
+ return this.comChangeCarModelRelationService.queryByPage(comChangeCarModelRelation);
+ }
+
+ /**
+ * description add 新增数据
+ *
+ * @param comChangeCarModelRelation 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-04-07 13:55:29
+ */
+ @ApiOperation(value = "新增车型与规格关联")
+ @PostMapping("/add")
+ public R add(@RequestBody AddComChangeCarModelRelationDto comChangeCarModelRelation) {
+ return this.comChangeCarModelRelationService.insert(comChangeCarModelRelation);
+ }
+
+ /**
+ * description edit 编辑数据
+ *
+ * @param comChangeCarModelRelation 请求参数
+ * @return 编辑结果
+ * @author lyq
+ * @date 2022-04-07 13:55:29
+ */
+ @ApiOperation(value = "编辑车型与规格关联")
+ @PutMapping("/edit")
+ public R edit(@RequestBody EditComChangeCarModelRelationDto comChangeCarModelRelation) {
+ return this.comChangeCarModelRelationService.update(comChangeCarModelRelation);
+ }
+
+ /**
+ * description deleteById 删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-04-07 13:55:29
+ */
+ @ApiOperation(value = "删除车型与规格关联")
+ @GetMapping("/delete")
+ public R deleteById(@RequestParam("id") Long id) {
+ return this.comChangeCarModelRelationService.deleteById(id);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-04-07 13:55:29
+ */
+ @ApiOperation(value = "查询车型与规格关联详情",response = ComChangeCarModelRelationVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comChangeCarModelRelationService.detailById(id);
+ }
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comChangeCarModelRelation 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-04-07 13:55:29
+ */
+ @ApiOperation(value = "查询车型与规格关联管理列表",response = ComChangeCarModelRelationVo.class)
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComChangeCarModelRelationDto comChangeCarModelRelation) {
+ return this.comChangeCarModelRelationService.queryByList(comChangeCarModelRelation);
+ }
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarModelSpecsApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarModelSpecsApi.java
new file mode 100644
index 0000000..cd427b9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarModelSpecsApi.java
@@ -0,0 +1,129 @@
+package com.panzhihua.applets_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.AddComChangeCarModelSpecsDto;
+import com.panzhihua.common.model.dtos.common.EditComChangeCarModelSpecsDto;
+import com.panzhihua.common.model.dtos.common.PageComChangeCarModelSpecsDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComChangeCarModelSpecsVo;
+import com.panzhihua.common.service.community.ComChangeCarModelSpecsFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * title: 换新车-车型规格表(ComChangeCarModelSpecs) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-车型规格表
+ *
+ * @author lyq
+ * @date 2022-04-07 13:55:31
+ */
+@Slf4j
+@Api(tags = {"换新车-车型规格管理"})
+@RestController
+@RequestMapping("/comChangeCarModelSpecs")
+public class ComChangeCarModelSpecsApi extends BaseController {
+
+ @Resource
+ private ComChangeCarModelSpecsFeign comChangeCarModelSpecsService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comChangeCarModelSpecs 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-04-07 13:55:31
+ */
+ @ApiOperation(value = "分页查询车型规格管理列表",response = ComChangeCarModelSpecsVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComChangeCarModelSpecsDto comChangeCarModelSpecs) {
+ return this.comChangeCarModelSpecsService.queryByPage(comChangeCarModelSpecs);
+ }
+
+ /**
+ * description add 新增数据
+ *
+ * @param comChangeCarModelSpecs 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-04-07 13:55:31
+ */
+ @ApiOperation(value = "新增车型规格")
+ @PostMapping("/add")
+ public R add(@RequestBody AddComChangeCarModelSpecsDto comChangeCarModelSpecs) {
+ Date nowDate = new Date();
+ comChangeCarModelSpecs.setCreateAt(nowDate);
+ comChangeCarModelSpecs.setCreateBy(this.getUserId());
+ comChangeCarModelSpecs.setUpdateAt(nowDate);
+ comChangeCarModelSpecs.setUpdateBy(this.getUserId());
+ return this.comChangeCarModelSpecsService.insert(comChangeCarModelSpecs);
+ }
+
+ /**
+ * description edit 编辑数据
+ *
+ * @param comChangeCarModelSpecs 请求参数
+ * @return 编辑结果
+ * @author lyq
+ * @date 2022-04-07 13:55:31
+ */
+ @ApiOperation(value = "编辑车型规格")
+ @PutMapping("/edit")
+ public R edit(@RequestBody EditComChangeCarModelSpecsDto comChangeCarModelSpecs) {
+ comChangeCarModelSpecs.setUpdateAt(new Date());
+ comChangeCarModelSpecs.setUpdateBy(this.getUserId());
+ return this.comChangeCarModelSpecsService.update(comChangeCarModelSpecs);
+ }
+
+ /**
+ * description deleteById 删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-04-07 13:55:31
+ */
+ @ApiOperation(value = "删除车型规格")
+ @GetMapping("/delete")
+ public R deleteById(@RequestParam("id") Long id) {
+ return this.comChangeCarModelSpecsService.deleteById(id);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-04-07 13:55:31
+ */
+ @ApiOperation(value = "查询车型规格管理详情",response = ComChangeCarModelSpecsVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comChangeCarModelSpecsService.detailById(id);
+ }
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comChangeCarModelSpecs 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-04-07 13:55:31
+ */
+ @ApiOperation(value = "查询车型规格管理列表",response = ComChangeCarModelSpecsVo.class)
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComChangeCarModelSpecsDto comChangeCarModelSpecs) {
+ return this.comChangeCarModelSpecsService.queryByList(comChangeCarModelSpecs);
+ }
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarModelSpecsChildrenApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarModelSpecsChildrenApi.java
new file mode 100644
index 0000000..0d1121f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComChangeCarModelSpecsChildrenApi.java
@@ -0,0 +1,121 @@
+package com.panzhihua.applets_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.AddComChangeCarModelSpecsChildrenDto;
+import com.panzhihua.common.model.dtos.common.EditComChangeCarModelSpecsChildrenDto;
+import com.panzhihua.common.model.dtos.common.PageComChangeCarModelSpecsChildrenDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComChangeCarModelSpecsChildrenVo;
+import com.panzhihua.common.service.community.ComChangeCarModelSpecsChildrenFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * title: 换新车-车型子规格表(ComChangeCarModelSpecsChildren) 表控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-车型子规格表
+ *
+ * @author lyq
+ * @date 2022-04-07 13:55:33
+ */
+@Slf4j
+@Api(tags = {"换新车-车型规格下子规格管理"})
+@RestController
+@RequestMapping("/comChangeCarModelSpecsChildren")
+public class ComChangeCarModelSpecsChildrenApi extends BaseController {
+
+ @Resource
+ private ComChangeCarModelSpecsChildrenFeign comChangeCarModelSpecsChildrenService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comChangeCarModelSpecsChildren 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-04-07 13:55:33
+ */
+ @ApiOperation(value = "分页查询车型规格下子规格管理列表",response = ComChangeCarModelSpecsChildrenVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComChangeCarModelSpecsChildrenDto comChangeCarModelSpecsChildren) {
+ return this.comChangeCarModelSpecsChildrenService.queryByPage(comChangeCarModelSpecsChildren);
+ }
+
+ /**
+ * description add 新增数据
+ *
+ * @param comChangeCarModelSpecsChildren 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-04-07 13:55:33
+ */
+ @ApiOperation(value = "新增车型规格下子规格",response = ComChangeCarModelSpecsChildrenVo.class)
+ @PostMapping("/add")
+ public R add(@RequestBody AddComChangeCarModelSpecsChildrenDto comChangeCarModelSpecsChildren) {
+ return this.comChangeCarModelSpecsChildrenService.insert(comChangeCarModelSpecsChildren);
+ }
+
+ /**
+ * description edit 编辑数据
+ *
+ * @param comChangeCarModelSpecsChildren 请求参数
+ * @return 编辑结果
+ * @author lyq
+ * @date 2022-04-07 13:55:33
+ */
+ @ApiOperation(value = "编辑车型规格下子规格",response = ComChangeCarModelSpecsChildrenVo.class)
+ @PutMapping("/edit")
+ public R edit(@RequestBody EditComChangeCarModelSpecsChildrenDto comChangeCarModelSpecsChildren) {
+ return this.comChangeCarModelSpecsChildrenService.update(comChangeCarModelSpecsChildren);
+ }
+
+ /**
+ * description deleteById 删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-04-07 13:55:33
+ */
+ @ApiOperation(value = "删除车型规格下子规格",response = ComChangeCarModelSpecsChildrenVo.class)
+ @GetMapping("/delete")
+ public R deleteById(@RequestParam("id") Long id) {
+ return this.comChangeCarModelSpecsChildrenService.deleteById(id);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-04-07 13:55:33
+ */
+ @ApiOperation(value = "查询车型规格下子规格详情",response = ComChangeCarModelSpecsChildrenVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comChangeCarModelSpecsChildrenService.detailById(id);
+ }
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comChangeCarModelSpecsChildren 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-04-07 13:55:33
+ */
+ @ApiOperation(value = "查询车型规格下子规格管理列表",response = ComChangeCarModelSpecsChildrenVo.class)
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComChangeCarModelSpecsChildrenDto comChangeCarModelSpecsChildren) {
+ return this.comChangeCarModelSpecsChildrenService.queryByList(comChangeCarModelSpecsChildren);
+ }
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComPropertyApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComPropertyApi.java
new file mode 100644
index 0000000..58a81da
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComPropertyApi.java
@@ -0,0 +1,72 @@
+package com.panzhihua.applets_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComPropertyVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zts
+ */
+@Slf4j
+@Api(tags = {"物业公司"})
+@RestController
+@RequestMapping("/comProperty")
+public class ComPropertyApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private UserService userService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "物业公司列表",response = ComPropertyVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setParamId(this.getCommunityId());
+ return this.communityService.comPropertySelectAll(commonPage);
+ }
+
+ @ApiOperation(value = "物业公司详情", response = ComPropertyVO.class)
+ @ApiImplicitParam(name = "id", value = "物业公司id", required = true)
+ @GetMapping("detail")
+ public R detailProperty(@RequestParam("id") Long id) {
+ return this.communityService.detailProperty(id);
+ }
+
+ @ApiOperation("新增投诉建议或问题留言")
+ @PostMapping("addFeedBack")
+ public R addFeedBack(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){
+ return userService.addFeedback(sysUserFeedbackDTO);
+ }
+
+/* @ApiOperation("查看自己的投诉建议或问题留言记录")
+ @GetMapping("myFeedBack")
+ public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type){
+ return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type);
+ }*/
+
+ @ApiOperation(value = "通知公告列表",response = ComPropertyVO.class)
+ @GetMapping("notice")
+ public R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId){
+ return communityService.noticeList(page,size,propertyId);
+ }
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommonDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommonDataApi.java
new file mode 100644
index 0000000..e9ca6cc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommonDataApi.java
@@ -0,0 +1,118 @@
+package com.panzhihua.applets_backstage.api;
+
+import javax.annotation.Resource;
+
+import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
+import com.panzhihua.common.model.vos.user.ComMngTagVO;
+import com.panzhihua.common.service.user.UserService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.ComMngCarSaveDTO;
+import com.panzhihua.common.model.dtos.community.PageComMngCarDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngCarVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 社区管理基础数据库管理接口
+ * @author: Null
+ * @date: 2021/3/11 13:26
+ */
+@Slf4j
+@Api(tags = {"社区管理/基础数据库"})
+@RestController
+@RequestMapping("/common/data")
+public class CommonDataApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private UserService userService;
+
+ @Value("${excel.convenientUrl}")
+ private String excelConvenientUrl = "http://panzhihua.nhys.cdnhxx.com/web/bianminfuwudaoru.xlsx";
+ // FTP 登录用户名
+ @Value("${ftp.username}")
+ private String userName;
+ // FTP 登录密码
+ @Value("${ftp.password}")
+ private String password;
+ // FTP 服务器地址IP地址
+ @Value("${ftp.host}")
+ private String host;
+ // FTP 端口
+ @Value("${ftp.port}")
+ private int port;
+ @Value("${ftp.url}")
+ private String url;
+
+ @ApiOperation(value = "分页查询车辆管理列表", response = ComMngCarVO.class)
+ @PostMapping("/car/page")
+ public R pageQueryComMngCar(@RequestBody PageComMngCarDTO pageComMngCarDTO) {
+ return communityService.pageQueryComMngCar(pageComMngCarDTO);
+ }
+
+ @ApiOperation(value = "新增/编辑车辆信息")
+ @PostMapping("/car/save")
+ public R saveComMngCar(@RequestBody ComMngCarSaveDTO comMngCarSaveDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ comMngCarSaveDTO.setCreateBy(userId);
+ return communityService.saveComMngCar(comMngCarSaveDTO);
+ }
+
+ @ApiOperation(value = "删除车辆信息")
+ @DeleteMapping("/car/delete")
+ public R deleteComMngCar(@RequestParam(value = "id") Long id) {
+ return communityService.deleteComMngCar(id);
+ }
+
+ @ApiOperation(value = "获取树结构区域信息")
+ @GetMapping(value = "arealist")
+ public R getAllArea(@ApiParam(name = "省份:四川510000",
+ required = true) @RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
+ return communityService.getCityTreeByProvinceCode(provinceAdcode, this.getAreaCode());
+ }
+
+ @ApiOperation(value = "特殊群体/分页查询标签列表", response = ComMngTagVO.class)
+ @PostMapping("/special/tags/page")
+ public R specialInputUserTags(@RequestBody PageInputUserDTO comMngUserTagDTO) {
+// Long communityId = this.getCommunityId();
+// comMngUserTagDTO.setCommunityId(communityId);
+ return userService.specialInputUserTags(comMngUserTagDTO);
+ }
+
+ /**
+ * 新增或修改特殊群体标签
+ *
+ * @param comMngTagVO
+ * @return
+ */
+ @ApiOperation(value = "特殊群体/新增或修改标签")
+ @PostMapping("/special/tags/save")
+ R saveSpecialInputUserTags(@RequestBody ComMngTagVO comMngTagVO) {
+// Long communityId = this.getLoginUserInfo().getCommunityId();
+// comMngTagVO.setCommunityId(communityId);
+ return userService.saveSpecialInputUserTags(comMngTagVO);
+ }
+
+ /**
+ * 删除特殊群体标签
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "特殊群体/删除标签")
+ @DeleteMapping("/special/tags/delete")
+ R deleteSpecialInputUserTags(@RequestParam(value = "id") Long id) {
+ return userService.deleteSpecialInputUserTags(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java
new file mode 100644
index 0000000..08f28a7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java
@@ -0,0 +1,159 @@
+package com.panzhihua.applets_backstage.api;
+
+import javax.annotation.Resource;
+
+import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
+import com.panzhihua.common.model.vos.grid.EventGridCommunityAdminVO;
+import com.panzhihua.common.utlis.Snowflake;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.interfaces.OperLog;
+import com.panzhihua.common.model.dtos.community.PageComActDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.community.ComMngStructAreaDistrictVO;
+import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
+import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 社区管理
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-15 09:54
+ **/
+@Api(tags = {"社区管理"})
+@RestController
+@RequestMapping("/communitymanager/")
+public class CommunityApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private UserService userService;
+
+ @ApiOperation(value = "分页查询小区", response = ComMngStructAreaVO.class)
+ @PostMapping("pagearea")
+ public R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO) {
+ return communityService.pageArea(comMngStructAreaVO);
+ }
+
+ // /**
+ // * 攀枝花地址json
+ // */
+ // private String
+ // panzhihuajson="[{\"district_name\":\"仁和区\",\"city_adcode\":510400,\"district_adcode\":510411,\"province_id\":23,\"id\":2004,\"province_adcode\":510000,\"city_id\":256},{\"district_name\":\"米易县\",\"city_adcode\":510400,\"district_adcode\":510421,\"province_id\":23,\"id\":2005,\"province_adcode\":510000,\"city_id\":256},{\"district_name\":\"盐边县\",\"city_adcode\":510400,\"district_adcode\":510422,\"province_id\":23,\"id\":2006,\"province_adcode\":510000,\"city_id\":256}]";
+
+ @ApiOperation(value = "新增社区", response = ComActVO.class)
+ @PostMapping("community")
+ @OperLog(operModul = "社区管理", operType = 1)
+ public R addCommunity(@Validated(AddGroup.class) @RequestBody ComActVO comActVO) {
+ comActVO.setAppId(getAppId());
+ comActVO.setCommunityId(Snowflake.getId());
+ R r = communityService.addCommunity(comActVO);
+ if (R.isOk(r)) {
+
+// ComActVO comActVO1 = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), ComActVO.class);
+ Long communityId = comActVO.getCommunityId();
+ AdministratorsUserVO administratorsUserVO = new AdministratorsUserVO();
+ administratorsUserVO.setAccount(comActVO.getAccount());
+ administratorsUserVO.setPassword(comActVO.getPassword());
+ administratorsUserVO.setName(comActVO.getContacts());
+ administratorsUserVO.setStatus(comActVO.getState() + 1);
+
+ administratorsUserVO.setType(3);
+ administratorsUserVO.setAreaId(null);
+ administratorsUserVO.setCommunityId(communityId);
+ administratorsUserVO.setRoleId(999999999l);
+ administratorsUserVO.setUserId(Snowflake.getId());
+ administratorsUserVO.setAppid(this.getAppId());
+
+ R r1 = userService.addUserBackstage(administratorsUserVO);
+
+ if (!R.isOk(r1)) {
+ // userService.deleteUserBackstage(administratorsUserVO);
+ communityService.delectCommunity(communityId);
+ }
+
+ if(R.isOk(r1))
+ {
+ addType(communityId,"资金公开");
+ addType(communityId,"资产公开");
+ addType(communityId,"资源公开");
+ addType(communityId,"村集体经济组织项目");
+ }
+
+ return r1;
+ }
+ return r;
+ }
+
+
+ private void addType(Long communityId,String name)
+ {
+ AddComActDynTypeDTO comActDynTypeDTO=new AddComActDynTypeDTO();
+ comActDynTypeDTO.setCommunityId(communityId);
+ comActDynTypeDTO.setName(name);
+ comActDynTypeDTO.setColor("#FF0000");
+ comActDynTypeDTO.setCategory(2);
+ comActDynTypeDTO.setArea("2");
+ communityService.addDynTypeByAdmin(comActDynTypeDTO);
+ }
+
+ @ApiOperation("编辑社区")
+ @PutMapping("community")
+ @OperLog(operModul = "社区管理", operType = 2)
+ public R putCommunity(@RequestBody ComActVO comActVO) {
+ Long communityId = comActVO.getCommunityId();
+ if (null == communityId || 0 == communityId) {
+ return R.fail("社区主键不能为空");
+ }
+ return communityService.putCommunity(comActVO);
+ }
+
+ @ApiOperation(value = "分页查询社区", response = ComActVO.class)
+ @PostMapping("pagecommunity")
+ public R pageCommunity(@RequestBody PageComActDTO pageComActDTO) {
+// pageComActDTO.setAreaCode(this.getAreaCode());
+ return communityService.pageCommunity(pageComActDTO);
+ }
+ @ApiOperation(value = "查询所有社区列表", response = EventGridCommunityAdminVO.class)
+ @GetMapping("/community/list")
+ public R getCommunityLists() {
+ return communityService.getCommunityLists();
+ }
+
+ @ApiOperation(value = "所在地地址下拉列表", response = ComMngStructAreaDistrictVO.class)
+ @PostMapping("listarea")
+ public R listArea() {
+ Long cityAdcode = 510400l;
+ return communityService.listAreaDistrict(cityAdcode);
+ }
+
+ @ApiOperation(value = "社区详情", response = ComActVO.class)
+ @GetMapping("community")
+ public R detailCommunity(@RequestParam("id") Long id) {
+ return communityService.detailCommunity(id);
+ }
+
+ @ApiOperation("删除社区")
+ @DeleteMapping("/remove/{id}")
+ public R removeCommunity(@PathVariable("id")Long id){
+ return communityService.removeCommunity(id);
+ }
+
+ @ApiOperation("重置密码")
+ @PostMapping("/repass")
+ public R repass(@RequestBody ComActVO comActVO){
+ return communityService.repassCommunity(comActVO);
+ }
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java
new file mode 100644
index 0000000..8029789
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java
@@ -0,0 +1,464 @@
+package com.panzhihua.applets_backstage.api;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.time.Instant;
+import java.util.UUID;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+import com.panzhihua.common.model.dtos.community.convenient.*;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientGoodsCategoryVO;
+import com.panzhihua.common.utlis.MimeTypeUtils;
+import io.swagger.annotations.*;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.alibaba.excel.EasyExcel;
+import com.jcraft.jsch.SftpException;
+import com.panzhihua.applets_backstage.config.MinioUtil;
+import com.panzhihua.common.constants.FtpConstants;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.listen.ComCvtServeExcelListen;
+import com.panzhihua.common.model.dtos.community.ComCvtBusinessDTO;
+import com.panzhihua.common.model.dtos.community.ComCvtCategoryDTO;
+import com.panzhihua.common.model.dtos.community.ComCvtServeDTO;
+import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
+import com.panzhihua.common.model.dtos.community.PageComCvtCategoryDTO;
+import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
+import com.panzhihua.common.model.vos.community.ComCvtCategoryVO;
+import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
+import com.panzhihua.common.model.vos.community.ComCvtServeVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.SFTPUtil;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import lombok.extern.slf4j.Slf4j;
+
+import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;
+
+/**
+ * @description: 社区便民服务商家接口
+ * @author: Null
+ * @date: 2021/3/11 13:26
+ */
+@Slf4j
+@Api(tags = {"社区运营/便民服务"})
+@RestController
+@RequestMapping("/convenient")
+public class CommunityConvenientApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @Resource
+ private MinioUtil minioUtil;
+
+ @Value("${excel.convenientUrl}")
+ private String excelConvenientUrl = "http://panzhihua.nhys.cdnhxx.com/web/bianminfuwudaoru.xlsx";
+ // FTP 登录用户名
+ @Value("${ftp.username}")
+ private String userName;
+ // FTP 登录密码
+ @Value("${ftp.password}")
+ private String password;
+ // FTP 服务器地址IP地址
+ @Value("${ftp.host}")
+ private String host;
+ // FTP 端口
+ @Value("${ftp.port}")
+ private int port;
+ @Value("${ftp.url}")
+ private String url;
+
+ @Deprecated
+ @ApiOperation(value = "分页查询便民服务商家", response = ComCvtBusinessVO.class)
+ @PostMapping("/business/page")
+ public R pageComCvtBusiness(@RequestBody PageComCvtBusinessDTO pageComCvtBusinessDTO) {
+ return communityService.pageComCvtBusiness(pageComCvtBusinessDTO);
+ }
+
+ @Deprecated
+ @ApiOperation(value = "新增便民服务商家")
+ @PostMapping("/business/add")
+ public R addComCvtBusiness(@RequestBody ComCvtBusinessDTO comCvtBusinessDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ comCvtBusinessDTO.setCreateBy(userId);
+ return communityService.addComCvtBusiness(comCvtBusinessDTO);
+ }
+
+ @Deprecated
+ @ApiOperation(value = "编辑便民服务商家")
+ @PutMapping("/business/put")
+ public R putComCvtBusiness(@RequestBody ComCvtBusinessDTO comCvtBusinessDTO) {
+ return communityService.putComCvtBusiness(comCvtBusinessDTO);
+ }
+
+ @Deprecated
+ @ApiOperation(value = "查询便民服务商家详情")
+ @GetMapping("/business/get")
+ public R getComCvtBusiness(@RequestParam("id") Long id) {
+ return communityService.getComCvtBusiness(id);
+ }
+
+ @Deprecated
+ @ApiOperation(value = "删除便民服务商家详情")
+ @DeleteMapping("/business/delete")
+ public R deleteComCvtBusiness(@RequestParam("id") Long id) {
+ return communityService.deleteComCvtBusiness(id);
+ }
+
+ @Deprecated
+ @ApiOperation(value = "分页查询便民服务分类", response = ComCvtCategoryVO.class)
+ @PostMapping("/category/page")
+ public R pageComCvtCategory(@RequestBody PageComCvtCategoryDTO pageComCvtCategoryDTO) {
+ return communityService.pageComCvtCategory(pageComCvtCategoryDTO);
+ }
+
+ @Deprecated
+ @ApiOperation(value = "查询便民服务所有分类，下拉框", response = ComCvtCategoryVO.class)
+ @PostMapping("/category/all")
+ public R allComCvtCategory() {
+ return communityService.allComCvtCategory();
+ }
+
+ @Deprecated
+ @ApiOperation(value = "新增便民服务分类")
+ @PostMapping("/category/add")
+ public R pageComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO) {
+ return communityService.addComCvtCategory(comCvtCategoryDTO);
+ }
+
+ @Deprecated
+ @ApiOperation(value = "编辑便民服务分类")
+ @PutMapping("/category/put")
+ public R putComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO) {
+ return communityService.putComCvtCategory(comCvtCategoryDTO);
+ }
+
+ @Deprecated
+ @ApiOperation(value = "查询便民服务分类详情", response = ComCvtCategoryVO.class)
+ @GetMapping("/category/get")
+ public R getComCvtCategory(@RequestParam("id") Long id) {
+ return communityService.getComCvtCategory(id);
+ }
+
+ @Deprecated
+ @ApiOperation(value = "删除便民服务分类信息")
+ @DeleteMapping("/category/delete")
+ public R deleteComCvtCategory(@RequestParam("id") Long id) {
+ return communityService.deleteComCvtCategory(id);
+ }
+
+ @Deprecated
+ @ApiOperation(value = "分页查询便民服务", response = ComCvtServeVO.class)
+ @PostMapping("/serve/page")
+ public R pageComCvtServe(@RequestBody PageComCvtServeDTO pageComCvtServeDTO) {
+ return communityService.pageComCvtServe(pageComCvtServeDTO);
+ }
+
+ @Deprecated
+ @ApiOperation(value = "新增便民服务")
+ @PostMapping("/serve/add")
+ public R addComCvtServe(@RequestBody ComCvtServeDTO comCvtServeDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ comCvtServeDTO.setCreateBy(userId);
+ return communityService.addComCvtServe(comCvtServeDTO);
+ }
+
+ @Deprecated
+ @ApiOperation(value = "编辑便民服务")
+ @PutMapping("/serve/put")
+ public R putComCvtServe(@RequestBody ComCvtServeDTO comCvtServeDTO) {
+ return communityService.putComCvtServe(comCvtServeDTO);
+ }
+
+ @Deprecated
+ @ApiOperation(value = "查询便民服务详情", response = ComCvtServeVO.class)
+ @GetMapping("/serve/get")
+ public R getComCvtServe(@RequestParam("id") Long id) {
+ return communityService.getComCvtServe(id);
+ }
+
+ @Deprecated
+ @ApiOperation(value = "删除便民服务信息")
+ @DeleteMapping("/serve/delete")
+ public R deleteComCvtServe(@RequestParam("id") Long id) {
+ return communityService.deleteComCvtServe(id);
+ }
+
+ @ApiOperation(value = "下载模板-便民服务")
+ @GetMapping(value = "/serve/download/template")
+ public R downloadTemplate(HttpServletResponse response) throws IOException, SftpException {
+ return R.ok(excelConvenientUrl);
+ }
+
+ @ApiOperation(value = "上传文件")
+ @PostMapping(value = "/upload/file", consumes = "multipart/*", headers = "content-type=multipart/form-date")
+ public R uploadImage(@RequestParam MultipartFile file, HttpServletRequest request) {
+ String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+ String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
+ try {
+ assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+ SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+ sftp.login();
+ InputStream is = file.getInputStream();
+ sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
+ sftp.logout();
+ return R.ok(url + "/idcard/" + name);
+ } catch (Exception e) {
+ log.error("上传照片失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+
+ @ApiOperation(value = "新上传照片接口")
+ @PostMapping(value = "/upload/files", consumes = "multipart/*", headers = "content-type=multipart/form-date")
+ public R uploadImages(@RequestParam MultipartFile file, HttpServletRequest request) {
+ try {
+ assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+ String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+ String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension;
+ String imageUrl = minioUtil.upload(file, name);
+ return R.ok(imageUrl);
+ } catch (Exception e) {
+ log.error("上传照片失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+
+ @ApiOperation(value = "excel导入便民服务")
+ @PostMapping(value = "/serve/import", consumes = "multipart/*", headers = "content-type=multipart/form-date")
+ public R downloadTemplate(@RequestParam MultipartFile file, HttpServletRequest request) {
+ String fileName = file.getOriginalFilename(); // 获取文件名
+ log.info("传入文件名字【{}】", fileName);
+ InputStream inputStream = null;
+ try {
+ inputStream = file.getInputStream();
+ EasyExcel.read(inputStream, ComCvtServeExcelVO.class, new ComCvtServeExcelListen(communityService, null))
+ .sheet().doRead();
+ } catch (IOException e) {
+ e.printStackTrace();
+ log.error("导入模板失败【{}】", e.getMessage());
+ return R.fail(e.getMessage());
+ }
+ return R.ok();
+ }
+
+ @ApiOperation(value = "新增便民服务分类")
+ @PostMapping("/service-category/add")
+ public R addServiceCategory(@RequestBody @Validated(AddGroup.class) ConvenientServiceCategoryDTO convenientServiceCategoryDTO) {
+ convenientServiceCategoryDTO.setCreatedBy(this.getUserId());
+ convenientServiceCategoryDTO.setAreaCode(this.getAreaCode());
+ return communityService.addServiceCategory(convenientServiceCategoryDTO);
+ }
+
+ @ApiOperation(value = "编辑便民服务分类")
+ @PutMapping("/service-category/put")
+ public R putServiceCategory(@RequestBody @Validated(PutGroup.class) ConvenientServiceCategoryDTO convenientServiceCategoryDTO) {
+ convenientServiceCategoryDTO.setUpdatedBy(this.getUserId());
+ return communityService.putServiceCategory(convenientServiceCategoryDTO);
+ }
+
+ @ApiOperation(value = "删除便民服务分类")
+ @DeleteMapping("/service-category/delete")
+ public R deleteServiceCategory(@RequestParam("categoryId")
+ @ApiParam(value = "便民服务分类id", required = true)
+ Long categoryId) {
+ return communityService.deleteServiceCategory(categoryId, this.getUserId());
+ }
+
+ @ApiOperation(value = "查询便民服务分类详情", response = ConvenientServiceCategoryVO.class)
+ @GetMapping("/service-category/get")
+ public R getServiceCategory(@RequestParam("categoryId")
+ @ApiParam(value = "便民服务分类id", required = true)
+ Long categoryId) {
+ return communityService.getServiceCategory(categoryId);
+ }
+
+ @ApiOperation(value = "分页查询便民服务分类", response = ConvenientServiceCategoryVO.class)
+ @PostMapping("/service-category/page")
+ public R pageServiceCategory(@RequestBody PageConvenientServiceCategoryDTO pageConvenientServiceCategoryDTO) {
+ pageConvenientServiceCategoryDTO.setAreaCode(this.getAreaCode());
+ return communityService.pageServiceCategory(pageConvenientServiceCategoryDTO);
+ }
+
+ @ApiOperation(value = "新增便民服务商家")
+ @PostMapping("/merchant/add")
+ public R addMerchant(@RequestBody @Validated(AddGroup.class) ConvenientMerchantDTO convenientMerchantDTO) {
+ convenientMerchantDTO.setCreatedBy(this.getUserId());
+ convenientMerchantDTO.setAreaCode(this.getAreaCode());
+ return communityService.addMerchant(convenientMerchantDTO);
+ }
+
+ @ApiOperation(value = "编辑便民服务商家")
+ @PutMapping("/merchant/put")
+ public R putMerchant(@RequestBody @Validated(PutGroup.class) ConvenientMerchantDTO convenientMerchantDTO) {
+ convenientMerchantDTO.setUpdatedBy(this.getUserId());
+ return communityService.putMerchant(convenientMerchantDTO);
+ }
+
+ @ApiOperation(value = "查询便民服务商家详情", response = ConvenientMerchantVO.class)
+ @GetMapping("/merchant/get")
+ public R getMerchant(@RequestParam("merchantId") Long merchantId) {
+ return communityService.getMerchant(merchantId);
+ }
+
+ @ApiOperation(value = "删除便民服务商家")
+ @DeleteMapping("/merchant/delete")
+ public R deleteMerchant(@RequestParam("merchantId") Long merchantId) {
+ return communityService.deleteMerchant(merchantId, this.getUserId());
+ }
+
+ @ApiOperation(value = "分页查询便民服务商家", response = ConvenientMerchantVO.class)
+ @PostMapping("/merchant/page")
+ public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO) {
+ pageConvenientMerchantDTO.setAreaCode(this.getAreaCode());
+ return communityService.pageMerchant(pageConvenientMerchantDTO);
+ }
+
+ @ApiOperation(value = "禁用/启用便民服务商家")
+ @PutMapping("/merchant/disable-or-enable")
+ public R disableOrEnableMerchant(@RequestBody @Valid DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO) {
+ disableOrEnableConvenientMerchantDTO.setUpdatedBy(this.getUserId());
+ return communityService.disableOrEnableMerchant(disableOrEnableConvenientMerchantDTO);
+ }
+
+ @ApiOperation(value = "重置便民服务商家账号密码")
+ @PutMapping("/merchant/reset-password")
+ public R resetPasswordMerchant(@RequestBody @Valid ResetPasswordConvenientMerchantDTO resetPasswordConvenientMerchantDTO) {
+ resetPasswordConvenientMerchantDTO.setUpdatedBy(this.getUserId());
+ return communityService.resetPasswordMerchant(resetPasswordConvenientMerchantDTO);
+ }
+
+ @ApiOperation(value = "社区下拉列表", response = ComActVO.class)
+ @GetMapping("/community")
+ public R listCommunity() {
+ return communityService.listCommunityAll(this.getAreaCode());
+ }
+
+ @ApiOperation(value = "所有服务分类", response = ConvenientServiceCategoryVO.class)
+ @GetMapping("/service-category/all")
+ public R getAllServiceCategories() {
+ return communityService.getAllServiceCategories(this.getAreaCode());
+ }
+
+
+ @ApiOperation(value = "分页查询自提点", response = ConvenientElevatingPointVO.class)
+ @PostMapping("/point/page")
+ public R pagePoint(@RequestBody PageConvenientElevatingPointDTO pageConvenientElevatingPointDTO) {
+ return communityService.pagePoint(pageConvenientElevatingPointDTO);
+ }
+
+ @ApiOperation(value = "新增自提点")
+ @PostMapping("/point/add")
+ public R addPoint(@RequestBody @Validated(AddGroup.class) ConvenientElevatingPointDTO convenientElevatingPointDTO) {
+ convenientElevatingPointDTO.setCreatedBy(this.getUserId());
+ return communityService.addPoint(convenientElevatingPointDTO);
+ }
+
+ @ApiOperation(value = "编辑自提点")
+ @PutMapping("/point/put")
+ public R putPoint(@RequestBody @Validated(PutGroup.class) ConvenientElevatingPointDTO convenientElevatingPointDTO) {
+ convenientElevatingPointDTO.setUpdatedBy(this.getUserId());
+ convenientElevatingPointDTO.setCreatedBy(this.getUserId());
+ return communityService.putPoint(convenientElevatingPointDTO);
+ }
+
+ @ApiOperation(value = "删除自提点")
+ @DeleteMapping("/point/delete")
+ public R deletePoint(@RequestParam("pointId") @ApiParam(value = "自提点id", required = true)
+ Long pointId) {
+ return communityService.deletePoint(pointId, this.getUserId());
+ }
+ @ApiOperation(value = "自提点详情")
+ @GetMapping("/point/detail")
+ public R detailPoint(@RequestParam("pointId") @ApiParam(value = "自提点id", required = true) Long pointId) {
+ return communityService.detailPoint(pointId);
+ }
+
+
+ @ApiOperation(value = "新增商品分类")
+ @PostMapping("/goodsCategory/add")
+ public R addGoodsCategory(@RequestBody @Validated(AddGroup.class) ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO) {
+ convenientGoodsCategoryDTO.setCreatedBy(this.getUserId());
+ convenientGoodsCategoryDTO.setAreaCode(this.getAreaCode());
+ return communityService.addGoodsCategory(convenientGoodsCategoryDTO);
+ }
+
+ @ApiOperation(value = "编辑商品分类")
+ @PutMapping("/goodsCategory/put")
+ public R putGoodsCategory(@RequestBody @Validated(PutGroup.class) ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO) {
+ convenientGoodsCategoryDTO.setUpdatedBy(this.getUserId());
+ return communityService.putGoodsCategory(convenientGoodsCategoryDTO);
+ }
+
+ @ApiOperation(value = "删除商品分类")
+ @DeleteMapping("/goodsCategory/delete")
+ public R deleteGoodsCategory(@RequestParam("categoryId") @ApiParam(value = "商品分类id", required = true) Long categoryId) {
+ return communityService.deleteGoodsCategory(categoryId, this.getUserId());
+ }
+
+ @ApiOperation(value = "查询商品分类详情", response = ConvenientGoodsCategoryVO.class)
+ @GetMapping("/goodsCategory/get")
+ public R getGoodsCategory(@RequestParam("categoryId") @ApiParam(value = "商品分类id", required = true) Long categoryId) {
+ return communityService.getGoodsCategory(categoryId);
+ }
+
+ @ApiOperation(value = "分页查询商品分类", response = ConvenientGoodsCategoryVO.class)
+ @PostMapping("/goodsCategory/page")
+ public R pageGoodsCategory(@RequestBody PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO) {
+ pageConvenientGoodsCategoryDTO.setAreaCode(this.getAreaCode());
+ return communityService.pageGoodsCategory(pageConvenientGoodsCategoryDTO);
+ }
+
+
+ /**
+ * 商家后台经营数据统计-上
+ * @param storeId
+ * @return
+ */
+ @GetMapping("/merchant/selectSumOrderAndAmountByStoreId")
+ @ApiOperation(value = "经营数据统计-上")
+ public R selectSumOrderAndAmountByStoreId(@RequestParam("storeId") Long storeId){
+ return communityService.selectSumOrderAndAmountByStoreId(storeId);
+ }
+
+ /**
+ * 统计时间区域的订单量 15天 30天 一年
+ * @param storeId
+ * @param type
+ * @return
+ */
+ @GetMapping("/merchant/selectOrderLineChart")
+ @ApiOperation(value = "统计时间区域的订单量 15天 30天 一年")
+ @ApiImplicitParams({@ApiImplicitParam(name = "storeId", value = "商家id"),
+ @ApiImplicitParam(name = "type", value = "类型 1.近15天 2.近30天 3.今年"),
+ @ApiImplicitParam(name = "tab", value = "tab 1.订单量 2.营业收入")})
+ public R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type") Integer type,@RequestParam("tab") Integer tab){
+ return communityService.selectOrderLineChart(storeId,type,tab);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/EasyPhotoClassifyApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/EasyPhotoClassifyApi.java
new file mode 100644
index 0000000..c252df2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/EasyPhotoClassifyApi.java
@@ -0,0 +1,56 @@
+package com.panzhihua.applets_backstage.api;
+
+import javax.annotation.Resource;
+
+import com.panzhihua.common.controller.BaseController;
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Api(tags = {"随手拍分类"})
+@RestController
+@RequestMapping("/classify")
+public class EasyPhotoClassifyApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "随手拍分类-新增")
+ @PostMapping("/add")
+ public R addPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) {
+ addPhotoClassify.setAreaCode(this.getAreaCode());
+ return communityService.addPhotoClassify(addPhotoClassify);
+ }
+
+ @ApiOperation(value = "随手拍分类-编辑")
+ @PostMapping("/edit")
+ public R editPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) {
+ return communityService.editPhotoClassify(addPhotoClassify);
+ }
+
+ @ApiOperation(value = "随手拍分类-分页")
+ @PostMapping("/page")
+ public R pagePhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) {
+ addPhotoClassify.setAreaCode(this.getAreaCode());
+ return communityService.pagePhotoClassify(addPhotoClassify);
+ }
+
+ @ApiOperation(value = "随手拍分类-详情")
+ @GetMapping("/detail")
+ public R detailPhotoClassify(@RequestParam("id") Long id) {
+ return communityService.detailPhotoClassify(id);
+ }
+
+ @ApiOperation(value = "随手拍分类-删除")
+ @GetMapping("/delete")
+ public R deletePhotoClassify(@RequestParam("id") Long id) {
+ return communityService.deletePhotoClassify(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/HouseApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/HouseApi.java
new file mode 100644
index 0000000..0c97c9e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/HouseApi.java
@@ -0,0 +1,77 @@
+package com.panzhihua.applets_backstage.api;
+
+import javax.annotation.Resource;
+
+import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
+import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComOpsHouseVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 房屋租售
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-22 15:30
+ **/
+@Slf4j
+@Api(tags = {"房屋租售"})
+@RestController
+@RequestMapping("/")
+public class HouseApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "房屋租售-新增")
+ @PostMapping("house")
+ public R addHouse(@RequestBody @Validated(AddGroup.class) ComOpsHouseDTO comOpsHouseDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ Long communityId = loginUserInfo.getCommunityId();
+ comOpsHouseDTO.setUserId(userId);
+ comOpsHouseDTO.setCommunityId(communityId);
+ comOpsHouseDTO.setUserType(2);
+ return communityService.addOpsHouse(comOpsHouseDTO);
+ }
+
+ @ApiOperation(value = "房屋租售-详情", response = ComOpsHouseVO.class)
+ @GetMapping("house")
+ public R detailHouse(@RequestParam("id") Long id) {
+ return communityService.detailOpsHouse(id);
+ }
+
+ @ApiOperation(value = "编辑/审核房屋租售")
+ @PutMapping("activity")
+ public R putActivity(@RequestBody ComOpsHouseVO comOpsHouseVO) {
+ Long id = comOpsHouseVO.getId();
+ if (ObjectUtils.isEmpty(id)) {
+ return R.fail("房屋租售id主键不能为空");
+ }
+ return communityService.putOpsHouse(comOpsHouseVO);
+ }
+
+ @ApiOperation(value = "房屋租售-删除")
+ @DeleteMapping("house")
+ public R deleteHouse(@RequestParam("id") Long id) {
+ return communityService.deleteOpsHouse(id);
+ }
+
+ @ApiOperation(value = "房屋租售-分页查询", response = ComOpsHouseVO.class)
+ @PostMapping("pagehouse")
+ public R pageHouse(@RequestBody PageComOpsHouseDTO pageComOpsHouseDTO) {
+ pageComOpsHouseDTO.setAreaCode(this.getAreaCode());
+ return communityService.pageOpsHouse(pageComOpsHouseDTO);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java
new file mode 100644
index 0000000..a0bb02c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java
@@ -0,0 +1,244 @@
+package com.panzhihua.applets_backstage.api;
+
+import javax.annotation.Resource;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.alibaba.fastjson.JSONArray;
+import com.panzhihua.applets_backstage.config.SFTPConfig;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.excel.CustomSheetWriteHandler;
+import com.panzhihua.common.model.dtos.DataKanBansDto;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.community.IndexUserStatisticsVo;
+import com.panzhihua.common.model.vos.community.IndexUserStreetExcelExportVo;
+import com.panzhihua.common.model.vos.user.*;
+import com.panzhihua.common.utlis.SFTPUtil;
+import com.panzhihua.common.utlis.StringUtils;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.model.vos.IndexDataKanbanVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.user.UserService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 首页接口
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-05 15:17
+ **/
+@Slf4j
+@Api(tags = {"首页接口"})
+@RestController
+@RequestMapping("/index/")
+public class IndexApi extends BaseController {
+ @Resource
+ private UserService userService;
+
+ @Resource
+ private SFTPConfig sftpConfig;
+
+ @ApiOperation(value = "数据看板", response = IndexDataKanbanVO.class)
+ @GetMapping("datakanban")
+ public R dataKanban() {
+ return userService.dataKanban(this.getAreaCode());
+ }
+
+ @ApiOperation(value = "数据看板", response = IndexDataKanbanVO.class)
+ @PostMapping("datakanbans")
+ public R dataKanBans(@RequestBody DataKanBansDto dataKanBansDto) {
+ dataKanBansDto.setAreaCode(this.getAreaCode());
+ dataKanBansDto.setAppId(this.getAppId());
+ return userService.dataKanBans(dataKanBansDto);
+ }
+
+ @ApiOperation(value = "社区通统计数据汇总", response = IndexUserStatisticsVo.class)
+ @GetMapping("statistics")
+ public R communityStatistics() {
+ return userService.communityStatistics(this.getAppId());
+ }
+
+ @ApiOperation(value = "社区通统计数据导出")
+ @GetMapping("statistics/export")
+ public R communityStatisticsExport() {
+ String url = sftpConfig.getExcelUrl();
+ String name = "社区通用户统计导出数据.xlsx";
+ String ftpUrl = "/mnt/data/web/excel/";
+ R r = userService.communityStatisticsExport(this.getAreaCode());
+ if (R.isOk(r)) {
+ List<IndexUserStreetExcelExportVo> resultList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), IndexUserStreetExcelExportVo.class);
+ try {
+ SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ // 这里 需要指定写用哪个class去写
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ excelWriter = EasyExcel.write(fileName, IndexUserStreetExcelExportVo.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet("社区通用户统计导出数据").build();
+ excelWriter.write(resultList, writeSheet);
+ excelWriter.finish();
+ File file = new File(fileName);
+ inputStream = new FileInputStream(file);
+ sftp.uploadMore(ftpUrl, name, inputStream);
+ sftp.logout();
+ inputStream.close();
+ String absolutePath = file.getAbsolutePath();
+ boolean delete = file.delete();
+ log.info("删除excel【{}】结果【{}】", absolutePath, delete);
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ }
+ return R.ok(url + name);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+ return r;
+ }
+ @ApiOperation(value = "新数据看板:数据总览", response = IndexDataAnalysisVO.class)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "type",value = "数据范围,1:所有区县，2：所有街道，3：所有社区，4：跟据街道筛选,5:按区县筛选",dataType = "Integer"),
+ @ApiImplicitParam(name = "streetId",value = "街道ID",dataType = "String"),
+ @ApiImplicitParam(name = "areaCode",value = "区县code",dataType = "String")
+ })
+ @GetMapping("/indexData/total/Data")
+ public R indexData(@RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "streetId",required = false) String streetId,
+ @RequestParam(value = "areaCode",required = false) String areaCode){
+ Long sId=null;
+ Long aCode=null;
+ if (StringUtils.isNotEmpty(streetId)){
+ sId=Long.parseLong(streetId);
+ }
+ if (StringUtils.isNotEmpty(areaCode)){
+ aCode=Long.parseLong(areaCode);
+ }
+ return userService.newIndexData(type, sId,aCode,this.getAppId());
+ }
+
+ @ApiOperation(value = "新数据看板:用户占比", response = UserRateVO.class)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "type",value = "数据范围,1:所有区县，2：所有街道，3：所有社区，4：跟据街道筛选,5:按区县筛选",dataType = "Integer"),
+ @ApiImplicitParam(name = "range",value = "本月或累计,默认累计不传，1：本月",dataType = "String"),
+ @ApiImplicitParam(name = "streetId",value = "街道ID",dataType = "String"),
+ @ApiImplicitParam(name = "areaCode",value = "区县code",dataType = "String")
+ })
+ @GetMapping("indexData/userRate")
+ public R userRate(@RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "range",required = false) String range,
+ @RequestParam(value = "streetId",required = false) String streetId,
+ @RequestParam(value = "areaCode",required = false) String areaCode){
+ Long sId=null;
+ Long aCode=null;
+ Integer r=null;
+ if (StringUtils.isNotEmpty(streetId)){
+ sId=Long.parseLong(streetId);
+ }
+ if (StringUtils.isNotEmpty(areaCode)){
+ aCode=Long.parseLong(areaCode);
+ }
+ if (StringUtils.isNotEmpty(range)){
+ r=Integer.parseInt(range);
+ }
+ return userService.userRate(type, sId,aCode,r,this.getAppId());
+ }
+
+ @ApiOperation(value = "新数据看板:实名用户", response = RealUserVO.class)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "type",value = "数据范围,1:所有区县，2：所有街道，3：所有社区，4：跟据街道筛选,5:按区县筛选",dataType = "Integer"),
+ @ApiImplicitParam(name = "range",value = "本月或累计,默认累计不传，1：本月",dataType = "String"),
+ @ApiImplicitParam(name = "streetId",value = "街道ID",dataType = "String"),
+ @ApiImplicitParam(name = "areaCode",value = "区县code",dataType = "String")
+ })
+ @GetMapping("/indexData/realUser")
+ public R realUser(@RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "streetId",required = false) String streetId,
+ @RequestParam(value = "areaCode",required = false) String areaCode,
+ @RequestParam(value = "range",required = false) String range){
+ Long sId=null;
+ Long aCode=null;
+ Integer r=null;
+ if (StringUtils.isNotEmpty(streetId)){
+ sId=Long.parseLong(streetId);
+ }
+ if (StringUtils.isNotEmpty(areaCode)){
+ aCode=Long.parseLong(areaCode);
+ }
+ if (StringUtils.isNotEmpty(range)){
+ r=Integer.parseInt(range);
+ }
+ return userService.realUser(type,sId,aCode,r,this.getAppId());
+ }
+
+ @ApiOperation(value = "新数据看板:用户行为分析", response = UserActivityAnalysisVO.class)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "type",value = "数据范围,1:所有区县，2：所有街道，3：所有社区，4：跟据街道筛选,5:按区县筛选",dataType = "Integer"),
+ @ApiImplicitParam(name = "range",value = "本月或累计,不传默认累计，1：本月",dataType = "String"),
+ @ApiImplicitParam(name = "streetId",value = "街道ID",dataType = "String"),
+ @ApiImplicitParam(name = "areaCode",value = "区县code",dataType = "String")
+ })
+ @GetMapping("/indexData/userActivity")
+ public R userActivity(@RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "streetId",required = false) String streetId,
+ @RequestParam(value = "areaCode",required = false) String areaCode,
+ @RequestParam(value = "range",required = false) String range){
+ Long sId=null;
+ Long aCode=null;
+ Integer r=null;
+ if (StringUtils.isNotEmpty(streetId)){
+ sId=Long.parseLong(streetId);
+ }
+ if (StringUtils.isNotEmpty(areaCode)){
+ aCode=Long.parseLong(areaCode);
+ }
+ if (StringUtils.isNotEmpty(range)){
+ r=Integer.parseInt(range);
+ }
+ return userService.userActivity(type,sId,aCode,r, this.getAppId());
+ }
+
+ @ApiOperation(value = "获取区县街道选项",response = AreaVO.class)
+ @GetMapping("/indexData/getAreaAndStreet")
+ public R getAreaAndStreet(){
+ return userService.getAreaAndStreet();
+ }
+
+
+ @GetMapping("/getAllCommunityList")
+ @ApiOperation(value = "获取当前账号下的社区/村落列表",response = StreetVO.class)
+ public R communityList(){
+ return userService.getAllCommunityList();
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/KaphtchaApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/KaphtchaApi.java
new file mode 100644
index 0000000..ed6a518
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/KaphtchaApi.java
@@ -0,0 +1,80 @@
+package com.panzhihua.applets_backstage.api;
+
+import com.google.code.kaptcha.impl.DefaultKaptcha;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.utlis.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.time.Duration;
+
+/**
+ * @author zzj
+ */
+@Api(tags = {"验证码接口"})
+@RestController
+@RequestMapping("/kaphtcha/")
+public class KaphtchaApi extends BaseController {
+ @Resource
+ private DefaultKaptcha defaultKaptcha;
+ @Resource
+ private StringRedisTemplate stringRedisTemplate;
+
+ @ApiOperation("生成验证码")
+ @GetMapping("/verification")
+ public void defaultKaptcha(@RequestParam("uuid")String uuid,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)
+ throws Exception {
+ byte[] captchaChallengeAsJpeg = null;
+ ByteArrayOutputStream jpegOutputStream = new ByteArrayOutputStream();
+ try {
+ // 生产验证码字符串并保存到session中，分布式环境存redis中
+ String createText = defaultKaptcha.createText();
+ stringRedisTemplate.opsForValue().set("verifyCode_"+uuid,createText, Duration.ofMinutes(5));
+ // 使用生产的验证码字符串返回一个BufferedImage对象并转为byte写入到byte数组中
+ BufferedImage challenge = defaultKaptcha.createImage(createText);
+ ImageIO.write(challenge, "jpg", jpegOutputStream);
+
+ } catch (IllegalArgumentException e) {
+ httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND);
+ return;
+ }
+
+ // 定义response输出类型为image/jpeg类型，使用response输出流输出图片的byte数组
+ captchaChallengeAsJpeg = jpegOutputStream.toByteArray();
+ httpServletResponse.setHeader("Cache-Control", "no-store");
+ httpServletResponse.setHeader("Pragma", "no-cache");
+ httpServletResponse.setDateHeader("Expires", 0);
+ httpServletResponse.setContentType("image/jpeg");
+ ServletOutputStream responseOutputStream = httpServletResponse.getOutputStream();
+ responseOutputStream.write(captchaChallengeAsJpeg);
+ responseOutputStream.flush();
+ responseOutputStream.close();
+ }
+ @ApiOperation("验证码核对")
+ @GetMapping("/checkVerifyCode")
+ public R checkVerifyCode(@RequestParam("verifyCode")String verifyCode,@RequestParam("uuid")String uuid){
+ String text=stringRedisTemplate.opsForValue().get("verifyCode_"+uuid);
+ if(StringUtils.isNotEmpty(text)){
+ if(verifyCode.equals(text)){
+ stringRedisTemplate.delete("verifyCode_"+uuid);
+ return R.ok();
+ }
+ return R.fail("验证码错误");
+ }
+ return R.fail("验证码失效");
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/LoginApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/LoginApi.java
new file mode 100644
index 0000000..449ff27
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/LoginApi.java
@@ -0,0 +1,65 @@
+package com.panzhihua.applets_backstage.api;
+
+import javax.annotation.Resource;
+
+import com.panzhihua.common.interfaces.OperLog;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.applets_backstage.model.vos.LoginBody;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.auth.TokenService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 登录、登出
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 10:52
+ **/
+@Slf4j
+@Api(tags = {"运营后台登录模块"})
+@RestController("/")
+public class LoginApi extends BaseController {
+ @Resource
+ private TokenService tokenService;
+
+ @ApiOperation(value = "登录")
+ @PostMapping("login")
+ @OperLog(operModul = "运营后台登录",operType = 0,businessType = "登录")
+ public R login(@RequestBody LoginBody loginBody) {
+ String account = loginBody.getAccount();
+ String password = loginBody.getPassword();
+ boolean empty = ObjectUtils.isEmpty(account);
+ boolean empty1 = ObjectUtils.isEmpty(password);
+ if (empty || empty1) {
+ return R.fail("账户密码不能为空");
+ }
+ log.info("登录用户信息【{}】", loginBody);
+ return tokenService.loginAppletsBackStage(account, password,this.getAppId());
+ }
+
+ @ApiOperation(value = "登出")
+ @PostMapping("logout")
+ @OperLog(operModul = "运营后台登录",operType = 0,businessType = "登出")
+ public R login() {
+ String token = this.getToken();
+ if (ObjectUtils.isEmpty(token)) {
+ return R.ok();
+ }
+ return tokenService.logout(token);
+ }
+
+ @ApiOperation(value = "刷新token")
+ @GetMapping("refreshToken")
+ @ApiImplicitParam(name = "refreshToken", value = "登录返回的刷新token")
+ public R refreshToken(@RequestParam("refreshToken") String refreshToken) {
+ return tokenService.refreshToken(refreshToken);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/McsOrderApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/McsOrderApi.java
new file mode 100644
index 0000000..eb09478
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/McsOrderApi.java
@@ -0,0 +1,112 @@
+package com.panzhihua.applets_backstage.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsOrderVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 商业街订单表(McsOrder)表控制层
+ *
+ * @author makejava
+ * @since 2022-01-04 16:10:07
+ */
+@Api(tags = {"商业街订单API"})
+@RestController
+@RequestMapping("mcsOrder")
+public class McsOrderApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询订单",response = McsOrderVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return communityService.selectAllMscOrder(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation(value = "通过主键查询单条数据",response = McsOrderVO.class)
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return communityService.selectOneMscOrder(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param mcsOrderVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody McsOrderVO mcsOrderVO) {
+ return communityService.insertMscOrder(mcsOrderVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param mcsOrderVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改订单")
+ @PostMapping("/update")
+ public R update(@RequestBody McsOrderVO mcsOrderVO) {
+ return communityService.updateMscOrder(mcsOrderVO);
+ }
+
+ /**
+ * 微信支付
+ * @param mcsOrderVO
+ * @return
+ */
+ @ApiOperation("微信支付")
+ @PostMapping("/wxPay")
+ public R wxPay(@RequestBody McsOrderVO mcsOrderVO){
+ return communityService.wxPayMscOrder(mcsOrderVO);
+ }
+
+ /**
+ * 发送提醒短信
+ * @param id
+ * @return
+ */
+ @ApiOperation("发送提醒短信")
+ @GetMapping("/sendContent")
+ public R sendContent(@RequestParam("id") Long id){
+ return communityService.sendContentMcsOrder(id);
+ }
+
+ /**
+ *微信支付回调
+ * @param mcsOrderVO
+ * @return
+ */
+ @ApiOperation("微信支付回调")
+ @PostMapping("/notify")
+ public R notify(@RequestBody McsOrderVO mcsOrderVO){
+ return communityService.notifyMcsOrder(mcsOrderVO);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/MicroCommercialStreetApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/MicroCommercialStreetApi.java
new file mode 100644
index 0000000..be389a2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/MicroCommercialStreetApi.java
@@ -0,0 +1,171 @@
+package com.panzhihua.applets_backstage.api;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsEvaluateDTO;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsEvaluateVO;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.DisableOrEnableMcsMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsInformationDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetPopularForGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForInfoDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsConfigVO;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsGameVO;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsInformationVO;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsMerchantVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @title: MicroCommercialStreetApi
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 微商业街相关接口
+ * @author: hans
+ * @date: 2021/12/28 14:18
+ */
+@Api(tags = {"微商业街"})
+@RestController
+@RequestMapping("/microcommercialstreet")
+public class MicroCommercialStreetApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "新增数字商业街商家")
+ @PostMapping("/merchant/add")
+ public R addMcsMerchant(@RequestBody @Validated(AddGroup.class) McsMerchantDTO mcsMerchantDTO) {
+ Long userId = this.getUserId();
+ mcsMerchantDTO.setCreatedBy(userId);
+ mcsMerchantDTO.setUpdatedBy(userId);
+ return communityService.addMcsMerchant(mcsMerchantDTO);
+ }
+
+ @ApiOperation(value = "编辑数字商业街商家")
+ @PutMapping("/merchant/put")
+ public R putMcsMerchant(@RequestBody @Validated(PutGroup.class) McsMerchantDTO mcsMerchantDTO) {
+ mcsMerchantDTO.setUpdatedBy(this.getUserId());
+ return communityService.putMcsMerchant(mcsMerchantDTO);
+ }
+
+ @ApiOperation(value = "查询数字商业街商家详情", response = McsMerchantVO.class)
+ @GetMapping("/merchant/get")
+ public R getMcsMerchant(@RequestParam("merchantId") Long merchantId) {
+ return communityService.getMcsMerchant(merchantId);
+ }
+
+ @ApiOperation(value = "删除数字商业街商家")
+ @DeleteMapping("/merchant/delete")
+ public R deleteMcsMerchant(@RequestParam("merchantId") Long merchantId) {
+ return communityService.deleteMcsMerchant(merchantId, this.getUserId());
+ }
+
+ @ApiOperation(value = "分页查询数字商业街商家", response = McsMerchantVO.class)
+ @PostMapping("/merchant/page")
+ public R pageMcsMerchant(@RequestBody @Valid PageMcsMerchantDTO pageMcsMerchantDTO) {
+ return communityService.pageMcsMerchant(pageMcsMerchantDTO);
+ }
+
+ @ApiOperation(value = "禁用/启用数字商业街商家")
+ @PutMapping("/merchant/disable-or-enable")
+ public R disableOrEnableMcsMerchant(@RequestBody @Valid DisableOrEnableMcsMerchantDTO disableOrEnableMcsMerchantDTO) {
+ disableOrEnableMcsMerchantDTO.setUpdatedBy(this.getUserId());
+ return communityService.disableOrEnableMcsMerchant(disableOrEnableMcsMerchantDTO);
+ }
+
+ @ApiOperation(value = "获取所有数字商业街配置", response = McsConfigVO.class)
+ @GetMapping("/config/all")
+ public R getAllMcsConfig() {
+ return communityService.getAllMcsConfig();
+ }
+
+ @ApiOperation(value = "修改数字商业街配置")
+ @PutMapping("/config/put")
+ public R putMcsConfig(@RequestBody List<McsConfigVO> configs) {
+ return communityService.putMcsConfig(configs);
+ }
+
+ @ApiOperation(value = "分页查询戳戳游戏", response = McsGameVO.class)
+ @PostMapping("/game/page")
+ public R pageMcsGame(@RequestBody @Valid PageMcsGameDTO pageMcsGameDTO) {
+ return communityService.pageMcsGame(pageMcsGameDTO);
+ }
+
+ @ApiOperation(value = "设为/取消游戏热门")
+ @PutMapping("/game/setPopular")
+ public R setPopularForGame(@RequestBody @Valid SetPopularForGameDTO setPopularForGameDTO) {
+ setPopularForGameDTO.setUpdatedBy(this.getUserId());
+ return communityService.setPopularForGame(setPopularForGameDTO);
+ }
+
+ @ApiOperation(value = "上架/下架戳戳游戏")
+ @PutMapping("/game/setShelf")
+ public R setShelfForGame(@RequestBody @Valid SetShelfForGameDTO setShelfForGameDTO) {
+ setShelfForGameDTO.setUpdatedBy(this.getUserId());
+ return communityService.setShelfForGame(setShelfForGameDTO);
+ }
+
+ @ApiOperation(value = "删除戳戳游戏")
+ @DeleteMapping("/game/delete")
+ public R deleteMcsGame(@RequestParam("gameId") Long gameId) {
+ return communityService.deleteMcsGame(gameId, this.getUserId());
+ }
+
+ @ApiOperation(value = "分页查询戳戳资讯", response = McsInformationVO.class)
+ @PostMapping("/information/page")
+ public R pageMcsInfo(@RequestBody @Valid PageMcsInformationDTO pageMcsInformationDTO) {
+ return communityService.pageMcsInfo(pageMcsInformationDTO);
+ }
+
+ @ApiOperation(value = "上架/下架戳戳资讯")
+ @PutMapping("/information/setShelf")
+ public R setShelfForMcsInfo(@RequestBody @Valid SetShelfForInfoDTO setShelfForInfoDTO) {
+ setShelfForInfoDTO.setUpdatedBy(this.getUserId());
+ return communityService.setShelfForMcsInfo(setShelfForInfoDTO);
+ }
+
+ @ApiOperation(value = "删除戳戳资讯")
+ @DeleteMapping("/information/delete")
+ public R deleteMcsInfo(@RequestParam("infoId") Long infoId) {
+ return communityService.deleteMcsInfo(infoId, this.getUserId());
+ }
+
+ @ApiOperation(value = "分页查询评价记录", response = McsEvaluateVO.class)
+ @PostMapping("/evaluate/page")
+ public R pageMcsEvaluate(@RequestBody @Valid PageMcsEvaluateDTO pageMcsEvaluateDTO) {
+ return communityService.pageMcsEvaluate(pageMcsEvaluateDTO);
+ }
+
+ @ApiOperation(value = "查询评价记录详情", response = McsEvaluateVO.class)
+ @GetMapping("/evaluate/get")
+ public R getMcsEvaluate(@RequestParam("evaluateId") Long evaluateId) {
+ return communityService.getMcsEvaluate(evaluateId);
+ }
+
+ @ApiOperation(value = "删除评价记录")
+ @DeleteMapping("/evaluate/delete")
+ public R deleteMcsEvaluate(@RequestParam("evaluateId") Long evaluateId) {
+ return communityService.deleteMcsEvaluate(evaluateId);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/NeighborApi.java
new file mode 100644
index 0000000..6f8259a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/NeighborApi.java
@@ -0,0 +1,68 @@
+package com.panzhihua.applets_backstage.api;
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.constants.NeighborCircleConstants;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.neighbor.*;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.neighbor.*;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+import static java.util.Objects.isNull;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Slf4j
+@RestController
+@RequestMapping("/neighbor/")
+@Api(tags = {"邻里圈服务"})
+public class NeighborApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private UserService userService;
+
+ @ApiOperation(value = "分页查询邻里圈话题列表", response = ComActNeighborCircleTopicAdminVO.class)
+ @PostMapping("pageNeighborTopicByAdmin")
+ public R pageNeighborTopicByAdmin(@RequestBody ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO) {
+ return communityService.pageNeighborTopicByAdmin(circleTopicAdminDTO);
+ }
+
+ @ApiOperation(value = "添加邻里圈话题")
+ @PostMapping("addNeighborTopicByAdmin")
+ public R addNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO) {
+ addCircleTopicAdminDTO.setUserId(this.getUserId());
+ return communityService.addNeighborTopicByAdmin(addCircleTopicAdminDTO);
+ }
+
+ @ApiOperation(value = "编辑邻里圈话题")
+ @PostMapping("editNeighborTopicByAdmin")
+ public R editNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO) {
+ if (addCircleTopicAdminDTO.getId() == null) {
+ return R.fail("参数错误");
+ }
+ return communityService.editNeighborTopicByAdmin(addCircleTopicAdminDTO);
+ }
+ /**
+ * 删除话题
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "删除话题")
+ @GetMapping("deleteNeighborTopic")
+ public R deleteNeighborTopic(@RequestParam("id") Long id){
+ return communityService.deleteNeighborTopic(id);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/RentingHousesContractConfigApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/RentingHousesContractConfigApi.java
new file mode 100644
index 0000000..5548021
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/RentingHousesContractConfigApi.java
@@ -0,0 +1,50 @@
+package com.panzhihua.applets_backstage.api;
+
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import com.panzhihua.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHousesConfigDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHousesConfigDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.rentingHouses.RentingHousesConfigVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @title: RentingHousesContractConfigApi
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 房屋租赁配置相关接口
+ * @author: hans
+ * @date: 2021/11/23 13:32
+ */
+@RestController
+@Api(tags = {"房屋租赁配置"})
+@RequestMapping("/rentingHousesConfig")
+public class RentingHousesContractConfigApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @PostMapping("/page")
+ @ApiOperation(value = "分页查询房屋租赁基础配置", response = RentingHousesConfigVO.class)
+ public R pageRentingHousesConfig(@RequestBody @Valid PageRentingHousesConfigDTO pageRentingHousesConfigDTO) {
+ return communityService.pageRentingHousesConfig(pageRentingHousesConfigDTO);
+ }
+
+ @PutMapping("/update")
+ @ApiOperation("更新配置信息")
+ public R updateRentingHousesConfig(@RequestBody @Valid RentingHousesConfigDTO rentingHousesConfigDTO) {
+ rentingHousesConfigDTO.setUserId(getUserId());
+ return communityService.updateRentingHousesConfig(rentingHousesConfigDTO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java
new file mode 100644
index 0000000..54b1025
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java
@@ -0,0 +1,383 @@
+package com.panzhihua.applets_backstage.api;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.excel.CustomSheetWriteHandler;
+import com.panzhihua.common.interfaces.ShopOperLog;
+import com.panzhihua.common.model.dtos.shop.*;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.shop.*;
+import com.panzhihua.common.model.vos.user.ChangePasswordVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.ClazzUtils;
+import com.panzhihua.common.utlis.SFTPUtil;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @auther llming
+ * @describe 商城管理
+ */
+@Slf4j
+@Api(tags = {"商城管理模块"})
+@RestController("/shop")
+public class ShopApi extends BaseController {
+ @Value("${excel.userurl}")
+ private String excelUrl;
+ // FTP 登录用户名
+ @Value("${ftp.username}")
+ private String userName;
+ // FTP 登录密码
+ @Value("${ftp.password}")
+ private String password;
+ // FTP 服务器地址IP地址
+ @Value("${ftp.host}")
+ private String host;
+ // FTP 端口
+ @Value("${ftp.port}")
+ private int port;
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private UserService userService;
+
+ @ApiOperation(value = "分页查询商家", response = PageShopStoreVO.class)
+ @PostMapping("/store/page")
+ public R pageVolunteer(@RequestBody PageComShopStoreDTO pageComShopStoreDTO) {
+ return communityService.pageStoreList(pageComShopStoreDTO);
+ }
+
+ @ApiOperation(value = "保存商家")
+ @PostMapping("/store/save")
+ @Transactional(rollbackFor = Exception.class)
+ public R saveStore(@Validated @RequestBody ShopStoreVO storeVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long loginUserId = loginUserInfo.getUserId();
+ if (storeVO == null) {
+ return R.fail();
+ }
+ storeVO.setLoginUserId(loginUserId);
+ // 查询该手机号是否已注册到平台
+ R isAddStore = communityService.addStore(storeVO);
+ if (isAddStore.getCode() != 200) {
+ return isAddStore;
+ }
+ R isAddSysUser = userService.addSysUser(storeVO);
+ if (isAddSysUser.getCode() != 200) {
+ return isAddSysUser;
+ }
+ return R.ok();
+ }
+
+ // @ApiOperation(value = "编辑商家、启用、禁用")
+ @PostMapping("/storebak/edit/{id}")
+ // @ApiImplicitParam(name = "id", value = "商家id")
+ public R editStoreBak(@Valid @RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id) {
+ R<LoginUserInfoVO> sysUserVO = userService.getSysUserVOByAccountAndType(storeVO.getStoreAccount(), 5);
+ if (sysUserVO.getData() == null) {
+ return R.fail("没有相关的用户！");
+ }
+
+ LoginUserInfoVO user =
+ JSON.parseObject(JSON.toJSONString(sysUserVO.getData())).toJavaObject(LoginUserInfoVO.class);
+ storeVO.setSysUserId(user.getUserId());
+ R<ShopStoreVO> storeInfoVO = communityService.getStoreInfo(id);
+ if (storeInfoVO.getCode() == 500) {
+ return R.fail(storeInfoVO.getMsg());
+ }
+ // 维护sys_user
+ ShopStoreVO shopStoreVO =
+ JSON.parseObject(JSON.toJSONString(storeInfoVO.getData())).toJavaObject(ShopStoreVO.class);
+ ChangePasswordVO changePasswordVO = new ChangePasswordVO();
+ changePasswordVO.setOldPassword(shopStoreVO.getStorePassword());
+ changePasswordVO.setUserId(user.getUserId());
+ changePasswordVO.setNewPassword(storeVO.getStorePassword());
+ R r = userService.changePassword(changePasswordVO);
+ if (R.isOk(r) || r.getMsg().equals("新密码与原密码不能相同")) {
+ return communityService.editStore(storeVO, id);
+ }
+ return R.fail();
+ }
+
+ @ApiOperation(value = "编辑商家、启用、禁用")
+ @PostMapping("/store/edit/{id}")
+ @ApiImplicitParam(name = "id", value = "商家id")
+ public R editStore(@Validated @RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id) {
+ // 判断参数
+ if (storeVO == null || id == null) {
+ return R.fail("参数错误");
+ }
+ storeVO.setId(id);
+ // 修改店铺信息
+ R editStore = communityService.editStore(storeVO, id);
+ if (editStore == null || editStore.getCode() != Constants.SUCCESS) {
+ return editStore;
+ }
+ // 修改SysUser信息
+ R editUser = userService.editSysUser(storeVO);
+ if (editUser == null || editUser.getCode() != Constants.SUCCESS) {
+ return editUser;
+ }
+ return R.ok();
+ }
+
+ @ApiOperation(value = "删除商家")
+ @PostMapping("/store/delete")
+ public R delete(@RequestBody Long[] ids) {
+ return communityService.deleteStore(ids);
+ }
+
+ @ApiOperation(value = "分页查询商品", response = PageShopGoodsVO.class)
+ @PostMapping("/goods/page")
+ public R pageGoodsList(@RequestBody PageComShopGoodsDTO pageComShopGoodsDTO) {
+ return communityService.pageGoodsList(pageComShopGoodsDTO);
+ }
+
+ @ApiOperation(value = "新增商品")
+ @PostMapping("/goods/save")
+ R saveShopGoods(@RequestBody @Validated(AddGroup.class) AddShopGoodsVO addShopGoodsVO) {
+ return communityService.saveShopGoods(addShopGoodsVO);
+ }
+
+ @ApiOperation(value = "编辑商品")
+ @PostMapping("/goods/edit/{id}")
+ R editShopGoods(@PathVariable("id") Long id,
+ @RequestBody @Validated(AddGroup.class) AddShopGoodsVO addShopGoodsVO) {
+ return communityService.editShopGoods(id, addShopGoodsVO);
+ }
+
+ @ApiOperation(value = "删除商品")
+ @PostMapping("/goods/delete")
+ R deleteShopGoods(@RequestBody Long[] id) {
+ return communityService.deleteShopGoods(id);
+ }
+
+ @ApiOperation(value = "商品上下架")
+ @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "商品Id"),
+ @ApiImplicitParam(name = "status", value = "1.上架 2.下架 ")})
+ @GetMapping("/goods/changeStatus")
+ R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) {
+ return communityService.changeStatus(id, status);
+ }
+
+ @ApiOperation(value = "订单_分页列表", response = ComShopOrderSearchVO.class)
+ @PostMapping("/order/page")
+ public R page(@RequestBody @Validated PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
+ // pageComShopOrderSearchDTO.setUserId(this.getUserId());
+ ClazzUtils.setIfStringIsEmpty(pageComShopOrderSearchDTO);
+ return communityService.pageShopOrder(pageComShopOrderSearchDTO);
+ }
+
+ @ApiOperation(value = "订单_详细", response = ComShopOrderPageVO.class)
+ @GetMapping("/order/detail")
+ @ShopOperLog(operType = 11)
+ public R detail(@RequestParam("orderId") Long orderId) {
+ return communityService.orderDetail(orderId);
+ }
+
+ @ApiOperation(value = "订单_导出表格")
+ @PostMapping("/order/export")
+ @ShopOperLog(operType = 12)
+ public R export(@RequestBody ComShopOrderExportDTO comShopOrderExportDTO) {
+ ClazzUtils.setIfStringIsEmpty(comShopOrderExportDTO);
+ String url = excelUrl;
+ String uuid = UUID.randomUUID().toString().replace("-", "");
+ // String name=uuid+".xlsx";
+ String ftpUrl = "/mnt/data/web/excel/";
+
+ R r = communityService.shopOrderExportData(comShopOrderExportDTO);
+ if (R.isOk(r)) {
+ List<ExcelShopOrderDTO> excelShopOrderDTO =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ExcelShopOrderDTO.class);
+ if (excelShopOrderDTO == null || excelShopOrderDTO.size() == 0) {
+ return R.ok("未找到数据");
+ }
+ try {
+ SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+ sftp.login();
+ String name = "商城订单-" + new SimpleDateFormat("yyyyMMddhhmmss").format(new Date()) + ".xlsx";
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ // 这里 需要指定写用哪个class去写
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ excelWriter = EasyExcel.write(fileName, ExcelShopOrderDTO.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet("订单").build();
+ excelWriter.write(excelShopOrderDTO, writeSheet);
+ excelWriter.finish();
+ File file = new File(fileName);
+ inputStream = new FileInputStream(file);
+ sftp.uploadMore(ftpUrl, name, inputStream);
+ sftp.logout();
+ inputStream.close();
+ String absolutePath = file.getAbsolutePath();
+ boolean delete = file.delete();
+ log.info("删除excel【{}】结果【{}】", absolutePath, delete);
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ }
+ return R.ok(url + URLEncoder.encode(name, "UTF-8"));
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+ return R.fail("导出数据失败");
+ }
+
+ @ApiOperation(value = "资金_统计信息")
+ @GetMapping("/capital/stat")
+ public R stat() {
+ Long userId = 0L;
+ return communityService.getFundsStat(userId);
+ }
+
+ @ApiOperation(value = "资金_分页列表")
+ @PostMapping("/capital/page")
+ public R page(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO) {
+ pageComShopFundsSearchDTO.setUserId(getUserId());
+ ClazzUtils.setIfStringIsEmpty(pageComShopFundsSearchDTO);
+ return communityService.pageShopFunds(pageComShopFundsSearchDTO);
+ }
+
+ @ApiOperation(value = "资金_详情", response = CapitalDetailVO.class)
+ @ApiImplicitParam(name = "orderId", value = "订单Id")
+ @GetMapping("/capital/capitalDetailByStore")
+ R capitalDetailByStore(@RequestParam("orderId") Long orderId) {
+ return communityService.capitalDetailByStore(orderId);
+ }
+
+ @ApiOperation(value = "资金_导出表格")
+ @PostMapping("/capital/export")
+ @ShopOperLog(operType = 12)
+ public R export(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO) {
+ ClazzUtils.setIfStringIsEmpty(comShopFundsExportDTO);
+ String url = excelUrl;
+ String uuid = UUID.randomUUID().toString().replace("-", "");
+ // String name=uuid+".xlsx";
+ String ftpUrl = "/mnt/data/web/excel/";
+
+ Long userId = this.getUserId();
+ comShopFundsExportDTO.setUserId(userId);
+ R r = communityService.shopOrderFundsExportData(comShopFundsExportDTO);
+ if (R.isOk(r)) {
+ List<ExcelShopFundsDTO> excelShopFundsDTO =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ExcelShopFundsDTO.class);
+ if (excelShopFundsDTO == null || excelShopFundsDTO.size() == 0) {
+ return R.ok("未找到数据");
+ }
+ try {
+ SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+ sftp.login();
+ String name = "商家资金流水-" + new SimpleDateFormat("yyyyMMddhhmmss").format(new Date()) + ".xlsx";
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ // 这里 需要指定写用哪个class去写
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ excelWriter = EasyExcel.write(fileName, ExcelShopFundsDTO.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet("订单").build();
+ excelWriter.write(excelShopFundsDTO, writeSheet);
+ excelWriter.finish();
+ File file = new File(fileName);
+ inputStream = new FileInputStream(file);
+ sftp.uploadMore(ftpUrl, name, inputStream);
+ sftp.logout();
+ inputStream.close();
+ String absolutePath = file.getAbsolutePath();
+ boolean delete = file.delete();
+ log.info("删除excel【{}】结果【{}】", absolutePath, delete);
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ }
+ return R.ok(url + URLEncoder.encode(name, "UTF-8"));
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+ return R.fail("导出数据失败");
+ }
+
+ @ApiOperation(value = "商家配置修改")
+ @PutMapping("/shop/conf")
+ public R editConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO) {
+ return communityService.editShopSysConf(comShopSysConfDTO);
+ }
+
+ @ApiOperation(value = "商家配置查询", response = ComShopHiddenConfVO.class)
+ @GetMapping("/shop/conf")
+ public R getConf() {
+ PageComShopSysConfDTO pageComShopSysConfDTO = new PageComShopSysConfDTO();
+ R r = communityService.pageShopSysConf(pageComShopSysConfDTO);
+ if (R.isOk(r) && r.getData() != null) {
+ ComShopSysConfVO comShopSysConfVO =
+ JSONObject.parseObject(JSONObject.toJSONString(r.getData()), ComShopSysConfVO.class);
+ if (comShopSysConfVO != null) {
+ ComShopHiddenConfVO comShopHiddenConfVO = new ComShopHiddenConfVO();
+ comShopHiddenConfVO.setId(comShopSysConfVO.getId());
+ comShopHiddenConfVO.setHidden(comShopSysConfVO.getVal());
+ return R.ok(comShopHiddenConfVO);
+ }
+ }
+ return r;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/StreetApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/StreetApi.java
new file mode 100644
index 0000000..947c2a1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/StreetApi.java
@@ -0,0 +1,98 @@
+package com.panzhihua.applets_backstage.api;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.service.partybuilding.NewStriveForFeign;
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComStreetVO;
+import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @description: 街道管理
+ * @author: llming
+ **/
+@Api(tags = {"街道管理"})
+@RestController
+@RequestMapping("/streetmanager/")
+public class StreetApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private UserService userService;
+
+
+ @Resource
+ private NewStriveForFeign newStriveForFeign;
+
+
+ @ApiOperation(value = "分页查询街道", response = PageComStreetDTO.class)
+ @PostMapping("pagestreet")
+ public R pageStreet(@RequestBody PageComStreetDTO pageComStreetDTO) {
+ pageComStreetDTO.setAreaCode(this.getAreaCode());
+ return communityService.pageStreet(pageComStreetDTO);
+ }
+
+ @ApiOperation(value = "查询街道", response = ComStreetVO.class)
+ @PostMapping("liststreet")
+ public R listStreet(@RequestBody ComStreetVO comStreetVO) {
+ R r = communityService.listStreet(comStreetVO);
+ return r;
+ }
+
+ @ApiOperation(value = "新增街道", response = ComStreetVO.class)
+ @PostMapping("addstreet")
+ public R pageStreet(@RequestBody ComStreetVO comStreetVO) {
+ R<ComStreetVO> r = communityService.addStreet(comStreetVO);
+ return r;
+ }
+
+ @ApiOperation(value = "批量删除街道")
+ @PostMapping("deletestreet")
+ public R pageStreet(@RequestBody List<Long> Ids) {
+ return communityService.delectStreat(Ids);
+ }
+
+ @ApiOperation("修改街道")
+ @PostMapping("/update")
+ public R update(@RequestBody ComStreetVO comStreetVO){
+ return communityService.updateStreet(comStreetVO);
+ }
+
+ @DeleteMapping("/remove/{id}")
+ @ApiOperation("删除街道")
+ public R remove(@PathVariable("id") Long id){
+ return communityService.removeStreet(id);
+ }
+
+ @ApiOperation("重置密码")
+ @PostMapping("repass")
+ public R repass(@RequestBody ComStreetVO comStreetVO){
+ return communityService.repassStreet(comStreetVO);
+ }
+
+// 手动刷新社区活动未签到时间
+ @GetMapping("comActActRegistUpdateEndTime")
+ public R comActActRegistUpdateEndTime()
+ {
+ return communityService.comActActRegistUpdateEndTime();
+ }
+
+// 手动双挣双评需求清单未签到时间
+ @GetMapping("upNewFightNeedProblemClaimEndTime")
+ public R upNewFightNeedProblemClaimEndTime()
+ {
+ return newStriveForFeign.upNewFightNeedProblemClaimEndTime();
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java
new file mode 100644
index 0000000..24b3131
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java
@@ -0,0 +1,245 @@
+package com.panzhihua.applets_backstage.api;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.interfaces.OperLog;
+import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
+import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvJumpDTO;
+import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
+import com.panzhihua.common.model.vos.AppletesBackstageConfigVO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.user.*;
+import com.panzhihua.common.service.HanyuPinyinHelper;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PageGroup;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 系统管理
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-24 09:19
+ **/
+@Api(tags = {"系统管理"})
+@RestController
+@RequestMapping("/systemmanagement/")
+public class SystemManagementApi extends BaseController {
+ @Resource
+ private UserService userService;
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "新增运营后台账户")
+ @PostMapping("user")
+ @OperLog(operModul = "用户管理", operType = 1)
+ public R addUser(@RequestBody @Validated(AddGroup.class) AdministratorsUserVO administratorsUserVO) {
+ administratorsUserVO.setType(2);
+ administratorsUserVO.setAreaId(null);
+ administratorsUserVO.setCommunityId(0l);
+ administratorsUserVO.setAppid(this.getAppId());
+ return userService.addUserBackstage(administratorsUserVO);
+ }
+
+ @ApiOperation(value = "编辑运营后台账户")
+ @PutMapping("user")
+ @OperLog(operModul = "用户管理", operType = 2)
+ public R putUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO) {
+ Long userId = administratorsUserVO.getUserId();
+ if (null == userId || 0 == userId) {
+ return R.fail("用户主键不能为空");
+ }
+ administratorsUserVO.setType(2);
+ administratorsUserVO.setAreaId(null);
+ administratorsUserVO.setCommunityId(0l);
+ Integer status = administratorsUserVO.getStatus();
+ if (null != status && status.intValue() == 0) {
+ administratorsUserVO.setStatus(null);
+ }
+ return userService.putUserBackstage(administratorsUserVO);
+ }
+
+ @ApiOperation(value = "删除后台用户")
+ @DeleteMapping("user")
+ @OperLog(operModul = "用户管理", operType = 3)
+ public R deleteUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO) {
+ Long userId = administratorsUserVO.getUserId();
+ if (null == userId || 0 == userId) {
+ return R.fail("用户主键不能为空");
+ }
+ administratorsUserVO.setCommunityId(0l);
+ return userService.deleteUserBackstage(administratorsUserVO);
+ }
+
+ @ApiOperation(value = "角色下拉列表", response = RoleVO.class)
+ @GetMapping("listrolebackstage")
+ public R listRoleBackstage(@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize) {
+ Long communityId = 0L;
+ return userService.listRoleBackstage(communityId,pageNum,pageSize,this.getAreaCode());
+ }
+
+ @ApiOperation(value = "分页查询后台用户", response = AdministratorsUserVO.class)
+ @PostMapping("pageuser")
+ public R pageUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO) {
+ administratorsUserVO.setAreaCode(this.getAreaCode());
+ return userService.pageUserBackstage(administratorsUserVO);
+ }
+
+ // @ApiOperation(value = "新增角色")
+ // @PostMapping("role")
+ // @OperLog(operModul = "角色管理",operType = 1)
+ // public R addRoleBackstage(@RequestBody RoleVO roleVO){
+ // String roleName = roleVO.getRoleName();
+ // if (ObjectUtils.isEmpty(roleName)) {
+ // return R.fail("角色名字不能为空");
+ // }
+ // roleVO.setCommunityId(0l);
+ // Long userId = this.getUserId();
+ // roleVO.setCreateBy(userId);
+ // roleVO.setStatus(0);
+ // HanyuPinyinHelper hanyuPinyinHelper = new HanyuPinyinHelper() ;
+ // roleVO.setRoleKey(hanyuPinyinHelper.toHanyuPinyin(roleName));
+ // return userService.addRoleBackstage(roleVO);
+ // }
+
+ @ApiOperation(value = "新增角色-设置角色的权限")
+ @PostMapping("menu")
+ @OperLog(operModul = "角色管理", operType = 1)
+ public R addMenuRole(@RequestBody @Validated MenuRoleVO menuRoleVO) {
+ RoleVO roleVO = new RoleVO();
+ String roleName = menuRoleVO.getRoleName();
+ if (ObjectUtils.isEmpty(roleName)) {
+ return R.fail("角色名字不能为空");
+ }
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ Long communityId = 0l;
+ roleVO.setRoleName(roleName);
+ roleVO.setCommunityId(communityId);
+ roleVO.setCreateBy(userId);
+ roleVO.setStatus(0);
+ roleVO.setAreaCode(this.getAreaCode());
+ HanyuPinyinHelper hanyuPinyinHelper = new HanyuPinyinHelper();
+ roleVO.setRoleKey(hanyuPinyinHelper.toHanyuPinyin(roleName));
+ R r = userService.addRoleBackstage(roleVO);
+ if (R.isOk(r)) {
+ Long roleId = Long.parseLong(r.getData().toString());
+ menuRoleVO.setRoleId(roleId);
+ menuRoleVO.setCommunityId(communityId);
+ return userService.putMenuRole(menuRoleVO);
+ }
+ return r;
+ }
+
+ @ApiOperation(value = "获取角色的权限配置列表", response = SysMenuVO.class)
+ @GetMapping("listmenurole")
+ @ApiImplicitParam(name = "roleId", value = "角色id")
+ public R listMenuBackstageByRole(@RequestParam("roleId") Long roleId) {
+ return userService.listMenuBackstageByRole(roleId);
+ }
+
+ @ApiOperation(value = "删除角色")
+ @DeleteMapping("role")
+ @OperLog(operModul = "角色管理", operType = 3)
+ public R deleteRoleBackstage(@RequestBody RoleVO roleVO) {
+ Long roleId = roleVO.getRoleId();
+ if (null == roleId || 0 == roleId) {
+ return R.fail("角色主键不能为空");
+ }
+ return userService.deleteRoleBackstage(roleVO);
+ }
+
+ @ApiOperation(value = "运营平台权限配置列表", response = SysMenuVO.class)
+ @GetMapping("listmenu")
+ public R listMenuBackstage() {
+ Long communityId = 0l;
+ return userService.listMenuBackstage(communityId);
+ }
+
+ @ApiOperation(value = "设置角色的权限")
+ @PutMapping("menu")
+ @OperLog(operModul = "角色管理", operType = 2)
+ public R putMenuRole(@RequestBody @Validated MenuRoleVO menuRoleVO) {
+ menuRoleVO.setCommunityId(0l);
+ return userService.putMenuRole(menuRoleVO);
+ }
+
+ @ApiOperation(value = "分页展示操作日志", response = SysOperLogVO.class)
+ @PostMapping("pageoperlog")
+ public R pageOperLog(@RequestBody SysOperLogVO sysOperLogVO) {
+// sysOperLogVO.setCommunityId(0l);
+// sysOperLogVO.setAreaCode(this.getAreaCode());
+ return userService.pageOperLog(sysOperLogVO);
+ }
+
+ @ApiOperation(value = "用户协议", response = SysUserAgreementVO.class)
+ @GetMapping("listagreement")
+ public R listAgreement() {
+ return userService.listAgreement(0L);
+ }
+
+ @ApiOperation(value = "编辑用户协议")
+ @PutMapping("agreement")
+ @OperLog(operModul = "用户协议", operType = 2)
+ public R putAgreement(@RequestBody SysUserAgreementVO sysUserAgreementVO) {
+ Long id = sysUserAgreementVO.getId();
+ if (null == id || id == 0) {
+ return R.fail("协议主键不能为空");
+ }
+ return userService.putAgreement(sysUserAgreementVO);
+ }
+
+ @ApiOperation(value = "获取系统配置", response = AppletesBackstageConfigVO.class)
+ @GetMapping("config")
+ public R getConfig() {
+ return communityService.getJumpContent();
+ }
+
+ @ApiOperation(value = "编辑系统配置")
+ @PutMapping("config")
+ @OperLog(operModul = "系统配置", operType = 2)
+ public R putConfig(@RequestBody AppletesBackstageConfigDTO appletesBackstageConfigDTO) {
+ List<ComOpsAdvJumpDTO> comOpsAdvJumpDTOS = appletesBackstageConfigDTO.getComOpsAdvJumpDTOS();
+ if (ObjectUtils.isEmpty(comOpsAdvJumpDTOS)) {
+ return R.fail("广告跳转内容不能为空");
+ }
+ return communityService.putJumpContent(appletesBackstageConfigDTO);
+ }
+
+ @ApiOperation(value = "分页查询用户意见反馈", response = SysUserFeedbackVO.class)
+ @PostMapping("pagefeedback")
+ public R pageFeedback(@RequestBody @Validated(PageGroup.class) PageFeedBackDTO pageFeedBackDTO) {
+ pageFeedBackDTO.setAreaCode(this.getAreaCode());
+ return userService.pageFeedback(pageFeedBackDTO);
+ }
+
+ @ApiOperation(value = "反馈意见详情", response = SysUserFeedbackVO.class)
+ @GetMapping("feedback")
+ public R detailFeedback(@RequestParam("id") Long id) {
+ return userService.detailFeedback(id);
+ }
+
+ @ApiOperation(value = "删除意见反馈")
+ @DeleteMapping("feedback")
+ public R deleteFeedback(@RequestParam("id") Long id) {
+ return userService.deleteFeedback(id);
+ }
+
+ @ApiOperation("回复意见反馈或修改意见反馈回复")
+ @PostMapping("feedback")
+ public R replyFeedBack(@RequestBody SysUserFeedbackVO sysUserFeedbackVO){
+ return userService.updateFeedBack(sysUserFeedbackVO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserApi.java
new file mode 100644
index 0000000..f0ae3c1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserApi.java
@@ -0,0 +1,170 @@
+package com.panzhihua.applets_backstage.api;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.applets_backstage.model.vos.LCArguments;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.interfaces.OperLog;
+import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.user.ChangePasswordVO;
+import com.panzhihua.common.model.vos.user.SysMenuVO;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.HttpClientUtil;
+import com.panzhihua.common.utlis.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 用户
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 13:48
+ **/
+@Api(tags = {"用户模块"})
+@RestController
+@RequestMapping("/user/")
+public class UserApi extends BaseController {
+ @Resource
+ private UserService userService;
+ @Resource
+ private StringRedisTemplate stringRedisTemplate;
+
+ @ApiOperation(value = "当前登录用户信息", response = LoginUserInfoVO.class)
+ @GetMapping("info")
+ public R getUserInfo() {
+ Long userId = this.getUserId();
+ R<LoginUserInfoVO> r=userService.detailUser(userId);
+ if(r.getData()!=null){
+ LoginUserInfoVO loginUserInfoVO=r.getData();
+ if(StringUtils.isNotEmpty(loginUserInfoVO.getAreaCode())){
+ switch (loginUserInfoVO.getAreaCode()){
+ case "510423": loginUserInfoVO.setCommunityName("西区运营后台");
+ break;
+ case "510411": loginUserInfoVO.setCommunityName("仁和区运营后台");
+ break;
+ case "510402": loginUserInfoVO.setCommunityName("东区运营后台");
+ break;
+ default:loginUserInfoVO.setCommunityName("运营后台");
+ }
+ }
+ return R.ok(loginUserInfoVO);
+ }
+ return R.fail("无用户信息");
+ }
+
+ @ApiOperation(value = "修改密码")
+ @PutMapping("changepassword")
+ @OperLog(operModul = "密码管理", operType = 2)
+ public R changePassword(@Validated @RequestBody ChangePasswordVO changePasswordVO) {
+ Long userId = this.getUserId();
+ String newPassword = changePasswordVO.getNewPassword();
+ String oldPassword = changePasswordVO.getOldPassword();
+ if (newPassword.equals(oldPassword)) {
+ return R.fail("修改失败，新密码和原密码一致");
+ }
+ changePasswordVO.setUserId(userId);
+ return userService.changePassword(changePasswordVO);
+ }
+
+ @ApiOperation(value = "用户菜单获取", response = SysMenuVO.class)
+ @GetMapping("listmenu")
+ public R listmenu() {
+ Long userId = this.getUserId();
+ return userService.listmenu(userId);
+ }
+ @ApiOperation("重置密码")
+ @GetMapping("/unlock")
+ public R unlock(@RequestParam("type")Integer type,@RequestParam("isReset")Integer isReset,@RequestParam("account")String account){
+ stringRedisTemplate.delete("LOGIN_FAIL_"+account+"_"+type+"_"+this.getAppId());
+ if(isReset==1){
+ userService.resetPasswordAccount(type,account,this.getAppId());
+ }
+ return R.ok();
+ }
+
+ @ApiOperation("新增投诉建议或问题留言")
+ @PostMapping("addFeedBack")
+ public R addFeedBack(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){
+ return userService.addFeedback(sysUserFeedbackDTO);
+ }
+
+/* @ApiOperation("查看自己的投诉建议或问题留言记录")
+ @GetMapping("myFeedBack")
+ public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type){
+ return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type);
+ }*/
+
+
+
+
+ @ApiOperation("获取浪潮token")
+ @GetMapping("getLCtoken")
+ public R myFeedBack(@RequestParam(value = "username",required = false) String username,
+ @RequestParam(value = "password",required = false) String password)
+ {
+// String url="http://117.172.73.171:9901/aaToken?username=huacheng&password=hc1236987";
+ String url="http://117.172.73.171:9901/aaToken?username="+username+"&password="+password;
+ try {
+ String result=HttpClientUtil.httpPost(url,null);
+ return R.ok(result);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.fail(e);
+ }
+ }
+
+
+
+ @ApiOperation("获取浪潮提交事件登记（自处）")
+ @PostMapping("registEventInfo")
+ public R myFeedBack(@Validated @RequestBody LCArguments lcArguments)
+ {
+ String url="http://117.172.73.171:9901/businessData/registEventInfo";
+ try {
+ Map map=new HashMap();
+ map.put("gridId",lcArguments.getGridId());
+ map.put("gridName",lcArguments.getGridName());
+ map.put("caseTypeCode",lcArguments.getCaseTypeCode());
+ map.put("caseTypeName",lcArguments.getCaseTypeName());
+ map.put("parties",lcArguments.getParties());
+ map.put("happenTime",lcArguments.getHappenTime());
+ map.put("happenAddress",lcArguments.getHappenAddress());
+ map.put("longitude",lcArguments.getLongitude());
+ map.put("latitude",lcArguments.getLatitude());
+ map.put("caseDescription",lcArguments.getCaseDescription());
+ map.put("happenAddress",lcArguments.getHappenAddress());
+ map.put("caseRecordTime",lcArguments.getCaseRecordTime());
+ map.put("handleType",lcArguments.getHandleType());
+ map.put("handleDescription",lcArguments.getHandleDescription());
+ map.put("handleTime",lcArguments.getHandleTime());
+ map.put("dataId",lcArguments.getDataId());
+ map.put("files",lcArguments.getFiles());
+ map.put("userId",lcArguments.getUserId());
+ map.put("type",lcArguments.getType());
+ map.put("name",lcArguments.getName());
+ map.put("use",lcArguments.getUse());
+
+ String result=HttpClientUtil.sendPostByJson(url,JSONObject.toJSONString(map),
+ 1,"Authorization",lcArguments.getLcToken());
+ return R.ok(result);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.fail(e);
+ }
+ }
+
+
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserManagementApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserManagementApi.java
new file mode 100644
index 0000000..887aef8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserManagementApi.java
@@ -0,0 +1,59 @@
+package com.panzhihua.applets_backstage.api;
+
+import javax.annotation.Resource;
+
+import com.panzhihua.common.controller.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.interfaces.OperLog;
+import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.user.SysUserVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.validated.PageGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 居民用户管理
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-30 11:10
+ **/
+@RestController
+@RequestMapping("/usermanagement/")
+@Api(tags = {"居民用户管理"})
+public class UserManagementApi extends BaseController {
+ @Resource
+ private UserService userService;
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "分页查询小程序用户", response = SysUserVO.class)
+ @PostMapping("pageuser")
+ public R pageUserAppletsBackstage(
+ @RequestBody @Validated(PageGroup.class) PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO) {
+ pageUserAppletsBackstageDTO.setAreaCode(this.getAreaCode());
+ pageUserAppletsBackstageDTO.setAppId(this.getAppId());
+ return userService.pageUserAppletsBackstage(pageUserAppletsBackstageDTO);
+ }
+
+ @ApiOperation(value = "编辑用户状态")
+ @PostMapping("user")
+ @OperLog(operModul = "居民用户管理", operType = 2)
+ public R putUserAppletsBackstage(
+ @RequestBody @Validated(PutGroup.class) PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO) {
+ return userService.putUserAppletsBackstage(pageUserAppletsBackstageDTO);
+ }
+
+ @ApiOperation(value = "社区下拉列表", response = ComActVO.class)
+ @GetMapping("listcommunity")
+ public R listCommunity() {
+ return communityService.listCommunityAll(this.getAreaCode());
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/VaccinesApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/VaccinesApi.java
new file mode 100644
index 0000000..546c683
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/VaccinesApi.java
@@ -0,0 +1,52 @@
+package com.panzhihua.applets_backstage.api;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.vaccines.VaccinesByAppVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequestMapping("/vaccines/")
+@Api(tags = {"疫苗服务"})
+public class VaccinesApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "疫苗分类列表", response = VaccinesByAppVO.class)
+ @PostMapping("list")
+ public R getVaccinesListByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO) {
+ vaccinesByAdminDTO.setAreaCode(this.getAreaCode());
+ return communityService.getVaccinesListByAdmin(vaccinesByAdminDTO);
+ }
+
+ @ApiOperation(value = "编辑疫苗信息")
+ @PostMapping("edit")
+ public R editVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO) {
+ return communityService.editVaccinesByAdmin(vaccinesByAdminDTO);
+ }
+
+ @ApiOperation(value = "添加疫苗信息")
+ @PostMapping("add")
+ public R addVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO) {
+ vaccinesByAdminDTO.setAreaCode(this.getAreaCode());
+ return communityService.addVaccinesByAdmin(vaccinesByAdminDTO);
+ }
+
+ @ApiOperation(value = "删除疫苗信息")
+ @PostMapping("delete")
+ public R deleteVaccinesByAdmin(@RequestParam("id") Long id) {
+ return communityService.deleteVaccinesByAdmin(id);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/WorkGuideApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/WorkGuideApi.java
new file mode 100644
index 0000000..436b127
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/WorkGuideApi.java
@@ -0,0 +1,123 @@
+package com.panzhihua.applets_backstage.api;
+
+import javax.annotation.Resource;
+
+import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @description: 办事指南管理
+ * @author: llming
+ **/
+@RestController
+@RequestMapping("/workguidemanager/")
+@Api(tags = {"办事指南管理"})
+public class WorkGuideApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "办事指南_新增")
+ @PostMapping("addworkguide")
+ public R addStreet(@RequestBody @Validated(AddGroup.class) ComActWorkGuideVO workGuideVO) {
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ workGuideVO.setAreaCode(this.getAreaCode());
+ return communityService.addWorkGuide(workGuideVO, loginUserInfo.getUserId());
+ }
+
+ @PostMapping("editworkguide")
+ @ApiOperation(value = "办事指南_编辑")
+ public R putWorkGuide(@RequestBody @Validated(AddGroup.class) ComActWorkGuideVO workGuideVO) {
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ return communityService.editWorkGuide(workGuideVO, loginUserInfo.getUserId());
+ }
+
+ @ApiOperation(value = "办事指南_详情", response = ComActWorkGuideVO.class)
+ @GetMapping("detailworkguide")
+ public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId) {
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ if(communityId==null|| communityId<0)
+ {
+ return communityService.detailWorkGuide(workGuideId, "");
+ }
+ return communityService.detailWorkGuide(workGuideId, communityId+"");
+ }
+
+ @ApiOperation(value = "办事指南_分页", response = ComActWorkGuideVO.class)
+ @PostMapping("pageworkguide")
+ public R detailWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) {
+ pageActWorkGuideDTO.setAreaCode(this.getAreaCode());
+ return communityService.pageWorkGuide(pageActWorkGuideDTO);
+ }
+
+ @ApiOperation(value = "办事指南_删除", response = ComActWorkGuideVO.class)
+ @PostMapping("delectworkguide")
+ R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId) {
+ return communityService.delectWorkGuide(workGuideId);
+ }
+
+ /**
+ * 分页查询办事指南-分类管理 pageWorkGuideClassify 分页查询办事指南-分类管理
+ * @param comActWorkGuideClassifyVO 查询参数
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @ApiOperation(value = "办事指南分类_分页查询", response = ComActWorkGuideClassifyVO.class)
+ @PostMapping("classify/apage")
+ public R pageWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO) {
+ comActWorkGuideClassifyVO.setAreaCode(this.getAreaCode());
+ return communityService.pageWorkGuideClassify(comActWorkGuideClassifyVO);
+ }
+
+ /**
+ * 办事指南-分类管理新增或修改 addWorkGuideClassify 办事指南-分类管理新增或修改
+ * @param comActWorkGuideClassifyVO 新增或修改参数
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @ApiOperation(value = "办事指南分类_新增或修改")
+ @PostMapping("classify/add")
+ public R addWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO) {
+ comActWorkGuideClassifyVO.setAreaCode(this.getAreaCode());
+ return communityService.addWorkGuideClassify(comActWorkGuideClassifyVO);
+ }
+
+ /**
+ * 办事指南-分类管理删除 deleteWorkGuideClassify 办事指南-分类管理删除
+ * @param workGuideClassifyId 办事指南-分类管理id
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @ApiOperation(value = "办事指南分类_删除")
+ @GetMapping("classify/delete")
+ public R deleteWorkGuideClassify(@RequestParam("workGuideClassifyId") Long workGuideClassifyId) {
+ return communityService.deleteWorkGuideClassify(workGuideClassifyId);
+ }
+
+ /**
+ * 办事指南-分类管理列表查询 getWorkGuideClassifyList 办事指南-分类管理列表查询
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @ApiOperation(value = "办事指南分类_列表查询")
+ @GetMapping("classify/getList")
+ public R getWorkGuideClassifyList() {
+ return communityService.getWorkGuideClassifyList(this.getAreaCode());
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/KaptchaConfig.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/KaptchaConfig.java
new file mode 100644
index 0000000..354ee09
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/KaptchaConfig.java
@@ -0,0 +1,45 @@
+package com.panzhihua.applets_backstage.config;
+
+import com.google.code.kaptcha.Constants;
+import com.google.code.kaptcha.impl.DefaultKaptcha;
+import com.google.code.kaptcha.util.Config;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Properties;
+
+/**
+ * @author zzj
+ */
+@Configuration
+public class KaptchaConfig {
+ /**
+ * 验证码配置
+ * @return
+ */
+ @Bean
+ public DefaultKaptcha getDefaultKaptcha(){
+ DefaultKaptcha defaultKaptcha=new DefaultKaptcha();
+ Properties properties=new Properties();
+ //是否有边框
+ properties.setProperty(Constants.KAPTCHA_BORDER,"yes");
+ //验证码文本颜色
+ properties.setProperty(Constants.KAPTCHA_TEXTPRODUCER_FONT_COLOR,"red");
+ //验证码图片宽度
+ properties.setProperty(Constants.KAPTCHA_IMAGE_WIDTH,"180");
+ //验证码图片高度
+ properties.setProperty(Constants.KAPTCHA_IMAGE_HEIGHT,"80");
+ //文本字符大小
+ properties.setProperty(Constants.KAPTCHA_TEXTPRODUCER_FONT_SIZE,"39");
+ //验证码session的值
+ properties.setProperty(Constants.KAPTCHA_SESSION_CONFIG_KEY,"kaptchaCode");
+ //验证码文本长度
+ properties.setProperty(Constants.KAPTCHA_TEXTPRODUCER_CHAR_LENGTH,"4");
+ //字体
+ properties.setProperty(Constants.KAPTCHA_TEXTPRODUCER_FONT_NAMES, "宋体,楷体,微软雅黑");
+
+ Config config=new Config(properties);
+ defaultKaptcha.setConfig(config);
+ return defaultKaptcha;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/MinioConfig.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/MinioConfig.java
new file mode 100644
index 0000000..b10c056
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/MinioConfig.java
@@ -0,0 +1,28 @@
+package com.panzhihua.applets_backstage.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * program 攀枝花智慧社区项目 description minio存储信息配置
+ *
+ * @author manailin Date 2021-08-19 15:30
+ **/
+@Data
+@ConfigurationProperties(prefix = "minio")
+public class MinioConfig {
+
+ private String host;
+
+ private String accessKey;
+
+ private String secretKey;
+
+ private String url;
+
+ private String bucket;
+
+ private String aliasName;
+
+ private String aliasPCName;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/MinioUtil.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/MinioUtil.java
new file mode 100644
index 0000000..68ac658
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/MinioUtil.java
@@ -0,0 +1,125 @@
+package com.panzhihua.applets_backstage.config;
+
+import io.minio.MinioClient;
+import io.minio.ObjectStat;
+import org.apache.commons.io.IOUtils;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.UUID;
+
+/**
+ * program 攀枝花智慧社区项目 description minio工具类
+ *
+ * @author manailin Date 2021-08-19 15:30
+ **/
+@Component
+@EnableConfigurationProperties(MinioConfig.class)
+public class MinioUtil {
+
+ @Resource
+ private MinioConfig minioProperties;
+
+ public static byte[] toByteArray(InputStream input) throws IOException {
+ ByteArrayOutputStream output = new ByteArrayOutputStream();
+ byte[] buffer = new byte[4096];
+ int n = 0;
+ while (-1 != (n = input.read(buffer))) {
+ output.write(buffer, 0, n);
+ }
+ return output.toByteArray();
+ }
+
+ /**
+ * 文件上传
+ *
+ * @param file
+ * 要上传的文件
+ * @return
+ */
+ public String upload(MultipartFile file, String name) {
+ if (null != file) {
+ try {
+ UUID uuid = UUID.randomUUID();
+ StringBuilder s = new StringBuilder();
+ s.append(uuid.toString().replace("-", "")).append("/");
+ MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(),
+ minioProperties.getSecretKey());
+ // bucket 不存在，创建
+ if (!minioClient.bucketExists(minioProperties.getBucket())) {
+ minioClient.makeBucket(minioProperties.getBucket());
+ }
+ // 得到文件流
+ InputStream input = file.getInputStream();
+ // 文件名
+ // String fileName = uuid + "/images." + FilenameUtils.getExtension(file.getOriginalFilename());
+ String fileName = s.append(name).toString();
+ String contentType = file.getContentType();
+ minioClient.putObject(minioProperties.getBucket(), fileName, input, contentType);
+ StringBuilder fileUrl = new StringBuilder(minioProperties.getUrl());
+ String url = fileUrl.append(fileName).toString();
+ return url;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 文件下载
+ *
+ * @param response
+ * @param url
+ */
+ public void download(HttpServletResponse response, String url) {
+ // 从链接中得到文件名
+ String replace = url.replace(minioProperties.getBucket() + "/", "#");
+ String fileName = replace.split("#")[1];
+ InputStream inputStream;
+ try {
+ MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(),
+ minioProperties.getSecretKey());
+ ObjectStat stat = minioClient.statObject(minioProperties.getBucket(), fileName);
+ inputStream = minioClient.getObject(minioProperties.getBucket(), fileName);
+ response.setContentType(stat.contentType());
+ response.setCharacterEncoding("UTF-8");
+ response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
+ IOUtils.copy(inputStream, response.getOutputStream());
+ inputStream.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ /**
+ * 文件下载
+ *
+ * @param response
+ * @param url
+ */
+ public byte[] getBytes(HttpServletResponse response, String url) {
+ // 从链接中得到文件名
+ String replace = url.replace(minioProperties.getBucket() + "/", "#");
+ String fileName = replace.split("#")[1];
+ InputStream inputStream;
+ byte[] bytes = new byte[0];
+ try {
+ MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(),
+ minioProperties.getSecretKey());
+ inputStream = minioClient.getObject(minioProperties.getBucket(), fileName);
+ bytes = toByteArray(inputStream);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return bytes;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/SFTPConfig.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/SFTPConfig.java
new file mode 100644
index 0000000..1afb737
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/SFTPConfig.java
@@ -0,0 +1,30 @@
+package com.panzhihua.applets_backstage.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Author: llming
+ * @Description:
+ */
+@Configuration
+@Data
+public class SFTPConfig {
+ // FTP 登录用户名
+ @Value("${ftp.username}")
+ private String userName;
+ // FTP 登录密码
+ @Value("${ftp.password}")
+ private String password;
+ // FTP 服务器地址IP地址
+ @Value("${ftp.host}")
+ private String host;
+ // FTP 端口
+ @Value("${ftp.port}")
+ private int port;
+ @Value("${ftp.url}")
+ private String url;
+ @Value("${excel.userurl}")
+ private String excelUrl;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/SwaggerConfig.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/SwaggerConfig.java
new file mode 100644
index 0000000..8173b81
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/config/SwaggerConfig.java
@@ -0,0 +1,33 @@
+package com.panzhihua.applets_backstage.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import io.swagger.annotations.ApiOperation;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: swagger3
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-19 16:08
+ **/
+@Configuration
+public class SwaggerConfig {
+ @Bean
+ public Docket createRestApi() {
+ return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).select()
+ .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)).paths(PathSelectors.any()).build();
+ }
+
+ private ApiInfo apiInfo() {
+ return new ApiInfoBuilder().title("小程序后台接口文档").description("。")
+ .contact(new Contact("Ray。", "http://www.ruiyeclub.cn", "ruiyeclub@foxmail.com")).version("1.0").build();
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/model/vos/LCArguments.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/model/vos/LCArguments.java
new file mode 100644
index 0000000..b3b833b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/model/vos/LCArguments.java
@@ -0,0 +1,59 @@
+package com.panzhihua.applets_backstage.model.vos;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@ApiModel(value = "浪潮提交事件参数")
+@AllArgsConstructor
+@NoArgsConstructor
+public class LCArguments {
+
+ @ApiModelProperty(value = "浪潮token")
+ private String lcToken;
+ @ApiModelProperty(value = "网格id，APP端每个网格员应该是固定的网格，")
+ private String gridId;
+ @ApiModelProperty(value = "网格 名称")
+ private String gridName;
+ @ApiModelProperty(value = "事件类型code")
+ private String caseTypeCode;
+ @ApiModelProperty(value = "事件类型名称")
+ private String caseTypeName;
+ @ApiModelProperty(value = "当事人姓名")
+ private String parties;
+ @ApiModelProperty(value = "事件发生时间，时间的实际发生时间，网格员可以修改的时间")
+ private String happenTime;
+ @ApiModelProperty(value = "地址，手动填写或通过天地图获取的地址信息")
+ private String happenAddress;
+ @ApiModelProperty(value = "经度，double字符串")
+ private String longitude;
+ @ApiModelProperty(value = "纬度，double字符串")
+ private String latitude;
+ @ApiModelProperty(value = "对本次事件的描述信息")
+ private String caseDescription;
+ @ApiModelProperty(value = "对本次事件记录的时间，APP记录本条数据的时间，网格员自己看不到")
+ private String caseRecordTime;
+ @ApiModelProperty(value = "处理方式，caseReport(立即上报)、caseHandler(事件自处)、caseCache(事件暂存)")
+ private String handleType;
+ @ApiModelProperty(value = "处理的描述信息")
+ private String handleDescription;
+ @ApiModelProperty(value = "处理的时间，APP点击提交的时间，并非平台接收的时间（APP可以离线使用）")
+ private String handleTime;
+ @ApiModelProperty(value = "APP生产的数据id，用于平台判断重复提交")
+ private String dataId;
+ @ApiModelProperty(value = "附件结合")
+ private String files;
+ @ApiModelProperty(value = "用户id")
+ private String userId;
+ @ApiModelProperty(value = "文件类型，video、audio、image")
+ private String type;
+ @ApiModelProperty(value = "文件名称")
+ private String name;
+ @ApiModelProperty(value = "使用类型，例如 自处前，自处后")
+ private String use;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/model/vos/LoginBody.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/model/vos/LoginBody.java
new file mode 100644
index 0000000..c590ca6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/model/vos/LoginBody.java
@@ -0,0 +1,25 @@
+package com.panzhihua.applets_backstage.model.vos;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 登录
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 10:54
+ **/
+@Data
+@ApiModel(value = "小程序后台登录")
+@AllArgsConstructor
+@NoArgsConstructor
+public class LoginBody {
+
+ @ApiModelProperty(value = "登录账户")
+ private String account;
+ @ApiModelProperty(value = "登录密码")
+ private String password;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..92ec8ef
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml
@@ -0,0 +1,47 @@
+spring:
+ application:
+ name: huacheng-appletsbackstage
+ cloud:
+ config:
+ discovery:
+ enabled: true
+ service-id: huacheng-config # 注册中心的服务名
+ profile: ${ENV:dev} # 指定配置文件的环境
+ uri: http://${CONFIG_URL:localhost}:6193/
+ profiles:
+ active: ${ENV:dev}
+ servlet:
+ multipart:
+ max-file-size: 200MB
+ max-request-size: 200MB
+
+eureka:
+ client:
+ service-url:
+ defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
+
+management:
+ endpoints:
+ web:
+ exposure:
+ include: '*'
+
+ endpoint:
+ health:
+ show-details: always
+
+ metrics:
+ tags:
+ application: huacheng-appletsbackstage
+
+
+
+springfox:
+ documentation:
+ swagger-ui:
+ enabled: false
+ auto-startup: false
+
+
+
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/logback-spring.xml b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..9fc7e80
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/logback-spring.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+ <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+ <springProfile name="dev">
+ <property name="LOG_HOME" value="F:/log" />
+ </springProfile>
+ <springProfile name="test">
+ <property name="LOG_HOME" value="/mnt/data/gocd/log" />
+ </springProfile>
+<property name="LOG_HOME" value="/mnt/data/gocd/log" />
+ <!-- 控制台输出 -->
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+ </encoder>
+ </appender>
+ <!-- 按照每天生成日志文件 -->
+ <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!--日志文件输出的文件名-->
+ <FileNamePattern>${LOG_HOME}/huachengapplets_backstage.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+ <!--日志文件保留天数-->
+ <MaxHistory>30</MaxHistory>
+ </rollingPolicy>
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+ </encoder>
+ <!--日志文件最大的大小-->
+ <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+ <MaxFileSize>10MB</MaxFileSize>
+ </triggeringPolicy>
+ </appender>
+
+ <!--myibatis log configure-->
+ <logger name="com.apache.ibatis" level="TRACE"/>
+ <logger name="java.sql.Connection" level="DEBUG"/>
+ <logger name="java.sql.Statement" level="DEBUG"/>
+ <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+ <logger name="com.panzhihua.applets_backstage" level="DEBUG"/>
+
+ <!-- 日志输出级别 -->
+ <root level="DEBUG">
+ <appender-ref ref="STDOUT" />
+ </root>
+ <root level="INFO">
+ <appender-ref ref="STDOUT" />
+ <appender-ref ref="FILE" />
+ </root>
+</configuration>
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/.gitignore b/springcloud_k8s_panzhihuazhihuishequ/auth/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/.mvn/wrapper/MavenWrapperDownloader.java b/springcloud_k8s_panzhihuazhihuishequ/auth/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 0000000..a45eb6b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+ private static final String WRAPPER_VERSION = "0.5.6";
+ /**
+ * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+ */
+ private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+ + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+ /**
+ * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+ * use instead of the default one.
+ */
+ private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+ ".mvn/wrapper/maven-wrapper.properties";
+
+ /**
+ * Path where the maven-wrapper.jar will be saved to.
+ */
+ private static final String MAVEN_WRAPPER_JAR_PATH =
+ ".mvn/wrapper/maven-wrapper.jar";
+
+ /**
+ * Name of the property which should be used to override the default download url for the wrapper.
+ */
+ private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+ public static void main(String args[]) {
+ System.out.println("- Downloader started");
+ File baseDirectory = new File(args[0]);
+ System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+ // If the maven-wrapper.properties exists, read it and check if it contains a custom
+ // wrapperUrl parameter.
+ File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+ String url = DEFAULT_DOWNLOAD_URL;
+ if (mavenWrapperPropertyFile.exists()) {
+ FileInputStream mavenWrapperPropertyFileInputStream = null;
+ try {
+ mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+ Properties mavenWrapperProperties = new Properties();
+ mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+ url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+ } catch (IOException e) {
+ System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+ } finally {
+ try {
+ if (mavenWrapperPropertyFileInputStream != null) {
+ mavenWrapperPropertyFileInputStream.close();
+ }
+ } catch (IOException e) {
+ // Ignore ...
+ }
+ }
+ }
+ System.out.println("- Downloading from: " + url);
+
+ File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+ if (!outputFile.getParentFile().exists()) {
+ if (!outputFile.getParentFile().mkdirs()) {
+ System.out.println(
+ "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+ }
+ }
+ System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+ try {
+ downloadFileFromURL(url, outputFile);
+ System.out.println("Done");
+ System.exit(0);
+ } catch (Throwable e) {
+ System.out.println("- Error downloading");
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+ private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+ if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+ String username = System.getenv("MVNW_USERNAME");
+ char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+ Authenticator.setDefault(new Authenticator() {
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(username, password);
+ }
+ });
+ }
+ URL website = new URL(urlString);
+ ReadableByteChannel rbc;
+ rbc = Channels.newChannel(website.openStream());
+ FileOutputStream fos = new FileOutputStream(destination);
+ fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+ fos.close();
+ rbc.close();
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/.mvn/wrapper/maven-wrapper.jar b/springcloud_k8s_panzhihuazhihuishequ/auth/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..2cc7d4a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/.mvn/wrapper/maven-wrapper.jar
Binary files differ
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/.mvn/wrapper/maven-wrapper.properties b/springcloud_k8s_panzhihuazhihuishequ/auth/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..642d572
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/mvnw b/springcloud_k8s_panzhihuazhihuishequ/auth/mvnw
new file mode 100644
index 0000000..a16b543
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/mvnw
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ -n "$MVNW_REPOURL" ]; then
+ jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ else
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+ fi
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+ fi
+
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/mvnw.cmd b/springcloud_k8s_panzhihuazhihuishequ/auth/mvnw.cmd
new file mode 100644
index 0000000..c8d4337
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/mvnw.cmd
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/pom.xml b/springcloud_k8s_panzhihuazhihuishequ/auth/pom.xml
new file mode 100644
index 0000000..ffc8d2a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/pom.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.panzhihua</groupId>
+ <artifactId>zhihuishequ</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <groupId>com.panzhihua</groupId>
+ <artifactId>auth</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>auth</name>
+ <description>认证授权中心</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-config</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-openfeign</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.panzhihua</groupId>
+ <artifactId>common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-redis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.netflix.hystrix</groupId>
+ <artifactId>hystrix-javanica</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ </dependency>
+ <!--阿里数据库连接池 -->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>druid-spring-boot-starter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>eu.bitwalker</groupId>
+ <artifactId>UserAgentUtils</artifactId>
+ <version>1.21</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!--添加监控依赖包-->
+ <dependency>
+ <groupId>io.micrometer</groupId>
+ <artifactId>micrometer-registry-prometheus</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>2.5.0</version>
+ <configuration>
+ <mainClass>com.panzhihua.auth.AuthApplication</mainClass>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>1.2.0</version>
+ <configuration>
+ <imageName>registry.cn-chengdu.aliyuncs.com/panzhihua/service-auth:v1</imageName>
+ <serverId></serverId>
+ <baseImage>java</baseImage>
+ <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
+ <resources>
+ <resource>
+ <targetPath>/</targetPath>
+ <directory>${project.build.directory}</directory>
+ <include>${project.build.finalName}.jar</include>
+ </resource>
+ </resources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>spring-snapshots</id>
+ <name>Spring Snapshots</name>
+ <url>https://repo.spring.io/snapshot</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>spring-milestones</id>
+ <name>Spring Milestones</name>
+ <url>https://repo.spring.io/milestone</url>
+ </repository>
+ </repositories>
+
+</project>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/AuthApplication.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/AuthApplication.java
new file mode 100644
index 0000000..20b0d87
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/AuthApplication.java
@@ -0,0 +1,21 @@
+package com.panzhihua.auth;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+
+@SpringCloudApplication
+@EnableFeignClients(basePackages = {"com.panzhihua.common.service"})
+@EnableCircuitBreaker
+@EnableEurekaClient
+@ComponentScan({"com.panzhihua.auth", "com.panzhihua.common"})
+public class AuthApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(AuthApplication.class, args);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
new file mode 100644
index 0000000..34e758c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
@@ -0,0 +1,321 @@
+package com.panzhihua.auth.api;
+
+import javax.annotation.Resource;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.interfaces.OperLog;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.auth.model.dos.LoginBody;
+import com.panzhihua.auth.service.LoginService;
+import com.panzhihua.common.exceptions.TokenException;
+import com.panzhihua.common.model.vos.LoginReturnVO;
+import com.panzhihua.common.model.vos.LoginReturnsVO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.utlis.JWTTokenUtil;
+
+import io.jsonwebtoken.Claims;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 登录\登出
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-19 16:56
+ **/
+@RestController
+@RequestMapping("/")
+public class LoginApi extends BaseController {
+ @Resource
+ private LoginService loginService;
+
+ /**
+ * 小程序登录
+ *
+ * @param openId
+ * 微信标识
+ * @return jwt
+ */
+ @OperLog(operModul = "小程序登录")
+ @PostMapping("/loginApplets")
+ public R loginApplets(@RequestParam("openId") String openId,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginApplets(openId,appid);
+ return R.ok(loginReturnVO);
+ }
+
+ /**
+ * 用户登出
+ *
+ * @param token
+ * 登录用户token
+ * @return 登出结果
+ */
+ @OperLog(operModul = "用户退出登录")
+ @PostMapping("/logout")
+ public R logout(@RequestParam("token") String token) {
+ loginService.logoutApplets(token);
+ return R.ok();
+ }
+
+ /**
+ * 运营后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @OperLog(operModul = "运营后台登录")
+ @PostMapping("/loginAppletsBackStage")
+ public R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginAppletsBackStage(account, password,appid);
+ return R.ok(loginReturnVO);
+ }
+
+ /**
+ * 大数据统计平台（区、街道、社区三层登陆接口）
+ *
+ * @param loginBody
+ * 账户
+ * @return 登录结果
+ * @author manailin
+ * @date 2021-5-13 10:56
+ */
+ @OperLog(operModul = "大数据统计平台（区、街道、社区三层登陆接口）")
+ @PostMapping("/loginBigDataBackStage")
+ public R loginBigDataBackStage(@RequestBody LoginBody loginBody) {
+ String account = loginBody.getAccount();
+ String password = loginBody.getPassword();
+ if (ObjectUtils.isEmpty(account) || ObjectUtils.isEmpty(password)) {
+ return R.fail("账户密码不能为空");
+ }
+ LoginReturnVO loginReturnVO = loginService.loginBigDataBackStage(account, password,this.getAppId());
+ return R.ok(loginReturnVO);
+ }
+
+ /**
+ * 社区后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @OperLog(operModul = "社区后台登录")
+ @PostMapping("/loginCommunityBackage")
+ public R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginCommunityBackage(account, password,appid);
+ return R.ok(loginReturnVO);
+ }
+
+ /**
+ * 认证中心刷新token
+ *
+ * @param refreshToken
+ * 用户端保存的刷新token
+ * @return 新的token 和刷新token
+ */
+ @PostMapping("/refreshToken")
+ public R refreshToken(@RequestParam("refreshToken") String refreshToken) {
+ Boolean expired = JWTTokenUtil.isTokenExpired(refreshToken);
+ if (expired) {
+ throw new TokenException("刷新token已过期");
+ }
+ Claims claims = JWTTokenUtil.getClaimsFromToken(refreshToken);
+ boolean empty = ObjectUtils.isEmpty(claims);
+ if (empty) {
+ throw new TokenException("刷新token校验失败");
+ }
+ String subject = claims.getSubject();
+ Integer type = (Integer)claims.get("type");
+ boolean empty1 = ObjectUtils.isEmpty(subject);
+ boolean empty2 = ObjectUtils.isEmpty(type);
+ if (empty1 || empty2) {
+ throw new TokenException("刷新token校验失败");
+ }
+ LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
+ loginUserInfoVO.setUserId(Long.valueOf(subject));
+ loginUserInfoVO.setType(type);
+ String token = JWTTokenUtil.generateToken(loginUserInfoVO);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUserInfoVO);
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ return R.ok(loginReturnVO);
+ }
+
+
+
+
+
+
+
+ /**
+ * 认证中心刷新token
+ *
+ * 用户端保存的刷新token
+ * @return 新的token 和刷新token
+ */
+ @PostMapping("/getNewToken")
+ public R getNewToken(@RequestBody LoginUserInfoVO loginUserInfoVO) {
+ String token = JWTTokenUtil.generateToken(loginUserInfoVO);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUserInfoVO);
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ return R.ok(loginReturnVO);
+ }
+
+
+
+
+
+
+
+
+
+
+
+ /**
+ * 商家后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @OperLog(operModul = "商家后台登录")
+ @PostMapping("/loginShopBackStage")
+ public R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginShopBackStage(account, password,appid);
+ return R.ok(loginReturnVO);
+ }
+
+ /**
+ * 网格综治APP登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @OperLog(operModul = "网格综治app登录")
+ @PostMapping("/loginGridApp")
+ public R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnsVO loginReturnVO = loginService.loginGridApp(account, password,appid);
+ return R.ok(loginReturnVO);
+ }
+
+ /**
+ * 网格综治后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @OperLog(operModul = "网格综治后台登录")
+ @PostMapping("/loginGridBackstage")
+ public R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginGridBackstage(account, password,appid);
+ return R.ok(loginReturnVO);
+ }
+
+ /**
+ * 城管后台登录
+ * @param account 账号
+ * @param password 密码
+ * @return 登录结果
+ */
+ @OperLog(operModul = "城管后台登录")
+ @PostMapping("/loginCgBackage")
+ public R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginCgBackage(account, password,appid);
+ return R.ok(loginReturnVO);
+ }
+
+ /**
+ * 一键报警APP登录
+ * @param account 账号
+ * @param password 密码
+ * @return 登录结果
+ */
+ @OperLog(operModul = "一键报警APP登录 ")
+ @PostMapping("/loginAlarmApp")
+ public R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnsVO loginReturnVO = loginService.loginAlarmApp(account, password,appid);
+ return R.ok(loginReturnVO);
+ }
+
+ /**
+ * 便民服务商家后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @OperLog(operModul = "便民服务商家后台登录 ")
+ @PostMapping("/loginMerchantBackStage")
+ public R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginMerchantBackStage(account, password,appid);
+ return R.ok(loginReturnVO);
+ }
+
+ /**
+ * 西区大屏登录
+ * @param account 账号
+ * @param password 密码
+ * @return 登录结果
+ */
+ @OperLog(operModul = "西区大屏登录")
+ @PostMapping("/loginXQDP")
+ public R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginXQDP(account, password,appid);
+ return R.ok(loginReturnVO);
+ }
+
+ /**
+ * 微商业街用户登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginMcsUser")
+ @OperLog(operModul = "微商业街用户登录")
+ public R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginMcsUser(account, password,appid);
+ return R.ok(loginReturnVO);
+ }
+
+ @GetMapping("/tfLogin")
+ public R tfLogin(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("appid")String appid){
+ LoginReturnVO loginReturnVO=loginService.tfLogin(account,password,appid);
+ return R.ok(loginReturnVO);
+ }
+
+ /**
+ * 电动车商城后台用户登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginBatteryUser")
+ public R loginBatteryUser(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginBatteryUser(account, password,appid);
+ return R.ok(loginReturnVO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/config/AuthConfig.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/config/AuthConfig.java
new file mode 100644
index 0000000..dddd310
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/config/AuthConfig.java
@@ -0,0 +1,26 @@
+package com.panzhihua.auth.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import lombok.Data;
+
+/**
+ * 读取项目相关配置
+ *
+ * @author huanghongfa
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "auth")
+public class AuthConfig {
+ /** 上传路径 */
+ public static String profile;
+ /** 获取地址开关 */
+ public static boolean addressEnabled;
+ /** 项目名称 */
+ public String name;
+ /** 版本 */
+ public String version;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/config/MyAESUtil.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/config/MyAESUtil.java
new file mode 100644
index 0000000..d46a9ef
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/config/MyAESUtil.java
@@ -0,0 +1,52 @@
+package com.panzhihua.auth.config;
+
+import sun.misc.BASE64Decoder;
+import sun.misc.BASE64Encoder;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.SecretKeySpec;
+
+public class MyAESUtil {
+
+ // 加密
+ public static String Encrypt(String sSrc, String sKey) throws Exception {
+ if (sKey == null) {
+ System.out.print("Key为空null");
+ return null;
+ }
+ // 判断Key是否为16位
+ if (sKey.length() != 16) {
+ System.out.print("Key长度不是16位");
+ return null;
+ }
+ byte[] raw = sKey.getBytes("utf-8");
+ SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
+ Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");//"算法/模式/补码方式"
+ cipher.init(Cipher.ENCRYPT_MODE, skeySpec);
+ byte[] encrypted = cipher.doFinal(sSrc.getBytes("utf-8"));
+ return new BASE64Encoder().encode(encrypted);//此处使用BASE64做转码功能，同时能起到2次加密的作用。
+ }
+
+ // 解密
+ public static String Decrypt(String sSrc, String sKey) throws Exception {
+ try {
+
+ byte[] raw = sKey.getBytes("utf-8");
+ SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
+ Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+ cipher.init(Cipher.DECRYPT_MODE, skeySpec);
+ byte[] encrypted1 = new BASE64Decoder().decodeBuffer(sSrc);//先用base64解密
+ try {
+ byte[] original = cipher.doFinal(encrypted1);
+ String originalString = new String(original,"utf-8");
+ return originalString;
+ } catch (Exception e) {
+ System.out.println(e.toString());
+ return null;
+ }
+ } catch (Exception ex) {
+ System.out.println(ex.toString());
+ return null;
+ }
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/config/ResourcesConfig.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/config/ResourcesConfig.java
new file mode 100644
index 0000000..71ed237
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/config/ResourcesConfig.java
@@ -0,0 +1,50 @@
+package com.panzhihua.auth.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import com.panzhihua.common.constants.Constants;
+
+/**
+ * 通用配置
+ *
+ * @author huanghongfa
+ */
+@Configuration
+public class ResourcesConfig implements WebMvcConfigurer {
+
+ @Override
+ public void addResourceHandlers(ResourceHandlerRegistry registry) {
+ /** 本地文件上传路径 */
+ registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**")
+ .addResourceLocations("file:" + AuthConfig.profile + "/");
+
+ /** swagger配置 */
+ registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+ registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+ }
+
+ /**
+ * 跨域配置
+ */
+ @Bean
+ public CorsFilter corsFilter() {
+ UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+ CorsConfiguration config = new CorsConfiguration();
+ config.setAllowCredentials(true);
+ // 设置访问源地址
+ config.addAllowedOrigin("*");
+ // 设置访问源请求头
+ config.addAllowedHeader("*");
+ // 设置访问源请求方法
+ config.addAllowedMethod("*");
+ // 对接口配置跨域设置
+ source.registerCorsConfiguration("/**", config);
+ return new CorsFilter(source);
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/config/SecurityConfig.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/config/SecurityConfig.java
new file mode 100644
index 0000000..02ad139
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/config/SecurityConfig.java
@@ -0,0 +1,103 @@
+package com.panzhihua.auth.config;
+
+import javax.annotation.Resource;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+
+import com.panzhihua.auth.handel.AjaxAuthenticationEntryPoint;
+import com.panzhihua.auth.handel.UserAuthenticationProvider;
+import com.panzhihua.auth.handel.UserLoginFailureHandler;
+import com.panzhihua.auth.handel.UserLogoutSuccessHandler;
+
+/**
+ * SpringSecurity配置类
+ *
+ * @Author youcong
+ */
+@Configuration
+@EnableWebSecurity
+public class SecurityConfig extends WebSecurityConfigurerAdapter {
+ /**
+ * 自定义登录逻辑验证器
+ */
+ @Resource
+ private UserAuthenticationProvider userAuthenticationProvider;
+
+ public static void main(String[] args) {
+ BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder();
+ String encode = bCryptPasswordEncoder.encode("123456");
+ System.out.println(encode);
+ }
+
+ /**
+ * 加密方式
+ *
+ * @Author youcong
+ */
+ @Bean
+ public BCryptPasswordEncoder bCryptPasswordEncoder() {
+ return new BCryptPasswordEncoder();
+ }
+
+ /**
+ * 配置登录验证逻辑
+ */
+ @Override
+ protected void configure(AuthenticationManagerBuilder auth) {
+ // 这里可启用我们自己的登陆验证逻辑
+ auth.authenticationProvider(userAuthenticationProvider);
+ }
+
+ /**
+ * 解决 无法直接注入 AuthenticationManager
+ *
+ * @return
+ * @throws Exception
+ */
+ @Bean
+ @Override
+ public AuthenticationManager authenticationManagerBean() throws Exception {
+ return super.authenticationManagerBean();
+ }
+
+ /**
+ * 配置security的控制逻辑
+ *
+ * @Author youcong
+ * @Param http 请求
+ */
+ @Override
+ protected void configure(HttpSecurity http) throws Exception {
+
+ http.authorizeRequests().anyRequest().permitAll().and()
+ // 配置登录成功自定义处理类
+ .formLogin()
+ // .successHandler(new UserLoginSuccessHandler())
+ // 配置登录失败自定义处理类
+ .failureHandler(new UserLoginFailureHandler()).and()
+ // 配置登出地址
+ .logout().logoutUrl("/login/userLogout")
+ // 配置用户登出自定义处理类
+ .logoutSuccessHandler(new UserLogoutSuccessHandler()).and()
+ // 开启跨域
+ .cors()
+ // 异常处理(权限拒绝、登录失效等)
+ .and().exceptionHandling().authenticationEntryPoint(new AjaxAuthenticationEntryPoint())// 匿名用户访问无权限资源时的异常处理;
+ .and()
+ // 取消跨站请求伪造防护
+ .csrf().disable();
+ // 基于Token不需要session
+ http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS);
+ // 禁用缓存
+ http.headers().cacheControl();
+
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/AjaxAuthenticationEntryPoint.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/AjaxAuthenticationEntryPoint.java
new file mode 100644
index 0000000..41cacdb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/AjaxAuthenticationEntryPoint.java
@@ -0,0 +1,34 @@
+package com.panzhihua.auth.handel;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.AuthenticationEntryPoint;
+import org.springframework.stereotype.Component;
+
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.utlis.ResultUtil;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description:
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-30 18:57
+ **/
+@Slf4j
+@Component
+public class AjaxAuthenticationEntryPoint implements AuthenticationEntryPoint {
+
+ @Override
+ public void commence(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse,
+ AuthenticationException e) throws IOException, ServletException {
+ log.error("错误信息【{}】", e.getMessage());
+ ResultUtil.responseJson(httpServletResponse, R.fail(e.getMessage()));
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java
new file mode 100644
index 0000000..20a5bd8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java
@@ -0,0 +1,168 @@
+package com.panzhihua.auth.handel;
+
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import javax.annotation.Resource;
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+
+import com.panzhihua.auth.config.MyAESUtil;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.model.helper.AESUtil;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.AES;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.LockedException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.user.UserService;
+
+import static java.util.Objects.nonNull;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 登录认证
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 16:14
+ **/
+@Component
+public class UserAuthenticationProvider implements AuthenticationProvider {
+ @Resource
+ private UserService userService;
+ @Resource
+ private RedisTemplate redisTemplate;
+ @Resource
+ private CommunityService communityService;
+
+ private static String LOGIN_FAIL="LOGIN_FAIL_";
+
+ @Override
+ public Authentication authenticate(Authentication authentication) throws AuthenticationException {
+ // 获取表单输入中返回的用户名
+ String userName = (String)authentication.getPrincipal();
+ String password =(String)authentication.getCredentials();
+ if(!userName.contains("_1")&&!userName.contains("_6")){
+ try {
+ password = MyAESUtil.Decrypt((String)authentication.getCredentials(),"Ryo7M3n8loC5Abcd");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ boolean flag= redisTemplate.hasKey(LOGIN_FAIL+userName);
+ if(flag){
+ Integer time= (Integer) redisTemplate.opsForValue().get(LOGIN_FAIL+userName);
+ if(time>=5){
+ redisTemplate.opsForValue().set(LOGIN_FAIL+userName,5);
+ throw new LockedException("账号或密码错误,登录错误超过限制");
+ }
+ }
+ // 查询用户是否存在
+ R<LoginUserInfoVO> r = userService.getUserInfo(userName);
+ if (r.getCode() != 200) {
+ lockLogin(flag,userName);
+ throw new UsernameNotFoundException("账号或密码错误");
+ }
+ LoginUserInfoVO loginUserInfoVO = r.getData();
+ List<GrantedAuthority> grantedAuthorityList = new ArrayList<>();
+ Set<String> roles = loginUserInfoVO.getRoles();
+ if (!ObjectUtils.isEmpty(roles)) {
+ roles.forEach(s -> {
+ grantedAuthorityList.add(new SimpleGrantedAuthority(s));
+ });
+ }
+ if (ObjectUtils.isEmpty(loginUserInfoVO.getAccount())||ObjectUtils.isEmpty(password)) {
+ lockLogin(flag,userName);
+ throw new UsernameNotFoundException("账号或密码错误");
+ }
+ // 我们还要判断密码是否正确，这里我们的密码使用BCryptPasswordEncoder进行加密的
+ if (!new BCryptPasswordEncoder().matches(password, loginUserInfoVO.getPassword())) {
+ lockLogin(flag,userName);
+ throw new BadCredentialsException("账号或密码错误");
+ }
+ // 还可以加一些其他信息的判断，比如用户账号已停用等判断
+ if (loginUserInfoVO.getStatus().intValue() == 2) {
+ throw new LockedException("该用户已被禁用");
+ }
+ // 维护最后登录时间
+ userService.putUserLastLoginTime(loginUserInfoVO.getUserId());
+ //是否为专家登陆
+ if (nonNull(loginUserInfoVO.getPhone())){
+ R r1 = communityService.isExpert(loginUserInfoVO.getPhone());
+ if (r1.getCode()== Constants.SUCCESS){
+ loginUserInfoVO.setType(13);
+ }
+ }
+ return new UsernamePasswordAuthenticationToken(loginUserInfoVO, password, grantedAuthorityList);
+ }
+ else {
+ // 查询用户是否存在
+ R<LoginUserInfoVO> r = userService.getUserInfo(userName);
+ if (r.getCode() != 200) {
+ throw new UsernameNotFoundException("账号或密码错误");
+ }
+ LoginUserInfoVO loginUserInfoVO = r.getData();
+ List<GrantedAuthority> grantedAuthorityList = new ArrayList<>();
+ Set<String> roles = loginUserInfoVO.getRoles();
+ if (!ObjectUtils.isEmpty(roles)) {
+ roles.forEach(s -> {
+ grantedAuthorityList.add(new SimpleGrantedAuthority(s));
+ });
+ }
+ if (ObjectUtils.isEmpty(loginUserInfoVO.getAccount())) {
+ throw new UsernameNotFoundException("账号或密码错误");
+ }
+ // 我们还要判断密码是否正确，这里我们的密码使用BCryptPasswordEncoder进行加密的
+ if (!new BCryptPasswordEncoder().matches(password, loginUserInfoVO.getPassword())) {
+ throw new BadCredentialsException("账号或密码错误");
+ }
+ // 还可以加一些其他信息的判断，比如用户账号已停用等判断
+ if (loginUserInfoVO.getStatus().intValue() == 2) {
+ throw new LockedException("该用户已被禁用");
+ }
+ // 维护最后登录时间
+ userService.putUserLastLoginTime(loginUserInfoVO.getUserId());
+ //是否为专家登陆
+ if (nonNull(loginUserInfoVO.getPhone())){
+ R r1 = communityService.isExpert(loginUserInfoVO.getPhone());
+ if (r1.getCode() == Constants.SUCCESS){
+ loginUserInfoVO.setType(13);
+ }
+ }
+ return new UsernamePasswordAuthenticationToken(loginUserInfoVO, password, grantedAuthorityList);
+
+ }
+ }
+
+ @Override
+ public boolean supports(Class<?> aClass) {
+ return true;
+ }
+
+ private void lockLogin(Boolean flag,String userName){
+ if(flag){
+ Integer time= (Integer) redisTemplate.opsForValue().get(LOGIN_FAIL+userName);
+ redisTemplate.opsForValue().set(LOGIN_FAIL+userName,time+1, Duration.ofMinutes(5));
+ }
+ else {
+ redisTemplate.opsForValue().set(LOGIN_FAIL+userName,1, Duration.ofMinutes(5));
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserLoginFailureHandler.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserLoginFailureHandler.java
new file mode 100644
index 0000000..9d4d685
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserLoginFailureHandler.java
@@ -0,0 +1,48 @@
+package com.panzhihua.auth.handel;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.LockedException;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.web.authentication.AuthenticationFailureHandler;
+import org.springframework.stereotype.Component;
+
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.utlis.ResultUtil;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 登录失败
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 16:02
+ **/
+@Slf4j
+@Component
+public class UserLoginFailureHandler implements AuthenticationFailureHandler {
+ /**
+ * 登录失败返回结果
+ *
+ * @Author youcong
+ */
+ @Override
+ public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response,
+ AuthenticationException exception) {
+ log.info("登录失败");
+ // 这些对于操作的处理类可以根据不同异常进行不同处理
+ if (exception instanceof UsernameNotFoundException) {
+ ResultUtil.responseJson(response, R.fail("该账号不存在"));
+ }
+ if (exception instanceof LockedException) {
+ ResultUtil.responseJson(response, R.fail("用户被冻结"));
+ }
+ if (exception instanceof BadCredentialsException) {
+ ResultUtil.responseJson(response, R.fail("密码错误"));
+ }
+ ResultUtil.responseJson(response, R.fail("登录失败"));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserLoginSuccessHandler.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserLoginSuccessHandler.java
new file mode 100644
index 0000000..f5f68b0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserLoginSuccessHandler.java
@@ -0,0 +1,47 @@
+package com.panzhihua.auth.handel;
+
+import java.io.IOException;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
+
+import com.panzhihua.common.constants.TokenConstant;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.utlis.JWTTokenUtil;
+import com.panzhihua.common.utlis.ResultUtil;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 登录成功
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 15:23
+ **/
+@Slf4j
+public class UserLoginSuccessHandler implements AuthenticationSuccessHandler {
+ @Override
+ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, FilterChain chain,
+ Authentication authentication) throws IOException, ServletException {
+ log.info("登录成功");
+ }
+
+ @Override
+ public void onAuthenticationSuccess(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse,
+ Authentication authentication) throws IOException, ServletException {
+ log.info("登录成功");
+ // 组装JWT
+ LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO)authentication.getPrincipal();
+ String token = JWTTokenUtil.generateToken(loginUserInfoVO);
+ token = TokenConstant.TOKEN_PRE + token;
+ // 封装返回参数
+ R<String> ok = R.ok(token);
+ ResultUtil.responseJson(httpServletResponse, ok);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserLogoutSuccessHandler.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserLogoutSuccessHandler.java
new file mode 100644
index 0000000..967bec0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserLogoutSuccessHandler.java
@@ -0,0 +1,31 @@
+package com.panzhihua.auth.handel;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
+
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.utlis.ResultUtil;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 登出成功处理
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 16:08
+ **/
+public class UserLogoutSuccessHandler implements LogoutSuccessHandler {
+ /**
+ * 用户登出返回结果 这里应该让前端清除掉Token
+ *
+ * @Author youcong
+ */
+ @Override
+ public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response,
+ Authentication authentication) {
+ SecurityContextHolder.clearContext();
+ ResultUtil.responseJson(response, R.ok());
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/manager/AsyncFactoryNew.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/manager/AsyncFactoryNew.java
new file mode 100644
index 0000000..086c88a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/manager/AsyncFactoryNew.java
@@ -0,0 +1,95 @@
+package com.panzhihua.auth.manager;
+
+import java.util.TimerTask;
+
+import com.panzhihua.auth.model.dos.SysLogininforDO;
+import com.panzhihua.auth.model.dos.SysOperLogDO;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.utlis.AddressUtils;
+import com.panzhihua.common.utlis.IpUtils;
+import com.panzhihua.common.utlis.LogUtils;
+import com.panzhihua.common.utlis.ServletUtils;
+
+import eu.bitwalker.useragentutils.UserAgent;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 异步工厂
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-20 15:28
+ **/
+@Slf4j
+public class AsyncFactoryNew {
+
+ /**
+ * 记录登录信息
+ *
+ * @param username
+ * 用户名
+ * @param status
+ * 状态
+ * @param message
+ * 消息
+ * @param args
+ * 列表
+ * @return 任务task
+ */
+ public static TimerTask recordLogininfor(final String username, final String status, final String message,
+ final Object... args) {
+ final UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
+ final String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
+ return new TimerTask() {
+ @Override
+ public void run() {
+ String address = AddressUtils.getRealAddressByIP(ip);
+ StringBuilder s = new StringBuilder();
+ s.append(LogUtils.getBlock(ip));
+ s.append(address);
+ s.append(LogUtils.getBlock(username));
+ s.append(LogUtils.getBlock(status));
+ s.append(LogUtils.getBlock(message));
+ // 打印信息到日志
+ log.info(s.toString(), args);
+ // 获取客户端操作系统
+ String os = userAgent.getOperatingSystem().getName();
+ // 获取客户端浏览器
+ String browser = userAgent.getBrowser().getName();
+ // 封装对象
+ SysLogininforDO logininfor = new SysLogininforDO();
+ logininfor.setUserName(username);
+ logininfor.setIpaddr(ip);
+ logininfor.setLoginLocation(address);
+ logininfor.setBrowser(browser);
+ logininfor.setOs(os);
+ logininfor.setMsg(message);
+ // 日志状态
+ if (Constants.LOGIN_SUCCESS.equals(status) || Constants.LOGOUT.equals(status)) {
+ logininfor.setStatus(Constants.SUCCESS + "");
+ } else if (Constants.LOGIN_FAIL.equals(status)) {
+ logininfor.setStatus(Constants.FAIL + "");
+ }
+ // 插入数据
+ // SpringUtils.getBean(ISysLogininforService.class).insertLogininfor(logininfor);
+ }
+ };
+ }
+
+ /**
+ * 操作日志记录
+ *
+ * @param operLog
+ * 操作日志信息
+ * @return 任务task
+ */
+ public static TimerTask recordOper(final SysOperLogDO operLog) {
+ return new TimerTask() {
+ @Override
+ public void run() {
+ // 远程查询操作地点
+ operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
+ // SpringUtils.getBean(ISysOperLogService.class).insertOperlog(operLog);
+ }
+ };
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/manager/AsyncManagerNew.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/manager/AsyncManagerNew.java
new file mode 100644
index 0000000..c1d0c33
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/manager/AsyncManagerNew.java
@@ -0,0 +1,53 @@
+package com.panzhihua.auth.manager;
+
+import java.util.TimerTask;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import com.panzhihua.common.utlis.SpringUtils;
+import com.panzhihua.common.utlis.Threads;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 异步任务
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-20 15:30
+ **/
+public class AsyncManagerNew {
+
+ private static AsyncManagerNew me = new AsyncManagerNew();
+ /**
+ * 操作延迟10毫秒
+ */
+ private final int OPERATE_DELAY_TIME = 10;
+ /**
+ * 异步操作任务调度线程池
+ */
+ private ScheduledExecutorService executor = SpringUtils.getBean("scheduledExecutorService");
+
+ /**
+ * 单例模式
+ */
+ private AsyncManagerNew() {}
+
+ public static AsyncManagerNew me() {
+ return me;
+ }
+
+ /**
+ * 执行任务
+ *
+ * @param task
+ * 任务
+ */
+ public void execute(TimerTask task) {
+ executor.schedule(task, OPERATE_DELAY_TIME, TimeUnit.MILLISECONDS);
+ }
+
+ /**
+ * 停止任务线程池
+ */
+ public void shutdown() {
+ Threads.shutdownAndAwaitTermination(executor);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/manager/ShutdownManager.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/manager/ShutdownManager.java
new file mode 100644
index 0000000..9f51c3a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/manager/ShutdownManager.java
@@ -0,0 +1,34 @@
+package com.panzhihua.auth.manager;
+
+import javax.annotation.PreDestroy;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 确保应用退出时能关闭后台线程
+ *
+ * @author ruoyi
+ */
+@Component
+public class ShutdownManager {
+ private static final Logger logger = LoggerFactory.getLogger("sys-user");
+
+ @PreDestroy
+ public void destroy() {
+ shutdownAsyncManager();
+ }
+
+ /**
+ * 停止异步执行任务
+ */
+ private void shutdownAsyncManager() {
+ try {
+ logger.info("====关闭后台任务任务线程池====");
+ AsyncManagerNew.me().shutdown();
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/dos/LoginBody.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/dos/LoginBody.java
new file mode 100644
index 0000000..d5750e3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/dos/LoginBody.java
@@ -0,0 +1,25 @@
+package com.panzhihua.auth.model.dos;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 大数据统计平台（区、街道、社区三层登陆接口）
+ *
+ * @author manailin
+ * @date 2021-5-13 10:56
+ */
+@Data
+@ApiModel(value = "管理后台登录")
+@AllArgsConstructor
+@NoArgsConstructor
+public class LoginBody {
+
+ @ApiModelProperty(value = "登录账户")
+ private String account;
+ @ApiModelProperty(value = "登录密码")
+ private String password;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/dos/SysLogininforDO.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/dos/SysLogininforDO.java
new file mode 100644
index 0000000..2dae28d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/dos/SysLogininforDO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.auth.model.dos;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
+/**
+ * 系统访问记录表 sys_logininfor
+ *
+ * @author ruoyi
+ */
+@Data
+public class SysLogininforDO {
+ private static final long serialVersionUID = 1L;
+
+ /** ID */
+ private Long infoId;
+
+ /** 用户账号 */
+ private String userName;
+
+ /** 登录状态 0成功 1失败 */
+ private String status;
+
+ /** 登录IP地址 */
+ private String ipaddr;
+
+ /** 登录地点 */
+ private String loginLocation;
+
+ /** 浏览器类型 */
+ private String browser;
+
+ /** 操作系统 */
+ private String os;
+
+ /** 提示消息 */
+ private String msg;
+
+ /** 访问时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date loginTime;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/dos/SysOperLogDO.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/dos/SysOperLogDO.java
new file mode 100644
index 0000000..16c3de7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/dos/SysOperLogDO.java
@@ -0,0 +1,70 @@
+package com.panzhihua.auth.model.dos;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
+/**
+ * 操作日志记录表 oper_log
+ *
+ * @author ruoyi
+ */
+@Data
+public class SysOperLogDO {
+ private static final long serialVersionUID = 1L;
+
+ /** 日志主键 */
+ private Long operId;
+
+ /** 操作模块 */
+ private String title;
+
+ /** 业务类型（0其它 1新增 2修改 3删除） */
+ private Integer businessType;
+
+ /** 业务类型数组 */
+ private Integer[] businessTypes;
+
+ /** 请求方法 */
+ private String method;
+
+ /** 请求方式 */
+ private String requestMethod;
+
+ /** 操作类别（0其它 1后台用户 2手机端用户） */
+ private Integer operatorType;
+
+ /** 操作人员 */
+ private String operName;
+
+ /** 部门名称 */
+ private String deptName;
+
+ /** 请求url */
+ private String operUrl;
+
+ /** 操作地址 */
+ private String operIp;
+
+ /** 操作地点 */
+ private String operLocation;
+
+ /** 请求参数 */
+ private String operParam;
+
+ /** 返回参数 */
+ private String jsonResult;
+
+ /** 操作状态（0正常 1异常） */
+ private Integer status;
+
+ /** 错误消息 */
+ private String errorMsg;
+
+ /** 操作时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date operTime;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/vos/SelfUserEntity.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/vos/SelfUserEntity.java
new file mode 100644
index 0000000..5ae756b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/vos/SelfUserEntity.java
@@ -0,0 +1,150 @@
+package com.panzhihua.auth.model.vos;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Map;
+
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 权限实体
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 15:26
+ **/
+public class SelfUserEntity implements Serializable, UserDetails {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 用户ID
+ */
+ private Long userId;
+ /**
+ * 用户名
+ */
+ private String username;
+ /**
+ * 密码
+ */
+ private String password;
+ /**
+ * 状态
+ */
+ private String status;
+
+ /**
+ * 显示名称
+ */
+ private String displayName;
+ /**
+ * 用户参数
+ */
+ private Map<String, String> userParamMap;
+ /**
+ * 用户角色
+ */
+ private Collection<GrantedAuthority> authorities;
+ /**
+ * 账户是否过期
+ */
+ private boolean isAccountNonExpired = false;
+ /**
+ * 账户是否被锁定
+ */
+ private boolean isAccountNonLocked = false;
+ /**
+ * 证书是否过期
+ */
+ private boolean isCredentialsNonExpired = false;
+ /**
+ * 账户是否有效
+ */
+ private boolean isEnabled = true;
+
+ public static long getSerialVersionUID() {
+ return serialVersionUID;
+ }
+
+ public Long getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Long userId) {
+ this.userId = userId;
+ }
+
+ @Override
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ @Override
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getDisplayName() {
+ return displayName;
+ }
+
+ public void setDisplayName(String displayName) {
+ this.displayName = displayName;
+ }
+
+ public Map<String, String> getUserParamMap() {
+ return userParamMap;
+ }
+
+ public void setUserParamMap(Map<String, String> userParamMap) {
+ this.userParamMap = userParamMap;
+ }
+
+ @Override
+ public Collection<GrantedAuthority> getAuthorities() {
+ return authorities;
+ }
+
+ public void setAuthorities(Collection<GrantedAuthority> authorities) {
+ this.authorities = authorities;
+ }
+
+ @Override
+ public boolean isAccountNonExpired() {
+ return isAccountNonExpired;
+ }
+
+ @Override
+ public boolean isAccountNonLocked() {
+ return isAccountNonLocked;
+ }
+
+ @Override
+ public boolean isCredentialsNonExpired() {
+ return isCredentialsNonExpired;
+ }
+
+ @Override
+ public boolean isEnabled() {
+ return isEnabled;
+ }
+
+ public void setEnabled(boolean enabled) {
+ isEnabled = enabled;
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/ISysMenuService.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/ISysMenuService.java
new file mode 100644
index 0000000..322ff2a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/ISysMenuService.java
@@ -0,0 +1,13 @@
+package com.panzhihua.auth.service;
+
+import java.util.Set;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 菜单
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-20 11:37
+ **/
+public interface ISysMenuService {
+ Set<String> selectMenuPermsByUserId(Long userId);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/ISysRoleService.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/ISysRoleService.java
new file mode 100644
index 0000000..b972478
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/ISysRoleService.java
@@ -0,0 +1,14 @@
+package com.panzhihua.auth.service;
+
+import java.util.Set;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 角色
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-20 11:36
+ **/
+public interface ISysRoleService {
+
+ Set<String> selectRolePermissionByUserId(Long userId);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java
new file mode 100644
index 0000000..4551207
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java
@@ -0,0 +1,160 @@
+package com.panzhihua.auth.service;
+
+import com.panzhihua.common.model.vos.LoginReturnVO;
+import com.panzhihua.common.model.vos.LoginReturnsVO;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: token
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-19 17:06
+ **/
+public interface LoginService {
+
+ /**
+ * 微信小程序登录
+ *
+ * @param openId
+ * 微信标识
+ * @return jwt
+ */
+ LoginReturnVO loginApplets(String openId,String appId);
+
+ /**
+ * 小程序用户登出
+ *
+ * @param token
+ * 登录用户token
+ */
+ void logoutApplets(String token);
+
+ /**
+ * 小程序后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ LoginReturnVO loginAppletsBackStage(String account, String password,String appid);
+
+ /**
+ * 社区后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ LoginReturnVO loginCommunityBackage(String account, String password,String appid);
+
+ /**
+ * 商家后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ LoginReturnVO loginShopBackStage(String account, String password,String appid);
+
+ /**
+ * 大数据统计平台（区、街道、社区三层登陆接口）
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @author manailin
+ * @return 登录结果
+ * @date 2021-5-13 10:56
+ */
+ LoginReturnVO loginBigDataBackStage(String account, String password,String appid);
+
+ /**
+ * 网格综治APP登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ LoginReturnsVO loginGridApp(String account, String password,String appid);
+
+ /**
+ * 网格综治后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ LoginReturnVO loginGridBackstage(String account, String password,String appid);
+
+ /**
+ * 城管后台登录
+ * @param account 账号
+ * @param password 密码
+ * @return 登录结果
+ */
+ LoginReturnVO loginCgBackage(String account, String password,String appid);
+
+ /**
+ * 一键报警APP登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ LoginReturnsVO loginAlarmApp(String account, String password,String appid);
+
+ /**
+ * 便民服务商家后台登录
+ * @param account 账户
+ * @param password 密码
+ * @return 登录结果
+ */
+ LoginReturnVO loginMerchantBackStage(String account, String password,String appid);
+
+ /**
+ * 西区大屏登录
+ * @param account 账号
+ * @param password 密码
+ * @return 登录结果
+ */
+ LoginReturnVO loginXQDP(String account, String password,String appid);
+
+ /**
+ * 微商业街用户登录
+ * @param account 账户
+ * @param password 密码
+ * @return 登录结果
+ */
+ LoginReturnVO loginMcsUser(String account, String password,String appid);
+ /**
+ * 天府通办
+ * @param account 账户
+ * @param password 密码
+ * @return 登录结果
+ */
+ LoginReturnVO tfLogin(String account, String password,String appid);
+
+ /**
+ * 电动车商城后台用户登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ LoginReturnVO loginBatteryUser(String account, String password,String appid);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/ISysMenuServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/ISysMenuServiceImpl.java
new file mode 100644
index 0000000..493f1bc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/ISysMenuServiceImpl.java
@@ -0,0 +1,21 @@
+package com.panzhihua.auth.service.impl;
+
+import java.util.Set;
+
+import org.springframework.stereotype.Service;
+
+import com.panzhihua.auth.service.ISysMenuService;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: ISysMenuService
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-20 13:28
+ **/
+@Service
+public class ISysMenuServiceImpl implements ISysMenuService {
+ @Override
+ public Set<String> selectMenuPermsByUserId(Long userId) {
+ return null;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/ISysRoleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/ISysRoleServiceImpl.java
new file mode 100644
index 0000000..0bd09d2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/ISysRoleServiceImpl.java
@@ -0,0 +1,21 @@
+package com.panzhihua.auth.service.impl;
+
+import java.util.Set;
+
+import org.springframework.stereotype.Service;
+
+import com.panzhihua.auth.service.ISysRoleService;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: ISysRoleService
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-20 13:27
+ **/
+@Service
+public class ISysRoleServiceImpl implements ISysRoleService {
+ @Override
+ public Set<String> selectRolePermissionByUserId(Long userId) {
+ return null;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java
new file mode 100644
index 0000000..1028cd9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java
@@ -0,0 +1,383 @@
+package com.panzhihua.auth.service.impl;
+
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.user.SysOperLogVO;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.IPUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Service;
+
+import com.panzhihua.auth.service.LoginService;
+import com.panzhihua.common.constants.TokenConstant;
+import com.panzhihua.common.constants.UserConstants;
+import com.panzhihua.common.model.vos.LoginReturnVO;
+import com.panzhihua.common.model.vos.LoginReturnsVO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.utlis.JWTTokenUtil;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import static java.util.Objects.nonNull;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: token
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-19 17:07
+ **/
+@Service
+public class LoginServiceImpl implements LoginService {
+ @Resource
+ private AuthenticationManager authenticationManager;
+ @Autowired
+ private StringRedisTemplate redisTemplate;
+ @Resource
+ private UserService userService;
+
+ /**
+ * 微信小程序登录
+ *
+ * @param openId
+ * 微信标识
+ * @return jwt
+ */
+ @Override
+ public LoginReturnVO loginApplets(String openId,String appId) {
+ Authentication authentication = null;
+ authentication = authenticationManager
+ .authenticate(new UsernamePasswordAuthenticationToken(openId + "_1"+"_"+appId, UserConstants.PASSWORD));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
+ String token = JWTTokenUtil.generateToken(loginUser);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ return loginReturnVO;
+ }
+
+ /**
+ * 小程序用户登出
+ *
+ * @param token
+ * 登录用户token
+ */
+ @Override
+ public void logoutApplets(String token) {
+ ValueOperations<String, String> valueOperations = redisTemplate.opsForValue();
+ token = token.replaceAll(TokenConstant.TOKEN_PRE, "");
+ valueOperations.set(UserConstants.LOGOUT_TOKEN + token, token, TokenConstant.EXPIRETIME, TimeUnit.MINUTES);
+ }
+
+ /**
+ * 运营后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @Override
+ public LoginReturnVO loginAppletsBackStage(String account, String password,String appid) {
+ Authentication authentication = null;
+ authentication =
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_2"+"_"+appid, password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
+ String token = JWTTokenUtil.generateToken(loginUser);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ return loginReturnVO;
+ }
+
+ /**
+ * 社区后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @Override
+ public LoginReturnVO loginCommunityBackage(String account, String password,String appId) {
+ Authentication authentication = null;
+ authentication =
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_3"+"_"+appId, password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
+ String token = JWTTokenUtil.generateToken(loginUser);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
+ ComActVO comActVO = loginUser.getComActVO();
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ loginReturnVO.setCommunityId(loginUser.getCommunityId());
+ if (nonNull(comActVO)) {
+ loginReturnVO.setLat(comActVO.getLat());
+ loginReturnVO.setLng(comActVO.getLng());
+ }
+ //保存登录日志
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ SysOperLogVO operlog = new SysOperLogVO();
+ operlog.setTitle("登录操作"); // 操作模块
+ operlog.setBusinessType(1); // 操作类型
+ operlog.setMethod("com.panzhihua.community_backstage.api.LoginApi.login"); // 请求方法
+ operlog.setAccount(loginUser.getAccount());
+ operlog.setOperName(loginUser.getName()); // 请求用户名称
+ operlog.setOperIp(IPUtil.getIpAddress(request)); // 请求IP
+ operlog.setOperUrl(request.getRequestURI()); // 请求URI
+ operlog.setRequestMethod(request.getMethod());
+ operlog.setOperLocation(IPUtil.getIpBelongAddress(request));
+ operlog.setOperTime(new Date()); // 创建时间
+ operlog.setCommunityId(loginUser.getCommunityId());
+ userService.addOperLog(operlog);
+ return loginReturnVO;
+ }
+
+ /**
+ * 商家后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @Override
+ public LoginReturnVO loginShopBackStage(String account, String password,String appId) {
+ Authentication authentication = null;
+ authentication =
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_5"+"_"+appId, password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
+ String token = JWTTokenUtil.generateToken(loginUser);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
+ ComActVO comActVO = loginUser.getComActVO();
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ loginReturnVO.setCommunityId(loginUser.getCommunityId());
+ if (nonNull(comActVO)) {
+ loginReturnVO.setLat(comActVO.getLat());
+ loginReturnVO.setLng(comActVO.getLng());
+ }
+ //保存登录日志
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ SysOperLogVO operlog = new SysOperLogVO();
+ operlog.setTitle("登录操作"); // 操作模块
+ operlog.setBusinessType(1); // 操作类型
+ operlog.setMethod("com.panzhihua.community_backstage.api.LoginApi.loginShopBackStage"); // 请求方法
+ operlog.setAccount(loginUser.getAccount());
+ operlog.setOperName(loginUser.getName()); // 请求用户名称
+ operlog.setOperIp(IPUtil.getIpAddress(request)); // 请求IP
+ operlog.setOperUrl(request.getRequestURI()); // 请求URI
+ operlog.setRequestMethod(request.getMethod());
+ operlog.setOperLocation(IPUtil.getIpBelongAddress(request));
+ operlog.setOperTime(new Date()); // 创建时间
+ operlog.setCommunityId(loginUser.getCommunityId());
+ userService.addOperLog(operlog);
+ return loginReturnVO;
+ }
+
+ /**
+ * 大数据统计平台（区、街道、社区三层登陆接口）
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @author manailin
+ * @return 登录结果
+ * @date 2021-5-13 10:56
+ */
+ @Override
+ public LoginReturnVO loginBigDataBackStage(String account, String password,String appid) {
+ Authentication authentication = null;
+ authentication =
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_8"+"_"+appid, password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
+ String token = JWTTokenUtil.generateToken(loginUser);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ return loginReturnVO;
+ }
+
+ /**
+ * 商家后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @Override
+ public LoginReturnsVO loginGridApp(String account, String password,String appid) {
+ Authentication authentication = null;
+ authentication =
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_6"+"_"+appid, password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
+ String token = JWTTokenUtil.generateToken(loginUser);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
+ LoginReturnsVO loginReturnVO = new LoginReturnsVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ loginReturnVO.setUserId(loginUser.getUserId());
+ return loginReturnVO;
+ }
+
+ /**
+ * 商家后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @Override
+ public LoginReturnVO loginGridBackstage(String account, String password,String appid) {
+ Authentication authentication = null;
+ authentication =
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_7"+"_"+appid, password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
+ String token = JWTTokenUtil.generateToken(loginUser);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ return loginReturnVO;
+ }
+
+ @Override
+ public LoginReturnVO loginCgBackage(String account, String password,String appid){
+ Authentication authentication = null;
+ authentication =
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_9"+"_"+appid, password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
+ String token = JWTTokenUtil.generateToken(loginUser);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ return loginReturnVO;
+ }
+
+ @Override
+ public LoginReturnsVO loginAlarmApp(String account, String password,String appid) {
+ Authentication authentication = null;
+ authentication =
+ authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_10"+"_"+appid, password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
+ String token = JWTTokenUtil.generateToken(loginUser);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
+ LoginReturnsVO loginReturnVO = new LoginReturnsVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ loginReturnVO.setUserId(loginUser.getUserId());
+ return loginReturnVO;
+ }
+
+ /**
+ * 便民服务商家后台登录
+ * @param account 账户
+ * @param password 密码
+ * @return 登录结果
+ */
+ @Override
+ public LoginReturnVO loginMerchantBackStage(String account, String password,String appid) {
+ Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_10"+"_"+appid, password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
+ String token = JWTTokenUtil.generateToken(loginUser);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ return loginReturnVO;
+ }
+
+ /**
+ * 西区大屏登录
+ * @param account 账号
+ * @param password 密码
+ * @return 登录结果
+ */
+ @Override
+ public LoginReturnVO loginXQDP(String account, String password,String appid){
+ Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_15"+"_"+appid, password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
+ String token = JWTTokenUtil.generateToken(loginUser);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ return loginReturnVO;
+ }
+
+ /**
+ * 微商业街用户登录
+ * @param account 账户
+ * @param password 密码
+ * @return 登录结果
+ */
+ @Override
+ public LoginReturnVO loginMcsUser(String account, String password,String appid) {
+ Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_11"+"_"+appid, password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
+ String token = JWTTokenUtil.generateToken(loginUser);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ return loginReturnVO;
+ }
+
+ @Override
+ public LoginReturnVO tfLogin(String account, String password, String appid) {
+ Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_16"+"_"+appid, password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
+ String token = JWTTokenUtil.generateToken(loginUser);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ return loginReturnVO;
+ }
+
+ /**
+ * 电动车商城后台用户登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @Override
+ public LoginReturnVO loginBatteryUser(String account, String password,String appid) {
+ Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_20"+"_"+appid, password));
+ LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
+ String token = JWTTokenUtil.generateToken(loginUser);
+ String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
+ LoginReturnVO loginReturnVO = new LoginReturnVO();
+ loginReturnVO.setToken(token);
+ loginReturnVO.setRefreshToken(refeshToken);
+ return loginReturnVO;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..fab9358
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml
@@ -0,0 +1,38 @@
+spring:
+ application:
+ name: huacheng-auth
+ cloud:
+ config:
+ discovery:
+ enabled: true
+ service-id: huacheng-config # 注册中心的服务名
+ profile: ${ENV:dev} # 指定配置文件的环境
+ uri: http://${CONFIG_URL:localhost}:6193/
+ profiles:
+ active: ${ENV:dev}
+
+eureka:
+ client:
+ service-url:
+ defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
+
+
+management:
+ endpoints:
+ web:
+ exposure:
+ include: '*'
+
+ endpoint:
+ health:
+ show-details: always
+
+ metrics:
+ tags:
+ application: huacheng-auth
+#实体加密、解密、字段脱敏拦截设置
+domain:
+ decrypt: true
+ encrypt: true
+ aesKey: Ryo7M3n8loC5
+ sensitive: true
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/logback-spring.xml b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..8b7fc35
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/logback-spring.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+ <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+ <springProfile name="dev">
+ <property name="LOG_HOME" value="F:/log" />
+ </springProfile>
+ <springProfile name="test">
+ <property name="LOG_HOME" value="/mnt/data/gocd/log" />
+ </springProfile>
+<property name="LOG_HOME" value="/mnt/data/gocd/log" />
+ <!-- 控制台输出 -->
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+ </encoder>
+ </appender>
+ <!-- 按照每天生成日志文件 -->
+ <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!--日志文件输出的文件名-->
+ <FileNamePattern>${LOG_HOME}/huachengauth.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+ <!--日志文件保留天数-->
+ <MaxHistory>30</MaxHistory>
+ </rollingPolicy>
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+ </encoder>
+ <!--日志文件最大的大小-->
+ <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+ <MaxFileSize>10MB</MaxFileSize>
+ </triggeringPolicy>
+ </appender>
+
+ <!--myibatis log configure-->
+ <logger name="com.apache.ibatis" level="TRACE"/>
+ <logger name="java.sql.Connection" level="DEBUG"/>
+ <logger name="java.sql.Statement" level="DEBUG"/>
+ <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+ <logger name="com.panzhihua.auth" level="DEBUG"/>
+
+ <!-- 日志输出级别 -->
+ <root level="DEBUG">
+ <appender-ref ref="STDOUT" />
+ </root>
+ <root level="INFO">
+ <appender-ref ref="STDOUT" />
+ <appender-ref ref="FILE" />
+ </root>
+</configuration>
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/.gitignore b/springcloud_k8s_panzhihuazhihuishequ/common/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/pom.xml b/springcloud_k8s_panzhihuazhihuishequ/common/pom.xml
new file mode 100644
index 0000000..ab94340
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/pom.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>zhihuishequ</artifactId>
+ <groupId>com.panzhihua</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>common</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-core</artifactId>
+ <version>5.6.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.coobird</groupId>
+ <artifactId>thumbnailator</artifactId>
+ <version>0.4.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </dependency>
+ <!-- 获取浏览器信息 -->
+ <dependency>
+ <groupId>eu.bitwalker</groupId>
+ <artifactId>UserAgentUtils</artifactId>
+ <version>1.21</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-redis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-openfeign</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>3.6</version>
+ </dependency>
+ <!-- thymeleaf -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ </dependency>
+ <!--FlyingSaucer-->
+ <dependency>
+ <groupId>org.xhtmlrenderer</groupId>
+ <artifactId>flying-saucer-pdf</artifactId>
+ <version>9.1.9</version>
+ </dependency>
+ <!-- batik -->
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-codec</artifactId>
+ <version>1.12</version>
+ </dependency>
+ <!-- 阿里easyexcel-->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>easyexcel</artifactId>
+ <version>2.2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>0.1.53</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.validator</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/com.belerweb/pinyin4j -->
+ <dependency>
+ <groupId>com.belerweb</groupId>
+ <artifactId>pinyin4j</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom2</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20160810</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.9</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.tencentcloudapi</groupId>
+ <artifactId>tencentcloud-sdk-java</artifactId>
+ <!-- go to https://search.maven.org/search?q=tencentcloud-sdk-java and get the latest version. -->
+ <!-- 请到https://search.maven.org/search?q=tencentcloud-sdk-java查询所有版本，最新版本如下 -->
+ <version>3.1.286</version>
+ </dependency>
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>5.6.7</version>
+ </dependency>
+ <dependency>
+ <groupId>com.esotericsoftware</groupId>
+ <artifactId>reflectasm</artifactId>
+ <version>1.11.9</version>
+ </dependency>
+ <dependency>
+ <groupId>cn.afterturn</groupId>
+ <artifactId>easypoi-base</artifactId>
+ <version>4.1.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.zxing</groupId>
+ <artifactId>core</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.zxing</groupId>
+ <artifactId>javase</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jsoup</groupId>
+ <artifactId>jsoup</artifactId>
+ <version>1.13.1</version>
+ <scope>compile</scope>
+ </dependency>
+
+ </dependencies>
+
+
+</project>
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/DictionItemConstants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/DictionItemConstants.java
new file mode 100644
index 0000000..3abe891
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/DictionItemConstants.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.api;
+
+/**
+ * 攀枝花综治网格化-字段key
+ *
+ * @author manailin
+ * @date 2021/06/16
+ */
+public class DictionItemConstants {
+
+ /**
+ * 文化层度字典编码
+ */
+ public static final String LC_CULTURE_LEVEL = "1156457421221564414";
+
+ private DictionItemConstants() {
+ throw new IllegalStateException("Utility class");
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcApiConstants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcApiConstants.java
new file mode 100644
index 0000000..102a4e4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcApiConstants.java
@@ -0,0 +1,106 @@
+package com.panzhihua.common.api;
+
+/**
+ * 攀枝花综治网格化-事件上报接口列表-测试环境接口
+ *
+ * @author manailin
+ * @date 2021/06/16
+ */
+public class LcApiConstants {
+
+ /**
+ * 将浪潮对接接口中所需的固定账号名称，账号和密码登陆来获取token
+ */
+ public static final String LC_UPLOAD_NAME = "18080799023";
+ /**
+ * 将浪潮对接接口中所需的固定用户密码
+ */
+ public static final String LC_UPLOAD_PASSWORD = "123456";
+ /**
+ * 将浪潮对接接口中所需的token存在Redis里面的KEY
+ */
+ public static final String LANG_CHAO_TOKEN = "lang_chao_token";
+ /**
+ * 获取token
+ */
+ public static final String GRID_GET_TOKEN_URL =
+ "/aaToken?username=#username&password=#password";
+ /**
+ * 提交事件登记（自处）
+ */
+ public static final String GRID_REGIST_EVENT_URL = "/businessData/registEventInfo";
+ /**
+ * 上传附件，仅上传文件流，服务器根据文件名自行匹配
+ */
+ public static final String GRID_EVENT_FILE_UPLOAD_URL = "/businessData/upload";
+ /**
+ * 事件类型获取
+ */
+ public static final String GRID_EVENT_CATEGORY_URL = "/businessData/getEventType";
+ /**
+ * 事件查询接口
+ */
+ public static final String GRID_EVENT_INFO_URL = "/businessData/getEventListInfo";
+ /**
+ * 获取指定APP登记事件详情信息
+ */
+ public static final String GRID_EVENT_INFO_DETAIL_URL = "/businessData/getEventDetails";
+ /**
+ * 获取指定事件信息
+ */
+ public static final String GRID_APP_EVENT_INFO_DETAIL_URL =
+ "/businessData/getAppointEventInfo";
+ /**
+ * 通过AREAID获取辖区网格树
+ */
+ public static final String GRID_GET_EVENT_INFO_AREA_ID_URL =
+ "/area/getAreaGridTreeByAreaId";
+ /**
+ * 通过AREAID获取辖区网格数据列表
+ */
+ public static final String GRID_GET_GRID_DATA_AREA_ID_URL =
+ "/gridDefined/getGridInfoByAreaId";
+ /**
+ * 获取所有或者根据姓名和工号查询,分页
+ */
+ public static final String GRID_GET_GETALL_SEARCH_PAGE_URL =
+ "/gridOperator/getAllOrSearchByPage?areaId=jhRxqEQp";
+ /**
+ * 流动人口 走访记录列表
+ */
+ public static final String VISIT_RECORD_FLOW_PERSON_PAGE_URL =
+ "/businessData/getFPVisitRecordByPageApp";
+
+ /**
+ * 下面的接口全部都是走访任务接口
+ */
+ /**
+ * 流动人口 走访详情（民警带领下工作或者自己走访）
+ */
+ public static final String VISIT_RECORD_FLOW_PERSON_DETAIL_URL =
+ "/businessData/getFPVisitRecordDetailByIdApp";
+ /**
+ * 流动人口 添加走访记录 （民警带领下工作或者自己走访）
+ */
+ public static final String VISIT_RECORD_FLOW_PERSON_SAVE_URL =
+ "/businessData/saveFpVisitRecordAppDock";
+ /**
+ * 重点人员 日常管理 走访记录列表
+ */
+ public static final String VISIT_RECORD_KEY_PERSON_PAGE_URL =
+ "/businessData/getKeyPersonVisitRecordByPageApp";
+ /**
+ * 重点人员 日常管理 走访详情
+ */
+ public static final String VISIT_RECORD_KEY_PERSON_DETAIL_URL =
+ "/businessData/getKeyPersonVisitRecordDetailByIdApp";
+ /**
+ * 重点人员 日常管理 添加走访记录
+ */
+ public static final String VISIT_RECORD_KEY_PERSON_SAVE_REMOTE_URL =
+ "/businessData/saveKeyPersonVisitRecordAppDock";
+
+ private LcApiConstants() {
+ throw new IllegalStateException("Utility class");
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcRequestEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcRequestEnum.java
new file mode 100644
index 0000000..30f6f92
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcRequestEnum.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.api;
+
+import lombok.Getter;
+
+/**
+ * 浪潮接口请求返回结果对象
+ *
+ * @author manailin
+ * @date 2021/06/20
+ */
+@Getter
+public enum LcRequestEnum {
+ /**
+ * 浪潮接口请求返回失败枚举
+ */
+ FALSE("0", "失败"),
+ /**
+ * 浪潮接口请求返回成功枚举
+ */
+ SUCCESS("200", "成功");
+
+ private final String code;
+ private final String result;
+
+ LcRequestEnum(String code, String result) {
+ this.code = code;
+ this.result = result;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcReturnObject.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcReturnObject.java
new file mode 100644
index 0000000..cb92b29
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcReturnObject.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.api;
+
+import lombok.Data;
+
+/**
+ * 攀枝花综治网格化-事件接口请求返回的对象
+ *
+ * @author manailin
+ * @date 2021/06/20
+ */
+@Data
+public class LcReturnObject {
+ /**
+ * 返回code
+ */
+ private String code;
+ /**
+ * 返回消息信息
+ */
+ private String message;
+ /**
+ * 返回对象信息
+ */
+ private String data;
+ /**
+ * 返回的是否成功标识
+ */
+ private Boolean success;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcVisitRecordKeyPersonLabelEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcVisitRecordKeyPersonLabelEnum.java
new file mode 100644
index 0000000..3619b68
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/api/LcVisitRecordKeyPersonLabelEnum.java
@@ -0,0 +1,56 @@
+package com.panzhihua.common.api;
+
+import lombok.Getter;
+
+/**
+ * 攀枝花综治网格化 浪潮重点人员走访接口，人员类型
+ *
+ * @author manailin
+ * @date 2021/06/20
+ */
+@Getter
+public enum LcVisitRecordKeyPersonLabelEnum {
+ /**
+ * 浪潮接口请求参数：吸毒人员类型
+ */
+ XD(1, "p01_drug"),
+ /**
+ * 浪潮接口请求参数：重精人员类型
+ */
+ JS(2, "p01_trouble_schiz"),
+ /**
+ * 浪潮接口请求参数：释放人员类型
+ */
+ XM(3, "p01_release"),
+ /**
+ * 浪潮接口请求参数：纠正人员类型
+ */
+ SJ(4, "p01_be_corrected");
+
+ private final Integer code;
+ private final String name;
+
+ LcVisitRecordKeyPersonLabelEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (LcVisitRecordKeyPersonLabelEnum item : LcVisitRecordKeyPersonLabelEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return -1;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (LcVisitRecordKeyPersonLabelEnum item : LcVisitRecordKeyPersonLabelEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "其他";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/BcDictionaryConstants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/BcDictionaryConstants.java
new file mode 100644
index 0000000..c547628
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/BcDictionaryConstants.java
@@ -0,0 +1,55 @@
+package com.panzhihua.common.constants;
+
+/**
+ * 字典表key
+ *
+ * @author xyh
+ * @date 2021/6/11 15:53
+ */
+public class BcDictionaryConstants {
+
+ /**
+ * 家庭关系
+ */
+ public static final String FAMILY = "family";
+
+ /**
+ * 民族
+ */
+ public static final String NATION = "nation";
+
+ /**
+ * 性别
+ */
+ public static final String SEX = "sex";
+
+ /**
+ * 婚姻状况
+ */
+ public static final String MARRY = "marry";
+ /**
+ * 国家
+ */
+ public static final String COUNTRY = "country";
+
+ /**
+ * 学历
+ */
+ public static final String EDUCATION = "education";
+
+ /**
+ * 生育史
+ */
+ public static final String CHILDBEARING_HISTORY = "childbearing history";
+
+ /**
+ * 职业
+ */
+ public static final String PROFESSION = "profession";
+
+ /**
+ * 政治面貌
+ */
+ public static final String POLITICAL_OUTLOOK = "political_outlook";
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
new file mode 100644
index 0000000..8da1881
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
@@ -0,0 +1,275 @@
+package com.panzhihua.common.constants;
+
+/**
+ * 通用常量信息
+ *
+ * @author HUANGHONGFA
+ */
+public class Constants {
+ /**
+ * UTF-8 字符集
+ */
+ public static final String UTF8 = "UTF-8";
+
+ /**
+ * GBK 字符集
+ */
+ public static final String GBK = "GBK";
+
+ /**
+ * http请求
+ */
+ public static final String HTTP = "http://";
+
+ /**
+ * https请求
+ */
+ public static final String HTTPS = "https://";
+
+ /**
+ * 成功标记
+ */
+ public static final Integer SUCCESS = 200;
+
+ /**
+ * 失败标记
+ */
+ public static final Integer FAIL = 500;
+
+ /**
+ * 登录成功
+ */
+ public static final String LOGIN_SUCCESS = "Success";
+
+ /**
+ * 注销
+ */
+ public static final String LOGOUT = "Logout";
+
+ /**
+ * 注册
+ */
+ public static final String REGISTER = "Register";
+
+ /**
+ * 登录失败
+ */
+ public static final String LOGIN_FAIL = "Error";
+
+ /**
+ * 当前记录起始索引
+ */
+ public static final String PAGE_NUM = "pageNum";
+
+ /**
+ * 每页显示记录数
+ */
+ public static final String PAGE_SIZE = "pageSize";
+
+ /**
+ * 排序列
+ */
+ public static final String ORDER_BY_COLUMN = "orderByColumn";
+
+ /**
+ * 排序的方向 "desc" 或者 "asc".
+ */
+ public static final String IS_ASC = "isAsc";
+
+ /**
+ * 验证码 redis key
+ */
+ public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
+
+ /**
+ * 验证码有效期（分钟）
+ */
+ public static final long CAPTCHA_EXPIRATION = 2;
+
+ /**
+ * 令牌有效期（分钟）
+ */
+ public final static long TOKEN_EXPIRE = 720;
+
+ /**
+ * 参数管理 cache key
+ */
+ public static final String SYS_CONFIG_KEY = "sys_config:";
+
+ /**
+ * 字典管理 cache key
+ */
+ public static final String SYS_DICT_KEY = "sys_dict:";
+
+ /**
+ * 资源映射路径 前缀
+ */
+ public static final String RESOURCE_PREFIX = "/profile";
+ /**
+ * 令牌前缀
+ */
+ public static final String LOGIN_USER_KEY = "login_user_key";
+ /**
+ * 令牌前缀
+ */
+ public static final String TOKEN_PREFIX = "Bearer ";
+ /**
+ * 登录用户 redis key
+ */
+ public static final String LOGIN_TOKEN_KEY = "login_tokens:";
+ /**
+ * 防重提交 redis key
+ */
+ public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";
+
+ public static final String AES_KEY = "35^*M@dp$5xDB&P@";
+
+ /**
+ * 商户平台默认角色权限默认字符串
+ */
+ public static final String SHOP_ROLE_KEY = "shanghupingtai";
+ /**
+ * 商户平台超级管理员权限默认字符串
+ */
+ public static final String ADMIN_SHOP_ROLE_KEY = "chaojiguanliyuan";
+ /**
+ * 便民服务商户默认角色权限默认字符串
+ */
+ public static final String CONVENIENT_MERCHANT_ROLE_KEY = "convenient_merchant_platform";
+ /**
+ * 街道超级管理员
+ */
+ public static final String STREET_ROLE_KEY="street_member";
+ /**
+ * 首页商城是否展示（1.是 2.否）
+ */
+ public static final Integer IS_SHOP_OPEN = 2;
+
+ /**
+ * 网格综治-默认角色权限默认字符串
+ */
+ public static final String GRID_DEFAULT_ROLE_KEY = "grid_member_default_role";
+
+ public static final String ZONG_ZHI_GRID_MEMBER_IMAGE_URL =
+ "https://www.psciio.com//idcard/57bf4104a76741cfabfead0bb8218307.jpg";
+
+ public static final String ZZ_APP_TAG_LIST = "{\"list\":[\"流动人口\",\"户籍人口\",\"社区矫正\",\"吸毒人员\",\"重精患者\",\"刑满释放\"]}";
+
+ public static final String PROFIT_EXPLAIN =
+ "<p>一、简介</p><p>活动期间内，居民发布随手拍内容可获得一定现金奖励，具体奖励金额以社区设置为准，最终由对应社区统一结算。</p><p>二、如何使用</p><p>居民获得收益后由对应社区结算，具体结算方式由社区根据实际情况进行处理。</p><p>三、如何获得</p><p>1.参与活动</p><p>活动期间内，用户可以在西区社区通“随手拍”板块，用照片和视频记录展示社区生活；</p><p>活动由所在社区添加管理，社区发布活动后居民可进行参与。</p><p>2. 社区审核</p><p>社区通过对用户发布内容的质量（优质、精良、普通内容）和价值进行审核，酌情对相关用户进行奖励；</p><p>3. 获得奖励</p><p>审核完成后，根据社区设置的内容质量奖励金额下发奖励。</p><p>若内容被工作人员驳回将不可获得奖励。</p><p> </p><p><br></p>";
+
+ public static final String INTEGRAL_EXPLAIN = "积分说明";
+
+ public static final String POPULATION_ERROR_LIST = "POPULATION_ERROR_LIST_";
+
+ public static final String BUILDING_ERROR_LIST = "BUILDING_ERROR_LIST_";
+
+ public static final String DRUG_POPULATION_ERROR_LIST = "DRUG_POPULATION_ERROR_LIST_";
+
+ public static final String CORRECT_POPULATION_ERROR_LIST = "CORRECT_POPULATION_ERROR_LIST_";
+
+ public static final String MAJOR_POPULATION_ERROR_LIST = "MAJOR_POPULATION_ERROR_LIST_";
+
+ public static final String CULT_POPULATION_ERROR_LIST = "CULT_POPULATION_ERROR_LIST_";
+
+ public static final String REHABILITATION_POPULATION_ERROR_LIST = "REHABILITATION_POPULATION_ERROR_LIST_";
+
+ public static final String KEY_POPULATION_ERROR_LIST = "KEY_POPULATION_ERROR_LIST_";
+
+ public static final String SENTENCE_POPULATION_ERROR_LIST = "SENTENCE_POPULATION_ERROR_LIST_";
+
+ public static final String VETERANS_POPULATION_ERROR_LIST = "VETERANS_POPULATION_ERROR_LIST_";
+
+ public static final String DISABILITY_POPULATION_ERROR_LIST = "DISABILITY_POPULATION_ERROR_LIST_";
+
+ public static final String LOWSECURITY_POPULATION_ERROR_LIST = "LOWSECURITY_POPULATION_ERROR_LIST_";
+
+ public static final String ELDER_POPULATION_ERROR_LIST = "ELDER_POPULATION_ERROR_LIST_";
+
+ public static final String PENSION_POPULATION_ERROR_LIST = "PENSION_POPULATION_ERROR_LIST_";
+
+ public static final String ELDER_RECORD_ERROR_LIST = "ELDER_RECORD_ERROR_LIST_";
+
+ public static final String PENSION_RECORD_ERROR_LIST = "PENSION_RECORD_ERROR_LIST_";
+
+ public static final String CLUSTER_MEMBER_ERROR_LIST = "CLUSTER_MEMBER_ERROR_LIST_";
+
+ public static final String COM_MNG_VOLUNTEER_ERROR_LIST = "COM_MNG_VOLUNTEER_ERROR_LIST_";
+
+ public static final String PB_CHECK_UNIT_ERROR_LIST = "PB_CHECK_UNIT_ERROR_LIST_";
+
+ public static final String PB_MEMBER_ROLE_ERROR_LIST = "PB_MEMBER_ROLE_ERROR_LIST_";
+
+ public static final String CLUSTER_MEMBER_DEFAULT_IMAGE_URL = "https://www.psciio.com/files/4822602b68af48bcbbea7842aa463227/a6a7882b3fd24d60ac6809fef42d879d.png";
+
+ public static final String FMS_MEMBER_ERROR_LIST = "FMS_MEMBER_ERROR_LIST_";
+ public static final String FMS_SERVICE_ERROR_LIST = "FMS_SERVICE_ERROR_LIST_";
+
+ /**
+ * 高德地图获取天气url
+ */
+ public static final String G_D_WEATHER_URL = "https://restapi.amap.com/v3/weather/weatherInfo";
+
+ /**
+ * 高德地图获取天气key
+ */
+ public static final String G_D_WEATHER_KEY = "02019a956b118ac7956c8539ab02b0f5";
+
+ /**
+ * 社区议事投票小程序身份验证参数默认key
+ */
+ public static final String DISCUSS_IDENTITY_KEY = "DISCUSS_IDENTITY_";
+ /**
+ * 常量
+ */
+ public static final Integer EIGHTY = 80;
+ /**
+ * 常量
+ */
+ public static final Integer NINETY = 90;
+ /**
+ * 常量
+ */
+ public static final Integer ONE_HUNDRED = 100;
+ /**
+ * 字典表民族系统配置码key
+ */
+ public static final String NATION_DICT_KEY = "nation";
+ /**
+ * 党建包名
+ */
+ public static final String SERVICE_PARTYBUILDING = "huacheng-partybuilding";
+ /**
+ * service_community包
+ */
+ public static final String SERVICE_COMMUNITY = "huacheng-community";
+
+
+ /**
+ * equipment包(总工会户外劳工站)
+ */
+ public static final String SERVICE_EQUIPMENT = "equipment";
+
+ /**
+ * 操作类型
+ * */
+ public static final String UPDATE="update";
+ public static final String INSERT="insert";
+ public static final String QUERY="query";
+ public static final String DELETE="delete";
+ public static final String VILLAGE="村";
+ /**
+ * 超管街道id
+ * */
+ public static final Integer ADMIN_STREET_ID=999999999;
+
+ /**
+ * 天府通办解密私钥
+ * */
+ public static final String PRIVATE_KEY="MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAJJuFUH/4m9H5hCCzxtd9BxpjWlG9gbejqiJpV0XJKaU1V7xDBJasswxPY7Zc15RoxWClPoKPwKrbWKm49dgBJebJq5xd4sLCSbboxRkKxpRiJHMZ4LJjYa5h9Ei9RyfoUzqGHqH4UrDy3m3IwPiP19cIBqoU50shyQf92ZpcGZhAgMBAAECgYEAiadU8pODoUs82x6tZbPALQmJN4PO+wwznfqv6sA74yGdKECAMazz0oMjtGt1SiCCqFD2jcweCftvvELZg3mvNg1V0vRQRD1ZCA8HDp8DXm20d11K3+RX39tR4KgyyM3HsSEhkUDujMxKIpYjyiB5iEtV7Ja9bZ2fROszq+mUIqUCQQDQQf6vWRMLBqfnDcU77vuDGOhXbjkF2ytLxLW3fbKaW3GWvC3n93zPM+mcvWSXgkl448+jFjpMktm1Vn+w+YX3AkEAs/+bbRbod6AcVbLu8C5E44qDRoRpu+LF7Cphp8tlSAIRjm2yGP5acMWGRUtH9MF2QJYPF0PgDzdmUSVqWnCAZwJBALnSuRri4wAKn1SmT+ALfLZcSiyBODZGeppv2ijw6qWahH8YR+ncRaxoyMFHqPMbmM1akJIXqktbGREaLnPOIb8CQQCdJycJaL3Qa98xR4dr9cm5rF6PO96g5w6M8jfO6ztjUkMHymh7f99wpFRlvaN2Y06edyV315ARWPohEPy5N44zAkBlLuDHLm1TkTTAfdlL5r2OcdjpaJYloTdn05Mp3+J+w1zTX8k6Mz8lFZtLUcoMeTfQ9rm/+u2KwxS8NljtSZWH";
+
+ /**
+ * 花城小程序appid
+ */
+ public static final String HC_APP_ID = "wx118de8a734d269f0";
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/FtpConstants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/FtpConstants.java
new file mode 100644
index 0000000..a225e38
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/FtpConstants.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.constants;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: ftp
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-30 13:39
+ **/
+public class FtpConstants {
+ /**
+ * ftp站点
+ */
+ public static final String FTPHOST = "47.104.148.185";
+ /**
+ * 端口号
+ */
+ public static final Integer FTPPORT = 22;
+ /**
+ * ftp访问用户名
+ */
+ public static final String FTPUSERNAME = "root";
+ /**
+ * ftp访问密码
+ */
+ public static final String FTPPASSWORD = "evanN7F2K5M6";
+ /**
+ * excel模板
+ */
+ public static final String FTPFILEPATH_MUBAN = "/mnt/data/ftp/muban/";
+ /**
+ * 党员保存
+ */
+ public static final String FTPFILEPATH_IDCARD = "/mnt/data/ftp/idcard/";
+ /**
+ * http访问路径
+ */
+ public static final String HTTP_URL = "http://image.panzhihua.nhys.cdnhxx.com/";
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/HttpConstant.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/HttpConstant.java
new file mode 100644
index 0000000..1e1e5c7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/HttpConstant.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.constants;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description:
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-08 10:40
+ **/
+public class HttpConstant {
+
+ /** httpClient连接超时时间,单位毫秒 */
+ public static final int CONNECT_TIMEOUT = 3 * 1000;
+
+ /** httpClient请求获取数据的超时时间(即响应时间) 单位毫秒 */
+ public static final int SOCKET_TIMEOUT = 10 * 1000;
+
+ /** http连接池大小 */
+ public static final int MAX_TOTAL = 10;
+
+ /** 分配给同一个route(路由)最大的并发连接数 */
+ public static final int MAX_CONN_PER_ROUTE = 2;
+
+ /** http连接是否是长连接 */
+ public static final boolean IS_KEEP_ALIVE = true;
+
+ /** 调用接口失败默认重新调用次数 */
+ public static final int REQ_TIMES = 3;
+
+ /** utf-8编码 */
+ public static final String UTF8_ENCODE = "UTF-8";
+
+ /** application/json */
+ public static final String APPLICATION_JSON = "application/json";
+
+ /** text/xml */
+ public static final String TEXT_XML = "text/xml";
+
+ /** 内江服务进出记录查询接口 */
+// public static final String NEIJIANG_URL = "https://mzj.scnjdx.gov.cn/proxy/comActCameraRecord/queryAll";
+ public static final String NEIJIANG_URL = "http://118.122.78.144:8086/comActCameraRecord/queryAll";
+
+ /** 测试服务报警记录查询接口 */
+ public static final String CALL_THE_POLICE_URL = "http://test.panzhihua.nhys.cdnhxx.com/api/communitybackstage/comPropertyAlarm/queryAll/noToken";
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/HttpStatus.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/HttpStatus.java
new file mode 100644
index 0000000..969e669
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/HttpStatus.java
@@ -0,0 +1,104 @@
+package com.panzhihua.common.constants;
+
+/**
+ * 返回状态码
+ *
+ * @author huanghongfa
+ */
+public class HttpStatus {
+
+ /**
+ * 正常
+ */
+ public static final int NORMAL = 0;
+
+ /**
+ * 操作成功
+ */
+ public static final int SUCCESS = 200;
+
+ /**
+ * 对象创建成功
+ */
+ public static final int CREATED = 201;
+
+ /**
+ * 请求已经被接受
+ */
+ public static final int ACCEPTED = 202;
+
+ /**
+ * 操作已经执行成功，但是没有返回数据
+ */
+ public static final int NO_CONTENT = 204;
+
+ /**
+ * 资源已被移除
+ */
+ public static final int MOVED_PERM = 301;
+
+ /**
+ * 重定向
+ */
+ public static final int SEE_OTHER = 303;
+
+ /**
+ * 资源没有被修改
+ */
+ public static final int NOT_MODIFIED = 304;
+
+ /**
+ * 参数列表错误（缺少，格式不匹配）
+ */
+ public static final int BAD_REQUEST = 400;
+
+ /**
+ * 未授权
+ */
+ public static final int UNAUTHORIZED = 401;
+
+ /**
+ * 访问受限，授权过期
+ */
+ public static final int FORBIDDEN = 403;
+
+ /**
+ * 资源，服务未找到
+ */
+ public static final int NOT_FOUND = 404;
+
+ /**
+ * 不允许的http方法
+ */
+ public static final int BAD_METHOD = 405;
+
+ /**
+ * 资源冲突，或者资源被锁
+ */
+ public static final int CONFLICT = 409;
+
+ /**
+ * 请求主体的大小超过了服务器
+ */
+ public static final int REQUEST_TOO_LARGE = 413;
+
+ /**
+ * 不支持的数据，媒体类型
+ */
+ public static final int UNSUPPORTED_TYPE = 415;
+
+ /**
+ * 系统内部错误
+ */
+ public static final int ERROR = 500;
+
+ /**
+ * 接口未实现
+ */
+ public static final int NOT_IMPLEMENTED = 501;
+
+ /**
+ * 暂不支持
+ */
+ public static final int NOT_ACCEPTABLE = 406;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/NeighborCircleConstants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/NeighborCircleConstants.java
new file mode 100644
index 0000000..ac6aa96
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/NeighborCircleConstants.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.constants;
+
+/**
+ * 邻里圈常量类
+ */
+public class NeighborCircleConstants {
+
+ /**
+ * 浏览变动热度值
+ */
+ public static final Long VIEW_HOT_NUM = 1L;
+ /**
+ * 点赞变动热度值
+ */
+ public static final Long FABULOUS_HOT_NUM = 2L;
+ /**
+ * 评论变动热度值
+ */
+ public static final Long COMMENT_HOT_NUM = 3L;
+
+ /**
+ * 邻里圈自动审核状态KEY(value：1.自动审核 2.需要社区审核)
+ */
+ public static final String NEIGHBOR_CIRCLE_AUTO_EXAMINE = "NEIGHBOR_CIRCLE_AUTO_EXAMINE_";
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/PayCpmstant.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/PayCpmstant.java
new file mode 100644
index 0000000..12a61df
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/PayCpmstant.java
@@ -0,0 +1,54 @@
+package com.panzhihua.common.constants;
+
+/**
+ * 微信支付通用常量
+ *
+ * @author LYQ
+ */
+public class PayCpmstant {
+
+ /**
+ * 微信支付统一下单url地址
+ */
+ public static final String UNIFIEDORDER_URL = "https://api.mch.weixin.qq.com/pay/unifiedorder";
+ /**
+ * 微信支付默认编码格式
+ */
+ public static final String DEFAULT_ENCODING = "UTF-8";
+ /**
+ * 微信支付返回支付成功CODE
+ */
+ public static final String RETURN_CODE = "SUCCESS";
+ /**
+ * 微信支付返回支付成功MSG
+ */
+ public static final String RETURN_MSG = "OK";
+ /**
+ * 微信支付默认加密格式
+ */
+ public static final String SIGN_TYPE = "MD5";
+
+ /**
+ * 电动车商城购买商品支付回调地址
+ */
+ public static final String BATTERY_STORE_PAY_NOTIFY_URL = "/api/huacheng-applets/wx/batteryPayNotify";
+ /**
+ * 电动车商城活动订单支付回调地址
+ */
+ public static final String BATTERY_STORE_ACTIVITY_PAY_NOTIFY_URL = "/api/huacheng-applets/wx/batteryActivityPayNotify";
+
+ public static final String REFUND_URL = "https://api.mch.weixin.qq.com/secapi/pay/refund";
+
+ /**
+ * 微信支付返回支付成功的参数名字
+ */
+ public static final String RETURN_CODE_CODE = "return_code";
+ /**
+ * 微信退款接口返回成功的参数名称
+ */
+ public static final String RESULT_CODE_CODE = "result_code";
+ /**
+ * 微信退款接口请求key
+ */
+ public static final String REFUND_KEY= "8A9H1B2234D7CBD0AC61B75EB274927F";
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/ReturnMsgConstants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/ReturnMsgConstants.java
new file mode 100644
index 0000000..f75636d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/ReturnMsgConstants.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.constants;
+
+/**
+ * 字典表key
+ *
+ * @author xyh
+ * @date 2021/6/11 15:53
+ */
+public class ReturnMsgConstants {
+
+ /**
+ * 数据已经存在
+ */
+ public static final String DATA_EXIST = "数据已经存在！";
+ /**
+ * 数据不存在
+ */
+ public static final String DATA_NOT_EXIST = "数据不存在！";
+ /**
+ * 保存成功
+ */
+ public static final String SAVE_SUCCESS = "保存成功";
+ /**
+ * 保存失败
+ */
+ public static final String SAVE_FALSE = "保存失败";
+ /**
+ * 更新成功
+ */
+ public static final String UPDATE_SUCCESS = "更新成功";
+ /**
+ * 更新失败
+ */
+ public static final String UPDATE_FALSE = "更新失败";
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/SecurityConstants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/SecurityConstants.java
new file mode 100644
index 0000000..6157f1c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/SecurityConstants.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.constants;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 权限
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-25 15:13
+ **/
+public class SecurityConstants {
+
+ public static final String ROLE_ALL = "springsecurity:role:all";// 平台所有权限存储在redis
+ public static final String ROLE_USER = "springsecurity:role:";// 某个用户的具体权限
+ public static final String ROLE_APPLETS = "applets";// 小程序用户通用角色
+ public static final String APPLETS_ACCESS_TOKEN = "APPLETS_ACCESS_TOKEN";// 小程序获取的access_token
+ public static final String APPLETS_ACCESS_TOKEN_TIME = "APPLETS_ACCESS_TOKEN_TIME";// 小程序获取的access_token
+ public static final String APPLETS_ACCESS_MEDIA_ID = "APPLETS_ACCESS_MEDIA_ID";// 小程序获取的access_token
+ public static final String APPLETS_ACCESS_MEDIA_ID_TIME = "APPLETS_ACCESS_MEDIA_ID_TIME";// 小程序获取的access_token
+
+ public static final String ROLE_APPLETS_REAL_NAMED = "applets:realnamed";// 小程序用户实名角色
+ public static final String ROLE_APPLETS_USER = "applets:realnamed:user:";// 小程序用户角色
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/TokenConstant.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/TokenConstant.java
new file mode 100644
index 0000000..e39e4a9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/TokenConstant.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.constants;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: token
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 14:44
+ **/
+public class TokenConstant {
+
+ public static final String TOKEN_HEADER = "Authorization";
+ public static final String TOKEN_LOGOUT = "token_logout";
+ public static final String TOKEN_PRE = "Bearer ";
+ public static final String TOKEN_USERINFO = "token_userinfo";
+ /**
+ * 30分钟
+ */
+ public static final int EXPIRETIME = 300;
+ public static final Long EXPIRETIME_LONG = 300L;
+ public static final String SECRET = "UTivpbn%n9O!KnnL";
+ /**
+ * 24小时
+ */
+ public static final int EXPIRETIME_REFRESH = 24;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/UserConstants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/UserConstants.java
new file mode 100644
index 0000000..b82f987
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/UserConstants.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.constants;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 用户
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-25 10:13
+ **/
+public class UserConstants {
+
+ public static final String PASSWORD = "y5g9w8*0TTWV4UgJ";
+ public static final String USER_ID = "user_id";
+ public static final String LOGOUT_TOKEN = "logout:";
+ public static final String LOGIN_USER_INFO = "login_user_info:";
+ public static final String PHONE_PUT = "phone_put:";
+ public static final String NEWS_ID = "news_media_id:";
+
+ public static final String NEWS_LIST = "news_list:";
+ public static final String SANSHUO_INDUSTRY_CENTER_ROLE="103";
+ public static final String SANSHUO_EXPERT_ROLE="102";
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/WxSubscribeConstants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/WxSubscribeConstants.java
new file mode 100644
index 0000000..3a99b83
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/WxSubscribeConstants.java
@@ -0,0 +1,80 @@
+package com.panzhihua.common.constants;
+
+/**
+ * 微信小程序订阅消息常量类
+ */
+public class WxSubscribeConstants {
+
+ /**
+ * 活动变更通知模板id
+ */
+ public static final String HDBG_ID = "WkyqgQbrQim4Q68uM4628Tb0FVCXR9JuleRWwOc-UTQ";
+ /**
+ * 作品点赞通知模板id
+ */
+ public static final String ZPDZ_ID = "xYpsRZLDO_M36B2WBPgZyBk51J-OEPWPAEA4labsL5I";
+ /**
+ * 留言回复通知模板id
+ */
+ public static final String LYHF_ID = "XhTPFPUoHrfZbNiIHO95pf5amYMYAPcB1HiHMKOIMXw";
+ /**
+ * 新动态发布提醒模板id
+ */
+ public static final String XDTFB_ID = "cRXVFlIqpqxMpjVvf5s5w8aK_P2run8buCeDxm6_5oA";
+ /**
+ * 新活动提醒模板id
+ */
+ public static final String XHDTX_ID = "fW5FkhdBsTrmDIFI10UbMa6pEUuLDyK8so3FAvdGoMQ";
+ /**
+ * 新的评论提醒模板id
+ */
+ public static final String PLTX_ID = "12cHm4epIrhDTlUYfGcoBD1Kbj7cv16EyBIYvFjV7BA";
+ /**
+ * 评论回复通知模板id
+ */
+ public static final String PLHF_ID = "WvSoXRTpx4JUW4YcvLbnk4xhttjQ_EPQSG2tF5DJ1OU";
+ /**
+ * 评论点赞通知模板id
+ */
+ public static final String PLDZ_ID = "7p9Dn0IQ0iCYB2JEm0c5nukc0lY90TKijzUlJjDfYqk";
+ /**
+ * 活动取消通知模板id
+ */
+ public static final String HDQX_ID = "K0HeNd4Za4Vh0oaihRbauLL9pNY69en0cCU1nzDRzv0";
+ /**
+ * 审核状态通知模板id
+ */
+ public static final String SHZT_ID = "IIEAp-7rmj0_Le_mBMK3X-aTRN7-b-bBdXq-pmJIhHo";
+ /**
+ * 认证审核通知模板id
+ */
+ public static final String EZSH_ID = "ZMCHtZn_XR118XnbKabF9DuYG5NKsvCfsr59_gIOAe0";
+ /**
+ * 调研问卷通知模板id
+ */
+ public static final String DYWJ_ID = "orfmflVy0RkVT-kIPUk8muikfFqJrK_47OjzM-OVINc";
+ /**
+ * 奖励发放通知模板id
+ */
+ public static final String JLFF_ID = "vuGJS9WYb0e_99lcoB8USqJk5emGJftbe-G0PjgEvjU";
+ /**
+ * 报名成功通知模板id
+ */
+ public static final String BMCG_ID = "NQbyd_2n-DX2urZVrUkAPYER-J5XY6VqIm6QvaYj0NY";
+ /**
+ * 活动即将开始通知模板id
+ */
+ public static final String HDJJKS_ID = "__0i0e8-yfDGW3jv3l-qobcWt23Ec3iZEdJhMV3nHWo";
+ /**
+ * 预约提醒通知模板id
+ */
+ public static final String YYTX_ID = "KZtj9-KaqcDrKfZnNvv8A_bK4StEUtzLcOo0fhPjWNM";
+ /**
+ * 跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
+ */
+ public static final String MINIPROGRAM_STATE = "trial";
+ /**
+ * 订阅消息推送url
+ */
+ public static final String DYXX_URL = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=";
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
new file mode 100644
index 0000000..3d844a2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
@@ -0,0 +1,204 @@
+package com.panzhihua.common.controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.utlis.StringUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.constants.TokenConstant;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.exceptions.UnAuthenticationException;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.utlis.AES;
+
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+import static java.util.Objects.isNull;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 基础controller
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 09:31
+ **/
+@Slf4j
+public class BaseController {
+ public static void main(String[] args) {
+ byte[] bytes = AES.parseHexStr2Byte(
+ "5730CB290AD203B32D2FA4347CD54A50A684E16D2C7A4544CF352D54D8A763BA6652C323B13BEEE682A5095B8BCC76842225A914253CE84AFB6B58A9D1BE30A7992786E151A933FDEC6EBDCD1928CA68927047770F296F7541268149B34FDFCEF1340CF2266A041484744CB45B216EE8B4D96E243098F9CB3F661ACA7AF356C422BFE9A009FA478DF606A71DA7DBD776527E5120C3F13281BA8FC5587BACD5E403EE069762B5CF060BFA3CF4FD3417F5653CC178D2CA117284D85F442C0FAB076DB6F6D873B5363FAB93EBA9284CC87A5E97243EF4DC73F1ADA57BD9E9AAB2E4972AC3A4615B2DF6F9062BC04428D1B84B6C892A306F191B1D9DDBBB201D2767CE928020489AFC6BCFDC8A74F8C95080F74B4EC64AD1A6354B17A156B95AA9467C7461BD3C3F15F8F65BD7F3272184435D77003738B5B942EEA9603CFF249764718732595EC44DE4ED1BB763F9C88BAFACF5540E689FE84A4702E31D3D1D05BAC25C10F8E0C3948C777478537397BCB67D37066385DFCBDE3F4A53D6BA14481DBCB07E8452ACD2790A76669A9DE6D7080C8CFD9FB774035FCC3AC1C436581144969B7150318024A2E893FE926654E002097EB4735E49F3A9698A405969888A7D88A55A0FA60318C4A1E2D243BEE6D438");
+ byte[] decrypt = AES.decrypt(bytes, Constants.AES_KEY);
+ System.out.println(decrypt);
+ String s = new String(decrypt);
+ System.out.println(s);
+ }
+
+ /**
+ * 获取request对象
+ */
+ public HttpServletRequest getRequest() {
+ return ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest();
+ }
+
+
+ /**
+ * 获取request对象
+ */
+ public HttpServletResponse getResponse() {
+ return ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getResponse();
+ }
+
+ /**
+ * 获取登录对象信息
+ *
+ * @return 对象userid
+ */
+ public Long getUserId() {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ return userId;
+ }
+
+ /**
+ * 获取登录对象所在社区id
+ *
+ * @return 社区id
+ */
+ public Long getCommunityId() {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long communityId = loginUserInfo.getCommunityId();
+// if (null == communityId) {
+// throw new ServiceException("用户未绑定社区");
+// }
+ return communityId;
+ }
+
+ /**
+ * 获取登录对象所在社区名称
+ *
+ * @return 社区名称
+ */
+ public String getCommunityName() {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long communityId = loginUserInfo.getCommunityId();
+ if (null == communityId || 0 == communityId) {
+ throw new ServiceException("用户未绑定社区");
+ }
+ String communityName = loginUserInfo.getCommunityName();
+ return communityName;
+ }
+
+ /**
+ * 获取登录对象所在小区
+ *
+ * @return 小区id
+ */
+ public Long getAreaId() {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long areaId = loginUserInfo.getAreaId();
+ if (null == areaId) {
+ throw new ServiceException("用户未绑定小区");
+ }
+ return areaId;
+ }
+ /**
+ * 获取登录对象所在区域编码
+ *
+ * @return
+ */
+ public String getAreaCode() {
+ String appid = this.getRequest().getHeader("appid");
+ if(StringUtils.isNotEmpty(appid)){
+ if(appid.equals("wx08932ba29546ff82")){
+ return "510411";
+ }
+ else if(appid.equals("wx50d8c395af50481b")){
+ return "510402";
+ }
+ else {
+ return "510423";
+ }
+ } else {
+ LoginUserInfoVO loginUserInfoVO=this.getLoginUserInfo();
+ ComActVO comActVO=loginUserInfoVO.getComActVO();
+ if(isNull(comActVO) || isBlank(comActVO.getAreaCode())){
+ return "510423";
+ }
+ return comActVO.getAreaCode();
+ }
+ }
+
+
+ /**
+ * 获取登录token
+ *
+ * @return token
+ */
+ public String getToken() {
+ HttpServletRequest request = this.getRequest();
+ String header = request.getHeader(TokenConstant.TOKEN_LOGOUT);
+ return header;
+ }
+
+ public String getAppId(){
+ String appid = this.getRequest().getHeader("appid");
+ if(StringUtils.isEmpty(appid)){
+ return "wx0cef797390444b75";
+ }
+ return appid;
+ }
+
+ public String getAppSecret(){
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ return loginUserInfo.getAppSecret();
+ }
+ /**
+ * 获取登录对象所有信息
+ *
+ * @return 所有信息
+ */
+ @SneakyThrows
+ public LoginUserInfoVO getLoginUserInfo() {
+ HttpServletRequest request = this.getRequest();
+ String userInfo = request.getHeader(TokenConstant.TOKEN_USERINFO);
+ boolean empty = ObjectUtils.isEmpty(userInfo);
+ if (empty) {
+ throw new UnAuthenticationException("获取登录人信息失败");
+ }
+ // log.info("userInfo【{}】",userInfo);
+ byte[] bytes = AES.parseHexStr2Byte(userInfo);
+ // log.info("bytes【{}】",bytes);
+ byte[] decrypt = AES.decrypt(bytes, Constants.AES_KEY);
+ // log.info("decrypt【{}】",decrypt);
+ userInfo = new String(decrypt);
+ LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(userInfo, LoginUserInfoVO.class);
+ return loginUserInfoVO;
+ }
+
+ @SneakyThrows
+ public LoginUserInfoVO getLoginUserInfoSureNoLogin() {
+ HttpServletRequest request = this.getRequest();
+ String userInfo = request.getHeader(TokenConstant.TOKEN_USERINFO);
+ boolean empty = ObjectUtils.isEmpty(userInfo);
+ if (empty) {
+ return null;
+ // throw new UnAuthenticationException("获取登录人信息失败");
+ }
+ // log.info("userInfo【{}】",userInfo);
+ byte[] bytes = AES.parseHexStr2Byte(userInfo);
+ // log.info("bytes【{}】",bytes);
+ byte[] decrypt = AES.decrypt(bytes, Constants.AES_KEY);
+ // log.info("decrypt【{}】",decrypt);
+ userInfo = new String(decrypt);
+ LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(userInfo, LoginUserInfoVO.class);
+ return loginUserInfoVO;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/ComPbCheckUnitTypeEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/ComPbCheckUnitTypeEnum.java
new file mode 100644
index 0000000..d2ff3d4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/ComPbCheckUnitTypeEnum.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @author lyq
+ * 党员双报道单位类型枚举
+ */
+@Getter
+public enum ComPbCheckUnitTypeEnum {
+
+ GYQY(1, "国有企业"), GYKGQY(2, "国有控股企业"), WZQY(3, "外资企业")
+ , HZQY(4, "合资企业"), SYQY(5, "私营企业"), SYDW(6, "事业单位")
+ , GJXZJG(7, "国家行政机关"), ZF(6, "政府");
+
+ private final Integer code;
+ private final String name;
+
+ ComPbCheckUnitTypeEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (ComPbCheckUnitTypeEnum item : ComPbCheckUnitTypeEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return 0;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (ComPbCheckUnitTypeEnum item : ComPbCheckUnitTypeEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "";
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/ComPbMemberRoleTypeEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/ComPbMemberRoleTypeEnum.java
new file mode 100644
index 0000000..a1e95b7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/ComPbMemberRoleTypeEnum.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @author lyq
+ * 党委标签枚举
+ */
+@Getter
+public enum ComPbMemberRoleTypeEnum {
+
+ SQDW(1, "社区党委"), CYDWWY(2, "区域党委委员");
+
+ private final Integer code;
+ private final String name;
+
+ ComPbMemberRoleTypeEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (ComPbMemberRoleTypeEnum item : ComPbMemberRoleTypeEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return 0;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (ComPbMemberRoleTypeEnum item : ComPbMemberRoleTypeEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "";
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EldersAuthLevelEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EldersAuthLevelEnum.java
new file mode 100644
index 0000000..c2c1558
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EldersAuthLevelEnum.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 房屋租售状态
+ *
+ * @author huanghongfa
+ */
+@Getter
+public enum EldersAuthLevelEnum {
+ ELDER80_89(1, "80_89周岁"), ELDER90_99(2, "90_99周岁"), ELDER9100_(3, "100周岁(含)以上"),;
+
+ private final int level;
+ private final String info;
+
+ EldersAuthLevelEnum(int level, String info) {
+ this.level = level;
+ this.info = info;
+ }
+
+ public static int getCode(int age) {
+
+ if (80 <= age && age <= 89) {
+ return ELDER80_89.getLevel();
+ } else if (90 <= age && age <= 99) {
+ return ELDER90_99.getLevel();
+ } else if (100 <= age) {
+ return ELDER9100_.getLevel();
+ }
+ return 0;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventStatusEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventStatusEnum.java
new file mode 100644
index 0000000..cca5750
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventStatusEnum.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 事件状态
+ *
+ * @author lyq
+ */
+@Getter
+public enum EventStatusEnum {
+ DCL(1, "待走访"), YJJ(2, "已走访"), DYZ(3, "待验证"), CGX(4, "草稿箱"), YCX(5, "已撤销"), YC(6, "异常"), WZ(9, "未知");
+
+ private final Integer code;
+ private final String name;
+
+ EventStatusEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (EventStatusEnum item : EventStatusEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return WZ.getCode();
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (EventStatusEnum item : EventStatusEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "未知";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventTasksStatusEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventTasksStatusEnum.java
new file mode 100644
index 0000000..44c04bf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventTasksStatusEnum.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.enums;
+
+/**
+ * 走访任务状态
+ *
+ * @author xyh
+ * @date 2021/6/21 17:22
+ */
+public enum EventTasksStatusEnum {
+
+ DZF(1, "待走访"), YJJ(2, "已走访");
+
+ private final int code;
+ private final String name;
+
+ EventTasksStatusEnum(int code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static String getName(int code) {
+ for (EventTasksStatusEnum item : EventTasksStatusEnum.values()) {
+ if (item.code == (code)) {
+ return item.getName();
+ }
+ }
+ return "";
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public String getName() {
+ return name;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventTasksVisitorTypeEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventTasksVisitorTypeEnum.java
new file mode 100644
index 0000000..ab62c2f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventTasksVisitorTypeEnum.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.enums;
+
+/**
+ * 被走访人标签
+ *
+ * @author xyh
+ * @date 2021/6/21 17:22
+ */
+public enum EventTasksVisitorTypeEnum {
+
+ DZF(1, "待走访"), JXZ(2, "进行中"), ZJJJ(3, "自己解决"), DYZ(4, "待验证"), CG(5, "草稿"), YCX(6, "已撤销"), YC(7, "异常"),;
+
+ private final int code;
+ private final String name;
+
+ EventTasksVisitorTypeEnum(int code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static String getName(int code) {
+ for (EventTasksVisitorTypeEnum item : EventTasksVisitorTypeEnum.values()) {
+ if (item.code == (code)) {
+ return item.name();
+ }
+ }
+ return YC.name;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventType.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventType.java
new file mode 100644
index 0000000..1ed7833
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventType.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.enums;
+
+/**
+ * @ClasssName 事件常量
+ * @Description TODO
+ * @Author cedoo
+ * @Date 2021/5/28
+ * @Version 1.0
+ **/
+public class EventType {
+ // 当event_type_category是1填写事件分类
+ // 1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报 7 宣传教育
+ public static Integer EMERGENCIES = 5; // 5 突发事件
+ public static Integer CONTRADICTION = 3; // 3 矛盾纠纷
+ public static Integer HAZARD = 1; // 1 治安隐患
+ public static Integer UNSTABLE = 4; // 4 不稳定因素
+ public static Integer PUBLIC = 2; // 2 公共服务
+ public static Integer PROPAGANDA = 7; // 7 宣传教育
+ public static Integer SPECIAL = 6; // 6 特殊人群信息上报
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityApprovalStatusEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityApprovalStatusEnum.java
new file mode 100644
index 0000000..4ad64ff
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityApprovalStatusEnum.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @title: IdentityApprovalStatusEnum
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 身份认证审核状态枚举类
+ * @author: hans
+ * @date: 2021/09/14 11:26
+ */
+@Getter
+public enum IdentityApprovalStatusEnum {
+ /**
+ * 待审核
+ */
+ PENDING_REVIEW(1),
+ /**
+ * 驳回
+ */
+ REFUSE(2),
+ /**
+ * 通过
+ */
+ PASS_THROUGH(3);
+
+ private int status;
+
+ IdentityApprovalStatusEnum(int status) {
+ this.status = status;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityAuthMethodEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityAuthMethodEnum.java
new file mode 100644
index 0000000..ea9b404
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityAuthMethodEnum.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @title: IdentityAuthMethodEnum
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 身份认证方式枚举类
+ * @author: hans
+ * @date: 2021/09/14 13:11
+ */
+@Getter
+public enum IdentityAuthMethodEnum {
+ /**
+ * 视频认证
+ */
+ VIDEO_AUTH(1),
+ /**
+ * 人脸核验
+ */
+ FACE_AUTH(2),
+ /**
+ * 线下认证
+ */
+ OFFLINE_AUTH(3);
+
+ private int method;
+
+ IdentityAuthMethodEnum(int method) {
+ this.method = method;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityAuthStatusEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityAuthStatusEnum.java
new file mode 100644
index 0000000..707bd88
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityAuthStatusEnum.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @title: IdentityAuthStatusEnum
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 身份认证认证状态枚举类
+ * @author: hans
+ * @date: 2021/09/14 11:30
+ */
+@Getter
+public enum IdentityAuthStatusEnum {
+ /**
+ * 已认证
+ */
+ CERTIFIED(1),
+ /**
+ * 未认证
+ */
+ NOT_CERTIFIED(0);
+
+ private int status;
+
+ IdentityAuthStatusEnum(int status) {
+ this.status = status;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityAuthTypeEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityAuthTypeEnum.java
new file mode 100644
index 0000000..686b7a8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/IdentityAuthTypeEnum.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @title: IdentityAuthTypeEnum
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 身份认证类型枚举类
+ * @author: hans
+ * @date: 2021/09/14 10:40
+ */
+@Getter
+public enum IdentityAuthTypeEnum {
+ /**
+ * 高龄认证
+ */
+ ELDER_AUTH(1),
+ /**
+ * 养老认证
+ */
+ PENSION_AUTH(2);
+
+ private int type;
+
+ IdentityAuthTypeEnum(int type) {
+ this.type = type;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/KeyPersonLabelEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/KeyPersonLabelEnum.java
new file mode 100644
index 0000000..9ea2628
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/KeyPersonLabelEnum.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ *
+ *
+ * @author manaiilin
+ */
+@Getter
+public enum KeyPersonLabelEnum {
+ XD(1, "吸毒人员"), ZJ(2, "重精人员"), XJ(3, "邪教人员"), QT(4, "其他重点人员");
+
+ private final Integer code;
+ private final String name;
+
+ KeyPersonLabelEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (KeyPersonLabelEnum item : KeyPersonLabelEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return -1;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (KeyPersonLabelEnum item : KeyPersonLabelEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "其他";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/LocalEventToLangChaoEventTypeEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/LocalEventToLangChaoEventTypeEnum.java
new file mode 100644
index 0000000..9c942ab
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/LocalEventToLangChaoEventTypeEnum.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * desc 本地事件类型和浪潮接口对应的事件类型的对应关系 本地事件类型1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报 7宣传教育
+ *
+ * @author manaiilin
+ */
+@Getter
+public enum LocalEventToLangChaoEventTypeEnum {
+ ZA(1, "6", "治安隐患"), GG(2, "4", "公共服务"), MD(3, "5", "矛盾纠纷"), TF(5, "1b62afbccc2a4bb98125f999b7133242", "突发事件"),
+ TSRQ(6, "7da14163537b4b7e9a73ae28f4a58b72", "特殊人群信息上报"), XC(8, "9306ca7327a44b5ca474426f2da0e206", "宣传教育");
+
+ private final Integer code;
+ private final String name;
+ private final String eventName;
+
+ LocalEventToLangChaoEventTypeEnum(Integer code, String name, String eventName) {
+ this.code = code;
+ this.name = name;
+ this.eventName = eventName;
+ }
+
+ public static String getCodeByName(Integer code) {
+ for (LocalEventToLangChaoEventTypeEnum item : LocalEventToLangChaoEventTypeEnum.values()) {
+ if (item.getCode().equals(code)) {
+ return item.getName();
+ }
+ }
+ return ZA.getName();
+ }
+
+ public static String getEventNameByCode(Integer code) {
+ for (LocalEventToLangChaoEventTypeEnum item : LocalEventToLangChaoEventTypeEnum.values()) {
+ if (item.getCode().equals(code)) {
+ return item.getEventName();
+ }
+ }
+ return ZA.getEventName();
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/MerchantBusinessPeriod.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/MerchantBusinessPeriod.java
new file mode 100644
index 0000000..99c1527
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/MerchantBusinessPeriod.java
@@ -0,0 +1,15 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @title: MerchantBusinessPeriod
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 便民服务商家营业周期枚举类
+ * @author: hans
+ * @date: 2021/09/17 16:06
+ */
+@Getter
+public enum MerchantBusinessPeriod {
+ EVERY_DAY, WEEKDAY, WEEKEND
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/OpsHouseStatus.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/OpsHouseStatus.java
new file mode 100644
index 0000000..1437c8a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/OpsHouseStatus.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 房屋租售状态
+ *
+ * @author huanghongfa
+ */
+@Getter
+public enum OpsHouseStatus {
+ AUDIT(0, "待审核"), GROUNDING(1, "已上架"), REJECTED(2, "已驳回"), UNDERCARRIAGE(2, "已下架");
+
+ private final int code;
+ private final String info;
+
+ OpsHouseStatus(int code, String info) {
+ this.code = code;
+ this.info = info;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulCultureLevelEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulCultureLevelEnum.java
new file mode 100644
index 0000000..9b82579
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulCultureLevelEnum.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 文化程度
+ *
+ * @author huanghongfa
+ */
+@Getter
+public enum PopulCultureLevelEnum {
+ XX(80, "小学"), CZ(70, "初中"), GZ(61, "高中"), ZZ(40, "中专"), DZ(31, "大专"), BK(21, "本科"), SS(14, "硕士"), YJS(10, "研究生"),
+ BS(11, "博士"), QT(90, "其他"), WM(9, "文盲");
+
+ private final Integer code;
+ private final String name;
+
+ PopulCultureLevelEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (PopulCultureLevelEnum item : PopulCultureLevelEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return QT.getCode();
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (PopulCultureLevelEnum item : PopulCultureLevelEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "其他";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulHouseControlStatusEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulHouseControlStatusEnum.java
new file mode 100644
index 0000000..20fae50
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulHouseControlStatusEnum.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 房屋管控状态
+ *
+ * @author LYQ
+ */
+@Getter
+public enum PopulHouseControlStatusEnum {
+ CG(1, "常规"), GZ(2, "关注"), GK(3, "管控");
+
+ private final Integer code;
+ private final String name;
+
+ PopulHouseControlStatusEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (PopulHouseControlStatusEnum item : PopulHouseControlStatusEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return -1;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (PopulHouseControlStatusEnum item : PopulHouseControlStatusEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulHousePurposeEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulHousePurposeEnum.java
new file mode 100644
index 0000000..71ec4af
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulHousePurposeEnum.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 房屋用途
+ *
+ * @author LYQ
+ */
+@Getter
+public enum PopulHousePurposeEnum {
+ ZZ(1, "住宅"), GY(2, "公寓"), SS(3, "宿舍"), CK(4, "仓库"), QT(5, "其他");
+
+ private final Integer code;
+ private final String name;
+
+ PopulHousePurposeEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (PopulHousePurposeEnum item : PopulHousePurposeEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return -1;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (PopulHousePurposeEnum item : PopulHousePurposeEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "其他";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulHouseStatusEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulHouseStatusEnum.java
new file mode 100644
index 0000000..7074cf5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulHouseStatusEnum.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 房屋状态
+ *
+ * @author LYQ
+ */
+@Getter
+public enum PopulHouseStatusEnum {
+ ZI_ZHU(1, "自住"), ZU_ZHU(2, "租住"), QI_TA(3, "其他");
+
+ private final Integer code;
+ private final String name;
+
+ PopulHouseStatusEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (PopulHouseStatusEnum item : PopulHouseStatusEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return -1;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (PopulHouseStatusEnum item : PopulHouseStatusEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "其他";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulHouseUseEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulHouseUseEnum.java
new file mode 100644
index 0000000..0209332
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulHouseUseEnum.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.enums;
+
+/**
+ * 实有房屋使用类型
+ *
+ * @author xyh
+ * @date 2021/6/11 9:33
+ */
+public enum PopulHouseUseEnum {
+
+ SELF(1, "是"), RENT(0, "否"),;
+
+ private final Integer code;
+ private final String name;
+
+ PopulHouseUseEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (PopulHouseUseEnum item : PopulHouseUseEnum.values()) {
+ if (item.getName().equals(name)) {
+ return item.getCode();
+ }
+ }
+ return -1;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (PopulHouseUseEnum item : PopulHouseUseEnum.values()) {
+ if (item.getCode().equals(code)) {
+ return item.getName();
+ }
+ }
+ return "其他";
+ }
+
+ public Integer getCode() {
+ return code;
+ }
+
+ public String getName() {
+ return name;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulIsOkEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulIsOkEnum.java
new file mode 100644
index 0000000..7b1e82d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulIsOkEnum.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 是否状态
+ *
+ * @author huanghongfa
+ */
+@Getter
+public enum PopulIsOkEnum {
+ YES(1, "是"), NO(0, "否");
+
+ private final Integer code;
+ private final String name;
+
+ PopulIsOkEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (PopulIsOkEnum item : PopulIsOkEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return 0;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (PopulIsOkEnum item : PopulIsOkEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "否";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulIsOksEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulIsOksEnum.java
new file mode 100644
index 0000000..11bc8b7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulIsOksEnum.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 是否状态(1.是 2.否)
+ *
+ * @author huanghongfa
+ */
+@Getter
+public enum PopulIsOksEnum {
+ YES(1, "是"), NO(2, "否");
+
+ private final Integer code;
+ private final String name;
+
+ PopulIsOksEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (PopulIsOksEnum item : PopulIsOksEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return 2;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (PopulIsOksEnum item : PopulIsOksEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "否";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulIsRentEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulIsRentEnum.java
new file mode 100644
index 0000000..317a199
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulIsRentEnum.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 是否状态
+ *
+ * @author huanghongfa
+ */
+@Getter
+public enum PopulIsRentEnum {
+ YES(1, "租住"), NO(0, "自住");
+
+ private final Integer code;
+ private final String name;
+
+ PopulIsRentEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (PopulIsRentEnum item : PopulIsRentEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return 0;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (PopulIsRentEnum item : PopulIsRentEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "否";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulMarriageEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulMarriageEnum.java
new file mode 100644
index 0000000..3c7bb2b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulMarriageEnum.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 婚姻状况
+ *
+ * @author huanghongfa
+ */
+@Getter
+public enum PopulMarriageEnum {
+ WH(10, "未婚"), YH(20, "已婚"), CH(21, "初婚"), ZH(22, "再婚"), FH(23, "复婚"), SO(30, "丧偶"), LH(40, "离婚"),
+
+ QT(60, "其他"), WSM(90, "未说明的婚姻状况");
+
+ private final Integer code;
+ private final String name;
+
+ PopulMarriageEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (PopulMarriageEnum item : PopulMarriageEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return -1;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (PopulMarriageEnum item : PopulMarriageEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "其他";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulOutOrLocalEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulOutOrLocalEnum.java
new file mode 100644
index 0000000..c5d2be4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulOutOrLocalEnum.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 本地外地
+ *
+ * @author LYQ
+ */
+@Getter
+public enum PopulOutOrLocalEnum {
+ BD(1, "本地"), WD(2, "外地");
+
+ private final Integer code;
+ private final String name;
+
+ PopulOutOrLocalEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (PopulOutOrLocalEnum item : PopulOutOrLocalEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return -1;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (PopulOutOrLocalEnum item : PopulOutOrLocalEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulPersonTypeEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulPersonTypeEnum.java
new file mode 100644
index 0000000..7058d42
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulPersonTypeEnum.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 人员类型
+ *
+ * @author tangxb
+ */
+@Getter
+public enum PopulPersonTypeEnum {
+ HJ(1, "户籍人口"), LS(2, "留守人员"), WD(3, "外地人员"), JW(4, "境外人员"),
+ LD(5, "流动人口"), CZ(6, "常住人口"), ZZ(7, "暂住人口");
+
+ private final Integer code;
+ private final String name;
+
+ PopulPersonTypeEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (PopulPersonTypeEnum item : PopulPersonTypeEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return -1;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (PopulPersonTypeEnum item : PopulPersonTypeEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "其他";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulPoliticalOutlookEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulPoliticalOutlookEnum.java
new file mode 100644
index 0000000..85a3cfd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulPoliticalOutlookEnum.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 政治面貌
+ *
+ * @author huanghongfa
+ */
+@Getter
+public enum PopulPoliticalOutlookEnum {
+ PARTY_MEMBER(1, "中共党员"), PROBATIONARY_PARTY_MEMBER(2, "中共预备党员"), COMMUNIST_YOUTH_LEAGUE_MEMBER(3, "共青团员"),
+ MEMBERS_OF_THE_DEMOCRATIC_REVOLUTION(4, "民革党员"), LEAGUE_MEMBER(5, "民盟盟员"), MEMBER_OF_CIVIL_CONSTRUCTION(6, "民建会员"),
+ A_MEMBER_OF_THE_RURAL_LABOR_PARTY(8, "农工党党员"), ZHIGONG_PARTY_MEMBER(9, "致公党党员"),
+ MEMBER_OF_JIUSAN_SOCIETY(10, "九三学社社员"), MEMBER_OF_THE_TAIWAN_LEAGUE(11, "台盟盟员"), INDEPENDENTS(12, "无党派人士"),
+ THE_MASSES(13, "群众");
+
+ private final Integer code;
+ private final String name;
+
+ PopulPoliticalOutlookEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (PopulPoliticalOutlookEnum item : PopulPoliticalOutlookEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return THE_MASSES.getCode();
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (PopulPoliticalOutlookEnum item : PopulPoliticalOutlookEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "群众";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRegiterNatureEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRegiterNatureEnum.java
new file mode 100644
index 0000000..a5f8f84
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRegiterNatureEnum.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.enums;
+
+/**
+ * 实有房屋使用类型
+ *
+ * @author xyh
+ * @date 2021/6/11 9:33
+ */
+public enum PopulRegiterNatureEnum {
+
+ CZHK(1, "城镇户口"), NCHK(0, "农村户口"),;
+
+ private final Integer code;
+ private final String name;
+
+ PopulRegiterNatureEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (PopulRegiterNatureEnum item : PopulRegiterNatureEnum.values()) {
+ if (item.getName().equals(name)) {
+ return item.getCode();
+ }
+ }
+ return -1;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (PopulRegiterNatureEnum item : PopulRegiterNatureEnum.values()) {
+ if (item.getCode().equals(code)) {
+ return item.getName();
+ }
+ }
+ return "其他";
+ }
+
+ public Integer getCode() {
+ return code;
+ }
+
+ public String getName() {
+ return name;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRelationEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRelationEnum.java
new file mode 100644
index 0000000..e699c95
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRelationEnum.java
@@ -0,0 +1,66 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 与户主关系
+ *
+ * @author huanghongfa
+ */
+@Getter
+public enum PopulRelationEnum {
+ relation01(1, "本人"), relation02(2, "户主"), relation10(10, "配偶"), relation11(11, "夫"), relation12(12, "妻"),
+
+ relation20(20, "子"), relation21(21, "独生子"), relation22(22, "长子"), relation23(23, "次子"), relation24(24, "三子"),
+ relation25(25, "四子"), relation26(26, "五子"), relation27(27, "养子或继子"), relation28(28, "女婿"), relation29(29, "其他儿子"),
+
+ relation30(30, "女"), relation31(31, "独生女"), relation32(32, "长女"), relation33(33, "次女"), relation434(34, "三女"),
+ relation35(35, "四女"), relation36(36, "五女"), relation37(37, "养女或继女"), relation38(38, "儿媳"), relation39(39, "其他女儿"),
+
+ relation40(40, "孙子、孙女或外孙子、外孙女"), relation41(41, "孙子"), relation42(42, "孙女"), relation43(43, "外孙子"),
+ relation44(44, "外孙女"), relation45(45, "孙媳妇或外孙媳妇"), relation46(46, "孙女婿或外孙女婿"), relation47(47, "曾孙子或外曾孙子"),
+ relation48(48, "曾孙女或外曾孙女"), relation49(49, "其他孙子、孙女或外孙子、外孙女"),
+
+ relation50(50, "父母"), relation51(51, "父亲"), relation52(52, "母亲"), relation53(53, "公公"), relation54(54, "婆婆"),
+ relation55(55, "岳父"), relation56(56, "岳母"), relation57(57, "继父或养父"), relation58(58, "继母或养母"),
+ relation59(59, "其他父母关系"),
+
+ relation60(60, "祖父母或外祖父母"), relation61(61, "祖父"), relation62(62, "祖母"), relation63(63, "外祖父"),
+ relation64(64, "外祖母"), relation65(65, "配偶的祖父母或外祖父母"), relation66(66, "曾祖父"), relation67(67, "曾祖母"),
+ relation68(68, "配偶的曾祖父母或外曾祖父母"), relation69(69, "其他祖父母或外祖父母关系"),
+
+ relation70(70, "兄弟姐妹"), relation71(71, "兄"), relation72(72, "嫂"), relation73(73, "弟"), relation74(74, "弟媳"),
+ relation75(75, "姐姐"), relation76(76, "姐夫"), relation77(77, "妹妹"), relation78(78, "妹夫"), relation79(79, "其他兄弟姐妹"),
+ relation80(80, "其他"), relation81(81, "伯父"), relation82(82, "伯母"), relation83(83, "叔父"), relation84(84, "婶母"),
+ relation85(85, "舅父"), relation86(86, "舅母"), relation87(87, "姨夫"), relation88(88, "姨母"), relation89(89, "姑母"),
+
+ relation90(90, "姑父"), relation91(91, "堂兄妹，堂姐妹"), relation92(92, "表兄妹，表姐妹"), relation93(93, "侄子"),
+ relation94(94, "侄女"), relation95(95, "外甥"), relation96(96, "外甥女"), relation97(97, "其他亲属"), relation99(99, "非亲属");
+
+ private final Integer code;
+ private final String name;
+
+ PopulRelationEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (PopulRelationEnum item : PopulRelationEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return -1;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (PopulRelationEnum item : PopulRelationEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "其他";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulSexEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulSexEnum.java
new file mode 100644
index 0000000..5eef916
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulSexEnum.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 性别枚举
+ *
+ * @author huanghongfa
+ */
+@Getter
+public enum PopulSexEnum {
+ nan(1, "男"), nv(2, "女"), weizhi(3, "未知");
+
+ private final Integer code;
+ private final String name;
+
+ PopulSexEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (PopulSexEnum item : PopulSexEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return 3;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (PopulSexEnum item : PopulSexEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "未知";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PresetPictureType.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PresetPictureType.java
new file mode 100644
index 0000000..5b12efb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PresetPictureType.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.enums;
+
+/**
+ * @title: PresetPictureType
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 预设图片类型
+ * @author: hans
+ * @date: 2021/11/23 17:31
+ */
+public class PresetPictureType {
+ /**
+ * 物业宣传
+ */
+ public static Integer PROPERTY_PUBLICITY = 1;
+ /**
+ * 五微服务-微讲堂
+ */
+ public static Integer FMS_CLASSROOM = 2;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/QuestnaireState.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/QuestnaireState.java
new file mode 100644
index 0000000..822f327
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/QuestnaireState.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Author: llming
+ * @Description:问卷状态
+ */
+@Getter
+public enum QuestnaireState {
+ CONTINUED(0, "调研中"), STOP(1, "已停止");
+
+ private final int code;
+ private final String info;
+
+ QuestnaireState(int code, String info) {
+ this.code = code;
+ this.info = info;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/QuestnaireSubType.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/QuestnaireSubType.java
new file mode 100644
index 0000000..b1954ba
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/QuestnaireSubType.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Author: llming
+ * @Description: 问卷题目类型
+ */
+@Getter
+public enum QuestnaireSubType {
+ SINGLE(0, "单选"), MULTIPLE(1, "多选"), NARRATION(2, "问答题");
+
+ private final int code;
+ private final String info;
+
+ QuestnaireSubType(int code, String info) {
+ this.code = code;
+ this.info = info;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/RealAssetsCategoryType.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/RealAssetsCategoryType.java
new file mode 100644
index 0000000..9e788d3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/RealAssetsCategoryType.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 建筑类型
+ *
+ * @author llming
+ */
+@Getter
+public enum RealAssetsCategoryType {
+ PUBLIC(2, "公共设施"), BUILD(1, "建筑类");
+
+ private final int code;
+ private final String info;
+
+ RealAssetsCategoryType(int code, String info) {
+ this.code = code;
+ this.info = info;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/RealAssetsFloorType.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/RealAssetsFloorType.java
new file mode 100644
index 0000000..e332c76
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/RealAssetsFloorType.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 楼层类型
+ *
+ * @author llming
+ */
+@Getter
+public enum RealAssetsFloorType {
+ HIGN(1, "高层"), CENTRE(2, "中层"), LOW(3, "底层");
+
+ private final int code;
+ private final String info;
+
+ RealAssetsFloorType(int code, String info) {
+ this.code = code;
+ this.info = info;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/ReserveRecordStatusEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/ReserveRecordStatusEnum.java
new file mode 100644
index 0000000..1efe109
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/ReserveRecordStatusEnum.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 预约登记记录状态枚举
+ *
+ * @author lyq
+ */
+@Getter
+public enum ReserveRecordStatusEnum {
+ dcl(1, "待处理"), yycg(2, "预约成功"), yysb(3, "预约失败"), yqx(4, "已取消"), wz(5, "未知");
+
+ private final Integer code;
+ private final String name;
+
+ ReserveRecordStatusEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (ReserveRecordStatusEnum item : ReserveRecordStatusEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return wz.code;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (ReserveRecordStatusEnum item : ReserveRecordStatusEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return wz.name;
+ }
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/SafeWordDangerLevelEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/SafeWordDangerLevelEnum.java
new file mode 100644
index 0000000..73b7f78
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/SafeWordDangerLevelEnum.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 婚姻状况
+ *
+ * @author huanghongfa
+ */
+@Getter
+public enum SafeWordDangerLevelEnum {
+ RED(1, "红色预警"), ORANGE(2, "橙色预警"), YELLOW(3, "黄色预警"), BLUE(4, "蓝色预警");
+
+ private final Integer code;
+ private final String name;
+
+ SafeWordDangerLevelEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (SafeWordDangerLevelEnum item : SafeWordDangerLevelEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return -1;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (SafeWordDangerLevelEnum item : SafeWordDangerLevelEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "其他";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/SafeWordStatusEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/SafeWordStatusEnum.java
new file mode 100644
index 0000000..449a5ec
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/SafeWordStatusEnum.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 婚姻状况
+ *
+ * @author huanghongfa
+ */
+@Getter
+public enum SafeWordStatusEnum {
+ DCL(1, "待处理"), YCL(2, "已处理"), YZG(3, "已整改");
+
+ private final Integer code;
+ private final String name;
+
+ SafeWordStatusEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (SafeWordStatusEnum item : SafeWordStatusEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return -1;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (SafeWordStatusEnum item : SafeWordStatusEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "其他";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/SanShuoEventStatusEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/SanShuoEventStatusEnum.java
new file mode 100644
index 0000000..52fc408
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/SanShuoEventStatusEnum.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 事件状态
+ *
+ * @author 1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消8 已删除
+ */
+@Getter
+public enum SanShuoEventStatusEnum {
+ UNDO(1, "待处理"), VALID(2, "待验证"), ACCEPT(3, "专家已受理"), REJECT(4, "专家未受理，拒绝5"), conciliation(5, "调解中"), OVER(6, "已结案归档"), CANCEL(7, "调解取消"), DELETE(8, "已删除");
+
+ private final Integer code;
+ private final String name;
+
+ SanShuoEventStatusEnum(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (SanShuoEventStatusEnum item : SanShuoEventStatusEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return UNDO.getCode();
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (SanShuoEventStatusEnum item : SanShuoEventStatusEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "未知";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/UserStatus.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/UserStatus.java
new file mode 100644
index 0000000..4f0e7b3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/UserStatus.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 用户状态
+ *
+ * @author huanghongfa
+ */
+@Getter
+public enum UserStatus {
+ OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除");
+
+ private final String code;
+ private final String info;
+
+ UserStatus(String code, String info) {
+ this.code = code;
+ this.info = info;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/excel/CustomSheetWriteHandler.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/excel/CustomSheetWriteHandler.java
new file mode 100644
index 0000000..c1e13f9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/excel/CustomSheetWriteHandler.java
@@ -0,0 +1,59 @@
+package com.panzhihua.common.excel;
+
+import org.apache.poi.ss.usermodel.DataValidation;
+import org.apache.poi.ss.usermodel.DataValidationConstraint;
+import org.apache.poi.ss.usermodel.DataValidationHelper;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.alibaba.excel.write.handler.SheetWriteHandler;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
+
+/**
+ * 自定义拦截器.对第一列第一行和第二行的数据新增下拉框，显示 测试1 测试2
+ *
+ * @author Jiaju Zhuang
+ */
+public class CustomSheetWriteHandler implements SheetWriteHandler {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(CustomSheetWriteHandler.class);
+
+ @Override
+ public void beforeSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {
+
+ }
+
+ @Override
+ public void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {
+ LOGGER.info("第{}个Sheet写入成功。", writeSheetHolder.getSheetNo());
+
+ // 区间设置 第一列第一行和第二行的数据。由于第一行是头，所以第一、二行的数据实际上是第二三行
+ CellRangeAddressList cellRangeAddressList = new CellRangeAddressList(1, 2000, 11, 11);
+ CellRangeAddressList cellRangeAddressList1 = new CellRangeAddressList(1, 2000, 4, 4);
+ CellRangeAddressList cellRangeAddressList2 = new CellRangeAddressList(1, 2000, 6, 6);
+ CellRangeAddressList cellRangeAddressList3 = new CellRangeAddressList(1, 2000, 13, 13);
+ CellRangeAddressList cellRangeAddressList4 = new CellRangeAddressList(1, 2000, 14, 14);
+ DataValidationHelper helper = writeSheetHolder.getSheet().getDataValidationHelper();
+ DataValidationConstraint constraint = helper.createExplicitListConstraint(new String[] {"男", "女", "未知"});
+ DataValidationConstraint constraint1 = helper.createExplicitListConstraint(new String[] {"中共党员", "中共预备党员",
+ "共青团员", "民革党员", "民盟盟员", "民建会员", "农工党党员", "致公党党员", "九三学社社员", "台盟盟员", "无党派人士", "群众"});
+ DataValidationConstraint constraint2 = helper.createExplicitListConstraint(new String[] {"本地", "外地"});
+ DataValidationConstraint constraint3 =
+ helper.createExplicitListConstraint(new String[] {"未婚", "已婚", "初婚", "再婚", "复婚", "丧偶", "离婚", "未说明的婚育状况"});
+ DataValidationConstraint constraint4 =
+ helper.createExplicitListConstraint(new String[] {"很好", "较好", "一般", "较差", "很差"});
+ DataValidation dataValidation = helper.createValidation(constraint2, cellRangeAddressList);
+ DataValidation dataValidation1 = helper.createValidation(constraint, cellRangeAddressList1);
+ DataValidation dataValidation2 = helper.createValidation(constraint1, cellRangeAddressList2);
+ DataValidation dataValidation3 = helper.createValidation(constraint3, cellRangeAddressList3);
+ DataValidation dataValidation4 = helper.createValidation(constraint4, cellRangeAddressList4);
+
+ writeSheetHolder.getSheet().addValidationData(dataValidation);
+ writeSheetHolder.getSheet().addValidationData(dataValidation1);
+ writeSheetHolder.getSheet().addValidationData(dataValidation2);
+ writeSheetHolder.getSheet().addValidationData(dataValidation3);
+ writeSheetHolder.getSheet().addValidationData(dataValidation4);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/excel/PEXCustomSheetWriteHandler.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/excel/PEXCustomSheetWriteHandler.java
new file mode 100644
index 0000000..ac51499
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/excel/PEXCustomSheetWriteHandler.java
@@ -0,0 +1,49 @@
+package com.panzhihua.common.excel;
+
+import org.apache.poi.ss.usermodel.DataValidation;
+import org.apache.poi.ss.usermodel.DataValidationConstraint;
+import org.apache.poi.ss.usermodel.DataValidationHelper;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.alibaba.excel.write.handler.SheetWriteHandler;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
+
+/**
+ * 自定义拦截器.对第一列第一行和第二行的数据新增下拉框，显示 测试1 测试2
+ *
+ * @author Jiaju Zhuang
+ */
+public class PEXCustomSheetWriteHandler implements SheetWriteHandler {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(PEXCustomSheetWriteHandler.class);
+
+ @Override
+ public void beforeSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {
+
+ }
+
+ @Override
+ public void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {
+ LOGGER.info("第{}个Sheet写入成功。", writeSheetHolder.getSheetNo());
+
+ // 区间设置 第一列第一行和第二行的数据。由于第一行是头，所以第一、二行的数据实际上是第二三行
+ CellRangeAddressList cellRangeAddressList1 = new CellRangeAddressList(1, 5000, 3, 3);
+ CellRangeAddressList cellRangeAddressList2 = new CellRangeAddressList(1, 5000, 4, 4);
+ CellRangeAddressList cellRangeAddressList3 = new CellRangeAddressList(1, 5000, 25, 25);
+ DataValidationHelper helper = writeSheetHolder.getSheet().getDataValidationHelper();
+ DataValidationConstraint constraint1 = helper.createExplicitListConstraint(new String[] {"中共党员", "中共预备党员",
+ "共青团员", "民革党员", "民盟盟员", "民建会员", "农工党党员", "致公党党员", "九三学社社员", "台盟盟员", "无党派人士", "群众"});
+ DataValidationConstraint constraint2 = helper.createExplicitListConstraint(new String[] {"是", "否"});
+ DataValidationConstraint constraint3 = helper.createExplicitListConstraint(new String[] {"本地", "外地"});
+ DataValidation dataValidation1 = helper.createValidation(constraint1, cellRangeAddressList1);
+ DataValidation dataValidation2 = helper.createValidation(constraint2, cellRangeAddressList2);
+ DataValidation dataValidation3 = helper.createValidation(constraint3, cellRangeAddressList3);
+
+ writeSheetHolder.getSheet().addValidationData(dataValidation1);
+ writeSheetHolder.getSheet().addValidationData(dataValidation2);
+ writeSheetHolder.getSheet().addValidationData(dataValidation3);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/BaseException.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/BaseException.java
new file mode 100644
index 0000000..7c52c34
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/BaseException.java
@@ -0,0 +1,84 @@
+package com.panzhihua.common.exceptions;
+
+import com.panzhihua.common.utlis.MessageUtils;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 基础异常
+ *
+ * @author
+ */
+public class BaseException extends RuntimeException {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 所属模块
+ */
+ private String module;
+
+ /**
+ * 错误码
+ */
+ private String code;
+
+ /**
+ * 错误码对应的参数
+ */
+ private Object[] args;
+
+ /**
+ * 错误消息
+ */
+ private String defaultMessage;
+
+ public BaseException(String module, String code, Object[] args, String defaultMessage) {
+ this.module = module;
+ this.code = code;
+ this.args = args;
+ this.defaultMessage = defaultMessage;
+ }
+
+ public BaseException(String module, String code, Object[] args) {
+ this(module, code, args, null);
+ }
+
+ public BaseException(String module, String defaultMessage) {
+ this(module, null, null, defaultMessage);
+ }
+
+ public BaseException(String code, Object[] args) {
+ this(null, code, args, null);
+ }
+
+ public BaseException(String defaultMessage) {
+ this(null, null, null, defaultMessage);
+ }
+
+ @Override
+ public String getMessage() {
+ String message = null;
+ if (!StringUtils.isEmpty(code)) {
+ message = MessageUtils.message(code, args);
+ }
+ if (message == null) {
+ message = defaultMessage;
+ }
+ return message;
+ }
+
+ public String getModule() {
+ return module;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public Object[] getArgs() {
+ return args;
+ }
+
+ public String getDefaultMessage() {
+ return defaultMessage;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileException.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileException.java
new file mode 100644
index 0000000..f0f7075
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileException.java
@@ -0,0 +1,18 @@
+package com.panzhihua.common.exceptions;
+
+
+/**
+ * 文件信息异常类
+ *
+ * @author
+ */
+public class FileException extends BaseException
+{
+ private static final long serialVersionUID = 1L;
+
+ public FileException(String code, Object[] args)
+ {
+ super("file", code, args, null);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileNameLengthLimitExceededException.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileNameLengthLimitExceededException.java
new file mode 100644
index 0000000..e8cdd11
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileNameLengthLimitExceededException.java
@@ -0,0 +1,16 @@
+package com.panzhihua.common.exceptions;
+
+/**
+ * 文件名称超长限制异常类
+ *
+ * @author ruoyi
+ */
+public class FileNameLengthLimitExceededException extends FileException
+{
+ private static final long serialVersionUID = 1L;
+
+ public FileNameLengthLimitExceededException(int defaultFileNameLength)
+ {
+ super("upload.filename.exceed.length", new Object[] { defaultFileNameLength });
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileSizeLimitExceededException.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileSizeLimitExceededException.java
new file mode 100644
index 0000000..8fc0ef2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/FileSizeLimitExceededException.java
@@ -0,0 +1,16 @@
+package com.panzhihua.common.exceptions;
+
+/**
+ * 文件名大小限制异常类
+ *
+ * @author ruoyi
+ */
+public class FileSizeLimitExceededException extends FileException
+{
+ private static final long serialVersionUID = 1L;
+
+ public FileSizeLimitExceededException(long defaultMaxSize)
+ {
+ super("upload.exceed.maxSize", new Object[] { defaultMaxSize });
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/GlobalExceptionCapture.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/GlobalExceptionCapture.java
new file mode 100644
index 0000000..3a7cc4c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/GlobalExceptionCapture.java
@@ -0,0 +1,145 @@
+package com.panzhihua.common.exceptions;
+
+import java.util.List;
+
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.FieldError;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import com.panzhihua.common.constants.HttpStatus;
+import com.panzhihua.common.model.vos.R;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 全局异常捕获
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-25 14:36
+ **/
+@Slf4j
+@RestControllerAdvice
+@Order(Ordered.HIGHEST_PRECEDENCE)
+public class GlobalExceptionCapture {
+ /**
+ * 拦截捕捉自定义异常 TokenException.class
+ *
+ * @param ex
+ * token 异常
+ * @return R 401
+ */
+ @ExceptionHandler(value = TokenException.class)
+ public R myErrorHandlerTokenException(TokenException ex) {
+ return R.fail(ex.getCode(), ex.getMsg());
+ }
+
+ /**
+ * 拦截捕捉自定义异常 PartyBuildingMemberException
+ *
+ * @param ex
+ * 党建异常
+ * @return 异常信息
+ */
+ @ExceptionHandler(value = PartyBuildingMemberException.class)
+ public R PartyBuildingMemberException(PartyBuildingMemberException ex) {
+ return R.fail(ex.getMsg());
+ }
+
+ /**
+ * 拦截捕捉自定义异常 UnAuthenticationException.class
+ *
+ * @param ex
+ * 认证 异常
+ * @return R 401
+ */
+ @ExceptionHandler(value = UnAuthenticationException.class)
+ public R myErrorHandlerUnAuthenticationException(UnAuthenticationException ex) {
+ return R.fail(ex.getCode(), "没有登录");
+ }
+
+ /**
+ * 拦截捕捉自定义异常 UnAuthorizationException.class
+ *
+ * @param ex
+ * 权限 异常
+ * @return R 403
+ */
+ @ExceptionHandler(value = UnAuthorizationException.class)
+ public R myErrorHandlerUnAuthorizationException(UnAuthenticationException ex) {
+ return R.fail(ex.getCode(), "没有访问权限");
+ }
+
+ /**
+ *
+ * @param ex
+ * 数据库异常
+ * @return
+ */
+ @ExceptionHandler(value = java.sql.SQLSyntaxErrorException.class)
+ public R sqlSyntaxExcetption(Exception ex) {
+ log.error("数据库异常【{}】", ex.getMessage());
+ return R.fail("sql语法错误");
+ }
+
+ /**
+ *
+ * @param ex
+ * 数据库异常
+ * @return
+ */
+ @ExceptionHandler(value = java.sql.SQLException.class)
+ public R sqlException(Exception ex) {
+ log.error("数据库异常【{}】", ex.getMessage());
+ return R.fail("sql错误");
+ }
+
+ /**
+ *
+ * @param ex
+ * 服务层业务异常
+ * @return
+ */
+ @ExceptionHandler(value = ServiceException.class)
+ public R serviceException(ServiceException ex) {
+ log.error("服务层业务异常【{}】", ex.getMessage());
+ return R.fail(ex.getMessage());
+ }
+
+ /**
+ * 校验异常
+ *
+ * @param ex
+ * valid
+ * @return 返回json
+ */
+ @ExceptionHandler(value = MethodArgumentNotValidException.class)
+ public R methodArgumentNotValidException(MethodArgumentNotValidException ex) {
+ BindingResult result = ex.getBindingResult();
+ StringBuilder errorMessage = new StringBuilder();
+ if (result.hasErrors()) {
+ List<ObjectError> errors = result.getAllErrors();
+ errors.forEach(p -> {
+ FieldError fieldError = (FieldError)p;
+ errorMessage.append(fieldError.getDefaultMessage());
+ errorMessage.append(" ");
+ });
+ }
+ return R.fail(HttpStatus.BAD_REQUEST, errorMessage.toString());
+ }
+
+ // /**
+ // * 全局异常捕捉处理
+ // * @param ex 所有运行时异常
+ // * @return R 500
+ // */
+ // @ExceptionHandler(value = Exception.class)
+ // public R errorHandler(Exception ex) {
+ // log.error("捕捉到全局异常【{}】",ex.getMessage());
+ // return R.fail("接口请求失败");
+ // }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/InvalidExtensionException.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/InvalidExtensionException.java
new file mode 100644
index 0000000..4ba638c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/InvalidExtensionException.java
@@ -0,0 +1,82 @@
+package com.panzhihua.common.exceptions;
+
+import org.apache.commons.fileupload.FileUploadException;
+
+import java.util.Arrays;
+
+/**
+ * 文件上传 误异常类
+ *
+ * @author ruoyi
+ */
+public class InvalidExtensionException extends FileUploadException
+{
+ private static final long serialVersionUID = 1L;
+
+ private String[] allowedExtension;
+ private String extension;
+ private String filename;
+
+ public InvalidExtensionException(String[] allowedExtension, String extension, String filename)
+ {
+ super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");
+ this.allowedExtension = allowedExtension;
+ this.extension = extension;
+ this.filename = filename;
+ }
+
+ public String[] getAllowedExtension()
+ {
+ return allowedExtension;
+ }
+
+ public String getExtension()
+ {
+ return extension;
+ }
+
+ public String getFilename()
+ {
+ return filename;
+ }
+
+ public static class InvalidImageExtensionException extends InvalidExtensionException
+ {
+ private static final long serialVersionUID = 1L;
+
+ public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename)
+ {
+ super(allowedExtension, extension, filename);
+ }
+ }
+
+ public static class InvalidFlashExtensionException extends InvalidExtensionException
+ {
+ private static final long serialVersionUID = 1L;
+
+ public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename)
+ {
+ super(allowedExtension, extension, filename);
+ }
+ }
+
+ public static class InvalidMediaExtensionException extends InvalidExtensionException
+ {
+ private static final long serialVersionUID = 1L;
+
+ public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename)
+ {
+ super(allowedExtension, extension, filename);
+ }
+ }
+
+ public static class InvalidVideoExtensionException extends InvalidExtensionException
+ {
+ private static final long serialVersionUID = 1L;
+
+ public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename)
+ {
+ super(allowedExtension, extension, filename);
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/PartyBuildingMemberException.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/PartyBuildingMemberException.java
new file mode 100644
index 0000000..af359bc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/PartyBuildingMemberException.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.exceptions;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 党建异常
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-30 11:01
+ **/
+public class PartyBuildingMemberException extends RuntimeException {
+ private static final long serialVersionUID = 1L;
+
+ private String msg = "党建异常";
+ private int code = 500;
+
+ public PartyBuildingMemberException(String msg) {
+ super(msg);
+ this.msg = msg;
+ }
+
+ public PartyBuildingMemberException() {
+ super();
+
+ }
+
+ public PartyBuildingMemberException(String msg, Throwable e) {
+ super(msg, e);
+ this.msg = msg;
+ }
+
+ public PartyBuildingMemberException(String msg, int code) {
+ super(msg);
+ this.msg = msg;
+ this.code = code;
+ }
+
+ public PartyBuildingMemberException(String msg, int code, Throwable e) {
+ super(msg, e);
+ this.msg = msg;
+ this.code = code;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/ServiceException.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/ServiceException.java
new file mode 100644
index 0000000..e61650f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/ServiceException.java
@@ -0,0 +1,67 @@
+package com.panzhihua.common.exceptions;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 服务层业务异常
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-28 14:13
+ **/
+public class ServiceException extends RuntimeException {
+
+ private String code;
+ private String msg;
+ private String data;
+
+ public ServiceException() {
+ super();
+ }
+
+ public ServiceException(String errorMsg) {
+ super(errorMsg);
+ this.msg = errorMsg;
+ }
+
+ public ServiceException(String errorCode, String errorMsg) {
+ super(errorCode);
+ this.code = errorCode;
+ this.msg = errorMsg;
+ }
+
+ public ServiceException(String errorCode, String errorMsg, String data) {
+ super(errorCode);
+ this.code = errorCode;
+ this.msg = errorMsg;
+ this.data = data;
+ }
+
+ public ServiceException(String errorCode, String errorMsg, Throwable cause) {
+ super(errorCode, cause);
+ this.code = errorCode;
+ this.msg = errorMsg;
+ }
+
+ public String getErrorCode() {
+ return code;
+ }
+
+ public void setErrorCode(String errorCode) {
+ this.code = errorCode;
+ }
+
+ public String getErrorMsg() {
+ return msg;
+ }
+
+ public void setErrorMsg(String errorMsg) {
+ this.msg = errorMsg;
+ }
+
+ public String getMessage() {
+ return msg;
+ }
+
+ @Override
+ public Throwable fillInStackTrace() {
+ return this;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/TokenException.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/TokenException.java
new file mode 100644
index 0000000..f94d8a7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/TokenException.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.exceptions;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: token
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 15:01
+ **/
+public class TokenException extends RuntimeException {
+ private static final long serialVersionUID = 1L;
+
+ private String msg = "token校验失败";
+ private int code = 401;
+
+ public TokenException(String msg) {
+ super(msg);
+ this.msg = msg;
+ }
+
+ public TokenException() {
+ super();
+
+ }
+
+ public TokenException(String msg, Throwable e) {
+ super(msg, e);
+ this.msg = msg;
+ }
+
+ public TokenException(String msg, int code) {
+ super(msg);
+ this.msg = msg;
+ this.code = code;
+ }
+
+ public TokenException(String msg, int code, Throwable e) {
+ super(msg, e);
+ this.msg = msg;
+ this.code = code;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/UnAuthenticationException.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/UnAuthenticationException.java
new file mode 100644
index 0000000..247766f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/UnAuthenticationException.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) 2016-2019 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.panzhihua.common.exceptions;
+
+/**
+ * 未认证异常
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+public class UnAuthenticationException extends RuntimeException {
+ private static final long serialVersionUID = 1L;
+
+ private String msg = "用户未认证";
+ private int code = 401;
+
+ public UnAuthenticationException(String msg) {
+ super(msg);
+ this.msg = msg;
+ }
+
+ public UnAuthenticationException() {
+ super();
+
+ }
+
+ public UnAuthenticationException(String msg, Throwable e) {
+ super(msg, e);
+ this.msg = msg;
+ }
+
+ public UnAuthenticationException(String msg, int code) {
+ super(msg);
+ this.msg = msg;
+ this.code = code;
+ }
+
+ public UnAuthenticationException(String msg, int code, Throwable e) {
+ super(msg, e);
+ this.msg = msg;
+ this.code = code;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/UnAuthorizationException.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/UnAuthorizationException.java
new file mode 100644
index 0000000..1e3f1e2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/UnAuthorizationException.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.exceptions;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 无权限
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 14:26
+ **/
+public class UnAuthorizationException extends RuntimeException {
+ private static final long serialVersionUID = 1L;
+
+ private String msg = "无权限";
+ private int code = 403;
+
+ public UnAuthorizationException(String msg) {
+ super(msg);
+ this.msg = msg;
+ }
+
+ public UnAuthorizationException() {
+ super();
+
+ }
+
+ public UnAuthorizationException(String msg, Throwable e) {
+ super(msg, e);
+ this.msg = msg;
+ }
+
+ public UnAuthorizationException(String msg, int code) {
+ super(msg);
+ this.msg = msg;
+ this.code = code;
+ }
+
+ public UnAuthorizationException(String msg, int code, Throwable e) {
+ super(msg, e);
+ this.msg = msg;
+ this.code = code;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/WeiXinException.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/WeiXinException.java
new file mode 100644
index 0000000..9ac488f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/WeiXinException.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) 2016-2019 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.panzhihua.common.exceptions;
+
+/**
+ * 微信异常
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+public class WeiXinException extends RuntimeException {
+ private static final long serialVersionUID = 1L;
+
+ private String msg = "微信调用失败";
+ private int code = 500;
+
+ public WeiXinException(String msg) {
+ super(msg);
+ this.msg = msg;
+ }
+
+ public WeiXinException() {
+ super();
+
+ }
+
+ public WeiXinException(String msg, Throwable e) {
+ super(msg, e);
+ this.msg = msg;
+ }
+
+ public WeiXinException(String msg, int code) {
+ super(msg);
+ this.msg = msg;
+ this.code = code;
+ }
+
+ public WeiXinException(String msg, int code, Throwable e) {
+ super(msg, e);
+ this.msg = msg;
+ this.code = code;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/interfaces/OperLog.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/interfaces/OperLog.java
new file mode 100644
index 0000000..80f8139
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/interfaces/OperLog.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.interfaces;
+
+import java.lang.annotation.*;
+
+/**
+ * 自定义操作日志注解
+ *
+ * @author wu
+ */
+@Target(ElementType.METHOD) // 注解放置的目标位置,METHOD是可注解在方法级别上
+@Retention(RetentionPolicy.RUNTIME) // 注解在哪个阶段执行
+@Documented
+public @interface OperLog {
+ String operModul() default ""; // 操作模块
+
+ int operType() default 0; // 操作类型 业务类型（0其它 1新增 2修改 3删除）
+
+ String businessType() default ""; //操作类型
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/interfaces/ShopOperLog.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/interfaces/ShopOperLog.java
new file mode 100644
index 0000000..e9d3d83
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/interfaces/ShopOperLog.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.interfaces;
+
+import java.lang.annotation.*;
+
+/**
+ * 商城后台操作日志注解
+ *
+ * @author wu
+ */
+@Target(ElementType.METHOD) // 注解放置的目标位置,METHOD是可注解在方法级别上
+@Retention(RetentionPolicy.RUNTIME) // 注解在哪个阶段执行
+@Documented
+public @interface ShopOperLog {
+ String operModul() default "shop";
+
+ /**
+ * 操作类型 1.登录 2.修改密码 3.添加商品 4.编辑商品 5.下架商品 6.上架商品 7.删除商品 8.取消订单 9.发货 10.配送 11.查看订单详情 12.导出订单 13.导出资金流水
+ *
+ * @return
+ */
+ int operType() default 0;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComActSocialWorkerExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComActSocialWorkerExcelListen.java
new file mode 100644
index 0000000..736af4f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComActSocialWorkerExcelListen.java
@@ -0,0 +1,61 @@
+package com.panzhihua.common.listen;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerExcelVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description: 便民服务导入监听
+ * @author: Null
+ * @date: 2021/3/11 13:26
+ */
+@Slf4j
+public class ComActSocialWorkerExcelListen extends AnalysisEventListener<ComActSocialWorkerExcelVO> {
+
+ private CommunityService communityService;
+
+ private Long communityId;
+
+ public ComActSocialWorkerExcelListen(CommunityService communityService, Long communityId) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ }
+
+
+ private static final int BATCH_COUNT = 5000;
+ private List<ComActSocialWorkerExcelVO> list = new ArrayList<>();
+
+ @Override
+ public void invoke(ComActSocialWorkerExcelVO comActSocialWorkerExcelVO, AnalysisContext analysisContext) {
+ list.add(comActSocialWorkerExcelVO);
+ // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
+ if (list.size() >= BATCH_COUNT) {
+ log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
+ R r = this.communityService.listSaveSocialWorkerExcelVO(list, this.communityId);
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+ //清空list
+ list.clear();
+ }
+
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+ log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
+ R r = this.communityService.listSaveSocialWorkerExcelVO(list, this.communityId);//确保最后遗留的数据保存在数据库中
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComClusterMemberExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComClusterMemberExcelListen.java
new file mode 100644
index 0000000..1a58f36
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComClusterMemberExcelListen.java
@@ -0,0 +1,215 @@
+package com.panzhihua.common.listen;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelErrorVO;
+import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * title: 群团组织成员导入监听
+ * @author : lyq
+ */
+@Slf4j
+public class ComClusterMemberExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 3000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComClusterMemberExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("000", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.CLUSTER_MEMBER_ERROR_LIST + communityId;
+ int index = 2;
+ try {
+ ArrayList<ComClusterMemberExcelVO> voList = Lists.newArrayList();
+ ArrayList<ComClusterMemberExcelErrorVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComClusterMemberExcelVO vo = new ComClusterMemberExcelVO();
+
+ if (StringUtils.isEmpty(oneData.get(0))) {
+ index++;
+ mistakes.add(setErrorObject(oneData,"名字不可为空，请填写姓名"));
+ continue;
+ }else{
+ //判断导入的名字的长度是否超过10
+ if(oneData.get(0).length() > 10){
+ index++;
+ mistakes.add(setErrorObject(oneData,"名字长度不可超过10，请重新填写姓名"));
+ continue;
+ }
+ }
+ vo.setName(oneData.get(0));
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ index++;
+ mistakes.add(setErrorObject(oneData,"组织不可为空，请填写组织名称"));
+ continue;
+ }
+ vo.setClusterName(oneData.get(1));
+ if (StringUtils.isEmpty(oneData.get(2))) {
+ index++;
+ mistakes.add(setErrorObject(oneData,"职务不可为空，请填写职务"));
+ continue;
+ }
+ vo.setJob(oneData.get(2));
+ if (StringUtils.isEmpty(oneData.get(3))) {
+ index++;
+ mistakes.add(setErrorObject(oneData,"联系电话不可为空，请填写联系电话"));
+ continue;
+ }else{
+ //验证手机号正则
+ String regex = "^[1][3,4,5,6,7,8,9][0-9]{9}$";
+ Pattern pattern = Pattern.compile(regex);
+ Matcher m = pattern.matcher(oneData.get(3));
+ if(!m.matches()){
+ index++;
+ mistakes.add(setErrorObject(oneData,"联系电话输入错误，请核对联系电话"));
+ continue;
+ }
+ }
+ vo.setPhone(oneData.get(3));
+ if (StringUtils.isEmpty(oneData.get(4))) {
+ index++;
+ mistakes.add(setErrorObject(oneData,"民族不可为空，请填写民族"));
+ continue;
+ }else{
+ if(!oneData.get(4).contains("族")){
+ index++;
+ mistakes.add(setErrorObject(oneData,"填写的民族有误，请重新填写（民族格式：X族 如：汉族）"));
+ continue;
+ }
+ }
+ vo.setNation(oneData.get(4));
+ if (StringUtils.isEmpty(oneData.get(5))) {
+ index++;
+ mistakes.add(setErrorObject(oneData,"住址不可为空，请填写住址"));
+ continue;
+ }
+ vo.setAddress(oneData.get(5));
+ if (StringUtils.isEmpty(oneData.get(6))) {
+ index++;
+ mistakes.add(setErrorObject(oneData,"身份证号不可为空，请填写身份证号码"));
+ continue;
+ }
+ // 判断身份证号码位数
+ if (oneData.get(6).length() != 18) {
+ index++;
+ mistakes.add(setErrorObject(oneData,"身份证号位数有误，请检查身份证号码是否正确"));
+ continue;
+ }
+ vo.setIdCard(oneData.get(6).toUpperCase());
+ voList.add(vo);
+ index++;
+ }
+ List<ComClusterMemberExcelVO> newVoList =
+ voList.stream().filter(ListUtils.distinctByKey(ComClusterMemberExcelVO::getIdCard))
+ .collect(Collectors.toList());
+ R r = communityService.importClusterMember(newVoList, communityId, userId);
+ if (!R.isOk(r)) {
+ List<ComClusterMemberExcelErrorVO> list =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComClusterMemberExcelErrorVO.class);
+ mistakes.addAll(list);
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ throw new ServiceException("500", key);
+ } else {
+ if (!mistakes.isEmpty()) {
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ throw new ServiceException("500", key);
+ }
+ }
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ throw new ServiceException("500", "导入失败");
+ }
+ }
+
+ private void setError(Map<Integer, String> map, ComClusterMemberExcelErrorVO vo) {
+ vo.setName(map.get(0));
+ vo.setClusterName(map.get(1));
+ vo.setJob(map.get(2));
+ vo.setPhone(map.get(3));
+ vo.setNation(map.get(4));
+ vo.setAddress(map.get(5));
+ vo.setIdCard(map.get(6));
+ }
+
+ /**
+ * 组装错误信息
+ * @param oneData 数据表格对象
+ * @param error 错误信息
+ * @return 错误对象
+ */
+ private ComClusterMemberExcelErrorVO setErrorObject(Map<Integer, String> oneData, String error){
+ ComClusterMemberExcelErrorVO mistake = new ComClusterMemberExcelErrorVO();
+ setError(oneData, mistake);
+ mistake.setError(error);
+ return mistake;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComCvtServeExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComCvtServeExcelListen.java
new file mode 100644
index 0000000..2b71ee3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComCvtServeExcelListen.java
@@ -0,0 +1,77 @@
+package com.panzhihua.common.listen;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.excel.exception.ExcelDataConvertException;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 便民服务导入监听
+ * @author: Null
+ * @date: 2021/3/11 13:26
+ */
+@Slf4j
+public class ComCvtServeExcelListen extends AnalysisEventListener<ComCvtServeExcelVO> {
+
+ private static final int BATCH_COUNT = 5000;
+ private CommunityService communityService;
+ private Long communityId;
+ private List<ComCvtServeExcelVO> list = new ArrayList<>();
+ public ComCvtServeExcelListen(CommunityService communityService, Long communityId) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ }
+
+ @Override
+ public void invoke(ComCvtServeExcelVO comCvtServeExcelVO, AnalysisContext analysisContext) {
+ list.add(comCvtServeExcelVO);
+ // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
+ if (list.size() >= BATCH_COUNT) {
+ log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
+ R r = this.communityService.listSaveConvenientServeExcelVO(list, this.communityId);
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+ // 清空list
+ list.clear();
+ }
+
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+ log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
+ R r = this.communityService.listSaveConvenientServeExcelVO(list, this.communityId);// 确保最后遗留的数据保存在数据库中
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+ }
+
+ /**
+ * 在转换异常
+ *
+ * @param exception
+ * @param context
+ * @throws Exception
+ */
+ @Override
+ public void onException(Exception exception, AnalysisContext context) throws ServiceException {
+ log.error("抛出异常:{}", exception.getMessage());
+ if (exception instanceof ExcelDataConvertException) {
+ ExcelDataConvertException excelDataConvertException = (ExcelDataConvertException)exception;
+ log.error("第{}行，第{}列解析异常，数据为:{}", excelDataConvertException.getRowIndex(),
+ excelDataConvertException.getColumnIndex(), excelDataConvertException.getCellData());
+ } else {
+ throw new ServiceException(exception.getMessage());
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComElderAuthRecordImportExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComElderAuthRecordImportExcelListen.java
new file mode 100644
index 0000000..12daa0a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComElderAuthRecordImportExcelListen.java
@@ -0,0 +1,229 @@
+package com.panzhihua.common.listen;
+
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.BcDictionaryConstants;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.enums.*;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComElderAuthRecordImportExcelVO;
+import com.panzhihua.common.model.vos.community.ComElderAuthRecordImportMistakeExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationDrugExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationDrugMistakeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.PayUtil;
+import com.panzhihua.common.utlis.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * @description: 高龄认证线下认证居民导入监听
+ * @author: txb
+ */
+@Slf4j
+public class ComElderAuthRecordImportExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComElderAuthRecordImportExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ log.info("开始导入线下认证居民数据");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("100", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.ELDER_RECORD_ERROR_LIST + communityId;
+
+ int index = 2;
+ try {
+ String[] parsePatterns = new String[] {"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd",
+ "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d"};
+ ArrayList<ComElderAuthRecordImportExcelVO> voList = Lists.newArrayList();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ArrayList<ComElderAuthRecordImportMistakeExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComElderAuthRecordImportExcelVO vo = new ComElderAuthRecordImportExcelVO();
+ if (StringUtils.isEmpty(oneData.get(0))) {
+ ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO();
+ index++;
+ setElderAuthMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(0));
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO();
+ index++;
+ setElderAuthMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
+
+ // 判断身份证号码位数
+ if (oneData.get(1).length() != 18) {
+ ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO();
+ index++;
+ setElderAuthMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIdCard(oneData.get(1).toUpperCase());
+ // 根据身份证号码解析年龄以及性别
+ // 获取用户生日
+ String birthday = vo.getIdCard().substring(6, 14);
+ if (StringUtils.isNotEmpty(birthday)) {
+ String year = birthday.substring(0, 4);
+ String month = birthday.substring(4, 6);
+ String day = birthday.substring(6, 8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
+ // //设置用户年龄
+ // vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
+ // 获取用户性别
+ int sex = Integer.parseInt(vo.getIdCard().substring(16, 17));
+ if (sex % 2 == 1) {
+ vo.setSex(PopulSexEnum.nan.getCode());
+ } else {
+ vo.setSex(PopulSexEnum.nv.getCode());
+ }
+
+ if (StringUtils.isNotEmpty(oneData.get(2))) {
+ vo.setPhone(oneData.get(2));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(3))) {
+ vo.setNowAddress(oneData.get(3));
+ vo.setAddress(oneData.get(3));
+ }
+ if (StringUtils.isEmpty(oneData.get(4))) {
+ index++;
+ ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO();
+ setElderAuthMistake(oneData, mistake);
+ mistake.setMistake("认证时间不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setAuthDate(DateUtil.parse(oneData.get(4).trim(), parsePatterns));
+ if (StringUtils.isEmpty(oneData.get(5))) {
+ index++;
+ ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO();
+ setElderAuthMistake(oneData, mistake);
+ mistake.setMistake("认证期数不能为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setAuthPeriod(oneData.get(5));
+ if (StringUtils.isNotEmpty(oneData.get(6))) {
+ vo.setMark(oneData.get(6));
+ }
+
+ voList.add(vo);
+ index++;
+ }
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.listSaveElderAuthRecordExcelVO(voList, communityId, userId);
+ log.info("业务层处理逻辑完成");
+ if (!R.isOk(r)) {
+ log.info("业务层处理成功");
+ List<ComElderAuthRecordImportMistakeExcelVO> list =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComElderAuthRecordImportMistakeExcelVO.class);
+ mistakes.addAll(list);
+ log.info("将错误数据存入redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", key+" 成功");
+ } else {
+ log.info("业务层处理逻辑失败");
+ if (!mistakes.isEmpty()) {
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
+ throw new ServiceException("500", key+" 失败");
+ }
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行");
+ // importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+ // populationImportErrorVOList.add(importErrorVO);
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ }
+ }
+
+ private void setElderAuthMistake(Map<Integer, String> map, ComElderAuthRecordImportMistakeExcelVO vo) {
+ vo.setName(map.get(0));
+ vo.setIdCard(map.get(1));
+ vo.setPhone(map.get(2));
+ vo.setNowAddress(map.get(3));
+ vo.setAuthDate(map.get(4));
+ vo.setAuthPeriod(map.get(5));
+ vo.setMark(map.get(6));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthElderlyExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthElderlyExcelListen.java
new file mode 100644
index 0000000..1d191e5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthElderlyExcelListen.java
@@ -0,0 +1,116 @@
+package com.panzhihua.common.listen;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.panzhihua.common.enums.EldersAuthLevelEnum;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.StringUtils;
+
+import cn.hutool.core.util.IdcardUtil;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 高龄老人导入监听
+ * @author: xyh
+ * @date: 2021/3/11 13:26
+ */
+@Slf4j
+public class ComEldersAuthElderlyExcelListen extends AnalysisEventListener<EldersAuthElderlyExcelVO> {
+
+ private static final int BATCH_COUNT = 3000;
+ private CommunityService communityService;
+ private Long communityId;
+ private Long createBy;
+ private List<EldersAuthElderlyExcelVO> list = new ArrayList<>();
+
+ public ComEldersAuthElderlyExcelListen(CommunityService communityService, Long communityId, Long createBy) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.createBy = createBy;
+ }
+
+ /**
+ * @author cedoo
+ * @Description:找出list中的重复数据
+ * @param datas
+ * @return
+ */
+ public static <T> List<T> findRepeat(Collection<T> datas) {
+ if (datas instanceof Set) {
+ return new ArrayList<>();
+ }
+ HashSet<T> set = new HashSet<T>();
+ List<T> repeatEles = new ArrayList<T>();
+ for (T t : datas) {
+ if (set.contains(t)) {
+ if (!repeatEles.contains(t)) {
+ repeatEles.add(t);
+ }
+ } else {
+ set.add(t);
+ }
+ }
+ return repeatEles;
+ }
+
+ @Override
+ public void invoke(EldersAuthElderlyExcelVO eldersAuthElderlyExcelVO, AnalysisContext analysisContext) {
+ if (StringUtils.isEmpty(eldersAuthElderlyExcelVO.getName())) {
+ throw new ServiceException("姓名不可为空");
+ }
+ if (StringUtils.isEmpty(eldersAuthElderlyExcelVO.getIsExist())) {
+ eldersAuthElderlyExcelVO.setIsExist("是");
+ }
+ if (StringUtils.isEmpty(eldersAuthElderlyExcelVO.getIsBigAge())) {
+ eldersAuthElderlyExcelVO.setIsBigAge("是");
+ }
+ if (StringUtils.isEmpty(eldersAuthElderlyExcelVO.getIdCard())) {
+ throw new ServiceException("身份证号错误");
+ }
+
+ String idCard = eldersAuthElderlyExcelVO.getIdCard();
+ if (idCard != null && idCard.contains("x")) {
+ idCard = idCard.replaceAll("x", "X");
+ }
+ eldersAuthElderlyExcelVO.setIdCard(idCard);
+
+ eldersAuthElderlyExcelVO.setBirthday(DateUtils.getDateStringYMD(IdcardUtil.getBirthDate(idCard)));
+ eldersAuthElderlyExcelVO.setLevel(EldersAuthLevelEnum.getCode(IdcardUtil.getAgeByIdCard(idCard)));
+
+ list.add(eldersAuthElderlyExcelVO);
+ // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
+ if (list.size() >= BATCH_COUNT) {
+ doAfterAllAnalysed(analysisContext);
+ list.clear();
+ }
+
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+ // 去重
+ List<String> idcardList = new ArrayList<>();
+ list.forEach(voInList -> {
+ idcardList.add(voInList.getIdCard());
+ });
+ List<String> repeatList = findRepeat(idcardList);
+ if (repeatList != null && repeatList.size() > 0) {
+ String repeatedId = StringUtils.join(repeatList, ",");
+ throw new ServiceException(repeatedId + " 身份证号码存在多条");
+ }
+ List<EldersAuthElderlyExcelVO> newVoList = list.stream()
+ .filter(ListUtils.distinctByKey(EldersAuthElderlyExcelVO::getIdCard)).collect(Collectors.toList());
+ R r = this.communityService.listSaveEldersAuthElderlyExcelVO(newVoList, this.communityId, this.createBy);
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthRecordExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthRecordExcelListen.java
new file mode 100644
index 0000000..be50db2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthRecordExcelListen.java
@@ -0,0 +1,85 @@
+package com.panzhihua.common.listen;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.enums.EldersAuthLevelEnum;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.StringUtils;
+
+import cn.hutool.core.util.IdcardUtil;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 高龄老人导入监听
+ * @author: xyh
+ * @date: 2021/3/11 13:26
+ */
+@Slf4j
+public class ComEldersAuthRecordExcelListen extends AnalysisEventListener<EldersAuthElderlyExcelVO> {
+
+ private static final int BATCH_COUNT = 500;
+ private CommunityService communityService;
+ private Long communityId;
+ private Long createBy;
+ private List<EldersAuthElderlyExcelVO> list = new ArrayList<>();
+
+ public ComEldersAuthRecordExcelListen(CommunityService communityService, Long communityId, Long createBy) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.createBy = createBy;
+ }
+
+ @Override
+ public void invoke(EldersAuthElderlyExcelVO eldersAuthElderlyExcelVO, AnalysisContext analysisContext) {
+ if (StringUtils.isEmpty(eldersAuthElderlyExcelVO.getName())) {
+ throw new ServiceException("姓名不可为空");
+ }
+ if (StringUtils.isEmpty(eldersAuthElderlyExcelVO.getIsExist())) {
+ eldersAuthElderlyExcelVO.setIsExist("是");
+ }
+ if (StringUtils.isEmpty(eldersAuthElderlyExcelVO.getIsBigAge())) {
+ eldersAuthElderlyExcelVO.setIsBigAge("是");
+ }
+ if (StringUtils.isEmpty(eldersAuthElderlyExcelVO.getIdCard())) {
+ throw new ServiceException("身份证号错误");
+ }
+
+ eldersAuthElderlyExcelVO
+ .setBirthday(DateUtils.getDateStringYMD(IdcardUtil.getBirthDate(eldersAuthElderlyExcelVO.getIdCard())));
+ eldersAuthElderlyExcelVO
+ .setLevel(EldersAuthLevelEnum.getCode(IdcardUtil.getAgeByIdCard(eldersAuthElderlyExcelVO.getIdCard())));
+ list.add(eldersAuthElderlyExcelVO);
+ // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
+ if (list.size() >= BATCH_COUNT) {
+ log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
+ List<EldersAuthElderlyExcelVO> newVoList = list.stream()
+ .filter(ListUtils.distinctByKey(EldersAuthElderlyExcelVO::getIdCard)).collect(Collectors.toList());
+ R r = this.communityService.listSaveEldersAuthElderlyExcelVO(newVoList, this.communityId, this.createBy);
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+ list.clear(); // 清空list
+ }
+
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+ List<EldersAuthElderlyExcelVO> newVoList = list.stream()
+ .filter(ListUtils.distinctByKey(EldersAuthElderlyExcelVO::getIdCard)).collect(Collectors.toList());
+ R r = this.communityService.listSaveEldersAuthElderlyExcelVO(newVoList, this.communityId, this.createBy);
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComFmsServiceImportExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComFmsServiceImportExcelListen.java
new file mode 100644
index 0000000..ddbddfc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComFmsServiceImportExcelListen.java
@@ -0,0 +1,176 @@
+package com.panzhihua.common.listen;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import cn.hutool.core.date.DateUtil;
+import com.panzhihua.common.utlis.ValidateUtils;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.fms.ComFmsServiceImportExcelVO;
+import com.panzhihua.common.model.vos.community.fms.ComFmsServiceImportMistakeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.StringUtils;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @title: ComFmsTeamMemberImportExcelListen
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务-微服务导入监听
+ * @author: hans
+ * @date: 2022/02/15 10:16
+ */
+@Slf4j
+public class ComFmsServiceImportExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComFmsServiceImportExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ log.info("开始导入微服务数据");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("100", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.FMS_SERVICE_ERROR_LIST + communityId;
+
+ int index = 2;
+ try {
+ String[] parsePatterns = new String[] {"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd",
+ "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d"};
+ ArrayList<ComFmsServiceImportExcelVO> voList = Lists.newArrayList();
+ ArrayList<ComFmsServiceImportMistakeExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComFmsServiceImportExcelVO vo = new ComFmsServiceImportExcelVO();
+ vo.setUserName(oneData.get(0));
+ if (StringUtils.isNotEmpty(oneData.get(1)) && !ValidateUtils.assertPhoneIsValid(oneData.get(1))) {
+ ComFmsServiceImportMistakeExcelVO mistake = new ComFmsServiceImportMistakeExcelVO();
+ index++;
+ setServiceImportMistake(oneData, mistake);
+ mistake.setMistake("联系电话有误，请检查");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setPhone(oneData.get(1));
+ if (StringUtils.isEmpty(oneData.get(2))) {
+ ComFmsServiceImportMistakeExcelVO mistake = new ComFmsServiceImportMistakeExcelVO();
+ index++;
+ setServiceImportMistake(oneData, mistake);
+ mistake.setMistake("服务时间不可为空，请填写服务时间");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setServiceAt(DateUtil.parse(oneData.get(2).trim(), parsePatterns));
+
+ if (StringUtils.isEmpty(oneData.get(3))) {
+ ComFmsServiceImportMistakeExcelVO mistake = new ComFmsServiceImportMistakeExcelVO();
+ index++;
+ setServiceImportMistake(oneData, mistake);
+ mistake.setMistake("服务内容不可为空，请填写服务内容");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setServiceContent(oneData.get(3));
+
+ if (StringUtils.isEmpty(oneData.get(4))) {
+ ComFmsServiceImportMistakeExcelVO mistake = new ComFmsServiceImportMistakeExcelVO();
+ index++;
+ setServiceImportMistake(oneData, mistake);
+ mistake.setMistake("服务过程不可为空，请填写服务过程");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setServiceProcess(oneData.get(4));
+ voList.add(vo);
+ index++;
+ }
+ if (!voList.isEmpty()) {
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.listSaveFmsServiceExcelVO(voList, communityId, userId);
+ log.info("业务层处理逻辑完成");
+ if (R.isOk(r)) {
+ log.info("业务层处理成功");
+ } else {
+ log.info("业务层处理逻辑失败");
+ }
+ }
+ if (!mistakes.isEmpty()) {
+ log.info("将错误数据缓存到redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("将错误数据缓存到redis中成功");
+ throw new ServiceException("500", key);
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ }
+ }
+
+ private void setServiceImportMistake(Map<Integer, String> map, ComFmsServiceImportMistakeExcelVO vo) {
+ vo.setUserName(map.get(0));
+ vo.setPhone(map.get(1));
+ vo.setServiceAt(map.get(2));
+ vo.setServiceContent(map.get(3));
+ vo.setServiceProcess(map.get(4));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComFmsTeamMemberImportExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComFmsTeamMemberImportExcelListen.java
new file mode 100644
index 0000000..5fd1e87
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComFmsTeamMemberImportExcelListen.java
@@ -0,0 +1,188 @@
+package com.panzhihua.common.listen;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportExcelVO;
+import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportMistakeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.StringUtils;
+
+import cn.hutool.core.util.IdcardUtil;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @title: ComFmsTeamMemberImportExcelListen
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务-团队成员导入监听
+ * @author: hans
+ * @date: 2022/02/15 10:16
+ */
+@Slf4j
+public class ComFmsTeamMemberImportExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComFmsTeamMemberImportExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ log.info("开始导入团队成员数据");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("100", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.FMS_MEMBER_ERROR_LIST + communityId;
+
+ int index = 2;
+ try {
+ ArrayList<ComFmsTeamMemberImportExcelVO> voList = Lists.newArrayList();
+ ArrayList<ComFmsTeamMemberImportMistakeExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComFmsTeamMemberImportExcelVO vo = new ComFmsTeamMemberImportExcelVO();
+ if (StringUtils.isEmpty(oneData.get(0))) {
+ ComFmsTeamMemberImportMistakeExcelVO mistake = new ComFmsTeamMemberImportMistakeExcelVO();
+ index++;
+ setMemberImportMistake(oneData, mistake);
+ mistake.setMistake("团队类型不可为空，请填写团队类型");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setTeamType(oneData.get(0));
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ ComFmsTeamMemberImportMistakeExcelVO mistake = new ComFmsTeamMemberImportMistakeExcelVO();
+ index++;
+ setMemberImportMistake(oneData, mistake);
+ mistake.setMistake("团队名称不可为空，请填写团队名称");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setTeamName(oneData.get(1));
+
+ if (StringUtils.isEmpty(oneData.get(2))) {
+ ComFmsTeamMemberImportMistakeExcelVO mistake = new ComFmsTeamMemberImportMistakeExcelVO();
+ index++;
+ setMemberImportMistake(oneData, mistake);
+ mistake.setMistake("团队成员不可为空，请填写团队成员");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setTeamMember(oneData.get(2));
+
+ if (StringUtils.isNotEmpty(oneData.get(3))) {
+ // 判断身份证号码位数
+ if (!IdcardUtil.isValidCard(oneData.get(3))) {
+ ComFmsTeamMemberImportMistakeExcelVO mistake = new ComFmsTeamMemberImportMistakeExcelVO();
+ index++;
+ setMemberImportMistake(oneData, mistake);
+ mistake.setMistake("身份证号有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIdCard(oneData.get(3).toUpperCase());
+ }
+
+ if (StringUtils.isEmpty(oneData.get(4))) {
+ ComFmsTeamMemberImportMistakeExcelVO mistake = new ComFmsTeamMemberImportMistakeExcelVO();
+ index++;
+ setMemberImportMistake(oneData, mistake);
+ mistake.setMistake("联系电话不可为空，请填写联系电话");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setPhone(oneData.get(4));
+ voList.add(vo);
+ index++;
+ }
+ if (!voList.isEmpty()) {
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.listSaveFmsTeamMemberExcelVO(voList, communityId, userId);
+ log.info("业务层处理逻辑完成");
+ if (R.isOk(r)) {
+ log.info("业务层处理成功");
+ List<ComFmsTeamMemberImportMistakeExcelVO> list =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComFmsTeamMemberImportMistakeExcelVO.class);
+ mistakes.addAll(list);
+ } else {
+ log.info("业务层处理逻辑失败");
+ }
+ }
+ if (!mistakes.isEmpty()) {
+ log.info("将错误数据存入redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", key);
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ }
+ }
+
+ private void setMemberImportMistake(Map<Integer, String> map, ComFmsTeamMemberImportMistakeExcelVO vo) {
+ vo.setTeamType(map.get(0));
+ vo.setTeamName(map.get(1));
+ vo.setTeamMember(map.get(2));
+ vo.setIdCard(map.get(3));
+ vo.setPhone(map.get(4));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngBuildingExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngBuildingExcelListen.java
new file mode 100644
index 0000000..8423844
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngBuildingExcelListen.java
@@ -0,0 +1,202 @@
+package com.panzhihua.common.listen;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngBuildingExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationImportErrorVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.grid.GridService;
+import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.utlis.Snowflake;
+import com.panzhihua.common.utlis.StringUtils;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+/**
+ * @description: 社区楼栋导入监听
+ * @author: xyh
+ */
+@Slf4j
+public class ComMngBuildingExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ private static final int BATCH_COUNT = 5000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private StringRedisTemplate stringRedisTemplate;
+ private GridService gridService;
+ private Long communityId;
+ private Map<Integer, String> headData;
+ public ComMngBuildingExcelListen(CommunityService communityService, Long communityId, StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ try {
+ int index = 2;
+ ArrayList<ComMngBuildingExcelVO> voList = Lists.newArrayList();
+ List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.BUILDING_ERROR_LIST + communityId;
+ for (int i = 0; i < list.size(); i++) {
+ Map<Integer, String> oneData = list.get(i);
+ ComMngBuildingExcelVO vo = new ComMngBuildingExcelVO();
+ vo.setId(Snowflake.getId());
+// vo.setUseType(oneData.get(0));
+// vo.setBuildType(oneData.get(1));
+ if (StringUtils.isEmpty(oneData.get(0))) {
+ ComMngPopulationImportErrorVO importErrorVO = setError(oneData);
+ importErrorVO.setErrorMsg("街路巷不能为空");
+ populationImportErrorVOList.add(importErrorVO);
+ continue;
+ }
+ vo.setAlley(oneData.get(0));
+ vo.setVillageName(oneData.get(1));
+ if (StringUtils.isEmpty(oneData.get(2))) {
+ ComMngPopulationImportErrorVO importErrorVO = setError(oneData);
+ importErrorVO.setErrorMsg("街路巷号不能为空");
+ populationImportErrorVOList.add(importErrorVO);
+ continue;
+ }
+ vo.setDoorNo(oneData.get(2));
+
+ if (StringUtils.isEmpty(oneData.get(3))) {
+ ComMngPopulationImportErrorVO importErrorVO = setError(oneData);
+ importErrorVO.setErrorMsg("楼栋号不能为空");
+ populationImportErrorVOList.add(importErrorVO);
+ continue;
+ }
+ vo.setName(oneData.get(3));
+
+// try {
+// vo.setUnitTotal(oneData.get(6) == null ? 0 : Integer.valueOf(oneData.get(6)));
+// } catch (Exception e1) {
+// vo.setUnitTotal(0);
+// }
+// try {
+// vo.setBuildFloorSum(oneData.get(7) == null ? 0 : Integer.valueOf(oneData.get(7)));
+// } catch (Exception e1) {
+// vo.setBuildFloorSum(0);
+// }
+//
+// try {
+// vo.setEveryFloorSum(oneData.get(8) == null ? 0 : Integer.valueOf(oneData.get(8)));
+// } catch (Exception e1) {
+// vo.setEveryFloorSum(0);
+// }
+//
+// try {
+// vo.setBuildUserSum(oneData.get(9) == null ? 0 : Integer.valueOf(oneData.get(9)));
+// } catch (Exception e1) {
+// vo.setBuildUserSum(0);
+// }
+// try {
+// vo.setElevatorTotal(oneData.get(10) == null ? 0 : Integer.valueOf(oneData.get(10)));
+// } catch (Exception e1) {
+// vo.setElevatorTotal(0);
+// }
+//
+// vo.setPropertyCompanyName(oneData.get(11));
+// try {
+// SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+// vo.setBuildDate(sdf.parse(oneData.get(12)));
+// } catch (Exception e1) {
+// vo.setBuildDate(null);
+// }
+// vo.setRemark(oneData.get(13));
+// vo.setGridId(oneData.get(14));
+// vo.setGridName(oneData.get(14));
+ voList.add(vo);
+ index++;
+ }
+
+ R r = communityService.listSaveBuildingExcelVO(voList, communityId);
+ if (!R.isOk(r)) {
+ List<ComMngPopulationImportErrorVO> errorList =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComMngPopulationImportErrorVO.class);
+ if (!errorList.isEmpty()) {
+ populationImportErrorVOList.addAll(errorList);
+ }
+ log.info("将错误数据存入redis中");
+ valueOperations.set(key, JSONArray.toJSONString(populationImportErrorVOList), 1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", key);
+ } else {
+ if (!populationImportErrorVOList.isEmpty()) {
+ log.info("将错误数据存入redis中");
+ valueOperations.set(key, JSONArray.toJSONString(populationImportErrorVOList), 1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", key);
+ }
+ }
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ }
+ }
+
+ private ComMngPopulationImportErrorVO setError(Map<Integer, String> oneData){
+ ComMngPopulationImportErrorVO result = new ComMngPopulationImportErrorVO();
+ if(oneData != null){
+// result.setUseType(oneData.get(0));
+// result.setBuildType(oneData.get(1));
+ result.setAlley(oneData.get(0));
+ result.setVillageName(oneData.get(1));
+ result.setDoorNo(oneData.get(2));
+ result.setName(oneData.get(3));
+// result.setUnitTotal(Integer.parseInt(oneData.get(6)));
+// result.setBuildFloorSum(Integer.parseInt(oneData.get(7)));
+// result.setEveryFloorSum(Integer.parseInt(oneData.get(8)));
+// result.setBuildUserSum(Integer.parseInt(oneData.get(9)));
+// result.setElevatorTotal(Integer.parseInt(oneData.get(10)));
+// result.setPropertyCompanyName(oneData.get(11));
+// result.setBuildDate(DateUtils.stringToDate(oneData.get(12),DateUtils.format_yyyy));
+// result.setRemark(oneData.get(13));
+// result.setGridId(oneData.get(14));
+ }
+ return result;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngCarExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngCarExcelListen.java
new file mode 100644
index 0000000..976130b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngCarExcelListen.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.listen;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 车辆导入监听
+ * @author: Null
+ * @date: 2021/3/11 13:26
+ */
+@Slf4j
+public class ComMngCarExcelListen extends AnalysisEventListener<ComMngCarExcelVO> {
+
+ private static final int BATCH_COUNT = 1000;
+ private CommunityService communityService;
+ private Long communityId;
+ private List<ComMngCarExcelVO> list = new ArrayList<>();
+
+ public ComMngCarExcelListen(CommunityService communityService, Long communityId) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ }
+
+ @Override
+ public void invoke(ComMngCarExcelVO comMngCarExcelVO, AnalysisContext analysisContext) {
+ list.add(comMngCarExcelVO);
+ // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
+ if (list.size() >= BATCH_COUNT) {
+ log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
+ R r = this.communityService.listSaveMngCarExcelVO(list, this.communityId);
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+ list.clear(); // 清空list
+ }
+
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+ log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
+ R r = this.communityService.listSaveMngCarExcelVO(list, this.communityId);// 确保最后遗留的数据保存在数据库中
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationConfirmServeExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationConfirmServeExcelListen.java
new file mode 100644
index 0000000..34c441f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationConfirmServeExcelListen.java
@@ -0,0 +1,582 @@
+package com.panzhihua.common.listen;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSON;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.BcDictionaryConstants;
+import com.panzhihua.common.enums.*;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngPopulationImportErrorVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.PayUtil;
+import com.panzhihua.common.utlis.StringUtils;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 实有人口导入监听
+ * @author: Null
+ * @date: 2021/3/11 13:26
+ */
+@Slf4j
+public class ComMngPopulationConfirmServeExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Map<Integer, String> headData;
+ public ComMngPopulationConfirmServeExcelListen(CommunityService communityService, Long communityId) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
+
+ Map<String, String> dictMap = dictionaryR.getData().stream()
+ .collect(Collectors.toMap(BcDictionaryVO::getDictName, BcDictionaryVO::getDictValue));
+ // Map<String,Integer> dictMap = new HashMap<>();
+ // for(BcDictionaryVO vo : dictionaryR.getData()){
+ // dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
+ // }
+
+ int index = 2;
+ try {
+ ArrayList<ComMngPopulationServeExcelVO> voList = Lists.newArrayList();
+ List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ for (Map<Integer, String> oneData : list) {
+ ComMngPopulationServeExcelVO vo = new ComMngPopulationServeExcelVO();
+ // 姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
+// if (StringUtils.isNotEmpty(oneData.get(0)) || StringUtils.isNotEmpty(oneData.get(1))) {
+// if (StringUtils.isEmpty(oneData.get(0))) {
+// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行，第1列");
+// importErrorVO.setErrorMsg("名字不可为空，请填写姓名");
+// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// continue;
+// }
+// vo.setName(oneData.get(0));
+// if (StringUtils.isEmpty(oneData.get(1))) {
+// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行，第2列" + oneData.get(1));
+// importErrorVO.setErrorMsg("身份证号不可为空，请填写身份证号");
+// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// continue;
+// }
+//
+// // 判断身份证号码位数
+// if (oneData.get(1).length() != 18) {
+// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行，第2列" + oneData.get(1));
+// importErrorVO.setErrorMsg("身份证号位数有误，请检查身份证号码是否正确");
+// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// continue;
+// }
+// vo.setCardNo(oneData.get(1));
+// // 根据身份证号码解析年龄以及性别
+// // 获取用户生日
+// String birthday = vo.getCardNo().substring(6, 14);
+// if (StringUtils.isNotEmpty(birthday)) {
+// String year = birthday.substring(0, 4);
+// String month = birthday.substring(4, 6);
+// String day = birthday.substring(6, 8);
+// vo.setBirthday(year + "-" + month + "-" + day);
+// }
+// // //设置用户年龄
+// // vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
+// // 获取用户性别
+// int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+// if (sex % 2 == 1) {
+// vo.setSex(PopulSexEnum.nan.getCode());
+// } else {
+// vo.setSex(PopulSexEnum.nv.getCode());
+// }
+// }
+ if (StringUtils.isNotEmpty(oneData.get(2))) {
+ // String nation = oneData.get(2);
+ // if(!nation.contains("族")){
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第3列");
+ // importErrorVO.setErrorMsg("您填写的民族格式有误");
+ // populationImportErrorVOList.add(importErrorVO);
+ // index++;
+ // continue;
+ // }
+ vo.setNation(oneData.get(2));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(3))) {
+ vo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCodeByName(oneData.get(3)));
+ }
+// if (StringUtils.isNotEmpty(oneData.get(4))) {
+// Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(4));
+// if (isOk.equals(-1)) {
+// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行，第5列");
+// importErrorVO.setErrorMsg("您填写的是否租住有误");
+// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// continue;
+// }
+// vo.setIsRent(isOk);
+// }
+ if (StringUtils.isNotEmpty(oneData.get(5))) {
+
+ // String ra = convertRelation(oneData.get(5));
+
+ // String relation = dictMap.get(oneData.get(5));
+ // if (StringUtils.isEmpty(relation)) {
+ //// vo.setRelationStr(ra);
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第6列");
+ // importErrorVO.setErrorMsg("您填写的与户主关系有误");
+ // populationImportErrorVOList.add(importErrorVO);
+ // index++;
+ // continue;
+ // } else {
+ // vo.setRelation(Integer.valueOf(relation));
+ // }
+ Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(5));
+ if (isOk.equals(-1)) {
+ // vo.setMarriageStr(ma);
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第6列");
+ // importErrorVO.setErrorMsg("您填写的与户主关系有误");
+ // populationImportErrorVOList.add(importErrorVO);
+ // index++;
+ // continue;
+ vo.setRelation(6);
+ } else {
+ vo.setRelation(isOk);
+ }
+
+ }
+// if (StringUtils.isEmpty(oneData.get(6))) {
+// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行，第7列");
+// importErrorVO.setErrorMsg("街路巷不可为空");
+// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// continue;
+// }
+// vo.setRoad(oneData.get(6));
+// if (StringUtils.isEmpty(oneData.get(7))) {
+// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行，第8列");
+// importErrorVO.setErrorMsg("小区号不可为空");
+// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// continue;
+// }
+// vo.setDoorNo(oneData.get(7).trim());
+// if (StringUtils.isEmpty(oneData.get(8))) {
+// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行，第9列");
+// importErrorVO.setErrorMsg("楼排号不可为空");
+// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// continue;
+// }
+// vo.setFloor(oneData.get(8).trim());
+// if (StringUtils.isEmpty(oneData.get(9))) {
+// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行，第10列");
+// importErrorVO.setErrorMsg("单元号不可为空");
+// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// continue;
+// }
+// vo.setUnitNo(oneData.get(9).trim());
+// if (StringUtils.isEmpty(oneData.get(10))) {
+// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行，第11列");
+// importErrorVO.setErrorMsg("户室不可为空");
+// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// continue;
+// }
+ vo.setHouseNo(oneData.get(10).trim());
+ if (StringUtils.isNotEmpty(oneData.get(11))) {
+ vo.setBuildPurpose(oneData.get(11).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(12))) {
+ vo.setBuildArea(oneData.get(12).trim());
+ }
+// if (StringUtils.isNotEmpty(oneData.get(13))) {
+// Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(13).trim());
+// if (isOk.equals(-1)) {
+// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行，第14列");
+// importErrorVO.setErrorMsg("您填写的房屋状态有误");
+// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// continue;
+// }
+// vo.setHouseStatus(isOk);
+// }
+// if (StringUtils.isNotEmpty(oneData.get(14))) {
+// Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(14).trim());
+// if (isOk.equals(-1)) {
+// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行，第15列");
+// importErrorVO.setErrorMsg("您填写的房屋用途有误");
+// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// continue;
+// }
+// vo.setHousePurpose(PopulHousePurposeEnum.getCodeByName(oneData.get(14).trim()));
+// }
+// if (StringUtils.isNotEmpty(oneData.get(15))) {
+// Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(15));
+// if (isOk.equals(-1)) {
+// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行，第16列");
+// importErrorVO.setErrorMsg("您填写的管控状态有误");
+// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// continue;
+// }
+// vo.setControlStatus(isOk);
+// }
+
+ if (StringUtils.isNotEmpty(oneData.get(16))) {
+ vo.setPhone(oneData.get(16).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(17))) {
+ vo.setNativePlace(oneData.get(17).trim());
+ }
+// if (StringUtils.isNotEmpty(oneData.get(18))) {
+// Integer isOk = PopulCultureLevelEnum.getCodeByName(oneData.get(18));
+// if (isOk.equals(-1)) {
+// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行，第19列");
+// importErrorVO.setErrorMsg("您填写的文化程度有误");
+// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// continue;
+// }
+// vo.setCultureLevel(isOk);
+// }
+// if (StringUtils.isNotEmpty(oneData.get(19))) {
+// // String ma = convertMarriage(oneData.get(19));
+// Integer isOk = PopulMarriageEnum.getCodeByName(oneData.get(19));
+// if (isOk.equals(-1)) {
+// // vo.setMarriageStr(ma);
+// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行，第20列");
+// importErrorVO.setErrorMsg("您填写的婚姻状况有误");
+// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// continue;
+// } else {
+// vo.setMarriage(isOk);
+// }
+//
+// }
+ if (StringUtils.isNotEmpty(oneData.get(20))) {
+ vo.setHealthy(oneData.get(20).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(21))) {
+ vo.setBloodType(oneData.get(21).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(22))) {
+ vo.setReligion(oneData.get(22).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(23))) {
+ vo.setProfession(oneData.get(23).trim());
+ }
+
+ if (StringUtils.isNotEmpty(oneData.get(24))) {
+ vo.setWorkCompany(oneData.get(24).trim());
+ }
+// if (StringUtils.isNotEmpty(oneData.get(25))) {
+// Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(25));
+// if (isOk.equals(-1)) {
+// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行，第26列");
+// importErrorVO.setErrorMsg("您填写的本地/外地有误");
+// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// continue;
+// }
+// vo.setOutOrLocal(isOk);
+// }
+ if (StringUtils.isNotEmpty(oneData.get(26))) {
+ vo.setCensusRegister(oneData.get(26).trim());
+ }
+ if (StringUtils.isEmpty(oneData.get(27))) {
+ vo.setResidence(0);
+ } else {
+ vo.setResidence(PopulIsOkEnum.getCodeByName(oneData.get(27).trim()));
+ }
+// if (StringUtils.isNotEmpty(oneData.get(28))) {
+// Integer isOk = PopulPersonTypeEnum.getCodeByName(oneData.get(28));
+// if (isOk.equals(-1)) {
+// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行，第30列");
+// importErrorVO.setErrorMsg("您填写的人员类型有误");
+// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// continue;
+// }
+// vo.setPersonType(isOk);
+// }
+ if (StringUtils.isNotEmpty(oneData.get(29))) {
+ vo.setCountry(oneData.get(29).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(30))) {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY-dd-MM HH:mm:ss");
+ vo.setDateOfDeparture(simpleDateFormat.parse(oneData.get(30)));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(31))) {
+ vo.setPersonStatus(oneData.get(31).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(32))) {
+ vo.setMonthlyIncome(oneData.get(32).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(33))) {
+ vo.setFamilyStatus(oneData.get(33).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(34))) {
+ vo.setGoalInChina(oneData.get(34).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(35))) {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY-dd-MM HH:mm:ss");
+ vo.setDateOfArrival(simpleDateFormat.parse(oneData.get(35)));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(36))) {
+ vo.setRemark(oneData.get(36).trim());
+ }
+
+ if (StringUtils.isNotEmpty(oneData.get(37))) {
+ vo.setIdCardPositive(oneData.get(37).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(38))) {
+ vo.setIdCardBack(oneData.get(38).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(39))) {
+ vo.setHouseHold(oneData.get(39).trim());
+ }
+ if (StringUtils.isEmpty(oneData.get(40))) {
+ vo.setDeath(0);
+ } else {
+ vo.setDeath(PopulIsOkEnum.getCodeByName(oneData.get(40).trim()));
+ }
+ for (int i = 41; i < headSize; i++) {
+ if (oneData.get(i) != null && oneData.get(i).equals("是")) {
+ vo.getUserTagStr().add(headData.get(i).substring(0, headData.get(i).indexOf("(")));
+ }
+ }
+
+ // 将重复的数据进行MD5加密实现去重
+ String distinct = vo.getName() + vo.getCardNo() + vo.getRoad() + vo.getDoorNo() + vo.getFloor()
+ + vo.getUnitNo() + vo.getHouseNo();
+ try {
+ String distinctPass = PayUtil.MD5(distinct);
+ if (StringUtils.isNotEmpty(distinctPass)) {
+ vo.setDistinctPass(distinctPass);
+ }
+ } catch (Exception e) {
+ log.error("组装MD5加密字段失败，数据表格行数：" + index);
+ continue;
+ }
+ voList.add(vo);
+ index++;
+ }
+ // 客户需要暂时注释，等客户处理完成需要恢复
+ // if(populationImportErrorVOList.isEmpty()){
+ // R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
+ // if (!R.isOk(r)) {
+ // throw new ServiceException(r.getMsg());
+ // }
+ // }else{
+ // throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ // }
+ // 根据list中的IdCard城市来去重
+ List<ComMngPopulationServeExcelVO> newVoList =
+ voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationServeExcelVO::getDistinctPass))
+ .collect(Collectors.toList());
+ R r = communityService.listSavePopulationConfirm(newVoList, communityId);
+ if (!R.isOk(r)) {
+ String errMsg = r.getMsg();
+ List<ComMngPopulationImportErrorVO> errorList =
+ JSON.parseArray(errMsg, ComMngPopulationImportErrorVO.class);
+ if (!errorList.isEmpty()) {
+ populationImportErrorVOList.addAll(errorList);
+ }
+ throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ } else {
+ if (!populationImportErrorVOList.isEmpty()) {
+ throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ }
+ }
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行");
+ importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+ populationImportErrorVOList.add(importErrorVO);
+ throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ } catch (ParseException e1) {
+ e1.printStackTrace();
+ List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行");
+ importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+ populationImportErrorVOList.add(importErrorVO);
+ throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ }
+
+ }
+
+ private String convertMarriage(String ma) {
+
+ if (Objects.equals("已", ma) || Objects.equals("一", ma)) {
+ ma = "已婚";
+ } else if (Objects.equals("未", ma) || Objects.equals("未婚婚", ma)) {
+ ma = "未婚";
+ } else if (Objects.equals("初", ma)) {
+ ma = "初婚";
+ } else if (Objects.equals("再", ma)) {
+ ma = "再婚";
+ } else if (Objects.equals("复", ma)) {
+ ma = "复婚";
+ } else if (Objects.equals("丧", ma) || Objects.equals("丧偶偶", ma)) {
+ ma = "丧偶";
+ } else if (Objects.equals("离", ma) || Objects.equals("离异", ma) || Objects.equals("离异婚", ma)) {
+ ma = "离婚";
+ } else if (Objects.equals("分", ma)) {
+ ma = "分居";
+ }
+
+ return ma;
+ }
+
+ private String convertRelation(String ra) {
+ if (ra.contains("户主")) {
+ ra = "户主";
+ } else if (Objects.equals(ra, "女儿")) {
+ ra = "女";
+ } else if (Objects.equals(ra, "儿子") || Objects.equals(ra, "儿")) {
+ ra = "子";
+ } else if (Objects.equals(ra, "大女")) {
+ ra = "长女";
+ } else if (Objects.equals(ra, "二女") || Objects.equals(ra, "此女")) {
+ ra = "次女";
+ } else if (Objects.equals(ra, "二子")) {
+ ra = "次子";
+ } else if (Objects.equals(ra, "长男") || ra.contains("长子")) {
+ ra = "长子";
+ } else if (Objects.equals(ra, "非亲属") || ra.contains("女友") || ra.contains("女朋友") || ra.contains("男友")
+ || ra.contains("男朋友")) {
+ ra = "其他";
+ } else if (Objects.equals(ra, "姐")) {
+ ra = "姐姐";
+ } else if (Objects.equals(ra, "户主")) {
+ ra = "本人";
+ } else if (Objects.equals(ra, "妻子") || Objects.equals(ra, "媳妇")) {
+ ra = "妻";
+ } else if (Objects.equals(ra, "哥") || Objects.equals(ra, "哥哥")) {
+ ra = "兄";
+ } else if (Objects.equals(ra, "丈夫")) {
+ ra = "夫";
+ } else if (Objects.equals(ra, "丈母娘")) {
+ ra = "岳母";
+ } else if (Objects.equals(ra, "继子") || Objects.equals(ra, "养子")) {
+ ra = "养子或继子";
+ } else if (Objects.equals(ra, "继女") || Objects.equals(ra, "养女")) {
+ ra = "养女或继女";
+ } else if (ra.contains("儿媳") || ra.contains("长媳")) {
+ ra = "儿媳";
+ } else if (Objects.equals(ra, "三姨") || Objects.equals(ra, "姨姨")) {
+ ra = "姨母";
+ } else if (Objects.equals(ra, "二外孙女")) {
+ ra = "外孙女";
+ } else if (Objects.equals(ra, "外孙")) {
+ ra = "外孙子";
+ } else if (Objects.equals(ra, "侄儿")) {
+ ra = "侄子";
+ } else if (ra.contains("表")) {
+ ra = "表兄弟、表姐妹";
+ } else if (Objects.equals(ra, "继父") || Objects.equals(ra, "养父")) {
+ ra = "继父或养父";
+ } else if (Objects.equals(ra, "父")) {
+ ra = "父亲";
+ } else if (Objects.equals(ra, "弟弟")) {
+ ra = "弟";
+ } else if (Objects.equals(ra, "孙")) {
+ ra = "孙子";
+ } else if (Objects.equals(ra, "孙媳妇") || Objects.equals(ra, "外孙媳妇")) {
+ ra = "孙媳妇或外孙媳妇";
+ } else if (Objects.equals(ra, "妹")) {
+ ra = "妹妹";
+ } else if (Objects.equals(ra, "祖父母")) {
+ ra = "祖父母或外祖父母";
+ } else if (Objects.equals(ra, "姐妹") || Objects.equals(ra, "兄弟")) {
+ ra = "兄弟姐妹";
+ } else if (Objects.equals(ra, "其他姐妹") || Objects.equals(ra, "其他兄弟")) {
+ ra = "其他兄弟姐妹";
+ } else if (Objects.equals(ra, "奶奶")) {
+ ra = "祖母";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (ra.contains("堂")) {
+ ra = "堂兄弟、堂姐妹";
+ }
+
+ return ra;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCorrectExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCorrectExcelListen.java
new file mode 100644
index 0000000..63703eb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCorrectExcelListen.java
@@ -0,0 +1,672 @@
+package com.panzhihua.common.listen;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.BcDictionaryConstants;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.enums.*;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngPopulationCorrectExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationCorrectMistakeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.PayUtil;
+import com.panzhihua.common.utlis.StringUtils;
+
+import cn.hutool.core.date.DateUtil;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 社区矫正人员导入监听
+ * @author: txb
+ */
+@Slf4j
+public class ComMngPopulationCorrectExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComMngPopulationCorrectExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
+ log.info("开始导入社区矫正人员数据");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("000", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.CORRECT_POPULATION_ERROR_LIST;
+
+ Map<String, String> dictMap = dictionaryR.getData().stream()
+ .collect(Collectors.toMap(BcDictionaryVO::getDictName, BcDictionaryVO::getDictValue));
+ // Map<String,Integer> dictMap = new HashMap<>();
+ // for(BcDictionaryVO vo : dictionaryR.getData()){
+ // dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
+ // }
+
+ int index = 2;
+ try {
+ String[] parsePatterns = new String[] {"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd",
+ "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d"};
+ ArrayList<ComMngPopulationCorrectExcelVO> voList = Lists.newArrayList();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ArrayList<ComMngPopulationCorrectMistakeExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComMngPopulationCorrectExcelVO vo = new ComMngPopulationCorrectExcelVO();
+ if (StringUtils.isNotEmpty(oneData.get(0))) {
+ vo.setSerialNumber(oneData.get(0));
+ }
+ // 姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(1));
+ if (StringUtils.isEmpty(oneData.get(3))) {
+ ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
+
+ // 判断身份证号码位数
+ if (oneData.get(3).length() != 18) {
+ ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(3).toUpperCase());
+ // 根据身份证号码解析年龄以及性别
+ // 获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if (StringUtils.isNotEmpty(birthday)) {
+ String year = birthday.substring(0, 4);
+ String month = birthday.substring(4, 6);
+ String day = birthday.substring(6, 8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
+ // //设置用户年龄
+ // vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
+ // 获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if (sex % 2 == 1) {
+ vo.setSex(PopulSexEnum.nan.getCode());
+ } else {
+ vo.setSex(PopulSexEnum.nv.getCode());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(2))) {
+ vo.setNation(oneData.get(2));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(4))) {
+ vo.setPhone(oneData.get(4));
+ }
+ if (StringUtils.isEmpty(oneData.get(5))) {
+ index++;
+ ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("街路巷不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setRoad(oneData.get(5));
+ if (StringUtils.isEmpty(oneData.get(6))) {
+ index++;
+ ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("小区号不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setDoorNo(oneData.get(6).trim());
+ // if(StringUtils.isEmpty(oneData.get(7))){
+ // index++;
+ // ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ // setMistake(oneData, mistake);
+ // mistake.setMistake("楼排号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(7))) {
+ vo.setFloor(oneData.get(7).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(8))){
+ // index++;
+ // ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ // setMistake(oneData, mistake);
+ // mistake.setMistake("单元号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(8))) {
+ vo.setUnitNo(oneData.get(8).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(9))){
+ // index++;
+ // ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ // setMistake(oneData, mistake);
+ // mistake.setMistake("户室不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(9))) {
+ vo.setHouseNo(oneData.get(9).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(10))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(10));
+ if (isOk.equals(-1)) {
+ ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否租住有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRent(isOk);
+ } else {
+ vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(11))) {
+ Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(11).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHouseStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(12))) {
+ Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(12).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋用途有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHousePurpose(PopulHousePurposeEnum.getCodeByName(oneData.get(12).trim()));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(13))) {
+ Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(13));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的管控状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setControlStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(14))) {
+ Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(14));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的本地/外地有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setOutOrLocal(isOk);
+ } else {
+ vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(15))) {
+ vo.setCensusRegister(oneData.get(15).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(16))) {
+// Integer isOk = PopulCultureLevelEnum.getCodeByName(oneData.get(16));
+// if (isOk.equals(-1)) {
+// index++;
+// ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+// setMistake(oneData, mistake);
+// mistake.setMistake("您填写的学历有误");
+// mistakes.add(mistake);
+// continue;
+// }
+ vo.setCultureLevel(oneData.get(16).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(17))) {
+ vo.setCorrectPersonCode(oneData.get(17).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(18))) {
+ vo.setOriginalCustodyplace(oneData.get(18).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(19))) {
+ vo.setCorrectType(oneData.get(19).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(20))) {
+ vo.setCaseType(oneData.get(20).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(21))) {
+ vo.setSpecificCharge(oneData.get(21).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(22))) {
+ vo.setOriginalTerm(oneData.get(22).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(23))) {
+ vo.setOriginalTermBegin(DateUtil.parse(oneData.get(23).trim(), parsePatterns));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(24))) {
+ vo.setOriginalTermEnd(DateUtil.parse(oneData.get(24).trim(), parsePatterns));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(25))) {
+ vo.setCorrectBegin(DateUtil.parse(oneData.get(25).trim(), parsePatterns));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(26))) {
+ vo.setCorrectEnd(DateUtil.parse(oneData.get(26).trim(), parsePatterns));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(27))) {
+ vo.setReceiveMethod(oneData.get(27).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(27))) {
+ vo.setReceiveMethod(oneData.get(27).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(28))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(28));
+ if (isOk.equals(-1)) {
+ ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否累惯犯有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRecidivist(isOk);
+ } else {
+ vo.setIsRecidivist(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(29))) {
+ vo.setFourHistory(oneData.get(29).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(30))) {
+ vo.setThreeInvovle(oneData.get(30).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(31))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(31));
+ if (isOk.equals(-1)) {
+ ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否建立矫正小组有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsCorrectGroup(isOk);
+ } else {
+ vo.setIsCorrectGroup(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(32))) {
+ vo.setCorrectGroupConstitute(oneData.get(32).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(33))) {
+ vo.setCorrectRelieveType(oneData.get(33).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(34))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(34));
+ if (isOk.equals(-1)) {
+ ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否有脱管有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsOutControl(isOk);
+ } else {
+ vo.setIsOutControl(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(35))) {
+ vo.setOutControlReason(oneData.get(35).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(36))) {
+ vo.setOutControlCorrect(oneData.get(36).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(37))) {
+ vo.setInspectOutControl(oneData.get(37).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(38))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(38));
+ if (isOk.equals(-1)) {
+ ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否有漏管有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsMissControl(isOk);
+ } else {
+ vo.setIsMissControl(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(39))) {
+ vo.setMissControlReason(oneData.get(39).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(40))) {
+ vo.setMissControlCorrect(oneData.get(40).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(41))) {
+ vo.setInspectMissControl(oneData.get(41).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(42))) {
+ vo.setRewardAndPunishiment(oneData.get(42).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(43))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(43));
+ if (isOk.equals(-1)) {
+ ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否重新犯罪有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsAgainCrime(isOk);
+ } else {
+ vo.setIsAgainCrime(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(44))) {
+ vo.setAgainCrimeName(oneData.get(44).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(45))) {
+ vo.setPubishmentChange(oneData.get(45).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(46))) {
+ vo.setRemark(oneData.get(46).trim());
+ }
+ vo.getUserTagStr().add("社区矫正");
+ for (int i = 47; i < headSize; i++) {
+ if (oneData.get(i) != null && oneData.get(i).equals("是")) {
+ vo.getUserTagStr().add(headData.get(i).substring(0, headData.get(i).indexOf("(")));
+ }
+ }
+ // 将重复的数据进行MD5加密实现去重
+ String distinct = vo.getName() + vo.getCardNo() + vo.getRoad() + vo.getDoorNo() + vo.getFloor()
+ + vo.getUnitNo() + vo.getHouseNo();
+ try {
+ String distinctPass = PayUtil.MD5(distinct);
+ if (StringUtils.isNotEmpty(distinctPass)) {
+ vo.setDistinctPass(distinctPass);
+ }
+ } catch (Exception e) {
+ log.error("组装MD5加密字段失败，数据表格行数：" + index);
+ continue;
+ }
+ voList.add(vo);
+ index++;
+ }
+ // 客户需要暂时注释，等客户处理完成需要恢复
+ // if(populationImportErrorVOList.isEmpty()){
+ // R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
+ // if (!R.isOk(r)) {
+ // throw new ServiceException(r.getMsg());
+ // }
+ // }else{
+ // throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ // }
+ // 根据list中的IdCard城市来去重
+ List<ComMngPopulationCorrectExcelVO> newVoList =
+ voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationCorrectExcelVO::getDistinctPass))
+ .collect(Collectors.toList());
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.listSavePopulationCorrectExcelVO(newVoList, communityId, userId);
+ log.info("业务层处理逻辑完成");
+ if (!R.isOk(r)) {
+ log.info("业务层处理成功");
+ List<ComMngPopulationCorrectMistakeExcelVO> list = JSONArray
+ .parseArray(JSONArray.toJSONString(r.getData()), ComMngPopulationCorrectMistakeExcelVO.class);
+ // String errMsg = r.getMsg();
+ // List<ComMngPopulationImportErrorVO> errorList =
+ // JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
+ // if(!errorList.isEmpty()){
+ // populationImportErrorVOList.addAll(errorList);
+ // }
+ mistakes.addAll(list);
+ log.info("将错误数据存入redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", key);
+ } else {
+ log.info("业务层处理逻辑失败");
+ if (!mistakes.isEmpty()) {
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
+ throw new ServiceException("500", key);
+ }
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行");
+ // importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+ // populationImportErrorVOList.add(importErrorVO);
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ }
+ }
+
+ private void setMistake(Map<Integer, String> map, ComMngPopulationCorrectMistakeExcelVO vo) {
+ vo.setSerialNumber(map.get(0));
+ vo.setName(map.get(1));
+ vo.setCardNo(map.get(3));
+ vo.setNation(map.get(2));
+ vo.setPhone(map.get(4));
+ vo.setRoad(map.get(5));
+ vo.setDoorNo(map.get(6));
+ vo.setFloor(map.get(7));
+ vo.setUnitNo(map.get(8));
+ vo.setHouseNo(map.get(9));
+ vo.setIsRent(map.get(10));
+ vo.setHouseStatus(map.get(11));
+ vo.setHousePurpose(map.get(12));
+ vo.setControlStatus(map.get(13));
+ vo.setOutOrLocal(map.get(14));
+ vo.setCensusRegister(map.get(15));
+ vo.setCultureLevel(map.get(16));
+ vo.setCorrectPersonCode(map.get(17));
+ vo.setOriginalCustodyplace(map.get(18));
+ vo.setCorrectType(map.get(19));
+ vo.setCaseType(map.get(20));
+ vo.setSpecificCharge(map.get(21));
+ vo.setOriginalTerm(map.get(22));
+ vo.setOriginalTermBegin(map.get(23));
+ vo.setOriginalTermEnd(map.get(24));
+ vo.setCorrectBegin(map.get(25));
+ vo.setCorrectEnd(map.get(26));
+ vo.setReceiveMethod(map.get(27));
+ vo.setIsRecidivist(map.get(28));
+ vo.setFourHistory(map.get(29));
+ vo.setThreeInvovle(map.get(30));
+ vo.setIsCorrectGroup(map.get(31));
+ vo.setCorrectGroupConstitute(map.get(32));
+ vo.setCorrectRelieveType(map.get(33));
+ vo.setIsOutControl(map.get(34));
+ vo.setOutControlReason(map.get(35));
+ vo.setOutControlCorrect(map.get(35));
+ vo.setInspectOutControl(map.get(37));
+ vo.setIsMissControl(map.get(38));
+ vo.setMissControlReason(map.get(39));
+ vo.setMissControlCorrect(map.get(40));
+ vo.setInspectMissControl(map.get(41));
+ vo.setRewardAndPunishiment(map.get(42));
+ vo.setIsAgainCrime(map.get(43));
+ vo.setAgainCrimeName(map.get(44));
+ vo.setPubishmentChange(map.get(45));
+ vo.setRemark(map.get(46));
+ }
+
+ private String convertMarriage(String ma) {
+
+ if (Objects.equals("已", ma) || Objects.equals("一", ma)) {
+ ma = "已婚";
+ } else if (Objects.equals("未", ma) || Objects.equals("未婚婚", ma)) {
+ ma = "未婚";
+ } else if (Objects.equals("初", ma)) {
+ ma = "初婚";
+ } else if (Objects.equals("再", ma)) {
+ ma = "再婚";
+ } else if (Objects.equals("复", ma)) {
+ ma = "复婚";
+ } else if (Objects.equals("丧", ma) || Objects.equals("丧偶偶", ma)) {
+ ma = "丧偶";
+ } else if (Objects.equals("离", ma) || Objects.equals("离异", ma) || Objects.equals("离异婚", ma)) {
+ ma = "离婚";
+ } else if (Objects.equals("分", ma)) {
+ ma = "分居";
+ }
+
+ return ma;
+ }
+
+ private String convertRelation(String ra) {
+ if (ra.contains("户主")) {
+ ra = "户主";
+ } else if (Objects.equals(ra, "女儿")) {
+ ra = "女";
+ } else if (Objects.equals(ra, "儿子") || Objects.equals(ra, "儿")) {
+ ra = "子";
+ } else if (Objects.equals(ra, "大女")) {
+ ra = "长女";
+ } else if (Objects.equals(ra, "二女") || Objects.equals(ra, "此女")) {
+ ra = "次女";
+ } else if (Objects.equals(ra, "二子")) {
+ ra = "次子";
+ } else if (Objects.equals(ra, "长男") || ra.contains("长子")) {
+ ra = "长子";
+ } else if (Objects.equals(ra, "非亲属") || ra.contains("女友") || ra.contains("女朋友") || ra.contains("男友")
+ || ra.contains("男朋友")) {
+ ra = "其他";
+ } else if (Objects.equals(ra, "姐")) {
+ ra = "姐姐";
+ } else if (Objects.equals(ra, "户主")) {
+ ra = "本人";
+ } else if (Objects.equals(ra, "妻子") || Objects.equals(ra, "媳妇")) {
+ ra = "妻";
+ } else if (Objects.equals(ra, "哥") || Objects.equals(ra, "哥哥")) {
+ ra = "兄";
+ } else if (Objects.equals(ra, "丈夫")) {
+ ra = "夫";
+ } else if (Objects.equals(ra, "丈母娘")) {
+ ra = "岳母";
+ } else if (Objects.equals(ra, "继子") || Objects.equals(ra, "养子")) {
+ ra = "养子或继子";
+ } else if (Objects.equals(ra, "继女") || Objects.equals(ra, "养女")) {
+ ra = "养女或继女";
+ } else if (ra.contains("儿媳") || ra.contains("长媳")) {
+ ra = "儿媳";
+ } else if (Objects.equals(ra, "三姨") || Objects.equals(ra, "姨姨")) {
+ ra = "姨母";
+ } else if (Objects.equals(ra, "二外孙女")) {
+ ra = "外孙女";
+ } else if (Objects.equals(ra, "外孙")) {
+ ra = "外孙子";
+ } else if (Objects.equals(ra, "侄儿")) {
+ ra = "侄子";
+ } else if (ra.contains("表")) {
+ ra = "表兄弟、表姐妹";
+ } else if (Objects.equals(ra, "继父") || Objects.equals(ra, "养父")) {
+ ra = "继父或养父";
+ } else if (Objects.equals(ra, "父")) {
+ ra = "父亲";
+ } else if (Objects.equals(ra, "弟弟")) {
+ ra = "弟";
+ } else if (Objects.equals(ra, "孙")) {
+ ra = "孙子";
+ } else if (Objects.equals(ra, "孙媳妇") || Objects.equals(ra, "外孙媳妇")) {
+ ra = "孙媳妇或外孙媳妇";
+ } else if (Objects.equals(ra, "妹")) {
+ ra = "妹妹";
+ } else if (Objects.equals(ra, "祖父母")) {
+ ra = "祖父母或外祖父母";
+ } else if (Objects.equals(ra, "姐妹") || Objects.equals(ra, "兄弟")) {
+ ra = "兄弟姐妹";
+ } else if (Objects.equals(ra, "其他姐妹") || Objects.equals(ra, "其他兄弟")) {
+ ra = "其他兄弟姐妹";
+ } else if (Objects.equals(ra, "奶奶")) {
+ ra = "祖母";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (ra.contains("堂")) {
+ ra = "堂兄弟、堂姐妹";
+ }
+
+ return ra;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java
new file mode 100644
index 0000000..58dc1ad
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java
@@ -0,0 +1,552 @@
+package com.panzhihua.common.listen;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.BcDictionaryConstants;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.enums.*;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngPopulationCultExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationCultMistakeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.PayUtil;
+import com.panzhihua.common.utlis.StringUtils;
+
+import cn.hutool.core.date.DateUtil;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 邪教人员导入监听
+ * @author: txb
+ */
+@Slf4j
+public class ComMngPopulationCultExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComMngPopulationCultExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
+ log.info("开始导入邪教人员数据");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("000", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.CULT_POPULATION_ERROR_LIST;
+
+ Map<String, String> dictMap = dictionaryR.getData().stream()
+ .collect(Collectors.toMap(BcDictionaryVO::getDictName, BcDictionaryVO::getDictValue));
+ // Map<String,Integer> dictMap = new HashMap<>();
+ // for(BcDictionaryVO vo : dictionaryR.getData()){
+ // dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
+ // }
+
+ int index = 2;
+ try {
+ String[] parsePatterns = new String[] {"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd",
+ "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d"};
+ ArrayList<ComMngPopulationCultExcelVO> voList = Lists.newArrayList();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ArrayList<ComMngPopulationCultMistakeExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComMngPopulationCultExcelVO vo = new ComMngPopulationCultExcelVO();
+ if (StringUtils.isNotEmpty(oneData.get(0))) {
+ vo.setSerialNumber(oneData.get(0));
+ }
+ // 姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(1));
+ if (StringUtils.isEmpty(oneData.get(2))) {
+ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
+
+ // 判断身份证号码位数
+ if (oneData.get(2).length() != 18) {
+ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(2).toUpperCase());
+ // 根据身份证号码解析年龄以及性别
+ // 获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if (StringUtils.isNotEmpty(birthday)) {
+ String year = birthday.substring(0, 4);
+ String month = birthday.substring(4, 6);
+ String day = birthday.substring(6, 8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
+ // //设置用户年龄
+ // vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
+ // 获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if (sex % 2 == 1) {
+ vo.setSex(PopulSexEnum.nan.getCode());
+ } else {
+ vo.setSex(PopulSexEnum.nv.getCode());
+ }
+
+ if (StringUtils.isNotEmpty(oneData.get(3))) {
+ vo.setNation(oneData.get(3));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(4))) {
+ vo.setProfession(oneData.get(4));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(5))) {
+ Integer isOk = PopulMarriageEnum.getCodeByName(oneData.get(5));
+ if (isOk.equals(-1)) {
+ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的婚姻状况有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setMarriage(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(6))) {
+ Integer isOk = PopulCultureLevelEnum.getCodeByName(oneData.get(6));
+ if (isOk.equals(-1)) {
+ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的文化程度有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCultureLevel(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(7))) {
+ Integer isOk = PopulPoliticalOutlookEnum.getCodeByName(oneData.get(7));
+ if (isOk.equals(-1)) {
+ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的政治面貌有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setPoliticalOutlook(isOk);
+ }
+ if (StringUtils.isEmpty(oneData.get(8))) {
+ index++;
+ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("街路巷不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setRoad(oneData.get(8));
+ if (StringUtils.isEmpty(oneData.get(9))) {
+ index++;
+ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("小区号不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setDoorNo(oneData.get(9).trim());
+ // if(StringUtils.isEmpty(oneData.get(10))){
+ // index++;
+ // ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ // setMistake(oneData, mistake);
+ // mistake.setMistake("楼排号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(10))) {
+ vo.setFloor(oneData.get(10).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(11))){
+ // index++;
+ // ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ // setMistake(oneData, mistake);
+ // mistake.setMistake("单元号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(11))) {
+ vo.setUnitNo(oneData.get(11).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(12))){
+ // index++;
+ // ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ // setMistake(oneData, mistake);
+ // mistake.setMistake("户室不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(12))) {
+ vo.setHouseNo(oneData.get(12).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(13))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(13));
+ if (isOk.equals(-1)) {
+ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否租住有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRent(isOk);
+ } else {
+ vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(14))) {
+ Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(14).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHouseStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(15))) {
+ Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(15).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋用途有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHousePurpose(PopulHousePurposeEnum.getCodeByName(oneData.get(15).trim()));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(11))) {
+ Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(16));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的管控状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setControlStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(17))) {
+ Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(17));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的本地/外地有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setOutOrLocal(isOk);
+ } else {
+ vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(18))) {
+ vo.setCensusRegister(oneData.get(18).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(19))) {
+ vo.setCultName(oneData.get(19).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(20))) {
+ vo.setBasicSituation(oneData.get(20).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(21))) {
+ vo.setJoinCultDate(DateUtil.parse(oneData.get(21).trim(), parsePatterns));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(22))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(22));
+ if (isOk.equals(-1)) {
+ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否对外宣传有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsExternalPublicity(isOk);
+ } else {
+ vo.setIsExternalPublicity(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(23))) {
+ vo.setRemark(oneData.get(23).trim());
+ }
+ vo.getUserTagStr().add("邪教人员");
+ for (int i = 24; i < headSize; i++) {
+ if (oneData.get(i) != null && oneData.get(i).equals("是")) {
+ vo.getUserTagStr().add(headData.get(i).substring(0, headData.get(i).indexOf("(")));
+ }
+ }
+ // 将重复的数据进行MD5加密实现去重
+ String distinct = vo.getName() + vo.getCardNo() + vo.getRoad() + vo.getDoorNo() + vo.getFloor()
+ + vo.getUnitNo() + vo.getHouseNo();
+ try {
+ String distinctPass = PayUtil.MD5(distinct);
+ if (StringUtils.isNotEmpty(distinctPass)) {
+ vo.setDistinctPass(distinctPass);
+ }
+ } catch (Exception e) {
+ log.error("组装MD5加密字段失败，数据表格行数：" + index);
+ continue;
+ }
+ voList.add(vo);
+ index++;
+ }
+ // 客户需要暂时注释，等客户处理完成需要恢复
+ // if(populationImportErrorVOList.isEmpty()){
+ // R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
+ // if (!R.isOk(r)) {
+ // throw new ServiceException(r.getMsg());
+ // }
+ // }else{
+ // throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ // }
+ // 根据list中的IdCard城市来去重
+ List<ComMngPopulationCultExcelVO> newVoList =
+ voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationCultExcelVO::getDistinctPass))
+ .collect(Collectors.toList());
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.listSavePopulationCultExcelVO(newVoList, communityId, userId);
+ log.info("业务层处理逻辑完成");
+ if (!R.isOk(r)) {
+ log.info("业务层处理成功");
+ List<ComMngPopulationCultMistakeExcelVO> list =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComMngPopulationCultMistakeExcelVO.class);
+ // String errMsg = r.getMsg();
+ // List<ComMngPopulationImportErrorVO> errorList =
+ // JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
+ // if(!errorList.isEmpty()){
+ // populationImportErrorVOList.addAll(errorList);
+ // }
+ mistakes.addAll(list);
+ log.info("将错误数据存入redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", key);
+ } else {
+ log.info("业务层处理逻辑失败");
+ if (!mistakes.isEmpty()) {
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
+ throw new ServiceException("500", key);
+ }
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行");
+ // importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+ // populationImportErrorVOList.add(importErrorVO);
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ }
+ }
+
+ private void setMistake(Map<Integer, String> map, ComMngPopulationCultMistakeExcelVO vo) {
+ vo.setSerialNumber(map.get(0));
+ vo.setName(map.get(1));
+ vo.setCardNo(map.get(2));
+ vo.setNation(map.get(3));
+ vo.setProfession(map.get(4));
+ vo.setMarriage(map.get(5));
+ vo.setCultureLevel(map.get(6));
+ vo.setPoliticalOutlook(map.get(7));
+ vo.setRoad(map.get(8));
+ vo.setDoorNo(map.get(9));
+ vo.setFloor(map.get(10));
+ vo.setUnitNo(map.get(11));
+ vo.setHouseNo(map.get(12));
+ vo.setIsRent(map.get(13));
+ vo.setHouseStatus(map.get(14));
+ vo.setHousePurpose(map.get(15));
+ vo.setControlStatus(map.get(16));
+ vo.setOutOrLocal(map.get(17));
+ vo.setCensusRegister(map.get(18));
+ vo.setCultName(map.get(19));
+ vo.setBasicSituation(map.get(20));
+ vo.setJoinCultDate(map.get(21));
+ vo.setIsExternalPublicity(map.get(22));
+ vo.setRemark(map.get(23));
+ }
+
+ private String convertMarriage(String ma) {
+
+ if (Objects.equals("已", ma) || Objects.equals("一", ma)) {
+ ma = "已婚";
+ } else if (Objects.equals("未", ma) || Objects.equals("未婚婚", ma)) {
+ ma = "未婚";
+ } else if (Objects.equals("初", ma)) {
+ ma = "初婚";
+ } else if (Objects.equals("再", ma)) {
+ ma = "再婚";
+ } else if (Objects.equals("复", ma)) {
+ ma = "复婚";
+ } else if (Objects.equals("丧", ma) || Objects.equals("丧偶偶", ma)) {
+ ma = "丧偶";
+ } else if (Objects.equals("离", ma) || Objects.equals("离异", ma) || Objects.equals("离异婚", ma)) {
+ ma = "离婚";
+ } else if (Objects.equals("分", ma)) {
+ ma = "分居";
+ }
+
+ return ma;
+ }
+
+ private String convertRelation(String ra) {
+ if (ra.contains("户主")) {
+ ra = "户主";
+ } else if (Objects.equals(ra, "女儿")) {
+ ra = "女";
+ } else if (Objects.equals(ra, "儿子") || Objects.equals(ra, "儿")) {
+ ra = "子";
+ } else if (Objects.equals(ra, "大女")) {
+ ra = "长女";
+ } else if (Objects.equals(ra, "二女") || Objects.equals(ra, "此女")) {
+ ra = "次女";
+ } else if (Objects.equals(ra, "二子")) {
+ ra = "次子";
+ } else if (Objects.equals(ra, "长男") || ra.contains("长子")) {
+ ra = "长子";
+ } else if (Objects.equals(ra, "非亲属") || ra.contains("女友") || ra.contains("女朋友") || ra.contains("男友")
+ || ra.contains("男朋友")) {
+ ra = "其他";
+ } else if (Objects.equals(ra, "姐")) {
+ ra = "姐姐";
+ } else if (Objects.equals(ra, "户主")) {
+ ra = "本人";
+ } else if (Objects.equals(ra, "妻子") || Objects.equals(ra, "媳妇")) {
+ ra = "妻";
+ } else if (Objects.equals(ra, "哥") || Objects.equals(ra, "哥哥")) {
+ ra = "兄";
+ } else if (Objects.equals(ra, "丈夫")) {
+ ra = "夫";
+ } else if (Objects.equals(ra, "丈母娘")) {
+ ra = "岳母";
+ } else if (Objects.equals(ra, "继子") || Objects.equals(ra, "养子")) {
+ ra = "养子或继子";
+ } else if (Objects.equals(ra, "继女") || Objects.equals(ra, "养女")) {
+ ra = "养女或继女";
+ } else if (ra.contains("儿媳") || ra.contains("长媳")) {
+ ra = "儿媳";
+ } else if (Objects.equals(ra, "三姨") || Objects.equals(ra, "姨姨")) {
+ ra = "姨母";
+ } else if (Objects.equals(ra, "二外孙女")) {
+ ra = "外孙女";
+ } else if (Objects.equals(ra, "外孙")) {
+ ra = "外孙子";
+ } else if (Objects.equals(ra, "侄儿")) {
+ ra = "侄子";
+ } else if (ra.contains("表")) {
+ ra = "表兄弟、表姐妹";
+ } else if (Objects.equals(ra, "继父") || Objects.equals(ra, "养父")) {
+ ra = "继父或养父";
+ } else if (Objects.equals(ra, "父")) {
+ ra = "父亲";
+ } else if (Objects.equals(ra, "弟弟")) {
+ ra = "弟";
+ } else if (Objects.equals(ra, "孙")) {
+ ra = "孙子";
+ } else if (Objects.equals(ra, "孙媳妇") || Objects.equals(ra, "外孙媳妇")) {
+ ra = "孙媳妇或外孙媳妇";
+ } else if (Objects.equals(ra, "妹")) {
+ ra = "妹妹";
+ } else if (Objects.equals(ra, "祖父母")) {
+ ra = "祖父母或外祖父母";
+ } else if (Objects.equals(ra, "姐妹") || Objects.equals(ra, "兄弟")) {
+ ra = "兄弟姐妹";
+ } else if (Objects.equals(ra, "其他姐妹") || Objects.equals(ra, "其他兄弟")) {
+ ra = "其他兄弟姐妹";
+ } else if (Objects.equals(ra, "奶奶")) {
+ ra = "祖母";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (ra.contains("堂")) {
+ ra = "堂兄弟、堂姐妹";
+ }
+
+ return ra;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java
new file mode 100644
index 0000000..ad76e4f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java
@@ -0,0 +1,514 @@
+package com.panzhihua.common.listen;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.BcDictionaryConstants;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.enums.*;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngPopulationDisabilityExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationDisabilityMistakeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.PayUtil;
+import com.panzhihua.common.utlis.StringUtils;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 残疾人导入监听
+ * @author: txb
+ */
+@Slf4j
+public class ComMngPopulationDisabilityExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComMngPopulationDisabilityExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
+ log.info("开始导入残疾人数据");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("000", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String Disability = Constants.DISABILITY_POPULATION_ERROR_LIST;
+
+ Map<String, String> dictMap = dictionaryR.getData().stream()
+ .collect(Collectors.toMap(BcDictionaryVO::getDictName, BcDictionaryVO::getDictValue));
+ // Map<String,Integer> dictMap = new HashMap<>();
+ // for(BcDictionaryVO vo : dictionaryR.getData()){
+ // dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
+ // }
+
+ int index = 2;
+ try {
+ ArrayList<ComMngPopulationDisabilityExcelVO> voList = Lists.newArrayList();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ArrayList<ComMngPopulationDisabilityMistakeExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComMngPopulationDisabilityExcelVO vo = new ComMngPopulationDisabilityExcelVO();
+ if (StringUtils.isNotEmpty(oneData.get(0))) {
+ vo.setSerialNumber(oneData.get(0));
+ }
+ // 姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
+ index++;
+ setDisabilityMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(1));
+ if (StringUtils.isEmpty(oneData.get(2))) {
+ ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
+ index++;
+ setDisabilityMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
+
+ // 判断身份证号码位数
+ if (oneData.get(2).length() != 18) {
+ ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
+ index++;
+ setDisabilityMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(2).toUpperCase());
+ // 根据身份证号码解析年龄以及性别
+ // 获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if (StringUtils.isNotEmpty(birthday)) {
+ String year = birthday.substring(0, 4);
+ String month = birthday.substring(4, 6);
+ String day = birthday.substring(6, 8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
+ // //设置用户年龄
+ // vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
+ // 获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if (sex % 2 == 1) {
+ vo.setSex(PopulSexEnum.nan.getCode());
+ } else {
+ vo.setSex(PopulSexEnum.nv.getCode());
+ }
+
+ if (StringUtils.isNotEmpty(oneData.get(3))) {
+ vo.setCertificateSituation(oneData.get(3));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(4))) {
+ Integer isOk = PopulCultureLevelEnum.getCodeByName(oneData.get(4));
+ if (isOk.equals(-1)) {
+ ComMngPopulationDisabilityMistakeExcelVO mistake =
+ new ComMngPopulationDisabilityMistakeExcelVO();
+ index++;
+ setDisabilityMistake(oneData, mistake);
+ mistake.setMistake("您填写的文化程度有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCultureLevel(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(5))) {
+ vo.setNation(oneData.get(5));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(6))) {
+ vo.setDisType(oneData.get(6));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(7))) {
+ vo.setDisLevel(oneData.get(7));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(8))) {
+ vo.setPhone(oneData.get(8));
+ }
+ if (StringUtils.isEmpty(oneData.get(9))) {
+ index++;
+ ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
+ setDisabilityMistake(oneData, mistake);
+ mistake.setMistake("街路巷不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setRoad(oneData.get(9));
+ if (StringUtils.isEmpty(oneData.get(10))) {
+ index++;
+ ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
+ setDisabilityMistake(oneData, mistake);
+ mistake.setMistake("小区号不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setDoorNo(oneData.get(10).trim());
+ // if(StringUtils.isEmpty(oneData.get(11))){
+ // index++;
+ // ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
+ // setDisabilityMistake(oneData, mistake);
+ // mistake.setMistake("楼排号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(11))) {
+ vo.setFloor(oneData.get(11).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(12))){
+ // index++;
+ // ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
+ // setDisabilityMistake(oneData, mistake);
+ // mistake.setMistake("单元号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(12))) {
+ vo.setUnitNo(oneData.get(12).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(13))){
+ // index++;
+ // ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
+ // setDisabilityMistake(oneData, mistake);
+ // mistake.setMistake("户室不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(13))) {
+ vo.setHouseNo(oneData.get(13).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(14))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(14));
+ if (isOk.equals(-1)) {
+ ComMngPopulationDisabilityMistakeExcelVO mistake =
+ new ComMngPopulationDisabilityMistakeExcelVO();
+ index++;
+ setDisabilityMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否租住有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRent(isOk);
+ } else {
+ vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(15))) {
+ Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(15).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationDisabilityMistakeExcelVO mistake =
+ new ComMngPopulationDisabilityMistakeExcelVO();
+ setDisabilityMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHouseStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(16))) {
+ Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(16).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationDisabilityMistakeExcelVO mistake =
+ new ComMngPopulationDisabilityMistakeExcelVO();
+ setDisabilityMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋用途有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHousePurpose(PopulHousePurposeEnum.getCodeByName(oneData.get(16).trim()));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(17))) {
+ Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(17));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationDisabilityMistakeExcelVO mistake =
+ new ComMngPopulationDisabilityMistakeExcelVO();
+ setDisabilityMistake(oneData, mistake);
+ mistake.setMistake("您填写的管控状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setControlStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(18))) {
+ Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(18));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationDisabilityMistakeExcelVO mistake =
+ new ComMngPopulationDisabilityMistakeExcelVO();
+ setDisabilityMistake(oneData, mistake);
+ mistake.setMistake("您填写的本地/外地有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setOutOrLocal(isOk);
+ } else {
+ vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(19))) {
+ vo.setCensusRegister(oneData.get(19).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(20))) {
+ vo.setRemark(oneData.get(20).trim());
+ }
+ vo.getUserTagStr().add("残疾人");
+ for (int i = 21; i < headSize; i++) {
+ if (oneData.get(i) != null && oneData.get(i).equals("是")) {
+ vo.getUserTagStr().add(headData.get(i).substring(0, headData.get(i).indexOf("(")));
+ }
+ }
+ // 将重复的数据进行MD5加密实现去重
+ String distinct = vo.getName() + vo.getCardNo() + vo.getRoad() + vo.getDoorNo() + vo.getFloor()
+ + vo.getUnitNo() + vo.getHouseNo();
+ try {
+ String distinctPass = PayUtil.MD5(distinct);
+ if (StringUtils.isNotEmpty(distinctPass)) {
+ vo.setDistinctPass(distinctPass);
+ }
+ } catch (Exception e) {
+ log.error("组装MD5加密字段失败，数据表格行数：" + index);
+ continue;
+ }
+ voList.add(vo);
+ index++;
+ }
+ // 客户需要暂时注释，等客户处理完成需要恢复
+ // if(populationImportErrorVOList.isEmpty()){
+ // R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
+ // if (!R.isOk(r)) {
+ // throw new ServiceException(r.getMsg());
+ // }
+ // }else{
+ // throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ // }
+ // 根据list中的IdCard城市来去重
+ List<ComMngPopulationDisabilityExcelVO> newVoList =
+ voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationDisabilityExcelVO::getDistinctPass))
+ .collect(Collectors.toList());
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.listSavePopulationDisabilityExcelVO(newVoList, communityId, userId);
+ log.info("业务层处理逻辑完成");
+ if (!R.isOk(r)) {
+ log.info("业务层处理成功");
+ List<ComMngPopulationDisabilityMistakeExcelVO> list = JSONArray
+ .parseArray(JSONArray.toJSONString(r.getData()), ComMngPopulationDisabilityMistakeExcelVO.class);
+ // String errMsg = r.getMsg();
+ // List<ComMngPopulationImportErrorVO> errorList =
+ // JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
+ // if(!errorList.isEmpty()){
+ // populationImportErrorVOList.addAll(errorList);
+ // }
+ mistakes.addAll(list);
+ log.info("将错误数据存入redis中");
+ valueOperations.set(Disability, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", Disability);
+ } else {
+ log.info("业务层处理逻辑失败");
+ if (!mistakes.isEmpty()) {
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
+ valueOperations.set(Disability, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
+ throw new ServiceException("500", Disability);
+ }
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行");
+ // importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+ // populationImportErrorVOList.add(importErrorVO);
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ }
+ }
+
+ private void setDisabilityMistake(Map<Integer, String> map, ComMngPopulationDisabilityMistakeExcelVO vo) {
+ vo.setSerialNumber(map.get(0));
+ vo.setName(map.get(1));
+ vo.setCardNo(map.get(2));
+ vo.setCertificateSituation(map.get(3));
+ vo.setCultureLevel(map.get(4));
+ vo.setNation(map.get(5));
+ vo.setDisType(map.get(6));
+ vo.setDisLevel(map.get(7));
+ vo.setPhone(map.get(8));
+ vo.setRoad(map.get(9));
+ vo.setDoorNo(map.get(10));
+ vo.setFloor(map.get(11));
+ vo.setUnitNo(map.get(12));
+ vo.setHouseNo(map.get(13));
+ vo.setIsRent(map.get(14));
+ vo.setHouseStatus(map.get(15));
+ vo.setHousePurpose(map.get(16));
+ vo.setControlStatus(map.get(17));
+ vo.setOutOrLocal(map.get(18));
+ vo.setCensusRegister(map.get(19));
+ vo.setRemark(map.get(20));
+ }
+
+ private String convertMarriage(String ma) {
+
+ if (Objects.equals("已", ma) || Objects.equals("一", ma)) {
+ ma = "已婚";
+ } else if (Objects.equals("未", ma) || Objects.equals("未婚婚", ma)) {
+ ma = "未婚";
+ } else if (Objects.equals("初", ma)) {
+ ma = "初婚";
+ } else if (Objects.equals("再", ma)) {
+ ma = "再婚";
+ } else if (Objects.equals("复", ma)) {
+ ma = "复婚";
+ } else if (Objects.equals("丧", ma) || Objects.equals("丧偶偶", ma)) {
+ ma = "丧偶";
+ } else if (Objects.equals("离", ma) || Objects.equals("离异", ma) || Objects.equals("离异婚", ma)) {
+ ma = "离婚";
+ } else if (Objects.equals("分", ma)) {
+ ma = "分居";
+ }
+
+ return ma;
+ }
+
+ private String convertRelation(String ra) {
+ if (ra.contains("户主")) {
+ ra = "户主";
+ } else if (Objects.equals(ra, "女儿")) {
+ ra = "女";
+ } else if (Objects.equals(ra, "儿子") || Objects.equals(ra, "儿")) {
+ ra = "子";
+ } else if (Objects.equals(ra, "大女")) {
+ ra = "长女";
+ } else if (Objects.equals(ra, "二女") || Objects.equals(ra, "此女")) {
+ ra = "次女";
+ } else if (Objects.equals(ra, "二子")) {
+ ra = "次子";
+ } else if (Objects.equals(ra, "长男") || ra.contains("长子")) {
+ ra = "长子";
+ } else if (Objects.equals(ra, "非亲属") || ra.contains("女友") || ra.contains("女朋友") || ra.contains("男友")
+ || ra.contains("男朋友")) {
+ ra = "其他";
+ } else if (Objects.equals(ra, "姐")) {
+ ra = "姐姐";
+ } else if (Objects.equals(ra, "户主")) {
+ ra = "本人";
+ } else if (Objects.equals(ra, "妻子") || Objects.equals(ra, "媳妇")) {
+ ra = "妻";
+ } else if (Objects.equals(ra, "哥") || Objects.equals(ra, "哥哥")) {
+ ra = "兄";
+ } else if (Objects.equals(ra, "丈夫")) {
+ ra = "夫";
+ } else if (Objects.equals(ra, "丈母娘")) {
+ ra = "岳母";
+ } else if (Objects.equals(ra, "继子") || Objects.equals(ra, "养子")) {
+ ra = "养子或继子";
+ } else if (Objects.equals(ra, "继女") || Objects.equals(ra, "养女")) {
+ ra = "养女或继女";
+ } else if (ra.contains("儿媳") || ra.contains("长媳")) {
+ ra = "儿媳";
+ } else if (Objects.equals(ra, "三姨") || Objects.equals(ra, "姨姨")) {
+ ra = "姨母";
+ } else if (Objects.equals(ra, "二外孙女")) {
+ ra = "外孙女";
+ } else if (Objects.equals(ra, "外孙")) {
+ ra = "外孙子";
+ } else if (Objects.equals(ra, "侄儿")) {
+ ra = "侄子";
+ } else if (ra.contains("表")) {
+ ra = "表兄弟、表姐妹";
+ } else if (Objects.equals(ra, "继父") || Objects.equals(ra, "养父")) {
+ ra = "继父或养父";
+ } else if (Objects.equals(ra, "父")) {
+ ra = "父亲";
+ } else if (Objects.equals(ra, "弟弟")) {
+ ra = "弟";
+ } else if (Objects.equals(ra, "孙")) {
+ ra = "孙子";
+ } else if (Objects.equals(ra, "孙媳妇") || Objects.equals(ra, "外孙媳妇")) {
+ ra = "孙媳妇或外孙媳妇";
+ } else if (Objects.equals(ra, "妹")) {
+ ra = "妹妹";
+ } else if (Objects.equals(ra, "祖父母")) {
+ ra = "祖父母或外祖父母";
+ } else if (Objects.equals(ra, "姐妹") || Objects.equals(ra, "兄弟")) {
+ ra = "兄弟姐妹";
+ } else if (Objects.equals(ra, "其他姐妹") || Objects.equals(ra, "其他兄弟")) {
+ ra = "其他兄弟姐妹";
+ } else if (Objects.equals(ra, "奶奶")) {
+ ra = "祖母";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (ra.contains("堂")) {
+ ra = "堂兄弟、堂姐妹";
+ }
+
+ return ra;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java
new file mode 100644
index 0000000..c4bd285
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java
@@ -0,0 +1,530 @@
+package com.panzhihua.common.listen;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.BcDictionaryConstants;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.enums.*;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngPopulationDrugExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationDrugMistakeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.PayUtil;
+import com.panzhihua.common.utlis.StringUtils;
+
+import cn.hutool.core.date.DateUtil;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 吸毒人员导入监听
+ * @author: txb
+ */
+@Slf4j
+public class ComMngPopulationDrugExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComMngPopulationDrugExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
+ log.info("开始导入吸毒人员数据");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("100", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.DRUG_POPULATION_ERROR_LIST;
+
+ Map<String, String> dictMap = dictionaryR.getData().stream()
+ .collect(Collectors.toMap(BcDictionaryVO::getDictName, BcDictionaryVO::getDictValue));
+ // Map<String,Integer> dictMap = new HashMap<>();
+ // for(BcDictionaryVO vo : dictionaryR.getData()){
+ // dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
+ // }
+
+ int index = 2;
+ try {
+ String[] parsePatterns = new String[] {"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd",
+ "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d"};
+ ArrayList<ComMngPopulationDrugExcelVO> voList = Lists.newArrayList();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ArrayList<ComMngPopulationDrugMistakeExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComMngPopulationDrugExcelVO vo = new ComMngPopulationDrugExcelVO();
+ if (StringUtils.isNotEmpty(oneData.get(0))) {
+ vo.setSerialNumber(oneData.get(0));
+ }
+ // 姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+ index++;
+ setDrugMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(1));
+ if (StringUtils.isEmpty(oneData.get(3))) {
+ ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+ index++;
+ setDrugMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
+
+ // 判断身份证号码位数
+ if (oneData.get(3).length() != 18) {
+ ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+ index++;
+ setDrugMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(3).toUpperCase());
+ // 根据身份证号码解析年龄以及性别
+ // 获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if (StringUtils.isNotEmpty(birthday)) {
+ String year = birthday.substring(0, 4);
+ String month = birthday.substring(4, 6);
+ String day = birthday.substring(6, 8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
+ // //设置用户年龄
+ // vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
+ // 获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if (sex % 2 == 1) {
+ vo.setSex(PopulSexEnum.nan.getCode());
+ } else {
+ vo.setSex(PopulSexEnum.nv.getCode());
+ }
+
+ if (StringUtils.isNotEmpty(oneData.get(2))) {
+ vo.setNation(oneData.get(2));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(4))) {
+ vo.setPhone(oneData.get(4));
+ }
+ if (StringUtils.isEmpty(oneData.get(5))) {
+ index++;
+ ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+ setDrugMistake(oneData, mistake);
+ mistake.setMistake("街路巷不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setRoad(oneData.get(5));
+ if (StringUtils.isEmpty(oneData.get(6))) {
+ index++;
+ ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+ setDrugMistake(oneData, mistake);
+ mistake.setMistake("小区号不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setDoorNo(oneData.get(6).trim());
+ // if(StringUtils.isEmpty(oneData.get(7))){
+ // index++;
+ // ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+ // setDrugMistake(oneData, mistake);
+ // mistake.setMistake("楼排号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(7))) {
+ vo.setFloor(oneData.get(7).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(8))){
+ // index++;
+ // ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+ // setDrugMistake(oneData, mistake);
+ // mistake.setMistake("单元号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(8))) {
+ vo.setUnitNo(oneData.get(8).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(9))){
+ // index++;
+ // ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+ // setDrugMistake(oneData, mistake);
+ // mistake.setMistake("户室不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(9))) {
+ vo.setHouseNo(oneData.get(9).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(10))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(10));
+ if (isOk.equals(-1)) {
+ ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+ index++;
+ setDrugMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否租住有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRent(isOk);
+ } else {
+ vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(11))) {
+ Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(11).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+ setDrugMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHouseStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(12))) {
+ Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(12).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+ setDrugMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋用途有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHousePurpose(PopulHousePurposeEnum.getCodeByName(oneData.get(12).trim()));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(13))) {
+ Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(13));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+ setDrugMistake(oneData, mistake);
+ mistake.setMistake("您填写的管控状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setControlStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(14))) {
+ Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(14));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+ setDrugMistake(oneData, mistake);
+ mistake.setMistake("您填写的本地/外地有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setOutOrLocal(isOk);
+ } else {
+ vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(15))) {
+ vo.setCensusRegister(oneData.get(15).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(16))) {
+ vo.setFirstDate(DateUtil.parse(oneData.get(16).trim(), parsePatterns));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(17))) {
+ vo.setControlSituation(oneData.get(17).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(18))) {
+ vo.setControlPerson(oneData.get(18).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(19))) {
+ vo.setControlPersonPhone(oneData.get(19).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(20))) {
+ vo.setHelpSituation(oneData.get(20).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(21))) {
+ vo.setHelpPerson(oneData.get(21).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(22))) {
+ vo.setHelpPersonPhone(oneData.get(22).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(23))) {
+ vo.setDrugReason(oneData.get(23).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(24))) {
+ vo.setDrugResult(oneData.get(24).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(25))) {
+ vo.setHaveCrime(oneData.get(25).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(26))) {
+ vo.setCrimeSutiation(oneData.get(26).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(27))) {
+ vo.setRemark(oneData.get(27).trim());
+ }
+ vo.getUserTagStr().add("吸毒人员");
+ for (int i = 28; i < headSize; i++) {
+ if (oneData.get(i) != null && oneData.get(i).equals("是")) {
+ vo.getUserTagStr().add(headData.get(i).substring(0, headData.get(i).indexOf("(")));
+ }
+ }
+ // 将重复的数据进行MD5加密实现去重
+ String distinct = vo.getName() + vo.getCardNo() + vo.getRoad() + vo.getDoorNo() + vo.getFloor()
+ + vo.getUnitNo() + vo.getHouseNo();
+ try {
+ String distinctPass = PayUtil.MD5(distinct);
+ if (StringUtils.isNotEmpty(distinctPass)) {
+ vo.setDistinctPass(distinctPass);
+ }
+ } catch (Exception e) {
+ log.error("组装MD5加密字段失败，数据表格行数：" + index);
+ continue;
+ }
+ voList.add(vo);
+ index++;
+ }
+ // 客户需要暂时注释，等客户处理完成需要恢复
+ // if(populationImportErrorVOList.isEmpty()){
+ // R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
+ // if (!R.isOk(r)) {
+ // throw new ServiceException(r.getMsg());
+ // }
+ // }else{
+ // throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ // }
+ // 根据list中的IdCard城市来去重
+ List<ComMngPopulationDrugExcelVO> newVoList =
+ voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationDrugExcelVO::getDistinctPass))
+ .collect(Collectors.toList());
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.listSavePopulationDrugExcelVO(newVoList, communityId, userId);
+ log.info("业务层处理逻辑完成");
+ if (!R.isOk(r)) {
+ log.info("业务层处理成功");
+ List<ComMngPopulationDrugMistakeExcelVO> list =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComMngPopulationDrugMistakeExcelVO.class);
+ // String errMsg = r.getMsg();
+ // List<ComMngPopulationImportErrorVO> errorList =
+ // JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
+ // if(!errorList.isEmpty()){
+ // populationImportErrorVOList.addAll(errorList);
+ // }
+ mistakes.addAll(list);
+ log.info("将错误数据存入redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", key);
+ } else {
+ log.info("业务层处理逻辑失败");
+ if (!mistakes.isEmpty()) {
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
+ throw new ServiceException("500", key);
+ }
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行");
+ // importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+ // populationImportErrorVOList.add(importErrorVO);
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ }
+ }
+
+ private void setDrugMistake(Map<Integer, String> map, ComMngPopulationDrugMistakeExcelVO vo) {
+ vo.setSerialNumber(map.get(0));
+ vo.setName(map.get(1));
+ vo.setCardNo(map.get(3));
+ vo.setNation(map.get(2));
+ vo.setPhone(map.get(4));
+ vo.setRoad(map.get(5));
+ vo.setDoorNo(map.get(6));
+ vo.setFloor(map.get(7));
+ vo.setUnitNo(map.get(8));
+ vo.setHouseNo(map.get(9));
+ vo.setIsRent(map.get(10));
+ vo.setHouseStatus(map.get(11));
+ vo.setHousePurpose(map.get(12));
+ vo.setControlStatus(map.get(13));
+ vo.setOutOrLocal(map.get(14));
+ vo.setCensusRegister(map.get(15));
+ vo.setFirstDate(map.get(16));
+ vo.setControlSituation(map.get(17));
+ vo.setControlPerson(map.get(18));
+ vo.setControlPersonPhone(map.get(19));
+ vo.setHelpSituation(map.get(20));
+ vo.setHelpPerson(map.get(21));
+ vo.setHelpPersonPhone(map.get(22));
+ vo.setDrugReason(map.get(23));
+ vo.setDrugResult(map.get(24));
+ vo.setHaveCrime(map.get(25));
+ vo.setCrimeSutiation(map.get(26));
+ vo.setRemark(map.get(27));
+ }
+
+ private String convertMarriage(String ma) {
+
+ if (Objects.equals("已", ma) || Objects.equals("一", ma)) {
+ ma = "已婚";
+ } else if (Objects.equals("未", ma) || Objects.equals("未婚婚", ma)) {
+ ma = "未婚";
+ } else if (Objects.equals("初", ma)) {
+ ma = "初婚";
+ } else if (Objects.equals("再", ma)) {
+ ma = "再婚";
+ } else if (Objects.equals("复", ma)) {
+ ma = "复婚";
+ } else if (Objects.equals("丧", ma) || Objects.equals("丧偶偶", ma)) {
+ ma = "丧偶";
+ } else if (Objects.equals("离", ma) || Objects.equals("离异", ma) || Objects.equals("离异婚", ma)) {
+ ma = "离婚";
+ } else if (Objects.equals("分", ma)) {
+ ma = "分居";
+ }
+
+ return ma;
+ }
+
+ private String convertRelation(String ra) {
+ if (ra.contains("户主")) {
+ ra = "户主";
+ } else if (Objects.equals(ra, "女儿")) {
+ ra = "女";
+ } else if (Objects.equals(ra, "儿子") || Objects.equals(ra, "儿")) {
+ ra = "子";
+ } else if (Objects.equals(ra, "大女")) {
+ ra = "长女";
+ } else if (Objects.equals(ra, "二女") || Objects.equals(ra, "此女")) {
+ ra = "次女";
+ } else if (Objects.equals(ra, "二子")) {
+ ra = "次子";
+ } else if (Objects.equals(ra, "长男") || ra.contains("长子")) {
+ ra = "长子";
+ } else if (Objects.equals(ra, "非亲属") || ra.contains("女友") || ra.contains("女朋友") || ra.contains("男友")
+ || ra.contains("男朋友")) {
+ ra = "其他";
+ } else if (Objects.equals(ra, "姐")) {
+ ra = "姐姐";
+ } else if (Objects.equals(ra, "户主")) {
+ ra = "本人";
+ } else if (Objects.equals(ra, "妻子") || Objects.equals(ra, "媳妇")) {
+ ra = "妻";
+ } else if (Objects.equals(ra, "哥") || Objects.equals(ra, "哥哥")) {
+ ra = "兄";
+ } else if (Objects.equals(ra, "丈夫")) {
+ ra = "夫";
+ } else if (Objects.equals(ra, "丈母娘")) {
+ ra = "岳母";
+ } else if (Objects.equals(ra, "继子") || Objects.equals(ra, "养子")) {
+ ra = "养子或继子";
+ } else if (Objects.equals(ra, "继女") || Objects.equals(ra, "养女")) {
+ ra = "养女或继女";
+ } else if (ra.contains("儿媳") || ra.contains("长媳")) {
+ ra = "儿媳";
+ } else if (Objects.equals(ra, "三姨") || Objects.equals(ra, "姨姨")) {
+ ra = "姨母";
+ } else if (Objects.equals(ra, "二外孙女")) {
+ ra = "外孙女";
+ } else if (Objects.equals(ra, "外孙")) {
+ ra = "外孙子";
+ } else if (Objects.equals(ra, "侄儿")) {
+ ra = "侄子";
+ } else if (ra.contains("表")) {
+ ra = "表兄弟、表姐妹";
+ } else if (Objects.equals(ra, "继父") || Objects.equals(ra, "养父")) {
+ ra = "继父或养父";
+ } else if (Objects.equals(ra, "父")) {
+ ra = "父亲";
+ } else if (Objects.equals(ra, "弟弟")) {
+ ra = "弟";
+ } else if (Objects.equals(ra, "孙")) {
+ ra = "孙子";
+ } else if (Objects.equals(ra, "孙媳妇") || Objects.equals(ra, "外孙媳妇")) {
+ ra = "孙媳妇或外孙媳妇";
+ } else if (Objects.equals(ra, "妹")) {
+ ra = "妹妹";
+ } else if (Objects.equals(ra, "祖父母")) {
+ ra = "祖父母或外祖父母";
+ } else if (Objects.equals(ra, "姐妹") || Objects.equals(ra, "兄弟")) {
+ ra = "兄弟姐妹";
+ } else if (Objects.equals(ra, "其他姐妹") || Objects.equals(ra, "其他兄弟")) {
+ ra = "其他兄弟姐妹";
+ } else if (Objects.equals(ra, "奶奶")) {
+ ra = "祖母";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (ra.contains("堂")) {
+ ra = "堂兄弟、堂姐妹";
+ }
+
+ return ra;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationElderExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationElderExcelListen.java
new file mode 100644
index 0000000..5120fdc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationElderExcelListen.java
@@ -0,0 +1,470 @@
+package com.panzhihua.common.listen;
+
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.BcDictionaryConstants;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.enums.*;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngPopulationElderExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationElderMistakeExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationMistakeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.PayUtil;
+import com.panzhihua.common.utlis.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * title: ComMngPopulationElderExcelListen 高龄老人导入监听
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 高龄老人导入监听
+ *
+ * @author txb
+ * @date 2021/9/01 15:12
+ */
+@Slf4j
+public class ComMngPopulationElderExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComMngPopulationElderExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
+ log.info("开始导入高龄老人数据");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("100", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.ELDER_POPULATION_ERROR_LIST + communityId;
+
+ Map<String, String> dictMap = dictionaryR.getData().stream()
+ .collect(Collectors.toMap(BcDictionaryVO::getDictName, BcDictionaryVO::getDictValue));
+ // Map<String,Integer> dictMap = new HashMap<>();
+ // for(BcDictionaryVO vo : dictionaryR.getData()){
+ // dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
+ // }
+
+ int index = 2;
+ try {
+ String[] parsePatterns = new String[] {"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd",
+ "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d"};
+ ArrayList<ComMngPopulationElderExcelVO> voList = Lists.newArrayList();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ArrayList<ComMngPopulationElderMistakeExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComMngPopulationElderExcelVO vo = new ComMngPopulationElderExcelVO();
+ if (StringUtils.isEmpty(oneData.get(0))) {
+ ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
+ index++;
+ setElderMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(0));
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
+ index++;
+ setElderMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
+
+ // 判断身份证号码位数
+ if (oneData.get(1).length() != 18) {
+ ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
+ index++;
+ setElderMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(1).toUpperCase());
+ // 根据身份证号码解析年龄以及性别
+ // 获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if (StringUtils.isNotEmpty(birthday)) {
+ String year = birthday.substring(0, 4);
+ String month = birthday.substring(4, 6);
+ String day = birthday.substring(6, 8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
+ // //设置用户年龄
+ // vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
+ // 获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if (sex % 2 == 1) {
+ vo.setSex(PopulSexEnum.nan.getCode());
+ } else {
+ vo.setSex(PopulSexEnum.nv.getCode());
+ }
+
+ if (StringUtils.isNotEmpty(oneData.get(2))) {
+ vo.setNation(oneData.get(2));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(3))) {
+ Integer isOk = PopulPoliticalOutlookEnum.getCodeByName(oneData.get(3));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
+ setElderMistake(oneData, mistake);
+ mistake.setMistake("您填写的政治面貌有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setPoliticalOutlook(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(4))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(4));
+ if (isOk.equals(-1)) {
+ ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
+ index++;
+ setElderMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否租住有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRent(isOk);
+ } else {
+ vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isEmpty(oneData.get(5))) {
+ index++;
+ ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
+ setElderMistake(oneData, mistake);
+ mistake.setMistake("街路巷不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setRoad(oneData.get(5));
+ if (StringUtils.isEmpty(oneData.get(6))) {
+ index++;
+ ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
+ setElderMistake(oneData, mistake);
+ mistake.setMistake("小区号不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setDoorNo(oneData.get(6).trim());
+ // if(StringUtils.isEmpty(oneData.get(7))){
+ // index++;
+ // ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
+ // setElderMistake(oneData, mistake);
+ // mistake.setMistake("楼排号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(7))) {
+ vo.setFloor(oneData.get(7).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(8))){
+ // index++;
+ // ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
+ // setElderMistake(oneData, mistake);
+ // mistake.setMistake("单元号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(8))) {
+ vo.setUnitNo(oneData.get(8).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(9))){
+ // index++;
+ // ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
+ // setElderMistake(oneData, mistake);
+ // mistake.setMistake("户室不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(9))) {
+ vo.setHouseNo(oneData.get(9).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(10))) {
+ Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(10).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
+ setElderMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHouseStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(11))) {
+ Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(11).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
+ setElderMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋用途有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHousePurpose(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(12))) {
+ Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(12));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
+ setElderMistake(oneData, mistake);
+ mistake.setMistake("您填写的管控状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setControlStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(13))) {
+ vo.setPhone(oneData.get(13).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(14))) {
+ vo.setNativePlace(oneData.get(14).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(15))) {
+ Integer isOk = PopulCultureLevelEnum.getCodeByName(oneData.get(15));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
+ setElderMistake(oneData, mistake);
+ mistake.setMistake("您填写的文化程度有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCultureLevel(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(16))) {
+ Integer isOk = PopulMarriageEnum.getCodeByName(oneData.get(16));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
+ setElderMistake(oneData, mistake);
+ mistake.setMistake("您填写的婚姻状况有误");
+ mistakes.add(mistake);
+ continue;
+ } else {
+ vo.setMarriage(isOk);
+ }
+ }
+ if (StringUtils.isNotEmpty(oneData.get(17))) {
+ vo.setHealthy(oneData.get(17).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(18))) {
+ Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(18));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
+ setElderMistake(oneData, mistake);
+ mistake.setMistake("您填写的本地/外地有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setOutOrLocal(isOk);
+ } else {
+ vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(19))) {
+ vo.setCensusRegister(oneData.get(19).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(20))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(20));
+ if (isOk.equals(-1)) {
+ ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
+ index++;
+ setElderMistake(oneData, mistake);
+ mistake.setMistake("您填写的高龄老人登记（是/否）有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRegister(isOk);
+ } else {
+ vo.setIsRegister(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(21))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(21));
+ if (isOk.equals(-1)) {
+ ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
+ index++;
+ setElderMistake(oneData, mistake);
+ mistake.setMistake("您填写的健在（是/否）有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsAlive(isOk);
+ } else {
+ vo.setIsAlive(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(22))) {
+ vo.setReceiveAllowanceBegin(DateUtil.parse(oneData.get(22).trim(), parsePatterns));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(23))) {
+ vo.setNowAddress(oneData.get(23).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(24))) {
+ vo.setRemark(oneData.get(24).trim());
+ }
+ vo.getUserTagStr().add("高龄老人");
+ for (int i = 25; i < headSize; i++) {
+ if (oneData.get(i) != null && oneData.get(i).equals("是")) {
+ vo.getUserTagStr().add(headData.get(i).substring(0, headData.get(i).indexOf("(")));
+ }
+ }
+ // 将重复的数据进行MD5加密实现去重
+ String distinct = vo.getName() + vo.getCardNo() + vo.getRoad() + vo.getDoorNo() + vo.getFloor()
+ + vo.getUnitNo() + vo.getHouseNo();
+ try {
+ String distinctPass = PayUtil.MD5(distinct);
+ if (StringUtils.isNotEmpty(distinctPass)) {
+ vo.setDistinctPass(distinctPass);
+ }
+ } catch (Exception e) {
+ log.error("组装MD5加密字段失败，数据表格行数：" + index);
+ continue;
+ }
+ voList.add(vo);
+ index++;
+ }
+ // 客户需要暂时注释，等客户处理完成需要恢复
+ // if(populationImportErrorVOList.isEmpty()){
+ // R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
+ // if (!R.isOk(r)) {
+ // throw new ServiceException(r.getMsg());
+ // }
+ // }else{
+ // throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ // }
+ // 根据list中的IdCard城市来去重
+ List<ComMngPopulationElderExcelVO> newVoList =
+ voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationElderExcelVO::getDistinctPass))
+ .collect(Collectors.toList());
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.listSavePopulationElderExcelVO(newVoList, communityId, userId);
+ log.info("业务层处理逻辑完成");
+ if (!R.isOk(r)) {
+ log.info("业务层处理成功");
+ List<ComMngPopulationElderMistakeExcelVO> list =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComMngPopulationElderMistakeExcelVO.class);
+ // String errMsg = r.getMsg();
+ // List<ComMngPopulationImportErrorVO> errorList =
+ // JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
+ // if(!errorList.isEmpty()){
+ // populationImportErrorVOList.addAll(errorList);
+ // }
+ mistakes.addAll(list);
+ log.info("将错误数据存入redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", key);
+ } else {
+ log.info("业务层处理逻辑失败");
+ if (!mistakes.isEmpty()) {
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
+ throw new ServiceException("500", key);
+ }
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行");
+ // importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+ // populationImportErrorVOList.add(importErrorVO);
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ }
+ }
+
+ private void setElderMistake(Map<Integer, String> map, ComMngPopulationElderMistakeExcelVO vo) {
+ vo.setName(map.get(0));
+ vo.setCardNo(map.get(1));
+ vo.setNation(map.get(2));
+ vo.setPoliticalOutlook(map.get(3));
+ vo.setIsRent(map.get(4));
+ vo.setRoad(map.get(5));
+ vo.setDoorNo(map.get(6));
+ vo.setFloor(map.get(7));
+ vo.setUnitNo(map.get(8));
+ vo.setHouseNo(map.get(9));
+ vo.setHouseStatus(map.get(10));
+ vo.setHousePurpose(map.get(11));
+ vo.setControlStatus(map.get(12));
+ vo.setPhone(map.get(13));
+ vo.setNativePlace(map.get(14));
+ vo.setCultureLevel(map.get(15));
+ vo.setMarriage(map.get(16));
+ vo.setHealthy(map.get(17));
+ vo.setOutOrLocal(map.get(18));
+ vo.setCensusRegister(map.get(19));
+ vo.setIsRegister(map.get(20));
+ vo.setIsAlive(map.get(21));
+ vo.setReceiveAllowanceBegin(map.get(22));
+ vo.setNowAddress(map.get(23));
+ vo.setRemark(map.get(24));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationKeyExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationKeyExcelListen.java
new file mode 100644
index 0000000..73cba98
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationKeyExcelListen.java
@@ -0,0 +1,487 @@
+package com.panzhihua.common.listen;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.BcDictionaryConstants;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.enums.*;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngPopulationKeyExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationKeyMistakeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.PayUtil;
+import com.panzhihua.common.utlis.StringUtils;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 重点上访人员导入监听
+ * @author: txb
+ */
+@Slf4j
+public class ComMngPopulationKeyExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComMngPopulationKeyExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
+ log.info("开始导入重点上访人员数据");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("000", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.KEY_POPULATION_ERROR_LIST;
+
+ Map<String, String> dictMap = dictionaryR.getData().stream()
+ .collect(Collectors.toMap(BcDictionaryVO::getDictName, BcDictionaryVO::getDictValue));
+ // Map<String,Integer> dictMap = new HashMap<>();
+ // for(BcDictionaryVO vo : dictionaryR.getData()){
+ // dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
+ // }
+
+ int index = 2;
+ try {
+ ArrayList<ComMngPopulationKeyExcelVO> voList = Lists.newArrayList();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ArrayList<ComMngPopulationKeyMistakeExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComMngPopulationKeyExcelVO vo = new ComMngPopulationKeyExcelVO();
+ if (StringUtils.isNotEmpty(oneData.get(0))) {
+ vo.setSerialNumber(oneData.get(0));
+ }
+ // 姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ index++;
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(1));
+ if (StringUtils.isEmpty(oneData.get(3))) {
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ index++;
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
+
+ // 判断身份证号码位数
+ if (oneData.get(3).length() != 18) {
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ index++;
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(3).toUpperCase());
+ // 根据身份证号码解析年龄以及性别
+ // 获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if (StringUtils.isNotEmpty(birthday)) {
+ String year = birthday.substring(0, 4);
+ String month = birthday.substring(4, 6);
+ String day = birthday.substring(6, 8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
+ // //设置用户年龄
+ // vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
+ // 获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if (sex % 2 == 1) {
+ vo.setSex(PopulSexEnum.nan.getCode());
+ } else {
+ vo.setSex(PopulSexEnum.nv.getCode());
+ }
+
+ if (StringUtils.isNotEmpty(oneData.get(2))) {
+ vo.setNation(oneData.get(2));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(4))) {
+ vo.setPhone(oneData.get(4));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(5))) {
+ vo.setNativePlace(oneData.get(5));
+ }
+ if (StringUtils.isEmpty(oneData.get(6))) {
+ index++;
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("街路巷不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setRoad(oneData.get(6));
+ if (StringUtils.isEmpty(oneData.get(7))) {
+ index++;
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("小区号不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setDoorNo(oneData.get(7).trim());
+ // if(StringUtils.isEmpty(oneData.get(8))){
+ // index++;
+ // ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ // setKeyMistake(oneData, mistake);
+ // mistake.setMistake("楼排号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(8))) {
+ vo.setFloor(oneData.get(8).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(9))){
+ // index++;
+ // ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ // setKeyMistake(oneData, mistake);
+ // mistake.setMistake("单元号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(9))) {
+ vo.setUnitNo(oneData.get(9).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(10))){
+ // index++;
+ // ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ // setKeyMistake(oneData, mistake);
+ // mistake.setMistake("户室不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(10))) {
+ vo.setHouseNo(oneData.get(10).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(11))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(11));
+ if (isOk.equals(-1)) {
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ index++;
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否租住有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRent(isOk);
+ } else {
+ vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(12))) {
+ Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(12).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHouseStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(13))) {
+ Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(13).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋用途有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHousePurpose(PopulHousePurposeEnum.getCodeByName(oneData.get(13).trim()));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(14))) {
+ Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(14));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("您填写的管控状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setControlStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(15))) {
+ Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(15));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("您填写的本地/外地有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setOutOrLocal(isOk);
+ } else {
+ vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(16))) {
+ vo.setCensusRegister(oneData.get(16).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(17))) {
+ vo.setRemark(oneData.get(17).trim());
+ }
+ vo.getUserTagStr().add("重点人员");
+ for (int i = 18; i < headSize; i++) {
+ if (oneData.get(i) != null && oneData.get(i).equals("是")) {
+ vo.getUserTagStr().add(headData.get(i).substring(0, headData.get(i).indexOf("(")));
+ }
+ }
+ // 将重复的数据进行MD5加密实现去重
+ String distinct = vo.getName() + vo.getCardNo() + vo.getRoad() + vo.getDoorNo() + vo.getFloor()
+ + vo.getUnitNo() + vo.getHouseNo();
+ try {
+ String distinctPass = PayUtil.MD5(distinct);
+ if (StringUtils.isNotEmpty(distinctPass)) {
+ vo.setDistinctPass(distinctPass);
+ }
+ } catch (Exception e) {
+ log.error("组装MD5加密字段失败，数据表格行数：" + index);
+ continue;
+ }
+ voList.add(vo);
+ index++;
+ }
+ // 客户需要暂时注释，等客户处理完成需要恢复
+ // if(populationImportErrorVOList.isEmpty()){
+ // R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
+ // if (!R.isOk(r)) {
+ // throw new ServiceException(r.getMsg());
+ // }
+ // }else{
+ // throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ // }
+ // 根据list中的IdCard城市来去重
+ List<ComMngPopulationKeyExcelVO> newVoList =
+ voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationKeyExcelVO::getDistinctPass))
+ .collect(Collectors.toList());
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.listSavePopulationKeyExcelVO(newVoList, communityId, userId);
+ log.info("业务层处理逻辑完成");
+ if (!R.isOk(r)) {
+ log.info("业务层处理成功");
+ List<ComMngPopulationKeyMistakeExcelVO> list =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComMngPopulationKeyMistakeExcelVO.class);
+ // String errMsg = r.getMsg();
+ // List<ComMngPopulationImportErrorVO> errorList =
+ // JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
+ // if(!errorList.isEmpty()){
+ // populationImportErrorVOList.addAll(errorList);
+ // }
+ mistakes.addAll(list);
+ log.info("将错误数据存入redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", key);
+ } else {
+ log.info("业务层处理逻辑失败");
+ if (!mistakes.isEmpty()) {
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
+ throw new ServiceException("500", key);
+ }
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行");
+ // importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+ // populationImportErrorVOList.add(importErrorVO);
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ }
+ }
+
+ private void setKeyMistake(Map<Integer, String> map, ComMngPopulationKeyMistakeExcelVO vo) {
+ vo.setSerialNumber(map.get(0));
+ vo.setName(map.get(1));
+ vo.setCardNo(map.get(3));
+ vo.setNation(map.get(2));
+ vo.setPhone(map.get(4));
+ vo.setNativePlace(map.get(5));
+ vo.setRoad(map.get(6));
+ vo.setDoorNo(map.get(7));
+ vo.setFloor(map.get(8));
+ vo.setUnitNo(map.get(9));
+ vo.setHouseNo(map.get(10));
+ vo.setIsRent(map.get(11));
+ vo.setHouseStatus(map.get(12));
+ vo.setHousePurpose(map.get(13));
+ vo.setControlStatus(map.get(14));
+ vo.setOutOrLocal(map.get(15));
+ vo.setCensusRegister(map.get(16));
+ vo.setRemark(map.get(17));
+ }
+
+ private String convertMarriage(String ma) {
+
+ if (Objects.equals("已", ma) || Objects.equals("一", ma)) {
+ ma = "已婚";
+ } else if (Objects.equals("未", ma) || Objects.equals("未婚婚", ma)) {
+ ma = "未婚";
+ } else if (Objects.equals("初", ma)) {
+ ma = "初婚";
+ } else if (Objects.equals("再", ma)) {
+ ma = "再婚";
+ } else if (Objects.equals("复", ma)) {
+ ma = "复婚";
+ } else if (Objects.equals("丧", ma) || Objects.equals("丧偶偶", ma)) {
+ ma = "丧偶";
+ } else if (Objects.equals("离", ma) || Objects.equals("离异", ma) || Objects.equals("离异婚", ma)) {
+ ma = "离婚";
+ } else if (Objects.equals("分", ma)) {
+ ma = "分居";
+ }
+
+ return ma;
+ }
+
+ private String convertRelation(String ra) {
+ if (ra.contains("户主")) {
+ ra = "户主";
+ } else if (Objects.equals(ra, "女儿")) {
+ ra = "女";
+ } else if (Objects.equals(ra, "儿子") || Objects.equals(ra, "儿")) {
+ ra = "子";
+ } else if (Objects.equals(ra, "大女")) {
+ ra = "长女";
+ } else if (Objects.equals(ra, "二女") || Objects.equals(ra, "此女")) {
+ ra = "次女";
+ } else if (Objects.equals(ra, "二子")) {
+ ra = "次子";
+ } else if (Objects.equals(ra, "长男") || ra.contains("长子")) {
+ ra = "长子";
+ } else if (Objects.equals(ra, "非亲属") || ra.contains("女友") || ra.contains("女朋友") || ra.contains("男友")
+ || ra.contains("男朋友")) {
+ ra = "其他";
+ } else if (Objects.equals(ra, "姐")) {
+ ra = "姐姐";
+ } else if (Objects.equals(ra, "户主")) {
+ ra = "本人";
+ } else if (Objects.equals(ra, "妻子") || Objects.equals(ra, "媳妇")) {
+ ra = "妻";
+ } else if (Objects.equals(ra, "哥") || Objects.equals(ra, "哥哥")) {
+ ra = "兄";
+ } else if (Objects.equals(ra, "丈夫")) {
+ ra = "夫";
+ } else if (Objects.equals(ra, "丈母娘")) {
+ ra = "岳母";
+ } else if (Objects.equals(ra, "继子") || Objects.equals(ra, "养子")) {
+ ra = "养子或继子";
+ } else if (Objects.equals(ra, "继女") || Objects.equals(ra, "养女")) {
+ ra = "养女或继女";
+ } else if (ra.contains("儿媳") || ra.contains("长媳")) {
+ ra = "儿媳";
+ } else if (Objects.equals(ra, "三姨") || Objects.equals(ra, "姨姨")) {
+ ra = "姨母";
+ } else if (Objects.equals(ra, "二外孙女")) {
+ ra = "外孙女";
+ } else if (Objects.equals(ra, "外孙")) {
+ ra = "外孙子";
+ } else if (Objects.equals(ra, "侄儿")) {
+ ra = "侄子";
+ } else if (ra.contains("表")) {
+ ra = "表兄弟、表姐妹";
+ } else if (Objects.equals(ra, "继父") || Objects.equals(ra, "养父")) {
+ ra = "继父或养父";
+ } else if (Objects.equals(ra, "父")) {
+ ra = "父亲";
+ } else if (Objects.equals(ra, "弟弟")) {
+ ra = "弟";
+ } else if (Objects.equals(ra, "孙")) {
+ ra = "孙子";
+ } else if (Objects.equals(ra, "孙媳妇") || Objects.equals(ra, "外孙媳妇")) {
+ ra = "孙媳妇或外孙媳妇";
+ } else if (Objects.equals(ra, "妹")) {
+ ra = "妹妹";
+ } else if (Objects.equals(ra, "祖父母")) {
+ ra = "祖父母或外祖父母";
+ } else if (Objects.equals(ra, "姐妹") || Objects.equals(ra, "兄弟")) {
+ ra = "兄弟姐妹";
+ } else if (Objects.equals(ra, "其他姐妹") || Objects.equals(ra, "其他兄弟")) {
+ ra = "其他兄弟姐妹";
+ } else if (Objects.equals(ra, "奶奶")) {
+ ra = "祖母";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (ra.contains("堂")) {
+ ra = "堂兄弟、堂姐妹";
+ }
+
+ return ra;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java
new file mode 100644
index 0000000..ab8a27d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java
@@ -0,0 +1,614 @@
+package com.panzhihua.common.listen;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.BcDictionaryConstants;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.enums.*;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngPopulationLowSecurityExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationLowSecurityMistakeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.PayUtil;
+import com.panzhihua.common.utlis.StringUtils;
+
+import cn.hutool.core.date.DateUtil;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 低保户导入监听
+ * @author: txb
+ */
+@Slf4j
+public class ComMngPopulationLowSecurityExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComMngPopulationLowSecurityExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
+ log.info("开始导入低保户数据");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("000", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String LowSecurity = Constants.LOWSECURITY_POPULATION_ERROR_LIST;
+
+ Map<String, String> dictMap = dictionaryR.getData().stream()
+ .collect(Collectors.toMap(BcDictionaryVO::getDictName, BcDictionaryVO::getDictValue));
+ // Map<String,Integer> dictMap = new HashMap<>();
+ // for(BcDictionaryVO vo : dictionaryR.getData()){
+ // dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
+ // }
+
+ int index = 2;
+ try {
+ String[] parsePatterns = new String[] {"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd",
+ "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d", "yyyy/MM", "yyyy/M", "yyyy-M", "yyyy-MM"};
+ ArrayList<ComMngPopulationLowSecurityExcelVO> voList = Lists.newArrayList();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ArrayList<ComMngPopulationLowSecurityMistakeExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComMngPopulationLowSecurityExcelVO vo = new ComMngPopulationLowSecurityExcelVO();
+ if (StringUtils.isNotEmpty(oneData.get(0))) {
+ vo.setSerialNumber(oneData.get(0));
+ }
+ // 姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
+ index++;
+ setLowSecurityMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(1));
+ if (StringUtils.isEmpty(oneData.get(2))) {
+ ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
+ index++;
+ setLowSecurityMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
+
+ // 判断身份证号码位数
+ if (oneData.get(2).length() != 18) {
+ ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
+ index++;
+ setLowSecurityMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(2).toUpperCase());
+ // 根据身份证号码解析年龄以及性别
+ // 获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if (StringUtils.isNotEmpty(birthday)) {
+ String year = birthday.substring(0, 4);
+ String month = birthday.substring(4, 6);
+ String day = birthday.substring(6, 8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
+ // //设置用户年龄
+ // vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
+ // 获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if (sex % 2 == 1) {
+ vo.setSex(PopulSexEnum.nan.getCode());
+ } else {
+ vo.setSex(PopulSexEnum.nv.getCode());
+ }
+
+ if (StringUtils.isNotEmpty(oneData.get(3))) {
+ vo.setPhone(oneData.get(3));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(4))) {
+ vo.setRegion(oneData.get(4));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(5))) {
+ vo.setFamilyCode(oneData.get(5));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(6))) {
+ vo.setGroupName(oneData.get(6));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(7))) {
+ vo.setClassifiedRescueCategory(oneData.get(7));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(8))) {
+ vo.setApplyDate(DateUtil.parse(oneData.get(8), parsePatterns));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(9))) {
+ vo.setHouseHolderName(oneData.get(9));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(10))) {
+ vo.setHouseHolderCardNo(oneData.get(10));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(11))) {
+ vo.setHouseHolderCode(oneData.get(11));
+ }
+ if (StringUtils.isEmpty(oneData.get(12))) {
+ index++;
+ ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
+ setLowSecurityMistake(oneData, mistake);
+ mistake.setMistake("街路巷不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setRoad(oneData.get(12));
+ if (StringUtils.isEmpty(oneData.get(13))) {
+ index++;
+ ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
+ setLowSecurityMistake(oneData, mistake);
+ mistake.setMistake("小区号不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setDoorNo(oneData.get(13).trim());
+ // if(StringUtils.isEmpty(oneData.get(14))){
+ // index++;
+ // ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
+ // setLowSecurityMistake(oneData, mistake);
+ // mistake.setMistake("楼排号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(14))) {
+ vo.setFloor(oneData.get(14).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(15))){
+ // index++;
+ // ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
+ // setLowSecurityMistake(oneData, mistake);
+ // mistake.setMistake("单元号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(15))) {
+ vo.setUnitNo(oneData.get(15).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(16))){
+ // index++;
+ // ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
+ // setLowSecurityMistake(oneData, mistake);
+ // mistake.setMistake("户室不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(16))) {
+ vo.setHouseNo(oneData.get(16).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(17))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(17));
+ if (isOk.equals(-1)) {
+ ComMngPopulationLowSecurityMistakeExcelVO mistake =
+ new ComMngPopulationLowSecurityMistakeExcelVO();
+ index++;
+ setLowSecurityMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否租住有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRent(isOk);
+ } else {
+ vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(18))) {
+ Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(18).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationLowSecurityMistakeExcelVO mistake =
+ new ComMngPopulationLowSecurityMistakeExcelVO();
+ setLowSecurityMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHouseStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(19))) {
+ Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(19).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationLowSecurityMistakeExcelVO mistake =
+ new ComMngPopulationLowSecurityMistakeExcelVO();
+ setLowSecurityMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋用途有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHousePurpose(PopulHousePurposeEnum.getCodeByName(oneData.get(19).trim()));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(20))) {
+ Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(20));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationLowSecurityMistakeExcelVO mistake =
+ new ComMngPopulationLowSecurityMistakeExcelVO();
+ setLowSecurityMistake(oneData, mistake);
+ mistake.setMistake("您填写的管控状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setControlStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(21))) {
+ Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(21));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationLowSecurityMistakeExcelVO mistake =
+ new ComMngPopulationLowSecurityMistakeExcelVO();
+ setLowSecurityMistake(oneData, mistake);
+ mistake.setMistake("您填写的本地/外地有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setOutOrLocal(isOk);
+ } else {
+ vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(22))) {
+ vo.setCensusRegister(oneData.get(22).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(23))) {
+ vo.setResidencePostalCode(oneData.get(23).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(24))) {
+ vo.setSalvageCertificateNo(oneData.get(24).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(25))) {
+ vo.setGuaranteedPopulationNumber(Integer.valueOf(oneData.get(25).trim()));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(26))) {
+ vo.setFamilyPopulationNumber(Integer.valueOf(oneData.get(26).trim()));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(27))) {
+ vo.setAccountPerson(oneData.get(27).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(28))) {
+ vo.setAccountBank(oneData.get(28).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(29))) {
+ vo.setAccountCardNo(oneData.get(29).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(30))) {
+ vo.setBankAccount(oneData.get(30).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(31))) {
+ vo.setSupportInstitutions(oneData.get(31).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(32))) {
+ vo.setDistributionMethod(oneData.get(32).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(33))) {
+ vo.setGuaranteedAmount(new BigDecimal(oneData.get(33).trim()).setScale(2, RoundingMode.HALF_UP));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(34))) {
+ vo.setReallocationAmount(new BigDecimal(oneData.get(34).trim()).setScale(2, RoundingMode.HALF_UP));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(35))) {
+ vo.setDifferenceReliefAmount(
+ new BigDecimal(oneData.get(35).trim()).setScale(2, RoundingMode.HALF_UP));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(36))) {
+ vo.setClassifiedInsuredAmount(
+ new BigDecimal(oneData.get(36).trim()).setScale(2, RoundingMode.HALF_UP));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(37))) {
+ vo.setTotalMonthlyFamilyIncome(
+ new BigDecimal(oneData.get(37).trim()).setScale(2, RoundingMode.HALF_UP));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(38))) {
+ vo.setAverageMonthlyFamilyIncome(
+ new BigDecimal(oneData.get(38).trim()).setScale(2, RoundingMode.HALF_UP));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(39))) {
+ vo.setTotalMonthlyFamilyExpenditure(
+ new BigDecimal(oneData.get(39).trim()).setScale(2, RoundingMode.HALF_UP));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(40))) {
+ vo.setLng(oneData.get(40).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(41))) {
+ vo.setLat(oneData.get(41).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(42))) {
+ vo.setOriginateDate(oneData.get(42).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(43))) {
+ vo.setNursingFee(new BigDecimal(oneData.get(43).trim()).setScale(2, RoundingMode.HALF_UP));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(44))) {
+ vo.setApplyReason(oneData.get(44).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(45))) {
+ vo.setReviewComment(oneData.get(45).trim());
+ }
+ vo.getUserTagStr().add("低保户");
+ for (int i = 46; i < headSize; i++) {
+ if (oneData.get(i) != null && oneData.get(i).equals("是")) {
+ vo.getUserTagStr().add(headData.get(i).substring(0, headData.get(i).indexOf("(")));
+ }
+ }
+ // 将重复的数据进行MD5加密实现去重
+ String distinct = vo.getName() + vo.getCardNo() + vo.getRoad() + vo.getDoorNo() + vo.getFloor()
+ + vo.getUnitNo() + vo.getHouseNo();
+ try {
+ String distinctPass = PayUtil.MD5(distinct);
+ if (StringUtils.isNotEmpty(distinctPass)) {
+ vo.setDistinctPass(distinctPass);
+ }
+ } catch (Exception e) {
+ log.error("组装MD5加密字段失败，数据表格行数：" + index);
+ continue;
+ }
+ voList.add(vo);
+ index++;
+ }
+ // 客户需要暂时注释，等客户处理完成需要恢复
+ // if(populationImportErrorVOList.isEmpty()){
+ // R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
+ // if (!R.isOk(r)) {
+ // throw new ServiceException(r.getMsg());
+ // }
+ // }else{
+ // throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ // }
+ // 根据list中的IdCard城市来去重
+ List<ComMngPopulationLowSecurityExcelVO> newVoList =
+ voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationLowSecurityExcelVO::getDistinctPass))
+ .collect(Collectors.toList());
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.listSavePopulationLowSecurityExcelVO(newVoList, communityId, userId);
+ log.info("业务层处理逻辑完成");
+ if (!R.isOk(r)) {
+ log.info("业务层处理成功");
+ List<ComMngPopulationLowSecurityMistakeExcelVO> list = JSONArray
+ .parseArray(JSONArray.toJSONString(r.getData()), ComMngPopulationLowSecurityMistakeExcelVO.class);
+ // String errMsg = r.getMsg();
+ // List<ComMngPopulationImportErrorVO> errorList =
+ // JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
+ // if(!errorList.isEmpty()){
+ // populationImportErrorVOList.addAll(errorList);
+ // }
+ mistakes.addAll(list);
+ log.info("将错误数据存入redis中");
+ valueOperations.set(LowSecurity, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", LowSecurity);
+ } else {
+ log.info("业务层处理逻辑失败");
+ if (!mistakes.isEmpty()) {
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
+ valueOperations.set(LowSecurity, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
+ throw new ServiceException("500", LowSecurity);
+ }
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行");
+ // importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+ // populationImportErrorVOList.add(importErrorVO);
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ }
+ }
+
+ private void setLowSecurityMistake(Map<Integer, String> map, ComMngPopulationLowSecurityMistakeExcelVO vo) {
+ vo.setSerialNumber(map.get(0));
+ vo.setName(map.get(1));
+ vo.setCardNo(map.get(2));
+ vo.setPhone(map.get(3));
+ vo.setRegion(map.get(4));
+ vo.setFamilyCode(map.get(5));
+ vo.setGroupName(map.get(6));
+ vo.setClassifiedRescueCategory(map.get(7));
+ vo.setApplyDate(map.get(8));
+ vo.setHouseHolderName(map.get(9));
+ vo.setHouseHolderCardNo(map.get(10));
+ vo.setHouseHolderCode(map.get(11));
+ vo.setRoad(map.get(12));
+ vo.setDoorNo(map.get(13));
+ vo.setFloor(map.get(14));
+ vo.setUnitNo(map.get(15));
+ vo.setHouseNo(map.get(16));
+ vo.setIsRent(map.get(17));
+ vo.setHouseStatus(map.get(18));
+ vo.setHousePurpose(map.get(19));
+ vo.setControlStatus(map.get(20));
+ vo.setOutOrLocal(map.get(21));
+ vo.setCensusRegister(map.get(22));
+ vo.setResidencePostalCode(map.get(23));
+ vo.setSalvageCertificateNo(map.get(24));
+ vo.setGuaranteedPopulationNumber(map.get(25));
+ vo.setFamilyPopulationNumber(map.get(26));
+ vo.setAccountPerson(map.get(27));
+ vo.setAccountBank(map.get(28));
+ vo.setAccountCardNo(map.get(29));
+ vo.setBankAccount(map.get(30));
+ vo.setSupportInstitutions(map.get(31));
+ vo.setDistributionMethod(map.get(32));
+ vo.setGuaranteedAmount(map.get(33));
+ vo.setReallocationAmount(map.get(34));
+ vo.setDifferenceReliefAmount(map.get(35));
+ vo.setClassifiedInsuredAmount(map.get(36));
+ vo.setTotalMonthlyFamilyIncome(map.get(37));
+ vo.setAverageMonthlyFamilyIncome(map.get(38));
+ vo.setTotalMonthlyFamilyExpenditure(map.get(39));
+ vo.setLng(map.get(40));
+ vo.setLat(map.get(41));
+ vo.setOriginateDate(map.get(42));
+ vo.setNursingFee(map.get(43));
+ vo.setApplyReason(map.get(44));
+ vo.setReviewComment(map.get(45));
+ }
+
+ private String convertMarriage(String ma) {
+
+ if (Objects.equals("已", ma) || Objects.equals("一", ma)) {
+ ma = "已婚";
+ } else if (Objects.equals("未", ma) || Objects.equals("未婚婚", ma)) {
+ ma = "未婚";
+ } else if (Objects.equals("初", ma)) {
+ ma = "初婚";
+ } else if (Objects.equals("再", ma)) {
+ ma = "再婚";
+ } else if (Objects.equals("复", ma)) {
+ ma = "复婚";
+ } else if (Objects.equals("丧", ma) || Objects.equals("丧偶偶", ma)) {
+ ma = "丧偶";
+ } else if (Objects.equals("离", ma) || Objects.equals("离异", ma) || Objects.equals("离异婚", ma)) {
+ ma = "离婚";
+ } else if (Objects.equals("分", ma)) {
+ ma = "分居";
+ }
+
+ return ma;
+ }
+
+ private String convertRelation(String ra) {
+ if (ra.contains("户主")) {
+ ra = "户主";
+ } else if (Objects.equals(ra, "女儿")) {
+ ra = "女";
+ } else if (Objects.equals(ra, "儿子") || Objects.equals(ra, "儿")) {
+ ra = "子";
+ } else if (Objects.equals(ra, "大女")) {
+ ra = "长女";
+ } else if (Objects.equals(ra, "二女") || Objects.equals(ra, "此女")) {
+ ra = "次女";
+ } else if (Objects.equals(ra, "二子")) {
+ ra = "次子";
+ } else if (Objects.equals(ra, "长男") || ra.contains("长子")) {
+ ra = "长子";
+ } else if (Objects.equals(ra, "非亲属") || ra.contains("女友") || ra.contains("女朋友") || ra.contains("男友")
+ || ra.contains("男朋友")) {
+ ra = "其他";
+ } else if (Objects.equals(ra, "姐")) {
+ ra = "姐姐";
+ } else if (Objects.equals(ra, "户主")) {
+ ra = "本人";
+ } else if (Objects.equals(ra, "妻子") || Objects.equals(ra, "媳妇")) {
+ ra = "妻";
+ } else if (Objects.equals(ra, "哥") || Objects.equals(ra, "哥哥")) {
+ ra = "兄";
+ } else if (Objects.equals(ra, "丈夫")) {
+ ra = "夫";
+ } else if (Objects.equals(ra, "丈母娘")) {
+ ra = "岳母";
+ } else if (Objects.equals(ra, "继子") || Objects.equals(ra, "养子")) {
+ ra = "养子或继子";
+ } else if (Objects.equals(ra, "继女") || Objects.equals(ra, "养女")) {
+ ra = "养女或继女";
+ } else if (ra.contains("儿媳") || ra.contains("长媳")) {
+ ra = "儿媳";
+ } else if (Objects.equals(ra, "三姨") || Objects.equals(ra, "姨姨")) {
+ ra = "姨母";
+ } else if (Objects.equals(ra, "二外孙女")) {
+ ra = "外孙女";
+ } else if (Objects.equals(ra, "外孙")) {
+ ra = "外孙子";
+ } else if (Objects.equals(ra, "侄儿")) {
+ ra = "侄子";
+ } else if (ra.contains("表")) {
+ ra = "表兄弟、表姐妹";
+ } else if (Objects.equals(ra, "继父") || Objects.equals(ra, "养父")) {
+ ra = "继父或养父";
+ } else if (Objects.equals(ra, "父")) {
+ ra = "父亲";
+ } else if (Objects.equals(ra, "弟弟")) {
+ ra = "弟";
+ } else if (Objects.equals(ra, "孙")) {
+ ra = "孙子";
+ } else if (Objects.equals(ra, "孙媳妇") || Objects.equals(ra, "外孙媳妇")) {
+ ra = "孙媳妇或外孙媳妇";
+ } else if (Objects.equals(ra, "妹")) {
+ ra = "妹妹";
+ } else if (Objects.equals(ra, "祖父母")) {
+ ra = "祖父母或外祖父母";
+ } else if (Objects.equals(ra, "姐妹") || Objects.equals(ra, "兄弟")) {
+ ra = "兄弟姐妹";
+ } else if (Objects.equals(ra, "其他姐妹") || Objects.equals(ra, "其他兄弟")) {
+ ra = "其他兄弟姐妹";
+ } else if (Objects.equals(ra, "奶奶")) {
+ ra = "祖母";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (ra.contains("堂")) {
+ ra = "堂兄弟、堂姐妹";
+ }
+
+ return ra;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java
new file mode 100644
index 0000000..0c9c9a4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java
@@ -0,0 +1,560 @@
+package com.panzhihua.common.listen;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.BcDictionaryConstants;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.enums.*;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngPopulationMajorExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationMajorMistakeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.PayUtil;
+import com.panzhihua.common.utlis.StringUtils;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 重精人员导入监听
+ * @author: txb
+ */
+@Slf4j
+public class ComMngPopulationMajorExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComMngPopulationMajorExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
+ log.info("开始导入重精人员数据");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("000", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.MAJOR_POPULATION_ERROR_LIST;
+
+ Map<String, String> dictMap = dictionaryR.getData().stream()
+ .collect(Collectors.toMap(BcDictionaryVO::getDictName, BcDictionaryVO::getDictValue));
+ // Map<String,Integer> dictMap = new HashMap<>();
+ // for(BcDictionaryVO vo : dictionaryR.getData()){
+ // dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
+ // }
+
+ int index = 2;
+ try {
+ ArrayList<ComMngPopulationMajorExcelVO> voList = Lists.newArrayList();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ArrayList<ComMngPopulationMajorMistakeExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComMngPopulationMajorExcelVO vo = new ComMngPopulationMajorExcelVO();
+ if (StringUtils.isNotEmpty(oneData.get(0))) {
+ vo.setSerialNumber(oneData.get(0));
+ }
+ // 姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(1));
+ if (StringUtils.isEmpty(oneData.get(2))) {
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
+
+ // 判断身份证号码位数
+ if (oneData.get(2).length() != 18) {
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(2).toUpperCase());
+ // 根据身份证号码解析年龄以及性别
+ // 获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if (StringUtils.isNotEmpty(birthday)) {
+ String year = birthday.substring(0, 4);
+ String month = birthday.substring(4, 6);
+ String day = birthday.substring(6, 8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
+ // //设置用户年龄
+ // vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
+ // 获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if (sex % 2 == 1) {
+ vo.setSex(PopulSexEnum.nan.getCode());
+ } else {
+ vo.setSex(PopulSexEnum.nv.getCode());
+ }
+
+ if (StringUtils.isEmpty(oneData.get(3))) {
+ index++;
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("街路巷不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setRoad(oneData.get(3));
+ if (StringUtils.isEmpty(oneData.get(4))) {
+ index++;
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("小区号不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setDoorNo(oneData.get(4).trim());
+ // if(StringUtils.isEmpty(oneData.get(5))){
+ // index++;
+ // ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ // setMistake(oneData, mistake);
+ // mistake.setMistake("楼排号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(5))) {
+ vo.setFloor(oneData.get(5).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(6))){
+ // index++;
+ // ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ // setMistake(oneData, mistake);
+ // mistake.setMistake("单元号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(6))) {
+ vo.setUnitNo(oneData.get(6).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(7))){
+ // index++;
+ // ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ // setMistake(oneData, mistake);
+ // mistake.setMistake("户室不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(7))) {
+ vo.setHouseNo(oneData.get(7).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(8))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(8));
+ if (isOk.equals(-1)) {
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否租住有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRent(isOk);
+ } else {
+ vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(9))) {
+ Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(9).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHouseStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(10))) {
+ Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(10).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋用途有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHousePurpose(PopulHousePurposeEnum.getCodeByName(oneData.get(10).trim()));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(11))) {
+ Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(11));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的管控状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setControlStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(12))) {
+ Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(12));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的本地/外地有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setOutOrLocal(isOk);
+ } else {
+ vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(13))) {
+ vo.setCensusRegister(oneData.get(13).trim());
+ }
+ if (StringUtils.isEmpty(oneData.get(14))) {
+ Integer isOk = PopulCultureLevelEnum.getCodeByName(oneData.get(14));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的文化程度有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setOutOrLocal(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(15))) {
+ vo.setEconomicCondition(oneData.get(15).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(16))) {
+ vo.setPersonType(oneData.get(16).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(17))) {
+ vo.setFamilySituation(oneData.get(17).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(18))) {
+ vo.setCustodyPerson(oneData.get(18).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(19))) {
+// Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(19));
+// if (isOk.equals(-1)) {
+// index++;
+// ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+// setMistake(oneData, mistake);
+// mistake.setMistake("您填写的与监护人关系有误");
+// mistakes.add(mistake);
+// continue;
+// }
+ vo.setCustodyRelation(oneData.get(19).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(20))) {
+ vo.setCustodyCardNo(oneData.get(20).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(21))) {
+ vo.setCustodyPersonPhone(oneData.get(21).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(22))) {
+ vo.setCustodyAddress(oneData.get(22).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(23))) {
+ vo.setHelpPerson(oneData.get(23).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(24))) {
+ vo.setHelpPersonPhone(oneData.get(24).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(25))) {
+ vo.setHelpMethod(oneData.get(25).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(26))) {
+ vo.setHelpSituation(oneData.get(26).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(27))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(27));
+ if (isOk.equals(-1)) {
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否违法犯罪有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsCrime(isOk);
+ } else {
+ vo.setIsCrime(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(28))) {
+ vo.setCrimeSutiation(oneData.get(28).trim());
+ }
+ vo.getUserTagStr().add("精神障碍患者");
+ for (int i = 29; i < headSize; i++) {
+ if (oneData.get(i) != null && oneData.get(i).equals("是")) {
+ vo.getUserTagStr().add(headData.get(i).substring(0, headData.get(i).indexOf("(")));
+ }
+ }
+ // 将重复的数据进行MD5加密实现去重
+ String distinct = vo.getName() + vo.getCardNo() + vo.getRoad() + vo.getDoorNo() + vo.getFloor()
+ + vo.getUnitNo() + vo.getHouseNo();
+ try {
+ String distinctPass = PayUtil.MD5(distinct);
+ if (StringUtils.isNotEmpty(distinctPass)) {
+ vo.setDistinctPass(distinctPass);
+ }
+ } catch (Exception e) {
+ log.error("组装MD5加密字段失败，数据表格行数：" + index);
+ continue;
+ }
+ voList.add(vo);
+ index++;
+ }
+ // 客户需要暂时注释，等客户处理完成需要恢复
+ // if(populationImportErrorVOList.isEmpty()){
+ // R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
+ // if (!R.isOk(r)) {
+ // throw new ServiceException(r.getMsg());
+ // }
+ // }else{
+ // throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ // }
+ // 根据list中的IdCard城市来去重
+ List<ComMngPopulationMajorExcelVO> newVoList =
+ voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationMajorExcelVO::getDistinctPass))
+ .collect(Collectors.toList());
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.listSavePopulationMajorExcelVO(newVoList, communityId, userId);
+ log.info("业务层处理逻辑完成");
+ if (!R.isOk(r)) {
+ log.info("业务层处理成功");
+ List<ComMngPopulationMajorMistakeExcelVO> list = JSONArray
+ .parseArray(JSONArray.toJSONString(r.getData()), ComMngPopulationMajorMistakeExcelVO.class);
+ // String errMsg = r.getMsg();
+ // List<ComMngPopulationImportErrorVO> errorList =
+ // JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
+ // if(!errorList.isEmpty()){
+ // populationImportErrorVOList.addAll(errorList);
+ // }
+ mistakes.addAll(list);
+ log.info("将错误数据存入redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", key);
+ } else {
+ log.info("业务层处理逻辑失败");
+ if (!mistakes.isEmpty()) {
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
+ throw new ServiceException("500", key);
+ }
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行");
+ // importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+ // populationImportErrorVOList.add(importErrorVO);
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ }
+ }
+
+ private void setMistake(Map<Integer, String> map, ComMngPopulationMajorMistakeExcelVO vo) {
+ vo.setSerialNumber(map.get(0));
+ vo.setName(map.get(1));
+ vo.setCardNo(map.get(2));
+ vo.setRoad(map.get(3));
+ vo.setDoorNo(map.get(4));
+ vo.setFloor(map.get(5));
+ vo.setUnitNo(map.get(6));
+ vo.setHouseNo(map.get(7));
+ vo.setIsRent(map.get(8));
+ vo.setHouseStatus(map.get(9));
+ vo.setHousePurpose(map.get(10));
+ vo.setControlStatus(map.get(11));
+ vo.setOutOrLocal(map.get(12));
+ vo.setCensusRegister(map.get(13));
+ vo.setCultureLevel(map.get(14));
+ vo.setEconomicCondition(map.get(15));
+ vo.setPersonType(map.get(16));
+ vo.setFamilySituation(map.get(17));
+ vo.setCustodyPerson(map.get(18));
+ vo.setCustodyRelation(map.get(19));
+ vo.setCustodyCardNo(map.get(20));
+ vo.setCustodyPersonPhone(map.get(21));
+ vo.setCustodyAddress(map.get(22));
+ vo.setHelpPerson(map.get(23));
+ vo.setHelpPersonPhone(map.get(24));
+ vo.setHelpMethod(map.get(25));
+ vo.setHelpSituation(map.get(26));
+ vo.setIsCrime(map.get(27));
+ vo.setCrimeSutiation(map.get(28));
+ }
+
+ private String convertMarriage(String ma) {
+
+ if (Objects.equals("已", ma) || Objects.equals("一", ma)) {
+ ma = "已婚";
+ } else if (Objects.equals("未", ma) || Objects.equals("未婚婚", ma)) {
+ ma = "未婚";
+ } else if (Objects.equals("初", ma)) {
+ ma = "初婚";
+ } else if (Objects.equals("再", ma)) {
+ ma = "再婚";
+ } else if (Objects.equals("复", ma)) {
+ ma = "复婚";
+ } else if (Objects.equals("丧", ma) || Objects.equals("丧偶偶", ma)) {
+ ma = "丧偶";
+ } else if (Objects.equals("离", ma) || Objects.equals("离异", ma) || Objects.equals("离异婚", ma)) {
+ ma = "离婚";
+ } else if (Objects.equals("分", ma)) {
+ ma = "分居";
+ }
+
+ return ma;
+ }
+
+ private String convertRelation(String ra) {
+ if (ra.contains("户主")) {
+ ra = "户主";
+ } else if (Objects.equals(ra, "女儿")) {
+ ra = "女";
+ } else if (Objects.equals(ra, "儿子") || Objects.equals(ra, "儿")) {
+ ra = "子";
+ } else if (Objects.equals(ra, "大女")) {
+ ra = "长女";
+ } else if (Objects.equals(ra, "二女") || Objects.equals(ra, "此女")) {
+ ra = "次女";
+ } else if (Objects.equals(ra, "二子")) {
+ ra = "次子";
+ } else if (Objects.equals(ra, "长男") || ra.contains("长子")) {
+ ra = "长子";
+ } else if (Objects.equals(ra, "非亲属") || ra.contains("女友") || ra.contains("女朋友") || ra.contains("男友")
+ || ra.contains("男朋友")) {
+ ra = "其他";
+ } else if (Objects.equals(ra, "姐")) {
+ ra = "姐姐";
+ } else if (Objects.equals(ra, "户主")) {
+ ra = "本人";
+ } else if (Objects.equals(ra, "妻子") || Objects.equals(ra, "媳妇")) {
+ ra = "妻";
+ } else if (Objects.equals(ra, "哥") || Objects.equals(ra, "哥哥")) {
+ ra = "兄";
+ } else if (Objects.equals(ra, "丈夫")) {
+ ra = "夫";
+ } else if (Objects.equals(ra, "丈母娘")) {
+ ra = "岳母";
+ } else if (Objects.equals(ra, "继子") || Objects.equals(ra, "养子")) {
+ ra = "养子或继子";
+ } else if (Objects.equals(ra, "继女") || Objects.equals(ra, "养女")) {
+ ra = "养女或继女";
+ } else if (ra.contains("儿媳") || ra.contains("长媳")) {
+ ra = "儿媳";
+ } else if (Objects.equals(ra, "三姨") || Objects.equals(ra, "姨姨")) {
+ ra = "姨母";
+ } else if (Objects.equals(ra, "二外孙女")) {
+ ra = "外孙女";
+ } else if (Objects.equals(ra, "外孙")) {
+ ra = "外孙子";
+ } else if (Objects.equals(ra, "侄儿")) {
+ ra = "侄子";
+ } else if (ra.contains("表")) {
+ ra = "表兄弟、表姐妹";
+ } else if (Objects.equals(ra, "继父") || Objects.equals(ra, "养父")) {
+ ra = "继父或养父";
+ } else if (Objects.equals(ra, "父")) {
+ ra = "父亲";
+ } else if (Objects.equals(ra, "弟弟")) {
+ ra = "弟";
+ } else if (Objects.equals(ra, "孙")) {
+ ra = "孙子";
+ } else if (Objects.equals(ra, "孙媳妇") || Objects.equals(ra, "外孙媳妇")) {
+ ra = "孙媳妇或外孙媳妇";
+ } else if (Objects.equals(ra, "妹")) {
+ ra = "妹妹";
+ } else if (Objects.equals(ra, "祖父母")) {
+ ra = "祖父母或外祖父母";
+ } else if (Objects.equals(ra, "姐妹") || Objects.equals(ra, "兄弟")) {
+ ra = "兄弟姐妹";
+ } else if (Objects.equals(ra, "其他姐妹") || Objects.equals(ra, "其他兄弟")) {
+ ra = "其他兄弟姐妹";
+ } else if (Objects.equals(ra, "奶奶")) {
+ ra = "祖母";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (ra.contains("堂")) {
+ ra = "堂兄弟、堂姐妹";
+ }
+
+ return ra;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationPensionExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationPensionExcelListen.java
new file mode 100644
index 0000000..509aad4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationPensionExcelListen.java
@@ -0,0 +1,468 @@
+package com.panzhihua.common.listen;
+
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.BcDictionaryConstants;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.enums.*;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngPopulationPensionExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationPensionMistakeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.PayUtil;
+import com.panzhihua.common.utlis.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * title: ComMngPopulationPensionExcelListen 养老金人员导入监听
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 养老金人员导入监听
+ *
+ * @author txb
+ * @date 2021/9/01 15:12
+ */
+@Slf4j
+public class ComMngPopulationPensionExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComMngPopulationPensionExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
+ log.info("开始导入养老金人员数据");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("100", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.PENSION_POPULATION_ERROR_LIST + + communityId;
+
+ Map<String, String> dictMap = dictionaryR.getData().stream()
+ .collect(Collectors.toMap(BcDictionaryVO::getDictName, BcDictionaryVO::getDictValue));
+ // Map<String,Integer> dictMap = new HashMap<>();
+ // for(BcDictionaryVO vo : dictionaryR.getData()){
+ // dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
+ // }
+
+ int index = 2;
+ try {
+ String[] parsePatterns = new String[] {"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd",
+ "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d"};
+ ArrayList<ComMngPopulationPensionExcelVO> voList = Lists.newArrayList();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ArrayList<ComMngPopulationPensionMistakeExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComMngPopulationPensionExcelVO vo = new ComMngPopulationPensionExcelVO();
+ if (StringUtils.isEmpty(oneData.get(0))) {
+ ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
+ index++;
+ setPensionMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(0));
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
+ index++;
+ setPensionMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
+
+ // 判断身份证号码位数
+ if (oneData.get(1).length() != 18) {
+ ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
+ index++;
+ setPensionMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(1).toUpperCase());
+ // 根据身份证号码解析年龄以及性别
+ // 获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if (StringUtils.isNotEmpty(birthday)) {
+ String year = birthday.substring(0, 4);
+ String month = birthday.substring(4, 6);
+ String day = birthday.substring(6, 8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
+ // //设置用户年龄
+ // vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
+ // 获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if (sex % 2 == 1) {
+ vo.setSex(PopulSexEnum.nan.getCode());
+ } else {
+ vo.setSex(PopulSexEnum.nv.getCode());
+ }
+
+ if (StringUtils.isNotEmpty(oneData.get(2))) {
+ vo.setNation(oneData.get(2));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(3))) {
+ Integer isOk = PopulPoliticalOutlookEnum.getCodeByName(oneData.get(3));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
+ setPensionMistake(oneData, mistake);
+ mistake.setMistake("您填写的政治面貌有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setPoliticalOutlook(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(4))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(4));
+ if (isOk.equals(-1)) {
+ ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
+ index++;
+ setPensionMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否租住有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRent(isOk);
+ } else {
+ vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isEmpty(oneData.get(5))) {
+ index++;
+ ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
+ setPensionMistake(oneData, mistake);
+ mistake.setMistake("街路巷不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setRoad(oneData.get(5));
+ if (StringUtils.isEmpty(oneData.get(6))) {
+ index++;
+ ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
+ setPensionMistake(oneData, mistake);
+ mistake.setMistake("小区号不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setDoorNo(oneData.get(6).trim());
+ // if(StringUtils.isEmpty(oneData.get(7))){
+ // index++;
+ // ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
+ // setPensionMistake(oneData, mistake);
+ // mistake.setMistake("楼排号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(7))) {
+ vo.setFloor(oneData.get(7).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(8))){
+ // index++;
+ // ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
+ // setPensionMistake(oneData, mistake);
+ // mistake.setMistake("单元号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(8))) {
+ vo.setUnitNo(oneData.get(8).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(9))){
+ // index++;
+ // ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
+ // setPensionMistake(oneData, mistake);
+ // mistake.setMistake("户室不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(9))) {
+ vo.setHouseNo(oneData.get(9).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(10))) {
+ Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(10).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
+ setPensionMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHouseStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(11))) {
+ Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(11).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
+ setPensionMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋用途有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHousePurpose(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(12))) {
+ Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(12));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
+ setPensionMistake(oneData, mistake);
+ mistake.setMistake("您填写的管控状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setControlStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(13))) {
+ vo.setPhone(oneData.get(13).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(14))) {
+ vo.setNativePlace(oneData.get(14).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(15))) {
+ Integer isOk = PopulCultureLevelEnum.getCodeByName(oneData.get(15));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
+ setPensionMistake(oneData, mistake);
+ mistake.setMistake("您填写的文化程度有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCultureLevel(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(16))) {
+ Integer isOk = PopulMarriageEnum.getCodeByName(oneData.get(16));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
+ setPensionMistake(oneData, mistake);
+ mistake.setMistake("您填写的婚姻状况有误");
+ mistakes.add(mistake);
+ continue;
+ } else {
+ vo.setMarriage(isOk);
+ }
+ }
+ if (StringUtils.isNotEmpty(oneData.get(17))) {
+ vo.setHealthy(oneData.get(17).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(18))) {
+ Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(18));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
+ setPensionMistake(oneData, mistake);
+ mistake.setMistake("您填写的本地/外地有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setOutOrLocal(isOk);
+ } else {
+ vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(19))) {
+ vo.setCensusRegister(oneData.get(19).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(20))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(20));
+ if (isOk.equals(-1)) {
+ ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
+ index++;
+ setPensionMistake(oneData, mistake);
+ mistake.setMistake("您填写的养老登记（是/否）有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRegister(isOk);
+ } else {
+ vo.setIsRegister(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(21))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(21));
+ if (isOk.equals(-1)) {
+ ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
+ index++;
+ setPensionMistake(oneData, mistake);
+ mistake.setMistake("您填写的健在（是/否）有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsAlive(isOk);
+ } else {
+ vo.setIsAlive(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(22))) {
+ vo.setReceiveAllowanceBegin(DateUtil.parse(oneData.get(22).trim(), parsePatterns));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(23))) {
+ vo.setNowAddress(oneData.get(23).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(24))) {
+ vo.setRemark(oneData.get(24).trim());
+ }
+ vo.getUserTagStr().add("养老金人员");
+ for (int i = 25; i < headSize; i++) {
+ if (oneData.get(i) != null && oneData.get(i).equals("是")) {
+ vo.getUserTagStr().add(headData.get(i).substring(0, headData.get(i).indexOf("(")));
+ }
+ }
+ // 将重复的数据进行MD5加密实现去重
+ String distinct = vo.getName() + vo.getCardNo() + vo.getRoad() + vo.getDoorNo() + vo.getFloor()
+ + vo.getUnitNo() + vo.getHouseNo();
+ try {
+ String distinctPass = PayUtil.MD5(distinct);
+ if (StringUtils.isNotEmpty(distinctPass)) {
+ vo.setDistinctPass(distinctPass);
+ }
+ } catch (Exception e) {
+ log.error("组装MD5加密字段失败，数据表格行数：" + index);
+ continue;
+ }
+ voList.add(vo);
+ index++;
+ }
+ // 客户需要暂时注释，等客户处理完成需要恢复
+ // if(populationImportErrorVOList.isEmpty()){
+ // R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
+ // if (!R.isOk(r)) {
+ // throw new ServiceException(r.getMsg());
+ // }
+ // }else{
+ // throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ // }
+ // 根据list中的IdCard城市来去重
+ List<ComMngPopulationPensionExcelVO> newVoList =
+ voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationPensionExcelVO::getDistinctPass))
+ .collect(Collectors.toList());
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.listSavePopulationPensionExcelVO(newVoList, communityId, userId);
+ log.info("业务层处理逻辑完成");
+ if (!R.isOk(r)) {
+ log.info("业务层处理成功");
+ List<ComMngPopulationPensionMistakeExcelVO> list =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComMngPopulationPensionMistakeExcelVO.class);
+ // String errMsg = r.getMsg();
+ // List<ComMngPopulationImportErrorVO> errorList =
+ // JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
+ // if(!errorList.isEmpty()){
+ // populationImportErrorVOList.addAll(errorList);
+ // }
+ mistakes.addAll(list);
+ log.info("将错误数据存入redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", key);
+ } else {
+ log.info("业务层处理逻辑失败");
+ if (!mistakes.isEmpty()) {
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
+ throw new ServiceException("500", key);
+ }
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行");
+ // importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+ // populationImportErrorVOList.add(importErrorVO);
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ }
+ }
+
+ private void setPensionMistake(Map<Integer, String> map, ComMngPopulationPensionMistakeExcelVO vo) {
+ vo.setName(map.get(0));
+ vo.setCardNo(map.get(1));
+ vo.setNation(map.get(2));
+ vo.setPoliticalOutlook(map.get(3));
+ vo.setIsRent(map.get(4));
+ vo.setRoad(map.get(5));
+ vo.setDoorNo(map.get(6));
+ vo.setFloor(map.get(7));
+ vo.setUnitNo(map.get(8));
+ vo.setHouseNo(map.get(9));
+ vo.setHouseStatus(map.get(10));
+ vo.setHousePurpose(map.get(11));
+ vo.setControlStatus(map.get(12));
+ vo.setPhone(map.get(13));
+ vo.setNativePlace(map.get(14));
+ vo.setCultureLevel(map.get(15));
+ vo.setMarriage(map.get(16));
+ vo.setHealthy(map.get(17));
+ vo.setOutOrLocal(map.get(18));
+ vo.setCensusRegister(map.get(19));
+ vo.setIsRegister(map.get(20));
+ vo.setIsAlive(map.get(21));
+ vo.setReceiveAllowanceBegin(map.get(22));
+ vo.setNowAddress(map.get(23));
+ vo.setRemark(map.get(24));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java
new file mode 100644
index 0000000..7b7a1da
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java
@@ -0,0 +1,658 @@
+package com.panzhihua.common.listen;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.BcDictionaryConstants;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.enums.*;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngPopulationRehabilitationExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationRehabilitationMistakeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.PayUtil;
+import com.panzhihua.common.utlis.StringUtils;
+
+import cn.hutool.core.date.DateException;
+import cn.hutool.core.date.DateUtil;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 刑释人员导入监听
+ * @author: txb
+ */
+@Slf4j
+public class ComMngPopulationRehabilitationExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComMngPopulationRehabilitationExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
+ log.info("开始导入刑释人员数据");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("000", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.REHABILITATION_POPULATION_ERROR_LIST;
+
+ Map<String, String> dictMap = dictionaryR.getData().stream()
+ .collect(Collectors.toMap(BcDictionaryVO::getDictName, BcDictionaryVO::getDictValue));
+ // Map<String,Integer> dictMap = new HashMap<>();
+ // for(BcDictionaryVO vo : dictionaryR.getData()){
+ // dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
+ // }
+
+ int index = 2;
+ try {
+ String[] parsePatterns = new String[] {"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd",
+ "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d"};
+ ArrayList<ComMngPopulationRehabilitationExcelVO> voList = Lists.newArrayList();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ArrayList<ComMngPopulationRehabilitationMistakeExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComMngPopulationRehabilitationExcelVO vo = new ComMngPopulationRehabilitationExcelVO();
+ if (StringUtils.isNotEmpty(oneData.get(0))) {
+ vo.setSerialNumber(oneData.get(0));
+ }
+ // 姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ ComMngPopulationRehabilitationMistakeExcelVO mistake =
+ new ComMngPopulationRehabilitationMistakeExcelVO();
+ index++;
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(1));
+ if (StringUtils.isEmpty(oneData.get(3))) {
+ ComMngPopulationRehabilitationMistakeExcelVO mistake =
+ new ComMngPopulationRehabilitationMistakeExcelVO();
+ index++;
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
+
+ // 判断身份证号码位数
+ if (oneData.get(3).length() != 18) {
+ ComMngPopulationRehabilitationMistakeExcelVO mistake =
+ new ComMngPopulationRehabilitationMistakeExcelVO();
+ index++;
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(3).toUpperCase());
+ // 根据身份证号码解析年龄以及性别
+ // 获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if (StringUtils.isNotEmpty(birthday)) {
+ String year = birthday.substring(0, 4);
+ String month = birthday.substring(4, 6);
+ String day = birthday.substring(6, 8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
+ // //设置用户年龄
+ // vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
+ // 获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if (sex % 2 == 1) {
+ vo.setSex(PopulSexEnum.nan.getCode());
+ } else {
+ vo.setSex(PopulSexEnum.nv.getCode());
+ }
+
+ if (StringUtils.isNotEmpty(oneData.get(2))) {
+ vo.setNation(oneData.get(2));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(4))) {
+ vo.setPhone(oneData.get(4));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(5))) {
+ vo.setNativePlace(oneData.get(5));
+ }
+ if (StringUtils.isEmpty(oneData.get(6))) {
+ index++;
+ ComMngPopulationRehabilitationMistakeExcelVO mistake =
+ new ComMngPopulationRehabilitationMistakeExcelVO();
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("街路巷不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setRoad(oneData.get(6));
+ if (StringUtils.isEmpty(oneData.get(7))) {
+ index++;
+ ComMngPopulationRehabilitationMistakeExcelVO mistake =
+ new ComMngPopulationRehabilitationMistakeExcelVO();
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("小区号不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setDoorNo(oneData.get(7).trim());
+ // if(StringUtils.isEmpty(oneData.get(8))){
+ // index++;
+ // ComMngPopulationRehabilitationMistakeExcelVO mistake = new
+ // ComMngPopulationRehabilitationMistakeExcelVO();
+ // setRehabilitationMistake(oneData, mistake);
+ // mistake.setMistake("楼排号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(8))) {
+ vo.setFloor(oneData.get(8).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(9))){
+ // index++;
+ // ComMngPopulationRehabilitationMistakeExcelVO mistake = new
+ // ComMngPopulationRehabilitationMistakeExcelVO();
+ // setRehabilitationMistake(oneData, mistake);
+ // mistake.setMistake("单元号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(9))) {
+ vo.setUnitNo(oneData.get(9).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(10))){
+ // index++;
+ // ComMngPopulationRehabilitationMistakeExcelVO mistake = new
+ // ComMngPopulationRehabilitationMistakeExcelVO();
+ // setRehabilitationMistake(oneData, mistake);
+ // mistake.setMistake("户室不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(10))) {
+ vo.setHouseNo(oneData.get(10).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(11))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(11));
+ if (isOk.equals(-1)) {
+ ComMngPopulationRehabilitationMistakeExcelVO mistake =
+ new ComMngPopulationRehabilitationMistakeExcelVO();
+ index++;
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否租住有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRent(isOk);
+ } else {
+ vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(12))) {
+ Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(12).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationRehabilitationMistakeExcelVO mistake =
+ new ComMngPopulationRehabilitationMistakeExcelVO();
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHouseStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(13))) {
+ Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(13).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationRehabilitationMistakeExcelVO mistake =
+ new ComMngPopulationRehabilitationMistakeExcelVO();
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋用途有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHousePurpose(PopulHousePurposeEnum.getCodeByName(oneData.get(13).trim()));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(14))) {
+ Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(14));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationRehabilitationMistakeExcelVO mistake =
+ new ComMngPopulationRehabilitationMistakeExcelVO();
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("您填写的管控状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setControlStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(15))) {
+ Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(15));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationRehabilitationMistakeExcelVO mistake =
+ new ComMngPopulationRehabilitationMistakeExcelVO();
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("您填写的本地/外地有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setOutOrLocal(isOk);
+ } else {
+ vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(16))) {
+ vo.setCensusRegister(oneData.get(16).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(17))) {
+ vo.setMainRelatives(oneData.get(17).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(18))) {
+// Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(18));
+// if (isOk.equals(-1)) {
+// index++;
+// ComMngPopulationRehabilitationMistakeExcelVO mistake =
+// new ComMngPopulationRehabilitationMistakeExcelVO();
+// setRehabilitationMistake(oneData, mistake);
+// mistake.setMistake("您填写的与人员关系有误");
+// mistakes.add(mistake);
+// continue;
+// }
+ vo.setPatientRelation(oneData.get(18).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(19))) {
+ vo.setRehabReasonAndType(oneData.get(19).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(20))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(20));
+ if (isOk.equals(-1)) {
+ ComMngPopulationRehabilitationMistakeExcelVO mistake =
+ new ComMngPopulationRehabilitationMistakeExcelVO();
+ index++;
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否列管有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRehab(isOk);
+ } else {
+ vo.setIsRehab(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(21))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(21));
+ if (isOk.equals(-1)) {
+ ComMngPopulationRehabilitationMistakeExcelVO mistake =
+ new ComMngPopulationRehabilitationMistakeExcelVO();
+ index++;
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否累惯犯有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRecidivist(isOk);
+ } else {
+ vo.setIsRecidivist(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(22))) {
+ vo.setOriginalTerm(oneData.get(22).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(23))) {
+ vo.setSentenceBegin(DateUtil.parse(oneData.get(23).trim(), parsePatterns));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(24))) {
+ vo.setOriginalCharge(oneData.get(24).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(25))) {
+ vo.setSentenceEnd(DateUtil.parse(oneData.get(25).trim(), parsePatterns));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(26))) {
+ vo.setSentencePlace(oneData.get(26).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(27))) {
+ vo.setRiskAssessment(oneData.get(27).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(28))) {
+ vo.setJoinDate(DateUtil.parse(oneData.get(28).trim(), parsePatterns));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(29))) {
+ vo.setJoinSituation(oneData.get(29).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(30))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(30));
+ if (isOk.equals(-1)) {
+ ComMngPopulationRehabilitationMistakeExcelVO mistake =
+ new ComMngPopulationRehabilitationMistakeExcelVO();
+ index++;
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否重新犯罪有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsAgainCrime(isOk);
+ } else {
+ vo.setIsAgainCrime(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(31))) {
+ vo.setAgainCrimeName(oneData.get(31).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(32))) {
+ vo.setPlaceSituation(oneData.get(32).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(33))) {
+ vo.setPlaceDate(DateUtil.parse(oneData.get(33).trim(), parsePatterns));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(34))) {
+ vo.setNotPlaceReason(oneData.get(34).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(35))) {
+ try {
+ vo.setHelpBegin(DateUtil.parse(oneData.get(35).trim(), parsePatterns));
+ } catch (DateException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ ComMngPopulationRehabilitationMistakeExcelVO mistake =
+ new ComMngPopulationRehabilitationMistakeExcelVO();
+ index++;
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("您填写的帮教开始日期有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ }
+ if (StringUtils.isNotEmpty(oneData.get(36))) {
+ try {
+ vo.setHelpEnd(DateUtil.parse(oneData.get(36).trim(), parsePatterns));
+ } catch (DateException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ ComMngPopulationRehabilitationMistakeExcelVO mistake =
+ new ComMngPopulationRehabilitationMistakeExcelVO();
+ index++;
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("您填写的帮教结束日期有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ }
+ if (StringUtils.isNotEmpty(oneData.get(37))) {
+ vo.setHelpSituation(oneData.get(37).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(38))) {
+ vo.setRemark(oneData.get(38).trim());
+ }
+ vo.getUserTagStr().add("刑满释放");
+ for (int i = 39; i < headSize; i++) {
+ if (oneData.get(i) != null && oneData.get(i).equals("是")) {
+ vo.getUserTagStr().add(headData.get(i).substring(0, headData.get(i).indexOf("(")));
+ }
+ }
+ // 将重复的数据进行MD5加密实现去重
+ String distinct = vo.getName() + vo.getCardNo() + vo.getRoad() + vo.getDoorNo() + vo.getFloor()
+ + vo.getUnitNo() + vo.getHouseNo();
+ try {
+ String distinctPass = PayUtil.MD5(distinct);
+ if (StringUtils.isNotEmpty(distinctPass)) {
+ vo.setDistinctPass(distinctPass);
+ }
+ } catch (Exception e) {
+ log.error("组装MD5加密字段失败，数据表格行数：" + index);
+ continue;
+ }
+ voList.add(vo);
+ index++;
+ }
+ // 客户需要暂时注释，等客户处理完成需要恢复
+ // if(populationImportErrorVOList.isEmpty()){
+ // R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
+ // if (!R.isOk(r)) {
+ // throw new ServiceException(r.getMsg());
+ // }
+ // }else{
+ // throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ // }
+ // 根据list中的IdCard城市来去重
+ List<ComMngPopulationRehabilitationExcelVO> newVoList =
+ voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationRehabilitationExcelVO::getDistinctPass))
+ .collect(Collectors.toList());
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.listSavePopulationRehabilitationExcelVO(newVoList, communityId, userId);
+ log.info("业务层处理逻辑完成");
+ if (!R.isOk(r)) {
+ log.info("业务层处理成功");
+ List<ComMngPopulationRehabilitationMistakeExcelVO> list = JSONArray.parseArray(
+ JSONArray.toJSONString(r.getData()), ComMngPopulationRehabilitationMistakeExcelVO.class);
+ // String errMsg = r.getMsg();
+ // List<ComMngPopulationImportErrorVO> errorList =
+ // JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
+ // if(!errorList.isEmpty()){
+ // populationImportErrorVOList.addAll(errorList);
+ // }
+ mistakes.addAll(list);
+ log.info("将错误数据存入redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", key);
+ } else {
+ log.info("业务层处理逻辑失败");
+ if (!mistakes.isEmpty()) {
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
+ throw new ServiceException("500", key);
+ }
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行");
+ // importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+ // populationImportErrorVOList.add(importErrorVO);
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ }
+ }
+
+ private void setRehabilitationMistake(Map<Integer, String> map, ComMngPopulationRehabilitationMistakeExcelVO vo) {
+ vo.setSerialNumber(map.get(0));
+ vo.setName(map.get(1));
+ vo.setCardNo(map.get(3));
+ vo.setNation(map.get(2));
+ vo.setPhone(map.get(4));
+ vo.setNativePlace(map.get(5));
+ vo.setRoad(map.get(6));
+ vo.setDoorNo(map.get(7));
+ vo.setFloor(map.get(8));
+ vo.setUnitNo(map.get(9));
+ vo.setHouseNo(map.get(10));
+ vo.setIsRent(map.get(11));
+ vo.setHouseStatus(map.get(12));
+ vo.setHousePurpose(map.get(13));
+ vo.setControlStatus(map.get(14));
+ vo.setOutOrLocal(map.get(15));
+ vo.setCensusRegister(map.get(16));
+ vo.setMainRelatives(map.get(17));
+ vo.setPatientRelation(map.get(18));
+ vo.setRehabReasonAndType(map.get(19));
+ vo.setIsRehab(map.get(20));
+ vo.setIsRecidivist(map.get(21));
+ vo.setOriginalTerm(map.get(22));
+ vo.setSentenceBegin(map.get(23));
+ vo.setOriginalCharge(map.get(24));
+ vo.setSentenceEnd(map.get(25));
+ vo.setSentencePlace(map.get(26));
+ vo.setRiskAssessment(map.get(27));
+ vo.setJoinDate(map.get(28));
+ vo.setJoinSituation(map.get(29));
+ vo.setIsAgainCrime(map.get(30));
+ vo.setAgainCrimeName(map.get(31));
+ vo.setPlaceSituation(map.get(32));
+ vo.setPlaceDate(map.get(33));
+ vo.setNotPlaceReason(map.get(34));
+ vo.setHelpBegin(map.get(35));
+ vo.setHelpEnd(map.get(36));
+ vo.setHelpSituation(map.get(37));
+ vo.setRemark(map.get(38));
+ }
+
+ private String convertMarriage(String ma) {
+
+ if (Objects.equals("已", ma) || Objects.equals("一", ma)) {
+ ma = "已婚";
+ } else if (Objects.equals("未", ma) || Objects.equals("未婚婚", ma)) {
+ ma = "未婚";
+ } else if (Objects.equals("初", ma)) {
+ ma = "初婚";
+ } else if (Objects.equals("再", ma)) {
+ ma = "再婚";
+ } else if (Objects.equals("复", ma)) {
+ ma = "复婚";
+ } else if (Objects.equals("丧", ma) || Objects.equals("丧偶偶", ma)) {
+ ma = "丧偶";
+ } else if (Objects.equals("离", ma) || Objects.equals("离异", ma) || Objects.equals("离异婚", ma)) {
+ ma = "离婚";
+ } else if (Objects.equals("分", ma)) {
+ ma = "分居";
+ }
+
+ return ma;
+ }
+
+ private String convertRelation(String ra) {
+ if (ra.contains("户主")) {
+ ra = "户主";
+ } else if (Objects.equals(ra, "女儿")) {
+ ra = "女";
+ } else if (Objects.equals(ra, "儿子") || Objects.equals(ra, "儿")) {
+ ra = "子";
+ } else if (Objects.equals(ra, "大女")) {
+ ra = "长女";
+ } else if (Objects.equals(ra, "二女") || Objects.equals(ra, "此女")) {
+ ra = "次女";
+ } else if (Objects.equals(ra, "二子")) {
+ ra = "次子";
+ } else if (Objects.equals(ra, "长男") || ra.contains("长子")) {
+ ra = "长子";
+ } else if (Objects.equals(ra, "非亲属") || ra.contains("女友") || ra.contains("女朋友") || ra.contains("男友")
+ || ra.contains("男朋友")) {
+ ra = "其他";
+ } else if (Objects.equals(ra, "姐")) {
+ ra = "姐姐";
+ } else if (Objects.equals(ra, "户主")) {
+ ra = "本人";
+ } else if (Objects.equals(ra, "妻子") || Objects.equals(ra, "媳妇")) {
+ ra = "妻";
+ } else if (Objects.equals(ra, "哥") || Objects.equals(ra, "哥哥")) {
+ ra = "兄";
+ } else if (Objects.equals(ra, "丈夫")) {
+ ra = "夫";
+ } else if (Objects.equals(ra, "丈母娘")) {
+ ra = "岳母";
+ } else if (Objects.equals(ra, "继子") || Objects.equals(ra, "养子")) {
+ ra = "养子或继子";
+ } else if (Objects.equals(ra, "继女") || Objects.equals(ra, "养女")) {
+ ra = "养女或继女";
+ } else if (ra.contains("儿媳") || ra.contains("长媳")) {
+ ra = "儿媳";
+ } else if (Objects.equals(ra, "三姨") || Objects.equals(ra, "姨姨")) {
+ ra = "姨母";
+ } else if (Objects.equals(ra, "二外孙女")) {
+ ra = "外孙女";
+ } else if (Objects.equals(ra, "外孙")) {
+ ra = "外孙子";
+ } else if (Objects.equals(ra, "侄儿")) {
+ ra = "侄子";
+ } else if (ra.contains("表")) {
+ ra = "表兄弟、表姐妹";
+ } else if (Objects.equals(ra, "继父") || Objects.equals(ra, "养父")) {
+ ra = "继父或养父";
+ } else if (Objects.equals(ra, "父")) {
+ ra = "父亲";
+ } else if (Objects.equals(ra, "弟弟")) {
+ ra = "弟";
+ } else if (Objects.equals(ra, "孙")) {
+ ra = "孙子";
+ } else if (Objects.equals(ra, "孙媳妇") || Objects.equals(ra, "外孙媳妇")) {
+ ra = "孙媳妇或外孙媳妇";
+ } else if (Objects.equals(ra, "妹")) {
+ ra = "妹妹";
+ } else if (Objects.equals(ra, "祖父母")) {
+ ra = "祖父母或外祖父母";
+ } else if (Objects.equals(ra, "姐妹") || Objects.equals(ra, "兄弟")) {
+ ra = "兄弟姐妹";
+ } else if (Objects.equals(ra, "其他姐妹") || Objects.equals(ra, "其他兄弟")) {
+ ra = "其他兄弟姐妹";
+ } else if (Objects.equals(ra, "奶奶")) {
+ ra = "祖母";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (ra.contains("堂")) {
+ ra = "堂兄弟、堂姐妹";
+ }
+
+ return ra;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationSentenceExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationSentenceExcelListen.java
new file mode 100644
index 0000000..797d189
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationSentenceExcelListen.java
@@ -0,0 +1,519 @@
+package com.panzhihua.common.listen;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.BcDictionaryConstants;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.enums.*;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngPopulationSentenceExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationSentenceMistakeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.PayUtil;
+import com.panzhihua.common.utlis.StringUtils;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 服刑人员导入监听
+ * @author: txb
+ */
+@Slf4j
+public class ComMngPopulationSentenceExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComMngPopulationSentenceExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
+ log.info("开始导入服刑人员数据");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("000", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String Sentence = Constants.SENTENCE_POPULATION_ERROR_LIST;
+
+ Map<String, String> dictMap = dictionaryR.getData().stream()
+ .collect(Collectors.toMap(BcDictionaryVO::getDictName, BcDictionaryVO::getDictValue));
+ // Map<String,Integer> dictMap = new HashMap<>();
+ // for(BcDictionaryVO vo : dictionaryR.getData()){
+ // dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
+ // }
+
+ int index = 2;
+ try {
+ ArrayList<ComMngPopulationSentenceExcelVO> voList = Lists.newArrayList();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ArrayList<ComMngPopulationSentenceMistakeExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComMngPopulationSentenceExcelVO vo = new ComMngPopulationSentenceExcelVO();
+ if (StringUtils.isNotEmpty(oneData.get(0))) {
+ vo.setSerialNumber(oneData.get(0));
+ }
+ // 姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
+ index++;
+ setSentenceMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(1));
+ if (StringUtils.isEmpty(oneData.get(3))) {
+ ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
+ index++;
+ setSentenceMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
+
+ // 判断身份证号码位数
+ if (oneData.get(3).length() != 18) {
+ ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
+ index++;
+ setSentenceMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(3).toUpperCase());
+ // 根据身份证号码解析年龄以及性别
+ // 获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if (StringUtils.isNotEmpty(birthday)) {
+ String year = birthday.substring(0, 4);
+ String month = birthday.substring(4, 6);
+ String day = birthday.substring(6, 8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
+ // //设置用户年龄
+ // vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
+ // 获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if (sex % 2 == 1) {
+ vo.setSex(PopulSexEnum.nan.getCode());
+ } else {
+ vo.setSex(PopulSexEnum.nv.getCode());
+ }
+
+ if (StringUtils.isNotEmpty(oneData.get(2))) {
+ vo.setNation(oneData.get(2));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(4))) {
+ vo.setPhone(oneData.get(4));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(5))) {
+ vo.setSpouse(oneData.get(5));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(6))) {
+ vo.setProfession(oneData.get(6));
+ }
+ if (StringUtils.isEmpty(oneData.get(7))) {
+ index++;
+ ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
+ setSentenceMistake(oneData, mistake);
+ mistake.setMistake("街路巷不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setRoad(oneData.get(7));
+ if (StringUtils.isEmpty(oneData.get(8))) {
+ index++;
+ ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
+ setSentenceMistake(oneData, mistake);
+ mistake.setMistake("小区号不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setDoorNo(oneData.get(8).trim());
+ // if(StringUtils.isEmpty(oneData.get(9))){
+ // index++;
+ // ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
+ // setSentenceMistake(oneData, mistake);
+ // mistake.setMistake("楼排号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(9))) {
+ vo.setFloor(oneData.get(9).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(10))){
+ // index++;
+ // ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
+ // setSentenceMistake(oneData, mistake);
+ // mistake.setMistake("单元号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(10))) {
+ vo.setUnitNo(oneData.get(10).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(11))){
+ // index++;
+ // ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
+ // setSentenceMistake(oneData, mistake);
+ // mistake.setMistake("户室不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(11))) {
+ vo.setHouseNo(oneData.get(11).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(12))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(12));
+ if (isOk.equals(-1)) {
+ ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
+ index++;
+ setSentenceMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否租住有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRent(isOk);
+ } else {
+ vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(13))) {
+ Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(13).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
+ setSentenceMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHouseStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(14))) {
+ Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(14).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
+ setSentenceMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋用途有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHousePurpose(PopulHousePurposeEnum.getCodeByName(oneData.get(14).trim()));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(15))) {
+ Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(15));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
+ setSentenceMistake(oneData, mistake);
+ mistake.setMistake("您填写的管控状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setControlStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(16))) {
+ Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(16));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
+ setSentenceMistake(oneData, mistake);
+ mistake.setMistake("您填写的本地/外地有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setOutOrLocal(isOk);
+ } else {
+ vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(17))) {
+ vo.setCensusRegister(oneData.get(17).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(18))) {
+ vo.setSentencePlace(oneData.get(18).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(19))) {
+ vo.setSentenceBegin(new SimpleDateFormat("yyyy-MM-dd").parse(oneData.get(19)));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(20))) {
+ vo.setSentenceEnd(new SimpleDateFormat("yyyy-MM-dd").parse(oneData.get(20)));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(21))) {
+ vo.setCharge(oneData.get(21).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(22))) {
+ vo.setRemark(oneData.get(22).trim());
+ }
+ vo.getUserTagStr().add("刑满释放");
+ for (int i = 23; i < headSize; i++) {
+ if (oneData.get(i) != null && oneData.get(i).equals("是")) {
+ vo.getUserTagStr().add(headData.get(i).substring(0, headData.get(i).indexOf("(")));
+ }
+ }
+ // 将重复的数据进行MD5加密实现去重
+ String distinct = vo.getName() + vo.getCardNo() + vo.getRoad() + vo.getDoorNo() + vo.getFloor()
+ + vo.getUnitNo() + vo.getHouseNo();
+ try {
+ String distinctPass = PayUtil.MD5(distinct);
+ if (StringUtils.isNotEmpty(distinctPass)) {
+ vo.setDistinctPass(distinctPass);
+ }
+ } catch (Exception e) {
+ log.error("组装MD5加密字段失败，数据表格行数：" + index);
+ continue;
+ }
+ voList.add(vo);
+ index++;
+ }
+ // 客户需要暂时注释，等客户处理完成需要恢复
+ // if(populationImportErrorVOList.isEmpty()){
+ // R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
+ // if (!R.isOk(r)) {
+ // throw new ServiceException(r.getMsg());
+ // }
+ // }else{
+ // throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ // }
+ // 根据list中的IdCard城市来去重
+ List<ComMngPopulationSentenceExcelVO> newVoList =
+ voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationSentenceExcelVO::getDistinctPass))
+ .collect(Collectors.toList());
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.listSavePopulationSentenceExcelVO(newVoList, communityId, userId);
+ log.info("业务层处理逻辑完成");
+ if (!R.isOk(r)) {
+ log.info("业务层处理成功");
+ List<ComMngPopulationSentenceMistakeExcelVO> list = JSONArray
+ .parseArray(JSONArray.toJSONString(r.getData()), ComMngPopulationSentenceMistakeExcelVO.class);
+ // String errMsg = r.getMsg();
+ // List<ComMngPopulationImportErrorVO> errorList =
+ // JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
+ // if(!errorList.isEmpty()){
+ // populationImportErrorVOList.addAll(errorList);
+ // }
+ mistakes.addAll(list);
+ log.info("将错误数据存入redis中");
+ valueOperations.set(Sentence, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", Sentence);
+ } else {
+ log.info("业务层处理逻辑失败");
+ if (!mistakes.isEmpty()) {
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
+ valueOperations.set(Sentence, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
+ throw new ServiceException("500", Sentence);
+ }
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行");
+ // importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+ // populationImportErrorVOList.add(importErrorVO);
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ } catch (ParseException e1) {
+ log.info("处理数据时失败2");
+ e1.printStackTrace();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行");
+ // importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+ // populationImportErrorVOList.add(importErrorVO);
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ }
+ }
+
+ private void setSentenceMistake(Map<Integer, String> map, ComMngPopulationSentenceMistakeExcelVO vo) {
+ vo.setSerialNumber(map.get(0));
+ vo.setName(map.get(1));
+ vo.setCardNo(map.get(3));
+ vo.setNation(map.get(2));
+ vo.setPhone(map.get(4));
+ vo.setSpouse(map.get(5));
+ vo.setProfession(map.get(6));
+ vo.setRoad(map.get(7));
+ vo.setDoorNo(map.get(8));
+ vo.setFloor(map.get(9));
+ vo.setUnitNo(map.get(10));
+ vo.setHouseNo(map.get(11));
+ vo.setIsRent(map.get(12));
+ vo.setHouseStatus(map.get(13));
+ vo.setHousePurpose(map.get(14));
+ vo.setControlStatus(map.get(15));
+ vo.setOutOrLocal(map.get(16));
+ vo.setCensusRegister(map.get(17));
+ vo.setSentencePlace(map.get(18));
+ vo.setSentenceBegin(map.get(19));
+ vo.setSentenceEnd(map.get(20));
+ vo.setCharge(map.get(21));
+ vo.setRemark(map.get(22));
+ }
+
+ private String convertMarriage(String ma) {
+
+ if (Objects.equals("已", ma) || Objects.equals("一", ma)) {
+ ma = "已婚";
+ } else if (Objects.equals("未", ma) || Objects.equals("未婚婚", ma)) {
+ ma = "未婚";
+ } else if (Objects.equals("初", ma)) {
+ ma = "初婚";
+ } else if (Objects.equals("再", ma)) {
+ ma = "再婚";
+ } else if (Objects.equals("复", ma)) {
+ ma = "复婚";
+ } else if (Objects.equals("丧", ma) || Objects.equals("丧偶偶", ma)) {
+ ma = "丧偶";
+ } else if (Objects.equals("离", ma) || Objects.equals("离异", ma) || Objects.equals("离异婚", ma)) {
+ ma = "离婚";
+ } else if (Objects.equals("分", ma)) {
+ ma = "分居";
+ }
+
+ return ma;
+ }
+
+ private String convertRelation(String ra) {
+ if (ra.contains("户主")) {
+ ra = "户主";
+ } else if (Objects.equals(ra, "女儿")) {
+ ra = "女";
+ } else if (Objects.equals(ra, "儿子") || Objects.equals(ra, "儿")) {
+ ra = "子";
+ } else if (Objects.equals(ra, "大女")) {
+ ra = "长女";
+ } else if (Objects.equals(ra, "二女") || Objects.equals(ra, "此女")) {
+ ra = "次女";
+ } else if (Objects.equals(ra, "二子")) {
+ ra = "次子";
+ } else if (Objects.equals(ra, "长男") || ra.contains("长子")) {
+ ra = "长子";
+ } else if (Objects.equals(ra, "非亲属") || ra.contains("女友") || ra.contains("女朋友") || ra.contains("男友")
+ || ra.contains("男朋友")) {
+ ra = "其他";
+ } else if (Objects.equals(ra, "姐")) {
+ ra = "姐姐";
+ } else if (Objects.equals(ra, "户主")) {
+ ra = "本人";
+ } else if (Objects.equals(ra, "妻子") || Objects.equals(ra, "媳妇")) {
+ ra = "妻";
+ } else if (Objects.equals(ra, "哥") || Objects.equals(ra, "哥哥")) {
+ ra = "兄";
+ } else if (Objects.equals(ra, "丈夫")) {
+ ra = "夫";
+ } else if (Objects.equals(ra, "丈母娘")) {
+ ra = "岳母";
+ } else if (Objects.equals(ra, "继子") || Objects.equals(ra, "养子")) {
+ ra = "养子或继子";
+ } else if (Objects.equals(ra, "继女") || Objects.equals(ra, "养女")) {
+ ra = "养女或继女";
+ } else if (ra.contains("儿媳") || ra.contains("长媳")) {
+ ra = "儿媳";
+ } else if (Objects.equals(ra, "三姨") || Objects.equals(ra, "姨姨")) {
+ ra = "姨母";
+ } else if (Objects.equals(ra, "二外孙女")) {
+ ra = "外孙女";
+ } else if (Objects.equals(ra, "外孙")) {
+ ra = "外孙子";
+ } else if (Objects.equals(ra, "侄儿")) {
+ ra = "侄子";
+ } else if (ra.contains("表")) {
+ ra = "表兄弟、表姐妹";
+ } else if (Objects.equals(ra, "继父") || Objects.equals(ra, "养父")) {
+ ra = "继父或养父";
+ } else if (Objects.equals(ra, "父")) {
+ ra = "父亲";
+ } else if (Objects.equals(ra, "弟弟")) {
+ ra = "弟";
+ } else if (Objects.equals(ra, "孙")) {
+ ra = "孙子";
+ } else if (Objects.equals(ra, "孙媳妇") || Objects.equals(ra, "外孙媳妇")) {
+ ra = "孙媳妇或外孙媳妇";
+ } else if (Objects.equals(ra, "妹")) {
+ ra = "妹妹";
+ } else if (Objects.equals(ra, "祖父母")) {
+ ra = "祖父母或外祖父母";
+ } else if (Objects.equals(ra, "姐妹") || Objects.equals(ra, "兄弟")) {
+ ra = "兄弟姐妹";
+ } else if (Objects.equals(ra, "其他姐妹") || Objects.equals(ra, "其他兄弟")) {
+ ra = "其他兄弟姐妹";
+ } else if (Objects.equals(ra, "奶奶")) {
+ ra = "祖母";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (ra.contains("堂")) {
+ ra = "堂兄弟、堂姐妹";
+ }
+
+ return ra;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
new file mode 100644
index 0000000..9a845a2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
@@ -0,0 +1,753 @@
+package com.panzhihua.common.listen;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.BcDictionaryConstants;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.enums.*;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngPopulationMistakeExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.PayUtil;
+import com.panzhihua.common.utlis.StringUtils;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 实有人口导入监听
+ * @author: llming
+ */
+@Slf4j
+public class ComMngPopulationServeExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 10000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComMngPopulationServeExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
+ log.info("开始导入人口数据");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("000", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.POPULATION_ERROR_LIST;
+
+ Map<String, String> dictMap = dictionaryR.getData().stream()
+ .collect(Collectors.toMap(BcDictionaryVO::getDictName, BcDictionaryVO::getDictValue));
+ // Map<String,Integer> dictMap = new HashMap<>();
+ // for(BcDictionaryVO vo : dictionaryR.getData()){
+ // dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
+ // }
+
+ int index = 2;
+ try {
+ ArrayList<ComMngPopulationServeExcelVO> voList = Lists.newArrayList();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ArrayList<ComMngPopulationMistakeExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComMngPopulationServeExcelVO vo = new ComMngPopulationServeExcelVO();
+ // 姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
+ if (StringUtils.isNotEmpty(oneData.get(0)) || StringUtils.isNotEmpty(oneData.get(1))) {
+ if (StringUtils.isEmpty(oneData.get(0))) {
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第1列");
+ // importErrorVO.setErrorMsg("名字不可为空，请填写姓名");
+ // populationImportErrorVOList.add(importErrorVO);
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(0));
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第2列"+oneData.get(1));
+ // importErrorVO.setErrorMsg("身份证号不可为空，请填写身份证号");
+ // populationImportErrorVOList.add(importErrorVO);
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证号");
+ mistakes.add(mistake);
+ continue;
+ }
+
+ // 判断身份证号码位数
+ if (oneData.get(1).length() != 18) {
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第2列"+oneData.get(1));
+ // importErrorVO.setErrorMsg("身份证号位数有误，请检查身份证号码是否正确");
+ // populationImportErrorVOList.add(importErrorVO);
+ index++;
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(1).toUpperCase());
+ // 根据身份证号码解析年龄以及性别
+ // 获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if (StringUtils.isNotEmpty(birthday)) {
+ String year = birthday.substring(0, 4);
+ String month = birthday.substring(4, 6);
+ String day = birthday.substring(6, 8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
+ // //设置用户年龄
+ // vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
+ // 获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if (sex % 2 == 1) {
+ vo.setSex(PopulSexEnum.nan.getCode());
+ } else {
+ vo.setSex(PopulSexEnum.nv.getCode());
+ }
+ }
+ if (StringUtils.isNotEmpty(oneData.get(2))) {
+ // String nation = oneData.get(2);
+ // if(!nation.contains("族")){
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第3列");
+ // importErrorVO.setErrorMsg("您填写的民族格式有误");
+ // populationImportErrorVOList.add(importErrorVO);
+ // index++;
+ // continue;
+ // }
+ vo.setNation(oneData.get(2));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(3))) {
+ vo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCodeByName(oneData.get(3)));
+ Integer isOk = PopulPoliticalOutlookEnum.getCodeByName(oneData.get(3));
+ if (isOk.equals(-1)) {
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第4列");
+ // importErrorVO.setErrorMsg("您填写的政治面貌有误");
+ // populationImportErrorVOList.add(importErrorVO);
+ index++;
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的政治面貌有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setPoliticalOutlook(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(4))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(4));
+ if (isOk.equals(-1)) {
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第5列");
+ // importErrorVO.setErrorMsg("您填写的是否租住有误");
+ // populationImportErrorVOList.add(importErrorVO);
+ index++;
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否租住有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRent(isOk);
+ } else {
+ vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(5))) {
+
+ // String ra = convertRelation(oneData.get(5));
+ //
+ // String relation = dictMap.get(ra);
+ // if(StringUtils.isEmpty(relation)){
+ //// vo.setRelationStr(ra);
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第6列");
+ // importErrorVO.setErrorMsg("您填写的与户主关系有误");
+ // populationImportErrorVOList.add(importErrorVO);
+ // index++;
+ // continue;
+ // }else{
+ // vo.setRelation(Integer.valueOf(relation));
+ // }
+ // String relation = convertMarriage(oneData.get(5));
+ Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(5));
+
+ if (isOk.equals(-1)) {
+ // vo.setMarriageStr(ma);
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第6列");
+ // importErrorVO.setErrorMsg("您填写的与户主关系有误");
+ // populationImportErrorVOList.add(importErrorVO);
+ index++;
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的与户主关系有误");
+ mistakes.add(mistake);
+ continue;
+ } else {
+ vo.setRelation(isOk);
+ }
+ }
+ if (StringUtils.isEmpty(oneData.get(6))) {
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第7列");
+ // importErrorVO.setErrorMsg("街路巷不可为空");
+ // populationImportErrorVOList.add(importErrorVO);
+ index++;
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("街路巷不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setRoad(oneData.get(6));
+ if (StringUtils.isEmpty(oneData.get(7))) {
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第8列");
+ // importErrorVO.setErrorMsg("小区号不可为空");
+ // populationImportErrorVOList.add(importErrorVO);
+ index++;
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("小区号不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setDoorNo(oneData.get(7).trim());
+ // if(StringUtils.isEmpty(oneData.get(8))){
+ //// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ //// importErrorVO.setErrorPosition("第" + index + "行，第9列");
+ //// importErrorVO.setErrorMsg("楼排号不可为空");
+ //// populationImportErrorVOList.add(importErrorVO);
+ // index++;
+ // ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ // setMistake(oneData, mistake);
+ // mistake.setMistake("楼排号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(8))) {
+ vo.setFloor(oneData.get(8).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(9))){
+ //// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ //// importErrorVO.setErrorPosition("第" + index + "行，第10列");
+ //// importErrorVO.setErrorMsg("单元号不可为空");
+ //// populationImportErrorVOList.add(importErrorVO);
+ // index++;
+ // ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ // setMistake(oneData, mistake);
+ // mistake.setMistake("单元号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(9))) {
+ vo.setUnitNo(oneData.get(9).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(10))){
+ //// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ //// importErrorVO.setErrorPosition("第" + index + "行，第11列");
+ //// importErrorVO.setErrorMsg("户室不可为空");
+ //// populationImportErrorVOList.add(importErrorVO);
+ // index++;
+ // ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ // setMistake(oneData, mistake);
+ // mistake.setMistake("户室不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(10))) {
+ vo.setHouseNo(oneData.get(10).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(11))) {
+ vo.setBuildPurpose(oneData.get(11).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(12))) {
+ vo.setBuildArea(oneData.get(12).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(13))) {
+ Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(13).trim());
+ if (isOk.equals(-1)) {
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第14列");
+ // importErrorVO.setErrorMsg("您填写的房屋状态有误");
+ // populationImportErrorVOList.add(importErrorVO);
+ index++;
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHouseStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(14))) {
+ Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(14).trim());
+ if (isOk.equals(-1)) {
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第15列");
+ // importErrorVO.setErrorMsg("您填写的房屋用途有误");
+ // populationImportErrorVOList.add(importErrorVO);
+ index++;
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋用途有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHousePurpose(PopulHousePurposeEnum.getCodeByName(oneData.get(14).trim()));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(15))) {
+ Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(15));
+ if (isOk.equals(-1)) {
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第16列");
+ // importErrorVO.setErrorMsg("您填写的管控状态有误");
+ // populationImportErrorVOList.add(importErrorVO);
+ index++;
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的管控状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setControlStatus(isOk);
+ }
+
+ if (StringUtils.isNotEmpty(oneData.get(16))) {
+ vo.setPhone(oneData.get(16).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(17))) {
+ vo.setNativePlace(oneData.get(17).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(18))) {
+ vo.setCultureLevel(PopulCultureLevelEnum.getCodeByName(oneData.get(18)));
+ Integer isOk = PopulCultureLevelEnum.getCodeByName(oneData.get(18));
+ if (isOk.equals(-1)) {
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第19列");
+ // importErrorVO.setErrorMsg("您填写的文化程度有误");
+ // populationImportErrorVOList.add(importErrorVO);
+ index++;
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的文化程度有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCultureLevel(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(19))) {
+ // String ma = convertMarriage(oneData.get(19));
+ Integer isOk = PopulMarriageEnum.getCodeByName(oneData.get(19));
+ if (isOk.equals(-1)) {
+ // vo.setMarriageStr(ma);
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第20列");
+ // importErrorVO.setErrorMsg("您填写的婚姻状况有误");
+ // populationImportErrorVOList.add(importErrorVO);
+ index++;
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的婚姻状况有误");
+ mistakes.add(mistake);
+ continue;
+ } else {
+ vo.setMarriage(isOk);
+ }
+
+ }
+ if (StringUtils.isNotEmpty(oneData.get(20))) {
+ vo.setHealthy(oneData.get(20).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(21))) {
+ vo.setBloodType(oneData.get(21).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(22))) {
+ vo.setReligion(oneData.get(22).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(23))) {
+ vo.setProfession(oneData.get(23).trim());
+ }
+
+ if (StringUtils.isNotEmpty(oneData.get(24))) {
+ vo.setWorkCompany(oneData.get(24).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(25))) {
+ Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(25));
+ if (isOk.equals(-1)) {
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第26列");
+ // importErrorVO.setErrorMsg("您填写的本地/外地有误");
+ // populationImportErrorVOList.add(importErrorVO);
+ index++;
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的本地/外地有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setOutOrLocal(isOk);
+ } else {
+ vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(26))) {
+ vo.setCensusRegister(oneData.get(26).trim());
+ }
+ if (StringUtils.isEmpty(oneData.get(27))) {
+ vo.setResidence(0);
+ } else {
+ vo.setResidence(PopulIsOkEnum.getCodeByName(oneData.get(27).trim()));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(28))) {
+ Integer isOk = PopulPersonTypeEnum.getCodeByName(oneData.get(28));
+ if (isOk.equals(-1)) {
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行，第29列");
+ // importErrorVO.setErrorMsg("您填写的人员类型有误");
+ // populationImportErrorVOList.add(importErrorVO);
+ index++;
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的人员类型有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setPersonType(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(29))) {
+ vo.setCountry(oneData.get(29).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(30))) {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY-dd-MM HH:mm:ss");
+ vo.setDateOfDeparture(simpleDateFormat.parse(oneData.get(30)));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(31))) {
+ vo.setPersonStatus(oneData.get(31).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(32))) {
+ vo.setMonthlyIncome(oneData.get(32).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(33))) {
+ vo.setFamilyStatus(oneData.get(33).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(34))) {
+ vo.setGoalInChina(oneData.get(34).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(35))) {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY-dd-MM HH:mm:ss");
+ vo.setDateOfArrival(simpleDateFormat.parse(oneData.get(35)));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(36))) {
+ vo.setRemark(oneData.get(36).trim());
+ }
+
+ if (StringUtils.isNotEmpty(oneData.get(37))) {
+ vo.setIdCardPositive(oneData.get(37).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(38))) {
+ vo.setIdCardBack(oneData.get(38).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(39))) {
+ vo.setHouseHold(oneData.get(39).trim());
+ }
+ if (StringUtils.isEmpty(oneData.get(40))) {
+ vo.setDeath(0);
+ } else {
+ vo.setDeath(PopulIsOkEnum.getCodeByName(oneData.get(40).trim()));
+ }
+ for (int i = 41; i < headSize; i++) {
+ if (oneData.get(i) != null && oneData.get(i).equals("是")) {
+ vo.getUserTagStr().add(headData.get(i).substring(0, headData.get(i).indexOf("(")));
+ }
+ }
+
+ // 将重复的数据进行MD5加密实现去重
+ String distinct = vo.getName() + vo.getCardNo() + vo.getRoad() + vo.getDoorNo() + vo.getFloor()
+ + vo.getUnitNo() + vo.getHouseNo();
+ try {
+ String distinctPass = PayUtil.MD5(distinct);
+ if (StringUtils.isNotEmpty(distinctPass)) {
+ vo.setDistinctPass(distinctPass);
+ }
+ } catch (Exception e) {
+ log.error("组装MD5加密字段失败，数据表格行数：" + index);
+ continue;
+ }
+ voList.add(vo);
+ index++;
+ }
+ // 客户需要暂时注释，等客户处理完成需要恢复
+ // if(populationImportErrorVOList.isEmpty()){
+ // R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
+ // if (!R.isOk(r)) {
+ // throw new ServiceException(r.getMsg());
+ // }
+ // }else{
+ // throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ // }
+ // 根据list中的IdCard城市来去重
+ List<ComMngPopulationServeExcelVO> newVoList =
+ voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationServeExcelVO::getDistinctPass))
+ .collect(Collectors.toList());
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.listSavePopulationServeExcelVO(newVoList, communityId, userId);
+ log.info("业务层处理逻辑完成");
+ if (!R.isOk(r)) {
+ log.info("业务层处理成功");
+ List<ComMngPopulationMistakeExcelVO> list =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComMngPopulationMistakeExcelVO.class);
+ // String errMsg = r.getMsg();
+ // List<ComMngPopulationImportErrorVO> errorList =
+ // JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
+ // if(!errorList.isEmpty()){
+ // populationImportErrorVOList.addAll(errorList);
+ // }
+ mistakes.addAll(list);
+ log.info("将错误数据存入redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", key);
+ } else {
+ log.info("业务层处理逻辑失败");
+ if (!mistakes.isEmpty()) {
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
+ throw new ServiceException("500", key);
+ }
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行");
+ // importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+ // populationImportErrorVOList.add(importErrorVO);
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ } catch (ParseException e1) {
+ log.info("处理数据时失败2");
+ e1.printStackTrace();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行");
+ // importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+ // populationImportErrorVOList.add(importErrorVO);
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ }
+ }
+
+ private void setMistake(Map<Integer, String> map, ComMngPopulationMistakeExcelVO vo) {
+ vo.setName(map.get(0));
+ vo.setCardNo(map.get(1));
+ vo.setNation(map.get(2));
+ vo.setPoliticalOutlook(map.get(3));
+ vo.setIsRent(map.get(4));
+ vo.setRelation(map.get(5));
+ vo.setRoad(map.get(6));
+ vo.setDoorNo(map.get(7));
+ vo.setFloor(map.get(8));
+ vo.setUnitNo(map.get(9));
+ vo.setHouseNo(map.get(10));
+ vo.setBuildPurpose(map.get(11));
+ vo.setBuildArea(map.get(12));
+ vo.setHouseStatus(map.get(13));
+ vo.setHousePurpose(map.get(14));
+ vo.setControlStatus(map.get(15));
+ vo.setPhone(map.get(16));
+ vo.setNativePlace(map.get(17));
+ vo.setCultureLevel(map.get(18));
+ vo.setMarriage(map.get(19));
+ vo.setHealthy(map.get(20));
+ vo.setBloodType(map.get(21));
+ vo.setReligion(map.get(22));
+ vo.setProfession(map.get(23));
+ vo.setWorkCompany(map.get(24));
+ vo.setOutOrLocal(map.get(25));
+ vo.setCensusRegister(map.get(26));
+ vo.setResidence(map.get(27));
+ // vo.setAddress(map.get(28));
+ vo.setPersonType(map.get(28));
+ vo.setCountry(map.get(29));
+ vo.setStringOfDeparture(map.get(30));
+ vo.setPersonStatus(map.get(31));
+ vo.setMonthlyIncome(map.get(32));
+ vo.setFamilyStatus(map.get(33));
+ vo.setGoalInChina(map.get(34));
+ vo.setStringOfArrival(map.get(35));
+ vo.setRemark(map.get(36));
+ vo.setIdCardPositive(map.get(37));
+ vo.setIdCardBack(map.get(38));
+ vo.setHouseHold(map.get(39));
+ vo.setDeath(map.get(40));
+ }
+
+ private String convertMarriage(String ma) {
+
+ if (Objects.equals("已", ma) || Objects.equals("一", ma)) {
+ ma = "已婚";
+ } else if (Objects.equals("未", ma) || Objects.equals("未婚婚", ma)) {
+ ma = "未婚";
+ } else if (Objects.equals("初", ma)) {
+ ma = "初婚";
+ } else if (Objects.equals("再", ma)) {
+ ma = "再婚";
+ } else if (Objects.equals("复", ma)) {
+ ma = "复婚";
+ } else if (Objects.equals("丧", ma) || Objects.equals("丧偶偶", ma)) {
+ ma = "丧偶";
+ } else if (Objects.equals("离", ma) || Objects.equals("离异", ma) || Objects.equals("离异婚", ma)) {
+ ma = "离婚";
+ } else if (Objects.equals("分", ma)) {
+ ma = "分居";
+ }
+
+ return ma;
+ }
+
+ private String convertRelation(String ra) {
+ if (ra.contains("户主")) {
+ ra = "户主";
+ } else if (Objects.equals(ra, "女儿")) {
+ ra = "女";
+ } else if (Objects.equals(ra, "儿子") || Objects.equals(ra, "儿")) {
+ ra = "子";
+ } else if (Objects.equals(ra, "大女")) {
+ ra = "长女";
+ } else if (Objects.equals(ra, "二女") || Objects.equals(ra, "此女")) {
+ ra = "次女";
+ } else if (Objects.equals(ra, "二子")) {
+ ra = "次子";
+ } else if (Objects.equals(ra, "长男") || ra.contains("长子")) {
+ ra = "长子";
+ } else if (Objects.equals(ra, "非亲属") || ra.contains("女友") || ra.contains("女朋友") || ra.contains("男友")
+ || ra.contains("男朋友")) {
+ ra = "其他";
+ } else if (Objects.equals(ra, "姐")) {
+ ra = "姐姐";
+ } else if (Objects.equals(ra, "户主")) {
+ ra = "本人";
+ } else if (Objects.equals(ra, "妻子") || Objects.equals(ra, "媳妇")) {
+ ra = "妻";
+ } else if (Objects.equals(ra, "哥") || Objects.equals(ra, "哥哥")) {
+ ra = "兄";
+ } else if (Objects.equals(ra, "丈夫")) {
+ ra = "夫";
+ } else if (Objects.equals(ra, "丈母娘")) {
+ ra = "岳母";
+ } else if (Objects.equals(ra, "继子") || Objects.equals(ra, "养子")) {
+ ra = "养子或继子";
+ } else if (Objects.equals(ra, "继女") || Objects.equals(ra, "养女")) {
+ ra = "养女或继女";
+ } else if (ra.contains("儿媳") || ra.contains("长媳")) {
+ ra = "儿媳";
+ } else if (Objects.equals(ra, "三姨") || Objects.equals(ra, "姨姨")) {
+ ra = "姨母";
+ } else if (Objects.equals(ra, "二外孙女")) {
+ ra = "外孙女";
+ } else if (Objects.equals(ra, "外孙")) {
+ ra = "外孙子";
+ } else if (Objects.equals(ra, "侄儿")) {
+ ra = "侄子";
+ } else if (ra.contains("表")) {
+ ra = "表兄弟、表姐妹";
+ } else if (Objects.equals(ra, "继父") || Objects.equals(ra, "养父")) {
+ ra = "继父或养父";
+ } else if (Objects.equals(ra, "父")) {
+ ra = "父亲";
+ } else if (Objects.equals(ra, "弟弟")) {
+ ra = "弟";
+ } else if (Objects.equals(ra, "孙")) {
+ ra = "孙子";
+ } else if (Objects.equals(ra, "孙媳妇") || Objects.equals(ra, "外孙媳妇")) {
+ ra = "孙媳妇或外孙媳妇";
+ } else if (Objects.equals(ra, "妹")) {
+ ra = "妹妹";
+ } else if (Objects.equals(ra, "祖父母")) {
+ ra = "祖父母或外祖父母";
+ } else if (Objects.equals(ra, "姐妹") || Objects.equals(ra, "兄弟")) {
+ ra = "兄弟姐妹";
+ } else if (Objects.equals(ra, "其他姐妹") || Objects.equals(ra, "其他兄弟")) {
+ ra = "其他兄弟姐妹";
+ } else if (Objects.equals(ra, "奶奶")) {
+ ra = "祖母";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (ra.contains("堂")) {
+ ra = "堂兄弟、堂姐妹";
+ }
+
+ return ra;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationTempFilledExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationTempFilledExcelListen.java
new file mode 100644
index 0000000..ef270c6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationTempFilledExcelListen.java
@@ -0,0 +1,238 @@
+package com.panzhihua.common.listen;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.enums.PopulPersonTypeEnum;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngPopulationMistakeExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.PayUtil;
+import com.panzhihua.common.utlis.StringUtils;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @title: ComMngPopulationTempFilledExcelListen
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 实有人口临时填充人员类型
+ * @author: hans
+ * @date: 2022/01/19 13:33
+ */
+@Slf4j
+public class ComMngPopulationTempFilledExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComMngPopulationTempFilledExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ log.info("开始填充历史数据人员类型");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("000", "数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = "POPULATION_FILLED_ERROR_LIST";
+
+ int index = 2;
+ try {
+ ArrayList<ComMngPopulationServeExcelVO> voList = Lists.newArrayList();
+ ArrayList<ComMngPopulationMistakeExcelVO> mistakes = Lists.newArrayList();
+
+ for (Map<Integer, String> oneData : list) {
+ ComMngPopulationServeExcelVO vo = new ComMngPopulationServeExcelVO();
+ // 姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
+ if (StringUtils.isNotEmpty(oneData.get(0)) || StringUtils.isNotEmpty(oneData.get(1))) {
+ if (StringUtils.isEmpty(oneData.get(0))) {
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(0));
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证号");
+ mistakes.add(mistake);
+ continue;
+ }
+
+ // 判断身份证号码位数
+ if (oneData.get(1).length() != 18) {
+ index++;
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(1).toUpperCase());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(2))) {
+ Integer isOk = PopulPersonTypeEnum.getCodeByName(oneData.get(2));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的人员类型有误");
+ mistake.setPersonType(oneData.get(2));
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setPersonType(isOk);
+ }
+ // 将重复的数据进行MD5加密实现去重
+ String distinct = vo.getName() + vo.getCardNo();
+ try {
+ String distinctPass = PayUtil.MD5(distinct);
+ if (StringUtils.isNotEmpty(distinctPass)) {
+ vo.setDistinctPass(distinctPass);
+ }
+ } catch (Exception e) {
+ log.error("组装MD5加密字段失败，数据表格行数：" + index);
+ continue;
+ }
+ voList.add(vo);
+ index++;
+ }
+ // 根据list中的IdCard城市来去重
+ List<ComMngPopulationServeExcelVO> newVoList =
+ voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationServeExcelVO::getDistinctPass))
+ .collect(Collectors.toList());
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.filledPopulationPersonType(newVoList, communityId, userId);
+ log.info("业务层处理逻辑完成");
+ if (!R.isOk(r)) {
+ log.info("业务层处理成功");
+ List<ComMngPopulationMistakeExcelVO> list =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComMngPopulationMistakeExcelVO.class);
+ mistakes.addAll(list);
+ log.info("将错误数据存入redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", key);
+ } else {
+ log.info("业务层处理逻辑失败");
+ if (!mistakes.isEmpty()) {
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
+ throw new ServiceException("500", key);
+ }
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ }
+ }
+
+ private void setMistake(Map<Integer, String> map, ComMngPopulationMistakeExcelVO vo) {
+ vo.setName(map.get(0));
+ vo.setCardNo(map.get(1));
+ vo.setNation(map.get(2));
+ vo.setPoliticalOutlook(map.get(3));
+ vo.setIsRent(map.get(4));
+ vo.setRelation(map.get(5));
+ vo.setRoad(map.get(6));
+ vo.setDoorNo(map.get(7));
+ vo.setFloor(map.get(8));
+ vo.setUnitNo(map.get(9));
+ vo.setHouseNo(map.get(10));
+ vo.setBuildPurpose(map.get(11));
+ vo.setBuildArea(map.get(12));
+ vo.setHouseStatus(map.get(13));
+ vo.setHousePurpose(map.get(14));
+ vo.setControlStatus(map.get(15));
+ vo.setPhone(map.get(16));
+ vo.setNativePlace(map.get(17));
+ vo.setCultureLevel(map.get(18));
+ vo.setMarriage(map.get(19));
+ vo.setHealthy(map.get(20));
+ vo.setBloodType(map.get(21));
+ vo.setReligion(map.get(22));
+ vo.setProfession(map.get(23));
+ vo.setWorkCompany(map.get(24));
+ vo.setOutOrLocal(map.get(25));
+ vo.setCensusRegister(map.get(26));
+ vo.setResidence(map.get(27));
+ vo.setPersonType(map.get(28));
+ vo.setCountry(map.get(29));
+ vo.setStringOfDeparture(map.get(30));
+ vo.setPersonStatus(map.get(31));
+ vo.setMonthlyIncome(map.get(32));
+ vo.setFamilyStatus(map.get(33));
+ vo.setGoalInChina(map.get(34));
+ vo.setStringOfArrival(map.get(35));
+ vo.setRemark(map.get(36));
+ vo.setIdCardPositive(map.get(37));
+ vo.setIdCardBack(map.get(38));
+ vo.setHouseHold(map.get(39));
+ vo.setDeath(map.get(40));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationVeteransExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationVeteransExcelListen.java
new file mode 100644
index 0000000..47741d7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationVeteransExcelListen.java
@@ -0,0 +1,716 @@
+package com.panzhihua.common.listen;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.BcDictionaryConstants;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.enums.*;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngPopulationVeteransExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationVeteransMistakeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.PayUtil;
+import com.panzhihua.common.utlis.StringUtils;
+
+import cn.hutool.core.date.DateUtil;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 退役军人导入监听
+ * @author: txb
+ */
+@Slf4j
+public class ComMngPopulationVeteransExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComMngPopulationVeteransExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
+ log.info("开始导入退役军人数据");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("000", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String Veterans = Constants.VETERANS_POPULATION_ERROR_LIST;
+
+ Map<String, String> dictMap = dictionaryR.getData().stream()
+ .collect(Collectors.toMap(BcDictionaryVO::getDictName, BcDictionaryVO::getDictValue));
+ // Map<String,Integer> dictMap = new HashMap<>();
+ // for(BcDictionaryVO vo : dictionaryR.getData()){
+ // dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
+ // }
+
+ int index = 2;
+ try {
+ String[] parsePatterns = new String[] {"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd",
+ "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d"};
+ ArrayList<ComMngPopulationVeteransExcelVO> voList = Lists.newArrayList();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ArrayList<ComMngPopulationVeteransMistakeExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComMngPopulationVeteransExcelVO vo = new ComMngPopulationVeteransExcelVO();
+ if (StringUtils.isNotEmpty(oneData.get(0))) {
+ vo.setSerialNumber(oneData.get(0));
+ }
+ // 姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
+ if (StringUtils.isEmpty(oneData.get(3))) {
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ index++;
+ setVeteransMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(3));
+ if (StringUtils.isEmpty(oneData.get(4))) {
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ index++;
+ setVeteransMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
+
+ // 判断身份证号码位数
+ if (oneData.get(4).length() != 18) {
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ index++;
+ setVeteransMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(4).toUpperCase());
+ // 根据身份证号码解析年龄以及性别
+ // 获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if (StringUtils.isNotEmpty(birthday)) {
+ String year = birthday.substring(0, 4);
+ String month = birthday.substring(4, 6);
+ String day = birthday.substring(6, 8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
+ // //设置用户年龄
+ // vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
+ // 获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if (sex % 2 == 1) {
+ vo.setSex(PopulSexEnum.nan.getCode());
+ } else {
+ vo.setSex(PopulSexEnum.nv.getCode());
+ }
+
+ if (StringUtils.isNotEmpty(oneData.get(1))) {
+ vo.setPersonStatus(oneData.get(1));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(2))) {
+ vo.setOrganization(oneData.get(2));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(5))) {
+ vo.setPhone(oneData.get(5));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(6))) {
+ vo.setPhoto(oneData.get(6));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(7))) {
+// Integer isOk = PopulRegiterNatureEnum.getCodeByName(oneData.get(7).trim());
+// if (isOk.equals(-1)) {
+// index++;
+// ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+// setVeteransMistake(oneData, mistake);
+// mistake.setMistake("您填写的户籍性质有误");
+// mistakes.add(mistake);
+// continue;
+// }
+ vo.setRegiterNature(oneData.get(7).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(8))) {
+ vo.setCensusRegister(oneData.get(8).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(9))) {
+ Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(9));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ setVeteransMistake(oneData, mistake);
+ mistake.setMistake("您填写的本地/外地有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setOutOrLocal(isOk);
+ } else {
+ vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
+ }
+ if (StringUtils.isEmpty(oneData.get(10))) {
+ index++;
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ setVeteransMistake(oneData, mistake);
+ mistake.setMistake("街路巷不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setRoad(oneData.get(10));
+ if (StringUtils.isEmpty(oneData.get(11))) {
+ index++;
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ setVeteransMistake(oneData, mistake);
+ mistake.setMistake("小区号不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setDoorNo(oneData.get(11).trim());
+ // if(StringUtils.isEmpty(oneData.get(12))){
+ // index++;
+ // ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ // setVeteransMistake(oneData, mistake);
+ // mistake.setMistake("楼排号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(12))) {
+ vo.setFloor(oneData.get(12).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(13))){
+ // index++;
+ // ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ // setVeteransMistake(oneData, mistake);
+ // mistake.setMistake("单元号不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(13))) {
+ vo.setUnitNo(oneData.get(13).trim());
+ }
+ // if(StringUtils.isEmpty(oneData.get(14))){
+ // index++;
+ // ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ // setVeteransMistake(oneData, mistake);
+ // mistake.setMistake("户室不可为空");
+ // mistakes.add(mistake);
+ // continue;
+ // }
+ if (StringUtils.isNotEmpty(oneData.get(14))) {
+ vo.setHouseNo(oneData.get(14).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(15))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(15));
+ if (isOk.equals(-1)) {
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ index++;
+ setVeteransMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否租住有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRent(isOk);
+ } else {
+ vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(16))) {
+ Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(16).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ setVeteransMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHouseStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(17))) {
+ Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(17).trim());
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ setVeteransMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋用途有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHousePurpose(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(18))) {
+ Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(18));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ setVeteransMistake(oneData, mistake);
+ mistake.setMistake("您填写的管控状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setControlStatus(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(19))) {
+ vo.setEnlistDate(DateUtil.parse(oneData.get(19), parsePatterns));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(20))) {
+ vo.setRetireDate(DateUtil.parse(oneData.get(20), parsePatterns));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(21))) {
+ vo.setPersonCategory(oneData.get(21).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(22))) {
+ vo.setNation(oneData.get(22).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(23))) {
+ vo.setHealthy(oneData.get(23).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(24))) {
+ Integer isOk = PopulPoliticalOutlookEnum.getCodeByName(oneData.get(24));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ setVeteransMistake(oneData, mistake);
+ mistake.setMistake("您填写的政治面貌有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setPoliticalOutlook(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(25))) {
+ Integer isOk = PopulMarriageEnum.getCodeByName(oneData.get(25));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ setVeteransMistake(oneData, mistake);
+ mistake.setMistake("您填写的婚姻关系有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setMarriage(isOk);
+ }
+ if (StringUtils.isNotEmpty(oneData.get(26))) {
+ vo.setHouseSituation(oneData.get(26).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(27))) {
+ vo.setHouseSituationOther(oneData.get(27).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(28))) {
+ vo.setBuildArea(oneData.get(28).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(29))) {
+ vo.setEmploymentSituation(oneData.get(29).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(30))) {
+ vo.setIncumbencyType(oneData.get(30).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(31))) {
+ vo.setEmploymentSituationOther(oneData.get(31).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(32))) {
+ vo.setEndowmentInsurance(oneData.get(32).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(33))) {
+ vo.setMedicalInsurance(oneData.get(33).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(34))) {
+ vo.setAnnualIncome(oneData.get(34).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(35))) {
+ vo.setFatherHealthy(oneData.get(35).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(36))) {
+ vo.setMotherHealthy(oneData.get(36).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(37))) {
+ vo.setSpouseHealthy(oneData.get(37).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(38))) {
+ vo.setSonHealthy(oneData.get(38).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(39))) {
+ vo.setDaughterHealthy(oneData.get(39).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(40))) {
+ vo.setMainDifficulty(oneData.get(40).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(41))) {
+ vo.setOtherDifficulty(oneData.get(41).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(42))) {
+ vo.setMainDemand(oneData.get(42).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(43))) {
+ vo.setMainDemandOther(oneData.get(43).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(44))) {
+ vo.setAcademicTraining(oneData.get(44).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(45))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(45));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ setVeteransMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否已参加退役军人培训（政府性质）有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsVeteransTraining(isOk);
+ } else {
+ vo.setIsVeteransTraining(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(46))) {
+ vo.setEducationBeforeEnlistment(oneData.get(46).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(47))) {
+ vo.setReEducation(oneData.get(47).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(48))) {
+ vo.setMajor(oneData.get(48).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(49))) {
+ vo.setMajorOther(oneData.get(49).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(50))) {
+ vo.setOnceEngagedIndustry(oneData.get(50).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(51))) {
+ vo.setOnceEngagedIndustryOther(oneData.get(51).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(52))) {
+ vo.setIntendedPlaceOfEmployment(oneData.get(52).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(53))) {
+ vo.setIntendedPlaceOfEmploymentOther(oneData.get(53).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(54))) {
+ vo.setUnemploymedEngagedIndustry(oneData.get(54).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(55))) {
+ vo.setUnemploymedEngagedIndustryOther(oneData.get(55).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(56))) {
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(56));
+ if (isOk.equals(-1)) {
+ index++;
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ setVeteransMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否有创业意愿有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsBusiness(isOk);
+ } else {
+ vo.setIsBusiness(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(57))) {
+ vo.setBusinessDesire(oneData.get(57).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(58))) {
+ vo.setRemark(oneData.get(58).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(59))) {
+ vo.setFillUnit(oneData.get(59).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(60))) {
+ vo.setFillPerson(oneData.get(50).trim());
+ }
+ if (StringUtils.isNotEmpty(oneData.get(61))) {
+ vo.setFillPersonPhone(oneData.get(61).trim());
+ }
+ vo.getUserTagStr().add("退役军人");
+ for (int i = 62; i < headSize; i++) {
+ if (oneData.get(i) != null && oneData.get(i).equals("是")) {
+ vo.getUserTagStr().add(headData.get(i).substring(0, headData.get(i).indexOf("(")));
+ }
+ }
+ // 将重复的数据进行MD5加密实现去重
+ String distinct = vo.getName() + vo.getCardNo() + vo.getRoad() + vo.getDoorNo() + vo.getFloor()
+ + vo.getUnitNo() + vo.getHouseNo();
+ try {
+ String distinctPass = PayUtil.MD5(distinct);
+ if (StringUtils.isNotEmpty(distinctPass)) {
+ vo.setDistinctPass(distinctPass);
+ }
+ } catch (Exception e) {
+ log.error("组装MD5加密字段失败，数据表格行数：" + index);
+ continue;
+ }
+ voList.add(vo);
+ index++;
+ }
+ // 客户需要暂时注释，等客户处理完成需要恢复
+ // if(populationImportErrorVOList.isEmpty()){
+ // R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
+ // if (!R.isOk(r)) {
+ // throw new ServiceException(r.getMsg());
+ // }
+ // }else{
+ // throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ // }
+ // 根据list中的IdCard城市来去重
+ List<ComMngPopulationVeteransExcelVO> newVoList =
+ voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationVeteransExcelVO::getDistinctPass))
+ .collect(Collectors.toList());
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.listSavePopulationVeteransExcelVO(newVoList, communityId, userId);
+ log.info("业务层处理逻辑完成");
+ if (!R.isOk(r)) {
+ log.info("业务层处理成功");
+ List<ComMngPopulationVeteransMistakeExcelVO> list = JSONArray
+ .parseArray(JSONArray.toJSONString(r.getData()), ComMngPopulationVeteransMistakeExcelVO.class);
+ // String errMsg = r.getMsg();
+ // List<ComMngPopulationImportErrorVO> errorList =
+ // JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
+ // if(!errorList.isEmpty()){
+ // populationImportErrorVOList.addAll(errorList);
+ // }
+ mistakes.addAll(list);
+ log.info("将错误数据存入redis中");
+ valueOperations.set(Veterans, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", Veterans);
+ } else {
+ log.info("业务层处理逻辑失败");
+ if (!mistakes.isEmpty()) {
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
+ valueOperations.set(Veterans, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
+ throw new ServiceException("500", Veterans);
+ }
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行");
+ // importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+ // populationImportErrorVOList.add(importErrorVO);
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ }
+ }
+
+ private void setVeteransMistake(Map<Integer, String> map, ComMngPopulationVeteransMistakeExcelVO vo) {
+ vo.setSerialNumber(map.get(0));
+ vo.setPersonStatus(map.get(1));
+ vo.setOrganization(map.get(2));
+ vo.setName(map.get(3));
+ vo.setCardNo(map.get(4));
+ vo.setPhone(map.get(5));
+ vo.setPhoto(map.get(6));
+ vo.setRegiterNature(map.get(7));
+ vo.setCensusRegister(map.get(8));
+ vo.setOutOrLocal(map.get(9));
+ vo.setRoad(map.get(10));
+ vo.setDoorNo(map.get(11));
+ vo.setFloor(map.get(12));
+ vo.setUnitNo(map.get(13));
+ vo.setHouseNo(map.get(14));
+ vo.setIsRent(map.get(15));
+ vo.setHouseStatus(map.get(16));
+ vo.setHousePurpose(map.get(17));
+ vo.setControlStatus(map.get(18));
+ vo.setEnlistDate(map.get(19));
+ vo.setRetireDate(map.get(20));
+ vo.setPersonCategory(map.get(21));
+ vo.setNation(map.get(22));
+ vo.setHealthy(map.get(23));
+ vo.setPoliticalOutlook(map.get(24));
+ vo.setMarriage(map.get(25));
+ vo.setHouseSituation(map.get(26));
+ vo.setHouseSituationOther(map.get(27));
+ vo.setBuildArea(map.get(28));
+ vo.setEmploymentSituation(map.get(29));
+ vo.setIncumbencyType(map.get(30));
+ vo.setEmploymentSituationOther(map.get(31));
+ vo.setEndowmentInsurance(map.get(32));
+ vo.setMedicalInsurance(map.get(33));
+ vo.setAnnualIncome(map.get(34));
+ vo.setFatherHealthy(map.get(35));
+ vo.setMotherHealthy(map.get(36));
+ vo.setSpouseHealthy(map.get(37));
+ vo.setSonHealthy(map.get(38));
+ vo.setDaughterHealthy(map.get(39));
+ vo.setMainDifficulty(map.get(40));
+ vo.setOtherDifficulty(map.get(41));
+ vo.setMainDemand(map.get(42));
+ vo.setMainDemandOther(map.get(43));
+ vo.setAcademicTraining(map.get(44));
+ vo.setIsVeteransTraining(map.get(45));
+ vo.setEducationBeforeEnlistment(map.get(46));
+ vo.setReEducation(map.get(47));
+ vo.setMajor(map.get(48));
+ vo.setMajorOther(map.get(49));
+ vo.setOnceEngagedIndustry(map.get(50));
+ vo.setOnceEngagedIndustryOther(map.get(51));
+ vo.setIntendedPlaceOfEmployment(map.get(52));
+ vo.setIntendedPlaceOfEmploymentOther(map.get(53));
+ vo.setUnemploymedEngagedIndustry(map.get(54));
+ vo.setUnemploymedEngagedIndustryOther(map.get(55));
+ vo.setIsBusiness(map.get(56));
+ vo.setBusinessDesire(map.get(57));
+ vo.setRemark(map.get(58));
+ vo.setFillUnit(map.get(59));
+ vo.setFillPerson(map.get(60));
+ vo.setFillPersonPhone(map.get(61));
+ }
+
+ private String convertMarriage(String ma) {
+
+ if (Objects.equals("已", ma) || Objects.equals("一", ma)) {
+ ma = "已婚";
+ } else if (Objects.equals("未", ma) || Objects.equals("未婚婚", ma)) {
+ ma = "未婚";
+ } else if (Objects.equals("初", ma)) {
+ ma = "初婚";
+ } else if (Objects.equals("再", ma)) {
+ ma = "再婚";
+ } else if (Objects.equals("复", ma)) {
+ ma = "复婚";
+ } else if (Objects.equals("丧", ma) || Objects.equals("丧偶偶", ma)) {
+ ma = "丧偶";
+ } else if (Objects.equals("离", ma) || Objects.equals("离异", ma) || Objects.equals("离异婚", ma)) {
+ ma = "离婚";
+ } else if (Objects.equals("分", ma)) {
+ ma = "分居";
+ }
+
+ return ma;
+ }
+
+ private String convertRelation(String ra) {
+ if (ra.contains("户主")) {
+ ra = "户主";
+ } else if (Objects.equals(ra, "女儿")) {
+ ra = "女";
+ } else if (Objects.equals(ra, "儿子") || Objects.equals(ra, "儿")) {
+ ra = "子";
+ } else if (Objects.equals(ra, "大女")) {
+ ra = "长女";
+ } else if (Objects.equals(ra, "二女") || Objects.equals(ra, "此女")) {
+ ra = "次女";
+ } else if (Objects.equals(ra, "二子")) {
+ ra = "次子";
+ } else if (Objects.equals(ra, "长男") || ra.contains("长子")) {
+ ra = "长子";
+ } else if (Objects.equals(ra, "非亲属") || ra.contains("女友") || ra.contains("女朋友") || ra.contains("男友")
+ || ra.contains("男朋友")) {
+ ra = "其他";
+ } else if (Objects.equals(ra, "姐")) {
+ ra = "姐姐";
+ } else if (Objects.equals(ra, "户主")) {
+ ra = "本人";
+ } else if (Objects.equals(ra, "妻子") || Objects.equals(ra, "媳妇")) {
+ ra = "妻";
+ } else if (Objects.equals(ra, "哥") || Objects.equals(ra, "哥哥")) {
+ ra = "兄";
+ } else if (Objects.equals(ra, "丈夫")) {
+ ra = "夫";
+ } else if (Objects.equals(ra, "丈母娘")) {
+ ra = "岳母";
+ } else if (Objects.equals(ra, "继子") || Objects.equals(ra, "养子")) {
+ ra = "养子或继子";
+ } else if (Objects.equals(ra, "继女") || Objects.equals(ra, "养女")) {
+ ra = "养女或继女";
+ } else if (ra.contains("儿媳") || ra.contains("长媳")) {
+ ra = "儿媳";
+ } else if (Objects.equals(ra, "三姨") || Objects.equals(ra, "姨姨")) {
+ ra = "姨母";
+ } else if (Objects.equals(ra, "二外孙女")) {
+ ra = "外孙女";
+ } else if (Objects.equals(ra, "外孙")) {
+ ra = "外孙子";
+ } else if (Objects.equals(ra, "侄儿")) {
+ ra = "侄子";
+ } else if (ra.contains("表")) {
+ ra = "表兄弟、表姐妹";
+ } else if (Objects.equals(ra, "继父") || Objects.equals(ra, "养父")) {
+ ra = "继父或养父";
+ } else if (Objects.equals(ra, "父")) {
+ ra = "父亲";
+ } else if (Objects.equals(ra, "弟弟")) {
+ ra = "弟";
+ } else if (Objects.equals(ra, "孙")) {
+ ra = "孙子";
+ } else if (Objects.equals(ra, "孙媳妇") || Objects.equals(ra, "外孙媳妇")) {
+ ra = "孙媳妇或外孙媳妇";
+ } else if (Objects.equals(ra, "妹")) {
+ ra = "妹妹";
+ } else if (Objects.equals(ra, "祖父母")) {
+ ra = "祖父母或外祖父母";
+ } else if (Objects.equals(ra, "姐妹") || Objects.equals(ra, "兄弟")) {
+ ra = "兄弟姐妹";
+ } else if (Objects.equals(ra, "其他姐妹") || Objects.equals(ra, "其他兄弟")) {
+ ra = "其他兄弟姐妹";
+ } else if (Objects.equals(ra, "奶奶")) {
+ ra = "祖母";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (Objects.equals(ra, "爷爷")) {
+ ra = "祖父";
+ } else if (ra.contains("堂")) {
+ ra = "堂兄弟、堂姐妹";
+ }
+
+ return ra;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngRealAssetsExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngRealAssetsExcelListen.java
new file mode 100644
index 0000000..58132d0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngRealAssetsExcelListen.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.listen;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngRealAssetsExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 实有单位导入监听
+ * @author: Null
+ * @date: 2021/3/11 13:26
+ */
+@Slf4j
+public class ComMngRealAssetsExcelListen extends AnalysisEventListener<ComMngRealAssetsExcelVO> {
+
+ private static final int BATCH_COUNT = 100;
+ private CommunityService communityService;
+ private Long communityId;
+ private List<ComMngRealAssetsExcelVO> list = new ArrayList<>();
+
+ public ComMngRealAssetsExcelListen(CommunityService communityService, Long communityId) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ }
+
+ @Override
+ public void invoke(ComMngRealAssetsExcelVO comMngRealCompanyExcelVO, AnalysisContext analysisContext) {
+ list.add(comMngRealCompanyExcelVO);
+ // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
+ if (list.size() >= BATCH_COUNT) {
+ log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
+ R r = this.communityService.listSaveMngRealAssetsExcelVO(list, this.communityId);
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+ list.clear(); // 清空list
+ }
+
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+ log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
+ R r = this.communityService.listSaveMngRealAssetsExcelVO(list, this.communityId);// 确保最后遗留的数据保存在数据库中
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngRealCompanyExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngRealCompanyExcelListen.java
new file mode 100644
index 0000000..88d0f24
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngRealCompanyExcelListen.java
@@ -0,0 +1,69 @@
+package com.panzhihua.common.listen;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.StringUtils;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 实有单位导入监听
+ * @author: Null
+ * @date: 2021/3/11 13:26
+ */
+@Slf4j
+public class ComMngRealCompanyExcelListen extends AnalysisEventListener<ComMngRealCompanyExcelVO> {
+
+ private static final int BATCH_COUNT = 5000;
+ private CommunityService communityService;
+ private Long communityId;
+ private List<ComMngRealCompanyExcelVO> list = new ArrayList<>();
+
+ public ComMngRealCompanyExcelListen(CommunityService communityService, Long communityId) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ }
+
+ @Override
+ public void invoke(ComMngRealCompanyExcelVO comMngRealCompanyExcelVO, AnalysisContext analysisContext) {
+ if (StringUtils.isEmpty(comMngRealCompanyExcelVO.getCreditCode())) {
+ throw new ServiceException("统一社会信用代码不可为空");
+ }
+ list.add(comMngRealCompanyExcelVO);
+ // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
+ if (list.size() >= BATCH_COUNT) {
+ log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
+ // 根据list中的creditCode来去重
+ List<ComMngRealCompanyExcelVO> newVoList = list.stream()
+ .filter(ListUtils.distinctByKey(ComMngRealCompanyExcelVO::getCreditCode)).collect(Collectors.toList());
+ R r = this.communityService.listSaveMngRealCompanyExcelVO(newVoList, this.communityId);
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+ list.clear(); // 清空list
+ }
+
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+ log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
+ // 根据list中的creditCode来去重
+ List<ComMngRealCompanyExcelVO> newVoList = list.stream()
+ .filter(ListUtils.distinctByKey(ComMngRealCompanyExcelVO::getCreditCode)).collect(Collectors.toList());
+ R r = this.communityService.listSaveMngRealCompanyExcelVO(newVoList, this.communityId);// 确保最后遗留的数据保存在数据库中
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVillageServeExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVillageServeExcelListen.java
new file mode 100644
index 0000000..b5a1a61
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVillageServeExcelListen.java
@@ -0,0 +1,83 @@
+package com.panzhihua.common.listen;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
+import com.panzhihua.common.model.vos.user.CommunityUserInfoVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.Snowflake;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 实有房屋导入监听
+ * @author: llming
+ */
+@Slf4j
+public class ComMngVillageServeExcelListen extends AnalysisEventListener<ComMngVillageServeExcelVO> {
+
+ private static final int BATCH_COUNT = 100;
+ private CommunityService communityService;
+ private LoginUserInfoVO loginUserInfo;
+ private UserService userService;
+ private List<ComMngVillageServeExcelVO> list = new ArrayList<>();
+ public ComMngVillageServeExcelListen(CommunityService communityService, LoginUserInfoVO loginUserInfo, UserService userService) {
+ this.communityService = communityService;
+ this.loginUserInfo = loginUserInfo;
+ this.userService=userService;
+ }
+
+ @Override
+ public void invoke(ComMngVillageServeExcelVO comMngVillageServeExcelVO, AnalysisContext analysisContext) {
+ try {
+ Integer.parseInt(comMngVillageServeExcelVO.getHouseNum());
+ }
+ catch (Exception e){
+ throw new ServiceException("门牌号只能为纯数字");
+ }
+ R r1=userService.detailUser(loginUserInfo.getUserId());
+ if(R.isOk(r1)){
+ LoginUserInfoVO loginUserInfoVO=JSONObject.parseObject(JSONObject.toJSONString(r1.getData()), LoginUserInfoVO.class);
+ comMngVillageServeExcelVO.setAddress("四川省-攀枝花市-"+loginUserInfoVO.getAreaName()+comMngVillageServeExcelVO.getAlley()+"+"+comMngVillageServeExcelVO.getHouseNum());
+ }
+ list.add(comMngVillageServeExcelVO);
+ // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
+ if (list.size() >= BATCH_COUNT) {
+ log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
+ list.forEach(villageServe -> {
+ villageServe.setVillageId(Snowflake.getId());
+ villageServe.setCreateAt(new Date());
+ });
+ R r = communityService.listSaveVillageServeExcelVO(list, loginUserInfo.getCommunityId());
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+ // 清空list
+ list.clear();
+ }
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+ log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
+ // 确保最后遗留的数据保存在数据库中
+ list.forEach(villageServe -> {
+ villageServe.setVillageId(Snowflake.getId());
+ villageServe.setCreateAt(new Date());
+ });
+ R r = this.communityService.listSaveVillageServeExcelVO(list, loginUserInfo.getCommunityId());
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVolunteerExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVolunteerExcelListen.java
new file mode 100644
index 0000000..d537c62
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVolunteerExcelListen.java
@@ -0,0 +1,196 @@
+package com.panzhihua.common.listen;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerErrorExcelVO;
+import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * title: 志愿者导入监听
+ * @author : lyq
+ */
+@Slf4j
+public class ComMngVolunteerExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 3000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComMngVolunteerExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("000", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.COM_MNG_VOLUNTEER_ERROR_LIST + communityId;
+ int index = 2;
+ try {
+ ArrayList<ComMngVolunteerExcelVO> voList = Lists.newArrayList();
+ ArrayList<ComMngVolunteerErrorExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComMngVolunteerExcelVO vo = new ComMngVolunteerExcelVO();
+
+ if (StringUtils.isEmpty(oneData.get(0))) {
+ index++;
+ mistakes.add(setErrorObject(oneData,"志愿者名称不可为空，请填写志愿者名称"));
+ continue;
+ }else{
+ //判断导入的名字的长度是否超过10
+ if(oneData.get(0).length() > 10){
+ index++;
+ mistakes.add(setErrorObject(oneData,"志愿者名称长度不可超过10，请重新填写志愿者名称"));
+ continue;
+ }
+ }
+ vo.setName(oneData.get(0));
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ index++;
+ mistakes.add(setErrorObject(oneData,"志愿者手机号不可为空，请填写志愿者手机号"));
+ continue;
+ }
+ vo.setPhone(oneData.get(1));
+ if (StringUtils.isEmpty(oneData.get(2))) {
+ index++;
+ mistakes.add(setErrorObject(oneData,"志愿者身份证不可为空，请填写志愿者身份证"));
+ continue;
+ }
+ // 判断身份证号码位数
+ if (oneData.get(2).length() != 18) {
+ if (oneData.get(2).length() != 15) {
+ index++;
+ mistakes.add(setErrorObject(oneData,"志愿者身份证位数有误，请检查身份证号码是否正确"));
+ continue;
+ }
+ }
+ if (oneData.get(2).length() != 15) {
+ if (oneData.get(2).length() != 18) {
+ index++;
+ mistakes.add(setErrorObject(oneData,"志愿者身份证位数有误，请检查身份证号码是否正确"));
+ continue;
+ }
+ }
+ vo.setIdCard(oneData.get(2).toUpperCase());
+ if (StringUtils.isNotEmpty(oneData.get(3))) {
+ vo.setOrgName(oneData.get(3));
+ }
+
+ if (StringUtils.isNotEmpty(oneData.get(4))) {
+ vo.setTeamName(oneData.get(4));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(5))) {
+ vo.setSkillName(oneData.get(5));
+ }
+ vo.setIsUniversity(2);
+ if (StringUtils.isNotEmpty(oneData.get(6))) {
+ vo.setIsUniversity(1);
+ vo.setUniversityName(oneData.get(6));
+ }
+ voList.add(vo);
+ index++;
+ }
+ List<ComMngVolunteerExcelVO> newVoList =
+ voList.stream().filter(ListUtils.distinctByKey(ComMngVolunteerExcelVO::getIdCard))
+ .collect(Collectors.toList());
+ R r = communityService.importVolunteerAdmin(newVoList, communityId, userId);
+ if (!R.isOk(r)) {
+ List<ComMngVolunteerErrorExcelVO> list =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComMngVolunteerErrorExcelVO.class);
+ mistakes.addAll(list);
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ throw new ServiceException("500", key);
+ } else {
+ if (!mistakes.isEmpty()) {
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ throw new ServiceException("500", key);
+ }
+ }
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ throw new ServiceException("500", "导入失败");
+ }
+ }
+
+ private void setError(Map<Integer, String> map, ComMngVolunteerErrorExcelVO vo) {
+ vo.setName(map.get(0));
+ vo.setPhone(map.get(1));
+ vo.setIdCard(map.get(2));
+ vo.setOrgName(map.get(3));
+ vo.setTeamName(map.get(4));
+ vo.setSkillName(map.get(5));
+ }
+
+ /**
+ * 组装错误信息
+ * @param oneData 数据表格对象
+ * @param error 错误信息
+ * @return 错误对象
+ */
+ private ComMngVolunteerErrorExcelVO setErrorObject(Map<Integer, String> oneData, String error){
+ ComMngVolunteerErrorExcelVO mistake = new ComMngVolunteerErrorExcelVO();
+ setError(oneData, mistake);
+ mistake.setError(error);
+ return mistake;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComPbCheckUnitExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComPbCheckUnitExcelListen.java
new file mode 100644
index 0000000..080abec
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComPbCheckUnitExcelListen.java
@@ -0,0 +1,181 @@
+package com.panzhihua.common.listen;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelErrorVO;
+import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
+import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitErrorExcelVO;
+import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * title: 党员双报到单位导入监听
+ * @author : lyq
+ */
+@Slf4j
+public class ComPbCheckUnitExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 3000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private ComPbCheckUnitFeign checkUnitService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComPbCheckUnitExcelListen(ComPbCheckUnitFeign checkUnitService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.checkUnitService = checkUnitService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("000", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.PB_CHECK_UNIT_ERROR_LIST + communityId;
+ int index = 2;
+ try {
+ ArrayList<ComPbCheckUnitExcelVO> voList = Lists.newArrayList();
+ ArrayList<ComPbCheckUnitErrorExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComPbCheckUnitExcelVO vo = new ComPbCheckUnitExcelVO();
+
+ if (StringUtils.isEmpty(oneData.get(0))) {
+ index++;
+ mistakes.add(setErrorObject(oneData,"单位名称不可为空，请填写单位名称"));
+ continue;
+ }else{
+ //判断导入的名字的长度是否超过30
+ if(oneData.get(0).length() > 30){
+ index++;
+ mistakes.add(setErrorObject(oneData,"单位名称长度不可超过30，请重新填写单位名称"));
+ continue;
+ }
+ }
+ vo.setName(oneData.get(0));
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ index++;
+ mistakes.add(setErrorObject(oneData,"单位类别不可为空，请填写单位类别"));
+ continue;
+ }
+ vo.setType(oneData.get(1));
+ if (StringUtils.isNotEmpty(oneData.get(2))) {
+ vo.setContacts(oneData.get(2));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(3))) {
+ //验证手机号正则
+ String regex = "^[1][3,4,5,6,7,8,9][0-9]{9}$";
+ Pattern pattern = Pattern.compile(regex);
+ Matcher m = pattern.matcher(oneData.get(3));
+ if(!m.matches()){
+ index++;
+ mistakes.add(setErrorObject(oneData,"联系电话输入错误，请核对联系电话"));
+ continue;
+ }
+ vo.setPhone(oneData.get(3));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(4))){
+ vo.setOrgName(oneData.get(4));
+ }
+ voList.add(vo);
+ index++;
+ }
+ List<ComPbCheckUnitExcelVO> newVoList =
+ voList.stream().filter(ListUtils.distinctByKey(ComPbCheckUnitExcelVO::getName))
+ .collect(Collectors.toList());
+ R r = checkUnitService.importCheckUnit(newVoList, communityId, userId);
+ if (!R.isOk(r)) {
+ List<ComPbCheckUnitErrorExcelVO> list =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComPbCheckUnitErrorExcelVO.class);
+ mistakes.addAll(list);
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ throw new ServiceException("500", key);
+ } else {
+ if (!mistakes.isEmpty()) {
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ throw new ServiceException("500", key);
+ }
+ }
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ throw new ServiceException("500", "导入失败");
+ }
+ }
+
+ private void setError(Map<Integer, String> map, ComPbCheckUnitErrorExcelVO vo) {
+ vo.setName(map.get(0));
+ vo.setType(map.get(1));
+ vo.setContacts(map.get(2));
+ vo.setPhone(map.get(3));
+ }
+
+ /**
+ * 组装错误信息
+ * @param oneData 数据表格对象
+ * @param error 错误信息
+ * @return 错误对象
+ */
+ private ComPbCheckUnitErrorExcelVO setErrorObject(Map<Integer, String> oneData, String error){
+ ComPbCheckUnitErrorExcelVO mistake = new ComPbCheckUnitErrorExcelVO();
+ setError(oneData, mistake);
+ mistake.setError(error);
+ return mistake;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComPbMemberRoleExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComPbMemberRoleExcelListen.java
new file mode 100644
index 0000000..addf02c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComPbMemberRoleExcelListen.java
@@ -0,0 +1,198 @@
+package com.panzhihua.common.listen;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitErrorExcelVO;
+import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
+import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleErrorExcelVo;
+import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
+import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign;
+import com.panzhihua.common.service.partybuilding.PartyBuildingService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * title: 社区党委导入监听
+ * @author : lyq
+ */
+@Slf4j
+public class ComPbMemberRoleExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 3000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private PartyBuildingService partyBuildingService;;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComPbMemberRoleExcelListen(PartyBuildingService partyBuildingService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.partyBuildingService = partyBuildingService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("000", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.PB_MEMBER_ROLE_ERROR_LIST + communityId;
+ int index = 2;
+ try {
+ ArrayList<ComPbMemberRoleExcelVo> voList = Lists.newArrayList();
+ ArrayList<ComPbMemberRoleErrorExcelVo> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComPbMemberRoleExcelVo vo = new ComPbMemberRoleExcelVo();
+
+ if (StringUtils.isEmpty(oneData.get(0))) {
+ index++;
+ mistakes.add(setErrorObject(oneData,"党员姓名不可为空，请填写党员姓名"));
+ continue;
+ }else{
+ //判断导入的名字的长度是否超过30
+ if(oneData.get(0).length() > 10){
+ index++;
+ mistakes.add(setErrorObject(oneData,"党员姓名长度不可超过10，请重新填写党员姓名"));
+ continue;
+ }
+ }
+ vo.setName(oneData.get(0));
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ index++;
+ mistakes.add(setErrorObject(oneData,"身份证号不可为空，请填写身份证号"));
+ continue;
+ }
+ vo.setIdCard(oneData.get(1));
+
+ if (StringUtils.isEmpty(oneData.get(2))) {
+ index++;
+ mistakes.add(setErrorObject(oneData,"手机号不可为空，请填写手机号"));
+ continue;
+ }
+ vo.setPhone(oneData.get(2));
+
+ if (StringUtils.isNotEmpty(oneData.get(3))) {
+ vo.setTypeName(oneData.get(3));
+ }
+
+ if (StringUtils.isEmpty(oneData.get(4))) {
+ index++;
+ mistakes.add(setErrorObject(oneData,"入党日期不可为空，请填写入党日期"));
+ continue;
+ }
+ vo.setJoinTime(oneData.get(4));
+
+ if (StringUtils.isNotEmpty(oneData.get(5))) {
+ vo.setEmploymentTime(oneData.get(5));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(6))) {
+ vo.setPosition(oneData.get(6));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(7))) {
+ vo.setJobResponsibilities(oneData.get(7));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(8))) {
+ vo.setOrg(oneData.get(8));
+ }
+ voList.add(vo);
+ index++;
+ }
+ List<ComPbMemberRoleExcelVo> newVoList =
+ voList.stream().filter(ListUtils.distinctByKey(ComPbMemberRoleExcelVo::getIdCard))
+ .collect(Collectors.toList());
+ R r = partyBuildingService.importPbMemberRole(newVoList, communityId, userId);
+ if (!R.isOk(r)) {
+ List<ComPbMemberRoleErrorExcelVo> list =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComPbMemberRoleErrorExcelVo.class);
+ mistakes.addAll(list);
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ throw new ServiceException("500", key);
+ } else {
+ if (!mistakes.isEmpty()) {
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ throw new ServiceException("500", key);
+ }
+ }
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ throw new ServiceException("500", "导入失败");
+ }
+ }
+
+ private void setError(Map<Integer, String> map, ComPbMemberRoleErrorExcelVo vo) {
+ vo.setName(map.get(0));
+ vo.setIdCard(map.get(1));
+ vo.setPhone(map.get(2));
+ vo.setTypeName(map.get(3));
+ vo.setJoinTime(map.get(4));
+ vo.setEmploymentTime(map.get(5));
+ vo.setPosition(map.get(6));
+ vo.setJobResponsibilities(map.get(7));
+ }
+
+ /**
+ * 组装错误信息
+ * @param oneData 数据表格对象
+ * @param error 错误信息
+ * @return 错误对象
+ */
+ private ComPbMemberRoleErrorExcelVo setErrorObject(Map<Integer, String> oneData, String error){
+ ComPbMemberRoleErrorExcelVo mistake = new ComPbMemberRoleErrorExcelVo();
+ setError(oneData, mistake);
+ mistake.setError(error);
+ return mistake;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComPensionAuthRecordImportExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComPensionAuthRecordImportExcelListen.java
new file mode 100644
index 0000000..52444ab
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComPensionAuthRecordImportExcelListen.java
@@ -0,0 +1,241 @@
+package com.panzhihua.common.listen;
+
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.BcDictionaryConstants;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.enums.PopulHouseUseEnum;
+import com.panzhihua.common.enums.PopulSexEnum;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComPensionAuthRecordImportExcelVO;
+import com.panzhihua.common.model.vos.community.ComPensionAuthRecordImportMistakeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * @title: ComPensionAuthRecordImportExcelListen
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 养老线下认证导入监听
+ * @author: txb
+ * @date: 2021/09/08 09:16
+ */
+@Slf4j
+public class ComPensionAuthRecordImportExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ private static int headSize = 0;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+ private CommunityService communityService;
+ private Long communityId;
+ private Long userId;
+ private Map<Integer, String> headData;
+ private StringRedisTemplate stringRedisTemplate;
+
+ public ComPensionAuthRecordImportExcelListen(CommunityService communityService, Long communityId, Long userId,
+ StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userId = userId;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
+ log.info("开始导入线下认证居民数据");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("100", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.PENSION_RECORD_ERROR_LIST + + communityId;
+
+ Map<String, String> dictMap = dictionaryR.getData().stream()
+ .collect(Collectors.toMap(BcDictionaryVO::getDictName, BcDictionaryVO::getDictValue));
+ // Map<String,Integer> dictMap = new HashMap<>();
+ // for(BcDictionaryVO vo : dictionaryR.getData()){
+ // dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
+ // }
+
+ int index = 2;
+ try {
+ String[] parsePatterns = new String[] {"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd",
+ "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d"};
+ ArrayList<ComPensionAuthRecordImportExcelVO> voList = Lists.newArrayList();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ArrayList<ComPensionAuthRecordImportMistakeExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComPensionAuthRecordImportExcelVO vo = new ComPensionAuthRecordImportExcelVO();
+ if (StringUtils.isEmpty(oneData.get(0))) {
+ ComPensionAuthRecordImportMistakeExcelVO mistake = new ComPensionAuthRecordImportMistakeExcelVO();
+ index++;
+ setPensionAuthMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(0));
+ if (StringUtils.isEmpty(oneData.get(1))) {
+ ComPensionAuthRecordImportMistakeExcelVO mistake = new ComPensionAuthRecordImportMistakeExcelVO();
+ index++;
+ setPensionAuthMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
+
+ // 判断身份证号码位数
+ if (oneData.get(1).length() != 18) {
+ ComPensionAuthRecordImportMistakeExcelVO mistake = new ComPensionAuthRecordImportMistakeExcelVO();
+ index++;
+ setPensionAuthMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIdCard(oneData.get(1).toUpperCase());
+ // 根据身份证号码解析年龄以及性别
+ // 获取用户生日
+ String birthday = vo.getIdCard().substring(6, 14);
+ if (StringUtils.isNotEmpty(birthday)) {
+ String year = birthday.substring(0, 4);
+ String month = birthday.substring(4, 6);
+ String day = birthday.substring(6, 8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
+ // //设置用户年龄
+ // vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
+ // 获取用户性别
+ int sex = Integer.parseInt(vo.getIdCard().substring(16, 17));
+ if (sex % 2 == 1) {
+ vo.setSex(PopulSexEnum.nan.getCode());
+ } else {
+ vo.setSex(PopulSexEnum.nv.getCode());
+ }
+
+ if (StringUtils.isNotEmpty(oneData.get(2))) {
+ vo.setPhone(oneData.get(2));
+ }
+ if (StringUtils.isNotEmpty(oneData.get(3))) {
+ vo.setNowAddress(oneData.get(3));
+ vo.setAddress(oneData.get(3));
+ }
+ if (StringUtils.isEmpty(oneData.get(4))) {
+ index++;
+ ComPensionAuthRecordImportMistakeExcelVO mistake = new ComPensionAuthRecordImportMistakeExcelVO();
+ setPensionAuthMistake(oneData, mistake);
+ mistake.setMistake("认证时间不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setAuthDate(DateUtil.parse(oneData.get(4).trim(), parsePatterns));
+ if (StringUtils.isEmpty(oneData.get(5))) {
+ index++;
+ ComPensionAuthRecordImportMistakeExcelVO mistake = new ComPensionAuthRecordImportMistakeExcelVO();
+ setPensionAuthMistake(oneData, mistake);
+ mistake.setMistake("认证期数不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setAuthPeriod(oneData.get(5));
+ if (StringUtils.isNotEmpty(oneData.get(6))) {
+ vo.setMark(oneData.get(6));
+ }
+
+ voList.add(vo);
+ index++;
+ }
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.listSavePensionAuthRecordExcelVO(voList, communityId, userId);
+ log.info("业务层处理逻辑完成");
+ if (!R.isOk(r)) {
+ log.info("业务层处理成功");
+ List<ComPensionAuthRecordImportMistakeExcelVO> list =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComPensionAuthRecordImportMistakeExcelVO.class);
+ // String errMsg = r.getMsg();
+ // List<ComMngPopulationImportErrorVO> errorList =
+ // JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
+ // if(!errorList.isEmpty()){
+ // populationImportErrorVOList.addAll(errorList);
+ // }
+ mistakes.addAll(list);
+ log.info("将错误数据存入redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", key);
+ } else {
+ log.info("业务层处理逻辑失败");
+ if (!mistakes.isEmpty()) {
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
+ valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
+ throw new ServiceException("500", key);
+ }
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+ // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ // importErrorVO.setErrorPosition("第" + index + "行");
+ // importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+ // populationImportErrorVOList.add(importErrorVO);
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "NumberFormatException");
+ }
+ }
+
+ private void setPensionAuthMistake(Map<Integer, String> map, ComPensionAuthRecordImportMistakeExcelVO vo) {
+ vo.setName(map.get(0));
+ vo.setIdCard(map.get(1));
+ vo.setPhone(map.get(2));
+ vo.setNowAddress(map.get(3));
+ vo.setAuthDate(map.get(4));
+ vo.setIsAlive(map.get(5));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComSwRotaExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComSwRotaExcelListen.java
new file mode 100644
index 0000000..eb5527b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComSwRotaExcelListen.java
@@ -0,0 +1,63 @@
+package com.panzhihua.common.listen;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 值班表监听
+ * @author: Null
+ * @date: 2021/7/31 13:26
+ */
+@Slf4j
+public class ComSwRotaExcelListen extends AnalysisEventListener<ComSwRotaExcelVO> {
+
+ private static final int BATCH_COUNT = 100;
+ private CommunityService communityService;
+ private Long communityId;
+ private List<ComSwRotaExcelVO> list = new ArrayList<>();
+
+ public ComSwRotaExcelListen(CommunityService communityService, Long communityId) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ }
+
+ @Override
+ public void invoke(ComSwRotaExcelVO comSwRotaExcelVO, AnalysisContext analysisContext) {
+ list.add(comSwRotaExcelVO);
+ if (list.size() == 0) {
+ throw new ServiceException("500", "导入数据为空！");
+ }
+ // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
+ if (list.size() >= BATCH_COUNT) {
+ log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
+ R r = this.communityService.listSaveSwRotaExcelVO(list, this.communityId);
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+ list.clear(); // 清空list
+ }
+
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+ log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
+ if (list.size() == 0) {
+ throw new ServiceException("500", "导入数据为空！");
+ }
+ R r = this.communityService.listSaveSwRotaExcelVO(list, this.communityId);// 确保最后遗留的数据保存在数据库中
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/WarehouseDonatesExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/WarehouseDonatesExcelListen.java
new file mode 100644
index 0000000..33eb274
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/WarehouseDonatesExcelListen.java
@@ -0,0 +1,83 @@
+package com.panzhihua.common.listen;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.warehouse.WarehouseDonatesExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.StringUtils;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @title: WarehouseDonatesExcelListen
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 爱心义仓物品捐赠导入监听
+ * @author: hans
+ * @date: 2021/10/09 17:45
+ */
+@Slf4j
+public class WarehouseDonatesExcelListen extends AnalysisEventListener<WarehouseDonatesExcelVO> {
+
+ private static final int BATCH_COUNT = 3000;
+ private CommunityService communityService;
+ private Long communityId;
+ private Long registerBy;
+ private List<WarehouseDonatesExcelVO> list = new ArrayList<>();
+
+ public WarehouseDonatesExcelListen(CommunityService communityService, Long communityId, Long registerBy) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.registerBy = registerBy;
+ }
+
+ @Override
+ public void invoke(WarehouseDonatesExcelVO warehouseDonatesExcelVO, AnalysisContext analysisContext) {
+ Integer quantity = warehouseDonatesExcelVO.getQuantity();
+ if (!StringUtils.isEmpty(warehouseDonatesExcelVO.getItem()) && nonNull(quantity)) {
+ if (quantity <= 0) {
+ throw new ServiceException("捐赠数量有误");
+ }
+ if (isNull(warehouseDonatesExcelVO.getIsAnonymous())) {
+ warehouseDonatesExcelVO.setIsAnonymous("否");
+ }
+ if (StringUtils.isEmpty(warehouseDonatesExcelVO.getName())) {
+ warehouseDonatesExcelVO.setIsAnonymous("是");
+ }
+ if (isNull(warehouseDonatesExcelVO.getSigningAt())) {
+ Date nowDate = new Date();
+ warehouseDonatesExcelVO.setSigningAt(nowDate);
+ warehouseDonatesExcelVO.setRegisterAt(nowDate);
+ } else {
+ warehouseDonatesExcelVO.setRegisterAt(warehouseDonatesExcelVO.getSigningAt());
+ }
+ warehouseDonatesExcelVO.setCommunityId(this.communityId);
+ warehouseDonatesExcelVO.setStatus(2);
+ warehouseDonatesExcelVO.setSurplusQuantity(quantity);
+ warehouseDonatesExcelVO.setRegisterBy(this.registerBy);
+ warehouseDonatesExcelVO.setSigningBy(this.registerBy);
+ list.add(warehouseDonatesExcelVO);
+ // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
+ if (list.size() >= BATCH_COUNT) {
+ doAfterAllAnalysed(analysisContext);
+ list.clear();
+ }
+ }
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+ R r = this.communityService.batchImportWarehouseDonates(list);
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/AppletesBackstageConfigDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/AppletesBackstageConfigDTO.java
new file mode 100644
index 0000000..0ef2da9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/AppletesBackstageConfigDTO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.dtos;
+
+import java.util.List;
+
+import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvJumpDTO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 运营后台编辑配置
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-28 17:45
+ **/
+@Data
+@ApiModel(value = "运营后台编辑配置")
+public class AppletesBackstageConfigDTO {
+
+ @ApiModelProperty("广告配置参数集合")
+ private List<ComOpsAdvJumpDTO> comOpsAdvJumpDTOS;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/CommonDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/CommonDTO.java
new file mode 100644
index 0000000..0d70b51
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/CommonDTO.java
@@ -0,0 +1,14 @@
+package com.panzhihua.common.model.dtos;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("公共请求参数请求参数")
+public class CommonDTO {
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/DataKanBansDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/DataKanBansDto.java
new file mode 100644
index 0000000..2faf1ba
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/DataKanBansDto.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.dtos;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 运营后台数据看板请求参数
+ */
+@Data
+@ApiModel("运营后台数据看板请求参数")
+public class DataKanBansDto {
+
+ @ApiModelProperty("社区用户量统计类型（1.累计用户 2.本月新增）")
+ private Integer type;
+
+ private String areaCode;
+
+ private Integer pageNum;
+
+ private Integer pageSize;
+
+ private String appId;
+ /**
+ * 社区用户量统计类型（1.累计用户 2.本月新增）
+ */
+ public interface type{
+ int lj = 1;
+ int by = 2;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/EventResourceDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/EventResourceDTO.java
new file mode 100644
index 0000000..e74ae3c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/EventResourceDTO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.dtos;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/25 15:22
+ */
+@ApiModel("附件资源DTO")
+@Data
+public class EventResourceDTO implements Serializable {
+
+ @ApiModelProperty("地址")
+ private String url;
+
+ @ApiModelProperty("时间:秒")
+ private Integer resourceTime;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/ExcelDO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/ExcelDO.java
new file mode 100644
index 0000000..a3c694e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/ExcelDO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.dtos;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ExcelDO implements Serializable {
+
+ @ColumnWidth(10) // 定义列宽
+ @ExcelProperty(value = {"单位归属"}, index = 0)
+ private String belongTo;
+
+ @ColumnWidth(20) // 定义列宽
+ @ExcelProperty(value = {"所属党组织"}, index = 1)
+ private String orgName;
+
+ @ColumnWidth(26) // 定义列宽
+ @ExcelProperty(value = {"单位名称"}, index = 2)
+ private String unitName;
+
+ @ColumnWidth(20) // 定义列宽
+ @ExcelProperty(value = {"报道社区名称"}, index = 3)
+ private String communityName;
+
+ @ColumnWidth(20) // 定义列宽
+ @ExcelProperty(value = {"服务次数"}, index = 4)
+ private Integer serviceTimes;
+
+ @ColumnWidth(20) // 定义列宽
+ @ExcelProperty(value = {"服务时长"}, index = 5)
+ private Double serviceTime;
+
+ @ColumnWidth(20) // 定义列宽
+ @ExcelProperty(value = {"累计积分"}, index = 6)
+ private Long awardSum;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/FtpConfig.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/FtpConfig.java
new file mode 100644
index 0000000..ce955fa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/FtpConfig.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.dtos;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author lyq
+ * ftp配置信息传递类
+ */
+@Data
+public class FtpConfig {
+
+ private String userName;
+ private String password;
+ private String host;
+ private int port;
+ private String url;
+ private String excelUrl;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/IdDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/IdDTO.java
new file mode 100644
index 0000000..c519403
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/IdDTO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.dtos;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/28 16:30
+ */
+@ApiModel("id参数")
+@Data
+public class IdDTO {
+
+ @NotNull(message = "id不能为空")
+ @ApiModelProperty("id")
+ private String id;
+
+ @ApiModelProperty("网格id")
+ private Long gridId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageBaseDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageBaseDTO.java
new file mode 100644
index 0000000..901a87d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageBaseDTO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.dtos;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @title: PageBaseDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页基础数据DTO
+ * @author: hans
+ * @date: 2021/12/21 14:22
+ */
+@Data
+@ApiModel(value = "分页基础数据DTO")
+public class PageBaseDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "查询参数id", example = "10")
+ private Long paramId;
+
+ @ApiModelProperty(value = "字符串类型查询参数", example = "10")
+ private String param2;
+
+ @ApiModelProperty(value = "数字类型查询参数", example = "10")
+ private Integer param3;
+
+ @ApiModelProperty(value = "单个社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "社区id列表")
+ private List<Long> communityIds;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageDTO.java
new file mode 100644
index 0000000..1d86bea
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageDTO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.dtos;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import com.panzhihua.common.validated.PageGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 分页
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-04 17:20
+ **/
+@Data
+@ApiModel(value = "分页参数")
+public class PageDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1", required = true)
+ @NotNull(groups = {PageGroup.class}, message = "当前页数不能为空")
+ @Min(value = 1, groups = {PageGroup.class}, message = "当前页数不能为空")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10", required = true)
+ @NotNull(groups = {PageGroup.class}, message = "每页记录数不能为空")
+ @Min(value = 1, groups = {PageGroup.class}, message = "每页记录数不能为空")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "登录用户", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "通知数据类型 类型 0查询所有 1活动 2 服务 3系统 4积分消息", example = "0")
+ private Integer type;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PartyExcelDO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PartyExcelDO.java
new file mode 100644
index 0000000..08a81cd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PartyExcelDO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.dtos;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class PartyExcelDO {
+
+ @ColumnWidth(10) // 定义列宽
+ @ExcelProperty(value = {"单位归属"}, index = 0)
+ private String belongTo;
+
+ @ColumnWidth(20) // 定义列宽
+ @ExcelProperty(value = {"所属党组织"}, index = 1)
+ private String orgName;
+
+ @ColumnWidth(26) // 定义列宽
+ @ExcelProperty(value = {"单位名称"}, index = 2)
+ private String unitName;
+
+ @ColumnWidth(26) // 定义列宽
+ @ExcelProperty(value = {"姓名"}, index = 3)
+ private String memberName;
+
+ @ColumnWidth(20) // 定义列宽
+ @ExcelProperty(value = {"报道社区名称"}, index = 4)
+ private String belongCommunity;
+
+ @ColumnWidth(20) // 定义列宽
+ @ExcelProperty(value = {"服务次数"}, index = 5)
+ private Integer serviceTimes;
+
+ @ColumnWidth(20) // 定义列宽
+ @ExcelProperty(value = {"服务时长"}, index = 6)
+ private Double serviceTime;
+
+ @ColumnWidth(20) // 定义列宽
+ @ExcelProperty(value = {"累计积分"}, index = 7)
+ private Long partyCount;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java
new file mode 100644
index 0000000..13a117d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java
@@ -0,0 +1,64 @@
+package com.panzhihua.common.model.dtos.advertisement;
+
+import java.util.Date;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 广告新增
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-04 09:43
+ **/
+@Data
+@ApiModel(value = "广告新增")
+public class ComOpsAdvDTO {
+
+ @ApiModelProperty("主键id")
+ private Long id;
+
+ @ApiModelProperty("广告位置id")
+ @NotNull(groups = {AddGroup.class}, message = "广告位置不能为空")
+ @Min(value = 1, groups = {AddGroup.class}, message = "广告位置不能为空")
+ private Long posId;
+
+ @ApiModelProperty("图片路径")
+ @NotBlank(groups = {AddGroup.class}, message = "图片路径不能为空")
+ private String photoPath;
+
+ @ApiModelProperty("链接类型：0~ 外部链接；1 ~ 内部链接")
+ @NotNull(groups = {AddGroup.class}, message = "链接类型不能为空")
+ @Min(value = 0, groups = {AddGroup.class}, message = "链接类型不能为空")
+ private Integer linkType;
+
+ @ApiModelProperty(value = "上架时间", example = "2021-01-04 00:00:00")
+ @NotNull(groups = {AddGroup.class}, message = "上架时间不能为空")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date onAt;
+
+ @ApiModelProperty(value = "下架时间", example = "2024-01-04 00:00:00")
+ @NotNull(groups = {AddGroup.class}, message = "下架时间不能为空")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date offAt;
+
+ @ApiModelProperty("跳转内容id")
+ private Long jumpId;
+
+ @ApiModelProperty("跳转url地址")
+ private String jumpUrl;
+
+ @ApiModelProperty(value = "create_at", hidden = true)
+ private Date createAt;
+
+ @ApiModelProperty(value = "update_at", hidden = true)
+ private Date updateAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvJumpDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvJumpDTO.java
new file mode 100644
index 0000000..cb6cfdf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvJumpDTO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.dtos.advertisement;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 跳转内容
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-28 15:49
+ **/
+@Data
+@ApiModel(value = "跳转内容")
+public class ComOpsAdvJumpDTO {
+
+ @ApiModelProperty("id")
+ private Long id;
+
+ @ApiModelProperty("跳转内容")
+ private String jumpContent;
+
+ @ApiModelProperty("是否默认 0 否 1 是")
+ private Integer isDefault;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/PageComOpsAdvDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/PageComOpsAdvDTO.java
new file mode 100644
index 0000000..1a896f2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/PageComOpsAdvDTO.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.dtos.advertisement;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 分页广告查询
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-27 10:26
+ **/
+@Data
+@ApiModel(value = "分页广告查询")
+public class PageComOpsAdvDTO {
+
+ @ApiModelProperty("广告位置id")
+ private Long posId;
+
+ @ApiModelProperty(value = "上架时间--开始", example = "2021-01-04 00:00:00")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date onAtBegin;
+
+ @ApiModelProperty(value = "上架时间--结束", example = "2021-01-04 00:00:00")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date onAtEnd;
+
+ @ApiModelProperty(value = "下架时间--开始", example = "2024-01-04 00:00:00")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date offAtBegin;
+
+ @ApiModelProperty(value = "下架时间--结束", example = "2024-01-04 00:00:00")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date offAtEnd;
+
+ @ApiModelProperty(value = "当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "每页记录数", example = "10")
+ private Long pageSize;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/EventFile.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/EventFile.java
new file mode 100644
index 0000000..0e2adbf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/EventFile.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.dtos.api;
+
+import lombok.Data;
+
+/**
+ * program 攀枝花智慧社区项目 description 上报事件关联的文件实体对象
+ *
+ * @author manailin Date 2021-06-17 15:30
+ **/
+@Data
+public class EventFile {
+ /**
+ * 事件业务ID,本地的ID
+ */
+ private String dataId;
+ /**
+ * 事件关联的文件对象
+ */
+ private String files;
+ /**
+ * 文件类型
+ */
+ private String fileName;
+ /**
+ * 文件类型
+ */
+ private String type;
+ /**
+ * 关联模块
+ */
+ private String module;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/EventInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/EventInfo.java
new file mode 100644
index 0000000..cba1290
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/EventInfo.java
@@ -0,0 +1,84 @@
+package com.panzhihua.common.model.dtos.api;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import lombok.Data;
+
+/**
+ * program 攀枝花智慧社区项目 description 上报事件实体对象
+ *
+ * @author manailin Date 2021-06-17 15:30
+ **/
+@Data
+public class EventInfo {
+ /**
+ * 网格id，APP端每个网格员应该是固定的网格
+ */
+ private String gridId;
+ /**
+ * 网格 名称
+ */
+ private String gridName;
+ /**
+ * 事件类型code
+ */
+ private String caseTypeCode;
+ /**
+ * 事件类型名称
+ */
+ private String caseTypeName;
+ /**
+ * 事件发生时间，时间的实际发生时间，网格员可以修改的时间
+ */
+ private String happenTime;
+ /**
+ * 地址，手动填写或通过天地图获取的地址信息
+ */
+ private String happenAddress;
+ /**
+ * 经度，double字符串
+ */
+ private String longitude;
+ /**
+ * 纬度，double字符串
+ */
+ private String latitude;
+ /**
+ * 对本次事件的描述信息
+ */
+ private String caseDescription;
+ /**
+ * 对本次事件记录的时间，APP记录本条数据的时间，网格员自己看不到
+ */
+ private String caseRecordTime;
+ /**
+ * 处理方式，caseReport(立即上报)、caseHandler(事件自处)、caseCache(事件暂存)
+ */
+ private String handleType;
+ /**
+ * 处理的描述信息
+ */
+ private String handleDescription;
+ /**
+ * APP生产的数据id，用于平台判断重复提交
+ */
+ private String dataId;
+ /**
+ * 用户id
+ */
+ private String userId;
+ /**
+ * 处理的时间，APP点击提交的时间，并非平台接收的时间（APP可以离线使用
+ */
+ private String handleTime;
+ /**
+ * 标题
+ */
+ private String caseName;
+ /**
+ * 当事人姓名
+ */
+ private List<PartiesBody> partiesBody = new ArrayList<>();
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/GridMemberPageListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/GridMemberPageListDTO.java
new file mode 100644
index 0000000..39ad821
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/GridMemberPageListDTO.java
@@ -0,0 +1,48 @@
+package com.panzhihua.common.model.dtos.api;
+
+import lombok.Data;
+
+/**
+ * program 攀枝花智慧社区项目 description 浪潮网格员接口返回对象
+ *
+ * @author manailin Date 2021-06-22 15:30
+ **/
+@Data
+public class GridMemberPageListDTO {
+
+ private String bindUserId;
+ private String bindUserName;
+ private String birthDate;
+ private String contactPhone;
+ private String createBy;
+ private String createTime;
+ private String dutyType;
+ private String educationCode;
+ private String educationName;
+ private String genderCode;
+ private String genderName;
+ private String gridDutyId;
+ private String gridDutyName;
+ private String id;
+ private String imei;
+ private Integer isLeader;
+ private Integer jobNum;
+ private String lastReportTime;
+ private String latitude;
+ private String locateUpdateTime;
+ private String longitude;
+ private String name;
+ private String nationCode;
+ private String nationName;
+ private String orgDuty;
+ private String orgDutyDate;
+ private String orgId;
+ private String orgName;
+ private String password;
+ private String politicalAffiliationCode;
+ private String politicalAffiliationName;
+ private String standbyPhone;
+ private String updateBy;
+ private String updateTime;
+ private String workState;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/LcGridMember.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/LcGridMember.java
new file mode 100644
index 0000000..5dc4ff9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/LcGridMember.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.dtos.api;
+
+import lombok.Data;
+
+/**
+ * program 攀枝花智慧社区项目 description 上报事件关联的网格员实体对象
+ *
+ * @author manailin Date 2021-06-17 15:30
+ **/
+@Data
+public class LcGridMember {
+ /**
+ * 网格员名字
+ */
+ private String name;
+ /**
+ * 网格员电话
+ */
+ private String contactPhone;
+ /**
+ * 网格员工号
+ */
+ private String jobNum;
+ /**
+ * 网格员联系电话
+ */
+ private String imei;
+ /**
+ * 网格员登录密码
+ */
+ private String password;
+ /**
+ * 网格员任职时间 2021-06-18
+ */
+ private String orgDutyDate;
+ /**
+ * 网格员责任网格 8c86b8b467194270b6b066b9c32e3b9b,a028fe8a7fff455781fa0bc3f66132fd
+ */
+ private String select;
+ /**
+ * 网格员责任网格 8c86b8b467194270b6b066b9c32e3b9b,a028fe8a7fff455781fa0bc3f66132fd
+ */
+ private String gridDutyId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/PartiesBody.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/PartiesBody.java
new file mode 100644
index 0000000..a63542c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/api/PartiesBody.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.dtos.api;
+
+import lombok.Data;
+
+/**
+ * program 攀枝花智慧社区项目 description 上报事件中当事人实体对象
+ *
+ * @author manailin Date 2021-06-17 15:30
+ **/
+@Data
+public class PartiesBody {
+ /**
+ * 当事人名字
+ */
+ private String partyName;
+ /**
+ * 当事人电话
+ */
+ private String partyPhone;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/bracelet/BraceletEarlyWarningDO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/bracelet/BraceletEarlyWarningDO.java
new file mode 100644
index 0000000..93bc307
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/bracelet/BraceletEarlyWarningDO.java
@@ -0,0 +1,73 @@
+package com.panzhihua.common.model.dtos.bracelet;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@ApiModel("手环预警数据表")
+public class BraceletEarlyWarningDO
+{
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "预警时间（创建时间）")
+ private Date creationTime;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "处理时间")
+ private Date disposeTime;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updataTime;
+
+ @ApiModelProperty(value = "处理状态（1 未处理 2 已处理 3处理中）")
+ private String disposeType;
+
+ @ApiModelProperty(value = "处理人")
+ private String disposeUserId;
+
+ @ApiModelProperty(value = "设备编号")
+ private String equipmentNumber;
+
+ //预警类型( 1血压 2心率 3体温 4 SOS预警 )
+ @ApiModelProperty(value = "预警类型( 1血压 2心率 3体温 4 SOS预警 )")
+ private String earlyWarningType;
+
+ @ApiModelProperty(value = "预警内容")
+ private String earlyWarningText;
+
+ @ApiModelProperty(value = "处理图片")
+ private String disposeImgurl;
+
+ @ApiModelProperty(value = "处理内容")
+ private String disposeText;
+
+ @ApiModelProperty(value = "处理结果")
+ private String disposeResult;
+
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ @ApiModelProperty(value = "视频地址")
+ private String disposeVideoUrl;
+
+ @ApiModelProperty(value = "处理人姓名")
+ private String disposeUserName;
+ @ApiModelProperty(value = "绑定手机号")
+ private String binPhone;
+ @ApiModelProperty(value = "用户姓名")
+ private String userName;
+ @ApiModelProperty(value = "'居住地址'")
+ private String address;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/bracelet/BraceletUserDataDO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/bracelet/BraceletUserDataDO.java
new file mode 100644
index 0000000..b8dd0a7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/bracelet/BraceletUserDataDO.java
@@ -0,0 +1,223 @@
+package com.panzhihua.common.model.dtos.bracelet;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@ApiModel("手环用户数据表")
+public class BraceletUserDataDO
+{
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ /**
+ * 设备类型 智能手表，智能手环
+ */
+ @ApiModelProperty(value = "设备类型 智能手表，智能手环")
+ private String deviceType;
+ /**
+ * 设备型号 W11，W6，W5
+ */
+ @ApiModelProperty(value = "主键")
+ private String deviceModel;
+ /**
+ * 设备 IMEI
+ */
+ @ApiModelProperty(value = "设备 IMEI")
+ private String deviceId;
+ /**
+ * 设备手机号码
+ */
+ @ApiModelProperty(value = "设备手机号码")
+ private String mobile;
+ /**
+ * 101：血压数据
+ * 107：体温数据
+ * 110：计步数据
+ * 112：心率数据
+ * 201：SOS 呼叫请求
+ * 202：定位数据
+ * 301：穿戴设备电量
+ * 302：设备在线与离线
+ */
+ @ApiModelProperty(value = "101：血压数据 107：体温数据 110：计步数据 112：心率数据 201：SOS 呼叫请求 202：定位数据 301：穿戴设备电量 302：设备在线与离线")
+ private String dataType;
+
+
+
+ /**
+ * 数据 id
+ */
+ @ApiModelProperty(value = "数据id")
+ private String dataId;//":600911,
+ @ApiModelProperty(value = "更新时间")
+ private String time;//":"2020-12-23 12:00:00.210"
+
+
+ /**
+ * 血压测量新数据
+ */
+ // pm 心率
+ @ApiModelProperty(value = "心率")
+ private String pm;
+ // 高压（收缩压）
+ @ApiModelProperty(value = "高压（收缩压）")
+ private String pcp;
+ //低压（舒张压）
+ @ApiModelProperty(value = "低压（舒张压）")
+ private String pdp;
+
+
+ /**
+ * 温度测量新数据
+ */
+ //温度
+ @ApiModelProperty(value = "温度")
+ private String etg;
+
+
+ /**
+ * 运动测量新数据
+ * @return
+ */
+ //行走步数
+ @ApiModelProperty(value = "行走步数")
+ private String step;
+
+
+ /**
+ * SOS 请求的示例数据 定位数据的示例
+ *
+ * @return
+ */
+ //经度
+ @ApiModelProperty(value = "经度")
+ private String lng;//":"113.929906",
+ //纬度
+ @ApiModelProperty(value = "纬度")
+ private String lat;//":"22.52887",
+ //定位方式 “0”：GPS “1”：LBS “2”：WIFI
+ @ApiModelProperty(value = "定位方式 “0”：GPS “1”：LBS “2”：WIFI")
+ private String mode;//":"1",
+
+
+ /**
+ * 设备电量的示例数据
+ * @return
+ */
+ //电量 取值 0-100，例如：取值“20” 表示电量 20%
+ @ApiModelProperty(value = "电量 取值 0-100，例如：取值“20” 表示电量 20%")
+ private String elec;//":"1",
+
+
+ /**
+ * 设备在线与离线的示例数据
+ * @return
+ */
+ //“1”：设备在线 “0”：设备离线
+ @ApiModelProperty(value = "“1”：设备在线 “0”：设备离线")
+ private String onoff;//":"1",
+
+ //社区id
+ @ApiModelProperty(value = "社区id")
+ private String communityId;//":"1",
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date creationTime;
+
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updataTime;
+
+ //用户姓名
+ @ApiModelProperty(value = "用户姓名")
+ private String userName;
+
+ //年龄
+ @ApiModelProperty(value = "年龄")
+ private String ageNum;
+
+ //1 男 2 女
+ @ApiModelProperty(value = "1 男 2 女")
+ private String sex;
+
+ //身份证
+ @ApiModelProperty(value = "身份证")
+ private String identityCard;
+
+ //居住地址
+ @ApiModelProperty(value = "居住地址")
+ private String address;
+
+
+ //详细居住地址
+ @ApiModelProperty(value = "详细居住地址")
+ private String detailAddress;
+
+ //居住地的经度
+ @ApiModelProperty(value = "居住地的经度")
+ private String addLng;
+
+ //居住地的纬度
+ @ApiModelProperty(value = "居住地的纬度")
+ private String addLat;
+
+ //设备绑定手机号
+ @ApiModelProperty(value = "设备绑定手机号")
+ private String binPhone;
+
+ //紧急联系人
+ @ApiModelProperty(value = "紧急联系人")
+ private String emergencyContact;
+
+ //心率下限
+ @ApiModelProperty(value = "心率下限")
+ private String lowHeartRate;
+ //心率上限
+ @ApiModelProperty(value = "心率上限")
+ private String tallHeartRate;
+ //体温下限
+ @ApiModelProperty(value = "体温下限")
+ private String lowAnimalHeat;
+ //体温上限
+ @ApiModelProperty(value = "体温上限")
+ private String tallAnimalHeat;
+ //低压下限
+ @ApiModelProperty(value = "低压下限")
+ private String lowTensionFloor;
+ //低压上限
+ @ApiModelProperty(value = "低压上限")
+ private String lowTensionUpperLimit;
+ //高压下限
+ @ApiModelProperty(value = "高压下限")
+ private String highPressureFloor;
+ //高压上限
+ @ApiModelProperty(value = "高压上限")
+ private String highPressureUpperLimit;
+
+ @ApiModelProperty(value = "是否紧急 0 正常 1紧急")
+ private String isAbnormal;
+
+ @ApiModelProperty(value = "SOS电话1")
+ private String sgtel1;
+
+ @ApiModelProperty(value = "SOS电话2")
+ private String sgtel2;
+
+ @ApiModelProperty(value = "SOS电话3")
+ private String sgtel3;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/bracelet/SetSOS.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/bracelet/SetSOS.java
new file mode 100644
index 0000000..ddcf3a2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/bracelet/SetSOS.java
@@ -0,0 +1,14 @@
+package com.panzhihua.common.model.dtos.bracelet;
+
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "手环设置SOS 联系人")
+public class SetSOS {
+ private String emergencyContact1;
+ private String emergencyContact2;
+ private String emergencyContact3;
+ private String deviceId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialExportVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialExportVO.java
new file mode 100644
index 0000000..4de3034
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialExportVO.java
@@ -0,0 +1,70 @@
+package com.panzhihua.common.model.dtos.civil;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+public class ComActSocialExportVO {
+ /**
+ * 姓名 列: name
+ */
+ @ExcelProperty(value = "姓名")
+ private String name;
+ /**
+ * 联系电话 列: telephone
+ */
+ @ExcelProperty(value = "联系电话",index = 4)
+ private String telephone;
+ /**
+ * 性别0女1男 列: gen
+ */
+ @ExcelProperty(value = "性别",index = 2)
+ private Integer gen;
+ /**
+ * 出生日期 列: birthday
+ */
+ @ExcelProperty(value = "出生日期",index = 3)
+ private String birthday;
+ /**
+ * 社工证编号 列: social_worker_code
+ */
+ @ExcelProperty(value = "社工证号码",index = 1)
+ private String socialWorkerCode;
+
+ /**
+ * 所属街道 列: street_id
+ */
+ @ExcelProperty(value = "所属街道",index = 5)
+ private Long streetId;
+ /**
+ * 所属社区 列: community_id
+ */
+ @ExcelProperty(value = "所属社区",index = 6)
+ private Long communityId;
+
+ /**
+ * 技能领域 列: skill_field
+ */
+ @ExcelProperty(value = "技能领域",index = 9)
+ private String skillField;
+ /**
+ * 业务范围 列: business_scope
+ */
+ @ExcelProperty(value = "业务范围",index = 10)
+ private String businessScope;
+
+ /**
+ * 所属组织ID 列: social_org_id
+ */
+ @ExcelProperty(value = "所属机构",index = 7)
+ private Long socialOrgId;
+
+ /**
+ * 社工资质 列: social_qua
+ */
+ @ExcelProperty(value = "社工资质",index = 8)
+ private Long socialQua;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerAddDTO.java
new file mode 100644
index 0000000..79ad4d4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerAddDTO.java
@@ -0,0 +1,124 @@
+package com.panzhihua.common.model.dtos.civil;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.math.BigDecimal;
+import javax.validation.constraints.Digits;
+import javax.validation.constraints.*;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import org.hibernate.validator.constraints.Length;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-03
+ * */
+@Data
+@ApiModel("创建社工请求参数")
+public class ComActSocialWorkerAddDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "所属组织ID", hidden = false, example = "1")
+ private Long socialOrgId;
+
+ @NotBlank() @Length(max=32)
+ @ApiModelProperty(value = "姓名", hidden = false, example = "")
+ private String name;
+
+ @NotBlank() @Length(max=32)
+ @ApiModelProperty(value = "联系电话", hidden = false, example = "")
+ private String telephone;
+
+ @ApiModelProperty(value = "性别0女1男", hidden = false, example = "")
+ private Integer gen;
+
+ @ApiModelProperty(value = "所属街道", hidden = false, example = "")
+ private Long streetId;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "所属社区", hidden = false, example = "1")
+ private Long communityId;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
+ private String userName;
+
+ /**
+ * 身份证
+ */
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ /**
+ * 分类id
+ */
+ @ApiModelProperty(value = "分类id")
+ private String skillType;
+
+ /**
+ * 分类名称
+ */
+ @ApiModelProperty(value = "分类名称")
+ private String skillTypeName;
+
+ /**
+ * 入职时间
+ */
+ @ApiModelProperty(value = "入职时间")
+ private Date joinTime;
+
+ /**
+ * 住址
+ */
+ @ApiModelProperty(value = "住址")
+ private String address;
+
+ /**
+ * 图片
+ */
+ @ApiModelProperty(value = "图片")
+ private String image;
+
+ /**
+ * 学历
+ */
+ @ApiModelProperty(value = "学历")
+ private String education;
+
+ /**
+ * 政治面貌
+ */
+ @ApiModelProperty(value = "政治面貌")
+ private String politicalOutlook;
+
+ /**
+ * 民族
+ */
+ @ApiModelProperty(value = "民族")
+ private String nation;
+
+ /**
+ * 是否证件 0否 1是
+ */
+ @ApiModelProperty(value = "是否证件 0否 1是")
+ private Integer credential;
+
+ /**
+ * 年龄
+ */
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerDeleteDTO.java
new file mode 100644
index 0000000..9288b01
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerDeleteDTO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.dtos.civil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-03
+ * */
+@Data
+@ApiModel("删除社工请求参数")
+public class ComActSocialWorkerDeleteDTO {
+
+ @ApiModelProperty(value = "ID", hidden = false, example = "1")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
+ private String userName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerEditDTO.java
new file mode 100644
index 0000000..31d21a5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerEditDTO.java
@@ -0,0 +1,114 @@
+package com.panzhihua.common.model.dtos.civil;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import javax.validation.constraints.*;
+import java.math.*;
+import java.util.Date;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-03
+ * */
+@Data
+@ApiModel("编辑社工请求参数")
+public class ComActSocialWorkerEditDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "ID", hidden = false, example = "1")
+ private Long id;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "所属组织ID", hidden = false, example = "1")
+ private Long socialOrgId;
+
+ @Length(max=32)
+ @ApiModelProperty(value = "姓名", hidden = false, example = "")
+ private String name;
+
+ @Length(max=32)
+ @ApiModelProperty(value = "联系电话", hidden = false, example = "")
+ private String telephone;
+
+ @ApiModelProperty(value = "性别0女1男", hidden = false, example = "")
+ private Integer gen;
+
+ @ApiModelProperty(value = "所属街道", hidden = false, example = "")
+ private Long streetId;
+
+ @ApiModelProperty(value = "所属社区", hidden = false, example = "1")
+ private Long communityId;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
+ private String userName;
+
+ /**
+ * 身份证
+ */
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ /**
+ * 分类id
+ */
+ @ApiModelProperty(value = "分类id")
+ private String skillType;
+
+ /**
+ * 入职时间
+ */
+ @ApiModelProperty(value = "入职时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date joinTime;
+
+ /**
+ * 住址
+ */
+ @ApiModelProperty(value = "住址")
+ private String address;
+
+ /**
+ * 图片
+ */
+ @ApiModelProperty(value = "图片")
+ private String image;
+
+ /**
+ * 学历
+ */
+ @ApiModelProperty(value = "学历")
+ private String education;
+
+ /**
+ * 政治面貌
+ */
+ @ApiModelProperty(value = "政治面貌")
+ private String politicalOutlook;
+
+ /**
+ * 民族
+ */
+ @ApiModelProperty(value = "民族")
+ private String nation;
+
+ /**
+ * 是否证件 0否 1是
+ */
+ @ApiModelProperty(value = "是否证件 0否 1是")
+ private Integer credential;
+
+ private Integer age;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerExcelVO.java
new file mode 100644
index 0000000..6216b67
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerExcelVO.java
@@ -0,0 +1,84 @@
+package com.panzhihua.common.model.dtos.civil;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+public class ComActSocialWorkerExcelVO {
+
+ /**
+ * 姓名 列: name
+ */
+ @ExcelProperty(value = "姓名",index = 0)
+ private String name;
+ /**
+ * 身份证 列: social_worker_code
+ */
+ @ExcelProperty(value = "身份证号码",index = 1)
+ private String idCard;
+
+ /**
+ * 性别0女1男 列: gen
+ */
+ @ExcelProperty(value = "性别0女1男",index = 2)
+ private String gen;
+ /**
+ * 入职时间
+ */
+ @ExcelProperty(value = "入职时间",index = 3)
+ private Date joinTime;
+ /**
+ * 联系电话 列: telephone
+ */
+ @ExcelProperty(value = "联系电话",index = 4)
+ private String telephone;
+
+ /**
+ * 学历 列: street_id
+ */
+ @ExcelProperty(value = "学历",index = 5)
+ private String education;
+ /**
+ * 所属社区 列: community_id
+ */
+ @ExcelProperty(value = "所属社区",index = 6)
+ private String communityId;
+
+ /**
+ * 政治面貌
+ */
+ @ExcelProperty(value = "政治面貌",index = 7)
+ private String politicalOutlook;
+
+
+ /**
+ * 民族 列: social_qua
+ */
+ @ExcelProperty(value = "民族",index = 8)
+ private String nation;
+ /**
+ * 社工证
+ */
+ @ExcelProperty(value = "社工证",index = 9)
+ private String credential;
+ /**
+ * 住址
+ */
+ @ExcelProperty(value = "住址",index = 10)
+ private String address;
+ /**
+ * 年龄
+ */
+ @ExcelProperty(value = "年龄",index = 11)
+ private Integer age;
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/PageComActSocialWorkerDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/PageComActSocialWorkerDTO.java
new file mode 100644
index 0000000..acd6b0b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/PageComActSocialWorkerDTO.java
@@ -0,0 +1,145 @@
+package com.panzhihua.common.model.dtos.civil;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.*;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-03
+ * */
+@Data
+@ApiModel("查询社工请求参数")
+public class PageComActSocialWorkerDTO {
+
+ @ApiModelProperty(value = "分页-当前页数,默认：1", example = "1", position = 1)
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数,默认：10", example = "10", position = 2)
+ private Long pageSize = 10L;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "ID", hidden = false, example = "1")
+ private Long id;
+
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "所属组织ID", hidden = false, example = "1")
+ private Long socialOrgId;
+
+
+ @Length(max=32)
+ @ApiModelProperty(value = "姓名", hidden = false, example = "")
+ private String name;
+
+
+ @Length(max=32)
+ @ApiModelProperty(value = "联系电话", hidden = false, example = "")
+ private String telephone;
+
+
+ @Length(max=1)
+ @ApiModelProperty(value = "性别0女1男", hidden = false, example = "")
+ private String gen;
+
+ @Length(max=32)
+ @ApiModelProperty(value = "所属街道", hidden = false, example = "")
+ private String streetId;
+
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "所属社区", hidden = false, example = "1")
+ private Long communityId;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "创建人", hidden = false, example = "1")
+ private Long createBy;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "更新人", hidden = false, example = "1")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+ @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
+ private String userName;
+
+ /**
+ * 身份证
+ */
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ /**
+ * 分类id
+ */
+ @ApiModelProperty(value = "分类id")
+ private Long skillType;
+
+ /**
+ * 入职时间
+ */
+ @ApiModelProperty(value = "入职时间")
+ private Date joinTime;
+
+ /**
+ * 住址
+ */
+ @ApiModelProperty(value = "住址")
+ private String address;
+
+ /**
+ * 图片
+ */
+ @ApiModelProperty(value = "图片")
+ private String image;
+
+ /**
+ * 学历
+ */
+ @ApiModelProperty(value = "学历")
+ private String education;
+
+ /**
+ * 政治面貌
+ */
+ @ApiModelProperty(value = "政治面貌")
+ private String politicalOutlook;
+
+ /**
+ * 民族
+ */
+ @ApiModelProperty(value = "民族")
+ private String nation;
+
+ /**
+ * 是否证件 0否 1是
+ */
+ @ApiModelProperty(value = "是否证件 0否 1是")
+ private Integer credential;
+
+ @ApiModelProperty(value = "关键字搜索")
+ private String keyword;
+
+ @ApiModelProperty(value = "年龄开始")
+ private Integer ageBegin;
+
+ @ApiModelProperty(value = "年龄结束")
+ private Integer ageEnd;
+
+ @ApiModelProperty("活动id")
+ private Long activityId;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComActEasyPhotoEvaluateDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComActEasyPhotoEvaluateDto.java
new file mode 100644
index 0000000..e4d1b94
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComActEasyPhotoEvaluateDto.java
@@ -0,0 +1,72 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增随手拍、微心愿评价表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增随手拍、微心愿评价表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-01 13:44:37
+ */
+@Data
+@ApiModel("新增随手拍、微心愿评价表请求参数")
+public class AddComActEasyPhotoEvaluateDto {
+
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ /**
+ * 业务记录id
+ */
+ @ApiModelProperty(value = "业务记录id")
+ private Long serviceId;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+ /**
+ * 评分
+ */
+ @ApiModelProperty(value = "评分")
+ private Integer score;
+
+ /**
+ * 评价内容
+ */
+ @ApiModelProperty(value = "评价内容")
+ private String content;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ /**
+ * 业务分类（1.随手拍 2.微心愿）
+ */
+ @ApiModelProperty(value = "业务分类（1.随手拍 2.微心愿）")
+ private Integer serviceType;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComActEasyPhotoHandlerDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComActEasyPhotoHandlerDto.java
new file mode 100644
index 0000000..748e5e9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComActEasyPhotoHandlerDto.java
@@ -0,0 +1,56 @@
+package com.panzhihua.common.model.dtos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增随手拍、微心愿处理人绑定表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增随手拍、微心愿处理人绑定表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-01 13:45:12
+ */
+@Data
+@ApiModel("新增随手拍、微心愿处理人绑定表请求参数")
+public class AddComActEasyPhotoHandlerDto {
+
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ /**
+ * 处理人id
+ */
+ @ApiModelProperty(value = "处理人id")
+ private Long userId;
+
+ /**
+ * 业务id
+ */
+ @ApiModelProperty(value = "业务id")
+ private Long serviceId;
+
+ /**
+ * 人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）
+ */
+ @ApiModelProperty(value = "人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）")
+ private Integer type;
+
+ /**
+ * 业务类型（1.随手拍 2.微心愿）
+ */
+ @ApiModelProperty(value = "业务类型（1.随手拍 2.微心愿）")
+ private Integer serviceType;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityActivityDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityActivityDto.java
new file mode 100644
index 0000000..4e33da1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityActivityDto.java
@@ -0,0 +1,141 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增电动车商城-商家活动表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增电动车商城-商家活动表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 13:17:41
+ */
+@Data
+@ApiModel("新增电动车商城-商家活动表请求参数")
+public class AddComBatteryCommodityActivityDto {
+
+
+ /**
+ * 活动名称
+ */
+ @ApiModelProperty(value = "活动名称")
+ private String name;
+
+ /**
+ * 活动类型（1.拼团活动 2.砍价活动 3.限时秒杀）
+ */
+ @ApiModelProperty(value = "活动类型（1.拼团活动 2.砍价活动 3.限时秒杀）")
+ private Integer type;
+
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+
+ /**
+ * 状态（1.进行中 2.已下架 3.已结束）
+ */
+ @ApiModelProperty(value = "状态（1.进行中 2.已下架 3.已结束）")
+ private Integer status;
+
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+
+ /**
+ * 活动价格
+ */
+ @ApiModelProperty(value = "活动价格")
+ private BigDecimal price;
+
+ /**
+ * 活动截止时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "活动截止时间")
+ private Date endTime;
+
+ /**
+ * 拼团总团数
+ */
+ @ApiModelProperty(value = "拼团总团数")
+ private Integer collageNum;
+
+ /**
+ * 拼团人数
+ */
+ @ApiModelProperty(value = "拼团人数")
+ private Integer collagePeopleNum;
+
+ /**
+ * 活动图片
+ */
+ @ApiModelProperty(value = "活动图片")
+ private String images;
+
+ /**
+ * 活动商品总数
+ */
+ @ApiModelProperty(value = "活动商品总数")
+ private Integer commodityNum;
+
+ /**
+ * 活动规则
+ */
+ @ApiModelProperty(value = "活动规则")
+ private String rule;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+ /**
+ * 商品规格id
+ */
+ @ApiModelProperty(value = "商品规格id")
+ private Long specsId;
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityDto.java
new file mode 100644
index 0000000..a2cf9fd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityDto.java
@@ -0,0 +1,123 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增电动车商城-商品表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增电动车商城-商品表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-28 14:59:59
+ */
+@Data
+@ApiModel("新增电动车商城-商品表请求参数")
+public class AddComBatteryCommodityDto {
+
+
+ /**
+ * 商品名称
+ */
+ @ApiModelProperty(value = "商品名称")
+ private String name;
+
+ /**
+ * 商品编号
+ */
+ @ApiModelProperty(value = "商品编号")
+ private String code;
+
+ /**
+ * 商品价格
+ */
+ @ApiModelProperty(value = "商品价格")
+ private BigDecimal price;
+
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+
+ /**
+ * 状态（1.上架 2.下架）
+ */
+ @ApiModelProperty(value = "状态（1.上架 2.下架）")
+ private Integer status;
+
+ /**
+ * 商品分类id
+ */
+ @ApiModelProperty(value = "商品分类id")
+ private Long classId;
+
+ /**
+ * 商品简介
+ */
+ @ApiModelProperty(value = "商品简介")
+ private String introduce;
+
+ /**
+ * 邮费
+ */
+ @ApiModelProperty(value = "邮费")
+ private BigDecimal postage;
+
+ /**
+ * 商品图片
+ */
+ @ApiModelProperty(value = "商品图片")
+ private String images;
+
+ /**
+ * 商品详情
+ */
+ @ApiModelProperty(value = "商品详情")
+ private String detail;
+
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderBargainDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderBargainDto.java
new file mode 100644
index 0000000..81671db
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderBargainDto.java
@@ -0,0 +1,97 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增电动车商城-砍价订单记录表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增电动车商城-砍价订单记录表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 16:06:36
+ */
+@Data
+@ApiModel("新增电动车商城-砍价订单记录表请求参数")
+public class AddComBatteryCommodityOrderBargainDto {
+
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+
+ /**
+ * 活动id
+ */
+ @ApiModelProperty(value = "活动id")
+ private Long activityId;
+
+ /**
+ * 订单id
+ */
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
+
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+
+ /**
+ * 商品原价
+ */
+ @ApiModelProperty(value = "商品原价")
+ private BigDecimal originalPrice;
+
+ /**
+ * 目标价格
+ */
+ @ApiModelProperty(value = "目标价格")
+ private BigDecimal targetPrice;
+
+ /**
+ * 当前价格
+ */
+ @ApiModelProperty(value = "当前价格")
+ private BigDecimal currentPrice;
+
+ /**
+ * 当前已砍价次数
+ */
+ @ApiModelProperty(value = "当前已砍价次数")
+ private Integer count;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderBargainRecordDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderBargainRecordDto.java
new file mode 100644
index 0000000..7d68adc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderBargainRecordDto.java
@@ -0,0 +1,67 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增电动车商城-订单砍价记录表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增电动车商城-订单砍价记录表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 16:06:48
+ */
+@Data
+@ApiModel("新增电动车商城-订单砍价记录表请求参数")
+public class AddComBatteryCommodityOrderBargainRecordDto {
+
+
+ /**
+ * 砍价记录id
+ */
+ @ApiModelProperty(value = "砍价记录id")
+ private Long bargainId;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+ /**
+ * 砍价金额
+ */
+ @ApiModelProperty(value = "砍价金额")
+ private BigDecimal amount;
+
+ /**
+ * 原砍价用户id
+ */
+ @ApiModelProperty(value = "原砍价用户id")
+ private Long oldUserId;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderCollageTeamDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderCollageTeamDto.java
new file mode 100644
index 0000000..f03873e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderCollageTeamDto.java
@@ -0,0 +1,66 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增电动车商城-拼团订单团队表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增电动车商城-拼团订单团队表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 16:06:58
+ */
+@Data
+@ApiModel("新增电动车商城-拼团订单团队表请求参数")
+public class AddComBatteryCommodityOrderCollageTeamDto {
+
+
+ /**
+ * 活动id
+ */
+ @ApiModelProperty(value = "活动id")
+ private Long activityId;
+
+ /**
+ * 订单id
+ */
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
+
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+
+ /**
+ * 开团用户id
+ */
+ @ApiModelProperty(value = "开团用户id")
+ private Long userId;
+
+ /**
+ * 状态（1.等待拼团 2.拼团成功 3.拼团失败 4.已退款）
+ */
+ @ApiModelProperty(value = "状态（1.等待拼团 2.拼团成功 3.拼团失败 4.已退款）")
+ private Integer status;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderCollageTeamPeopleDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderCollageTeamPeopleDto.java
new file mode 100644
index 0000000..7a4cc15
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderCollageTeamPeopleDto.java
@@ -0,0 +1,66 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增电动车商城-拼团活动团队人员表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增电动车商城-拼团活动团队人员表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 16:07:10
+ */
+@Data
+@ApiModel("新增电动车商城-拼团活动团队人员表请求参数")
+public class AddComBatteryCommodityOrderCollageTeamPeopleDto {
+
+
+ /**
+ * 拼团团队id
+ */
+ @ApiModelProperty(value = "拼团团队id")
+ private Long teamId;
+
+ /**
+ * 团长id
+ */
+ @ApiModelProperty(value = "团长id")
+ private Long headUserId;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+ /**
+ * 参团类型（1.开团 2.参与拼团）
+ */
+ @ApiModelProperty(value = "参团类型（1.开团 2.参与拼团）")
+ private Integer type;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderDto.java
new file mode 100644
index 0000000..a7d55f6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommodityOrderDto.java
@@ -0,0 +1,217 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增电动车商城-订单表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增电动车商城-订单表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 13:18:45
+ */
+@Data
+@ApiModel("新增电动车商城-订单表请求参数")
+public class AddComBatteryCommodityOrderDto {
+
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+
+ /**
+ * 收货地址id
+ */
+ @ApiModelProperty(value = "收货地址id")
+ private Long addressId;
+
+ /**
+ * 活动id
+ */
+ @ApiModelProperty(value = "活动id")
+ private Long activityId;
+
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+
+ /**
+ * 商品规格id
+ */
+ @ApiModelProperty(value = "商品规格id")
+ private Long specsId;
+
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+
+ /**
+ * 活动状态（1.拼团活动 2.砍价活动 3.限时秒杀）
+ */
+ @ApiModelProperty(value = "活动状态（1.拼团活动 2.砍价活动 3.限时秒杀）")
+ private Integer activityType;
+
+ /**
+ * 订单状态（1.待付款 2.待发货 3.待收货 4.已完成 5.待拼团 6.待砍价 7.已退款 8.已关闭）
+ */
+ @ApiModelProperty(value = "订单状态（1.待付款 2.待发货 3.待收货 4.已完成 5.待拼团 6.待砍价 7.已退款 8.已关闭）")
+ private Integer status;
+
+ /**
+ * 拼团状态（1.拼团中 2.拼团成功 3.拼团失败）
+ */
+ @ApiModelProperty(value = "拼团状态（1.拼团中 2.拼团成功 3.拼团失败）")
+ private Integer collageStatus;
+
+ /**
+ * 砍价状态（1.砍价中 2.砍价成功 3.砍价失败）
+ */
+ @ApiModelProperty(value = "砍价状态（1.砍价中 2.砍价成功 3.砍价失败）")
+ private Integer bargainStatus;
+
+ /**
+ * 支付状态(1.未支付 2.已支付)
+ */
+ @ApiModelProperty(value = "支付状态(1.未支付 2.已支付)")
+ private Integer payStatus;
+
+ /**
+ * 是否已删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否已删除（1.是 2.否）")
+ private Integer isDel;
+
+ /**
+ * 支付方式（1.微信支付）
+ */
+ @ApiModelProperty(value = "支付方式（1.微信支付）")
+ private Integer payType;
+
+ /**
+ * 购买商品数量
+ */
+ @ApiModelProperty(value = "购买商品数量")
+ private Integer count;
+
+ /**
+ * 商品单价
+ */
+ @ApiModelProperty(value = "商品单价")
+ private BigDecimal price;
+
+ /**
+ * 订单金额
+ */
+ @ApiModelProperty(value = "订单金额")
+ private BigDecimal amount;
+
+ /**
+ * 运费
+ */
+ @ApiModelProperty(value = "运费")
+ private BigDecimal freight;
+
+ /**
+ * 物流单号
+ */
+ @ApiModelProperty(value = "物流单号")
+ private String logisticsNo;
+
+ /**
+ * 物流公司
+ */
+ @ApiModelProperty(value = "物流公司")
+ private String logisticsCompany;
+
+ /**
+ * 订单最终金额
+ */
+ @ApiModelProperty(value = "订单最终金额")
+ private BigDecimal finalAmount;
+
+ /**
+ * 支付单号
+ */
+ @ApiModelProperty(value = "支付单号")
+ private String payNo;
+
+ /**
+ * 支付总金额
+ */
+ @ApiModelProperty(value = "支付总金额")
+ private BigDecimal payAmount;
+
+ /**
+ * 订单备注
+ */
+ @ApiModelProperty(value = "订单备注")
+ private String remark;
+
+ /**
+ * 发货时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "发货时间")
+ private Date deliveryTime;
+
+ /**
+ * 收货时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "收货时间")
+ private Date receivingTime;
+
+ /**
+ * 下单时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "下单时间")
+ private Date createAt;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommoditySpecsDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommoditySpecsDto.java
new file mode 100644
index 0000000..50f3363
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryCommoditySpecsDto.java
@@ -0,0 +1,99 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增电动车商城-商品规格表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增电动车商城-商品规格表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-28 15:16:22
+ */
+@Data
+@ApiModel("新增电动车商城-商品规格表请求参数")
+public class AddComBatteryCommoditySpecsDto {
+
+
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+
+ /**
+ * 规格名称
+ */
+ @ApiModelProperty(value = "规格名称")
+ private String name;
+
+ /**
+ * 规格库存数量
+ */
+ @ApiModelProperty(value = "规格库存数量")
+ private Integer stock;
+
+ /**
+ * 规格价格
+ */
+ @ApiModelProperty(value = "规格价格")
+ private BigDecimal price;
+
+ /**
+ * 规格图片
+ */
+ @ApiModelProperty(value = "规格图片")
+ private String images;
+
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryStoreClassDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryStoreClassDto.java
new file mode 100644
index 0000000..d7dd020
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryStoreClassDto.java
@@ -0,0 +1,80 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增电动车商城-商家分类表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增电动车商城-商家分类表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 11:01:57
+ */
+@Data
+@ApiModel("新增电动车商城-商家分类表请求参数")
+public class AddComBatteryStoreClassDto {
+
+
+ /**
+ * 分类名称
+ */
+ @ApiModelProperty(value = "分类名称")
+ private String name;
+
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+
+ /**
+ * 状态（1.启用 2.禁用）
+ */
+ @ApiModelProperty(value = "状态（1.启用 2.禁用）")
+ private Integer status;
+
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryStoreDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryStoreDto.java
new file mode 100644
index 0000000..5a2dd3b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryStoreDto.java
@@ -0,0 +1,134 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增电动车商城-商家表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增电动车商城-商家表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-28 13:44:59
+ */
+@Data
+@ApiModel("新增电动车商城-商家表请求参数")
+public class AddComBatteryStoreDto {
+
+
+ /**
+ * 商家名称
+ */
+ @ApiModelProperty(value = "商家名称")
+ private String name;
+
+ /**
+ * 注册手机
+ */
+ @ApiModelProperty(value = "注册手机")
+ private String regPhone;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+
+ /**
+ * 商家账号
+ */
+ @ApiModelProperty(value = "商家账号")
+ private String account;
+
+ /**
+ * 商家密码
+ */
+ @ApiModelProperty(value = "商家密码")
+ private String password;
+
+ /**
+ * 状态（1.启用 2.禁用）
+ */
+ @ApiModelProperty(value = "状态（1.启用 2.禁用）")
+ private Integer status;
+
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+
+ /**
+ * 商家logo
+ */
+ @ApiModelProperty(value = "商家logo")
+ private String logo;
+
+ /**
+ * 商家简介
+ */
+ @ApiModelProperty(value = "商家简介")
+ private String introduction;
+
+ /**
+ * 商家地址
+ */
+ @ApiModelProperty(value = "商家地址")
+ private String address;
+
+ /**
+ * 详细地址
+ */
+ @ApiModelProperty(value = "详细地址")
+ private String detailAddress;
+
+ /**
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ @ApiModelProperty(value = "纬度")
+ private String latitude;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryTradeOrderDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryTradeOrderDto.java
new file mode 100644
index 0000000..614ecf2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryTradeOrderDto.java
@@ -0,0 +1,131 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增电动车商城-微信交易流水表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增电动车商城-微信交易流水表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-01 13:18:50
+ */
+@Data
+@ApiModel("新增电动车商城-微信交易流水表请求参数")
+public class AddComBatteryTradeOrderDto {
+
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+ /**
+ * 用户openid
+ */
+ @ApiModelProperty(value = "用户openid")
+ private String openId;
+
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+
+ /**
+ * 订单状态（1.待支付 2.已支付 3.申请退款 4.已退款 5.已关闭）
+ */
+ @ApiModelProperty(value = "订单状态（1.待支付 2.已支付 3.申请退款 4.已退款 5.已关闭）")
+ private Integer status;
+
+ /**
+ * 支付类型（1.微信 ）
+ */
+ @ApiModelProperty(value = "支付类型（1.微信 ）")
+ private Integer payType;
+
+ /**
+ * 订单支付状态（1.待支付 2.已支付）
+ */
+ @ApiModelProperty(value = "订单支付状态（1.待支付 2.已支付）")
+ private Integer payStatus;
+
+ /**
+ * 订单金额
+ */
+ @ApiModelProperty(value = "订单金额")
+ private BigDecimal orderAmount;
+
+ /**
+ * 实际支付金额
+ */
+ @ApiModelProperty(value = "实际支付金额")
+ private BigDecimal payAmount;
+
+ /**
+ * 支付单号
+ */
+ @ApiModelProperty(value = "支付单号")
+ private String payNo;
+
+ /**
+ * 支付时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "支付时间")
+ private Date payTime;
+
+ /**
+ * 交易类型（1.电动车商城购买商品）
+ */
+ @ApiModelProperty(value = "交易类型（1.电动车商城购买商品）")
+ private Integer tradeType;
+
+ /**
+ * 交易业务订单id
+ */
+ @ApiModelProperty(value = "交易业务订单id")
+ private Long tradeOrderId;
+
+ /**
+ * 交易业务订单号
+ */
+ @ApiModelProperty(value = "交易业务订单号")
+ private String tradeOrderNo;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryUserAddressDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryUserAddressDto.java
new file mode 100644
index 0000000..a79867b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComBatteryUserAddressDto.java
@@ -0,0 +1,116 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增电动车商城-用户收货地址表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增电动车商城-用户收货地址表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 13:18:20
+ */
+@Data
+@ApiModel("新增电动车商城-用户收货地址表请求参数")
+public class AddComBatteryUserAddressDto {
+
+
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 姓名
+ */
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ /**
+ * 详细地址
+ */
+ @ApiModelProperty(value = "详细地址")
+ private String address;
+
+ /**
+ * 是否是默认地址（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否是默认地址（1.是 2.否）")
+ private Integer isDefault;
+
+ /**
+ * 省份行政区划代码
+ */
+ @ApiModelProperty(value = "省份行政区划代码")
+ private String provinceAdcode;
+
+ /**
+ * 省份名称
+ */
+ @ApiModelProperty(value = "省份名称")
+ private String provinceName;
+
+ /**
+ * 城市行政区划代码
+ */
+ @ApiModelProperty(value = "城市行政区划代码")
+ private String cityAdcode;
+
+ /**
+ * 城市名称
+ */
+ @ApiModelProperty(value = "城市名称")
+ private String cityName;
+
+ /**
+ * 区县行政区划代码
+ */
+ @ApiModelProperty(value = "区县行政区划代码")
+ private String districtAdcode;
+
+ /**
+ * 区县名称
+ */
+ @ApiModelProperty(value = "区县名称")
+ private String districtName;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarBrandDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarBrandDto.java
new file mode 100644
index 0000000..d900c2e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarBrandDto.java
@@ -0,0 +1,86 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增换新车-品牌表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增换新车-品牌表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:37:25
+ */
+@Data
+@ApiModel("新增换新车-品牌表请求参数")
+public class AddComChangeCarBrandDto {
+
+
+ /**
+ * 品牌编号
+ */
+ @ApiModelProperty(value = "品牌编号")
+ private String code;
+
+ /**
+ * 品牌名称
+ */
+ @ApiModelProperty(value = "品牌名称")
+ private String name;
+
+ /**
+ * 状态（1.启用 2.禁用）
+ */
+ @ApiModelProperty(value = "状态（1.启用 2.禁用）")
+ private Integer status;
+
+ /**
+ * 品牌logo
+ */
+ @ApiModelProperty(value = "品牌logo")
+ private String logo;
+
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarInquiryDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarInquiryDto.java
new file mode 100644
index 0000000..7baab60
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarInquiryDto.java
@@ -0,0 +1,72 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增换新车-分期询价表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增换新车-分期询价表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:39:07
+ */
+@Data
+@ApiModel("新增换新车-分期询价表请求参数")
+public class AddComChangeCarInquiryDto {
+
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ /**
+ * 用户称呼
+ */
+ @ApiModelProperty(value = "用户称呼")
+ private String name;
+
+ /**
+ * 用户手机号
+ */
+ @ApiModelProperty(value = "用户手机号")
+ private String phone;
+
+ /**
+ * 类型（1.分期 2.询价）
+ */
+ @ApiModelProperty(value = "类型（1.分期 2.询价）")
+ private Integer type;
+
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）",hidden = true)
+ private Integer isDel;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间",hidden = true)
+ private Date createAt;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id",hidden = true)
+ private Long createBy;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarModelDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarModelDto.java
new file mode 100644
index 0000000..71214f8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarModelDto.java
@@ -0,0 +1,99 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增换新车-车型管理表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增换新车-车型管理表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:41:56
+ */
+@Data
+@ApiModel("新增换新车-车型管理表请求参数")
+public class AddComChangeCarModelDto {
+
+
+ /**
+ * 车型名称
+ */
+ @ApiModelProperty(value = "车型名称")
+ private String name;
+
+ /**
+ * 图片url，多张以,隔开
+ */
+ @ApiModelProperty(value = "图片url，多张以,隔开")
+ private String images;
+
+ /**
+ * 最低价格
+ */
+ @ApiModelProperty(value = "最低价格")
+ private BigDecimal minPrice;
+
+ /**
+ * 品牌id
+ */
+ @ApiModelProperty(value = "品牌id")
+ private Long brandId;
+
+ /**
+ * 车辆详情
+ */
+ @ApiModelProperty(value = "车辆详情")
+ private String detail;
+
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+
+ /**
+ * 状态（1.上架 2.下架）
+ */
+ @ApiModelProperty(value = "状态（1.上架 2.下架）")
+ private Integer status;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarModelRelationDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarModelRelationDto.java
new file mode 100644
index 0000000..1b3646c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarModelRelationDto.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.dtos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增换新车-车型与规格关联表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增换新车-车型与规格关联表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:55:30
+ */
+@Data
+@ApiModel("新增换新车-车型与规格关联表请求参数")
+public class AddComChangeCarModelRelationDto {
+
+
+ /**
+ * 车型id
+ */
+ @ApiModelProperty(value = "车型id")
+ private Long modelId;
+
+ /**
+ * 车型规格id
+ */
+ @ApiModelProperty(value = "车型规格id")
+ private Long modelSpecsId;
+
+ /**
+ * 车型子规格id
+ */
+ @ApiModelProperty(value = "车型子规格id")
+ private Long modelSpecsChildrenId;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarModelSpecsChildrenDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarModelSpecsChildrenDto.java
new file mode 100644
index 0000000..4f40eb6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarModelSpecsChildrenDto.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.dtos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增换新车-车型子规格表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增换新车-车型子规格表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:55:34
+ */
+@Data
+@ApiModel("新增换新车-车型子规格表请求参数")
+public class AddComChangeCarModelSpecsChildrenDto {
+
+
+ /**
+ * 主规格id
+ */
+ @ApiModelProperty(value = "主规格id")
+ private Long specsId;
+
+ /**
+ * 子规格名称
+ */
+ @ApiModelProperty(value = "子规格名称")
+ private String name;
+
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarModelSpecsDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarModelSpecsDto.java
new file mode 100644
index 0000000..de0c479
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComChangeCarModelSpecsDto.java
@@ -0,0 +1,74 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增换新车-车型规格表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增换新车-车型规格表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:55:32
+ */
+@Data
+@ApiModel("新增换新车-车型规格表请求参数")
+public class AddComChangeCarModelSpecsDto {
+
+
+ /**
+ * 规格编号
+ */
+ @ApiModelProperty(value = "规格编号")
+ private String code;
+
+ /**
+ * 规格名称
+ */
+ @ApiModelProperty(value = "规格名称")
+ private String name;
+
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComMngVolunteerOrgTeamDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComMngVolunteerOrgTeamDto.java
new file mode 100644
index 0000000..54d4a1b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComMngVolunteerOrgTeamDto.java
@@ -0,0 +1,67 @@
+package com.panzhihua.common.model.dtos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 新增志愿者组织队伍表请求参数
+ *
+ * @author lyq
+ * @since 2021-10-30 16:04:49
+ */
+@Data
+@ApiModel("新增志愿者组织队伍表请求参数")
+public class AddComMngVolunteerOrgTeamDto {
+
+ private Long id;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ private String name;
+
+ /**
+ * 父级id,为0时则为组织，不为0则为队伍
+ */
+ @ApiModelProperty(value = "父级id,为0时则为组织，不为0则为队伍")
+ private Long parentId;
+
+ /**
+ * 服务类型
+ */
+ @ApiModelProperty(value = "服务类型")
+ private Long serviceTypeId;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+
+
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComMngVolunteerServiceTypeDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComMngVolunteerServiceTypeDto.java
new file mode 100644
index 0000000..608bab4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComMngVolunteerServiceTypeDto.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.dtos.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 新增志愿者服务类型表请求参数
+ *
+ * @author lyq
+ * @since 2021-10-30 16:47:10
+ */
+@Data
+@ApiModel("新增志愿者服务类型表请求参数")
+public class AddComMngVolunteerServiceTypeDto {
+
+
+ private Long id;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ private String name;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComMngVolunteerSkillDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComMngVolunteerSkillDto.java
new file mode 100644
index 0000000..1d4ac99
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComMngVolunteerSkillDto.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.dtos.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 新增志愿者技能表请求参数
+ *
+ * @author lyq
+ * @since 2021-10-30 16:47:37
+ */
+@Data
+@ApiModel("新增志愿者技能表请求参数")
+public class AddComMngVolunteerSkillDto {
+
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ private String name;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComPbCheckUnitDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComPbCheckUnitDto.java
new file mode 100644
index 0000000..8f5205e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComPbCheckUnitDto.java
@@ -0,0 +1,120 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增党建-报到单位请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增党建-报到单位请求参数
+ *
+ * @author lyq
+ * @date 2022-02-16 16:22:40
+ */
+@Data
+@ApiModel("新增党建-报到单位请求参数")
+public class AddComPbCheckUnitDto {
+
+
+ /**
+ * 单位名称
+ */
+ @ApiModelProperty(value = "单位名称")
+ private String name;
+
+ /**
+ * 单位类别（1.国有企业 2.国有控股企业 3.外资企业 4.合资企业 5.私营企业 6.事业单位 7.国家行政机关 8.政府）
+ */
+ @ApiModelProperty(value = "单位类别（1.国有企业 2.国有控股企业 3.外资企业 4.合资企业 5.私营企业 6.事业单位 7.国家行政机关 8.政府）")
+ private Integer type;
+
+ /**
+ * 负责人
+ */
+ @ApiModelProperty(value = "负责人")
+ private String contacts;
+
+ /**
+ * 负责人联系电话
+ */
+ @ApiModelProperty(value = "负责人联系电话")
+ private String phone;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "党组织名称")
+ private String orgName;
+
+ @ApiModelProperty(value = "党组织logo")
+ private String logo;
+
+ private Integer partyNum;
+
+ @ApiModelProperty(value = "特长描述")
+ private String specialtyName;
+ @ApiModelProperty(value = "帮扶社区id")
+ private Long helpCommunityId;
+ @ApiModelProperty(value = "帮扶社区名字")
+ private String helpCommunityName;
+ @ApiModelProperty(value = "帮扶社区手机号")
+ private String helpCommunityContacts;
+ @ApiModelProperty(value = "帮扶社区联系人")
+ private String helpCommunityContactsName;
+ @ApiModelProperty(value = "小区id")
+ private Long villageId;
+ @ApiModelProperty(value = "小区名字")
+ private String villageName;
+
+ private String natureName;
+
+ private Integer natureId;
+
+ private String address;
+ @ApiModelProperty(value = "管理员名称")
+ private String adminName;
+ @ApiModelProperty(value = "管理员电话")
+ private String adminPhone;
+ @ApiModelProperty(value = "其他")
+ private String otherRemark;
+ @ApiModelProperty(value = "单位所属")
+ private String belongTo;
+ @ApiModelProperty(value = "联系人json")
+ private String adminJson;
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddSysUserDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddSysUserDto.java
new file mode 100644
index 0000000..b127ede
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddSysUserDto.java
@@ -0,0 +1,255 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 新增用户表 后台用户+小程序用户请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 新增用户表 后台用户+小程序用户请求参数
+ *
+ * @author lyq
+ * @date 2022-03-28 14:28:10
+ */
+@Data
+@ApiModel("新增用户表 后台用户+小程序用户请求参数")
+public class AddSysUserDto {
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private Long userId;
+
+ /**
+ * 登录账户
+ */
+ @ApiModelProperty(value = "登录账户")
+ private String account;
+
+ /**
+ * 登录密码
+ */
+ @ApiModelProperty(value = "登录密码")
+ private String password;
+
+ /**
+ * 微信小程序唯一标识
+ */
+ @ApiModelProperty(value = "微信小程序唯一标识")
+ private String openid;
+
+ /**
+ * 会话密钥
+ */
+ @ApiModelProperty(value = "会话密钥")
+ private String sessionKey;
+
+ /**
+ * 用户在开放平台的唯一标识符
+ */
+ @ApiModelProperty(value = "用户在开放平台的唯一标识符")
+ private String unionid;
+
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ /**
+ * 昵称
+ */
+ @ApiModelProperty(value = "昵称")
+ private String nickName;
+
+ /**
+ * 真实名字
+ */
+ @ApiModelProperty(value = "真实名字")
+ private String name;
+
+ /**
+ * 社区ID
+ */
+ @ApiModelProperty(value = "社区ID")
+ private Long communityId;
+
+ /**
+ * 性别 1 男 2 女
+ */
+ @ApiModelProperty(value = "性别 1 男 2 女")
+ private Integer sex;
+
+ /**
+ * 身份证号
+ */
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+
+ /**
+ * 生日
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "生日")
+ private Date birthday;
+
+ /**
+ * 头像
+ */
+ @ApiModelProperty(value = "头像")
+ private String imageUrl;
+
+ /**
+ * 用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10一键报警app
+ */
+ @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10一键报警app")
+ private Integer type;
+
+ /**
+ * 职业
+ */
+ @ApiModelProperty(value = "职业")
+ private String job;
+
+ /**
+ * 是否志愿者 0 否 1 是
+ */
+ @ApiModelProperty(value = "是否志愿者 0 否 1 是")
+ private Integer isVolunteer;
+
+ /**
+ * 是否党员 0 否 1 是
+ */
+ @ApiModelProperty(value = "是否党员 0 否 1 是")
+ private Integer isPartymember;
+
+ /**
+ * 1 启用 2 禁用
+ */
+ @ApiModelProperty(value = "1 启用 2 禁用")
+ private Integer status;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ /**
+ * 最后登录时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "最后登录时间")
+ private Date lastLoginTime;
+
+ /**
+ * 标签多个用,隔开
+ */
+ @ApiModelProperty(value = "标签多个用,隔开")
+ private String tags;
+
+ /**
+ * 家庭id
+ */
+ @ApiModelProperty(value = "家庭id")
+ private Long familyId;
+
+ /**
+ * 人脸采集照片url
+ */
+ @ApiModelProperty(value = "人脸采集照片url")
+ private String faceUrl;
+
+ /**
+ * 人脸采集审核状态 0 待审核 1 审核通过 2驳回
+ */
+ @ApiModelProperty(value = "人脸采集审核状态 0 待审核 1 审核通过 2驳回")
+ private Integer faceState;
+
+ /**
+ * 驳回原因
+ */
+ @ApiModelProperty(value = "驳回原因")
+ private String rejectReson;
+
+ /**
+ * 小区id
+ */
+ @ApiModelProperty(value = "小区id")
+ private Long areaId;
+
+ /**
+ * 证件照（人相面）照片
+ */
+ @ApiModelProperty(value = "证件照（人相面）照片")
+ private String cardPhotoFront;
+
+ /**
+ * 证件照（国徽面）照片
+ */
+ @ApiModelProperty(value = "证件照（国徽面）照片")
+ private String cardPhotoBack;
+
+ /**
+ * 户口本
+ */
+ @ApiModelProperty(value = "户口本")
+ private String familyBook;
+
+ /**
+ * 连续登陆天数 每天凌晨定时任务更新
+ */
+ @ApiModelProperty(value = "连续登陆天数 每天凌晨定时任务更新")
+ private Integer continuousLandingDays;
+
+ /**
+ * 小程序首页是否显示公告(1.是 2.否)
+ */
+ @ApiModelProperty(value = "小程序首页是否显示公告(1.是 2.否)")
+ private Integer isTips;
+
+ /**
+ * 网格员工作状态(1.在岗 2.脱岗 3.已下班)
+ */
+ @ApiModelProperty(value = "网格员工作状态(1.在岗 2.脱岗 3.已下班)")
+ private Integer workStatus;
+
+ /**
+ * 网格员上班开始时间
+ */
+ @ApiModelProperty(value = "网格员上班开始时间")
+ private Integer workStartTime;
+
+ /**
+ * 网格员上班结束时间
+ */
+ @ApiModelProperty(value = "网格员上班结束时间")
+ private Integer workEndTime;
+
+ /**
+ * 高龄认证显示提示(1.是 2.否)
+ */
+ @ApiModelProperty(value = "高龄认证显示提示(1.是 2.否)")
+ private Integer bigAgeTips;
+
+ /**
+ * 明文密码
+ */
+ @ApiModelProperty(value = "明文密码")
+ private String plaintextPassword;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComActEasyPhotoEvaluateDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComActEasyPhotoEvaluateDto.java
new file mode 100644
index 0000000..ebce8c3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComActEasyPhotoEvaluateDto.java
@@ -0,0 +1,69 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑随手拍、微心愿评价表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑随手拍、微心愿评价表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-01 13:44:37
+ */
+@Data
+@ApiModel("编辑随手拍、微心愿评价表请求参数")
+public class EditComActEasyPhotoEvaluateDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+ /**
+ * 业务记录id
+ */
+ @ApiModelProperty(value = "业务记录id")
+ private Long serviceId;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 评分
+ */
+ @ApiModelProperty(value = "评分")
+ private Integer score;
+ /**
+ * 评价内容
+ */
+ @ApiModelProperty(value = "评价内容")
+ private String content;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 业务分类（1.随手拍 2.微心愿）
+ */
+ @ApiModelProperty(value = "业务分类（1.随手拍 2.微心愿）")
+ private Integer serviceType;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComActEasyPhotoHandlerDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComActEasyPhotoHandlerDto.java
new file mode 100644
index 0000000..9c4c1c5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComActEasyPhotoHandlerDto.java
@@ -0,0 +1,83 @@
+package com.panzhihua.common.model.dtos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * title: 编辑随手拍、微心愿处理人绑定表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑随手拍、微心愿处理人绑定表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-01 13:45:12
+ */
+@Data
+@ApiModel("编辑随手拍、微心愿处理人绑定表请求参数")
+public class EditComActEasyPhotoHandlerDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+ /**
+ * 处理人id
+ */
+ @ApiModelProperty(value = "处理人id")
+ private Long userId;
+ /**
+ * 业务id
+ */
+ @ApiModelProperty(value = "业务id")
+ private Long serviceId;
+ /**
+ * 人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）
+ */
+ @ApiModelProperty(value = "人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）")
+ private Integer type;
+ /**
+ * 业务类型（1.随手拍 2.微心愿）
+ */
+ @ApiModelProperty(value = "业务类型（1.随手拍 2.微心愿）")
+ private Integer serviceType;
+
+ /**
+ * 服务状态 0待执行 1已完成
+ */
+ @ApiModelProperty(value = "服务状态 0待执行 1已完成")
+ private Integer status;
+ /**
+ * 发起人id
+ */
+ private Long senderId;
+
+ private Date createTime;
+ /**
+ * 得分
+ */
+ @ApiModelProperty(value = "得分")
+ private Integer score;
+ /**
+ * 汇报内容
+ */
+ @ApiModelProperty(value = "汇报内容")
+ private String resultContent;
+ /**
+ * 汇报图片
+ */
+ @ApiModelProperty(value = "汇报图片")
+ private String resultUrl;
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityActivityDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityActivityDto.java
new file mode 100644
index 0000000..53faa81
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityActivityDto.java
@@ -0,0 +1,129 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑电动车商城-商家活动表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑电动车商城-商家活动表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 13:17:41
+ */
+@Data
+@ApiModel("编辑电动车商城-商家活动表请求参数")
+public class EditComBatteryCommodityActivityDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 活动名称
+ */
+ @ApiModelProperty(value = "活动名称")
+ private String name;
+ /**
+ * 活动类型（1.拼团活动 2.砍价活动 3.限时秒杀）
+ */
+ @ApiModelProperty(value = "活动类型（1.拼团活动 2.砍价活动 3.限时秒杀）")
+ private Integer type;
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+ /**
+ * 状态（1.进行中 2.已下架 3.已结束）
+ */
+ @ApiModelProperty(value = "状态（1.进行中 2.已下架 3.已结束）")
+ private Integer status;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 活动价格
+ */
+ @ApiModelProperty(value = "活动价格")
+ private BigDecimal price;
+ /**
+ * 活动截止时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "活动截止时间")
+ private Date endTime;
+ /**
+ * 拼团总团数
+ */
+ @ApiModelProperty(value = "拼团总团数")
+ private Integer collageNum;
+ /**
+ * 拼团人数
+ */
+ @ApiModelProperty(value = "拼团人数")
+ private Integer collagePeopleNum;
+ /**
+ * 活动图片
+ */
+ @ApiModelProperty(value = "活动图片")
+ private String images;
+ /**
+ * 活动商品总数
+ */
+ @ApiModelProperty(value = "活动商品总数")
+ private Integer commodityNum;
+ /**
+ * 活动规则
+ */
+ @ApiModelProperty(value = "活动规则")
+ private String rule;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+ /**
+ * 商品规格id
+ */
+ @ApiModelProperty(value = "商品规格id")
+ private Long specsId;
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityDto.java
new file mode 100644
index 0000000..45c2021
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityDto.java
@@ -0,0 +1,112 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑电动车商城-商品表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑电动车商城-商品表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-28 14:59:59
+ */
+@Data
+@ApiModel("编辑电动车商城-商品表请求参数")
+public class EditComBatteryCommodityDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 商品名称
+ */
+ @ApiModelProperty(value = "商品名称")
+ private String name;
+ /**
+ * 商品编号
+ */
+ @ApiModelProperty(value = "商品编号")
+ private String code;
+ /**
+ * 商品价格
+ */
+ @ApiModelProperty(value = "商品价格")
+ private BigDecimal price;
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+ /**
+ * 状态（1.上架 2.下架）
+ */
+ @ApiModelProperty(value = "状态（1.上架 2.下架）")
+ private Integer status;
+ /**
+ * 商品分类id
+ */
+ @ApiModelProperty(value = "商品分类id")
+ private Long classId;
+ /**
+ * 商品简介
+ */
+ @ApiModelProperty(value = "商品简介")
+ private String introduce;
+ /**
+ * 邮费
+ */
+ @ApiModelProperty(value = "邮费")
+ private BigDecimal postage;
+ /**
+ * 商品图片
+ */
+ @ApiModelProperty(value = "商品图片")
+ private String images;
+ /**
+ * 商品详情
+ */
+ @ApiModelProperty(value = "商品详情")
+ private String detail;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderBargainDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderBargainDto.java
new file mode 100644
index 0000000..1a378b0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderBargainDto.java
@@ -0,0 +1,90 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑电动车商城-砍价订单记录表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑电动车商城-砍价订单记录表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 16:06:37
+ */
+@Data
+@ApiModel("编辑电动车商城-砍价订单记录表请求参数")
+public class EditComBatteryCommodityOrderBargainDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+ /**
+ * 活动id
+ */
+ @ApiModelProperty(value = "活动id")
+ private Long activityId;
+ /**
+ * 订单id
+ */
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+ /**
+ * 商品原价
+ */
+ @ApiModelProperty(value = "商品原价")
+ private BigDecimal originalPrice;
+ /**
+ * 目标价格
+ */
+ @ApiModelProperty(value = "目标价格")
+ private BigDecimal targetPrice;
+ /**
+ * 当前价格
+ */
+ @ApiModelProperty(value = "当前价格")
+ private BigDecimal currentPrice;
+ /**
+ * 当前已砍价次数
+ */
+ @ApiModelProperty(value = "当前已砍价次数")
+ private Integer count;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderBargainRecordDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderBargainRecordDto.java
new file mode 100644
index 0000000..cc833a5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderBargainRecordDto.java
@@ -0,0 +1,65 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑电动车商城-订单砍价记录表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑电动车商城-订单砍价记录表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 16:06:48
+ */
+@Data
+@ApiModel("编辑电动车商城-订单砍价记录表请求参数")
+public class EditComBatteryCommodityOrderBargainRecordDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 砍价记录id
+ */
+ @ApiModelProperty(value = "砍价记录id")
+ private Long bargainId;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 砍价金额
+ */
+ @ApiModelProperty(value = "砍价金额")
+ private BigDecimal amount;
+ /**
+ * 原砍价用户id
+ */
+ @ApiModelProperty(value = "原砍价用户id")
+ private Long oldUserId;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderCollageTeamDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderCollageTeamDto.java
new file mode 100644
index 0000000..6a807ca
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderCollageTeamDto.java
@@ -0,0 +1,64 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑电动车商城-拼团订单团队表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑电动车商城-拼团订单团队表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 16:06:59
+ */
+@Data
+@ApiModel("编辑电动车商城-拼团订单团队表请求参数")
+public class EditComBatteryCommodityOrderCollageTeamDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 活动id
+ */
+ @ApiModelProperty(value = "活动id")
+ private Long activityId;
+ /**
+ * 订单id
+ */
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+ /**
+ * 开团用户id
+ */
+ @ApiModelProperty(value = "开团用户id")
+ private Long userId;
+ /**
+ * 状态（1.等待拼团 2.拼团成功 3.拼团失败 4.已退款）
+ */
+ @ApiModelProperty(value = "状态（1.等待拼团 2.拼团成功 3.拼团失败 4.已退款）")
+ private Integer status;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderCollageTeamPeopleDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderCollageTeamPeopleDto.java
new file mode 100644
index 0000000..60fda7e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderCollageTeamPeopleDto.java
@@ -0,0 +1,64 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑电动车商城-拼团活动团队人员表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑电动车商城-拼团活动团队人员表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 16:07:11
+ */
+@Data
+@ApiModel("编辑电动车商城-拼团活动团队人员表请求参数")
+public class EditComBatteryCommodityOrderCollageTeamPeopleDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 拼团团队id
+ */
+ @ApiModelProperty(value = "拼团团队id")
+ private Long teamId;
+ /**
+ * 团长id
+ */
+ @ApiModelProperty(value = "团长id")
+ private Long headUserId;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 参团类型（1.开团 2.参与拼团）
+ */
+ @ApiModelProperty(value = "参团类型（1.开团 2.参与拼团）")
+ private Integer type;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderDto.java
new file mode 100644
index 0000000..fb210ee
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommodityOrderDto.java
@@ -0,0 +1,191 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑电动车商城-订单表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑电动车商城-订单表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 13:18:46
+ */
+@Data
+@ApiModel("编辑电动车商城-订单表请求参数")
+public class EditComBatteryCommodityOrderDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+ /**
+ * 收货地址id
+ */
+ @ApiModelProperty(value = "收货地址id")
+ private Long addressId;
+ /**
+ * 活动id
+ */
+ @ApiModelProperty(value = "活动id")
+ private Long activityId;
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+ /**
+ * 商品规格id
+ */
+ @ApiModelProperty(value = "商品规格id")
+ private Long specsId;
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+ /**
+ * 活动状态（1.拼团活动 2.砍价活动 3.限时秒杀）
+ */
+ @ApiModelProperty(value = "活动状态（1.拼团活动 2.砍价活动 3.限时秒杀）")
+ private Integer activityType;
+ /**
+ * 订单状态（1.待付款 2.待发货 3.待收货 4.已完成 5.待拼团 6.待砍价 7.已退款 8.已关闭）
+ */
+ @ApiModelProperty(value = "订单状态（1.待付款 2.待发货 3.待收货 4.已完成 5.待拼团 6.待砍价 7.已退款 8.已关闭）")
+ private Integer status;
+ /**
+ * 拼团状态（1.拼团中 2.拼团成功 3.拼团失败）
+ */
+ @ApiModelProperty(value = "拼团状态（1.拼团中 2.拼团成功 3.拼团失败）")
+ private Integer collageStatus;
+ /**
+ * 砍价状态（1.砍价中 2.砍价成功 3.砍价失败）
+ */
+ @ApiModelProperty(value = "砍价状态（1.砍价中 2.砍价成功 3.砍价失败）")
+ private Integer bargainStatus;
+ /**
+ * 支付状态(1.未支付 2.已支付)
+ */
+ @ApiModelProperty(value = "支付状态(1.未支付 2.已支付)")
+ private Integer payStatus;
+ /**
+ * 是否已删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否已删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 支付方式（1.微信支付）
+ */
+ @ApiModelProperty(value = "支付方式（1.微信支付）")
+ private Integer payType;
+ /**
+ * 购买商品数量
+ */
+ @ApiModelProperty(value = "购买商品数量")
+ private Integer count;
+ /**
+ * 商品单价
+ */
+ @ApiModelProperty(value = "商品单价")
+ private BigDecimal price;
+ /**
+ * 订单金额
+ */
+ @ApiModelProperty(value = "订单金额")
+ private BigDecimal amount;
+ /**
+ * 运费
+ */
+ @ApiModelProperty(value = "运费")
+ private BigDecimal freight;
+ /**
+ * 物流单号
+ */
+ @ApiModelProperty(value = "物流单号")
+ private String logisticsNo;
+ /**
+ * 物流公司
+ */
+ @ApiModelProperty(value = "物流公司")
+ private String logisticsCompany;
+ /**
+ * 订单最终金额
+ */
+ @ApiModelProperty(value = "订单最终金额")
+ private BigDecimal finalAmount;
+ /**
+ * 支付单号
+ */
+ @ApiModelProperty(value = "支付单号")
+ private String payNo;
+ /**
+ * 支付总金额
+ */
+ @ApiModelProperty(value = "支付总金额")
+ private BigDecimal payAmount;
+ /**
+ * 订单备注
+ */
+ @ApiModelProperty(value = "订单备注")
+ private String remark;
+ /**
+ * 发货时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "发货时间")
+ private Date deliveryTime;
+ /**
+ * 收货时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "收货时间")
+ private Date receivingTime;
+ /**
+ * 下单时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "下单时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommoditySpecsDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommoditySpecsDto.java
new file mode 100644
index 0000000..fbf1b1f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryCommoditySpecsDto.java
@@ -0,0 +1,92 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑电动车商城-商品规格表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑电动车商城-商品规格表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-28 15:16:22
+ */
+@Data
+@ApiModel("编辑电动车商城-商品规格表请求参数")
+public class EditComBatteryCommoditySpecsDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+ /**
+ * 规格名称
+ */
+ @ApiModelProperty(value = "规格名称")
+ private String name;
+ /**
+ * 规格库存数量
+ */
+ @ApiModelProperty(value = "规格库存数量")
+ private Integer stock;
+ /**
+ * 规格价格
+ */
+ @ApiModelProperty(value = "规格价格")
+ private BigDecimal price;
+ /**
+ * 规格图片
+ */
+ @ApiModelProperty(value = "规格图片")
+ private String images;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryStoreClassDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryStoreClassDto.java
new file mode 100644
index 0000000..f2f90cba
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryStoreClassDto.java
@@ -0,0 +1,76 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑电动车商城-商家分类表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑电动车商城-商家分类表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 11:01:57
+ */
+@Data
+@ApiModel("编辑电动车商城-商家分类表请求参数")
+public class EditComBatteryStoreClassDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 分类名称
+ */
+ @ApiModelProperty(value = "分类名称")
+ private String name;
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+ /**
+ * 状态（1.启用 2.禁用）
+ */
+ @ApiModelProperty(value = "状态（1.启用 2.禁用）")
+ private Integer status;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryStoreDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryStoreDto.java
new file mode 100644
index 0000000..426790a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryStoreDto.java
@@ -0,0 +1,116 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑电动车商城-商家表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑电动车商城-商家表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-28 13:44:59
+ */
+@Data
+@ApiModel("编辑电动车商城-商家表请求参数")
+public class EditComBatteryStoreDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 商家名称
+ */
+ @ApiModelProperty(value = "商家名称")
+ private String name;
+ /**
+ * 注册手机
+ */
+ @ApiModelProperty(value = "注册手机")
+ private String regPhone;
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+ /**
+ * 商家账号
+ */
+ @ApiModelProperty(value = "商家账号")
+ private String account;
+ /**
+ * 状态（1.启用 2.禁用）
+ */
+ @ApiModelProperty(value = "状态（1.启用 2.禁用）")
+ private Integer status;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 商家logo
+ */
+ @ApiModelProperty(value = "商家logo")
+ private String logo;
+ /**
+ * 商家简介
+ */
+ @ApiModelProperty(value = "商家简介")
+ private String introduction;
+ /**
+ * 商家地址
+ */
+ @ApiModelProperty(value = "商家地址")
+ private String address;
+ /**
+ * 详细地址
+ */
+ @ApiModelProperty(value = "详细地址")
+ private String detailAddress;
+ /**
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private String longitude;
+ /**
+ * 纬度
+ */
+ @ApiModelProperty(value = "纬度")
+ private String latitude;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryTradeOrderDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryTradeOrderDto.java
new file mode 100644
index 0000000..c64024d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryTradeOrderDto.java
@@ -0,0 +1,119 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑电动车商城-微信交易流水表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑电动车商城-微信交易流水表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-01 13:18:51
+ */
+@Data
+@ApiModel("编辑电动车商城-微信交易流水表请求参数")
+public class EditComBatteryTradeOrderDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 用户openid
+ */
+ @ApiModelProperty(value = "用户openid")
+ private String openId;
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+ /**
+ * 订单状态（1.待支付 2.已支付 3.申请退款 4.已退款 5.已关闭）
+ */
+ @ApiModelProperty(value = "订单状态（1.待支付 2.已支付 3.申请退款 4.已退款 5.已关闭）")
+ private Integer status;
+ /**
+ * 支付类型（1.微信 ）
+ */
+ @ApiModelProperty(value = "支付类型（1.微信 ）")
+ private Integer payType;
+ /**
+ * 订单支付状态（1.待支付 2.已支付）
+ */
+ @ApiModelProperty(value = "订单支付状态（1.待支付 2.已支付）")
+ private Integer payStatus;
+ /**
+ * 订单金额
+ */
+ @ApiModelProperty(value = "订单金额")
+ private BigDecimal orderAmount;
+ /**
+ * 实际支付金额
+ */
+ @ApiModelProperty(value = "实际支付金额")
+ private BigDecimal payAmount;
+ /**
+ * 支付单号
+ */
+ @ApiModelProperty(value = "支付单号")
+ private String payNo;
+ /**
+ * 支付时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "支付时间")
+ private Date payTime;
+ /**
+ * 交易类型（1.电动车商城购买商品）
+ */
+ @ApiModelProperty(value = "交易类型（1.电动车商城购买商品）")
+ private Integer tradeType;
+ /**
+ * 交易业务订单id
+ */
+ @ApiModelProperty(value = "交易业务订单id")
+ private Long tradeOrderId;
+ /**
+ * 交易业务订单号
+ */
+ @ApiModelProperty(value = "交易业务订单号")
+ private String tradeOrderNo;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryUserAddressDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryUserAddressDto.java
new file mode 100644
index 0000000..4156d3a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComBatteryUserAddressDto.java
@@ -0,0 +1,108 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑电动车商城-用户收货地址表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑电动车商城-用户收货地址表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 13:18:21
+ */
+@Data
+@ApiModel("编辑电动车商城-用户收货地址表请求参数")
+public class EditComBatteryUserAddressDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 姓名
+ */
+ @ApiModelProperty(value = "姓名")
+ private String name;
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+ /**
+ * 详细地址
+ */
+ @ApiModelProperty(value = "详细地址")
+ private String address;
+ /**
+ * 是否是默认地址（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否是默认地址（1.是 2.否）")
+ private Integer isDefault;
+ /**
+ * 省份行政区划代码
+ */
+ @ApiModelProperty(value = "省份行政区划代码")
+ private String provinceAdcode;
+ /**
+ * 省份名称
+ */
+ @ApiModelProperty(value = "省份名称")
+ private String provinceName;
+ /**
+ * 城市行政区划代码
+ */
+ @ApiModelProperty(value = "城市行政区划代码")
+ private String cityAdcode;
+ /**
+ * 城市名称
+ */
+ @ApiModelProperty(value = "城市名称")
+ private String cityName;
+ /**
+ * 区县行政区划代码
+ */
+ @ApiModelProperty(value = "区县行政区划代码")
+ private String districtAdcode;
+ /**
+ * 区县名称
+ */
+ @ApiModelProperty(value = "区县名称")
+ private String districtName;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarBrandDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarBrandDto.java
new file mode 100644
index 0000000..60d7acb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarBrandDto.java
@@ -0,0 +1,81 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑换新车-品牌表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑换新车-品牌表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:37:25
+ */
+@Data
+@ApiModel("编辑换新车-品牌表请求参数")
+public class EditComChangeCarBrandDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 品牌编号
+ */
+ @ApiModelProperty(value = "品牌编号")
+ private String code;
+ /**
+ * 品牌名称
+ */
+ @ApiModelProperty(value = "品牌名称")
+ private String name;
+ /**
+ * 状态（1.启用 2.禁用）
+ */
+ @ApiModelProperty(value = "状态（1.启用 2.禁用）")
+ private Integer status;
+ /**
+ * 品牌logo
+ */
+ @ApiModelProperty(value = "品牌logo")
+ private String logo;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarInquiryDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarInquiryDto.java
new file mode 100644
index 0000000..250a3b9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarInquiryDto.java
@@ -0,0 +1,69 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑换新车-分期询价表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑换新车-分期询价表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:39:07
+ */
+@Data
+@ApiModel("编辑换新车-分期询价表请求参数")
+public class EditComChangeCarInquiryDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 用户称呼
+ */
+ @ApiModelProperty(value = "用户称呼")
+ private String name;
+ /**
+ * 用户手机号
+ */
+ @ApiModelProperty(value = "用户手机号")
+ private String phone;
+ /**
+ * 类型（1.分期 2.询价）
+ */
+ @ApiModelProperty(value = "类型（1.分期 2.询价）")
+ private Integer type;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarModelDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarModelDto.java
new file mode 100644
index 0000000..75dfb85
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarModelDto.java
@@ -0,0 +1,92 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑换新车-车型管理表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑换新车-车型管理表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:41:56
+ */
+@Data
+@ApiModel("编辑换新车-车型管理表请求参数")
+public class EditComChangeCarModelDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 车型名称
+ */
+ @ApiModelProperty(value = "车型名称")
+ private String name;
+ /**
+ * 图片url，多张以,隔开
+ */
+ @ApiModelProperty(value = "图片url，多张以,隔开")
+ private String images;
+ /**
+ * 最低价格
+ */
+ @ApiModelProperty(value = "最低价格")
+ private BigDecimal minPrice;
+ /**
+ * 品牌id
+ */
+ @ApiModelProperty(value = "品牌id")
+ private Long brandId;
+ /**
+ * 车辆详情
+ */
+ @ApiModelProperty(value = "车辆详情")
+ private String detail;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 状态（1.上架 2.下架）
+ */
+ @ApiModelProperty(value = "状态（1.上架 2.下架）")
+ private Integer status;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarModelRelationDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarModelRelationDto.java
new file mode 100644
index 0000000..ebca0d5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarModelRelationDto.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.dtos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑换新车-车型与规格关联表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑换新车-车型与规格关联表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:55:30
+ */
+@Data
+@ApiModel("编辑换新车-车型与规格关联表请求参数")
+public class EditComChangeCarModelRelationDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 车型id
+ */
+ @ApiModelProperty(value = "车型id")
+ private Long modelId;
+ /**
+ * 车型规格id
+ */
+ @ApiModelProperty(value = "车型规格id")
+ private Long modelSpecsId;
+ /**
+ * 车型子规格id
+ */
+ @ApiModelProperty(value = "车型子规格id")
+ private Long modelSpecsChildrenId;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarModelSpecsChildrenDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarModelSpecsChildrenDto.java
new file mode 100644
index 0000000..7ec044c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarModelSpecsChildrenDto.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.dtos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑换新车-车型子规格表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑换新车-车型子规格表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:55:35
+ */
+@Data
+@ApiModel("编辑换新车-车型子规格表请求参数")
+public class EditComChangeCarModelSpecsChildrenDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 主规格id
+ */
+ @ApiModelProperty(value = "主规格id")
+ private Long specsId;
+ /**
+ * 子规格名称
+ */
+ @ApiModelProperty(value = "子规格名称")
+ private String name;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarModelSpecsDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarModelSpecsDto.java
new file mode 100644
index 0000000..7d2201a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComChangeCarModelSpecsDto.java
@@ -0,0 +1,71 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑换新车-车型规格表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑换新车-车型规格表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:55:32
+ */
+@Data
+@ApiModel("编辑换新车-车型规格表请求参数")
+public class EditComChangeCarModelSpecsDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 规格编号
+ */
+ @ApiModelProperty(value = "规格编号")
+ private String code;
+ /**
+ * 规格名称
+ */
+ @ApiModelProperty(value = "规格名称")
+ private String name;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComMngVolunteerOrgTeamDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComMngVolunteerOrgTeamDto.java
new file mode 100644
index 0000000..3cd38c1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComMngVolunteerOrgTeamDto.java
@@ -0,0 +1,62 @@
+package com.panzhihua.common.model.dtos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 编辑志愿者组织队伍表请求参数
+ *
+ * @author lyq
+ * @since 2021-10-30 16:04:50
+ */
+@Data
+@ApiModel("编辑志愿者组织队伍表请求参数")
+public class EditComMngVolunteerOrgTeamDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ private String name;
+ /**
+ * 父级id,为0时则为组织，不为0则为队伍
+ */
+ @ApiModelProperty(value = "父级id,为0时则为组织，不为0则为队伍")
+ private Long parentId;
+ /**
+ * 服务类型
+ */
+ @ApiModelProperty(value = "服务类型")
+ private Long serviceTypeId;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComMngVolunteerServiceTypeDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComMngVolunteerServiceTypeDto.java
new file mode 100644
index 0000000..2c579d9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComMngVolunteerServiceTypeDto.java
@@ -0,0 +1,73 @@
+package com.panzhihua.common.model.dtos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 编辑志愿者服务类型表请求参数
+ *
+ * @author lyq
+ * @since 2021-10-30 16:47:10
+ */
+@Data
+@ApiModel("编辑志愿者服务类型表请求参数")
+public class EditComMngVolunteerServiceTypeDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ private String name;
+ /**
+ * 备注
+ */
+ @ApiModelProperty(value = "备注")
+ private String remark;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComMngVolunteerSkillDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComMngVolunteerSkillDto.java
new file mode 100644
index 0000000..4757b0b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComMngVolunteerSkillDto.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.dtos.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 编辑志愿者技能表请求参数
+ *
+ * @author lyq
+ * @since 2021-10-30 16:47:37
+ */
+@Data
+@ApiModel("编辑志愿者技能表请求参数")
+public class EditComMngVolunteerSkillDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ private String name;
+ /**
+ * 备注
+ */
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComPbCheckUnitDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComPbCheckUnitDto.java
new file mode 100644
index 0000000..ec5a075
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComPbCheckUnitDto.java
@@ -0,0 +1,115 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑党建-报到单位请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑党建-报到单位请求参数
+ *
+ * @author lyq
+ * @date 2022-02-16 16:22:40
+ */
+@Data
+@ApiModel("编辑党建-报到单位请求参数")
+public class EditComPbCheckUnitDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 单位名称
+ */
+ @ApiModelProperty(value = "单位名称")
+ private String name;
+ /**
+ * 单位类别（1.国有企业 2.国有控股企业 3.外资企业 4.合资企业 5.私营企业 6.事业单位 7.国家行政机关 8.政府）
+ */
+ @ApiModelProperty(value = "单位类别（1.国有企业 2.国有控股企业 3.外资企业 4.合资企业 5.私营企业 6.事业单位 7.国家行政机关 8.政府）")
+ private Integer type;
+ /**
+ * 负责人
+ */
+ @ApiModelProperty(value = "负责人")
+ private String contacts;
+ /**
+ * 负责人联系电话
+ */
+ @ApiModelProperty(value = "负责人联系电话")
+ private String phone;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "党组织名称")
+ private String orgName;
+
+ @ApiModelProperty(value = "党组织logo")
+ private String logo;
+
+ @ApiModelProperty(value = "特长描述")
+ private String specialtyName;
+ @ApiModelProperty(value = "帮扶社区id")
+ private Long helpCommunityId;
+ @ApiModelProperty(value = "帮扶社区名字")
+ private String helpCommunityName;
+ @ApiModelProperty(value = "帮扶社区手机号")
+ private String helpCommunityContacts;
+ @ApiModelProperty(value = "帮扶社区联系人")
+ private String helpCommunityContactsName;
+ @ApiModelProperty(value = "小区id")
+ private Long villageId;
+ @ApiModelProperty(value = "小区名字")
+ private String villageName;
+
+ private String natureName;
+
+ private Integer natureId;
+
+ private String address;
+ @ApiModelProperty(value = "管理员名称")
+ private String adminName;
+ @ApiModelProperty(value = "管理员电话")
+ private String adminPhone;
+ @ApiModelProperty(value = "其他")
+ private String otherRemark;
+ @ApiModelProperty(value = "单位所属")
+ private String belongTo;
+ @ApiModelProperty(value = "联系人json")
+ private String adminJson;
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditOrderAddressDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditOrderAddressDto.java
new file mode 100644
index 0000000..2ffe575
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditOrderAddressDto.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.dtos.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 修改订单收货地址请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 修改订单收货地址请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 13:18:45
+ */
+@Data
+@ApiModel("修改订单收货地址请求参数")
+public class EditOrderAddressDto {
+
+ @ApiModelProperty(value = "订单id")
+ private Long id;
+
+ @ApiModelProperty(value = "收件人姓名")
+ private String receivingName;
+
+ @ApiModelProperty(value = "收件人联系方式")
+ private String receivingPhone;
+
+ @ApiModelProperty(value = "收货地区")
+ private String receivingRegion;
+
+ @ApiModelProperty(value = "收货地区Code")
+ private String receivingRegionCode;
+
+ @ApiModelProperty(value = "收货详细地址")
+ private String receivingAddress;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditOrderLogisticsDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditOrderLogisticsDto.java
new file mode 100644
index 0000000..faeb0b5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditOrderLogisticsDto.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.dtos.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 修改订单物流信息请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 修改订单物流信息请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 13:18:45
+ */
+@Data
+@ApiModel("修改订单物流信息请求参数")
+public class EditOrderLogisticsDto {
+
+ @ApiModelProperty(value = "订单id")
+ private Long id;
+
+ @ApiModelProperty(value = "物流单号")
+ private String logisticsNo;
+
+ @ApiModelProperty(value = "物流公司")
+ private String logisticsCompany;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditSysUserDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditSysUserDto.java
new file mode 100644
index 0000000..0522f7a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditSysUserDto.java
@@ -0,0 +1,218 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 编辑用户表 后台用户+小程序用户请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 编辑用户表 后台用户+小程序用户请求参数
+ *
+ * @author lyq
+ * @date 2022-03-28 14:28:10
+ */
+@Data
+@ApiModel("编辑用户表 后台用户+小程序用户请求参数")
+public class EditSysUserDto {
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private Long userId;
+ /**
+ * 登录账户
+ */
+ @ApiModelProperty(value = "登录账户")
+ private String account;
+ /**
+ * 登录密码
+ */
+ @ApiModelProperty(value = "登录密码")
+ private String password;
+ /**
+ * 微信小程序唯一标识
+ */
+ @ApiModelProperty(value = "微信小程序唯一标识")
+ private String openid;
+ /**
+ * 会话密钥
+ */
+ @ApiModelProperty(value = "会话密钥")
+ private String sessionKey;
+ /**
+ * 用户在开放平台的唯一标识符
+ */
+ @ApiModelProperty(value = "用户在开放平台的唯一标识符")
+ private String unionid;
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+ /**
+ * 昵称
+ */
+ @ApiModelProperty(value = "昵称")
+ private String nickName;
+ /**
+ * 真实名字
+ */
+ @ApiModelProperty(value = "真实名字")
+ private String name;
+ /**
+ * 社区ID
+ */
+ @ApiModelProperty(value = "社区ID")
+ private Long communityId;
+ /**
+ * 性别 1 男 2 女
+ */
+ @ApiModelProperty(value = "性别 1 男 2 女")
+ private Integer sex;
+ /**
+ * 身份证号
+ */
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+ /**
+ * 生日
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "生日")
+ private Date birthday;
+ /**
+ * 头像
+ */
+ @ApiModelProperty(value = "头像")
+ private String imageUrl;
+ /**
+ * 用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10一键报警app
+ */
+ @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10一键报警app")
+ private Integer type;
+ /**
+ * 职业
+ */
+ @ApiModelProperty(value = "职业")
+ private String job;
+ /**
+ * 是否志愿者 0 否 1 是
+ */
+ @ApiModelProperty(value = "是否志愿者 0 否 1 是")
+ private Integer isVolunteer;
+ /**
+ * 是否党员 0 否 1 是
+ */
+ @ApiModelProperty(value = "是否党员 0 否 1 是")
+ private Integer isPartymember;
+ /**
+ * 1 启用 2 禁用
+ */
+ @ApiModelProperty(value = "1 启用 2 禁用")
+ private Integer status;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 最后登录时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "最后登录时间")
+ private Date lastLoginTime;
+ /**
+ * 标签多个用,隔开
+ */
+ @ApiModelProperty(value = "标签多个用,隔开")
+ private String tags;
+ /**
+ * 家庭id
+ */
+ @ApiModelProperty(value = "家庭id")
+ private Long familyId;
+ /**
+ * 人脸采集照片url
+ */
+ @ApiModelProperty(value = "人脸采集照片url")
+ private String faceUrl;
+ /**
+ * 人脸采集审核状态 0 待审核 1 审核通过 2驳回
+ */
+ @ApiModelProperty(value = "人脸采集审核状态 0 待审核 1 审核通过 2驳回")
+ private Integer faceState;
+ /**
+ * 驳回原因
+ */
+ @ApiModelProperty(value = "驳回原因")
+ private String rejectReson;
+ /**
+ * 小区id
+ */
+ @ApiModelProperty(value = "小区id")
+ private Long areaId;
+ /**
+ * 证件照（人相面）照片
+ */
+ @ApiModelProperty(value = "证件照（人相面）照片")
+ private String cardPhotoFront;
+ /**
+ * 证件照（国徽面）照片
+ */
+ @ApiModelProperty(value = "证件照（国徽面）照片")
+ private String cardPhotoBack;
+ /**
+ * 户口本
+ */
+ @ApiModelProperty(value = "户口本")
+ private String familyBook;
+ /**
+ * 连续登陆天数 每天凌晨定时任务更新
+ */
+ @ApiModelProperty(value = "连续登陆天数 每天凌晨定时任务更新")
+ private Integer continuousLandingDays;
+ /**
+ * 小程序首页是否显示公告(1.是 2.否)
+ */
+ @ApiModelProperty(value = "小程序首页是否显示公告(1.是 2.否)")
+ private Integer isTips;
+ /**
+ * 网格员工作状态(1.在岗 2.脱岗 3.已下班)
+ */
+ @ApiModelProperty(value = "网格员工作状态(1.在岗 2.脱岗 3.已下班)")
+ private Integer workStatus;
+ /**
+ * 网格员上班开始时间
+ */
+ @ApiModelProperty(value = "网格员上班开始时间")
+ private Integer workStartTime;
+ /**
+ * 网格员上班结束时间
+ */
+ @ApiModelProperty(value = "网格员上班结束时间")
+ private Integer workEndTime;
+ /**
+ * 高龄认证显示提示(1.是 2.否)
+ */
+ @ApiModelProperty(value = "高龄认证显示提示(1.是 2.否)")
+ private Integer bigAgeTips;
+ /**
+ * 明文密码
+ */
+ @ApiModelProperty(value = "明文密码")
+ private String plaintextPassword;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EvaluateEasyDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EvaluateEasyDto.java
new file mode 100644
index 0000000..7ab006f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EvaluateEasyDto.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.dtos.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 随手拍、微心愿评价请求参数
+ */
+@Data
+@ApiModel("随手拍、微心愿评价请求参数")
+public class EvaluateEasyDto {
+
+ @ApiModelProperty(value = "id")
+ private Long id;
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "评论内容")
+ private String content;
+
+ @ApiModelProperty(value = "评分")
+ private Integer score;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/OrderDeliverAdminDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/OrderDeliverAdminDto.java
new file mode 100644
index 0000000..088319b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/OrderDeliverAdminDto.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.dtos.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 后台订单发货请求参数
+ */
+@Data
+@ApiModel("后台订单发货请求参数")
+public class OrderDeliverAdminDto {
+
+ @ApiModelProperty(value = "订单id")
+ private Long id;
+
+ @ApiModelProperty(value = "操作用户id",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "物流公司")
+ private String logisticsCompany;
+
+ @ApiModelProperty(value = "物流单号")
+ private String logisticsNo;
+
+ @ApiModelProperty(value = "操作类型（1.发货 2.修改物流信息）")
+ private Integer type;
+
+ /**
+ * 操作类型（1.发货 2.修改物流信息）
+ */
+ public interface Type{
+ int FH = 1;
+ int XGWL = 2;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComActEasyPhotoEvaluateDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComActEasyPhotoEvaluateDto.java
new file mode 100644
index 0000000..c02561d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComActEasyPhotoEvaluateDto.java
@@ -0,0 +1,78 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询随手拍、微心愿评价表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询随手拍、微心愿评价表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-01 13:44:24
+ */
+@Data
+@ApiModel("分页查询随手拍、微心愿评价表请求参数")
+public class PageComActEasyPhotoEvaluateDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+ /**
+ * 业务记录id
+ */
+ @ApiModelProperty(value = "业务记录id")
+ private Long serviceId;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 评分
+ */
+ @ApiModelProperty(value = "评分")
+ private Integer score;
+ /**
+ * 评价内容
+ */
+ @ApiModelProperty(value = "评价内容")
+ private String content;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 业务分类（1.随手拍 2.微心愿）
+ */
+ @ApiModelProperty(value = "业务分类（1.随手拍 2.微心愿）")
+ private Integer serviceType;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComActEasyPhotoHandlerDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComActEasyPhotoHandlerDto.java
new file mode 100644
index 0000000..98821d9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComActEasyPhotoHandlerDto.java
@@ -0,0 +1,67 @@
+package com.panzhihua.common.model.dtos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询随手拍、微心愿处理人绑定表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询随手拍、微心愿处理人绑定表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-01 13:45:11
+ */
+@Data
+@ApiModel("分页查询随手拍、微心愿处理人绑定表请求参数")
+public class PageComActEasyPhotoHandlerDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+ /**
+ * 处理人id
+ */
+ @ApiModelProperty(value = "处理人id")
+ private Long userId;
+ /**
+ * 业务id
+ */
+ @ApiModelProperty(value = "业务id")
+ private Long serviceId;
+ /**
+ * 人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）
+ */
+ @ApiModelProperty(value = "人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）")
+ private Integer type;
+ /**
+ * 业务类型（1.随手拍 2.微心愿）
+ */
+ @ApiModelProperty(value = "业务类型（1.随手拍 2.微心愿）")
+ private Integer serviceType;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "状态 0待执行 1已完成")
+ private Integer status;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityActivityDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityActivityDto.java
new file mode 100644
index 0000000..0c173c3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityActivityDto.java
@@ -0,0 +1,142 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询电动车商城-商家活动表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询电动车商城-商家活动表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 13:17:40
+ */
+@Data
+@ApiModel("分页查询电动车商城-商家活动表请求参数")
+public class PageComBatteryCommodityActivityDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 活动名称
+ */
+ @ApiModelProperty(value = "活动名称")
+ private String name;
+ /**
+ * 活动类型（1.拼团活动 2.砍价活动 3.限时秒杀）
+ */
+ @ApiModelProperty(value = "活动类型（1.拼团活动 2.砍价活动 3.限时秒杀）")
+ private Integer type;
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+ /**
+ * 状态（1.进行中 2.已下架 3.已结束）
+ */
+ @ApiModelProperty(value = "状态（1.进行中 2.已下架 3.已结束）")
+ private Integer status;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 活动价格
+ */
+ @ApiModelProperty(value = "活动价格")
+ private BigDecimal price;
+ /**
+ * 活动截止时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "活动截止时间")
+ private Date endTime;
+ /**
+ * 拼团总团数
+ */
+ @ApiModelProperty(value = "拼团总团数")
+ private Integer collageNum;
+ /**
+ * 拼团人数
+ */
+ @ApiModelProperty(value = "拼团人数")
+ private Integer collagePeopleNum;
+ /**
+ * 活动图片
+ */
+ @ApiModelProperty(value = "活动图片")
+ private String images;
+ /**
+ * 活动商品总数
+ */
+ @ApiModelProperty(value = "活动商品总数")
+ private Integer commodityNum;
+ /**
+ * 活动规则
+ */
+ @ApiModelProperty(value = "活动规则")
+ private String rule;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "是否是查询自己参与的活动(1.是 2.否)")
+ private Integer isUser = 2;
+
+ @ApiModelProperty(value = "是否是小程序(1.是 2.否)")
+ private Integer isApplets;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityDto.java
new file mode 100644
index 0000000..56c467b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityDto.java
@@ -0,0 +1,121 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询电动车商城-商品表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询电动车商城-商品表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-28 14:59:59
+ */
+@Data
+@ApiModel("分页查询电动车商城-商品表请求参数")
+public class PageComBatteryCommodityDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 商品名称
+ */
+ @ApiModelProperty(value = "商品名称")
+ private String name;
+ /**
+ * 商品编号
+ */
+ @ApiModelProperty(value = "商品编号")
+ private String code;
+ /**
+ * 商品价格
+ */
+ @ApiModelProperty(value = "商品价格")
+ private BigDecimal price;
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+ /**
+ * 状态（1.上架 2.下架）
+ */
+ @ApiModelProperty(value = "状态（1.上架 2.下架）")
+ private Integer status;
+ /**
+ * 商品分类id
+ */
+ @ApiModelProperty(value = "商品分类id")
+ private Long classId;
+ /**
+ * 商品简介
+ */
+ @ApiModelProperty(value = "商品简介")
+ private String introduce;
+ /**
+ * 邮费
+ */
+ @ApiModelProperty(value = "邮费")
+ private BigDecimal postage;
+ /**
+ * 商品图片
+ */
+ @ApiModelProperty(value = "商品图片")
+ private String images;
+ /**
+ * 商品详情
+ */
+ @ApiModelProperty(value = "商品详情")
+ private String detail;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderBargainDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderBargainDto.java
new file mode 100644
index 0000000..fa3f446
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderBargainDto.java
@@ -0,0 +1,99 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询电动车商城-砍价订单记录表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询电动车商城-砍价订单记录表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 16:06:36
+ */
+@Data
+@ApiModel("分页查询电动车商城-砍价订单记录表请求参数")
+public class PageComBatteryCommodityOrderBargainDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+ /**
+ * 活动id
+ */
+ @ApiModelProperty(value = "活动id")
+ private Long activityId;
+ /**
+ * 订单id
+ */
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+ /**
+ * 商品原价
+ */
+ @ApiModelProperty(value = "商品原价")
+ private BigDecimal originalPrice;
+ /**
+ * 目标价格
+ */
+ @ApiModelProperty(value = "目标价格")
+ private BigDecimal targetPrice;
+ /**
+ * 当前价格
+ */
+ @ApiModelProperty(value = "当前价格")
+ private BigDecimal currentPrice;
+ /**
+ * 当前已砍价次数
+ */
+ @ApiModelProperty(value = "当前已砍价次数")
+ private Integer count;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderBargainRecordDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderBargainRecordDto.java
new file mode 100644
index 0000000..27d2f0b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderBargainRecordDto.java
@@ -0,0 +1,74 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询电动车商城-订单砍价记录表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询电动车商城-订单砍价记录表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 16:06:47
+ */
+@Data
+@ApiModel("分页查询电动车商城-订单砍价记录表请求参数")
+public class PageComBatteryCommodityOrderBargainRecordDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 砍价记录id
+ */
+ @ApiModelProperty(value = "砍价记录id")
+ private Long bargainId;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 砍价金额
+ */
+ @ApiModelProperty(value = "砍价金额")
+ private BigDecimal amount;
+ /**
+ * 原砍价用户id
+ */
+ @ApiModelProperty(value = "原砍价用户id")
+ private Long oldUserId;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderCollageTeamDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderCollageTeamDto.java
new file mode 100644
index 0000000..0d5a8c0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderCollageTeamDto.java
@@ -0,0 +1,73 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询电动车商城-拼团订单团队表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询电动车商城-拼团订单团队表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 16:06:58
+ */
+@Data
+@ApiModel("分页查询电动车商城-拼团订单团队表请求参数")
+public class PageComBatteryCommodityOrderCollageTeamDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 活动id
+ */
+ @ApiModelProperty(value = "活动id")
+ private Long activityId;
+ /**
+ * 订单id
+ */
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+ /**
+ * 开团用户id
+ */
+ @ApiModelProperty(value = "开团用户id")
+ private Long userId;
+ /**
+ * 状态（1.等待拼团 2.拼团成功 3.拼团失败 4.已退款）
+ */
+ @ApiModelProperty(value = "状态（1.等待拼团 2.拼团成功 3.拼团失败 4.已退款）")
+ private Integer status;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderCollageTeamPeopleDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderCollageTeamPeopleDto.java
new file mode 100644
index 0000000..abb8a35
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderCollageTeamPeopleDto.java
@@ -0,0 +1,73 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询电动车商城-拼团活动团队人员表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询电动车商城-拼团活动团队人员表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 16:07:10
+ */
+@Data
+@ApiModel("分页查询电动车商城-拼团活动团队人员表请求参数")
+public class PageComBatteryCommodityOrderCollageTeamPeopleDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 拼团团队id
+ */
+ @ApiModelProperty(value = "拼团团队id")
+ private Long teamId;
+ /**
+ * 团长id
+ */
+ @ApiModelProperty(value = "团长id")
+ private Long headUserId;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 参团类型（1.开团 2.参与拼团）
+ */
+ @ApiModelProperty(value = "参团类型（1.开团 2.参与拼团）")
+ private Integer type;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderDto.java
new file mode 100644
index 0000000..da10e12
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderDto.java
@@ -0,0 +1,212 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询电动车商城-订单表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询电动车商城-订单表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 13:18:45
+ */
+@Data
+@ApiModel("分页查询电动车商城-订单表请求参数")
+public class PageComBatteryCommodityOrderDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+ /**
+ * 收货地址id
+ */
+ @ApiModelProperty(value = "收货地址id")
+ private Long addressId;
+ /**
+ * 活动id
+ */
+ @ApiModelProperty(value = "活动id")
+ private Long activityId;
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+ /**
+ * 商品规格id
+ */
+ @ApiModelProperty(value = "商品规格id")
+ private Long specsId;
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+ /**
+ * 活动状态（1.拼团活动 2.砍价活动 3.限时秒杀）
+ */
+ @ApiModelProperty(value = "活动状态（1.拼团活动 2.砍价活动 3.限时秒杀）")
+ private Integer activityType;
+ /**
+ * 订单状态（1.待付款 2.待发货 3.待收货 4.已完成 5.待拼团 6.待砍价 7.已退款 8.已关闭）
+ */
+ @ApiModelProperty(value = "订单状态（1.待付款 2.待发货 3.待收货 4.已完成 5.待拼团 6.待砍价 7.已退款 8.已关闭）")
+ private Integer status;
+ /**
+ * 拼团状态（1.拼团中 2.拼团成功 3.拼团失败）
+ */
+ @ApiModelProperty(value = "拼团状态（1.拼团中 2.拼团成功 3.拼团失败）")
+ private Integer collageStatus;
+ /**
+ * 砍价状态（1.砍价中 2.砍价成功 3.砍价失败）
+ */
+ @ApiModelProperty(value = "砍价状态（1.砍价中 2.砍价成功 3.砍价失败）")
+ private Integer bargainStatus;
+ /**
+ * 支付状态(1.未支付 2.已支付)
+ */
+ @ApiModelProperty(value = "支付状态(1.未支付 2.已支付)")
+ private Integer payStatus;
+ /**
+ * 是否已删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否已删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 支付方式（1.微信支付）
+ */
+ @ApiModelProperty(value = "支付方式（1.微信支付）")
+ private Integer payType;
+ /**
+ * 购买商品数量
+ */
+ @ApiModelProperty(value = "购买商品数量")
+ private Integer count;
+ /**
+ * 商品单价
+ */
+ @ApiModelProperty(value = "商品单价")
+ private BigDecimal price;
+ /**
+ * 订单金额
+ */
+ @ApiModelProperty(value = "订单金额")
+ private BigDecimal amount;
+ /**
+ * 运费
+ */
+ @ApiModelProperty(value = "运费")
+ private BigDecimal freight;
+ /**
+ * 物流单号
+ */
+ @ApiModelProperty(value = "物流单号")
+ private String logisticsNo;
+ /**
+ * 物流公司
+ */
+ @ApiModelProperty(value = "物流公司")
+ private String logisticsCompany;
+ /**
+ * 订单最终金额
+ */
+ @ApiModelProperty(value = "订单最终金额")
+ private BigDecimal finalAmount;
+ /**
+ * 支付单号
+ */
+ @ApiModelProperty(value = "支付单号")
+ private String payNo;
+ /**
+ * 支付总金额
+ */
+ @ApiModelProperty(value = "支付总金额")
+ private BigDecimal payAmount;
+ /**
+ * 订单备注
+ */
+ @ApiModelProperty(value = "订单备注")
+ private String remark;
+ /**
+ * 发货时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "发货时间")
+ private Date deliveryTime;
+ /**
+ * 收货时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "收货时间")
+ private Date receivingTime;
+ /**
+ * 下单时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "下单时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "下单时间开始查询")
+ private String startTime;
+
+ @ApiModelProperty(value = "下单时间结束查询")
+ private String endTime;
+
+ @ApiModelProperty(value = "是否是小程序查询(1.是 2.否)",hidden = true)
+ private Integer isApplets;
+
+ @ApiModelProperty(value = "是否是后台查询(1.是 2.否)",hidden = true)
+ private Integer isAdmin;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommoditySpecsDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommoditySpecsDto.java
new file mode 100644
index 0000000..4502c9a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommoditySpecsDto.java
@@ -0,0 +1,103 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询电动车商城-商品规格表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询电动车商城-商品规格表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-28 15:16:22
+ */
+@Data
+@ApiModel("分页查询电动车商城-商品规格表请求参数")
+public class PageComBatteryCommoditySpecsDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+ /**
+ * 规格名称
+ */
+ @ApiModelProperty(value = "规格名称")
+ private String name;
+ /**
+ * 规格库存数量
+ */
+ @ApiModelProperty(value = "规格库存数量")
+ private Integer stock;
+ /**
+ * 规格价格
+ */
+ @ApiModelProperty(value = "规格价格")
+ private BigDecimal price;
+ /**
+ * 规格图片
+ */
+ @ApiModelProperty(value = "规格图片")
+ private String images;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "商品状态（1.上架 2.下架）")
+ private Integer status;
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryStoreClassDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryStoreClassDto.java
new file mode 100644
index 0000000..a3a21c0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryStoreClassDto.java
@@ -0,0 +1,85 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询电动车商城-商家分类表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询电动车商城-商家分类表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 11:01:57
+ */
+@Data
+@ApiModel("分页查询电动车商城-商家分类表请求参数")
+public class PageComBatteryStoreClassDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 分类名称
+ */
+ @ApiModelProperty(value = "分类名称")
+ private String name;
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+ /**
+ * 状态（1.启用 2.禁用）
+ */
+ @ApiModelProperty(value = "状态（1.启用 2.禁用）")
+ private Integer status;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryStoreDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryStoreDto.java
new file mode 100644
index 0000000..4739b80
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryStoreDto.java
@@ -0,0 +1,125 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询电动车商城-商家表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询电动车商城-商家表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-28 13:44:45
+ */
+@Data
+@ApiModel("分页查询电动车商城-商家表请求参数")
+public class PageComBatteryStoreDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 商家名称
+ */
+ @ApiModelProperty(value = "商家名称")
+ private String name;
+ /**
+ * 注册手机
+ */
+ @ApiModelProperty(value = "注册手机")
+ private String regPhone;
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+ /**
+ * 商家账号
+ */
+ @ApiModelProperty(value = "商家账号")
+ private String account;
+ /**
+ * 状态（1.启用 2.禁用）
+ */
+ @ApiModelProperty(value = "状态（1.启用 2.禁用）")
+ private Integer status;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 商家logo
+ */
+ @ApiModelProperty(value = "商家logo")
+ private String logo;
+ /**
+ * 商家简介
+ */
+ @ApiModelProperty(value = "商家简介")
+ private String introduction;
+ /**
+ * 商家地址
+ */
+ @ApiModelProperty(value = "商家地址")
+ private String address;
+ /**
+ * 详细地址
+ */
+ @ApiModelProperty(value = "详细地址")
+ private String detailAddress;
+ /**
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private String longitude;
+ /**
+ * 纬度
+ */
+ @ApiModelProperty(value = "纬度")
+ private String latitude;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryTradeOrderDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryTradeOrderDto.java
new file mode 100644
index 0000000..cb5fefc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryTradeOrderDto.java
@@ -0,0 +1,128 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询电动车商城-微信交易流水表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询电动车商城-微信交易流水表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-01 13:18:50
+ */
+@Data
+@ApiModel("分页查询电动车商城-微信交易流水表请求参数")
+public class PageComBatteryTradeOrderDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 用户openid
+ */
+ @ApiModelProperty(value = "用户openid")
+ private String openId;
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+ /**
+ * 订单状态（1.待支付 2.已支付 3.申请退款 4.已退款 5.已关闭）
+ */
+ @ApiModelProperty(value = "订单状态（1.待支付 2.已支付 3.申请退款 4.已退款 5.已关闭）")
+ private Integer status;
+ /**
+ * 支付类型（1.微信 ）
+ */
+ @ApiModelProperty(value = "支付类型（1.微信 ）")
+ private Integer payType;
+ /**
+ * 订单支付状态（1.待支付 2.已支付）
+ */
+ @ApiModelProperty(value = "订单支付状态（1.待支付 2.已支付）")
+ private Integer payStatus;
+ /**
+ * 订单金额
+ */
+ @ApiModelProperty(value = "订单金额")
+ private BigDecimal orderAmount;
+ /**
+ * 实际支付金额
+ */
+ @ApiModelProperty(value = "实际支付金额")
+ private BigDecimal payAmount;
+ /**
+ * 支付单号
+ */
+ @ApiModelProperty(value = "支付单号")
+ private String payNo;
+ /**
+ * 支付时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "支付时间")
+ private Date payTime;
+ /**
+ * 交易类型（1.电动车商城购买商品）
+ */
+ @ApiModelProperty(value = "交易类型（1.电动车商城购买商品）")
+ private Integer tradeType;
+ /**
+ * 交易业务订单id
+ */
+ @ApiModelProperty(value = "交易业务订单id")
+ private Long tradeOrderId;
+ /**
+ * 交易业务订单号
+ */
+ @ApiModelProperty(value = "交易业务订单号")
+ private String tradeOrderNo;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryUserAddressDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryUserAddressDto.java
new file mode 100644
index 0000000..cfb9137
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryUserAddressDto.java
@@ -0,0 +1,118 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询电动车商城-用户收货地址表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询电动车商城-用户收货地址表请求参数
+ *
+ * @author lyq
+ * @date 2022-03-29 13:18:20
+ */
+@Data
+@ApiModel("分页查询电动车商城-用户收货地址表请求参数")
+public class PageComBatteryUserAddressDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 姓名
+ */
+ @ApiModelProperty(value = "姓名")
+ private String name;
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+ /**
+ * 详细地址
+ */
+ @ApiModelProperty(value = "详细地址")
+ private String address;
+ /**
+ * 是否是默认地址（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否是默认地址（1.是 2.否）")
+ private Integer isDefault;
+ /**
+ * 省份行政区划代码
+ */
+ @ApiModelProperty(value = "省份行政区划代码")
+ private String provinceAdcode;
+ /**
+ * 省份名称
+ */
+ @ApiModelProperty(value = "省份名称")
+ private String provinceName;
+ /**
+ * 城市行政区划代码
+ */
+ @ApiModelProperty(value = "城市行政区划代码")
+ private String cityAdcode;
+ /**
+ * 城市名称
+ */
+ @ApiModelProperty(value = "城市名称")
+ private String cityName;
+ /**
+ * 区县行政区划代码
+ */
+ @ApiModelProperty(value = "区县行政区划代码")
+ private String districtAdcode;
+ /**
+ * 区县名称
+ */
+ @ApiModelProperty(value = "区县名称")
+ private String districtName;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarBrandDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarBrandDto.java
new file mode 100644
index 0000000..c20b900
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarBrandDto.java
@@ -0,0 +1,92 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询换新车-品牌表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询换新车-品牌表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:37:25
+ */
+@Data
+@ApiModel("分页查询换新车-品牌表请求参数")
+public class PageComChangeCarBrandDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 品牌编号
+ */
+ @ApiModelProperty(value = "品牌编号")
+ private String code;
+ /**
+ * 品牌名称
+ */
+ @ApiModelProperty(value = "品牌名称")
+ private String name;
+ /**
+ * 状态（1.启用 2.禁用）
+ */
+ @ApiModelProperty(value = "状态（1.启用 2.禁用）")
+ private Integer status;
+ /**
+ * 品牌logo
+ */
+ @ApiModelProperty(value = "品牌logo")
+ private String logo;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "是否是小程序请求（1.是 2.否）")
+ private Integer isApplets = 2;
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarInquiryDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarInquiryDto.java
new file mode 100644
index 0000000..bd5f0f8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarInquiryDto.java
@@ -0,0 +1,78 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询换新车-分期询价表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询换新车-分期询价表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:39:07
+ */
+@Data
+@ApiModel("分页查询换新车-分期询价表请求参数")
+public class PageComChangeCarInquiryDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 用户称呼
+ */
+ @ApiModelProperty(value = "用户称呼")
+ private String name;
+ /**
+ * 用户手机号
+ */
+ @ApiModelProperty(value = "用户手机号")
+ private String phone;
+ /**
+ * 类型（1.分期 2.询价）
+ */
+ @ApiModelProperty(value = "类型（1.分期 2.询价）")
+ private Integer type;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarModelDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarModelDto.java
new file mode 100644
index 0000000..d0cf63f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarModelDto.java
@@ -0,0 +1,101 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询换新车-车型管理表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询换新车-车型管理表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:41:56
+ */
+@Data
+@ApiModel("分页查询换新车-车型管理表请求参数")
+public class PageComChangeCarModelDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 车型名称
+ */
+ @ApiModelProperty(value = "车型名称")
+ private String name;
+ /**
+ * 图片url，多张以,隔开
+ */
+ @ApiModelProperty(value = "图片url，多张以,隔开")
+ private String images;
+ /**
+ * 最低价格
+ */
+ @ApiModelProperty(value = "最低价格")
+ private BigDecimal minPrice;
+ /**
+ * 品牌id
+ */
+ @ApiModelProperty(value = "品牌id")
+ private Long brandId;
+ /**
+ * 车辆详情
+ */
+ @ApiModelProperty(value = "车辆详情")
+ private String detail;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 状态（1.上架 2.下架）
+ */
+ @ApiModelProperty(value = "状态（1.上架 2.下架）")
+ private Integer status;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarModelRelationDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarModelRelationDto.java
new file mode 100644
index 0000000..a98855a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarModelRelationDto.java
@@ -0,0 +1,64 @@
+package com.panzhihua.common.model.dtos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * title: 分页查询换新车-车型与规格关联表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询换新车-车型与规格关联表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:55:30
+ */
+@Data
+@ApiModel("分页查询换新车-车型与规格关联表请求参数")
+public class PageComChangeCarModelRelationDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 车型id
+ */
+ @ApiModelProperty(value = "车型id")
+ private Long modelId;
+ /**
+ * 车型规格id
+ */
+ @ApiModelProperty(value = "车型规格id")
+ private Long modelSpecsId;
+ /**
+ * 车型子规格id
+ */
+ @ApiModelProperty(value = "车型子规格id")
+ private Long modelSpecsChildrenId;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "价格排序（1.升序 2.降序）")
+ private Integer priceSort;
+
+ @ApiModelProperty(value = "品牌id筛选参数")
+ private List<Long> brandIds;
+
+ @ApiModelProperty(value = "子规格id筛选参数")
+ private List<Long> specsChildrenIds;
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarModelSpecsChildrenDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarModelSpecsChildrenDto.java
new file mode 100644
index 0000000..caf28da
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarModelSpecsChildrenDto.java
@@ -0,0 +1,54 @@
+package com.panzhihua.common.model.dtos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询换新车-车型子规格表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询换新车-车型子规格表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:55:34
+ */
+@Data
+@ApiModel("分页查询换新车-车型子规格表请求参数")
+public class PageComChangeCarModelSpecsChildrenDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 主规格id
+ */
+ @ApiModelProperty(value = "主规格id")
+ private Long specsId;
+ /**
+ * 子规格名称
+ */
+ @ApiModelProperty(value = "子规格名称")
+ private String name;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarModelSpecsDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarModelSpecsDto.java
new file mode 100644
index 0000000..2b241e4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComChangeCarModelSpecsDto.java
@@ -0,0 +1,80 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询换新车-车型规格表请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询换新车-车型规格表请求参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:55:32
+ */
+@Data
+@ApiModel("分页查询换新车-车型规格表请求参数")
+public class PageComChangeCarModelSpecsDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 规格编号
+ */
+ @ApiModelProperty(value = "规格编号")
+ private String code;
+ /**
+ * 规格名称
+ */
+ @ApiModelProperty(value = "规格名称")
+ private String name;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComMngVolunteerOrgTeamDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComMngVolunteerOrgTeamDto.java
new file mode 100644
index 0000000..3b4220f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComMngVolunteerOrgTeamDto.java
@@ -0,0 +1,71 @@
+package com.panzhihua.common.model.dtos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 分页查询志愿者组织队伍表请求参数
+ *
+ * @author lyq
+ * @since 2021-10-30 16:04:48
+ */
+@Data
+@ApiModel("分页查询志愿者组织队伍表请求参数")
+public class PageComMngVolunteerOrgTeamDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ private String name;
+ /**
+ * 父级id,为0时则为组织，不为0则为队伍
+ */
+ @ApiModelProperty(value = "父级id,为0时则为组织，不为0则为队伍")
+ private Long parentId;
+ /**
+ * 服务类型
+ */
+ @ApiModelProperty(value = "服务类型")
+ private Long serviceTypeId;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComMngVolunteerServiceTypeDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComMngVolunteerServiceTypeDto.java
new file mode 100644
index 0000000..7c04955
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComMngVolunteerServiceTypeDto.java
@@ -0,0 +1,76 @@
+package com.panzhihua.common.model.dtos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 分页查询志愿者服务类型表请求参数
+ *
+ * @author lyq
+ * @since 2021-10-30 16:47:10
+ */
+@Data
+@ApiModel("分页查询志愿者服务类型表请求参数")
+public class PageComMngVolunteerServiceTypeDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ private String name;
+ /**
+ * 备注
+ */
+ @ApiModelProperty(value = "备注")
+ private String remark;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComMngVolunteerSkillDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComMngVolunteerSkillDto.java
new file mode 100644
index 0000000..4380a75
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComMngVolunteerSkillDto.java
@@ -0,0 +1,76 @@
+package com.panzhihua.common.model.dtos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 分页查询志愿者技能表请求参数
+ *
+ * @author lyq
+ * @since 2021-10-30 16:47:37
+ */
+@Data
+@ApiModel("分页查询志愿者技能表请求参数")
+public class PageComMngVolunteerSkillDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ private String name;
+ /**
+ * 备注
+ */
+ @ApiModelProperty(value = "备注")
+ private String remark;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComPbCheckUnitDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComPbCheckUnitDto.java
new file mode 100644
index 0000000..596cb95
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComPbCheckUnitDto.java
@@ -0,0 +1,108 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询党建-报到单位请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询党建-报到单位请求参数
+ *
+ * @author lyq
+ * @date 2022-02-16 16:22:26
+ */
+@Data
+@ApiModel("分页查询党建-报到单位请求参数")
+public class PageComPbCheckUnitDto {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 单位名称
+ */
+ @ApiModelProperty(value = "单位名称")
+ private String name;
+ /**
+ * 单位类别（1.国有企业 2.国有控股企业 3.外资企业 4.合资企业 5.私营企业 6.事业单位 7.国家行政机关 8.政府）
+ */
+ @ApiModelProperty(value = "单位类别（1.国有企业 2.国有控股企业 3.外资企业 4.合资企业 5.私营企业 6.事业单位 7.国家行政机关 8.政府）")
+ private Integer type;
+ /**
+ * 负责人
+ */
+ @ApiModelProperty(value = "负责人")
+ private String contacts;
+ /**
+ * 负责人联系电话
+ */
+ @ApiModelProperty(value = "负责人联系电话")
+ private String phone;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "所属党组织")
+ private String orgName;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "技能特长")
+ private String specialtyName;
+
+ @ApiModelProperty("区级")
+ private String belongTo;
+
+ @ApiModelProperty("单位性质")
+ private String natureName;
+
+ @ApiModelProperty(value = "社区id集合")
+ private List<Long> communityIds;
+
+ @ApiModelProperty(value = "农行单位id集合")
+ private Long[] ids;
+
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PagePbCheckUnitCommonDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PagePbCheckUnitCommonDto.java
new file mode 100644
index 0000000..2f44a56
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PagePbCheckUnitCommonDto.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.dtos.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @title: PagePbCheckUnitCommonDto
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 报到单位/报到党员统计公共请求参数
+ * @author: hans
+ * @date: 2022/07/25 15:41
+ */
+@Data
+@ApiModel("报到单位/报到党员统计公共请求参数")
+public class PagePbCheckUnitCommonDto {
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty("单位归属")
+ private String belongTo;
+
+ @ApiModelProperty("单位性质")
+ private String natureName;
+
+
+ @ApiModelProperty(value = "社区id集合")
+ private List<Long> communityIds;
+
+ @ApiModelProperty(value = "报道单位id集合")
+ private Long[] unitIds;
+
+ @ApiModelProperty("年份 例子 2024")
+ private String yearTime;
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageSysUserDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageSysUserDto.java
new file mode 100644
index 0000000..4b755d5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageSysUserDto.java
@@ -0,0 +1,227 @@
+package com.panzhihua.common.model.dtos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 分页查询用户表 后台用户+小程序用户请求参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 分页查询用户表 后台用户+小程序用户请求参数
+ *
+ * @author lyq
+ * @date 2022-03-28 14:28:10
+ */
+@Data
+@ApiModel("分页查询用户表 后台用户+小程序用户请求参数")
+public class PageSysUserDto {
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private Long userId;
+ /**
+ * 登录账户
+ */
+ @ApiModelProperty(value = "登录账户")
+ private String account;
+ /**
+ * 登录密码
+ */
+ @ApiModelProperty(value = "登录密码")
+ private String password;
+ /**
+ * 微信小程序唯一标识
+ */
+ @ApiModelProperty(value = "微信小程序唯一标识")
+ private String openid;
+ /**
+ * 会话密钥
+ */
+ @ApiModelProperty(value = "会话密钥")
+ private String sessionKey;
+ /**
+ * 用户在开放平台的唯一标识符
+ */
+ @ApiModelProperty(value = "用户在开放平台的唯一标识符")
+ private String unionid;
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+ /**
+ * 昵称
+ */
+ @ApiModelProperty(value = "昵称")
+ private String nickName;
+ /**
+ * 真实名字
+ */
+ @ApiModelProperty(value = "真实名字")
+ private String name;
+ /**
+ * 社区ID
+ */
+ @ApiModelProperty(value = "社区ID")
+ private Long communityId;
+ /**
+ * 性别 1 男 2 女
+ */
+ @ApiModelProperty(value = "性别 1 男 2 女")
+ private Integer sex;
+ /**
+ * 身份证号
+ */
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+ /**
+ * 生日
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "生日")
+ private Date birthday;
+ /**
+ * 头像
+ */
+ @ApiModelProperty(value = "头像")
+ private String imageUrl;
+ /**
+ * 用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10一键报警app
+ */
+ @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10一键报警app")
+ private Integer type;
+ /**
+ * 职业
+ */
+ @ApiModelProperty(value = "职业")
+ private String job;
+ /**
+ * 是否志愿者 0 否 1 是
+ */
+ @ApiModelProperty(value = "是否志愿者 0 否 1 是")
+ private Integer isVolunteer;
+ /**
+ * 是否党员 0 否 1 是
+ */
+ @ApiModelProperty(value = "是否党员 0 否 1 是")
+ private Integer isPartymember;
+ /**
+ * 1 启用 2 禁用
+ */
+ @ApiModelProperty(value = "1 启用 2 禁用")
+ private Integer status;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 最后登录时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "最后登录时间")
+ private Date lastLoginTime;
+ /**
+ * 标签多个用,隔开
+ */
+ @ApiModelProperty(value = "标签多个用,隔开")
+ private String tags;
+ /**
+ * 家庭id
+ */
+ @ApiModelProperty(value = "家庭id")
+ private Long familyId;
+ /**
+ * 人脸采集照片url
+ */
+ @ApiModelProperty(value = "人脸采集照片url")
+ private String faceUrl;
+ /**
+ * 人脸采集审核状态 0 待审核 1 审核通过 2驳回
+ */
+ @ApiModelProperty(value = "人脸采集审核状态 0 待审核 1 审核通过 2驳回")
+ private Integer faceState;
+ /**
+ * 驳回原因
+ */
+ @ApiModelProperty(value = "驳回原因")
+ private String rejectReson;
+ /**
+ * 小区id
+ */
+ @ApiModelProperty(value = "小区id")
+ private Long areaId;
+ /**
+ * 证件照（人相面）照片
+ */
+ @ApiModelProperty(value = "证件照（人相面）照片")
+ private String cardPhotoFront;
+ /**
+ * 证件照（国徽面）照片
+ */
+ @ApiModelProperty(value = "证件照（国徽面）照片")
+ private String cardPhotoBack;
+ /**
+ * 户口本
+ */
+ @ApiModelProperty(value = "户口本")
+ private String familyBook;
+ /**
+ * 连续登陆天数 每天凌晨定时任务更新
+ */
+ @ApiModelProperty(value = "连续登陆天数 每天凌晨定时任务更新")
+ private Integer continuousLandingDays;
+ /**
+ * 小程序首页是否显示公告(1.是 2.否)
+ */
+ @ApiModelProperty(value = "小程序首页是否显示公告(1.是 2.否)")
+ private Integer isTips;
+ /**
+ * 网格员工作状态(1.在岗 2.脱岗 3.已下班)
+ */
+ @ApiModelProperty(value = "网格员工作状态(1.在岗 2.脱岗 3.已下班)")
+ private Integer workStatus;
+ /**
+ * 网格员上班开始时间
+ */
+ @ApiModelProperty(value = "网格员上班开始时间")
+ private Integer workStartTime;
+ /**
+ * 网格员上班结束时间
+ */
+ @ApiModelProperty(value = "网格员上班结束时间")
+ private Integer workEndTime;
+ /**
+ * 高龄认证显示提示(1.是 2.否)
+ */
+ @ApiModelProperty(value = "高龄认证显示提示(1.是 2.否)")
+ private Integer bigAgeTips;
+ /**
+ * 明文密码
+ */
+ @ApiModelProperty(value = "明文密码")
+ private String plaintextPassword;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/StartBargainOrderDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/StartBargainOrderDto.java
new file mode 100644
index 0000000..1ea7f5c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/StartBargainOrderDto.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.dtos.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 发起砍价订单请求参数
+ */
+@Data
+@ApiModel("发起砍价订单请求参数")
+public class StartBargainOrderDto {
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "用户openId",hidden = true)
+ private String openId;
+
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+
+ @ApiModelProperty(value = "活动id")
+ private Long activityId;
+
+ @ApiModelProperty(value = "用户收货地址id")
+ private Long addressId;
+
+ @ApiModelProperty(value = "购买商品数量")
+ private Integer count;
+
+ @ApiModelProperty(value = "订单备注")
+ private String remark;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/StartFightOrderDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/StartFightOrderDto.java
new file mode 100644
index 0000000..fef5a64
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/StartFightOrderDto.java
@@ -0,0 +1,49 @@
+package com.panzhihua.common.model.dtos.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 发起拼团订单请求参数
+ */
+@Data
+@ApiModel("发起拼团订单请求参数")
+public class StartFightOrderDto {
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "用户openId",hidden = true)
+ private String openId;
+
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+
+ @ApiModelProperty(value = "活动id")
+ private Long activityId;
+
+ @ApiModelProperty(value = "用户收货地址id")
+ private Long addressId;
+
+ @ApiModelProperty(value = "购买商品数量")
+ private Integer count;
+
+ @ApiModelProperty(value = "订单备注")
+ private String remark;
+
+ @ApiModelProperty(value = "拼团类型（1.开团 2.参团）")
+ private Integer type;
+
+ @ApiModelProperty(value = "拼团团队id")
+ private Long teamId;
+
+ /**
+ * 拼团类型（1.开团 2.参团）
+ */
+ public interface Type{
+ int KT = 1;
+ int PT = 2;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/StartSeckillOrderDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/StartSeckillOrderDto.java
new file mode 100644
index 0000000..4469ae9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/StartSeckillOrderDto.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.dtos.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 发起秒杀订单请求参数
+ */
+@Data
+@ApiModel("发起秒杀订单请求参数")
+public class StartSeckillOrderDto {
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "用户openId",hidden = true)
+ private String openId;
+
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+
+ @ApiModelProperty(value = "活动id")
+ private Long activityId;
+
+ @ApiModelProperty(value = "用户收货地址id")
+ private Long addressId;
+
+ @ApiModelProperty(value = "购买商品数量")
+ private Integer count;
+
+ @ApiModelProperty(value = "订单备注")
+ private String remark;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/StartUserBargainOrderDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/StartUserBargainOrderDto.java
new file mode 100644
index 0000000..94d9156
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/StartUserBargainOrderDto.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.dtos.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 帮好友砍价请求参数
+ */
+@Data
+@ApiModel("帮好友砍价请求参数")
+public class StartUserBargainOrderDto {
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "原用户砍价记录id")
+ private Long bargainId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/UserCreateOrderDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/UserCreateOrderDto.java
new file mode 100644
index 0000000..1c25375
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/UserCreateOrderDto.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.dtos.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 订单创建请求参数
+ */
+@Data
+@ApiModel("订单创建请求参数")
+public class UserCreateOrderDto {
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "用户openId",hidden = true)
+ private String openId;
+
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+
+ @ApiModelProperty(value = "商品规格id")
+ private Long specsId;
+
+ @ApiModelProperty(value = "用户收货地址id")
+ private Long addressId;
+
+ @ApiModelProperty(value = "购买商品数量")
+ private Integer count;
+
+ @ApiModelProperty(value = "订单备注")
+ private String remark;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ActivityInviteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ActivityInviteDTO.java
new file mode 100644
index 0000000..b237559
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ActivityInviteDTO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ActivityInviteDTO
+ * @projectName:
+ * @description: 活动邀请请求参数
+ * @author: hans
+ * @date: 2022/08/02 9:55
+ */
+@Data
+@ApiModel("活动邀请请求参数")
+public class ActivityInviteDTO {
+
+ @ApiModelProperty("受邀活动id")
+ @NotNull(message = "受邀活动id不能为空")
+ private Long activityId;
+
+ @ApiModelProperty("受邀用户id")
+ @NotNull(message = "受邀用户id不能为空")
+ private Long userId;
+
+ @ApiModelProperty("受邀用户姓名")
+ @NotBlank(message = "受邀用户姓名不能为空")
+ private String name;
+
+ @ApiModelProperty("受邀用户电话")
+ @NotBlank(message = "受邀用户电话不能为空")
+ private String phone;
+
+ @ApiModelProperty(value = "邀请人", hidden = true)
+ private Long createdBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/AddComActDynTypeDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/AddComActDynTypeDTO.java
new file mode 100644
index 0000000..1054d30
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/AddComActDynTypeDTO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.NotBlank;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("新增社区动态分类请求参数")
+public class AddComActDynTypeDTO {
+
+ @ApiModelProperty("分类名称")
+ @NotBlank(message = "分类名称不能为空")
+ @Length(min = 1, max = 20, message = "分类名称不可超过20个字")
+ private String name;
+
+ @ApiModelProperty("分类字体颜色")
+ @NotBlank(message = "分类字体颜色不能为空")
+ private String color;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "操作人员id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty("类型（1.社区动态 2.党务公开 3.花城资讯）")
+ private Integer category;
+
+
+ @ApiModelProperty("1 花城西区都有 2 花城独有 3 西区独有")
+ private String area;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/AddIdentityAuthDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/AddIdentityAuthDTO.java
new file mode 100644
index 0000000..b4d1fe7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/AddIdentityAuthDTO.java
@@ -0,0 +1,77 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import com.panzhihua.common.model.helper.sensitive.Sensitive;
+import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: AddIdentityAuthDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 新增身份认证
+ * @author: hans
+ * @date: 2021/09/03 9:43
+ */
+@Data
+@ApiModel("新增身份认证参数")
+@EncryptDecryptClass
+public class AddIdentityAuthDTO {
+
+ @ApiModelProperty(value = "认证类型（1.高龄认证 2.养老认证）", required = true, allowableValues = "1,2", example = "1")
+ @NotNull(message = "认证类型不能为空")
+ private Integer authType;
+
+ @ApiModelProperty(value = "姓名", required = true, example = "张三")
+ @Sensitive(strategy = SensitiveStrategy.USERNAME)
+ @NotBlank(message = "姓名不能为空")
+ private String name;
+
+ @ApiModelProperty(value = "身份证号", required = true, example = "511321199503241233")
+ @Sensitive(strategy = SensitiveStrategy.ID_CARD)
+ @EncryptDecryptField
+ @NotBlank(message = "身份证号码不能为空")
+ @Size(min = 18, max = 18, message = "请输入18位有效身份证号")
+ private String idCard;
+
+ @ApiModelProperty(value = "现居住地址", required = true, example = "双流小区")
+ @NotBlank(message = "居住地址不能为空")
+ private String address;
+
+ @ApiModelProperty(value = "认证视频url，视频认证时需传入", example = "http://test.video.html")
+ private String authVideo;
+
+ @ApiModelProperty(value = "用户eidToken，人脸核验时需传入")
+ private String eidToken;
+
+ @ApiModelProperty(value = "提交用户", hidden = true)
+ private Long submitUserId;
+
+ @ApiModelProperty(value = "人脸核身结果数据", hidden = true)
+ private String verificationResult;
+
+ @ApiModelProperty(value = "身份认证方式 1.视频认证 2.人脸认证 3.线下认证", hidden = true)
+ private Integer authMethod = 1;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("认证时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date authTime;
+
+ @ApiModelProperty("认证期数")
+ private String authPeriod;
+
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/CancelRecordDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/CancelRecordDTO.java
new file mode 100644
index 0000000..24853dd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/CancelRecordDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("取消预约/登记参数")
+public class CancelRecordDTO {
+ @ApiModelProperty("记录id")
+ private Long id;
+ /**
+ * 内容
+ */
+ @ApiModelProperty("内容")
+ private String content;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty("备注")
+ private String remark;
+
+ private Integer status;
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/CascadeHouseDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/CascadeHouseDTO.java
new file mode 100644
index 0000000..d25572b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/CascadeHouseDTO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 房屋级联选择请求参数
+ */
+@Data
+@ApiModel("房屋级联选择请求参数")
+public class CascadeHouseDTO implements Serializable {
+
+ @ApiModelProperty(value = "级别（1.街路巷 2.门牌号 3.楼排号 4.单元号 5.户室）")
+ private Integer level = 1;
+
+ @ApiModelProperty(value = "房屋id")
+ private String houseId;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "小区id")
+ private Long villageId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussCommentDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussCommentDTO.java
new file mode 100644
index 0000000..111d0d5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussCommentDTO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 一起议评论
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-23 09:47
+ **/
+@Data
+@ApiModel("一起议评论")
+public class ComActDiscussCommentDTO {
+ @ApiModelProperty("主键")
+ private Long id;
+
+ @ApiModelProperty("一起议主键")
+ private Long discussId;
+
+ @ApiModelProperty("评论内容")
+ private String comment;
+
+ @ApiModelProperty("是否置顶 0 否 1 是")
+ private Integer isTopping;
+
+ @ApiModelProperty("评论时间")
+ private Date createAt;
+
+ @ApiModelProperty("是否作者本人回复 0 否 1 是")
+ private Integer isAuthor;
+
+ @ApiModelProperty("上级评论id 默认0表示一级评论")
+ private Long parentId;
+
+ @ApiModelProperty("用户主键")
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussCommentUserDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussCommentUserDTO.java
new file mode 100644
index 0000000..5c1536b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussCommentUserDTO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.Min;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 一起议评论点赞
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-24 12:58
+ **/
+@Data
+@ApiModel("一起议评论点赞")
+public class ComActDiscussCommentUserDTO {
+
+ @ApiModelProperty("评论主键")
+ @Min(value = 1, message = "评论主键不能为空")
+ private Long id;
+
+ @ApiModelProperty(value = "用户主键", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty("操作类型 1 点赞 2 取消点赞")
+ @Min(value = 1, message = "操作类型不能为空")
+ private Integer type;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java
new file mode 100644
index 0000000..ee04562
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java
@@ -0,0 +1,108 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.validated.AddGroup;
+
+import com.panzhihua.common.validated.PutGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 议事投票新增编辑
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-22 15:34
+ **/
+@Data
+@ApiModel("议事投票新增编辑")
+public class ComActDiscussDTO {
+ @ApiModelProperty("主键")
+ @NotNull(message = "一起议id不能为空", groups = {PutGroup.class})
+ private Long id;
+
+ @ApiModelProperty("主题")
+ @NotBlank(groups = {AddGroup.class}, message = "主题不能为空")
+ private String discussSubject;
+
+ @ApiModelProperty("类型 1 议事 2 投票")
+ @Min(value = 1, groups = {AddGroup.class}, message = "类型不能为空")
+ private Integer type;
+
+ @ApiModelProperty("图片地址 多个用逗号隔开")
+ private String photoPah;
+
+ @ApiModelProperty("地址")
+ private String address;
+
+ @ApiModelProperty(value = "发布人主键", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "社区主键", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("create_at")
+ private Date createAt;
+
+ @ApiModelProperty("1 单选 2 多选")
+ private Integer discussOption;
+
+ @ApiModelProperty("投票标题")
+ private String voteTitle;
+
+ @ApiModelProperty("选项集合")
+ private List<ComActDiscussOptionDTO> discussOptions;
+
+ @ApiModelProperty(value = "单张图片宽度")
+ private BigDecimal imgWidth;
+
+ @ApiModelProperty(value = "单张图片高度")
+ private BigDecimal imgHeight;
+
+ @ApiModelProperty(value = "投票开始时间(格式：yyyy-MM-dd HH:mm:ss)")
+ private String startTime;
+
+ @ApiModelProperty(value = "投票结束时间(格式：yyyy-MM-dd HH:mm:ss)")
+ private String endTime;
+
+ @ApiModelProperty(value = "是否可重复投票（1.是 2.否）")
+ private Integer isRepeat;
+
+ @ApiModelProperty(value = "每人可投票数")
+ private Integer count;
+
+ @ApiModelProperty(value = "是否是小程序用户", hidden = true)
+ private Boolean isApplets;
+
+ @ApiModelProperty(value = "当前登录用户信息", hidden = true)
+ private LoginUserInfoVO loginUserInfo;
+
+ @ApiModelProperty("投票结果")
+ @NotBlank(message = "投票结果不能为空", groups = {PutGroup.class})
+ private String publishResult;
+
+ @ApiModelProperty("议事内容类型（1.社区议事 2.院落议事 3.党群议事）")
+ private Integer contentType;
+
+ @ApiModelProperty("投票范围（1.全部居民 2.志愿者 3.党员）")
+ private Integer voteScope;
+
+ @ApiModelProperty("是否需要签名")
+ private Boolean needSign;
+
+ /**
+ * 类型 1 议事 2 投票
+ */
+ public interface type{
+ int ys = 1;
+ int tp = 2;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussOptionDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussOptionDTO.java
new file mode 100644
index 0000000..e3194ea
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussOptionDTO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 一起议投票选项参数
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-22 15:34
+ **/
+@Data
+@ApiModel("一起议投票选项参数")
+public class ComActDiscussOptionDTO {
+
+ @ApiModelProperty("选项图片url")
+ private String optionUrl;
+
+ @ApiModelProperty("选项内容")
+ private String optionContent;
+
+ @ApiModelProperty("是否需要填写原因")
+ private Boolean needReason;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussOptionUserDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussOptionUserDTO.java
new file mode 100644
index 0000000..f55a4b1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussOptionUserDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 选项投票
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-24 08:56
+ **/
+@Data
+@ApiModel("选项投票")
+public class ComActDiscussOptionUserDTO {
+
+ @ApiModelProperty("一起议选项id集合")
+ private List<Long> discussOptionIds;
+
+ @ApiModelProperty("投票人id")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussUserDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussUserDTO.java
new file mode 100644
index 0000000..49baedf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussUserDTO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.util.Date;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 一起议点赞
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-23 16:30
+ **/
+@Data
+@ApiModel("一起议点赞")
+public class ComActDiscussUserDTO {
+
+ @ApiModelProperty("主键")
+ private Long id;
+
+ @ApiModelProperty("一起议主键")
+ @NotNull(message = "一起议主键不能为空")
+ @Min(value = 1, message = "一起议主键不能为空")
+ private Long discussId;
+
+ @ApiModelProperty("用户主键")
+ private Long userId;
+
+ @ApiModelProperty("点赞时间")
+ private Date createAt;
+
+ @ApiModelProperty("操作类型 1 点赞 2 取消点赞")
+ @Min(value = 1, message = "操作类型不能为空")
+ private Integer type;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussVoteOptionDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussVoteOptionDTO.java
new file mode 100644
index 0000000..7eb308d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussVoteOptionDTO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComActDiscussVoteOptionDTO
+ * @projectName:
+ * @description: 一起议投票内容参数
+ * @author: hans
+ * @date: 2022/08/17 14:49
+ */
+@Data
+@ApiModel("一起议投票内容参数")
+public class ComActDiscussVoteOptionDTO {
+
+ @ApiModelProperty("选项id")
+ private Long id;
+
+ @ApiModelProperty("投票原因")
+ private String reason;
+
+ @ApiModelProperty("签名")
+ private String signUrl;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActEasyPhotoCommentDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActEasyPhotoCommentDTO.java
new file mode 100644
index 0000000..7f01300
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActEasyPhotoCommentDTO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 随手拍评论新增
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-21 15:38
+ **/
+@Data
+@ApiModel("随手拍评论新增")
+public class ComActEasyPhotoCommentDTO {
+
+ @ApiModelProperty("随手拍主键id")
+ private Long id;
+
+ @ApiModelProperty("评论内容")
+ private String comment;
+
+ @ApiModelProperty(value = "评论者id", hidden = true)
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActEasyPhotoCommentUserDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActEasyPhotoCommentUserDTO.java
new file mode 100644
index 0000000..1fab97a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActEasyPhotoCommentUserDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 评论点赞 、取消点赞
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-21 15:06
+ **/
+@Data
+@ApiModel("评论点赞 、取消点赞")
+public class ComActEasyPhotoCommentUserDTO {
+
+ @ApiModelProperty(value = "评论主键", example = "1")
+ private Long id;
+
+ @ApiModelProperty(value = "操作类型 1 点赞 2 取消点赞", example = "2")
+ private Integer type;
+
+ @ApiModelProperty(value = "操作用户", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActProceedingsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActProceedingsDTO.java
new file mode 100644
index 0000000..6ce33d4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActProceedingsDTO.java
@@ -0,0 +1,76 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+@Data
+public class ComActProceedingsDTO implements Serializable {
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("id")
+ private Long id;
+
+ /**
+ * 姓名
+ */
+ @ApiModelProperty("姓名")
+ private String name;
+
+ /**
+ * 所属单位名
+ */
+ @ApiModelProperty("所属单位名")
+ private String unitName;
+
+ /**
+ * 所属单位id
+ */
+ @ApiModelProperty("所属单位id")
+ private Long unitId;
+
+ /**
+ * 简介
+ */
+ @ApiModelProperty("简介")
+ private String introduce;
+
+ /**
+ * 是否删除0否1是
+ */
+ @ApiModelProperty("是否删除")
+ private Boolean delFlag;
+
+ /**
+ * 状态0可用1禁用
+ */
+ @ApiModelProperty("是否可用")
+ private Boolean status;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 创建人
+ */
+ private String createBy;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人
+ */
+ private Date updateBy;
+
+ private String workTime;
+ private String logo;
+
+ private static final long serialVersionUID = 1L;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActQuestnaireAnswerContentDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActQuestnaireAnswerContentDTO.java
new file mode 100644
index 0000000..4b579d0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActQuestnaireAnswerContentDTO.java
@@ -0,0 +1,8 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel("问卷回答记录内容")
+public class ComActQuestnaireAnswerContentDTO {}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActQuestnaireDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActQuestnaireDTO.java
new file mode 100644
index 0000000..877e8ac
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActQuestnaireDTO.java
@@ -0,0 +1,8 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel("调查问卷 问卷表")
+public class ComActQuestnaireDTO {}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActQuestnaireSubDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActQuestnaireSubDTO.java
new file mode 100644
index 0000000..38b0d3b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActQuestnaireSubDTO.java
@@ -0,0 +1,8 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel("问卷题目")
+public class ComActQuestnaireSubDTO {}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActQuestnaireSubSelectionDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActQuestnaireSubSelectionDTO.java
new file mode 100644
index 0000000..e889533
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActQuestnaireSubSelectionDTO.java
@@ -0,0 +1,10 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel("问卷题目选项")
+public class ComActQuestnaireSubSelectionDTO {
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActWorkGuideDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActWorkGuideDTO.java
new file mode 100644
index 0000000..e08f2bd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActWorkGuideDTO.java
@@ -0,0 +1,67 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.google.common.collect.Lists;
+import com.panzhihua.common.model.vos.community.ComActWorkGuideMaterialVO;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe 办事指南
+ */
+@Data
+@ApiModel("办事指南新增")
+public class ComActWorkGuideDTO {
+ @ApiModelProperty("办事指南id")
+ private Long id;
+
+ @ApiModelProperty("办事指南标题")
+ @NotBlank(groups = {AddGroup.class}, message = "标题不能为空")
+ @Length(groups = {AddGroup.class}, max = 35)
+ private String title;
+
+ @ApiModelProperty("办事指南内容")
+ @NotBlank(groups = {AddGroup.class}, message = "内容不能为空")
+ @Length(groups = {AddGroup.class}, max = 5000)
+ private String content;
+
+ @ApiModelProperty("所属分类")
+ private String classify;
+
+ @ApiModelProperty("办理时间")
+ private String timeAt;
+
+ @ApiModelProperty("创建时间")
+ private String createAt;
+
+ @ApiModelProperty("办理地点")
+ private String address;
+
+ @ApiModelProperty("咨询电话")
+ private String phone;
+
+ @ApiModelProperty("经度")
+ private String lon;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ private String areaCode;
+
+ @ApiModelProperty(value = "是否在线 （0 不在线 1在线）")
+ private String isOnLine;
+
+ @ApiModelProperty(value = "组件json数据")
+ private String jsonObject;
+
+ private List<ComActWorkGuideMaterialVO> materials = Lists.newArrayList();
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtBusinessDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtBusinessDTO.java
new file mode 100644
index 0000000..32ba0a8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtBusinessDTO.java
@@ -0,0 +1,77 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 便民服务 商家信息新增/编辑
+ * @author: Null
+ * @date: 2021/3/11 10:36
+ */
+@Data
+@ApiModel("商家信息新增/编辑")
+public class ComCvtBusinessDTO implements Serializable {
+
+ @ApiModelProperty("商家ID")
+ private Long id;
+
+ @ApiModelProperty("商家名称")
+ @NotBlank(groups = {AddGroup.class}, message = "商家名称不能为空")
+ @Length(groups = {AddGroup.class}, max = 35, message = "商家名称不能为空大于35个字")
+ private String name;
+
+ @ApiModelProperty("联系人")
+ @NotBlank(groups = {AddGroup.class}, message = "联系人不能为空")
+ private String contacts;
+
+ @ApiModelProperty("联系方式")
+ @NotBlank(groups = {AddGroup.class}, message = "联系方式不能为空")
+ private String contactsPhone;
+
+ @ApiModelProperty("详细地址")
+ @NotBlank(groups = {AddGroup.class}, message = "详细地址不能为空")
+ private String address;
+
+ @ApiModelProperty("主营业务")
+ @NotBlank(groups = {AddGroup.class}, message = "主营业务不能为空")
+ @Length(groups = {AddGroup.class}, max = 500)
+ private String busScope;
+
+ @ApiModelProperty("服务范围标记：1-全攀枝花市，2-部分地区")
+ @NotNull(groups = {AddGroup.class}, message = "服务范围标记不能为空")
+ private Integer areaFlag;
+
+ @ApiModelProperty("商家logo")
+ @NotBlank(groups = {AddGroup.class}, message = "商家logo不能为空")
+ private String logo;
+
+ @ApiModelProperty("创建人")
+ private Long createBy;
+
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ @ApiModelProperty(value = "社区主键", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("服务范围集合")
+ private List<Long> communityIds;
+
+ @ApiModelProperty("商家介绍媒体文件类型：1-图片 2-视频")
+ private Integer mediaType;
+
+ @ApiModelProperty("介绍媒体文件集合")
+ private List<String> mediaPaths;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtCategoryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtCategoryDTO.java
new file mode 100644
index 0000000..4557384
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtCategoryDTO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 便民服务 分类信息
+ * @author: Null
+ * @date: 2021/3/11 17:11
+ */
+@Data
+@ApiModel("分类信息")
+public class ComCvtCategoryDTO implements Serializable {
+
+ @ApiModelProperty("分类ID")
+ private Long id;
+
+ @ApiModelProperty("分类名称")
+ @NotBlank(groups = {AddGroup.class}, message = "分类名称不能为空")
+ private String name;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("权重")
+ @NotNull(message = "权重不能为空")
+ private Integer weight;
+
+ @ApiModelProperty(value = "创建人", hidden = true)
+ private String createBy;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtServeDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtServeDTO.java
new file mode 100644
index 0000000..435c347
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtServeDTO.java
@@ -0,0 +1,56 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 便民服务新增/编辑参数
+ * @author: Null
+ * @date: 2021/3/11 10:52
+ */
+@Data
+@ApiModel("便民服务新增/编辑参数")
+public class ComCvtServeDTO implements Serializable {
+
+ private static final long serialVersionUID = -7734682979200558948L;
+ @ApiModelProperty("服务主键ID")
+ private Long id;
+
+ @ApiModelProperty("服务名称")
+ @NotBlank(groups = {AddGroup.class}, message = "服务名称不能为空")
+ private String serviceName;
+
+ @ApiModelProperty("服务价格")
+ @NotBlank(groups = {AddGroup.class}, message = "服务价格不能为空")
+ private BigDecimal servicePrice;
+
+ @ApiModelProperty("服务分类ID")
+ @NotBlank(groups = {AddGroup.class}, message = "服务分类不能为空")
+ private Long categoryId;
+
+ @ApiModelProperty("服务描述")
+ @NotBlank(groups = {AddGroup.class}, message = "服务描述不能为空")
+ private String serviceDesc;
+
+ @ApiModelProperty("所属商家ID")
+ @NotBlank(groups = {AddGroup.class}, message = "所属商家不能为空")
+ private Long businessId;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty(value = "创建人", hidden = true)
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建时间", hidden = true)
+ private Date createAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComExServicemanDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComExServicemanDTO.java
new file mode 100644
index 0000000..da46114
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComExServicemanDTO.java
@@ -0,0 +1,111 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 退役军人DTO
+ */
+@Data
+@ApiModel("退役军人")
+public class ComExServicemanDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 分页-当前页数
+ */
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ /**
+ * 分页-每页记录数
+ */
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+ /**
+ * 年龄开始查询字段
+ */
+ @ApiModelProperty("年龄开始查询字段")
+ private String ageStart;
+
+ /**
+ * 年龄开始时间查询字段
+ */
+ @ApiModelProperty(value = "年龄开始时间查询字段", hidden = true)
+ private String ageStartTime;
+ /**
+ * 年龄结束查询字段
+ */
+ @ApiModelProperty("年龄结束查询字段")
+ private String ageEnd;
+
+ /**
+ * 年龄结束时间查询字段
+ */
+ @ApiModelProperty(value = "年龄结束时间查询字段", hidden = true)
+ private String ageEndTime;
+
+ /**
+ * 民族
+ */
+ @ApiModelProperty("民族")
+ private String nation;
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ /**
+ * 街道id
+ */
+ @ApiModelProperty(value = "街道id", hidden = true)
+ private Integer streetId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long CommunityId;
+ /**
+ * 姓名
+ */
+ @ApiModelProperty(value = "姓名")
+ private String name;
+ /**
+ * 性别
+ */
+ @ApiModelProperty(value = "性别")
+ private String sex;
+
+ /**
+ * 身份证号码
+ */
+ @ApiModelProperty(value = "身份证号码")
+ @EncryptQuery
+ private String cardNo;
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngCarAppletDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngCarAppletDTO.java
new file mode 100644
index 0000000..fddb201
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngCarAppletDTO.java
@@ -0,0 +1,63 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotBlank;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 车辆登记
+ * @author: Null
+ * @date: 2021/3/16 14:37
+ */
+@Data
+@ApiModel("小程序车辆登记参数")
+public class ComMngCarAppletDTO implements Serializable {
+
+ @ApiModelProperty(value = "车辆主键ID", hidden = true)
+ private Long id;
+
+ @ApiModelProperty(value = "车牌号")
+ @NotBlank(groups = {AddGroup.class}, message = "车牌号不能为空")
+ @Length(groups = {AddGroup.class}, max = 20, message = "车牌号长度错误")
+ private String plateNum;
+
+ @ApiModelProperty(value = "车辆品牌型号")
+ @NotBlank(groups = {AddGroup.class}, message = "车辆品牌型号不能为空")
+ @Length(groups = {AddGroup.class}, max = 20, message = "车辆品牌型号超长")
+ private String brand;
+
+ @ApiModelProperty(value = "车身颜色")
+ private String color;
+
+ @ApiModelProperty(value = "社区ID", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "小区名称", hidden = true)
+ private String areaName;
+
+ @ApiModelProperty(value = "小区ID", hidden = true)
+ private Long areaId;
+
+ @ApiModelProperty(value = "车主姓名", hidden = true)
+ private String userName;
+
+ @ApiModelProperty(value = "车主ID", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "车主手机号码", hidden = true)
+ private String mobile;
+
+ @ApiModelProperty(value = "创建人", hidden = true)
+ private Long createBy;
+
+ @ApiModelProperty(value = "数据来源：1-小程序 2-后台录入", hidden = true)
+ private Integer source;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngCarSaveDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngCarSaveDTO.java
new file mode 100644
index 0000000..c3ea854
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngCarSaveDTO.java
@@ -0,0 +1,69 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 后端辆登记参数
+ * @author: Null
+ * @date: 2021/3/16 14:37
+ */
+@Data
+@ApiModel("后端辆登记/修改参数")
+public class ComMngCarSaveDTO implements Serializable {
+
+ @ApiModelProperty(value = "车辆主键ID")
+ private Long id;
+
+ @ApiModelProperty(value = "车牌号")
+ @NotBlank(groups = {AddGroup.class}, message = "车牌号不能为空")
+ private String plateNum;
+
+ @ApiModelProperty(value = "车辆品牌型号")
+ @NotBlank(groups = {AddGroup.class}, message = "车辆品牌型号不能为空")
+ private String brand;
+
+ @ApiModelProperty(value = "车身颜色")
+ private String color;
+
+ @ApiModelProperty(value = "小区ID")
+ @Min(value = 1, groups = {AddGroup.class}, message = "用户小区id不能为空")
+ @NotNull(groups = {AddGroup.class}, message = "用户小区id不能为空")
+ private Long areaId;
+
+ @ApiModelProperty(value = "车主姓名")
+ @NotBlank(groups = {AddGroup.class}, message = "车主姓名不能为空")
+ private String userName;
+
+ @ApiModelProperty(value = "身份证号")
+ @NotBlank(groups = {AddGroup.class}, message = "车主身份证号码不能为空")
+ private String cardNo;
+
+ @ApiModelProperty(value = "车主手机号码")
+ @NotBlank(groups = {AddGroup.class}, message = "车主手机号码不能为空")
+ private String mobile;
+
+ @ApiModelProperty(value = "社区ID", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "小区名称", hidden = true)
+ private String areaName;
+
+ @ApiModelProperty(value = "车主ID", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "创建人", hidden = true)
+ private Long createBy;
+
+ @ApiModelProperty(value = "数据来源：1-小程序 2-后台录入", hidden = true)
+ private Integer source;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java
new file mode 100644
index 0000000..feda4dd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java
@@ -0,0 +1,234 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
+import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 实有人口DTO
+ */
+@Data
+@EncryptQueryClass
+public class ComMngPopulationDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 分页-当前页数
+ */
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ /**
+ * 分页-每页记录数
+ */
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+ /**
+ * 年龄开始查询字段
+ */
+ @ApiModelProperty("年龄开始查询字段")
+ private String ageStart;
+
+ /**
+ * 年龄开始时间查询字段
+ */
+ @ApiModelProperty(value = "年龄开始时间查询字段", hidden = true)
+ private String ageStartTime;
+
+ /**
+ * 最终年龄开始时间查询字段
+ */
+ @ApiModelProperty(value = "最终年龄开始时间查询字段", hidden = true)
+ private String ageStartTimeEnd;
+
+ /**
+ * 年龄结束查询字段
+ */
+ @ApiModelProperty("年龄结束查询字段")
+ private String ageEnd;
+
+ /**
+ * 最终年龄结束时间查询字段
+ */
+ @ApiModelProperty(value = "最终年龄结束时间查询字段", hidden = true)
+ private String ageEndTimeEnd;
+
+ /**
+ * 年龄结束时间查询字段
+ */
+ @ApiModelProperty(value = "年龄结束时间查询字段", hidden = true)
+ private String ageEndTime;
+
+ /**
+ * 籍贯
+ */
+ @ApiModelProperty("籍贯")
+ private String nativePlace;
+ /**
+ * 民族
+ */
+ @ApiModelProperty("民族")
+ private String nation;
+ /**
+ * 小区名字
+ */
+ @ApiModelProperty("小区名字")
+ private String alley;
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ /**
+ * 街道id
+ */
+ @ApiModelProperty(value = "街道id", hidden = true)
+ private Integer streetId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long actId;
+ /**
+ * 小区id（实有房屋id）
+ */
+ @ApiModelProperty(value = "小区id（实有房屋id）")
+ private Long villageId;
+ /**
+ * 家庭成员（姓名）
+ */
+ @ApiModelProperty(value = "家庭成员（姓名）")
+ private String name;
+ /**
+ * 性别（1.男 2.女 3.未知）
+ */
+ @ApiModelProperty(value = "性别（1.男 2.女 3.未知）")
+ private Integer sex;
+ /**
+ * 年龄
+ */
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ /**
+ * 身份证号码
+ */
+ @ApiModelProperty(value = "身份证号码")
+ @EncryptQuery
+ private String cardNo;
+ /**
+ * 街路巷
+ */
+ @ApiModelProperty(value = "街路巷")
+ private String road;
+ /**
+ * 门牌号
+ */
+ @ApiModelProperty(value = "门牌号")
+ private String doorNo;
+ /**
+ * 楼排号
+ */
+ @ApiModelProperty(value = "楼排号")
+ private String floor;
+ /**
+ * 单元号
+ */
+ @ApiModelProperty(value = "单元号")
+ private String unitNo;
+ /**
+ * 户室（房间号）
+ */
+ @ApiModelProperty(value = "户室（房间号）")
+ private String houseNo;
+ /**
+ * 政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)
+ */
+ @ApiModelProperty(
+ value = "政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
+ private Integer politicalOutlook;
+ /**
+ * 工作单位
+ */
+ @ApiModelProperty(value = "工作单位")
+ private String workCompany;
+ /**
+ * 特殊情况
+ */
+ @ApiModelProperty(value = "特殊情况")
+ private String specialSituation;
+ /**
+ * 联系方式
+ */
+ @ApiModelProperty(value = "联系方式")
+ private String phone;
+ /**
+ * 备注
+ */
+ @ApiModelProperty(value = "备注")
+ private String remark;
+ /**
+ * 标签集合（多个标签以,隔开）
+ */
+ @ApiModelProperty(value = "标签集合（多个标签以,隔开）")
+ private String label;
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+
+ /**
+ * 是否租住(0.否 1.是)
+ */
+ @ApiModelProperty(value = "是否租住(0.否 1.是)")
+ private Integer isRent;
+
+ /**
+ * 外地or本地（1.本地 2.外地）
+ */
+ @ApiModelProperty(value = "外地or本地（1.本地 2.外地）")
+ private Integer outOrLocal;
+
+ @ApiModelProperty(value = "房屋地址等级")
+ private Integer level;
+
+ @ApiModelProperty(value = "房屋id")
+ private Long houseId;
+
+ @ApiModelProperty("居住地址")
+ private String address;
+
+ @ApiModelProperty("关键词")
+ private String keyWord;
+
+ @ApiModelProperty("等级是否查询全部（1.是 2.否）")
+ private Integer levelIsAll;
+
+ @ApiModelProperty("是否死亡人员 (1.是 0.否)")
+ private Integer isDeath;
+
+ @ApiModelProperty("人员类型（1、户籍人口2、留守人员3、外地人员4、境外人员5、流动人口6、常住人口7、暂住人口）")
+ private String personType;
+
+ private Integer type;
+
+ private String searchKey;
+ public interface levelIsAll{
+ int yes = 1;
+ int no = 2;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationEditDTO.java
new file mode 100644
index 0000000..2360098
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationEditDTO.java
@@ -0,0 +1,115 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 实有人口编辑请求参数
+ */
+@Data
+@ApiModel("实有人口编辑请求参数")
+public class ComMngPopulationEditDTO implements Serializable {
+
+ @ApiModelProperty("实有人口id")
+ private Long id;
+
+ @ApiModelProperty("姓名")
+ @NotBlank(groups = {PutGroup.class}, message = "姓名不可为空")
+ private String name;
+
+ @ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
+ @NotBlank(groups = {PutGroup.class}, message = "政治面貌不可为空")
+ private Integer politicalOutlook;
+
+ @ApiModelProperty("是否租住 是否租住(0.否 1.是)")
+ @NotBlank(groups = {PutGroup.class}, message = "是否租住不可为空")
+ private Integer isRent;
+
+ @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
+ @NotBlank(groups = {PutGroup.class}, message = "与户主关系不可为空")
+ private Integer relation;
+
+ @ApiModelProperty("联系方式")
+ @NotBlank(groups = {PutGroup.class}, message = "联系方式不可为空")
+ @EncryptDecryptField
+ private String phone;
+
+ @ApiModelProperty("文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)")
+ @NotBlank(groups = {PutGroup.class}, message = "文化程度不可为空")
+ private Integer cultureLevel;
+
+ @ApiModelProperty("婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)")
+ @NotBlank(groups = {PutGroup.class}, message = "婚姻状况不可为空")
+ private Integer marriage;
+
+ @ApiModelProperty("工作单位")
+ @NotBlank(groups = {PutGroup.class}, message = "工作单位不可为空")
+ private String workCompany;
+
+ @ApiModelProperty("外地or本地（1.本地 2.外地）")
+ @NotBlank(groups = {PutGroup.class}, message = "外地/本地不可为空")
+ private Integer outOrLocal;
+
+ @ApiModelProperty("户口所在地")
+ @NotBlank(groups = {PutGroup.class}, message = "户口所在地不可为空")
+ private String censusRegister;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("标签集合（多个标签以,隔开,如物业工作人员,物业")
+ private String label;
+
+ @ApiModelProperty("健康状况")
+ private String healthy;
+
+ @ApiModelProperty("人员类型（1、户籍人口2、留守人员3、外地人员4、境外人员5、流动人口6、常住人口7、暂住人口）")
+ private String personType;
+
+ @ApiModelProperty("房屋信息请求参数")
+ private List<ComMngPopulationHouseEditDTO> houseEditDTOList;
+
+ @ApiModelProperty("吸毒信息")
+ private ComDrugPopulationVO comDrugPopulationVO;
+
+ @ApiModelProperty("社区矫正信息")
+ private ComCorrectPopulationVO comCorrectPopulationVO;
+
+ @ApiModelProperty("精神障碍信息")
+ private ComMajorPopulationVO comMajorPopulationVO;
+
+ @ApiModelProperty("邪教信息")
+ private ComCultPopulationVO comCultPopulationVO;
+
+ @ApiModelProperty("刑释信息")
+ private ComRehabilitationPopulationVO comRehabilitationPopulationVO;
+
+ @ApiModelProperty("上访信息")
+ private ComKeyPopulationVO comKeyPopulationVO;
+
+ @ApiModelProperty("退役军人信息")
+ private ComVeteransPopulationVO comVeteransPopulationVO;
+
+ @ApiModelProperty("残疾人信息")
+ private ComDisabilityPopulationVO comDisabilityPopulationVO;
+
+ @ApiModelProperty("低保户信息")
+ private ComLowSecurityPopulationVO comLowSecurityPopulationVO;
+
+ @ApiModelProperty("高龄老人信息")
+ private ComElderAuthElderliesVO comElderAuthElderliesVO;
+
+ @ApiModelProperty("养老人员信息")
+ private ComPensionAuthPensionerVO comPensionAuthPensionerVO;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseAdminDTO.java
new file mode 100644
index 0000000..53dc721
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseAdminDTO.java
@@ -0,0 +1,134 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 实有房屋DTO
+ */
+@Data
+@ApiModel("实有房屋请求参数")
+public class ComMngPopulationHouseAdminDTO implements Serializable {
+ /**
+ * 分页-当前页数
+ */
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ /**
+ * 分页-每页记录数
+ */
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ /**
+ * 街路巷
+ */
+ @ApiModelProperty("街路巷")
+ private String alley;
+ /**
+ * 门牌号
+ */
+ @ApiModelProperty(value = "门牌号")
+ private String houseNum;
+ /**
+ * 小区组
+ */
+ @ApiModelProperty(value = "小区组")
+ private String groupAt;
+
+ /**
+ * 房屋状态(1.自住 2.租住 3.其他)
+ */
+ @ApiModelProperty("房屋状态(1.自住 2.租住 3.其他)")
+ private Integer status;
+ /**
+ * 房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)
+ */
+ @ApiModelProperty("房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)")
+ private Integer purpose;
+ /**
+ * 管控状态(1.常规 2.关注 3.管控)
+ */
+ @ApiModelProperty(value = "管控状态(1.常规 2.关注 3.管控)")
+ private Integer controlStatus;
+
+ /**
+ * 房屋id
+ */
+ @ApiModelProperty(value = "房屋id")
+ private Long houseId;
+
+ /**
+ * 级别（1.街路巷 2.门牌号 3.楼排号 4.单元号 5.户室）
+ */
+ @ApiModelProperty(value = "级别（1.街路巷 2.门牌号 3.楼排号 4.单元号 5.户室）")
+ private Integer level;
+
+ /**
+ * 更新开始时间
+ */
+ @ApiModelProperty(value = "更新开始时间")
+ private String startTime;
+
+ /**
+ * 更新结束时间
+ */
+ @ApiModelProperty(value = "更新结束时间")
+ private String endTime;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ /**
+ * 街路巷
+ */
+ @ApiModelProperty(value = "街路巷", hidden = true)
+ private String road;
+ /**
+ * 门牌号
+ */
+ @ApiModelProperty(value = "门牌号", hidden = true)
+ private String doorNo;
+ /**
+ * 楼排号
+ */
+ @ApiModelProperty(value = "楼排号", hidden = true)
+ private String floor;
+ /**
+ * 单元号
+ */
+ @ApiModelProperty(value = "单元号", hidden = true)
+ private String unitNo;
+ /**
+ * 户室（房间号）
+ */
+ @ApiModelProperty(value = "户室（房间号）", hidden = true)
+ private String houseNo;
+ /**
+ * 小区id
+ */
+ @ApiModelProperty(value = "小区id")
+ private Long villageId;
+
+ /**
+ * 房屋地址
+ */
+ @ApiModelProperty(value = "房屋地址")
+ private Long address;
+
+ @ApiModelProperty("等级是否查询全部（1.是 2.否）")
+ private Integer levelIsAll;
+
+ public interface levelIsAll{
+ int yes = 1;
+ int no = 2;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseEditAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseEditAdminDTO.java
new file mode 100644
index 0000000..105dd56
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseEditAdminDTO.java
@@ -0,0 +1,51 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 实有房屋编辑请求参数
+ */
+@Data
+@ApiModel("实有房屋编辑请求参数")
+public class ComMngPopulationHouseEditAdminDTO implements Serializable {
+
+ @ApiModelProperty("房屋id")
+ private Long houseId;
+ /**
+ * 建筑面积
+ */
+ @ApiModelProperty("建筑面积")
+ private BigDecimal constructArea;
+ /**
+ * 建筑用途
+ */
+ @ApiModelProperty(value = "建筑用途")
+ private String constructPurpose;
+ /**
+ * 房屋编号
+ */
+ @ApiModelProperty(value = "房屋编号")
+ private String code;
+
+ /**
+ * 房屋状态(1.自住 2.租住 3.其他)
+ */
+ @ApiModelProperty("房屋状态(1.自住 2.租住 3.其他)")
+ private Integer status;
+ /**
+ * 房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)
+ */
+ @ApiModelProperty("房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)")
+ private Integer purpose;
+ /**
+ * 管控状态(1.常规 2.关注 3.管控)
+ */
+ @ApiModelProperty(value = "管控状态(1.常规 2.关注 3.管控)")
+ private Integer controlStatus;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseEditDTO.java
new file mode 100644
index 0000000..7c0ad3b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseEditDTO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 实有人口编辑请求参数
+ */
+@Data
+@ApiModel("实有人口房屋编辑请求参数")
+public class ComMngPopulationHouseEditDTO implements Serializable {
+
+ @ApiModelProperty("实有房屋id")
+ private Long id;
+
+ @ApiModelProperty(value = "是否是居住地(1.是 0.否)")
+ private Integer isResidence;
+
+ @ApiModelProperty("与户主关系")
+ private Integer relation;
+
+ /**
+ * 是否是居住地(1.是 0.否)
+ */
+ public interface isResidence {
+ int yes = 1;
+ int no = 0;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseInsertAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseInsertAdminDTO.java
new file mode 100644
index 0000000..bb4f2a1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseInsertAdminDTO.java
@@ -0,0 +1,132 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 实有房屋新增请求参数
+ * @author zzj
+ */
+@Data
+@ApiModel("实有房屋新增请求参数")
+public class ComMngPopulationHouseInsertAdminDTO implements Serializable {
+
+ /**
+ * 房屋地址
+ */
+ @ApiModelProperty("房屋地址")
+ private String address;
+
+ /**
+ * 房屋编号
+ */
+ @ApiModelProperty("房屋编号")
+ private String code;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ /**
+ * 街路巷id
+ */
+ @ApiModelProperty("街路巷id")
+ private String alley;
+
+ /**
+ * 门牌号
+ */
+ @ApiModelProperty("门牌号")
+ private String houseNum;
+
+ /**
+ * 楼排号
+ */
+ @ApiModelProperty("楼排号")
+ private String floor;
+ /**
+ * 单元号
+ */
+ @ApiModelProperty("单元号")
+ private String unitNo;
+ /**
+ * 户室（房间号）
+ */
+ @ApiModelProperty("户室（房间号）")
+ private String houseNo;
+
+ /**
+ * 房屋状态(1.自住 2.租住 3.其他)
+ */
+ @ApiModelProperty("房屋状态(1.自住 2.租住 3.其他)")
+ private Integer status;
+
+ /**
+ * 房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)
+ */
+ @ApiModelProperty("房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)")
+ private Integer purpose;
+
+ /**
+ * 管控状态(1.常规 2.关注 3.管控)
+ */
+ @ApiModelProperty("管控状态(1.常规 2.关注 3.管控)")
+ private Integer controlStatus;
+
+ /**
+ * 空户(1.是 2.否)
+ */
+ @ApiModelProperty("空户(1.是 2.否)")
+ private Integer isEmpty;
+
+ /**
+ * 建筑用途
+ */
+ @ApiModelProperty("建筑用途")
+ private String constructPurpose;
+
+ /**
+ * 建筑面积
+ */
+ @ApiModelProperty("建筑面积")
+ private BigDecimal constructArea;
+
+ /**
+ * 创建时间
+ */
+ private Date createAt;
+
+ /**
+ * 修改时间
+ */
+ private Date updateAt;
+
+ /**
+ * 小区id
+ */
+ @ApiModelProperty("小区id")
+ private Long villageId;
+
+ /**
+ * 街道id
+ *
+ * @return
+ */
+ @ApiModelProperty("街道id")
+ private Long streetId;
+
+ /**
+ * 层次递归字段（省>市>区县>街道>社区>小区>详细地址）
+ */
+ private String path;
+ @ApiModelProperty("人员id")
+ private Long populationId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseUserVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseUserVO.java
new file mode 100644
index 0000000..12a121e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseUserVO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class ComMngPopulationHouseUserVO {
+ private Long id;
+
+ /**
+ * 实有人口id
+ */
+ @ApiModelProperty("实有人口id")
+ private Long populId;
+
+ /**
+ * 实有房屋id
+ */
+ @ApiModelProperty("实有房屋id")
+ private Long houseId;
+
+ /**
+ * 与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)
+ */
+ @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
+ private Integer relation;
+
+ /**
+ * 人和房屋关系’ (1.自住2、租住)
+ */
+ @ApiModelProperty("人和房屋关系’ (1.自住2、租住)")
+ private Integer relationId;
+
+ /**
+ * 人和房屋关系’ (1.是、0.否)
+ */
+ @ApiModelProperty("人和房屋关系’ (1.是、0.否)")
+ private Integer residence;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationTagCardNoDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationTagCardNoDTO.java
new file mode 100644
index 0000000..9493615
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationTagCardNoDTO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 实有人口DTO
+ *
+ * @author manailin
+ */
+@Data
+public class ComMngPopulationTagCardNoDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 身份证
+ */
+ @ApiModelProperty(value = "身份证")
+ private String cardNo;
+
+ /**
+ * 标签字符串（多个以,隔开）
+ */
+ @ApiModelProperty(value = "标签字符串")
+ private String label;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationTagDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationTagDTO.java
new file mode 100644
index 0000000..297ef37
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationTagDTO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 实有人口DTO
+ */
+@Data
+public class ComMngPopulationTagDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ /**
+ * 标签字符串（多个以,隔开）
+ */
+ @ApiModelProperty(value = "标签字符串")
+ private String label;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngRealCompanyBelongsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngRealCompanyBelongsDTO.java
new file mode 100644
index 0000000..c97b737
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngRealCompanyBelongsDTO.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 实有单位归属请求参数
+ * @author: Null
+ * @date: 2021/3/11 10:36
+ */
+@Data
+@ApiModel("实有单位归属请求参数")
+public class ComMngRealCompanyBelongsDTO {
+
+ @ApiModelProperty(value = "社区名称")
+ private String actName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComOpsHouseDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComOpsHouseDTO.java
new file mode 100644
index 0000000..676e8f7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComOpsHouseDTO.java
@@ -0,0 +1,128 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 房屋租售
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-22 14:48
+ **/
+@Data
+public class ComOpsHouseDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private Long id;
+ /**
+ * 状态 0待审核 1已上架 2已驳回 3已下架
+ */
+ @ApiModelProperty(value = "状态 0待审核 1已上架 2已驳回 3已下架")
+ private Integer status;
+ /**
+ * 房屋所在社区id
+ */
+ @ApiModelProperty(value = "房屋所在社区id")
+ private Long houseCommunityId;
+ /**
+ * 房屋所在社区名字
+ */
+ @ApiModelProperty(value = "房屋所在社区名字")
+ private String houseCommunityName;
+ /**
+ * 房屋标题
+ */
+ @ApiModelProperty(value = "房屋标题")
+ private String title;
+ /**
+ * 租售类型 1 出租 2 出售
+ */
+ @ApiModelProperty(value = "租售类型 1 出租 2 出售")
+ private Integer houseType;
+ /**
+ * 租房类型 1 整租 2 合租
+ */
+ @ApiModelProperty(value = "租房类型 1 整租 2 合租")
+ private Integer rentType;
+ /**
+ * 价格
+ */
+ @ApiModelProperty(value = "价格")
+ private Double amount;
+ /**
+ * 面积
+ */
+ @ApiModelProperty(value = "面积")
+ private Integer area;
+ /**
+ * 室数量
+ */
+ @ApiModelProperty(value = "室数量")
+ private Integer brn;
+ /**
+ * 厅数量
+ */
+ @ApiModelProperty(value = "厅数量")
+ private Integer lrn;
+ /**
+ * 卫数量
+ */
+ @ApiModelProperty(value = "卫数量")
+ private Integer wcn;
+ /**
+ * 所在楼层
+ */
+ @ApiModelProperty(value = "所在楼层")
+ private Integer floor;
+ /**
+ * 总楼层
+ */
+ @ApiModelProperty(value = "总楼层")
+ private Integer totalFloor;
+ /**
+ * 朝向 0无1东2南3西4北5东南6东北7西南8西北9南北10东西
+ */
+ @ApiModelProperty(value = "朝向 0无1东2南3西4北5东南6东北7西南8西北9南北10东西")
+ private Integer orient;
+ /**
+ * 装修情况
+ */
+ @ApiModelProperty(value = "装修情况")
+ private String decoration;
+ /**
+ * 房屋简介
+ */
+ @ApiModelProperty(value = "房屋简介")
+ private String introduction;
+ /**
+ * 联系方式
+ */
+ @ApiModelProperty(value = "联系方式")
+ private String mobile;
+ /**
+ * 拒绝原因
+ */
+ @ApiModelProperty(value = "拒绝原因")
+ private String reason;
+ /**
+ * 图片地址 多个用逗号隔开
+ */
+ @ApiModelProperty(value = "图片地址 多个用逗号隔开")
+ private String photoPah;
+
+ @ApiModelProperty(value = "发布人主键", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "社区主键", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台", hidden = true)
+ private Integer userType;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComPropertyPublicityDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComPropertyPublicityDTO.java
new file mode 100644
index 0000000..774c2a1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComPropertyPublicityDTO.java
@@ -0,0 +1,61 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComPropertyPublicityDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 新增/编辑物业宣传
+ * @author: hans
+ * @date: 2021/11/11 10:55
+ */
+@Data
+@ApiModel("新增/编辑物业宣传")
+public class ComPropertyPublicityDTO {
+
+ @ApiModelProperty("物业宣传id")
+ @NotNull(groups = PutGroup.class, message = "物业宣传id不能为空")
+ private Long id;
+
+ @ApiModelProperty("宣传标题")
+ @NotBlank(groups = AddGroup.class, message = "宣传标题不能为空")
+ private String title;
+
+ @ApiModelProperty("宣传类型（0.其他 1.停水通知 2.停电通知 3.停气通知 4.物业公告 5.优秀业主）")
+ @NotNull(groups = AddGroup.class, message = "宣传类型不能为空")
+ private Integer publicityType;
+
+ @ApiModelProperty("其他类型自定义名称")
+ private String other;
+
+ @ApiModelProperty("封面")
+ @NotBlank(groups = AddGroup.class, message = "封面不能为空")
+ private String cover;
+
+ @ApiModelProperty("内容形式（1.文章链接 2.自定义内容）")
+ @NotNull(groups = AddGroup.class, message = "内容形式不能为空")
+ private Integer contentType;
+
+ @ApiModelProperty("文章链接")
+ private String articleUrl;
+
+ @ApiModelProperty("自定义内容")
+ private String diyContent;
+
+ @ApiModelProperty(value = "物业公司id", hidden = true)
+ private Long propertyId;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwDangerReportEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwDangerReportEditDTO.java
new file mode 100644
index 0000000..a24d145
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwDangerReportEditDTO.java
@@ -0,0 +1,221 @@
+package com.panzhihua.common.model.dtos.community;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @title: ComSwDangerReportEditDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 编辑隐患报告DTO
+ * @author: txb
+ * @date: 2021/09/08 16:16
+ */
+
+@Data
+@ApiModel("编辑隐患报告DTO")
+public class ComSwDangerReportEditDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 隐患报告id
+ */
+ @ApiModelProperty("隐患报告id")
+ private Long id;
+
+ /**
+ * 巡查时间
+ */
+ @ApiModelProperty("巡查时间")
+ private String patrolTime;
+
+ /**
+ * (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
+ */
+ @ApiModelProperty("巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)，多条以逗号隔开")
+ private String patrolType;
+
+ /**
+ * 巡查领导
+ */
+ @ApiModelProperty("巡查领导")
+ private String patrolLeader;
+
+ /**
+ * 巡查人员
+ */
+ @ApiModelProperty("巡查人员id")
+ private String patrolPerson;
+
+ /**
+ * 巡查地址
+ */
+ @ApiModelProperty("巡查地址")
+ private String address;
+
+ /**
+ * 巡查记录
+ */
+ @ApiModelProperty("巡查记录")
+ private String recordContent;
+
+ /**
+ * 发现记录
+ */
+ @ApiModelProperty("发现记录")
+ private String findRecord;
+
+ /**
+ * 记录照片
+ */
+ @ApiModelProperty("记录照片")
+ private String recordPhoto;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty("备注")
+ private String remark;
+
+ /**
+ * 接班领导
+ */
+ @ApiModelProperty("接班领导")
+ private String successionLeader;
+
+ /**
+ * 接班人员
+ */
+ @ApiModelProperty("接班人员")
+ private String successionPerson;
+
+ /**
+ * 接班时间
+ */
+ @ApiModelProperty("接班时间")
+ private String successionTime;
+
+ /**
+ * 是否存在隐患（1是 、0否）
+ */
+ @ApiModelProperty("是否存在隐患（1是 、0否）")
+ private Integer isHiddenDanger;
+
+ /**
+ * 隐患名称
+ */
+ @ApiModelProperty("隐患名称")
+ private String dangerName;
+
+ @ApiModelProperty("原隐患名称")
+ private String dagerName;
+
+ /**
+ * 排查时间
+ */
+ @ApiModelProperty("排查时间")
+ private String checkTime;
+
+ /**
+ * 主体部门、单位或个人全称
+ */
+ @ApiModelProperty("主体部门、单位或个人全称")
+ private String unitName;
+
+ /**
+ * 隐患简述
+ */
+ @ApiModelProperty("隐患简述")
+ private String dangerDescription;
+
+ @ApiModelProperty("原隐患简述")
+ private String dagerDescription;
+
+ /**
+ * 是否立即整改（1是 、0否）
+ */
+ @ApiModelProperty("是否立即整改（1是 、0否）")
+ private Integer isRectifyImmediately;
+
+ /**
+ * 社区处理建议
+ */
+ @ApiModelProperty("社区处理建议")
+ private String communitySuggestion;
+
+ /**
+ * 街道安全人员管理建议
+ */
+ @ApiModelProperty("街道安全人员管理建议")
+ private String streetSuggestion;
+
+ /**
+ * 承办记录
+ */
+ @ApiModelProperty("承办记录")
+ private String undertakeRecord;
+
+ /**
+ * 领导意见
+ */
+ @ApiModelProperty("领导意见")
+ private String leaderSuggestion;
+
+ /**
+ * 风险等级（1.红色预警 2.橙色预警 3.黄色预警 4.蓝色预警）
+ */
+ @ApiModelProperty("风险等级（1.红色预警 2.橙色预警 3.黄色预警 4.蓝色预警）")
+ private String dangerLevel;
+
+ /**
+ * 指派人员
+ */
+ @ApiModelProperty("指派人员")
+ private String assignPerson;
+
+ /**
+ * 采取措施
+ */
+ @ApiModelProperty("采取措施")
+ private String takeSteps;
+
+ /**
+ * 采取措施照片
+ */
+ @ApiModelProperty("采取措施照片")
+ private String stepsPhoto;
+
+ /**
+ * 整改人员
+ */
+ @ApiModelProperty("整改人员id")
+ private String rectifyPerson;
+
+ /**
+ * 修改人员
+ */
+ @ApiModelProperty("修改人员")
+ private Long updateBy;
+
+ /**
+ * 巡查类型
+ */
+ public interface patrolType {
+ int huo = 1;
+ int xun = 2;
+ int yi = 3;
+ }
+
+ /**
+ * 是否
+ */
+ public interface isOk {
+ int yes = 1;
+ int no = 0;
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwDangerReportHandleDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwDangerReportHandleDTO.java
new file mode 100644
index 0000000..696449c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwDangerReportHandleDTO.java
@@ -0,0 +1,69 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 隐患报告处理DTO
+ */
+@Data
+@ApiModel("隐患报告处理DTO")
+public class ComSwDangerReportHandleDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 隐患报告id
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("隐患报告id")
+ private Long dangerReportId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ /**
+ * 社区处理建议
+ */
+ @ApiModelProperty("社区处理建议")
+ private String communitySuggestion;
+
+ /**
+ * 街道安全人员管理建议
+ */
+ @ApiModelProperty("街道安全人员管理建议")
+ private String streetSuggestion;
+
+ /**
+ * 承办记录
+ */
+ @ApiModelProperty("承办记录")
+ private String undertakeRecord;
+
+ /**
+ * 领导意见
+ */
+ @ApiModelProperty("领导意见")
+ private String leaderSuggestion;
+
+ /**
+ * 风险等级（1.红色预警 2.橙色预警 3.黄色预警 4.蓝色预警）
+ */
+ @ApiModelProperty("风险等级（1.红色预警 2.橙色预警 3.黄色预警 4.蓝色预警）")
+ private String dangerLevel;
+
+ /**
+ * 指派人员
+ */
+ @ApiModelProperty("指派人员")
+ private String assignPerson;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwDangerReportRectifyDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwDangerReportRectifyDTO.java
new file mode 100644
index 0000000..f58cde0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwDangerReportRectifyDTO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 隐患报告整改DTO
+ */
+@Data
+@ApiModel("隐患报告整改DTO")
+public class ComSwDangerReportRectifyDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 隐患报告id
+ */
+ @ApiModelProperty("隐患报告id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long dangerReportId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ /**
+ * 采取措施
+ */
+ @ApiModelProperty("采取措施")
+ private String takeSteps;
+
+ /**
+ * 采取措施照片
+ */
+ @ApiModelProperty("采取措施照片")
+ private String stepsPhoto;
+
+ /**
+ * 整改人员
+ */
+ @ApiModelProperty("整改人员")
+ private String rectifyPerson;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java
new file mode 100644
index 0000000..c75b9e8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java
@@ -0,0 +1,224 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther txb
+ * @create 2021-07-23 14:38:38
+ * @describe 社区》安全工作》巡查记录实体类
+ */
+
+@Data
+@ApiModel("新增巡查记录DTO")
+public class ComSwPatrolRecordAddDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ /**
+ * 巡查时间
+ */
+ @ApiModelProperty("巡查时间")
+ private String PatrolTime;
+
+ /**
+ * (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
+ */
+ @ApiModelProperty("巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)，多条以逗号隔开")
+ private String patrolType;
+
+ /**
+ * 巡查领导
+ */
+ @ApiModelProperty("巡查领导id")
+ private String patrolLeader;
+
+ /**
+ * 巡查人员
+ */
+ @ApiModelProperty("巡查人员id")
+ private String patrolPerson;
+
+ /**
+ * 巡查人员名字，多个以逗号隔开
+ */
+ @ApiModelProperty("巡查人员名字，多个以逗号隔开")
+ private String pPersonName;
+
+ /**
+ * 巡查人员电话，多个以逗号隔开
+ */
+ @ApiModelProperty("巡查人员电话，多个以逗号隔开")
+ private String pPersonPhone;
+
+ /**
+ * 巡查地址
+ */
+ @ApiModelProperty("巡查地址")
+ private String address;
+
+ /**
+ * 巡查记录
+ */
+ @ApiModelProperty("巡查记录")
+ private String recordContent;
+
+ /**
+ * 发现记录
+ */
+ @ApiModelProperty("发现记录")
+ private String findRecord;
+
+ /**
+ * 记录照片
+ */
+ @ApiModelProperty("记录照片")
+ private String recordPhoto;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty("备注")
+ private String remark;
+
+ /**
+ * 接班领导
+ */
+ @ApiModelProperty("接班领导")
+ private String successionLeader;
+
+ /**
+ * 接班人员
+ */
+ @ApiModelProperty("接班人员")
+ private String successionPerson;
+
+ /**
+ * 接班时间
+ */
+ @ApiModelProperty("接班时间")
+ private String successionTime;
+
+ /**
+ * 是否存在隐患（1是 、0否）
+ */
+ @ApiModelProperty("是否存在隐患（1是 、0否）")
+ private Integer isHiddenDanger;
+
+ /**
+ * 隐患类型(1.火灾隐患2.汛情隐患3.疫情隐患)
+ */
+ @ApiModelProperty("隐患类型(1.火灾隐患2.汛情隐患3.疫情隐患)，多条以逗号隔开")
+ private String hiddenDangerType;
+
+ /**
+ * 隐患名称
+ */
+ @ApiModelProperty("隐患名称")
+ private String dangerName;
+
+ @ApiModelProperty("原隐患名称")
+ private String dagerName;
+
+ /**
+ * 排查时间
+ */
+ @ApiModelProperty("排查时间")
+ private String checkTime;
+
+ /**
+ * 主体部门、单位或个人全称
+ */
+ @ApiModelProperty("主体部门、单位或个人全称")
+ private String unitName;
+
+ /**
+ * 隐患简述
+ */
+ @ApiModelProperty("隐患简述")
+ private String dangerDescription;
+
+ @ApiModelProperty("原隐患简述")
+ private String dagerDescription;
+
+ /**
+ * 是否立即整改（1是 、0否）
+ */
+ @ApiModelProperty("是否立即整改（1是 、0否）")
+ private Integer isRectifyImmediately;
+
+ /**
+ * 采取措施
+ */
+ @ApiModelProperty("采取措施")
+ private String takeSteps;
+
+ /**
+ * 采取措施照片
+ */
+ @ApiModelProperty("采取措施照片")
+ private String stepsPhoto;
+
+ /**
+ * 整改人员
+ */
+ @ApiModelProperty("整改人员id")
+ private String rectifyPerson;
+
+ /**
+ * 整改人员名字，多个以逗号隔开
+ */
+ @ApiModelProperty("整改人员名字，多个以逗号隔开")
+ private String dPersonName;
+
+ /**
+ * 整改人员电话，多个以逗号隔开
+ */
+ @ApiModelProperty("整改人员电话，多个以逗号隔开")
+ private String dPersonPhone;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty("创建人")
+ private Long createBy;
+
+ /**
+ * 巡查类型
+ */
+ public interface patrolType {
+ int huo = 1;
+ int xun = 2;
+ int yi = 3;
+ }
+
+ /**
+ * 巡查类型
+ */
+ public interface hiddenDangerType {
+ int huo = 1;
+ int xun = 2;
+ int yi = 3;
+ }
+
+ /**
+ * 是否
+ */
+ public interface isOk {
+ int yes = 1;
+ int no = 0;
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordEditDTO.java
new file mode 100644
index 0000000..9c21563
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordEditDTO.java
@@ -0,0 +1,124 @@
+package com.panzhihua.common.model.dtos.community;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @title: ComSwPatrolRecordEditDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 编辑巡查记录DTO
+ * @author: txb
+ * @date: 2021/09/08 16:16
+ */
+@Data
+@ApiModel("编辑巡查记录DTO")
+public class ComSwPatrolRecordEditDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 巡查记录id
+ */
+ @ApiModelProperty("巡查记录id")
+ private Long id;
+
+ /**
+ * 巡查时间
+ */
+ @ApiModelProperty("巡查时间")
+ private String patrolTime;
+
+ /**
+ * (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
+ */
+ @ApiModelProperty("巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)，多条以逗号隔开")
+ private String patrolType;
+
+ /**
+ * 巡查领导
+ */
+ @ApiModelProperty("巡查领导id")
+ private String patrolLeader;
+
+ /**
+ * 巡查人员
+ */
+ @ApiModelProperty("巡查人员id")
+ private String patrolPerson;
+
+ /**
+ * 巡查地址
+ */
+ @ApiModelProperty("巡查地址")
+ private String address;
+
+ /**
+ * 巡查记录
+ */
+ @ApiModelProperty("巡查记录")
+ private String recordContent;
+
+ /**
+ * 发现记录
+ */
+ @ApiModelProperty("发现记录")
+ private String findRecord;
+
+ /**
+ * 记录照片
+ */
+ @ApiModelProperty("记录照片")
+ private String recordPhoto;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty("备注")
+ private String remark;
+
+ /**
+ * 接班领导
+ */
+ @ApiModelProperty("接班领导")
+ private String successionLeader;
+
+ /**
+ * 接班人员
+ */
+ @ApiModelProperty("接班人员")
+ private String successionPerson;
+
+ /**
+ * 接班时间
+ */
+ @ApiModelProperty("接班时间")
+ private String successionTime;
+
+ /**
+ * 修改人员
+ */
+ @ApiModelProperty("修改人员")
+ private Long updateBy;
+
+ /**
+ * 巡查类型
+ */
+ public interface patrolType {
+ int huo = 1;
+ int xun = 2;
+ int yi = 3;
+ }
+
+ /**
+ * 是否
+ */
+ public interface isOk {
+ int yes = 1;
+ int no = 0;
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java
new file mode 100644
index 0000000..b6fc13c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordPageDTO.java
@@ -0,0 +1,79 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询巡查记录DTO
+ */
+@Data
+@ApiModel("分页查询巡查记录DTO")
+public class ComSwPatrolRecordPageDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 分页-当前页数
+ */
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ /**
+ * 分页-每页记录数
+ */
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("巡查开始时间")
+ private String patrolAtBegin;
+
+ @ApiModelProperty("巡查结束时间")
+ private String patrolAtEnd;
+
+ @ApiModelProperty(value = "巡查开始时间(日期格式)", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date patrolAtBeginDate;
+
+ @ApiModelProperty(value = "巡查结束时间(日期格式)", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date patrolAtEndDate;
+
+ /**
+ * (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
+ */
+ @ApiModelProperty("巡查类型(1.防火巡查2.防汛巡查3.防疫巡查),多条以逗号隔开")
+ private String patrolType;
+
+ /**
+ * 巡查人员
+ */
+ @ApiModelProperty("巡查人员")
+ private String patrolPerson;
+
+ /**
+ * 状态（1.待查看 2.待处理 3.待整改 4.已整改）
+ */
+ @ApiModelProperty("状态（1.待处理 2.待整改 3.已整改）")
+ private String status;
+
+ /**
+ * 查看人（1.全部 2.只看我的）
+ */
+ @ApiModelProperty("查看人（1.全部 2.只看我的）")
+ private Integer selectPerson;
+
+ @ApiModelProperty("区域编码")
+ private String areaCode;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwRotaPageDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwRotaPageDTO.java
new file mode 100644
index 0000000..7a2fbda
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwRotaPageDTO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询值班表DTO
+ */
+@Data
+@ApiModel("分页查询值班表DTO")
+public class ComSwRotaPageDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 分页-当前页数
+ */
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ /**
+ * 分页-每页记录数
+ */
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ /**
+ * 值班人员
+ */
+ @ApiModelProperty("值班人员")
+ private String rotaPerson;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwRotaSaveDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwRotaSaveDTO.java
new file mode 100644
index 0000000..3db2611
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwRotaSaveDTO.java
@@ -0,0 +1,77 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 新增值班表DTO
+ */
+@Data
+@ApiModel("新增值班表DTO")
+public class ComSwRotaSaveDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * id
+ */
+ @ApiModelProperty("id")
+ private Long id;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ /**
+ * 值班时间
+ */
+ @ApiModelProperty("值班时间")
+ private String rotaDate;
+
+ /**
+ * 值班领导，多个以逗号隔开
+ */
+ @ApiModelProperty("值班领导，多个以逗号隔开")
+ private String rotaLeader;
+
+ /**
+ * 领导名字，多个以逗号隔开
+ */
+ @ApiModelProperty("领导名字，多个以逗号隔开")
+ private String leaderName;
+
+ /**
+ * 领导电话，多个以逗号隔开
+ */
+ @ApiModelProperty("领导电话，多个以逗号隔开")
+ private String leaderPhone;
+
+ /**
+ * 值班人员，多个以逗号隔开
+ */
+ @ApiModelProperty("值班人员，多个以逗号隔开")
+ private String rotaPerson;
+
+ /**
+ * 人员名字，多个以逗号隔开
+ */
+ @ApiModelProperty("人员名字，多个以逗号隔开")
+ private String personName;
+
+ /**
+ * 人员电话，多个以逗号隔开
+ */
+ @ApiModelProperty("人员电话，多个以逗号隔开")
+ private String personPhone;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty("创建人")
+ private Long createBy;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwSafetyWorkEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwSafetyWorkEditDTO.java
new file mode 100644
index 0000000..6aaf9db
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwSafetyWorkEditDTO.java
@@ -0,0 +1,122 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @title: ComSwSafetyWorkEditDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 安全工作记录DTO
+ * @author: txb
+ * @date: 2021/09/08 16:16
+ */
+@Data
+@ApiModel("安全工作记录DTO")
+public class ComSwSafetyWorkEditDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 安全工作记录id
+ */
+ @ApiModelProperty("安全工作记录id")
+ private Long id;
+
+ /**
+ * 巡查时间
+ */
+ @ApiModelProperty("巡查时间")
+ private String patrolTime;
+
+ /**
+ * (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
+ */
+ @ApiModelProperty("巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)，多条以逗号隔开")
+ private String patrolType;
+
+ /**
+ * 巡查领导
+ */
+ @ApiModelProperty("巡查领导id")
+ private String patrolLeader;
+
+ /**
+ * 巡查人员
+ */
+ @ApiModelProperty("巡查人员id")
+ private String patrolPerson;
+
+ /**
+ * 巡查地址
+ */
+ @ApiModelProperty("巡查地址")
+ private String address;
+
+ /**
+ * 巡查记录
+ */
+ @ApiModelProperty("巡查记录")
+ private String recordContent;
+
+ /**
+ * 发现记录
+ */
+ @ApiModelProperty("发现记录")
+ private String findRecord;
+
+ /**
+ * 记录照片
+ */
+ @ApiModelProperty("记录照片")
+ private String recordPhoto;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty("备注")
+ private String remark;
+
+ /**
+ * 接班领导
+ */
+ @ApiModelProperty("接班领导")
+ private String successionLeader;
+
+ /**
+ * 接班人员
+ */
+ @ApiModelProperty("接班人员")
+ private String successionPerson;
+
+ /**
+ * 接班时间
+ */
+ @ApiModelProperty("接班时间")
+ private String successionTime;
+
+ /**
+ * 修改人员
+ */
+ @ApiModelProperty("修改人员")
+ private Long updateBy;
+
+ /**
+ * 巡查类型
+ */
+ public interface patrolType {
+ int huo = 1;
+ int xun = 2;
+ int yi = 3;
+ }
+
+ /**
+ * 是否
+ */
+ public interface isOk {
+ int yes = 1;
+ int no = 0;
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/DisabledPersonsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/DisabledPersonsDTO.java
new file mode 100644
index 0000000..76c3f8e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/DisabledPersonsDTO.java
@@ -0,0 +1,122 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+/**
+ * Description 残疾人dto ClassName DisabledPersons
+ *
+ * @author manailin
+ */
+@Data
+public class DisabledPersonsDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 主键
+ */
+ private Long id;
+
+ private Long userId;
+ /**
+ * 街道id
+ */
+ private Long streetId;
+ /**
+ * 社区id
+ */
+ private Long actId;
+ /**
+ * 名字
+ */
+ @ExcelProperty(value = "名字", index = 0)
+ @Excel(name = "姓名(必填项)", width = 20, isImportField = "true_st")
+ private String name;
+ /**
+ * 身份证号码
+ */
+ @ExcelProperty(value = "身份证号码", index = 1)
+ @Excel(name = "身份证号码(必填项)", width = 20, isImportField = "true_st")
+ private String cardNo;
+ /**
+ * 残疾人证编码
+ */
+ @ExcelProperty(value = "残疾人证编码", index = 2)
+ @Excel(name = "残疾人证编码(必填项)", width = 20, isImportField = "true_st")
+ private String disableSn;
+ /**
+ * 出生年月
+ */
+ private String birthday;
+ /**
+ * 残疾人证
+ */
+ @ExcelProperty(value = "残疾人证类型", index = 3)
+ @Excel(name = "残疾人证类型(必填项)", width = 20, isImportField = "true_st")
+ private String level;
+ /**
+ * 性别(取字典表国家编码)
+ */
+ @ExcelProperty(value = "性别", index = 4)
+ @Excel(name = "性别(必填项)", width = 20, isImportField = "true_st")
+ private String sex;
+ /**
+ * 性别名称
+ */
+ private String sexName;
+ /**
+ * 文化程度(取字典表国家编码))
+ */
+ @ExcelProperty(value = "文化程度", index = 5)
+ @Excel(name = "文化程度(必填项)", width = 20, isImportField = "true_st")
+ private String cultureLevel;
+ /**
+ * 民族
+ */
+ @ExcelProperty(value = "民族", index = 6)
+ @Excel(name = "民族(必填项)", width = 20, isImportField = "true_st")
+ private String nation;
+ /**
+ * 残疾部位/类别
+ */
+ @ExcelProperty(value = "残疾类别", index = 7)
+ @Excel(name = "残疾类别(必填项)", width = 20, isImportField = "true_st")
+ private String disableType;
+ /**
+ * 残疾级别
+ */
+ @ExcelProperty(value = "残疾级别", index = 8)
+ @Excel(name = "残疾级别(必填项)", width = 20, isImportField = "true_st")
+ private String disableLevel;
+ /**
+ * 联系电话
+ */
+ @ExcelProperty(value = "联系电话", index = 9)
+ @Excel(name = "联系电话(必填项)", width = 20, isImportField = "true_st")
+ private String phone;
+ /**
+ * 监护人联系电话
+ */
+ @ExcelProperty(value = "监护人联系电话", index = 10)
+ @Excel(name = "监护人联系电话(必填项)", width = 20, isImportField = "true_st")
+ private String guardianPhone;
+ /**
+ * 地址
+ */
+ @ExcelProperty(value = "地址", index = 11)
+ @Excel(name = "地址(必填项)", width = 20, isImportField = "true_st")
+ private String address;
+ /**
+ * 创建用户
+ */
+ private Long createBy;
+
+ /**
+ * 修改用户
+ */
+ private Long updateBy;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/DiscussVoteOptionDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/DiscussVoteOptionDTO.java
new file mode 100644
index 0000000..80bb4fa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/DiscussVoteOptionDTO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: DiscussVoteOptionDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 一起议投票请求参数
+ * @author: hans
+ * @date: 2021/09/16 17:03
+ */
+@Data
+@ApiModel("一起议投票请求参数")
+public class DiscussVoteOptionDTO {
+ @ApiModelProperty("投票内容")
+ @NotEmpty(message = "投票内容不能为空")
+ private List<ComActDiscussVoteOptionDTO> options;
+
+ @ApiModelProperty(value = "投票人id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EditComActDynTypeDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EditComActDynTypeDTO.java
new file mode 100644
index 0000000..dbe3064
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EditComActDynTypeDTO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.dtos.community;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("新增社区动态分类请求参数")
+public class EditComActDynTypeDTO {
+
+ @ApiModelProperty("主键(分类编码)")
+ private Long id;
+
+ @ApiModelProperty("分类名称")
+ @Length(min = 1, max = 5, message = "分类名称不可超过5个字")
+ private String name;
+
+ @ApiModelProperty("分类字体颜色")
+ private String color;
+
+ @ApiModelProperty(value = "操作人员id", hidden = true)
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthAddByFamilyDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthAddByFamilyDTO.java
new file mode 100644
index 0000000..7d22b8d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthAddByFamilyDTO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel("创建高龄认证请求参数")
+public class EldersAuthAddByFamilyDTO {
+
+ @NotBlank()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "家庭成员ID", hidden = false, example = "1", required = true)
+ private Long familyUserId;
+
+ @Length(max = 1024)
+ @NotBlank()
+ @ApiModelProperty(value = "视频地址", hidden = false, example = "")
+ private String videoUrl;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "提交人", hidden = true, example = "1")
+ private Long sumitUserId;
+
+ @ApiModelProperty(value = "用户ID", hidden = true, example = "")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthAddDTO.java
new file mode 100644
index 0000000..f5035ac
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthAddDTO.java
@@ -0,0 +1,61 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel("创建高龄认证请求参数")
+public class EldersAuthAddDTO {
+
+ @NotBlank()
+ @Length(max = 18)
+ @ApiModelProperty(value = "身份证", hidden = false, example = "")
+ private String idCard;
+
+ @Length(max = 32)
+ @NotBlank()
+ @ApiModelProperty(value = "认证人姓名", hidden = false, example = "")
+ private String authUserName;
+
+ @Length(max = 1024)
+ @NotBlank()
+ @ApiModelProperty(value = "视频地址", hidden = false, example = "")
+ private String videoUrl;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "提交人", hidden = true, example = "1")
+ private Long sumitUserId;
+
+ @Length(max = 1024)
+ @ApiModelProperty(value = "户籍地", hidden = false, example = "")
+ private String domicile;
+
+ @Length(max = 1)
+ @ApiModelProperty(value = "状态", hidden = false, example = "")
+ private String status;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "出生日期", hidden = false, example = "2021-05-01 18:05:50")
+ private Date birthDay;
+
+ @ApiModelProperty(value = "用户ID", hidden = true, example = "")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthDeleteDTO.java
new file mode 100644
index 0000000..517f8ce
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthDeleteDTO.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel("删除高龄认证请求参数")
+public class EldersAuthDeleteDTO {
+
+ @ApiModelProperty(value = "ID", hidden = false, example = "1")
+ private Long id;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthEditDTO.java
new file mode 100644
index 0000000..8539fe9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthEditDTO.java
@@ -0,0 +1,65 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel("编辑高龄认证请求参数")
+public class EldersAuthEditDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "ID", hidden = false, example = "1")
+ private Long id;
+
+ @NotBlank()
+ @Length(max = 18)
+ @ApiModelProperty(value = "身份证", hidden = false, example = "")
+ private String idCard;
+
+ @Length(max = 32)
+ @ApiModelProperty(value = "认证人姓名", hidden = false, example = "")
+ private String authUserName;
+
+ @Length(max = 1024)
+ @ApiModelProperty(value = "视频地址", hidden = false, example = "")
+ private String videoUrl;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "提交人", hidden = false, example = "1")
+ private Long sumitUserId;
+
+ @Length(max = 1024)
+ @ApiModelProperty(value = "户籍地", hidden = false, example = "")
+ private String domicile;
+
+ @Length(max = 1)
+ @ApiModelProperty(value = "状态", hidden = false, example = "")
+ private String status;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "出生日期", hidden = false, example = "2021-05-01 18:05:50")
+ private Date birthDay;
+
+ @ApiModelProperty(value = "用户ID", hidden = true, example = "")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthElderlyDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthElderlyDTO.java
new file mode 100644
index 0000000..76364d7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthElderlyDTO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 高领老人分页查询条件
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel("高领老人分页查询条件")
+public class EldersAuthElderlyDTO {
+
+ @ApiModelProperty(value = "id")
+ private Long id;
+
+ @ApiModelProperty(value = "姓名", example = "妞妞")
+ private String name;
+
+ @ApiModelProperty(value = "身份证号码")
+ private String idCard;
+
+ @ApiModelProperty(value = "是否健在(1是，2否)", example = "1是，2否")
+ private Integer isExist;
+
+ @ApiModelProperty(value = "是否办理高龄津贴(1是，2否)", example = "1是，2否")
+ private Integer isBigAge;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthFeedbackAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthFeedbackAddDTO.java
new file mode 100644
index 0000000..5cdeda1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthFeedbackAddDTO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel("创建高龄认证社区反馈请求参数")
+public class EldersAuthFeedbackAddDTO {
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "认证ID", hidden = false, example = "1", required = true)
+ private Long authId;
+
+ @Length(max = 1024)
+ @ApiModelProperty(value = "反馈结果", hidden = false, example = "")
+ private String feedBack;
+
+ @ApiModelProperty(value = "用户ID", hidden = true, example = "")
+ private Long userId;
+
+ private String areaCode;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthFeedbackDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthFeedbackDeleteDTO.java
new file mode 100644
index 0000000..032d6ee
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthFeedbackDeleteDTO.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel("删除高龄认证社区反馈请求参数")
+public class EldersAuthFeedbackDeleteDTO {
+
+ @ApiModelProperty(value = "ID", hidden = false, example = "1")
+ private Long id;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthFeedbackEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthFeedbackEditDTO.java
new file mode 100644
index 0000000..0f71263
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthFeedbackEditDTO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel("编辑高龄认证社区反馈请求参数")
+public class EldersAuthFeedbackEditDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "ID", hidden = false, example = "1")
+ private Long id;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "认证ID", hidden = false, example = "1")
+ private Long authId;
+
+ @Length(max = 1024)
+ @ApiModelProperty(value = "反馈结果", hidden = false, example = "")
+ private String feedBack;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthTypeQueryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthTypeQueryDTO.java
new file mode 100644
index 0000000..2a589e4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthTypeQueryDTO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel("高龄认证查询请求参数")
+public class EldersAuthTypeQueryDTO {
+
+ @NotBlank()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "家庭成员ID", hidden = false, example = "1", required = true)
+ private Long familyUserId;
+
+ @Length(max = 1024)
+ @NotBlank()
+ @ApiModelProperty(value = "视频地址", hidden = false, example = "")
+ private String videoUrl;
+
+ @ApiModelProperty(value = "用户ID", hidden = true, example = "")
+ private Long userId;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "提交人", hidden = true, example = "1")
+ private Long operUserId;
+
+ @ApiModelProperty(value = "社区ID", hidden = true, example = "")
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExcelElderAuthDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExcelElderAuthDTO.java
new file mode 100644
index 0000000..56e3b39
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExcelElderAuthDTO.java
@@ -0,0 +1,48 @@
+package com.panzhihua.common.model.dtos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @description: 商城订单导出
+ * @author: cedoo
+ * @date: 2021-4-18 16:13:21
+ */
+@Data
+public class ExcelElderAuthDTO {
+
+ @ExcelProperty("*序号")
+ private Integer seq;
+
+ @ExcelProperty("*项目名称")
+ private String subsidy;
+
+ @ExcelProperty("*发放批次")
+ private String batch;
+
+ @ExcelProperty("*姓名")
+ private String name;
+
+ @ExcelProperty("*身份证号")
+ private String idCard;
+
+ @ExcelProperty("*人员类别")
+ private String type;
+
+ @ExcelProperty("*应付年月")
+ private String yearMonth;
+
+ @ExcelProperty("*发放金额（元）")
+ private String payCount;
+
+ @ExcelProperty("联系电话（到账信息提醒）")
+ private String telphone;
+
+ @ExcelProperty("*所属村(社区)")
+ private String communityName;
+
+ @ExcelProperty("所属组")
+ private String group;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExcelHouseDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExcelHouseDTO.java
new file mode 100644
index 0000000..ceab04b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExcelHouseDTO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.dtos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @description: 房屋信息导出
+ * @author: Null
+ * @date: 2021/3/16 09:36
+ */
+@Data
+public class ExcelHouseDTO {
+
+ @ExcelProperty("楼栋")
+ private String build;
+
+ @ExcelProperty("单元")
+ private String unit;
+
+ @ExcelProperty("楼层")
+ private String floor;
+
+ @ExcelProperty("房间")
+ private String room;
+
+ @ExcelProperty("面积")
+ private String square;
+
+ @ExcelProperty("房屋状态")
+ private String state;
+
+ @ExcelProperty("居住人")
+ private String username;
+
+ @ExcelProperty("联系电话")
+ private String phone;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExcelQuestnaireAnswersDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExcelQuestnaireAnswersDTO.java
new file mode 100644
index 0000000..065ca44
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExcelQuestnaireAnswersDTO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.util.List;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 用户问卷excel导出
+ * @author: cedoo
+ * @create: 2021-4-10 10:34:52
+ **/
+@Data
+public class ExcelQuestnaireAnswersDTO {
+
+ @ExcelProperty("姓名")
+ private String name;
+
+ @ExcelProperty("提交时间")
+ private String submitTime;
+
+ @ExcelProperty("题目答案")
+ private List<String> answers;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportComMngCarExcelDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportComMngCarExcelDTO.java
new file mode 100644
index 0000000..043d3f2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportComMngCarExcelDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 车辆导出请求参数
+ * @author: txb
+ * @date: 2021/7/14 10:36
+ */
+@Data
+@ApiModel("车辆导出请求参数")
+public class ExportComMngCarExcelDTO {
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "小区名称")
+ private String areaName;
+
+ @ApiModelProperty(value = "车主名称")
+ private String userName;
+
+ @ApiModelProperty(value = "小区id", hidden = true)
+ private Long villageId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportRealAssetsExcelDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportRealAssetsExcelDTO.java
new file mode 100644
index 0000000..4b3e0d8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportRealAssetsExcelDTO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 实有资产导出请求参数
+ * @author: Null
+ * @date: 2021/3/11 10:36
+ */
+@Data
+@ApiModel("实有资产导出请求参数")
+public class ExportRealAssetsExcelDTO {
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "资产名称")
+ private String name;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportRealCompanyExcelDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportRealCompanyExcelDTO.java
new file mode 100644
index 0000000..22ae4c2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportRealCompanyExcelDTO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 实有单位导出请求参数
+ * @author: Null
+ * @date: 2021/3/11 10:36
+ */
+@Data
+@ApiModel("实有单位导出请求参数")
+public class ExportRealCompanyExcelDTO {
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "单位名称")
+ private String comName;
+
+ @ApiModelProperty(value = "法人")
+ private String legalPerson;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportSpecialUserDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportSpecialUserDTO.java
new file mode 100644
index 0000000..dff29a6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportSpecialUserDTO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 特殊群体excel导出查询参数
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-02-20 10:27
+ **/
+@Data
+@ApiModel("特殊群体excel导出查询参数")
+public class ExportSpecialUserDTO {
+ @ApiModelProperty(value = "姓名")
+ private String name;
+ @ApiModelProperty(value = "小区名字")
+ private String areaName;
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+ @ApiModelProperty("标签")
+ private String tags;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportUserDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportUserDTO.java
new file mode 100644
index 0000000..c4d297d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportUserDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 居民excel导出查询参数
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-02-20 10:27
+ **/
+@Data
+@ApiModel("居民excel导出查询参数")
+public class ExportUserDTO {
+ @ApiModelProperty(value = "姓名")
+ private String name;
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+ @ApiModelProperty(value = "小区名字")
+ private String areaName;
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/GetIdentityEidTokenDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/GetIdentityEidTokenDTO.java
new file mode 100644
index 0000000..c4899cb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/GetIdentityEidTokenDTO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import com.panzhihua.common.model.helper.sensitive.Sensitive;
+import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: GetIdentityEidTokenDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 获取身份认证人脸核验token参数
+ * @author: hans
+ * @date: 2021/09/13 11:07
+ */
+@Data
+@ApiModel("获取身份认证人脸核验token参数")
+@EncryptDecryptClass
+public class GetIdentityEidTokenDTO {
+
+ @ApiModelProperty(value = "认证类型（1.高龄认证 2.养老认证）", required = true, allowableValues = "1,2", example = "1")
+ @NotNull(message = "认证类型不能为空")
+ private Integer authType;
+
+ @ApiModelProperty(value = "姓名", required = true, example = "张三")
+ @Sensitive(strategy = SensitiveStrategy.USERNAME)
+ @NotBlank(message = "姓名不能为空")
+ private String name;
+
+ @ApiModelProperty(value = "身份证号", required = true, example = "511321199503241233")
+ @Sensitive(strategy = SensitiveStrategy.ID_CARD)
+ @EncryptDecryptField
+ @NotBlank(message = "身份证号码不能为空")
+ @Size(min = 18, max = 18, message = "请输入18位有效身份证号")
+ private String idCard;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/GrantRewardDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/GrantRewardDTO.java
new file mode 100644
index 0000000..798970b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/GrantRewardDTO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 随手拍发放奖励请求参数
+ */
+@Data
+@ApiModel("随手拍发放奖励请求参数")
+public class GrantRewardDTO implements Serializable {
+
+ @ApiModelProperty(value = "随手拍id")
+ @NotBlank(groups = {AddGroup.class}, message = "随手拍id不能为空")
+ private List<Long> ids;
+
+ @ApiModelProperty(value = "发放奖励金额")
+ @NotBlank(groups = {AddGroup.class}, message = "发放奖励金额不能为空")
+ private BigDecimal amount;
+
+ @ApiModelProperty(value = "操作人", hidden = true)
+ private Long userId;
+
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/KeyPersonInfoDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/KeyPersonInfoDTO.java
new file mode 100644
index 0000000..a885ddc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/KeyPersonInfoDTO.java
@@ -0,0 +1,156 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * Description 重点人员信息 ClassName KeyPersonInfo
+ *
+ * @author manailin
+ */
+@Data
+public class KeyPersonInfoDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 主键
+ */
+ private Long id;
+ /**
+ * 街道id
+ */
+ private Long streetId;
+ /**
+ * 姓名
+ */
+ @ExcelProperty(value = "姓名(必填项)", index = 0)
+ private String name;
+ /**
+ * 性别(取字典表国家编码)
+ */
+ private String sex;
+ /**
+ * 性别名称
+ */
+ @ExcelProperty(value = "性别名称", index = 1)
+ private String sexName;
+ /**
+ * 身份证号码
+ */
+ @ExcelProperty(value = "身份证号码", index = 2)
+ private String cardNo;
+ /**
+ * 联系方式
+ */
+ @ExcelProperty(value = "联系方式", index = 3)
+ private String phone;
+ /**
+ * 民族
+ */
+ @ExcelProperty(value = "民族", index = 4)
+ private String nation;
+ /**
+ * 户口所在地
+ */
+ @ExcelProperty(value = "户口所在地", index = 5)
+ private String censusRegister;
+ /**
+ * 居住地址
+ */
+ @ExcelProperty(value = "居住地址", index = 6)
+ private String address;
+ /**
+ * 地址精度纬度信息（逗号隔开）
+ */
+ @ExcelProperty(value = "地址精度纬度信息（逗号隔开）", index = 7)
+ private String visiterAddressLatLng;
+ /**
+ * 人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员
+ */
+ @ExcelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员", index = 8)
+ private String visiterType;
+ /**
+ * (法轮功类填写)基本情况
+ */
+ @ExcelProperty(value = "(法轮功类填写)基本情况", index = 9)
+ private String basicInfo;
+ /**
+ * 是否有效
+ */
+ @ExcelProperty(value = "是否有效", index = 10)
+ private Boolean invalid;
+ /**
+ * 备注
+ */
+ @ExcelProperty(value = "备注", index = 11)
+ private String note;
+ /**
+ * 文化程度(取字典表国家编码))
+ */
+ @ExcelProperty(value = "文化程度", index = 12)
+ private String cultureLevel;
+ /**
+ * 经济状态
+ */
+ @ExcelProperty(value = "经济状态", index = 13)
+ private String economicLevel;
+ /**
+ * 修改人
+ */
+ private Long updateBy;
+ /**
+ * 修改时间
+ */
+ private Date updateAt;
+ /**
+ * 创建人
+ */
+ private Long createBy;
+ /**
+ * （精神类人群填写）目前诊断
+ */
+ @ExcelProperty(value = "目前诊断", index = 14)
+ private String diagnose;
+ /**
+ * 上报提交时间
+ */
+ private Date submitDate;
+ /**
+ * （精神类人群填写）监护人名称
+ */
+ @ExcelProperty(value = "监护人名称", index = 15)
+ private String guardian;
+ /**
+ * （精神类人群填写）监护人电话
+ */
+ @ExcelProperty(value = "监护人电话", index = 16)
+ private String guardianPhone;
+ /**
+ * （精神类人群填写）监护人关系
+ */
+ @ExcelProperty(value = "监护人关系", index = 17)
+ private String guardianRelation;
+ /**
+ * 创建时间
+ */
+ private Date createAt;
+ /**
+ * 社区id
+ */
+
+ private Long actId;
+ /**
+ * 小区id（实有房屋id）
+ */
+
+ private Long villageId;
+ /**
+ * 用户ID
+ */
+
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/NoticeReadDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/NoticeReadDTO.java
new file mode 100644
index 0000000..dc0498d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/NoticeReadDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 通知已读
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-04 19:12
+ **/
+@Data
+@ApiModel("通知已读")
+public class NoticeReadDTO {
+
+ @ApiModelProperty("是否全部已读 1 是 0 否")
+ private Integer all;
+
+ @ApiModelProperty("单独读取某条通知的id")
+ private Long id;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/OperationDetailDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/OperationDetailDTO.java
new file mode 100644
index 0000000..a6d9907
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/OperationDetailDTO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.dtos.community;
+
+import lombok.Data;
+
+@Data
+public class OperationDetailDTO {
+ /**
+ * 预约登记记录id
+ */
+ private Long reserveRecordId;
+
+ /**
+ * 用户id
+ */
+ private Long userId;
+
+ /**
+ * 类型（1.本人操作 2.社区操作）
+ */
+ private Integer type;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageActWorkGuideDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageActWorkGuideDTO.java
new file mode 100644
index 0000000..969097a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageActWorkGuideDTO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("办事指南请求参数")
+public class PageActWorkGuideDTO {
+
+ @ApiModelProperty("办事指南标题")
+ private String title;
+
+ @ApiModelProperty("所属分类")
+ private String classify;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ private String areaCode;
+
+ @ApiModelProperty(value = "是否在线办理 0 不是 1是")
+ private String isOnLine;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageActivityInviteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageActivityInviteDTO.java
new file mode 100644
index 0000000..2206703
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageActivityInviteDTO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ActivityInviteDTO
+ * @projectName:
+ * @description: 活动邀请请求参数
+ * @author: hans
+ * @date: 2022/08/02 9:55
+ */
+@Data
+@ApiModel("活动邀请请求参数")
+public class PageActivityInviteDTO {
+
+ @ApiModelProperty("受邀活动id")
+ @NotNull(message = "受邀活动id不能为空")
+ private Long activityId;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDTO.java
new file mode 100644
index 0000000..6c1b1e6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDTO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 社区
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-15 10:06
+ **/
+@Data
+@ApiModel("社区表请求参数")
+public class PageComActDTO {
+
+ @ApiModelProperty("社区名字")
+ private String name;
+
+ @ApiModelProperty("区级地址编码")
+ private String areaCode;
+
+ @ApiModelProperty(value = "创建查询开始时间", example = "2020-01-02 00:00:00")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtBegin;
+
+ @ApiModelProperty(value = "创建查询结束时间", example = "2020-12-02 00:00:00")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussCommentDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussCommentDTO.java
new file mode 100644
index 0000000..9b11a80
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussCommentDTO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 一起议分页评论查询
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-23 14:29
+ **/
+@Data
+@ApiModel("一起议分页评论查询")
+public class PageComActDiscussCommentDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "账号")
+ private String account;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "评论内容")
+ private String comment;
+
+ @ApiModelProperty(value = "一起议主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "登录用户", required = true)
+ private Long loginUserId;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java
new file mode 100644
index 0000000..c8635f7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java
@@ -0,0 +1,68 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 分页查询一起议
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-23 11:11
+ **/
+@Data
+@ApiModel("分页查询一起议")
+public class PageComActDiscussDTO {
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty("主题")
+ private String subject;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("查询开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date begin;
+
+ @ApiModelProperty("查询结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date end;
+
+ @ApiModelProperty(value = "登录用户", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "登录用户-用于判断是否点赞和投票", hidden = true)
+ private Long loginUserId;
+
+ @ApiModelProperty("小程序使用 1 表示查询我的议题")
+ private Integer isMy;
+
+ @ApiModelProperty("状态（1.未开始 2.进行中 3.待公布 4.已公布 5.已发布）")
+ private Integer status;
+
+ @ApiModelProperty("关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "类型： 1.议事 2.投票，小程序必须传入类型", allowableValues = "1,2")
+ private Integer type;
+
+ @ApiModelProperty(value = "展示状态，小程序获取不同状态的投票列表 1.进行中 2.已结束", allowableValues = "1,2")
+ private Integer displayStatus;
+
+ @ApiModelProperty("议事内容类型（1.社区议事 2.院落议事 3.党群议事 4.居民议事 5.其他）")
+ private Integer contentType;
+
+ @ApiModelProperty(value = "是否党员", hidden = true)
+ private Integer isPbMember;
+ @ApiModelProperty(value = "是否志愿者", hidden = true)
+ private Integer isVolunteer;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDynTypeDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDynTypeDTO.java
new file mode 100644
index 0000000..94b1a60
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDynTypeDTO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("分页查询社区动态分类请求参数")
+public class PageComActDynTypeDTO {
+
+ @ApiModelProperty(value = "当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty("关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ @ApiModelProperty("类型（1.社区动态 2.党务公开 3.花城资讯）")
+ private Integer category;
+
+ @ApiModelProperty("1 花城西区都有 2 花城独有")
+ private String area;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActEasyPhotoCommentDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActEasyPhotoCommentDTO.java
new file mode 100644
index 0000000..db357f8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActEasyPhotoCommentDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 随手拍评论分页
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-21 14:51
+ **/
+@Data
+@ApiModel("随手拍评论分页")
+public class PageComActEasyPhotoCommentDTO {
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "随手拍主键")
+ private Long id;
+
+ @ApiModelProperty(value = "登录用户", hidden = true)
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComCvtBusinessAppletsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComCvtBusinessAppletsDTO.java
new file mode 100644
index 0000000..8ace9cd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComCvtBusinessAppletsDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 便民服务商家请求参数
+ * @author: Null
+ * @date: 2021/3/11 10:36
+ */
+@Data
+@ApiModel("便民服务商家请求参数")
+public class PageComCvtBusinessAppletsDTO {
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComCvtBusinessDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComCvtBusinessDTO.java
new file mode 100644
index 0000000..2604ef3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComCvtBusinessDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 便民服务商家请求参数
+ * @author: Null
+ * @date: 2021/3/11 10:36
+ */
+@Data
+@ApiModel("便民服务商家请求参数")
+public class PageComCvtBusinessDTO {
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("商家名称")
+ private String name;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComCvtCategoryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComCvtCategoryDTO.java
new file mode 100644
index 0000000..2278fe9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComCvtCategoryDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 便民服务分类请求参数
+ * @author: Null
+ * @date: 2021/3/11 10:36
+ */
+@Data
+@ApiModel("便民服务请求参数")
+public class PageComCvtCategoryDTO {
+
+ @ApiModelProperty("分类名称")
+ private String name;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComCvtServeDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComCvtServeDTO.java
new file mode 100644
index 0000000..bbc251e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComCvtServeDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 便民服务列表请求参数
+ * @author: Null
+ * @date: 2021/3/11 10:52
+ */
+@Data
+@ApiModel("便民服务列表请求参数")
+public class PageComCvtServeDTO {
+
+ @ApiModelProperty("服务名称")
+ private String serviceName;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthElderlyDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthElderlyDTO.java
new file mode 100644
index 0000000..7798a03
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthElderlyDTO.java
@@ -0,0 +1,101 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
+import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-09
+ */
+@Data
+@ApiModel("查询高龄老人库请求参数")
+@EncryptQueryClass
+public class PageComEldersAuthElderlyDTO {
+
+ @ApiModelProperty(value = "分页-当前页数,默认：1", example = "1", position = 1)
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数,默认：10", example = "10", position = 2)
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt", position = 3)
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc", position = 4)
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "主键id", hidden = false, example = "1")
+ private Long id;
+ @Length(max = 50)
+ @ApiModelProperty(value = "名称", hidden = false, example = "")
+ private String name;
+ @Length(max = 50)
+ @EncryptQuery
+ @ApiModelProperty(value = "身份证号码", hidden = false, example = "")
+ private String idCard;
+ @Length(max = 50)
+ @ApiModelProperty(value = "出生年月", hidden = false, example = "")
+ private String birthday;
+ @Max(127)
+ @ApiModelProperty(value = "人员类别（1.80-89周岁 2.90-99周岁 3.100周岁（含）以上）", hidden = false, example = "1")
+ private Integer level;
+ @Length(max = 255)
+ @ApiModelProperty(value = "户籍地", hidden = false, example = "")
+ private String domicile;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "社区id", hidden = false, example = "1")
+ private Long communityId;
+ @Max(127)
+ @ApiModelProperty(value = "是否健在（1.是 2.否）", hidden = false, example = "1")
+ private Integer isExist;
+ @Max(127)
+ @ApiModelProperty(value = "是否办理高龄津贴（1.是 2.否）", hidden = false, example = "1")
+ private Integer isBigAge;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtBegin;
+ @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "创建用户", hidden = false, example = "1")
+ private Long createBy;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date updateAtBegin;
+ @ApiModelProperty(value = "修改时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAtEnd;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "修改用户", hidden = false, example = "1")
+ private Long updateBy;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long operUserId;
+ @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
+ private String operUserName;
+
+ @ApiModelProperty(value = "排序列", example = "create_at", hidden = true)
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthHistoryRecordDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthHistoryRecordDTO.java
new file mode 100644
index 0000000..bb401a3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthHistoryRecordDTO.java
@@ -0,0 +1,82 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-10
+ */
+@Data
+@ApiModel("查询高龄老人认证记录请求参数")
+public class PageComEldersAuthHistoryRecordDTO {
+
+ @ApiModelProperty(value = "分页-当前页数,默认：1", example = "1", position = 1)
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数,默认：10", example = "10", position = 2)
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt", position = 3)
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc", position = 4)
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "主键id", hidden = false, example = "1")
+ private Long id;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "老人用户id", hidden = false, example = "1")
+ private Long userId;
+ @Length(max = 50)
+ @ApiModelProperty(value = "名称", hidden = false, example = "")
+ private String name;
+ @Length(max = 50)
+ @ApiModelProperty(value = "身份证号码", hidden = false, example = "")
+ private String idCard;
+ @Length(max = 50)
+ @ApiModelProperty(value = "出生年月", hidden = false, example = "")
+ private String brithday;
+ @Max(9999999999L)
+ @ApiModelProperty(value = "年龄", hidden = false, example = "1")
+ private Integer age;
+ @Length(max = 50)
+ @ApiModelProperty(value = "户籍地", hidden = false, example = "")
+ private String domicile;
+ @Max(127)
+ @ApiModelProperty(value = "本月是否已认证（1.是 2.否）", hidden = false, example = "1")
+ private Integer isAuth;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtBegin;
+ @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long operUserId;
+ @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
+ private String operUserName;
+
+ @ApiModelProperty(value = "排序列", example = "create_at", hidden = true)
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthStatisticsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthStatisticsDTO.java
new file mode 100644
index 0000000..486e374
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthStatisticsDTO.java
@@ -0,0 +1,74 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-10
+ */
+@Data
+@ApiModel("查询老人认证月统计请求参数")
+public class PageComEldersAuthStatisticsDTO {
+
+ @ApiModelProperty(value = "分页-当前页数,默认：1", example = "1", position = 1)
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数,默认：10", example = "10", position = 2)
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt", position = 3)
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc", position = 4)
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "主键id", hidden = false, example = "1")
+ private Long id;
+ @Max(9999999999L)
+ @ApiModelProperty(value = "年份", hidden = false, example = "1")
+ private Integer year;
+ @Max(9999999999L)
+ @ApiModelProperty(value = "月份", hidden = false, example = "1")
+ private Integer month;
+ @Max(9999999999L)
+ @ApiModelProperty(value = "总人数", hidden = false, example = "1")
+ private Integer sum;
+ @Max(9999999999L)
+ @ApiModelProperty(value = "认证人数", hidden = false, example = "1")
+ private Integer authSum;
+ @Max(9999999999L)
+ @ApiModelProperty(value = "未认证人数", hidden = false, example = "1")
+ private Integer noAuthSum;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtBegin;
+ @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long operUserId;
+ @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
+ private String operUserName;
+
+ @ApiModelProperty(value = "排序列", example = "create_at", hidden = true)
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthUserDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthUserDTO.java
new file mode 100644
index 0000000..33464a1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthUserDTO.java
@@ -0,0 +1,77 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.google.common.base.CaseFormat;
+import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
+import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-09
+ */
+@Data
+@ApiModel("查询用户绑定老人关系请求参数")
+@EncryptQueryClass
+public class PageComEldersAuthUserDTO {
+
+ @ApiModelProperty(value = "分页-当前页数,默认：1", example = "1", position = 1)
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数,默认：10", example = "10", position = 2)
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt", position = 3)
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc", position = 4)
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "主键id", hidden = false, example = "1")
+ private Long id;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "用户id", hidden = false, example = "1")
+ private Long userId;
+ @Max(127)
+ @ApiModelProperty(value = "与本人关系(1.父母 2.配偶 3.子女 4.兄弟姐妹 5.祖/外祖父母 6.本人 7.其他)", hidden = false, example = "1")
+ private Integer relation;
+ @Max(127)
+ @ApiModelProperty(value = "是否已认证（1.是 2.否）", hidden = false, example = "1")
+ private Integer isAuth;
+ @Length(max = 50)
+ @ApiModelProperty(value = "姓名", hidden = false, example = "")
+ private String name;
+ @Length(max = 50)
+ @EncryptQuery
+ @ApiModelProperty(value = "身份证号码", hidden = false, example = "")
+ private String idCard;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "社区id", hidden = false, example = "1")
+ private Long communityId;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "高龄老人库id", hidden = false, example = "1")
+ private Long bigAgeId;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long operUserId;
+ @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
+ private String operUserName;
+
+ @ApiModelProperty(value = "排序列", example = "create_at", hidden = true)
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersRecordsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersRecordsDTO.java
new file mode 100644
index 0000000..7c15958
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersRecordsDTO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询生存认证记录表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-09
+ */
+@Data
+@ApiModel("查询高龄老人库请求参数")
+public class PageComEldersRecordsDTO {
+
+ @ApiModelProperty(value = "分页-当前页数,默认：1", example = "1", position = 1)
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数,默认：10", example = "10", position = 2)
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt", position = 3)
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc", position = 4)
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+ @ApiModelProperty(value = "家庭成员ID", hidden = false, example = "1", required = true)
+ @NotNull(message = "家庭成员ID不能为空")
+ private Long bigAgeid;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long operUserId;
+ @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
+ private String operUserName;
+
+ @ApiModelProperty(value = "排序列", example = "create_at", hidden = true)
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComMngCarDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComMngCarDTO.java
new file mode 100644
index 0000000..e210aea
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComMngCarDTO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 车辆管理列表请求参数
+ * @author: Null
+ * @date: 2021/3/11 10:36
+ */
+@Data
+@ApiModel("车辆管理列表请求参数")
+public class PageComMngCarDTO {
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "小区名称")
+ private String areaName;
+
+ @ApiModelProperty("车主姓名")
+ private String name;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+ @ApiModelProperty("小区id")
+ private Long villageId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComMngRealAssetsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComMngRealAssetsDTO.java
new file mode 100644
index 0000000..7554069
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComMngRealAssetsDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 实有资产列表请求参数
+ * @author: Null
+ * @date: 2021/3/11 10:36
+ */
+@Data
+@ApiModel("实有资产列表请求参数")
+public class PageComMngRealAssetsDTO {
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "资产名称")
+ private String name;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComMngRealCompanyDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComMngRealCompanyDTO.java
new file mode 100644
index 0000000..3bdfd29
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComMngRealCompanyDTO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 实有单位列表请求参数
+ * @author: Null
+ * @date: 2021/3/11 10:36
+ */
+@Data
+@ApiModel("实有单位列表请求参数")
+public class PageComMngRealCompanyDTO {
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "单位名称")
+ private String comName;
+
+ @ApiModelProperty(value = "法人")
+ private String legalPerson;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComMngVillageDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComMngVillageDTO.java
new file mode 100644
index 0000000..f922273
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComMngVillageDTO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author: llming
+ * @description: 实有房屋
+ **/
+@Data
+@ApiModel("小区请求参数")
+public class PageComMngVillageDTO {
+
+ @ApiModelProperty("街路巷")
+ private String alley;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("小区/组")
+ private String groupAt;
+
+ @ApiModelProperty("小区类型（1.城镇 2.农村 3.未知）")
+ private Integer type;
+
+ @ApiModelProperty("门牌号")
+ private String houseNum;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComOpsHouseDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComOpsHouseDTO.java
new file mode 100644
index 0000000..34106ad
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComOpsHouseDTO.java
@@ -0,0 +1,70 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 分页查询房屋租售
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-23 11:11
+ **/
+@Data
+@ApiModel("分页查询房屋租售")
+public class PageComOpsHouseDTO {
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "房屋所在小区id")
+ private Long houseCommunityId;
+
+ @ApiModelProperty(value = "房屋所在小区名字")
+ private String houseCommunityName;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("查询开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date begin;
+
+ @ApiModelProperty("查询结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date end;
+
+ @ApiModelProperty(value = "发布人id")
+ private Long userId;
+
+ @ApiModelProperty(value = "状态 0待审核 1已上架 2已驳回 3已下架 4待审核和已驳回 5已上架和已下架")
+ private Integer status;
+
+ @ApiModelProperty("小程序使用 1 表示查询我的")
+ private Integer isMy;
+
+ @ApiModelProperty(value = "朝向 0无1东2南3西4北5东南6东北7西南8西北9南北10东西")
+ private Integer orient;
+ @ApiModelProperty(value = "租售类型 1 出租 2 出售")
+ private Integer houseType;
+ @ApiModelProperty(value = "租房类型 1 整租 2 合租")
+ private Integer rentType;
+ @ApiModelProperty(value = "室数量,1 一室 2 二室 3 三室 4 四室以上")
+ private Integer brn;
+ @ApiModelProperty(value = "1 价格从低到高 2 价格从高到底 ")
+ private Integer priceOrder;
+
+ @ApiModelProperty(value = "发布人姓名")
+ private String userName;
+ @ApiModelProperty(value = "联系方式")
+ private String mobile;
+
+ private String areaCode;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComPropertyPublicityDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComPropertyPublicityDTO.java
new file mode 100644
index 0000000..a88f90b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComPropertyPublicityDTO.java
@@ -0,0 +1,48 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageComPropertyPublicityDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询物业宣传信息请求参数
+ * @author: hans
+ * @date: 2021/11/11 10:32
+ */
+@Data
+@ApiModel("分页查询物业宣传信息请求参数")
+public class PageComPropertyPublicityDTO {
+
+ @ApiModelProperty("关键词")
+ private String keyword;
+
+ @ApiModelProperty("物业公司id")
+ private Long propertyId;
+
+ @ApiModelProperty("小区id")
+ private Long villageId;
+
+ @ApiModelProperty("宣传类型（0.其他 1.停水通知 2.停电通知 3.停气通知 4.物业公告 5.优秀业主）")
+ private Integer publicityType;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageSize;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComStreetDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComStreetDTO.java
new file mode 100644
index 0000000..1aca3c9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComStreetDTO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author: llming
+ * @description: 街道
+ **/
+@Data
+@ApiModel("街道表请求参数")
+public class PageComStreetDTO {
+
+ @ApiModelProperty("街道名字")
+ private String name;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+ @ApiModelProperty("areaCode")
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageCommunityQuestnaireDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageCommunityQuestnaireDTO.java
new file mode 100644
index 0000000..61f09b9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageCommunityQuestnaireDTO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("问卷调查")
+public class PageCommunityQuestnaireDTO {
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageElderAuthRecordsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageElderAuthRecordsDTO.java
new file mode 100644
index 0000000..847fe22
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageElderAuthRecordsDTO.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: PageElderAuthRecordsDTO 高龄老人认证记录分页查询参数
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 高龄老人认证记录分页查询参数
+ *
+ * @author txb
+ * @date 2021/9/02 11:12
+ */
+@Data
+@ApiModel("高龄老人认证记录分页查询参数")
+public class PageElderAuthRecordsDTO {
+
+
+ @ApiModelProperty(value = "分页-当前页数,默认1", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数,默认10", example = "10")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "查询关键词")
+ private String searchKey;
+
+ @ApiModelProperty(value = "认证期数")
+ private String authPeriod;
+
+ @ApiModelProperty(value = "认证开始时间")
+ private String authDateBegin;
+
+ @ApiModelProperty(value = "认证结束时间")
+ private String authDateEnd;
+
+ @ApiModelProperty(value = "认证状态（1.已认证 2.未认证）")
+ private Integer authStatus;
+
+ @ApiModelProperty(value = "审核状态（1.待审核 2.驳回 3.通过）")
+ private Integer approvalStatus;
+
+ @ApiModelProperty(value = "人员类别（1.80-89周岁 2.90-99周岁 3.100周岁（含）以上）")
+ private Integer personnelCategory;
+
+ @ApiModelProperty(value = "是否健在（1.是 0.否）")
+ private Integer isAlive;
+
+ @ApiModelProperty(value = "社区ID", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "认证方式（1.视频认证 2.人脸认证 3.线下认证）")
+ private String authMethod;
+
+ private String idCard;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java
new file mode 100644
index 0000000..216e1ba
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java
@@ -0,0 +1,114 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
+import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel("查询高龄认证请求参数")
+@EncryptQueryClass
+public class PageEldersAuthDTO {
+
+ @ApiModelProperty(value = "分页-当前页数,默认1", example = "1", required = true)
+ @NotNull
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数,默认10", example = "10", required = true)
+ @NotNull
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", hidden = true, example = "createAt")
+ private String sortBy = "create_at";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", hidden = true, example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String order = "desc";
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "ID", hidden = false, example = "1")
+ private Long id;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "创建人", hidden = false, example = "1")
+ private Long createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAt;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "更新人", hidden = false, example = "1")
+ private Long updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date updateAt;
+
+ @Length(max = 18)
+ @EncryptQuery
+ @ApiModelProperty(value = "身份证", hidden = false, example = "")
+ private String idCard;
+
+ @Length(max = 32)
+ @ApiModelProperty(value = "认证人姓名", hidden = false, example = "")
+ private String authUserName;
+
+ @Length(max = 1024)
+ @ApiModelProperty(value = "视频地址", hidden = false, example = "")
+ private String videoUrl;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "提交人", hidden = false, example = "1")
+ private Long sumitUserId;
+
+ @Length(max = 1024)
+ @ApiModelProperty(value = "户籍地", hidden = false, example = "")
+ private String domicile;
+
+ @Length(max = 1)
+ @ApiModelProperty(value = "状态", hidden = false, example = "")
+ private String status;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "出生日期", hidden = false, example = "2021-05-01 18:05:50")
+ private Date birthDay;
+
+ @ApiModelProperty(value = "导出的ID", hidden = false, example = "")
+ private Long[] ids;
+
+ @ApiModelProperty(value = "查询类型 1 按月 2 按时间", hidden = false, example = "")
+ private String type;
+
+ @ApiModelProperty(value = "月份(1-12)", hidden = false, example = "")
+ private Integer month;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建起始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtStart;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建结束时间", hidden = false, example = "2021-05-02 18:05:50")
+ private Date createAtEnd;
+
+ @ApiModelProperty(value = "社区ID", hidden = false, example = "")
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthElderlyDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthElderlyDTO.java
new file mode 100644
index 0000000..aac4cd2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthElderlyDTO.java
@@ -0,0 +1,55 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
+import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 高领老人分页查询条件
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel("高领老人分页查询条件")
+@EncryptQueryClass
+public class PageEldersAuthElderlyDTO {
+
+ @ApiModelProperty(value = "分页-当前页数,默认1", example = "1", required = true)
+ @NotNull
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数,默认10", example = "10", required = true)
+ @NotNull
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", hidden = true, example = "createAt")
+ private String sortBy = "create_at";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", hidden = true, example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String order = "desc";
+
+ @ApiModelProperty(value = "姓名", example = "妞妞")
+ private String name;
+
+ @ApiModelProperty(value = "身份证号码")
+ @EncryptQuery
+ private String idCard;
+
+ @ApiModelProperty(value = "人员类别", example = "1:80-89周岁;2:90-99周岁;3:100周岁（含）以上")
+ private Integer level;
+
+ @ApiModelProperty(value = "是否健在", example = "1是，2否")
+ private Integer isExist;
+
+ @ApiModelProperty(value = "是否办理高龄津贴", example = "1是，2否")
+ private Integer isBigAge;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthFeedbackDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthFeedbackDTO.java
new file mode 100644
index 0000000..68eaa91
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthFeedbackDTO.java
@@ -0,0 +1,72 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel("查询高龄认证社区反馈请求参数")
+public class PageEldersAuthFeedbackDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
+ private String sortBy = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String order = "desc";
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "ID", hidden = false, example = "1")
+ private Long id;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "创建人", hidden = false, example = "1")
+ private Long createBy;
+
+ @NotNull()
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAt;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "更新人", hidden = false, example = "1")
+ private Long updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date updateAt;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "认证ID", hidden = false, example = "1")
+ private Long authId;
+
+ @Length(max = 1024)
+ @ApiModelProperty(value = "反馈结果", hidden = false, example = "")
+ private String feedBack;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthHistoryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthHistoryDTO.java
new file mode 100644
index 0000000..b177e12
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthHistoryDTO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 高领老人分页查询条件
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel("高领老人分页查询条件")
+public class PageEldersAuthHistoryDTO {
+
+ @ApiModelProperty(value = "月份")
+ private Integer month;
+
+ @ApiModelProperty(value = "年份")
+ private Integer year;
+
+ @ApiModelProperty(value = "分页-当前页数,默认1", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数,默认10", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "社区ID", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthRecordDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthRecordDTO.java
new file mode 100644
index 0000000..dca1493
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthRecordDTO.java
@@ -0,0 +1,58 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import com.google.common.base.CaseFormat;
+import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
+import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 高领老人分页查询条件
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel("生存认证记录分页查询条件")
+@EncryptQueryClass
+public class PageEldersAuthRecordDTO {
+
+ @ApiModelProperty(value = "分页-当前页数,默认1", example = "1", required = true)
+ @NotNull
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数,默认10", example = "10", required = true)
+ @NotNull
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc", position = 4)
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt", position = 3)
+ private String sortAttr = "createAt";
+ @ApiModelProperty(value = "姓名", example = "妞妞")
+ private String name;
+ @EncryptQuery
+ @ApiModelProperty(value = "身份证号码")
+ private String idCard;
+ @ApiModelProperty(value = "认证方式（1.视频认证 2.人脸核验）", example = "1")
+ private Integer type;
+ @ApiModelProperty(value = "认证时间(月份)", example = "1")
+ private Integer month;
+ @ApiModelProperty(value = "认证时间(年份)", example = "2021")
+ private Integer year;
+
+ @ApiModelProperty(value = "排序列", example = "create_at", hidden = true)
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageIdentityAuthRecordDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageIdentityAuthRecordDTO.java
new file mode 100644
index 0000000..a0e80cd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageIdentityAuthRecordDTO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.NotNull;
+
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageIdentityAuthRecordDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询身份认证记录
+ * @author: hans
+ * @date: 2021/09/03 9:39
+ */
+@Data
+@ApiModel("分页查询身份认证记录参数")
+@EncryptDecryptClass
+public class PageIdentityAuthRecordDTO {
+
+ @ApiModelProperty(value = "认证类型（1.高龄认证 2.养老认证）", required = true, allowableValues = "1,2", example = "1")
+ @NotNull(message = "认证类型不能为空")
+ private Integer authType;
+
+ @ApiModelProperty(value = "当前页数", required = true, example = "1")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "每页记录数", required = true, example = "10")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "提交用户", example = "1", hidden = true)
+ private Long submitUserId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageMemberForInviteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageMemberForInviteDTO.java
new file mode 100644
index 0000000..6a5eed0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageMemberForInviteDTO.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ActivityInviteDTO
+ * @projectName:
+ * @description: 活动邀请党员请求参数
+ * @author: hans
+ * @date: 2022/08/02 9:55
+ */
+@Data
+@ApiModel("活动邀请党员请求参数")
+public class PageMemberForInviteDTO {
+
+ @ApiModelProperty("受邀活动id")
+ @NotNull(message = "受邀活动id不能为空")
+ private Long activityId;
+
+ @ApiModelProperty(value = "报道单位id")
+ private Long checkUnitId;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "appid", hidden = true)
+ private String appid;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireAnswerDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireAnswerDTO.java
new file mode 100644
index 0000000..426d50a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireAnswerDTO.java
@@ -0,0 +1,16 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("问卷列表-问卷题目答卷详细-参数")
+public class PageQuestnaireAnswerDTO {
+ @ApiModelProperty(value = "问卷ID")
+ private String questId;
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireDTO.java
new file mode 100644
index 0000000..457054f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireDTO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: llming
+ * @Description:
+ */
+@Data
+@ApiModel("问卷列表参数")
+public class PageQuestnaireDTO {
+ @ApiModelProperty(value = "标题")
+ private String title;
+ @ApiModelProperty(value = "用户Id")
+ private Long userId;
+ @ApiModelProperty(value = "状态 1待发布 2调研中 3已停止")
+ private List<Integer> states;
+ @ApiModelProperty(value = "发布开始时间")
+ private String startTime;
+ @ApiModelProperty(value = "发布结束时间")
+ private String endTime;
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+ @ApiModelProperty(value = "广告位置（1.首页弹窗 2.首页顶部 3.首页应用）")
+ private Integer advertPosition;
+ @ApiModelProperty(value = "身份（1.全部居民 2.党员 3.志愿者）")
+ private Integer identity;
+ @ApiModelProperty("提供居民")
+ private Boolean forMasses;
+ @ApiModelProperty("提供党员")
+ private Boolean forParty = false;
+ @ApiModelProperty("提供志愿者")
+ private Boolean forVolunteer = false;
+ @ApiModelProperty("社区ID")
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireSubDetailsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireSubDetailsDTO.java
new file mode 100644
index 0000000..a1790ca
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireSubDetailsDTO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.dtos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: llming
+ * @Description:
+ */
+@Data
+@ApiModel("问卷列表-问卷题目答卷详细-参数")
+public class PageQuestnaireSubDetailsDTO {
+ @ApiModelProperty(value = "问卷题目ID")
+ private String subId;
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageSysConfDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageSysConfDTO.java
new file mode 100644
index 0000000..a1af6a6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageSysConfDTO.java
@@ -0,0 +1,79 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-09
+ */
+@Data
+@ApiModel("查询系统配置请求参数")
+public class PageSysConfDTO {
+
+ @ApiModelProperty(value = "分页-当前页数,默认：1", example = "1", position = 1)
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数,默认：10", example = "10", position = 2)
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt", position = 3)
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc", position = 4)
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "主键id", hidden = false, example = "1")
+ private Long id;
+ @Length(max = 50)
+ @ApiModelProperty(value = "参数名", hidden = false, example = "")
+ private String name;
+ @Length(max = 50)
+ @ApiModelProperty(value = "参数唯一编码", hidden = false, example = "")
+ private String code;
+ @Length(max = 65535)
+ @ApiModelProperty(value = "参数值", hidden = false, example = "")
+ private String value;
+ @Length(max = 100)
+ @ApiModelProperty(value = "参数描述", hidden = false, example = "")
+ private String describe;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtBegin;
+ @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "创建用户", hidden = false, example = "1")
+ private Long createBy;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "社区id", hidden = false, example = "1")
+ private Long communityId;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long operUserId;
+ @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
+ private String operUserName;
+
+ @ApiModelProperty(value = "排序列", example = "create_at", hidden = true)
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageUserReserveDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageUserReserveDTO.java
new file mode 100644
index 0000000..8ca3d81
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageUserReserveDTO.java
@@ -0,0 +1,12 @@
+package com.panzhihua.common.model.dtos.community;
+
+import lombok.Data;
+
+@Data
+public class PageUserReserveDTO {
+ private Integer pageNum;
+ private Integer pageSize;
+ private Integer type;
+ private Long userId;
+ private Integer status;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageVolunteerDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageVolunteerDTO.java
new file mode 100644
index 0000000..90bf4fa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageVolunteerDTO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import com.panzhihua.common.validated.PageGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 分页志愿者
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-31 13:52
+ **/
+@Data
+@ApiModel("分页志愿者")
+public class PageVolunteerDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1", required = true)
+ @NotNull(groups = {PageGroup.class}, message = "当前页数不能为空")
+ @Min(value = 1, groups = {PageGroup.class}, message = "当前页数不能为空")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10", required = true)
+ @NotNull(groups = {PageGroup.class}, message = "每页记录数不能为空")
+ @Min(value = 1, groups = {PageGroup.class}, message = "每页记录数不能为空")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty("物业公司Id")
+ private Long propertyId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageVoteSituationDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageVoteSituationDTO.java
new file mode 100644
index 0000000..ee5589f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageVoteSituationDTO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.dtos.community;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageVoteSituationDTO
+ * @projectName:
+ * @description: 分页查询一起议投票情况
+ * @author: hans
+ * @date: 2022/08/17 16:43
+ */
+@Data
+@ApiModel("分页查询一起议投票情况")
+public class PageVoteSituationDTO {
+
+ @ApiModelProperty(value = "议事投票id")
+ @NotNull
+ private Long discussId;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/QuestnaireAnswersDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/QuestnaireAnswersDTO.java
new file mode 100644
index 0000000..cc20fb1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/QuestnaireAnswersDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.community;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
+import com.panzhihua.common.model.vos.community.ComActQuestnaireSubVO;
+
+import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 用户问卷 所有答案 回答DTO
+ * @author: cedoo
+ * @create: 2021-4-10 10:34:52
+ **/
+@Data
+public class QuestnaireAnswersDTO {
+ @ApiModelProperty("题目列表")
+ private List<ComActQuestnaireSubVO> subs;
+
+ @ApiModelProperty("题目用户回答列表")
+ private List<ComActQuestnaireAnswerContentVO> answers;
+
+ @ApiModelProperty("用户填报记录")
+ private ComActReserveRegisterDetailedVO recordListVO;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/BatchCheckAcidRecordDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/BatchCheckAcidRecordDTO.java
new file mode 100644
index 0000000..22aab16
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/BatchCheckAcidRecordDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.community.acid;
+
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BatchCheckAcidRecordDTO
+ * @projectName:
+ * @description:批量核对填报记录
+ * @author: hans
+ * @date: 2022/08/18 10:18
+ */
+@Data
+@ApiModel("批量核对填报记录")
+public class BatchCheckAcidRecordDTO {
+
+ @ApiModelProperty("填报记录id")
+ @NotEmpty
+ private List<Long> ids;
+
+ @ApiModelProperty("备注")
+ private String remark;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidCheckRecordDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidCheckRecordDTO.java
new file mode 100644
index 0000000..0102f02
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidCheckRecordDTO.java
@@ -0,0 +1,59 @@
+package com.panzhihua.common.model.dtos.community.acid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 排查跟进表(ComActAcidCheckRecord)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 排查跟进表相关功能
+ *
+ * @author zzj
+ * @since 2022-04-24 16:14:25
+ */
+@Data
+@ApiModel("排查跟进表")
+public class ComActAcidCheckRecordDTO {
+
+ @NotNull(message = "分页参数不能为空")
+ private Integer page;
+ @ApiModelProperty("条数")
+ @NotNull(message = "分页参数不能为空")
+ private Integer size;
+ /**
+ * 人员id
+ */
+ @ApiModelProperty(value = "人员id")
+ private Long memberId;
+
+ /**
+ * 处理情况 1：集中隔离 2：居家隔离 3：健康监测 4：失联或尚需追踪 5：排除风险 6：暂未管控
+ */
+ @ApiModelProperty(value = "处理情况 1：集中隔离 2：居家隔离 3：健康监测 4：失联或尚需追踪 5：排除风险 6：暂未管控")
+ private Integer status;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 操作人
+ */
+ @ApiModelProperty(value = "操作人")
+ private String username;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidDangerMemberDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidDangerMemberDTO.java
new file mode 100644
index 0000000..5933297
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidDangerMemberDTO.java
@@ -0,0 +1,67 @@
+package com.panzhihua.common.model.dtos.community.acid;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 风险人员表(ComActAcidDangerMember)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 风险人员表相关功能
+ *
+ * @author zzj
+ * @since 2022-04-24 16:12:09
+ */
+@Data
+@ApiModel("风险人员")
+public class ComActAcidDangerMemberDTO {
+
+ /**
+ * 人员类型 1风险人员 2未填地址人员
+ */
+ @ApiModelProperty(value = "人员类型 1风险人员 2未填地址人员")
+ private Integer type = 1;
+ @ApiModelProperty(value = "数据来源 1系统")
+ private Integer source;
+ @ApiModelProperty("页数")
+ @NotNull(message = "分页参数不能为空")
+ private Integer page;
+ @ApiModelProperty("条数")
+ @NotNull(message = "分页参数不能为空")
+ private Integer size;
+ @ApiModelProperty("关键字")
+ private String keyword;
+ @ApiModelProperty("开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date startTime;
+ @ApiModelProperty("结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date stopTime;
+ /**
+ * 处理情况 1：集中隔离 2：居家隔离 3：健康监测 4：失联或尚需追踪 5：排除风险 6：暂未管控
+ */
+ @ApiModelProperty(value = "当前处理情况 1：集中隔离 2：居家隔离 3：健康监测 4：失联或尚需追踪 5：排除风险 6：暂未管控")
+ private Integer status;
+
+ @ApiModelProperty(value = "风险类别")
+ private String riskType;
+
+ @ApiModelProperty("有无住址 0无 1有")
+ private Integer isAddress;
+
+ @ApiModelProperty(value = "在攀居住地")
+ private String localCity;
+
+ @ApiModelProperty(value = "绑定单位", hidden = true)
+ private String relationName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidMemberDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidMemberDTO.java
new file mode 100644
index 0000000..49c2268
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidMemberDTO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.dtos.community.acid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("工作人员实体")
+public class ComActAcidMemberDTO {
+ /**
+ * 是否推送 1是 0否
+ */
+ @ApiModelProperty(value = "是否推送 1是 0否")
+ private Integer pushStatus;
+
+ /**
+ * 绑定单位
+ */
+ @ApiModelProperty(value = "绑定单位")
+ private String relationName;
+ @ApiModelProperty(value = "关键字")
+ private String keyword;
+
+ @ApiModelProperty("页数")
+ private Integer page;
+ @ApiModelProperty("条数")
+ private Integer size;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidRecordDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidRecordDTO.java
new file mode 100644
index 0000000..674707c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidRecordDTO.java
@@ -0,0 +1,70 @@
+package com.panzhihua.common.model.dtos.community.acid;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * (ComActAcidRecord)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 相关功能
+ *
+ * @author zzj
+ * @since 2022-04-12 15:29:57
+ */
+@Data
+@ApiModel("防疫筛选条件")
+public class ComActAcidRecordDTO implements Serializable {
+
+ @ApiModelProperty("页数")
+ private Integer page;
+ @ApiModelProperty("条数")
+ private Integer size;
+ @ApiModelProperty("关键字")
+ private String keyword;
+ @ApiModelProperty("有无住址 0无 1有")
+ private Integer isAddress;
+ /**
+ * 出发城市
+ */
+ @ApiModelProperty(value = "出发城市")
+ private String departureCity;
+
+ /**
+ * 在攀居住地
+ */
+ @ApiModelProperty(value = "在攀居住地")
+ private String localCity;
+
+ /**
+ * 用户id
+ */
+ private Long userId;
+
+ @ApiModelProperty("开始时间")
+ private String startTime;
+ @ApiModelProperty("结束时间")
+ private String stopTime;
+ @ApiModelProperty("健康码状态")
+ private String colorMark;
+ @ApiModelProperty("行程码")
+ private String travelCard;
+ @ApiModelProperty("核查状态")
+ private String checkStatus;
+ @ApiModelProperty("id数组")
+ private String ids;
+ @ApiModelProperty("登录的账号名")
+ private String loginAccount;
+ private Integer type;
+ private String dangerArea;
+ private String touristCity;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/PageDangerMemberDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/PageDangerMemberDTO.java
new file mode 100644
index 0000000..9af8ffa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/PageDangerMemberDTO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.dtos.community.acid;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageDangerMemberDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询风险人员请求参数
+ * @author: hans
+ * @date: 2022/04/28 13:15
+ */
+@Data
+@ApiModel("分页查询风险人员请求参数")
+public class PageDangerMemberDTO {
+
+ @ApiModelProperty(value = "关键字")
+ private String keyword;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "是否填写居住地（1.是 2.否）", example = "1")
+ private Integer isFill;
+
+ @ApiModelProperty(value = "人员类型 1风险人员 2未填地址人员")
+ private Integer type = 1;
+
+ @ApiModelProperty(value = "绑定单位", hidden = true)
+ private String relationName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenEventDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenEventDTO.java
new file mode 100644
index 0000000..6bf27dc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenEventDTO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.dtos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("事件大屏请求参数")
+public class BigScreenEventDTO {
+
+ @ApiModelProperty(value = "社区id", required = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "查询开始时间")
+ private String startTime;
+
+ @ApiModelProperty(value = "查询结束时间")
+ private String endTime;
+
+ @ApiModelProperty(value = "事件状态(1待处理2已解决3待验证)")
+ private Integer eventProcessStatus;
+
+ @ApiModelProperty(value = "是否红牌（1.是 0.否）")
+ private Integer redCard;
+
+ @ApiModelProperty(value = "是否黄牌（1.是 0.否）")
+ private Integer yellowCard;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenEventDetailDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenEventDetailDTO.java
new file mode 100644
index 0000000..1fe8749
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenEventDetailDTO.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.model.dtos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏事件详情请求参数")
+public class BigScreenEventDetailDTO {
+
+ @ApiModelProperty(value = "事件id", required = true)
+ private Long eventId;
+
+ @ApiModelProperty(value = "事件状态(1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群上报、7随手拍处理)", required = true)
+ private Integer type;
+
+ @ApiModelProperty("事件类型(1、网格事件 2、随手拍事件)")
+ private Integer eventType;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenStatisticAgeGenderDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenStatisticAgeGenderDTO.java
new file mode 100644
index 0000000..820d68c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenStatisticAgeGenderDTO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.dtos.community.bigscreen;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClasssName PageBigScreenStatisticPartyOrg
+ * @Description 党员党支部统计信息分页
+ * @Author cedoo
+ * @Date 2021/6/16
+ * @Version 1.0
+ **/
+@Data
+public class BigScreenStatisticAgeGenderDTO {
+
+ @ApiModelProperty(value = "社区id", hidden = false, example = "2", required = true)
+ @NotNull(message = "社区id不能为空")
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenStatisticPartyActivityDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenStatisticPartyActivityDTO.java
new file mode 100644
index 0000000..ce9f1fa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenStatisticPartyActivityDTO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.dtos.community.bigscreen;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClasssName PageBigScreenStatisticPartyOrg
+ * @Description 党员活动统计
+ * @Author cedoo
+ * @Date 2021/6/16
+ * @Version 1.0
+ **/
+@Data
+public class BigScreenStatisticPartyActivityDTO {
+
+ @ApiModelProperty(value = "社区id", hidden = true, example = "2", required = false)
+ // @NotNull(message = "社区id不能为空")
+ private Long communityId;
+
+ @ApiModelProperty(value = "类型：3 按月 2.按周;默认为3", hidden = false, example = "3", required = false)
+ @NotNull(message = "类型不能为空")
+ private Integer type = 3;
+
+ @ApiModelProperty(value = "日期", hidden = false, example = "2021-06-01", required = true)
+ // @NotNull(message = "时间不能为空")
+ @Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2}$", message = "时间格式错误")
+ private String date;
+
+ @ApiModelProperty(value = "开始时间", hidden = false, example = "2021-06-01")
+ @Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2}$", message = "时间格式错误")
+ private String startTime;
+
+ @ApiModelProperty(value = "结束时间", hidden = false, example = "2021-06-01")
+ @Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2}$", message = "时间格式错误")
+ private String endTime;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/PageBigScreenStatisticPartyOrg.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/PageBigScreenStatisticPartyOrg.java
new file mode 100644
index 0000000..3b51b51
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/PageBigScreenStatisticPartyOrg.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.dtos.community.bigscreen;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClasssName PageBigScreenStatisticPartyOrg
+ * @Description 党员党支部统计信息分页
+ * @Author cedoo
+ * @Date 2021/6/16
+ * @Version 1.0
+ **/
+@Data
+public class PageBigScreenStatisticPartyOrg {
+ @ApiModelProperty(value = "分页-当前页数,默认1", example = "1", required = true)
+ @NotNull
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数,默认50", example = "10", required = true)
+ @NotNull
+ private Long pageSize = 50L;
+
+ @ApiModelProperty(value = "排序字段, 默认id", hidden = true, example = "id")
+ private String sortBy = "id";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", hidden = true, example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String order = "desc";
+
+ @ApiModelProperty(value = "社区id", hidden = true, example = "2")
+ // @NotNull(message = "社区id不能为空")
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenDrawEventListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenDrawEventListDTO.java
new file mode 100644
index 0000000..1c6f463
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenDrawEventListDTO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.dtos.community.bigscreen.event;
+
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏事件列表请求参数")
+public class ScreenDrawEventListDTO {
+
+ @ApiModelProperty(value = "最大展示事件数量", example = "100")
+ private Integer count = 100;
+
+ @ApiModelProperty(value = "社区id", example = "2", required = true)
+ @NotNull(message = "社区id不能为空")
+ private Long communityId;
+
+ @ApiModelProperty(value = "多边形类型(1.圆形 2.多边形)")
+ private Integer type;
+
+ @ApiModelProperty(value = "圆心坐标经度")
+ private Double centerLng;
+
+ @ApiModelProperty(value = "圆心坐标纬度")
+ private Double centerLat;
+
+ @ApiModelProperty(value = "圆心半径")
+ private String radius;
+
+ @ApiModelProperty(value = "多边形经纬度列表")
+ private List<ScreenDrawLngLatDTO> lngLatList;
+
+ /**
+ * 多边形类型(1.圆形 2.多边形)
+ */
+ public interface type {
+ int yx = 1;
+ int dbx = 2;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenDrawLngLatDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenDrawLngLatDTO.java
new file mode 100644
index 0000000..7bdff96
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenDrawLngLatDTO.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.dtos.community.bigscreen.event;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("经纬度参数")
+public class ScreenDrawLngLatDTO {
+
+ @ApiModelProperty(value = "经度")
+ private Double lng;
+
+ @ApiModelProperty(value = "纬度")
+ private Double lat;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenEventListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenEventListDTO.java
new file mode 100644
index 0000000..a60f2d5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenEventListDTO.java
@@ -0,0 +1,61 @@
+package com.panzhihua.common.model.dtos.community.bigscreen.event;
+
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏事件列表请求参数")
+public class ScreenEventListDTO {
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "社区id", example = "2", required = true)
+ @NotNull(message = "社区id不能为空")
+ private Long communityId;
+
+ @ApiModelProperty(value = "查询开始时间")
+ private String startTime;
+
+ @ApiModelProperty(value = "查询结束时间")
+ private String endTime;
+
+ @ApiModelProperty(value = "网格id")
+ private List<Long> gridIds;
+
+ @ApiModelProperty(value = "事件类型（1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报 8宣传教育）")
+ private List<Integer> eventTypes;
+
+ @ApiModelProperty(value = "事件分类(1、办件事件2、宣传事件3、阅读事件)", hidden = true)
+ private Integer eventCategory = 1;
+
+ @ApiModelProperty(value = "事件处理状态(1待处理、2待验证、3已上报、4已解决、5草稿箱、6已撤销、7已失效 8 已发布)")
+ private Integer eventDealStatus;
+
+ @ApiModelProperty("是否紧急")
+ private Boolean urgent;
+
+ @ApiModelProperty("是否重大")
+ private Boolean major;
+
+ /**
+ * 事件类型（1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报 8宣传教育）
+ */
+ public interface eventType {
+ int za = 1;
+ int gg = 2;
+ int md = 3;
+ int bwd = 4;
+ int tf = 5;
+ int ts = 6;
+ int xc = 8;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenActActivityListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenActActivityListDTO.java
new file mode 100644
index 0000000..d362b1b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenActActivityListDTO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.dtos.community.bigscreen.work;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("工作大屏一起议列表请求参数")
+public class ScreenActActivityListDTO {
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "社区id", example = "2", required = true)
+ @NotNull(message = "社区id不能为空")
+ private Long communityId;
+
+ @ApiModelProperty(value = "查询开始时间")
+ private String startTime;
+
+ @ApiModelProperty(value = "查询结束时间")
+ private String endTime;
+
+ @ApiModelProperty(value = "活动状态 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
+ private Integer type;
+
+ /**
+ * 发布类型 1 图文 2 投票
+ */
+ public interface type {
+ int tw = 1;
+ int tp = 2;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenActActivityPeopleListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenActActivityPeopleListDTO.java
new file mode 100644
index 0000000..f40b43f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenActActivityPeopleListDTO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.dtos.community.bigscreen.work;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("工作大屏一起议列表请求参数")
+public class ScreenActActivityPeopleListDTO {
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "活动id", example = "2", required = true)
+ @NotNull(message = "活动id不可为空")
+ private Long activityId;
+
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "身份证")
+ private String cardNo;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenDiscussListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenDiscussListDTO.java
new file mode 100644
index 0000000..24e8be7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenDiscussListDTO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.dtos.community.bigscreen.work;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("工作大屏一起议列表请求参数")
+public class ScreenDiscussListDTO {
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "社区id", example = "2", required = true)
+ @NotNull(message = "社区id不能为空")
+ private Long communityId;
+
+ @ApiModelProperty(value = "查询开始时间")
+ private String startTime;
+
+ @ApiModelProperty(value = "查询结束时间")
+ private String endTime;
+
+ @ApiModelProperty(value = "发布类型 1 图文 2 投票")
+ private Integer type;
+
+ /**
+ * 发布类型 1 图文 2 投票
+ */
+ public interface type {
+ int tw = 1;
+ int tp = 2;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenMicroListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenMicroListDTO.java
new file mode 100644
index 0000000..3452fb6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenMicroListDTO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.dtos.community.bigscreen.work;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("工作大屏微心愿列表请求参数")
+public class ScreenMicroListDTO {
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "社区id", example = "2", required = true)
+ @NotNull(message = "社区id不能为空")
+ private Long communityId;
+
+ @ApiModelProperty(value = "查询开始时间")
+ private String startTime;
+
+ @ApiModelProperty(value = "查询结束时间")
+ private String endTime;
+
+ @ApiModelProperty(value = "状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成")
+ private Integer status;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/BuildingDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/BuildingDto.java
new file mode 100644
index 0000000..708dbfe
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/BuildingDto.java
@@ -0,0 +1,14 @@
+package com.panzhihua.common.model.dtos.community.building;
+
+
+import lombok.Data;
+
+@Data
+public class BuildingDto {
+
+ private Long streetId;
+
+ private Integer areaCode;
+
+ private String appId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/AddBuildingHouseDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/AddBuildingHouseDto.java
new file mode 100644
index 0000000..c282adc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/AddBuildingHouseDto.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.dtos.community.building.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 添加楼栋户室请求参数
+ */
+
+@Data
+@ApiModel("添加楼栋户室请求参数")
+public class AddBuildingHouseDto {
+
+ @ApiModelProperty("楼栋id")
+ private Long id;
+
+ @ApiModelProperty("单元号")
+ private String unitNo;
+
+ @ApiModelProperty("门牌号")
+ private String houseNo;
+
+ @ApiModelProperty("楼层数")
+ private Integer floorNum;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/AddBuildingUnitDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/AddBuildingUnitDto.java
new file mode 100644
index 0000000..765b026
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/AddBuildingUnitDto.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.community.building.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询楼栋列表请求参数
+ */
+
+@Data
+@ApiModel("分页查询楼栋列表请求参数")
+public class AddBuildingUnitDto {
+
+ @ApiModelProperty("楼栋id")
+ private Long id;
+
+ @ApiModelProperty("单元号")
+ private String unitNo;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/DeleteBuildingHousePopulationDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/DeleteBuildingHousePopulationDto.java
new file mode 100644
index 0000000..39cec34
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/DeleteBuildingHousePopulationDto.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.dtos.community.building.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 删除楼栋户室人员关系请求参数
+ */
+
+@Data
+@ApiModel("删除楼栋户室人员关系请求参数")
+public class DeleteBuildingHousePopulationDto {
+
+ @ApiModelProperty("房屋id")
+ private Long houseId;
+
+ @ApiModelProperty("人员类型（1.业主 2.居住人）")
+ private Integer type;
+
+ @ApiModelProperty("人员id")
+ private Long populationId;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ /**
+ * 人员类型（1.业主 2.居住人）
+ */
+ public interface type{
+ int yz = 1;
+ int jzr = 2;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/EditBuildingHouseDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/EditBuildingHouseDto.java
new file mode 100644
index 0000000..e6e91b6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/EditBuildingHouseDto.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.community.building.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 修改楼栋户室请求参数
+ */
+
+@Data
+@ApiModel("修改楼栋户室请求参数")
+public class EditBuildingHouseDto {
+
+ @ApiModelProperty("房屋id")
+ private Long houseId;
+
+ @ApiModelProperty("门牌号")
+ private String houseNo;
+
+ @ApiModelProperty("楼层数")
+ private Integer floorNum;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/EditBuildingUnitDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/EditBuildingUnitDto.java
new file mode 100644
index 0000000..f86c86c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/EditBuildingUnitDto.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.community.building.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询楼栋列表请求参数
+ */
+
+@Data
+@ApiModel("分页查询楼栋列表请求参数")
+public class EditBuildingUnitDto {
+
+ @ApiModelProperty("楼栋id")
+ private Long id;
+
+ @ApiModelProperty("原单元号")
+ private String oldUnitNo;
+
+ @ApiModelProperty("新单元号")
+ private String newUnitNo;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/PageBuildingListDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/PageBuildingListDto.java
new file mode 100644
index 0000000..41c02d2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/PageBuildingListDto.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.dtos.community.building.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询楼栋列表请求参数
+ */
+
+@Data
+@ApiModel("分页查询楼栋列表请求参数")
+public class PageBuildingListDto {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("关键词")
+ private String keyWord;
+
+ @ApiModelProperty("小区id")
+ private Long villageId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/PageBuildingUnitHouseListDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/PageBuildingUnitHouseListDto.java
new file mode 100644
index 0000000..27830c4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/building/admin/PageBuildingUnitHouseListDto.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.dtos.community.building.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询楼栋单元下房屋列表请求参数
+ */
+
+@Data
+@ApiModel("分页查询楼栋单元下房屋列表请求参数")
+public class PageBuildingUnitHouseListDto {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("单元号")
+ private String unit;
+
+ @ApiModelProperty("楼栋id")
+ private Long id;
+
+ private Long villageId;
+
+ private String floor;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/PageClusterMemberDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/PageClusterMemberDto.java
new file mode 100644
index 0000000..cf80070
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/PageClusterMemberDto.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.dtos.community.cluster;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询群团组织成员列表请求参数
+ */
+@Data
+@ApiModel("分页查询群团组织成员列表请求参数")
+public class PageClusterMemberDto {
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "分页-当前页数",example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数",example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "群团组织id")
+ private Long clusterId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/AddClusterAdminDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/AddClusterAdminDto.java
new file mode 100644
index 0000000..e77ea00
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/AddClusterAdminDto.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.dtos.community.cluster.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询群团组织成员列表请求参数
+ */
+@Data
+@ApiModel("分页查询群团组织列表请求参数")
+public class AddClusterAdminDto {
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "组织名")
+ private String name;
+
+ @ApiModelProperty(value = "组织电话")
+ private String phone;
+
+ @ApiModelProperty(value = "组织地址")
+ private String address;
+
+ @ApiModelProperty(value = "状态（1.启用 2.禁用）")
+ private Integer status;
+
+ @ApiModelProperty(value = "组织logo")
+ private String logo;
+
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/AddClusterMemberAdminDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/AddClusterMemberAdminDto.java
new file mode 100644
index 0000000..e66ea79
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/AddClusterMemberAdminDto.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.dtos.community.cluster.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询群团组织成员列表请求参数
+ */
+@Data
+@ApiModel("分页查询群团组织列表请求参数")
+public class AddClusterMemberAdminDto {
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("群团组织成员名称")
+ private String name;
+
+ @ApiModelProperty("群团组织成员照片")
+ private String imageUrl;
+
+ @ApiModelProperty("群团组织成员职务")
+ private String job;
+
+ @ApiModelProperty("群团组织成员电话")
+ private String phone;
+
+ @ApiModelProperty("群团组织成员住址")
+ private String address;
+
+ @ApiModelProperty("群团组织成员身份证号码")
+ private String idCard;
+
+ @ApiModelProperty("所属群团组织id")
+ private Long clusterId;
+
+ @ApiModelProperty("状态（1.启用 2禁用）")
+ private Integer status;
+
+ @ApiModelProperty("民族code")
+ private String nationCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/EditClusterAdminDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/EditClusterAdminDto.java
new file mode 100644
index 0000000..b30b2b7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/EditClusterAdminDto.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.dtos.community.cluster.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询群团组织成员列表请求参数
+ */
+@Data
+@ApiModel("分页查询群团组织列表请求参数")
+public class EditClusterAdminDto {
+
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "组织名")
+ private String name;
+
+ @ApiModelProperty(value = "组织电话")
+ private String phone;
+
+ @ApiModelProperty(value = "组织地址")
+ private String address;
+
+ @ApiModelProperty(value = "状态（1.启用 2.禁用）")
+ private Integer status;
+
+ @ApiModelProperty(value = "组织logo")
+ private String logo;
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/EditClusterMemberAdminDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/EditClusterMemberAdminDto.java
new file mode 100644
index 0000000..868afe7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/EditClusterMemberAdminDto.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.dtos.community.cluster.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询群团组织成员列表请求参数
+ */
+@Data
+@ApiModel("分页查询群团组织列表请求参数")
+public class EditClusterMemberAdminDto {
+
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("群团组织成员名称")
+ private String name;
+
+ @ApiModelProperty("群团组织成员照片")
+ private String imageUrl;
+
+ @ApiModelProperty("群团组织成员职务")
+ private String job;
+
+ @ApiModelProperty("群团组织成员电话")
+ private String phone;
+
+ @ApiModelProperty("群团组织成员住址")
+ private String address;
+
+ @ApiModelProperty("群团组织成员身份证号码")
+ private String idCard;
+
+ @ApiModelProperty("所属群团组织id")
+ private Long clusterId;
+
+ @ApiModelProperty("状态（1.启用 2禁用）")
+ private Integer status;
+
+ @ApiModelProperty("民族code")
+ private String nationCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/PageClusterAdminDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/PageClusterAdminDto.java
new file mode 100644
index 0000000..d1ab2e0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/PageClusterAdminDto.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.dtos.community.cluster.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询群团组织成员列表请求参数
+ */
+@Data
+@ApiModel("分页查询群团组织列表请求参数")
+public class PageClusterAdminDto {
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "分页-当前页数",example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数",example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "状态（1.启用 2.禁用）")
+ private Integer status;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/PageClusterMemberAdminDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/PageClusterMemberAdminDto.java
new file mode 100644
index 0000000..b49ae88
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/cluster/admin/PageClusterMemberAdminDto.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.dtos.community.cluster.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询群团组织成员列表请求参数
+ */
+@Data
+@ApiModel("分页查询群团组织成员列表请求参数")
+public class PageClusterMemberAdminDto {
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "分页-当前页数",example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数",example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "状态（1.启用 2.禁用）")
+ private Integer status;
+
+ @ApiModelProperty(value = "群团组织id")
+ private Long clusterId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientElevatingPointDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientElevatingPointDTO.java
new file mode 100644
index 0000000..3cbd305
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientElevatingPointDTO.java
@@ -0,0 +1,75 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @ClassName: ConvenientElevatingPointDTO
+ * @Author: yh
+ * @Date: 2022/11/8 10:10
+ * @Description: 新增/编辑便民服务自提点
+ */
+@Data
+@ApiModel("新增/编辑便民服务自提点")
+public class ConvenientElevatingPointDTO {
+
+ @ApiModelProperty("自提点ID")
+ @NotNull(groups = {PutGroup.class}, message = "自提点ID不能为空")
+ private Long id;
+
+ @ApiModelProperty("自提点名称")
+ @NotBlank(groups = {AddGroup.class}, message = "自提点名称不能为空")
+ @Length(groups = {AddGroup.class}, max = 30, message = "自提点名称最多支持30个字符")
+ private String name;
+
+ @ApiModelProperty("联系人")
+ @NotBlank(groups = {AddGroup.class}, message = "联系人不能为空")
+ private String contacts;
+
+
+ @ApiModelProperty("联系电话")
+ @NotBlank(groups = {AddGroup.class}, message = "联系电话不能为空")
+ private String phone;
+
+ @ApiModelProperty("微信账号")
+ @NotBlank(groups = {AddGroup.class}, message = "微信账号不能为空")
+ private String wechatAccount;
+
+ @ApiModelProperty("详细地址")
+ @NotBlank(groups = {AddGroup.class}, message = "详细地址不能为空")
+ private String address;
+
+ @ApiModelProperty("纬度")
+ @NotBlank(groups = {AddGroup.class}, message = "纬度不能为空")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ @NotBlank(groups = {AddGroup.class}, message = "经度不能为空")
+ private String lon;
+
+
+ @ApiModelProperty("状态，1.显示 2.隐藏")
+ @NotNull(groups = {AddGroup.class}, message = "状态不能为空")
+ private Integer businessStatus;
+
+
+ @ApiModelProperty(value = "所属社区id")
+ @NotNull(groups = {AddGroup.class}, message = "所属社区id不能为空")
+ private String communityId;
+
+ @ApiModelProperty(value = "创建人", hidden = true)
+ private Long createdBy;
+
+ @ApiModelProperty(value = "更新人", hidden = true)
+ private Long updatedBy;
+
+ @ApiModelProperty(value = "提货点详细地址")
+ private String detailAddress;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientGoodsCategoryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientGoodsCategoryDTO.java
new file mode 100644
index 0000000..63f38ce
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientGoodsCategoryDTO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @title: ConvenientGoodsCategoryDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 新增/编辑商品务分类
+ * @author: yh
+ * @date: 2022-10-21 09:36:09
+ */
+@Data
+@ApiModel("新增/编辑商品务分类")
+public class ConvenientGoodsCategoryDTO {
+
+ @ApiModelProperty("分类ID")
+ @NotNull(groups = {PutGroup.class}, message = "分类id不能为空")
+ private Long id;
+
+ @ApiModelProperty("分类名称")
+ @NotBlank(groups = {AddGroup.class}, message = "分类名称不能为空")
+ private String name;
+
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("权重")
+ @NotNull(groups = {AddGroup.class}, message = "权重不能为空")
+ private Integer weight;
+
+ @ApiModelProperty(value = "创建人", hidden = true)
+ private Long createdBy;
+
+ @ApiModelProperty(value = "更新人", hidden = true)
+ private Long updatedBy;
+
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientMerchantDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientMerchantDTO.java
new file mode 100644
index 0000000..c711b1d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientMerchantDTO.java
@@ -0,0 +1,140 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.enums.MerchantBusinessPeriod;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ConvenientMerchantDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 新增/编辑便民服务商家
+ * @author: hans
+ * @date: 2021/09/15 17:18
+ */
+@Data
+@ApiModel("新增/编辑便民服务商家")
+public class ConvenientMerchantDTO {
+
+ @ApiModelProperty("便民服务商家ID")
+ @NotNull(groups = {PutGroup.class}, message = "便民服务商家ID不能为空")
+ private Long id;
+
+ @ApiModelProperty("商家名称")
+ @NotBlank(groups = {AddGroup.class}, message = "商家名称不能为空")
+ @Length(groups = {AddGroup.class}, max = 25, message = "商家名称最多支持25个字符")
+ private String name;
+
+ @ApiModelProperty("商家logo")
+ private String logo;
+
+ @ApiModelProperty("联系人")
+ @NotBlank(groups = {AddGroup.class}, message = "联系人不能为空")
+ private String contacts;
+
+ @ApiModelProperty("负责人身份证号")
+ @Pattern(groups = {AddGroup.class}, message = "请输入18位有效身份证号码", regexp = "(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)")
+ private String idCard;
+
+ @ApiModelProperty("咨询电话")
+ private String phone;
+
+ @ApiModelProperty("商家地址")
+ @NotBlank(groups = {AddGroup.class}, message = "商家地址不能为空")
+ private String address;
+
+ @ApiModelProperty("纬度")
+ @NotBlank(groups = {AddGroup.class}, message = "纬度不能为空")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ @NotBlank(groups = {AddGroup.class}, message = "经度不能为空")
+ private String lon;
+
+ @ApiModelProperty("营业开始时间")
+ @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+ @NotNull(groups = {AddGroup.class}, message = "营业开始时间不能为空")
+ private Date beginAt;
+
+ @ApiModelProperty("营业截至时间")
+ @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+ @NotNull(groups = {AddGroup.class}, message = "营业截至时间不能为空")
+ private Date endAt;
+
+ @ApiModelProperty(value = "营业周期", allowableValues = "EVERY_DAY,WEEKDAY,WEEKEND")
+ @NotNull(groups = {AddGroup.class}, message = "营业周期不能为空")
+ private MerchantBusinessPeriod period;
+
+ @ApiModelProperty("商家介绍")
+ @Size(max = 100)
+ private String introduction;
+
+ @ApiModelProperty("服务范围")
+ @NotEmpty(groups = {AddGroup.class}, message = "服务范围不能为空")
+ private List<Long> serviceIds;
+
+ @ApiModelProperty("是否营业中，1.在营 0.已关闭")
+ @NotNull(groups = {AddGroup.class}, message = "是否营业不能为空")
+ private Integer businessStatus;
+
+ @ApiModelProperty("管理账号")
+ @NotBlank(groups = {AddGroup.class}, message = "管理账号不能为空")
+ private String account;
+
+ @ApiModelProperty("登陆密码")
+ @Pattern(groups = {AddGroup.class}, message = "请输入8-12位登陆密码，由英文，数字和特殊符号组成",
+ regexp = "^(?=.*[A-Za-z])(?=(.*[\\d]){1,})(?=(.*[\\W]){1,})(?!.*\\s).{8,12}$")
+ private String password;
+
+ @ApiModelProperty(value = "所属社区id")
+ @NotNull(groups = {AddGroup.class}, message = "所属社区id不能为空")
+ private Long communityId;
+
+ @ApiModelProperty(value = "创建人", hidden = true)
+ private Long createdBy;
+
+ @ApiModelProperty(value = "更新人", hidden = true)
+ private Long updatedBy;
+
+ private String areaCode;
+
+ @ApiModelProperty("服务范围")
+ private Integer serviceRange;
+
+ @ApiModelProperty("微信手机号")
+ private String mobilePhone;
+
+ @ApiModelProperty("详细地址")
+ private String detailedAddress;
+
+ public String getPeriod() {
+ return period.name();
+ }
+
+ public void setPeriod(MerchantBusinessPeriod period) {
+ this.period = period;
+ }
+
+ public Boolean getBusinessStatus() {
+ return businessStatus.intValue() == 1;
+ }
+
+ public void setBusinessStatus(Boolean businessStatus) {
+ this.businessStatus = businessStatus ? 1 : 0;
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientProductCategoryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientProductCategoryDTO.java
new file mode 100644
index 0000000..79e9d62
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientProductCategoryDTO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @title: ConvenientProductCategoryDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 新增/编辑产品分类
+ * @author: hans
+ * @date: 2021/09/20 10:32
+ */
+@Data
+@ApiModel("新增/编辑产品分类")
+public class ConvenientProductCategoryDTO {
+
+ @ApiModelProperty("分类ID")
+ @NotNull(groups = {PutGroup.class}, message = "分类id不能为空")
+ private Long id;
+
+ @ApiModelProperty("分类名称")
+ @NotBlank(groups = {AddGroup.class}, message = "分类名称不能为空")
+ private String name;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("权重")
+ @NotNull(groups = {AddGroup.class}, message = "权重不能为空")
+ private Integer weight;
+
+ @ApiModelProperty(value = "创建人", hidden = true)
+ private Long createdBy;
+
+ @ApiModelProperty(value = "更新人", hidden = true)
+ private Long updatedBy;
+
+ @ApiModelProperty(value = "商家id", hidden = true)
+ private Long merchantId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientProductDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientProductDTO.java
new file mode 100644
index 0000000..7cf95ec
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientProductDTO.java
@@ -0,0 +1,66 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @title: ConvenientProductDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 新增/编辑便民服务商家后台产品
+ * @author: hans
+ * @date: 2021/09/20 20:32
+ */
+@Data
+@ApiModel("新增/编辑便民服务商家后台产品")
+public class ConvenientProductDTO {
+
+ @ApiModelProperty("产品ID")
+ @NotNull(groups = {PutGroup.class}, message = "产品ID不能为空")
+ private Long id;
+
+ @ApiModelProperty("产品名称")
+ @NotBlank(groups = {AddGroup.class}, message = "产品名称不能为空")
+ @Length(groups = {AddGroup.class}, max = 20, message = "产品名称最多支持20个字符")
+ private String name;
+
+ @ApiModelProperty("产品介绍")
+ private String introduction;
+
+ @ApiModelProperty("所属分类")
+ @NotNull(groups = {AddGroup.class}, message = "所属分类不能为空")
+ private Long categoryId;
+
+ @ApiModelProperty("产品规格")
+ @NotEmpty(groups = {AddGroup.class}, message = "产品规格不能为空")
+ private List<ConvenientProductSpecificationDTO> productSpecificationDTOList;
+
+ @ApiModelProperty("上架状态，1.上架 0.下架")
+ @NotNull(groups = {AddGroup.class}, message = "上架状态不能为空")
+ private Integer onShelf;
+
+ @ApiModelProperty(value = "创建人", hidden = true)
+ private Long createdBy;
+
+ @ApiModelProperty(value = "更新人", hidden = true)
+ private Long updatedBy;
+
+ @ApiModelProperty(value = "所属商家", hidden = true)
+ private Long merchantId;
+
+ public Boolean getOnShelf() {
+ return onShelf.intValue() == 1;
+ }
+
+ public void setOnShelf(Boolean onShelf) {
+ this.onShelf = onShelf ? 1 : 0;
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientProductSpecificationDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientProductSpecificationDTO.java
new file mode 100644
index 0000000..4b9d1fe
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientProductSpecificationDTO.java
@@ -0,0 +1,48 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * @title: ConvenientProductSpecificationDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 新增/编辑产品规格信息
+ * @author: hans
+ * @date: 2021/09/20 20:46
+ */
+@Data
+@ApiModel("新增/编辑产品规格信息")
+public class ConvenientProductSpecificationDTO {
+
+ @ApiModelProperty("规格ID")
+ @NotNull(message = "规格ID不能为空", groups = {PutGroup.class})
+ private Long id;
+
+ @ApiModelProperty("规格名称")
+ @NotBlank(message = "规格名称不能为空", groups = {AddGroup.class})
+ @Max(6)
+ private String name;
+
+ @ApiModelProperty("价格")
+ @NotNull(message = "价格不能为空", groups = {AddGroup.class})
+ @Min(0)
+ private BigDecimal price;
+
+ @ApiModelProperty("产品图片")
+ private String image;
+
+ @ApiModelProperty(value = "创建人", hidden = true)
+ private Long createdBy;
+
+ @ApiModelProperty(value = "更新人", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientServiceCategoryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientServiceCategoryDTO.java
new file mode 100644
index 0000000..336d1f9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientServiceCategoryDTO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ConvenientServiceCategoryDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 新增/编辑便民服务分类
+ * @author: hans
+ * @date: 2021/09/16 9:49
+ */
+@Data
+@ApiModel("新增/编辑便民服务分类")
+public class ConvenientServiceCategoryDTO {
+
+ @ApiModelProperty("分类ID")
+ @NotNull(groups = {PutGroup.class}, message = "分类id不能为空")
+ private Long id;
+
+ @ApiModelProperty("分类名称")
+ @NotBlank(groups = {AddGroup.class}, message = "分类名称不能为空")
+ private String name;
+
+ @ApiModelProperty("分类图标")
+ @NotBlank(groups = {AddGroup.class}, message = "分类图标不能为空")
+ private String icon;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("权重")
+ @NotNull(groups = {AddGroup.class}, message = "权重不能为空")
+ private Integer weight;
+
+ @ApiModelProperty(value = "创建人", hidden = true)
+ private Long createdBy;
+
+ @ApiModelProperty(value = "更新人", hidden = true)
+ private Long updatedBy;
+
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/DeleteConvenientProductDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/DeleteConvenientProductDTO.java
new file mode 100644
index 0000000..30fb339
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/DeleteConvenientProductDTO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * @title: DeleteConvenientProductDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 删除便民服务商家后台产品请求参数
+ * @author: hans
+ * @date: 2021/09/21 16:25
+ */
+@Data
+@ApiModel("删除便民服务商家后台产品请求参数")
+public class DeleteConvenientProductDTO {
+
+ @ApiModelProperty(value = "需要删除的产品id集合", required = true)
+ @NotEmpty(message = "产品id不能为空")
+ private List<Long> ids;
+
+ @ApiModelProperty(value = "处理人", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/DisableOrEnableConvenientMerchantDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/DisableOrEnableConvenientMerchantDTO.java
new file mode 100644
index 0000000..54cca2b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/DisableOrEnableConvenientMerchantDTO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: DisableOrEnableConvenientMerchantDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 禁用/启用便民服务商家请求参数
+ * @author: hans
+ * @date: 2021/09/16 15:34
+ */
+@Data
+@ApiModel("禁用/启用便民服务商家请求参数")
+public class DisableOrEnableConvenientMerchantDTO {
+
+ @ApiModelProperty(value = "处理类型（1.启用 2.禁用）", required = true, allowableValues = "1,2")
+ @NotNull(message = "处理类型不能为空")
+ private Integer type;
+
+ @ApiModelProperty(value = "需要处理的id集合", required = true)
+ @NotEmpty(message = "处理id不能为空")
+ private List<Long> ids;
+
+ @ApiModelProperty(value = "处理人", hidden = true)
+ private Long updatedBy;
+
+ @ApiModelProperty(value = "被禁用商家关联用户id", hidden = true)
+ private List<Long> userIds;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ExportMerchantDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ExportMerchantDTO.java
new file mode 100644
index 0000000..3ab9804
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ExportMerchantDTO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ExportMerchantDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 商家导出请求参数
+ * @author: hans
+ * @date: 2021/09/23 15:23
+ */
+@Data
+@ApiModel("商家导出请求参数")
+public class ExportMerchantDTO {
+
+ @ApiModelProperty(value = "批量勾选时传参数组")
+ private List<Long> ids;
+
+ @ApiModelProperty("关键词")
+ private String keyword;
+
+ @ApiModelProperty("服务分类id")
+ private Long serviceId;
+
+ @ApiModelProperty("营业状态（1.在营 0.已关闭）")
+ private Integer businessStatus;
+
+ @ApiModelProperty("账号状态（1.启用 2.禁用）")
+ private Integer accountStatus;
+
+ @ApiModelProperty(value = "服务分类id", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/JinhuiPageConvenientMerchantDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/JinhuiPageConvenientMerchantDTO.java
new file mode 100644
index 0000000..1d7a901
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/JinhuiPageConvenientMerchantDTO.java
@@ -0,0 +1,49 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @title: PageConvenientMerchantDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询便民服务商家请求参数
+ * @author: hans
+ * @date: 2021/09/16 15:03
+ */
+@Data
+@ApiModel("分页查询便民服务商家请求参数")
+public class JinhuiPageConvenientMerchantDTO {
+
+ @ApiModelProperty("关键词")
+ private String keyword;
+
+ @ApiModelProperty("社区id")
+ private String communityId;
+
+ @ApiModelProperty("服务分类id")
+ private String convenientType;
+
+ @ApiModelProperty("营业状态（1.在营 0.已关闭）")
+ private Integer businessStatus;
+
+ @ApiModelProperty("账号状态（1.启用 2.禁用）")
+ private Integer accountStatus;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageSize;
+
+ private String areaCode;
+
+ private String auditType;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/OnShelfOrOffShelfProductDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/OnShelfOrOffShelfProductDTO.java
new file mode 100644
index 0000000..da97622
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/OnShelfOrOffShelfProductDTO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @title: OnShelfOrOffShelfProductDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 上架/下架便民服务商家后台产品请求参数
+ * @author: hans
+ * @date: 2021/09/21 16:42
+ */
+@Data
+@ApiModel("上架/下架便民服务商家后台产品请求参数")
+public class OnShelfOrOffShelfProductDTO {
+
+ @ApiModelProperty(value = "处理类型（1.上架 2.下架）", required = true, allowableValues = "1,2")
+ @NotNull(message = "处理类型不能为空")
+ private Integer type;
+
+ @ApiModelProperty(value = "需要上架/下架的产品id集合", required = true)
+ @NotEmpty(message = "需要上架/下架的产品id不能为空")
+ private List<Long> ids;
+
+ @ApiModelProperty(value = "处理人", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageClassifyMerchantDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageClassifyMerchantDTO.java
new file mode 100644
index 0000000..cb9e141
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageClassifyMerchantDTO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageClassifyMerchantDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页获取服务类型下商家信息请求参数
+ * @author: hans
+ * @date: 2021/09/22 16:45
+ */
+@Data
+@ApiModel("分页获取服务类型下商家信息请求参数")
+public class PageClassifyMerchantDTO {
+
+ @ApiModelProperty(value = "商家服务分类id")
+ @NotNull(message = "商家服务分类id不能为空")
+ @Min(value = 1)
+ private Long serviceId;
+
+ @ApiModelProperty(value = "社区id")
+ @NotNull(message = "社区id不能为空")
+ @Min(value = 1)
+ private Long communityId;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageSize;
+
+ private String areaCode;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientElevatingPointDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientElevatingPointDTO.java
new file mode 100644
index 0000000..892f83b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientElevatingPointDTO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @title: PageConvenientElevatingPointDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询便民服务自提点请求参数
+ * @author: yh
+ * @date: 2022-10-21 09:36:09
+ */
+@Data
+@ApiModel("分页查询便民服务自提点请求参数")
+public class PageConvenientElevatingPointDTO {
+
+ @ApiModelProperty("关键词")
+ private String keyword;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+
+ @ApiModelProperty("营业状态（1.显示 2.隐藏）")
+ private Integer businessStatus;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageSize;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientGoodsCategoryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientGoodsCategoryDTO.java
new file mode 100644
index 0000000..4cc558f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientGoodsCategoryDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageConvenientGoodsCategoryDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询商品分类请求参数
+ * @author: yh
+ * @date: 2022-10-21 09:36:09
+ */
+@Data
+@ApiModel("分页查询商品分类请求参数")
+public class PageConvenientGoodsCategoryDTO {
+
+ @ApiModelProperty("分类名称")
+ private String name;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientMerchantDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientMerchantDTO.java
new file mode 100644
index 0000000..dc68734
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientMerchantDTO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageConvenientMerchantDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询便民服务商家请求参数
+ * @author: hans
+ * @date: 2021/09/16 15:03
+ */
+@Data
+@ApiModel("分页查询便民服务商家请求参数")
+public class PageConvenientMerchantDTO {
+
+ @ApiModelProperty("关键词")
+ private String keyword;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("服务分类id")
+ private Long serviceId;
+
+ @ApiModelProperty("营业状态（1.在营 0.已关闭）")
+ private Integer businessStatus;
+
+ @ApiModelProperty("账号状态（1.启用 2.禁用）")
+ private Integer accountStatus;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageSize;
+
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientProductCategoryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientProductCategoryDTO.java
new file mode 100644
index 0000000..c6f7c30
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientProductCategoryDTO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageConvenientProductCategoryDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询产品分类请求参数
+ * @author: hans
+ * @date: 2021/09/20 15:23
+ */
+@Data
+@ApiModel("分页查询产品分类请求参数")
+public class PageConvenientProductCategoryDTO {
+
+ @ApiModelProperty("分类名称")
+ private String name;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "商家id", hidden = true)
+ private Long merchantId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientProductDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientProductDTO.java
new file mode 100644
index 0000000..eb223b8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientProductDTO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @title: PageConvenientProductDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询便民服务商家后台产品信息请求参数
+ * @author: hans
+ * @date: 2021/09/21 16:12
+ */
+@Data
+@ApiModel("分页查询便民服务商家后台产品信息请求参数")
+public class PageConvenientProductDTO {
+
+ @ApiModelProperty("产品名称")
+ private String name;
+
+ @ApiModelProperty("产品分类id")
+ private Long categoryId;
+
+ @ApiModelProperty("上架状态（1.已上架 0.已下架）")
+ private Integer onShelf;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageSize;
+
+ @ApiModelProperty(value = "所属商家", hidden = true)
+ private Long merchantId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientServiceCategoryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientServiceCategoryDTO.java
new file mode 100644
index 0000000..b6d064a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientServiceCategoryDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageConvenientServiceCategoryDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询便民服务分类请求参数
+ * @author: hans
+ * @date: 2021/09/16 10:16
+ */
+@Data
+@ApiModel("分页查询便民服务分类请求参数")
+public class PageConvenientServiceCategoryDTO {
+
+ @ApiModelProperty("分类名称")
+ private String name;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PagePopularMerchantDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PagePopularMerchantDTO.java
new file mode 100644
index 0000000..bf940cc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PagePopularMerchantDTO.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PagePopularMerchantDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询热门商家请求参数
+ * @author: hans
+ * @date: 2021/09/22 16:29
+ */
+@Data
+@ApiModel("分页查询热门商家请求参数")
+public class PagePopularMerchantDTO {
+
+ @ApiModelProperty(value = "社区id")
+ @NotNull(message = "社区id不能为空")
+ @Min(value = 1)
+ private Long communityId;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageSize;
+
+ private String areaCode;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageSearchDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageSearchDTO.java
new file mode 100644
index 0000000..65f0bfe
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageSearchDTO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageSearchMerchantDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页搜索商家/商品信息请求参数
+ * @author: hans
+ * @date: 2021/09/23 12:34
+ */
+@Data
+@ApiModel("分页搜索商家/商品信息请求参数")
+public class PageSearchDTO {
+
+ @ApiModelProperty(value = "关键词")
+ @NotBlank(message = "关键词不能为空")
+ private String keyword;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageSize;
+
+ @ApiModelProperty(value = "社区id")
+ @NotNull(message = "社区id不能为空")
+ @Min(value = 1)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ResetPasswordConvenientMerchantDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ResetPasswordConvenientMerchantDTO.java
new file mode 100644
index 0000000..c7952d4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ResetPasswordConvenientMerchantDTO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.dtos.community.convenient;
+
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Pattern;
+
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ResetPasswordConvenientMerchantDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 重置便民服务商家账号密码请求参数
+ * @author: hans
+ * @date: 2021/09/16 15:47
+ */
+@Data
+@ApiModel("重置便民服务商家账号密码请求参数")
+public class ResetPasswordConvenientMerchantDTO {
+
+ @ApiModelProperty(value = "需要处理的id集合", required = true)
+ @NotEmpty(message = "处理id不能为空")
+ private List<Long> ids;
+
+ @ApiModelProperty(value = "新密码", required = true)
+ @Pattern(groups = {AddGroup.class}, message = "请输入8-12位登陆密码，由英文，数字和特殊符号组成",
+ regexp = "^(?=.*[A-Za-z])(?=.*\\d)(?=.*[$@$!%*#?&])[A-Za-z\\d$@$!%*#?&]{8,12}$")
+ private String password;
+
+ @ApiModelProperty(value = "处理人", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/discuss/ComActDiscussDetailDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/discuss/ComActDiscussDetailDTO.java
new file mode 100644
index 0000000..187705f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/discuss/ComActDiscussDetailDTO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.dtos.community.discuss;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 议事投票公布结果请求参数
+ */
+@Data
+@ApiModel("议事投票公布结果请求参数")
+public class ComActDiscussDetailDTO {
+
+ @ApiModelProperty("主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/discuss/ComActDiscussPublishResultDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/discuss/ComActDiscussPublishResultDTO.java
new file mode 100644
index 0000000..f8b5c7f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/discuss/ComActDiscussPublishResultDTO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.dtos.community.discuss;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author lyq
+ * 议事投票公布结果请求参数
+ */
+@Data
+@ApiModel("议事投票公布结果请求参数")
+public class ComActDiscussPublishResultDTO {
+
+ @ApiModelProperty("议事投票id")
+ private Long id;
+
+ @ApiModelProperty("公布结果")
+ private String result;
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty("类型（1.新增公布结果 2.修改公布结果）")
+ private Integer type;
+
+ /**
+ * 类型（1.新增公布结果 2.修改公布结果）
+ */
+ public interface type{
+ int add = 1;
+ int edit = 2;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/AddDpcDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/AddDpcDTO.java
new file mode 100644
index 0000000..c6ce6e0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/AddDpcDTO.java
@@ -0,0 +1,58 @@
+package com.panzhihua.common.model.dtos.community.dpc;
+
+import javax.validation.constraints.NotBlank;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: AddDpcDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 人大代表新增请求参数类
+ * @author: hans
+ * @date: 2022/06/07 11:00
+ */
+@Data
+@ApiModel("人大代表新增请求参数类")
+public class AddDpcDTO {
+
+ @ApiModelProperty("姓名")
+ @NotBlank(message = "姓名不能为空")
+ private String name;
+
+ @ApiModelProperty("手机号")
+ @NotBlank(message = "手机号不能为空")
+ private String phone;
+
+ @ApiModelProperty("民族")
+ private String nation;
+
+ @ApiModelProperty("性别（1.男 2.女 3.未知）")
+ private Integer sex;
+
+ @ApiModelProperty("选区")
+ @NotBlank(message = "选区不能为空")
+ private String area;
+
+ @ApiModelProperty("所属家/站")
+ private String belong;
+
+ @ApiModelProperty("代表类别")
+ private String category;
+
+ @ApiModelProperty("单位职务")
+ private String position;
+
+ @ApiModelProperty("照片")
+ private String photo;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "创建者", hidden = true)
+ private Long createdBy;
+
+ @ApiModelProperty(value = "由谁更新", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/EditDpcDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/EditDpcDTO.java
new file mode 100644
index 0000000..a03bada
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/EditDpcDTO.java
@@ -0,0 +1,60 @@
+package com.panzhihua.common.model.dtos.community.dpc;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: EditDpcDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 人大代表编辑请求参数类
+ * @author: hans
+ * @date: 2022/06/07 11:06
+ */
+@Data
+@ApiModel("人大代表编辑请求参数类")
+public class EditDpcDTO {
+
+ @ApiModelProperty("人大代表id")
+ @NotNull(message = "人大代表id不能为空")
+ private Long id;
+
+ @ApiModelProperty("姓名")
+ @NotBlank(message = "姓名不能为空")
+ private String name;
+
+ @ApiModelProperty("手机号")
+ @NotBlank(message = "手机号不能为空")
+ private String phone;
+
+ @ApiModelProperty("民族")
+ private String nation;
+
+ @ApiModelProperty("性别（1.男 2.女 3.未知）")
+ private Integer sex;
+
+ @ApiModelProperty("选区")
+ @NotBlank(message = "选区不能为空")
+ private String area;
+
+ @ApiModelProperty("所属家/站")
+ private String belong;
+
+ @ApiModelProperty("代表类别")
+ private String category;
+
+ @ApiModelProperty("单位职务")
+ private String position;
+
+ @ApiModelProperty("照片")
+ private String photo;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "由谁更新", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/PageDpcDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/PageDpcDTO.java
new file mode 100644
index 0000000..4a4665b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/dpc/PageDpcDTO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.dtos.community.dpc;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageDpcDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询人大代表请求参数
+ * @author: hans
+ * @date: 2022/06/07 11:08
+ */
+@Data
+@ApiModel("分页查询人大代表请求参数")
+public class PageDpcDTO {
+
+ @ApiModelProperty(value = "关键字")
+ private String keyword;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/AddEasyPhotoActivityDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/AddEasyPhotoActivityDTO.java
new file mode 100644
index 0000000..a252b45
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/AddEasyPhotoActivityDTO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.dtos.community.easyPhoto;
+
+import java.math.BigDecimal;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("添加随手拍活动请求参数")
+public class AddEasyPhotoActivityDTO {
+
+ @ApiModelProperty(value = "社区主键", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("活动开始时间")
+ private String activityStartAt;
+
+ @ApiModelProperty("活动结束时间")
+ private String activityEndAt;
+
+ @ApiModelProperty("活动简介")
+ @Length(max = 20)
+ private String content;
+
+ @ApiModelProperty("优质奖励金额")
+ private BigDecimal goodReward;
+
+ @ApiModelProperty("精良奖励金额")
+ private BigDecimal excellentReward;
+
+ @ApiModelProperty("普通奖励金额")
+ private BigDecimal ordinaryReward;
+
+ @ApiModelProperty("一般奖励金额")
+ private BigDecimal commonlyReward;
+
+ @ApiModelProperty("活动图片")
+ private String logo;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/AddEasyPhotoClassifyDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/AddEasyPhotoClassifyDTO.java
new file mode 100644
index 0000000..c01ff18
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/AddEasyPhotoClassifyDTO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.dtos.community.easyPhoto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("添加随手拍活动请求参数")
+public class AddEasyPhotoClassifyDTO {
+
+ @ApiModelProperty("随手拍分类id")
+ private Long id;
+
+ @ApiModelProperty("随手拍分类名称")
+ private String name;
+
+ @ApiModelProperty("权重")
+ private Integer weight;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("1 随手拍 2网格治理")
+ private String addType;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/EditEasyPhotoActivityDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/EditEasyPhotoActivityDTO.java
new file mode 100644
index 0000000..0e0df9d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/EditEasyPhotoActivityDTO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.dtos.community.easyPhoto;
+
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("编辑随手拍活动请求参数")
+public class EditEasyPhotoActivityDTO {
+
+ @ApiModelProperty("随手拍活动id")
+ private Long id;
+
+ @ApiModelProperty("活动开始时间")
+ private String activityStartAt;
+
+ @ApiModelProperty("活动结束时间")
+ private String activityEndAt;
+
+ @ApiModelProperty("活动简介")
+ private String content;
+
+ @ApiModelProperty("优质奖励金额")
+ private BigDecimal goodReward;
+
+ @ApiModelProperty("精良奖励金额")
+ private BigDecimal excellentReward;
+
+ @ApiModelProperty("普通奖励金额")
+ private BigDecimal ordinaryReward;
+
+ @ApiModelProperty("一般奖励金额")
+ private BigDecimal commonlyReward;
+
+ @ApiModelProperty("活动图片")
+ private String logo;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/ExportEasyPhotoDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/ExportEasyPhotoDTO.java
new file mode 100644
index 0000000..da9c86b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/ExportEasyPhotoDTO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.dtos.community.easyPhoto;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ExportEasyPhotoDTO {
+ @ApiModelProperty(value = "批量勾选时传参数组")
+ private List<Integer> ids;
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+ @ApiModelProperty("社区id")
+ private Long communityId;
+ private Integer type;
+ @ApiModelProperty("处理人名字")
+ private String handlerName;
+ @ApiModelProperty("查询-创建开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createBegin;
+
+ @ApiModelProperty("查询-创建结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createEnd;
+ @ApiModelProperty("城管安排状态")
+ private Integer urbanStatus;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/PageEasyPhotoActivityDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/PageEasyPhotoActivityDTO.java
new file mode 100644
index 0000000..f74bf42
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/PageEasyPhotoActivityDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.community.easyPhoto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("随手拍活动列表请求参数")
+public class PageEasyPhotoActivityDTO {
+
+ @ApiModelProperty("活动状态（1.待开始 2.进行中 3.已结束 4.已取消）")
+ private Integer status;
+
+ @ApiModelProperty("活动开始时间")
+ private String startTime;
+
+ @ApiModelProperty("活动结束时间")
+ private String endTime;
+
+ @ApiModelProperty(value = "社区主键", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/PageEasyPhotoActivityUserDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/PageEasyPhotoActivityUserDTO.java
new file mode 100644
index 0000000..121a419
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/PageEasyPhotoActivityUserDTO.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.model.dtos.community.easyPhoto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("随手拍活动列表请求参数")
+public class PageEasyPhotoActivityUserDTO {
+
+ @ApiModelProperty(value = "活动id")
+ private Long activityId;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/elder/ElderAuthStatisticHeaderDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/elder/ElderAuthStatisticHeaderDTO.java
new file mode 100644
index 0000000..b255024
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/elder/ElderAuthStatisticHeaderDTO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.dtos.community.elder;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 高龄老人认证统计表头查询参数
+ */
+@Data
+@ApiModel("高龄老人认证统计表头查询参数")
+public class ElderAuthStatisticHeaderDTO {
+
+ @ApiModelProperty(value = "认证期数",required = true)
+ private String authPeriod;
+
+ @ApiModelProperty(value = "社区ID", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/elder/PageElderAuthStatisticDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/elder/PageElderAuthStatisticDTO.java
new file mode 100644
index 0000000..5386873
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/elder/PageElderAuthStatisticDTO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.dtos.community.elder;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: PageElderAuthRecordsDTO 高龄老人认证记录分页查询参数
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 高龄老人认证记录分页查询参数
+ *
+ * @author txb
+ * @date 2021/9/02 11:12
+ */
+@Data
+@ApiModel("高龄老人认证记录分页查询参数")
+public class PageElderAuthStatisticDTO {
+
+
+ @ApiModelProperty(value = "分页-当前页数,默认1", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数,默认10", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "认证期数")
+ private String authPeriod;
+
+ @ApiModelProperty(value = "认证状态（1.已认证 2.未认证）")
+ private Integer authStatus;
+
+ @ApiModelProperty(value = "人员类别（1.80-89周岁 2.90-99周岁 3.100周岁（含）以上）")
+ private Integer personnelCategory;
+
+ @ApiModelProperty(value = "是否健在（1.是 0.否）")
+ private Integer isAlive;
+
+ @ApiModelProperty(value = "社区ID", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/elder/PagePensionAuthStatisticDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/elder/PagePensionAuthStatisticDTO.java
new file mode 100644
index 0000000..548bd3a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/elder/PagePensionAuthStatisticDTO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.dtos.community.elder;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: PageElderAuthRecordsDTO 养老认证记录分页查询参数
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 高龄老人认证记录分页查询参数
+ *
+ * @author lyq
+ * @date 2021/9/18 15:12
+ */
+@Data
+@ApiModel("养老认证记录分页查询参数")
+public class PagePensionAuthStatisticDTO {
+
+
+ @ApiModelProperty(value = "分页-当前页数,默认1", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数,默认10", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "认证期数")
+ private String authPeriod;
+
+ @ApiModelProperty(value = "认证状态（1.已认证 2.未认证）")
+ private Integer authStatus;
+
+ @ApiModelProperty(value = "是否健在（1.是 0.否）")
+ private Integer isAlive;
+
+ @ApiModelProperty(value = "社区ID", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/elder/SignElderAuthStatisticDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/elder/SignElderAuthStatisticDTO.java
new file mode 100644
index 0000000..fff8ca6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/elder/SignElderAuthStatisticDTO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.dtos.community.elder;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author lyq
+ * 标记高龄老人认证统计记录请求参数
+ */
+@Data
+@ApiModel("标记高龄老人认证统计记录请求参数")
+public class SignElderAuthStatisticDTO {
+
+ @ApiModelProperty(value = "id")
+ private Long id;
+
+ @ApiModelProperty(value = "标记内容")
+ private String mark;
+
+ @ApiModelProperty(value = "操作用户id",hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/AddEnterpriseDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/AddEnterpriseDTO.java
new file mode 100644
index 0000000..4147f84
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/AddEnterpriseDTO.java
@@ -0,0 +1,65 @@
+package com.panzhihua.common.model.dtos.community.enterprise;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: AddEnterpriseDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 社区企业新增请求参数类
+ * @author: hans
+ * @date: 2022/05/31 10:30
+ */
+@Data
+@ApiModel("社区企业新增请求参数类")
+public class AddEnterpriseDTO {
+
+ @ApiModelProperty("企业名称")
+ @NotBlank(message = "企业名称不能为空")
+ private String name;
+
+ @ApiModelProperty("统一社会信用代码")
+ @NotBlank(message = "统一社会信用代码不能为空")
+ private String agencyCode;
+
+ @ApiModelProperty("法定代表人")
+ @NotBlank(message = "法定代表人不能为空")
+ private String legalRepresentative;
+
+ @ApiModelProperty("联系电话")
+ @NotBlank(message = "联系电话不能为空")
+ private String phone;
+
+ @ApiModelProperty("注册时间")
+ private Date registeAt;
+
+ @ApiModelProperty("所属社区")
+ @NotNull(message = "所属社区不能为空")
+ private Long communityId;
+
+ @ApiModelProperty("地址")
+ @NotBlank(message = "地址不能为空")
+ private String address;
+
+ @ApiModelProperty("企业介绍")
+ private String introduct;
+
+ @ApiModelProperty("企业logo")
+ private String logo;
+
+ @ApiModelProperty("服务分类id")
+ @NotNull(message = "服务分类不能为空")
+ private Long type;
+
+ @ApiModelProperty(value = "创建者", hidden = true)
+ private Long createdBy;
+
+ @ApiModelProperty(value = "由谁更新", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/AddEnterpriseTypeDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/AddEnterpriseTypeDTO.java
new file mode 100644
index 0000000..6eef9f6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/AddEnterpriseTypeDTO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.dtos.community.enterprise;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: AddEnterpriseDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 社区企业服务分类新增请求参数类
+ * @author: hans
+ * @date: 2022/05/31 10:30
+ */
+@Data
+@ApiModel("社区企业服务分类新增请求参数类")
+public class AddEnterpriseTypeDTO {
+
+ @ApiModelProperty("服务分类名称")
+ @NotBlank(message = "服务分类名称不能为空")
+ private String name;
+
+ @ApiModelProperty("状态（1.启用 2.停用）")
+ @NotNull(message = "状态不能为空")
+ private Integer status;
+
+ @ApiModelProperty("描述")
+ private String description;
+
+ @ApiModelProperty(value = "创建者", hidden = true)
+ private Long createdBy;
+
+ @ApiModelProperty(value = "由谁更新", hidden = true)
+ private Long updatedBy;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/EditEnterpriseDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/EditEnterpriseDTO.java
new file mode 100644
index 0000000..c38b799
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/EditEnterpriseDTO.java
@@ -0,0 +1,67 @@
+package com.panzhihua.common.model.dtos.community.enterprise;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: EditEnterpriseDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 社区企业编辑请求参数类
+ * @author: hans
+ * @date: 2022/05/31 10:45
+ */
+@Data
+@ApiModel("社区企业编辑请求参数类")
+public class EditEnterpriseDTO {
+
+ @ApiModelProperty("企业id")
+ @NotNull(message = "企业id不能为空")
+ private Long id;
+
+ @ApiModelProperty("企业名称")
+ @NotBlank(message = "企业名称不能为空")
+ private String name;
+
+ @ApiModelProperty("统一社会信用代码")
+ @NotBlank(message = "统一社会信用代码不能为空")
+ private String agencyCode;
+
+ @ApiModelProperty("法定代表人")
+ @NotBlank(message = "法定代表人不能为空")
+ private String legalRepresentative;
+
+ @ApiModelProperty("联系电话")
+ @NotBlank(message = "联系电话不能为空")
+ private String phone;
+
+ @ApiModelProperty("注册时间")
+ private Date registeAt;
+
+ @ApiModelProperty("所属社区")
+ @NotNull(message = "所属社区不能为空")
+ private Long communityId;
+
+ @ApiModelProperty("地址")
+ @NotBlank(message = "地址不能为空")
+ private String address;
+
+ @ApiModelProperty("企业介绍")
+ private String introduct;
+
+ @ApiModelProperty("企业logo")
+ private String logo;
+
+ @ApiModelProperty("服务分类id")
+ @NotNull(message = "服务分类不能为空")
+ private Long type;
+
+ @ApiModelProperty(value = "由谁更新", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/EditEnterpriseTypeDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/EditEnterpriseTypeDTO.java
new file mode 100644
index 0000000..e3378c7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/EditEnterpriseTypeDTO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.dtos.community.enterprise;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: EditEnterpriseDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 社区企业服务分类编辑请求参数类
+ * @author: hans
+ * @date: 2022/05/31 10:45
+ */
+@Data
+@ApiModel("社区企业服务分类编辑请求参数类")
+public class EditEnterpriseTypeDTO {
+
+ @ApiModelProperty("分类id")
+ @NotNull(message = "分类id不能为空")
+ private Long id;
+
+ @ApiModelProperty("服务分类名称")
+ @NotBlank(message = "服务分类名称不能为空")
+ private String name;
+
+ @ApiModelProperty("状态（1.启用 2.停用）")
+ @NotNull(message = "状态不能为空")
+ private Integer status;
+
+ @ApiModelProperty("描述")
+ private String description;
+
+ @ApiModelProperty(value = "由谁更新", hidden = true)
+ private Long updatedBy;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/PageEnterpriseDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/PageEnterpriseDTO.java
new file mode 100644
index 0000000..adaaa06
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/PageEnterpriseDTO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.dtos.community.enterprise;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageEnterpriseDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询社区企业请求参数
+ * @author: hans
+ * @date: 2022/05/31 13:31
+ */
+@Data
+@ApiModel("分页查询社区企业请求参数")
+public class PageEnterpriseDTO {
+
+ @ApiModelProperty(value = "关键字")
+ private String keyword;
+
+ @ApiModelProperty(value = "状态（1.启用 2.禁用）")
+ private Integer status;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty("服务分类id")
+ private Long type;
+
+ @ApiModelProperty(value = "街道id", hidden = true)
+ private Long streetId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/PageEnterpriseTypeDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/PageEnterpriseTypeDTO.java
new file mode 100644
index 0000000..1407709
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/enterprise/PageEnterpriseTypeDTO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.dtos.community.enterprise;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageEnterpriseDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询社区企业服务分类请求参数
+ * @author: hans
+ * @date: 2022/05/31 13:31
+ */
+@Data
+@ApiModel("分页查询社区企业服务分类请求参数")
+public class PageEnterpriseTypeDTO {
+
+ @ApiModelProperty(value = "关键字")
+ private String keyword;
+
+ @ApiModelProperty(value = "状态（1.启用 2.停用）")
+ private Integer status;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddFmsClassroomAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddFmsClassroomAdminDTO.java
new file mode 100644
index 0000000..4fe86af
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddFmsClassroomAdminDTO.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: AddFmsServiceDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 后台新增微讲堂请求参数类
+ * @author: hans
+ * @date: 2022/02/16 11:22
+ */
+@Data
+@ApiModel("后台新增微讲堂请求参数类")
+public class AddFmsClassroomAdminDTO {
+
+ @ApiModelProperty("标题")
+ @NotBlank
+ @Size(min = 1, max = 30)
+ private String title;
+
+ @ApiModelProperty("参与学习人数")
+ private Integer scholars;
+
+ @ApiModelProperty("封面")
+ @NotBlank
+ private String cover;
+
+ @ApiModelProperty("内容")
+ @NotBlank
+ private String content;
+
+ @ApiModelProperty(value = "所属社区", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "创建者", hidden = true)
+ private Long createdBy;
+
+ @ApiModelProperty(value = "由谁更新", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddFmsServiceAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddFmsServiceAdminDTO.java
new file mode 100644
index 0000000..f5d913e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddFmsServiceAdminDTO.java
@@ -0,0 +1,61 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: AddFmsServiceDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 后台新增微服务请求参数类
+ * @author: hans
+ * @date: 2022/02/16 11:22
+ */
+@Data
+@ApiModel("后台新增微服务请求参数类")
+public class AddFmsServiceAdminDTO {
+
+ @ApiModelProperty("服务用户")
+ private String userName;
+
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ @ApiModelProperty("服务时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @NotNull
+ private Date serviceAt;
+
+ @ApiModelProperty("服务内容")
+ @NotBlank(message = "服务内容不能为空")
+ private String serviceContent;
+
+ @ApiModelProperty("服务内容图片，多张逗号隔开")
+ private String serviceImage;
+
+ @ApiModelProperty("服务过程")
+ @NotBlank(message = "服务过程不能为空")
+ private String serviceProcess;
+
+ @ApiModelProperty("服务过程图片，多张逗号隔开")
+ private String processImage;
+
+ @ApiModelProperty("分派服务人员id")
+ private Long memberId;
+
+ @ApiModelProperty(value = "所属社区", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "创建者", hidden = true)
+ private Long createdBy;
+
+ @ApiModelProperty(value = "由谁更新", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddTeamDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddTeamDTO.java
new file mode 100644
index 0000000..177ae73
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddTeamDTO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: AddTeamTypeDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 新增团队请求参数类
+ * @author: hans
+ * @date: 2022/02/11 13:40
+ */
+@Data
+@ApiModel("新增团队请求参数类")
+public class AddTeamDTO {
+
+ @ApiModelProperty("团队名称")
+ @NotBlank
+ @Size(min = 1, max = 20)
+ private String name;
+
+ @ApiModelProperty("所属团队类型")
+ @NotNull
+ private Long teamType;
+
+ @ApiModelProperty("服务电话")
+ private String phone;
+
+ @ApiModelProperty("团队照片")
+ @NotBlank
+ private String image;
+
+ @ApiModelProperty(value = "所属社区", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "创建者", hidden = true)
+ private Long createdBy;
+
+ @ApiModelProperty(value = "由谁更新", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddTeamMemberDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddTeamMemberDTO.java
new file mode 100644
index 0000000..7327f04
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddTeamMemberDTO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: AddTeamTypeDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 新增团队成员请求参数类
+ * @author: hans
+ * @date: 2022/02/11 13:40
+ */
+@Data
+@ApiModel("新增团队成员请求参数类")
+public class AddTeamMemberDTO {
+
+ @ApiModelProperty("成员姓名")
+ @NotBlank
+ @Size(min = 1, max = 10)
+ private String name;
+
+ @ApiModelProperty("所属团队")
+ @NotEmpty
+ private List<Long> teamIds;
+
+ @ApiModelProperty("联系电话")
+ @NotBlank(message = "联系电话不能为空")
+ @Pattern(message = "联系电话格式错误", regexp = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$")
+ private String phone;
+
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+
+ @ApiModelProperty(value = "所属社区", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "创建者", hidden = true)
+ private Long createdBy;
+
+ @ApiModelProperty(value = "由谁更新", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddTeamTypeDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddTeamTypeDTO.java
new file mode 100644
index 0000000..1288dd3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/AddTeamTypeDTO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * @title: AddTeamTypeDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 团队类型新增请求参数类
+ * @author: hans
+ * @date: 2022/02/11 13:40
+ */
+@Data
+@ApiModel("团队类型新增请求参数类")
+public class AddTeamTypeDTO {
+
+ @ApiModelProperty("团队类型名称")
+ @NotBlank
+ @Size(min = 1, max = 10)
+ private String name;
+
+ @ApiModelProperty(value = "所属社区", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "创建者", hidden = true)
+ private Long createdBy;
+
+ @ApiModelProperty(value = "由谁更新", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/ApplyFmsServiceDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/ApplyFmsServiceDTO.java
new file mode 100644
index 0000000..1c9b2b1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/ApplyFmsServiceDTO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ApplyFmsServiceDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 申请微服务请求参数类
+ * @author: hans
+ * @date: 2022/02/19 13:42
+ */
+@Data
+@ApiModel("申请微服务请求参数类")
+public class ApplyFmsServiceDTO {
+
+ @ApiModelProperty("申请服务内容")
+ @NotBlank(message = "申请服务内容不能为空")
+ @Size(min = 1, max = 200)
+ private String serviceContent;
+
+ @ApiModelProperty("服务内容图片，多张逗号隔开")
+ private String serviceImage;
+
+ @ApiModelProperty(value = "创建者", hidden = true)
+ private LoginUserInfoVO userInfo;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/ApprovalFmsServiceAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/ApprovalFmsServiceAdminDTO.java
new file mode 100644
index 0000000..3ed39bd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/ApprovalFmsServiceAdminDTO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @title: AddFmsServiceDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 后台核实微服务请求参数类
+ * @author: hans
+ * @date: 2022/02/16 11:22
+ */
+@Data
+@ApiModel("后台核实微服务请求参数类")
+public class ApprovalFmsServiceAdminDTO {
+
+ @ApiModelProperty("服务id")
+ @NotNull
+ private Long serviceId;
+
+ @ApiModelProperty("反馈内容")
+ private String content;
+
+ @ApiModelProperty("是否通过（TRUE-通过，FALSE-不通过）")
+ @NotNull
+ private Boolean isPass;
+
+ @ApiModelProperty("分派服务人员id")
+ private Long memberId;
+
+ @ApiModelProperty(value = "由谁更新", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/DeleteTeamMemberDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/DeleteTeamMemberDTO.java
new file mode 100644
index 0000000..9b6748d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/DeleteTeamMemberDTO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: AddTeamTypeDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 团队成员删除请求参数类
+ * @author: hans
+ * @date: 2022/02/11 13:40
+ */
+@Data
+@ApiModel("团队成员删除请求参数类")
+public class DeleteTeamMemberDTO {
+
+ @ApiModelProperty("成员id")
+ @NotNull
+ private Long id;
+
+ @ApiModelProperty("所属团队")
+ @NotNull
+ private Long teamId;
+
+ @ApiModelProperty(value = "所属社区", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EditFmsClassroomAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EditFmsClassroomAdminDTO.java
new file mode 100644
index 0000000..c5aca81
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EditFmsClassroomAdminDTO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: AddFmsServiceDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 后台编辑微讲堂请求参数类
+ * @author: hans
+ * @date: 2022/02/16 11:22
+ */
+@Data
+@ApiModel("后台编辑微讲堂请求参数类")
+public class EditFmsClassroomAdminDTO {
+
+ @ApiModelProperty("讲堂id")
+ @NotNull
+ private Long id;
+
+ @ApiModelProperty("标题")
+ @NotBlank
+ @Size(min = 1, max = 30)
+ private String title;
+
+ @ApiModelProperty("参与学习人数")
+ private Integer scholars;
+
+ @ApiModelProperty("封面")
+ @NotBlank
+ private String cover;
+
+ @ApiModelProperty("内容")
+ @NotBlank
+ private String content;
+
+ @ApiModelProperty(value = "由谁更新", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EditTeamDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EditTeamDTO.java
new file mode 100644
index 0000000..1eee164
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EditTeamDTO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: AddTeamTypeDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 团队信息编辑请求参数类
+ * @author: hans
+ * @date: 2022/02/11 13:40
+ */
+@Data
+@ApiModel("团队信息编辑请求参数类")
+public class EditTeamDTO {
+
+ @ApiModelProperty("团队id")
+ @NotNull
+ private Long id;
+
+ @ApiModelProperty("团队名称")
+ @NotBlank
+ @Size(min = 1, max = 20)
+ private String name;
+
+ @ApiModelProperty("所属团队类型")
+ @NotNull
+ private Long teamType;
+
+ @ApiModelProperty("服务电话")
+ private String phone;
+
+ @ApiModelProperty("团队照片")
+ @NotBlank
+ private String image;
+
+ @ApiModelProperty(value = "所属社区", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "由谁更新", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EditTeamMemberDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EditTeamMemberDTO.java
new file mode 100644
index 0000000..5fc0d27
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EditTeamMemberDTO.java
@@ -0,0 +1,52 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @title: AddTeamTypeDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 团队成员编辑请求参数类
+ * @author: hans
+ * @date: 2022/02/11 13:40
+ */
+@Data
+@ApiModel("团队成员编辑请求参数类")
+public class EditTeamMemberDTO {
+
+ @ApiModelProperty("成员id")
+ @NotNull
+ private Long id;
+
+ @ApiModelProperty("成员姓名")
+ @NotBlank
+ @Size(min = 1, max = 10)
+ private String name;
+
+ @ApiModelProperty("所属团队")
+ @NotEmpty
+ private List<Long> teamIds;
+
+ @ApiModelProperty("联系电话")
+ @NotBlank(message = "联系电话不能为空")
+ @Pattern(message = "联系电话格式错误", regexp = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$")
+ private String phone;
+
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+
+ @ApiModelProperty(value = "所属社区", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "由谁更新", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EditTeamTypeDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EditTeamTypeDTO.java
new file mode 100644
index 0000000..856b250
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EditTeamTypeDTO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: AddTeamTypeDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 团队类型编辑请求参数类
+ * @author: hans
+ * @date: 2022/02/11 13:40
+ */
+@Data
+@ApiModel("团队类型编辑请求参数类")
+public class EditTeamTypeDTO {
+
+ @ApiModelProperty("团队类型id")
+ @NotNull
+ private Long id;
+
+ @ApiModelProperty("团队类型名称")
+ @NotBlank
+ @Size(min = 1, max = 10)
+ private String name;
+
+ @ApiModelProperty(value = "所属社区", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "由谁更新", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EvaluationFmsServiceDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EvaluationFmsServiceDTO.java
new file mode 100644
index 0000000..40e68b0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/EvaluationFmsServiceDTO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: EvaluationFmsServiceDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 服务评价请求参数类
+ * @author: hans
+ * @date: 2022/02/19 14:19
+ */
+@Data
+@ApiModel("服务评价请求参数类")
+public class EvaluationFmsServiceDTO {
+
+ @ApiModelProperty("服务id")
+ @NotNull
+ private Long serviceId;
+
+ @ApiModelProperty("评分星级（1.非常差2.差3.一般4.满意5.非常满意）")
+ @NotNull
+ private Integer starLevel;
+
+ @ApiModelProperty("评价内容")
+ private String evaluateContent;
+
+ @ApiModelProperty("图片")
+ private String image;
+
+ @ApiModelProperty(value = "用户", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/FeedbackFmsServiceDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/FeedbackFmsServiceDTO.java
new file mode 100644
index 0000000..b776bf8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/FeedbackFmsServiceDTO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import javax.validation.constraints.NotNull;
+
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: FeedbackFmsServiceDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 服务反馈微服务信息请求参数
+ * @author: hans
+ * @date: 2022/02/19 14:52
+ */
+@Data
+@ApiModel("服务反馈微服务信息请求参数")
+public class FeedbackFmsServiceDTO {
+
+ @ApiModelProperty(value = "服务id")
+ @NotNull
+ private Long serviceId;
+
+ @ApiModelProperty(value = "反馈内容")
+ private String feedbackContent;
+
+ @ApiModelProperty(value = "反馈图片")
+ private String image;
+
+ @ApiModelProperty("结束服务（TRUE-是，FALSE-否）")
+ @NotNull
+ private Boolean isEnd;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "用户信息", hidden = true)
+ private LoginUserInfoVO userInfo;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsClassroomAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsClassroomAdminDTO.java
new file mode 100644
index 0000000..5a1ed1a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsClassroomAdminDTO.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageFmsClassroomAdminDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 后台分页查询微讲堂信息请求参数
+ * @author: hans
+ * @date: 2022/02/17 14:15
+ */
+@Data
+@ApiModel("后台分页查询微讲堂信息请求参数")
+public class PageFmsClassroomAdminDTO {
+
+ @ApiModelProperty(value = "关键字")
+ private String keyword;
+
+ @ApiModelProperty("发布时间-起")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createdAtBegin;
+
+ @ApiModelProperty("发布时间-止")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createdAtEnd;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsEventAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsEventAdminDTO.java
new file mode 100644
index 0000000..ec59342
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsEventAdminDTO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageFmsClassroomAdminDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 后台分页查询微调节/微防控信息请求参数
+ * @author: hans
+ * @date: 2022/02/17 14:15
+ */
+@Data
+@ApiModel("后台分页查询微调节/微防控信息请求参数")
+public class PageFmsEventAdminDTO {
+
+ @ApiModelProperty(value = "关键字")
+ private String keyword;
+
+ @ApiModelProperty(value = "事件类型")
+ private String eventClazz;
+
+ @ApiModelProperty(value = "状态(1.待处理2.已解决)")
+ private Integer eventProcessStatus;
+
+ @ApiModelProperty(value = "查询类型（1.微调节数据2.微防控数）")
+ @NotNull(message = "查询类型不能为空")
+ private Integer type;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsServiceAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsServiceAdminDTO.java
new file mode 100644
index 0000000..8c70cf7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsServiceAdminDTO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageFmsServiceAdminDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 后台分页查询微服务信息请求参数
+ * @author: hans
+ * @date: 2022/02/16 14:05
+ */
+@Data
+@ApiModel("后台分页查询微服务信息请求参数")
+public class PageFmsServiceAdminDTO {
+
+ @ApiModelProperty(value = "关键字")
+ private String keyword;
+
+ @ApiModelProperty(value = "服务状态（1.待核实2.进行中3.待评价4.已完成5.未通过）")
+ private Integer serviceStatus;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsServiceAppletsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsServiceAppletsDTO.java
new file mode 100644
index 0000000..608d299
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsServiceAppletsDTO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import javax.validation.constraints.NotNull;
+
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageFmsServiceAdminDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 小程序分页查询微服务信息请求参数
+ * @author: hans
+ * @date: 2022/02/16 14:05
+ */
+@Data
+@ApiModel("小程序分页查询微服务信息请求参数")
+public class PageFmsServiceAppletsDTO {
+
+ @ApiModelProperty(value = "此状态和服务状态不一致（1.已完成2.进行中）")
+ private Integer status;
+
+ @ApiModelProperty(value = "微服务处理状态（1.待我服务2.待核实3.已完成）")
+ private Integer dealStatus;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "用户信息", hidden = true)
+ private LoginUserInfoVO userInfo;
+
+ @ApiModelProperty(value = "成员id", hidden = true)
+ private Long memberId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsTeamDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsTeamDTO.java
new file mode 100644
index 0000000..f8e9075
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageFmsTeamDTO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageFmsTeamDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询团队信息请求参数
+ * @author: hans
+ * @date: 2022/02/18 10:16
+ */
+@Data
+@ApiModel("分页查询团队信息请求参数")
+public class PageFmsTeamDTO {
+
+ @ApiModelProperty(value = "关键字")
+ private String keyword;
+
+ @ApiModelProperty(value = "团队类型")
+ private Long teamType;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageTeamMemberDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageTeamMemberDTO.java
new file mode 100644
index 0000000..85b307d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/fms/PageTeamMemberDTO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.dtos.community.fms;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageTeamMemberDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询团队成员信息请求参数
+ * @author: hans
+ * @date: 2022/02/14 15:28
+ */
+@Data
+@ApiModel("分页查询团队成员信息请求参数")
+public class PageTeamMemberDTO {
+
+ @ApiModelProperty(value = "关键字")
+ private String keyword;
+
+ @ApiModelProperty(value = "团队类型")
+ private Long teamType;
+
+ @ApiModelProperty(value = "所属团队")
+ private Long teamId;
+
+ @ApiModelProperty(value = "性别（1.男2.女3.未知）")
+ private Integer gender;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/ComActIntegralCommunityRankDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/ComActIntegralCommunityRankDTO.java
new file mode 100644
index 0000000..2b9f012
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/ComActIntegralCommunityRankDTO.java
@@ -0,0 +1,51 @@
+package com.panzhihua.common.model.dtos.community.integral;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("查询社区积分排行榜请求参数")
+public class ComActIntegralCommunityRankDTO {
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "交易身份类型（1.居民 2.党员 3.志愿者）", hidden = true)
+ private Integer identityType;
+
+ @ApiModelProperty("身份类型（1.全部 2.居民 3.志愿者 4.党员）")
+ private Integer type = 1;
+
+ @ApiModelProperty("变动类型（1.增加 2.减少）")
+ private Integer changeType;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ /**
+ * 身份类型（1.全部 2.居民 3.志愿者 4.党员）
+ */
+ public interface type {
+ int all = 1;
+ int resident = 2;
+ int party = 3;
+ int volunteer = 4;
+ }
+
+ /**
+ * 交易身份类型（1.居民 2.党员 3.志愿者）
+ */
+ public interface identityType {
+ int resident = 1;
+ int party = 2;
+ int volunteer = 3;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/ComActIntegralCountDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/ComActIntegralCountDTO.java
new file mode 100644
index 0000000..f77ad9f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/ComActIntegralCountDTO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.dtos.community.integral;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("查询用户积分交易记录条数请求参数")
+public class ComActIntegralCountDTO {
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ @ApiModelProperty("查询开始时间")
+ private String startTime;
+
+ @ApiModelProperty("查询结束时间")
+ private String endTime;
+
+ @ApiModelProperty("变动类型（1.增加 2.减少）")
+ private Integer type;
+
+ @ApiModelProperty("交易业务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.社区活动-居民身份参与 \" +\n" +
+ " \"5.社区活动-党员身份参与 6.社区活动-志愿者身份参与 7.参与调查问卷 8.取消活动 9.参与单位党员活动）")
+ private Integer serviceType;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java
new file mode 100644
index 0000000..2144f2f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java
@@ -0,0 +1,63 @@
+package com.panzhihua.common.model.dtos.community.integral.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("计算用户积分请求参数")
+public class AddComActIntegralUserDTO {
+
+ @ApiModelProperty("业务id")
+ private Long serviceId;
+
+ @ApiModelProperty("积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.社区活动-居民身份参与 " +
+ "5.社区活动-党员身份参与 6.社区活动-志愿者身份参与 7.参与调查问卷 8.取消活动 9.参与单位党员活动）")
+ private Integer integralType;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+ @ApiModelProperty(value = "是否是评论（1.是 2.否）")
+ private Integer isComment;
+
+ @ApiModelProperty(value = "签到类型 1居民 志愿者签到 2党员签到")
+ private Integer activityType;
+
+ @ApiModelProperty(value = "以什么身份报名（1.居民 2.党员 3.志愿者）")
+ private Integer signIdentity;
+
+ @ApiModelProperty(value = "积分")
+ private Integer integral;
+
+ private Integer integralPartyTime;
+
+ private String remark;
+
+ public AddComActIntegralUserDTO(Long serviceId, Integer integralType, Long communityId, Long userId) {
+ this.serviceId = serviceId;
+ this.integralType = integralType;
+ this.communityId = communityId;
+ this.userId = userId;
+ }
+
+ public AddComActIntegralUserDTO() {}
+
+ /**
+ * 积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.社区活动-居民身份参与 " +
+ * "5.社区活动-党员身份参与 6.社区活动-志愿者身份参与 7.参与调查问卷 8.取消活动 9.参与单位党员活动）
+ */
+ public interface integralType {
+ int fbssp = 1;
+ int fbwxy = 2;
+ int cyystp = 3;
+ int cyjmhd = 4;
+ int cyzyzhd = 5;
+ int cydyhd = 6;
+ int cydcwj = 7;
+ int qxhd = 8;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/EditComActIntegralRuleDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/EditComActIntegralRuleDTO.java
new file mode 100644
index 0000000..8ad1699
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/EditComActIntegralRuleDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.community.integral.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("编辑积分规则请求参数")
+public class EditComActIntegralRuleDTO {
+
+ @ApiModelProperty("社区积分规则id")
+ private Long id;
+
+ @ApiModelProperty("奖励积分金额")
+ private Integer amount;
+
+ @ApiModelProperty("是否限制（1.是 2.否）")
+ private Integer isRestrict;
+
+ @ApiModelProperty("限制类型（1.月 2.日）")
+ private Integer type;
+
+ @ApiModelProperty("限制次数")
+ private Integer count;
+
+ @ApiModelProperty("积分任务描述")
+ private String integralDescribe;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/PageComActIntegralRuleDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/PageComActIntegralRuleDTO.java
new file mode 100644
index 0000000..2c3cd9b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/PageComActIntegralRuleDTO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.dtos.community.integral.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("分页查询社区后台积分交易记录请求参数")
+public class PageComActIntegralRuleDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/PageComActIntegralTradeDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/PageComActIntegralTradeDTO.java
new file mode 100644
index 0000000..3b8f362
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/PageComActIntegralTradeDTO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.dtos.community.integral.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("分页查询社区后台积分交易记录请求参数")
+public class PageComActIntegralTradeDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("用户身份（1.居民 2.党员 3.志愿者）")
+ private Integer userIdentity;
+
+ @ApiModelProperty("交易身份类型（1.居民 2.党员 3.志愿者）")
+ private Integer identityType;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/large/AreaStreetDetail.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/large/AreaStreetDetail.java
new file mode 100644
index 0000000..6c03896
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/large/AreaStreetDetail.java
@@ -0,0 +1,16 @@
+package com.panzhihua.common.model.dtos.community.large;
+
+import com.panzhihua.common.model.vos.community.screen.event.EventPopulationSpecialStatisticsVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AreaStreetDetail {
+
+
+ @ApiModelProperty("街道相关信息")
+ private AreaStreetDetailResp areaStreetDetailResp;
+
+ @ApiModelProperty("特殊人口数据")
+ private EventPopulationSpecialStatisticsVO eventPopulationVO;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/large/AreaStreetDetailResp.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/large/AreaStreetDetailResp.java
new file mode 100644
index 0000000..e55440c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/large/AreaStreetDetailResp.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.dtos.community.large;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AreaStreetDetailResp {
+
+ @ApiModelProperty("街道 总和")
+ private Integer streetCount;
+
+ @ApiModelProperty("社区 总和")
+ private Integer actCount;
+
+ @ApiModelProperty("人口 总和")
+ private Integer populationCount;
+
+ @ApiModelProperty("小区 总和")
+ private Integer villageCount;
+
+ @ApiModelProperty("房屋 总和")
+ private Integer houseCount;
+
+ @ApiModelProperty("城市小区 总和")
+ private Integer cityVillageCount;
+
+ @ApiModelProperty("农村小区 总和")
+ private Integer countryVillageCount;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/large/SumAreaStreetResp.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/large/SumAreaStreetResp.java
new file mode 100644
index 0000000..dd4c409
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/large/SumAreaStreetResp.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.community.large;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SumAreaStreetResp {
+
+ @ApiModelProperty("区 总和")
+ private Integer areaCount;
+
+ @ApiModelProperty("街道 总和")
+ private Integer streetCount;
+
+ @ApiModelProperty("社区 总和")
+ private Integer actCount;
+
+ @ApiModelProperty("人口 总和")
+ private Integer populationCount;
+
+ @ApiModelProperty("小区 总和")
+ private Integer villageCount;
+
+ @ApiModelProperty("房屋 总和")
+ private Integer houseCount;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/BindUserPhoneDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/BindUserPhoneDTO.java
new file mode 100644
index 0000000..0b381da
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/BindUserPhoneDTO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BindUserPhoneDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 商业街用户绑定手机号
+ * @author: hans
+ * @date: 2022/01/13 10:58
+ */
+@Data
+@ApiModel("商业街用户绑定手机号")
+public class BindUserPhoneDTO {
+
+ @ApiModelProperty("手机号")
+ @NotBlank(message = "手机号不能为空")
+ @Pattern(message = "手机号格式错误", regexp = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$")
+ private String phone;
+
+ @ApiModelProperty("验证码")
+ @NotBlank(message = "验证码不能为空")
+ private String code;
+
+ @ApiModelProperty("openId")
+ @NotBlank(message = "openId不能为空")
+ private String openId;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/DeleteProductDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/DeleteProductDTO.java
new file mode 100644
index 0000000..20cad4b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/DeleteProductDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: DeleteProductDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 删除产品信息请求参数
+ * @author: hans
+ * @date: 2022/01/11 16:24
+ */
+@Data
+@ApiModel("删除产品信息请求参数")
+public class DeleteProductDTO {
+
+ @ApiModelProperty(value = "产品id列表", required = true)
+ @NotEmpty(message = "产品id列表不能为空")
+ private List<Long> productIds;
+
+ @ApiModelProperty(value = "处理人", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/DisableOrEnableMcsMerchantDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/DisableOrEnableMcsMerchantDTO.java
new file mode 100644
index 0000000..b69677b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/DisableOrEnableMcsMerchantDTO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: DisableOrEnableMcsMerchantDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 禁用/启用数字商业街商家请求参数
+ * @author: hans
+ * @date: 2021/12/29 14:35
+ */
+@Data
+@ApiModel("禁用/启用数字商业街商家请求参数")
+public class DisableOrEnableMcsMerchantDTO {
+
+ @ApiModelProperty(value = "处理类型（1.启用 2.禁用）", required = true, allowableValues = "1,2")
+ @NotNull(message = "处理类型不能为空")
+ private Integer type;
+
+ @ApiModelProperty(value = "商家id", required = true)
+ @NotNull(message = "商家id不能为空")
+ private Long merchantId;
+
+ @ApiModelProperty(value = "处理人", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/LoginWithPhoneDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/LoginWithPhoneDTO.java
new file mode 100644
index 0000000..445c4b5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/LoginWithPhoneDTO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: LoginWithPhoneDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 手机号登录请求参数
+ * @author: hans
+ * @date: 2022/01/06 16:40
+ */
+@Data
+@ApiModel("手机号登录请求参数")
+public class LoginWithPhoneDTO {
+
+ @ApiModelProperty("手机号")
+ @NotBlank(message = "手机号不能为空")
+ @Pattern(message = "手机号格式错误", regexp = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$")
+ private String phone;
+
+ @ApiModelProperty("验证码")
+ @NotBlank(message = "验证码不能为空")
+ private String code;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsEvaluateDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsEvaluateDTO.java
new file mode 100644
index 0000000..e5bfebd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsEvaluateDTO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: McsEvaluateDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 评价记录请求
+ * @author: hans
+ * @date: 2022/01/08 13:13
+ */
+@Data
+@ApiModel("评价记录请求")
+public class McsEvaluateDTO {
+
+ @ApiModelProperty("戳戳券码id")
+ @NotNull(groups = {AddGroup.class}, message = "戳戳券码id不能为空")
+ private Long couponId;
+
+ @ApiModelProperty("评分（1.差 2.一般 3.还不错 4.很满意 5.强烈推荐）")
+ @NotNull(groups = {AddGroup.class}, message = "评分不能为空")
+ private Integer star;
+
+ @ApiModelProperty("评价内容")
+ @NotBlank(groups = {AddGroup.class}, message = "评价内容不能为空")
+ private String content;
+
+ @ApiModelProperty("评价图片（多张逗号隔开）")
+ @NotBlank(groups = {AddGroup.class}, message = "评价图片不能为空")
+ private String photos;
+
+ @ApiModelProperty(value = "创建人", hidden = true)
+ private Long userId;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsGameDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsGameDTO.java
new file mode 100644
index 0000000..d16c864
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsGameDTO.java
@@ -0,0 +1,85 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: McsGameDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 新增/编辑戳戳游戏
+ * @author: hans
+ * @date: 2021/12/31 15:42
+ */
+@Data
+@ApiModel("新增/编辑戳戳游戏")
+public class McsGameDTO {
+
+ @ApiModelProperty("游戏ID")
+ @NotNull(groups = {PutGroup.class}, message = "游戏ID不能为空")
+ private Long id;
+
+ @ApiModelProperty("游戏名称")
+ @NotBlank(groups = {AddGroup.class}, message = "游戏名称不能为空")
+ private String name;
+
+ @ApiModelProperty("戳戳卷数量")
+ @NotNull(groups = {AddGroup.class}, message = "戳戳卷数量不能为空")
+ private Integer coupons;
+
+ @ApiModelProperty("游戏类别（1.戳戳币游戏 2.体验游戏）")
+ @NotNull(groups = {AddGroup.class}, message = "游戏类别不能为空")
+ private Integer type;
+
+ @ApiModelProperty("奖励类型（1.免费领 2.产品试用 3.消费赠礼 4.优惠券）")
+ private Integer awardType;
+
+ @ApiModelProperty("戳戳币分配方式（1.随机分配 2.平均分配）")
+ private Integer allocation;
+
+ @ApiModelProperty("戳戳币数量")
+ private Integer coins;
+
+ @ApiModelProperty("地址")
+ @NotBlank(groups = {AddGroup.class}, message = "地址不能为空")
+ private String address;
+
+ @ApiModelProperty("纬度")
+ @NotBlank(groups = {AddGroup.class}, message = "纬度不能为空")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ @NotBlank(groups = {AddGroup.class}, message = "经度不能为空")
+ private String lon;
+
+ @ApiModelProperty("失效时间")
+ @NotNull(groups = {AddGroup.class}, message = "失效时间不能为空")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date expireAt;
+
+ @ApiModelProperty("封面")
+ @NotBlank(groups = {AddGroup.class}, message = "封面不能为空")
+ private String cover;
+
+ @ApiModelProperty("其他图片（多张图片以逗号隔开）")
+ private String otherImages;
+
+ @ApiModelProperty("游戏介绍")
+ @NotBlank(groups = {AddGroup.class}, message = "游戏介绍不能为空")
+ private String introduction;
+
+ @ApiModelProperty(value = "创建人", hidden = true)
+ private Long createdBy;
+
+ @ApiModelProperty(value = "更新人", hidden = true)
+ private Long updatedBy;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsInfoDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsInfoDTO.java
new file mode 100644
index 0000000..5769158
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsInfoDTO.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: McsInfoDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 新增/编辑戳戳资讯
+ * @author: hans
+ * @date: 2022/01/05 10:06
+ */
+@Data
+@ApiModel("新增/编辑戳戳资讯")
+public class McsInfoDTO {
+
+ @ApiModelProperty("资讯ID")
+ @NotNull(groups = {PutGroup.class}, message = "资讯ID不能为空")
+ private Long id;
+
+ @ApiModelProperty("资讯标题")
+ @NotBlank(groups = {AddGroup.class}, message = "资讯标题不能为空")
+ private String name;
+
+ @ApiModelProperty("地址")
+ @NotBlank(groups = {AddGroup.class}, message = "地址不能为空")
+ private String address;
+
+ @ApiModelProperty("纬度")
+ @NotBlank(groups = {AddGroup.class}, message = "纬度不能为空")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ @NotBlank(groups = {AddGroup.class}, message = "经度不能为空")
+ private String lon;
+
+ @ApiModelProperty("封面")
+ @NotBlank(groups = {AddGroup.class}, message = "封面不能为空")
+ private String cover;
+
+ @ApiModelProperty("资讯内容")
+ @NotBlank(groups = {AddGroup.class}, message = "资讯内容不能为空")
+ private String content;
+
+ @ApiModelProperty(value = "创建人", hidden = true)
+ private Long createdBy;
+
+ @ApiModelProperty(value = "更新人", hidden = true)
+ private Long updatedBy;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsMerchantDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsMerchantDTO.java
new file mode 100644
index 0000000..b4fc5b1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsMerchantDTO.java
@@ -0,0 +1,91 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: McsMerchantDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description:
+ * @author: hans
+ * @date: 2021/12/28 14:32
+ */
+@Data
+@ApiModel("新增/编辑微商业街商家")
+public class McsMerchantDTO {
+
+ @ApiModelProperty("微商业街商家ID")
+ @NotNull(groups = {PutGroup.class}, message = "微商业街商家ID不能为空")
+ private Long id;
+
+ @ApiModelProperty("商家名称")
+ @NotBlank(groups = {AddGroup.class}, message = "商家名称不能为空")
+ private String name;
+
+ @ApiModelProperty("手机号")
+ @Pattern(groups = {AddGroup.class}, message = "手机号格式错误", regexp = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$")
+ private String phone;
+
+ @ApiModelProperty("商家级别（1.临时商家 2.合作商家）")
+ @NotNull(groups = {AddGroup.class}, message = "商家级别不能为空")
+ private Integer level;
+
+ @ApiModelProperty("点亮天数")
+ @NotNull(groups = {AddGroup.class}, message = "点亮天数不能为空")
+ private Integer litDays;
+
+ @ApiModelProperty("商家账号")
+ @NotBlank(groups = {AddGroup.class}, message = "商家账号不能为空")
+ private String account;
+
+ @ApiModelProperty("密码")
+// @Pattern(groups = {AddGroup.class}, message = "请输入8-12位密码，由英文，数字和特殊符号组成",
+// regexp = "^(?=.*[A-Za-z])(?=(.*[\\d]){1,})(?=(.*[\\W]){1,})(?!.*\\s).{8,12}$")
+ @NotBlank(groups = {AddGroup.class}, message = "密码不能为空")
+ private String password;
+
+ @ApiModelProperty("账号状态（1.启用 2.禁用）")
+ @NotNull(groups = {AddGroup.class}, message = "账号状态不能为空")
+ private Integer accountStatus;
+
+ @ApiModelProperty("商家logo")
+ private String logo;
+
+ @ApiModelProperty("戳戳点亮上限（发布次数上限）")
+ private Integer publishLimit;
+
+ @ApiModelProperty("商家地址")
+ private String address;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ private String lon;
+
+ @ApiModelProperty("商家介绍")
+ private String introduction;
+
+ @ApiModelProperty(value = "创建人", hidden = true)
+ private Long createdBy;
+
+ @ApiModelProperty(value = "更新人", hidden = true)
+ private Long updatedBy;
+
+ @ApiModelProperty(value = "所属商家", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "用户头像", hidden = true)
+ private String imageUrl;
+
+ @ApiModelProperty(value = "openId", hidden = true)
+ private String openId;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsProductDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsProductDTO.java
new file mode 100644
index 0000000..7cf3052
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsProductDTO.java
@@ -0,0 +1,48 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @title: McsProductDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 新增/编辑产品信息
+ * @author: hans
+ * @date: 2022/01/05 11:25
+ */
+@Data
+@ApiModel("新增/编辑产品信息")
+public class McsProductDTO {
+
+ @ApiModelProperty("产品ID")
+ @NotNull(groups = {PutGroup.class}, message = "产品ID不能为空")
+ private Long id;
+
+ @ApiModelProperty("产品名称")
+ @NotBlank(groups = {AddGroup.class}, message = "产品名称不能为空")
+ private String name;
+
+ @ApiModelProperty("产品图片")
+ private String image;
+
+ @ApiModelProperty("产品介绍")
+ private String introduction;
+
+ @ApiModelProperty("产品标签id列表")
+ private List<Long> labelIds;
+
+ @ApiModelProperty(value = "创建人", hidden = true)
+ private Long createdBy;
+
+ @ApiModelProperty(value = "更新人", hidden = true)
+ private Long updatedBy;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageJoinGameListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageJoinGameListDTO.java
new file mode 100644
index 0000000..88964e8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageJoinGameListDTO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageMyCouponDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询我的评价-参与游戏列表
+ * @author: hans
+ * @date: 2022/01/08 12:34
+ */
+@Data
+@ApiModel("分页查询我的评价-参与游戏列表")
+public class PageJoinGameListDTO {
+
+ @ApiModelProperty("关键字")
+ private String keyword;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageSize;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsEvaluateDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsEvaluateDTO.java
new file mode 100644
index 0000000..5dbec26
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsEvaluateDTO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageMcsEvaluateDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询戳戳评价记录请求参数
+ * @author: hans
+ * @date: 2021/12/31 13:22
+ */
+@Data
+@ApiModel("分页查询戳戳评价记录请求参数")
+public class PageMcsEvaluateDTO {
+
+ @ApiModelProperty("关键词")
+ private String keyword;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageSize;
+
+ @ApiModelProperty("1.我的评价")
+ private Integer isMy;
+
+ @ApiModelProperty("戳戳游戏id")
+ private Long gameId;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsGameDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsGameDTO.java
new file mode 100644
index 0000000..13fb057
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsGameDTO.java
@@ -0,0 +1,54 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageMcsGameDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询戳戳游戏请求参数
+ * @author: hans
+ * @date: 2021/12/30 15:20
+ */
+@Data
+@ApiModel("分页查询戳戳游戏请求参数")
+public class PageMcsGameDTO {
+
+ @ApiModelProperty("关键词")
+ private String keyword;
+
+ @ApiModelProperty("游戏类别（1.戳戳币游戏 2.体验游戏）")
+ private Integer type;
+
+ @ApiModelProperty("状态（1.未发布 2.进行中 3.已下架 4.已结束）")
+ private Integer status;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageSize;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ private String lon;
+
+ @ApiModelProperty("距离(千米)")
+ private Integer distance;
+
+ @ApiModelProperty("商家id")
+ private Long merchantId;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsInformationDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsInformationDTO.java
new file mode 100644
index 0000000..5527a1a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsInformationDTO.java
@@ -0,0 +1,51 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageMcsInformationDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询戳戳资讯请求参数
+ * @author: hans
+ * @date: 2021/12/30 17:44
+ */
+@Data
+@ApiModel("分页查询戳戳资讯请求参数")
+public class PageMcsInformationDTO {
+
+ @ApiModelProperty("关键词")
+ private String keyword;
+
+ @ApiModelProperty("状态（1.未发布 2.已发布 3.已下架）")
+ private Integer status;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageSize;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ private String lon;
+
+ @ApiModelProperty("距离(千米)")
+ private Integer distance;
+
+ @ApiModelProperty("商家id")
+ private Long merchantId;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsMerchantDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsMerchantDTO.java
new file mode 100644
index 0000000..fdf6777
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsMerchantDTO.java
@@ -0,0 +1,54 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageMcsMerchantDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询微商业街商家请求参数
+ * @author: hans
+ * @date: 2021/12/29 14:31
+ */
+@Data
+@ApiModel("分页查询微商业街商家请求参数")
+public class PageMcsMerchantDTO {
+
+ @ApiModelProperty("关键词")
+ private String keyword;
+
+ @ApiModelProperty("账号状态（1.启用 2.禁用）")
+ private Integer accountStatus;
+
+ @ApiModelProperty("商家级别（1.临时商家 2.合作商家）")
+ private Integer level;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageSize;
+
+ @ApiModelProperty("查询类型（1.戳戳游戏 2.戳戳资讯）")
+ private Integer type;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ private String lon;
+
+ @ApiModelProperty("距离，单位km")
+ private Integer distance;
+
+ @ApiModelProperty("x km以上时，此值为1")
+ private Integer isMore;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsProductDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsProductDTO.java
new file mode 100644
index 0000000..b435318
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageMcsProductDTO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageMcsProductDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询产品信息请求参数
+ * @author: hans
+ * @date: 2022/01/05 11:30
+ */
+@Data
+@ApiModel("分页查询产品信息请求参数")
+public class PageMcsProductDTO {
+
+ @ApiModelProperty("关键词")
+ private String keyword;
+
+ @ApiModelProperty("状态（1.上架中 2.已下架）")
+ private Integer status;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageSize;
+
+ @ApiModelProperty(value = "商家id")
+ private Long merchantId;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageVerifyRecordDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageVerifyRecordDTO.java
new file mode 100644
index 0000000..f9b2107
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PageVerifyRecordDTO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: PageVerifyRecordDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询核销记录
+ * @author: hans
+ * @date: 2022/01/08 14:53
+ */
+@Data
+@ApiModel("分页查询核销记录")
+public class PageVerifyRecordDTO {
+
+ @ApiModelProperty("关键字")
+ private String keyword;
+
+ @ApiModelProperty("游戏类别（1.戳戳币游戏 2.体验游戏）")
+ private Integer type;
+
+ @ApiModelProperty("核销时间-起")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date verifiedBegin;
+
+ @ApiModelProperty("核销时间-止")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date verifiedEnd;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageSize;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PutUserInfoDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PutUserInfoDTO.java
new file mode 100644
index 0000000..d395b20
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/PutUserInfoDTO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PutUserInfoDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 修改用戶信息请求参数
+ * @author: hans
+ * @date: 2022/01/08 16:24
+ */
+@Data
+@ApiModel("修改用戶信息请求参数")
+public class PutUserInfoDTO {
+
+ @ApiModelProperty("头像")
+ private String imageUrl;
+
+ @ApiModelProperty("昵称")
+ private String name;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/SetPopularForGameDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/SetPopularForGameDTO.java
new file mode 100644
index 0000000..72ff4f7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/SetPopularForGameDTO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: SetPopularForGameDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 设为/取消游戏热门请求参数
+ * @author: hans
+ * @date: 2021/12/30 16:29
+ */
+@Data
+@ApiModel("设为/取消游戏热门请求参数")
+public class SetPopularForGameDTO {
+
+ @ApiModelProperty(value = "处理类型（1.设为热门 2.取消热门）", required = true, allowableValues = "1,2")
+ @NotNull(message = "处理类型不能为空")
+ private Integer type;
+
+ @ApiModelProperty(value = "游戏id", required = true)
+ @NotNull(message = "游戏id不能为空")
+ private Long gameId;
+
+ @ApiModelProperty(value = "处理人", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/SetShelfForGameDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/SetShelfForGameDTO.java
new file mode 100644
index 0000000..a4927c4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/SetShelfForGameDTO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: SetPopularForGameDTO1
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 上架/下架戳戳游戏请求参数
+ * @author: hans
+ * @date: 2021/12/30 16:43
+ */
+@Data
+@ApiModel("上架/下架戳戳游戏请求参数")
+public class SetShelfForGameDTO {
+
+ @ApiModelProperty(value = "处理类型（1.上架 2.下架）", required = true, allowableValues = "1,2")
+ @NotNull(message = "处理类型不能为空")
+ private Integer type;
+
+ @ApiModelProperty(value = "游戏id", required = true)
+ @NotNull(message = "游戏id不能为空")
+ private Long gameId;
+
+ @ApiModelProperty(value = "处理人", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/SetShelfForInfoDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/SetShelfForInfoDTO.java
new file mode 100644
index 0000000..30ddeb6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/SetShelfForInfoDTO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: SetShelfForInfoDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 上架/下架戳戳资讯请求参数
+ * @author: hans
+ * @date: 2021/12/30 17:45
+ */
+@Data
+@ApiModel("上架/下架戳戳资讯请求参数")
+public class SetShelfForInfoDTO {
+
+ @ApiModelProperty(value = "处理类型（1.上架 2.下架）", required = true, allowableValues = "1,2")
+ @NotNull(message = "处理类型不能为空")
+ private Integer type;
+
+ @ApiModelProperty(value = "资讯id", required = true)
+ @NotNull(message = "资讯id不能为空")
+ private Long infoId;
+
+ @ApiModelProperty(value = "处理人", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/SetShelfForProductDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/SetShelfForProductDTO.java
new file mode 100644
index 0000000..b8132b5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/SetShelfForProductDTO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.dtos.community.microCommercialStreet;
+
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: SetShelfForProductDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 上架/下架产品信息请求参数
+ * @author: hans
+ * @date: 2022/01/05 11:27
+ */
+@Data
+@ApiModel("上架/下架产品信息请求参数")
+public class SetShelfForProductDTO {
+
+ @ApiModelProperty(value = "处理类型（1.上架 2.下架）", required = true, allowableValues = "1,2")
+ @NotNull(message = "处理类型不能为空")
+ private Integer type;
+
+ @ApiModelProperty(value = "产品id列表", required = true)
+ @NotEmpty(message = "产品id列表不能为空")
+ private List<Long> productIds;
+
+ @ApiModelProperty(value = "处理人", hidden = true)
+ private Long updatedBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/questnaire/StatisticsSummaryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/questnaire/StatisticsSummaryDTO.java
new file mode 100644
index 0000000..828d1b8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/questnaire/StatisticsSummaryDTO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.dtos.community.questnaire;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("统计汇总请求参数")
+public class StatisticsSummaryDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "调查问卷id")
+ private Long questId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/NearbyDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/NearbyDTO.java
new file mode 100644
index 0000000..3629871
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/NearbyDTO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.dtos.community.rentingHouses;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class NearbyDTO {
+ @ApiModelProperty("经度")
+ private String longitude;
+ @ApiModelProperty("纬度")
+ private String latitude;
+ @ApiModelProperty("距离(千米)")
+ private Integer distance;
+ @ApiModelProperty("关键字")
+ private String keyword;
+ @ApiModelProperty("社区id")
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/PageRentingHouseRegisterDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/PageRentingHouseRegisterDTO.java
new file mode 100644
index 0000000..b54050f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/PageRentingHouseRegisterDTO.java
@@ -0,0 +1,91 @@
+package com.panzhihua.common.model.dtos.community.rentingHouses;
+
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @title: PageRentingHouseRegisterDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询房屋租赁信息
+ * @author: hans
+ * @date: 2021/11/24 16:07
+ */
+@Data
+@ApiModel("分页查询房屋租赁信息请求参数")
+public class PageRentingHouseRegisterDTO {
+
+ @ApiModelProperty(value = "关键字")
+ private String keyword;
+
+ @ApiModelProperty(value = "户型（室数量）")
+ private Integer brn;
+
+ @ApiModelProperty(value = "更多户型（x室以上此值应传入1）")
+ private Integer moreBrn;
+
+ @ApiModelProperty(value = "装修情况（1.毛坯房 2.简装 3.精装修）")
+ private Integer decoration;
+
+ @ApiModelProperty(value = "朝向（1.东 2.南 3.西 4.北 5.东南 6.东北 7.西南 8.西北 9.南北 10.东西）")
+ private Integer orientation;
+
+ @ApiModelProperty(value = "最小面积")
+ private BigDecimal minArea;
+
+ @ApiModelProperty(value = "最大面积")
+ private BigDecimal maxArea;
+
+ @ApiModelProperty(value = "最低租金")
+ private BigDecimal minRentMoney;
+
+ @ApiModelProperty(value = "最高租金")
+ private BigDecimal maxRentMoney;
+
+ @ApiModelProperty(value = "房屋状态(1、待发布 2、待出租 3、出租中 4、已退租")
+ @NotNull(message = "房屋状态不能为空")
+ private Integer status;
+
+ @ApiModelProperty(value = "1、待认证 2、待发布 3、待出租 4、保留中 5、出租中 6、已超时 7、已到期）")
+ private Integer detailStatus;
+
+ @ApiModelProperty(value = "到期时间-起")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date expireDateBegin;
+
+ @ApiModelProperty(value = "到期时间-止")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date expireDateEnd;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("排序条件 1距离远到近 2 近到远 3 租金高到低 4 租金低到高")
+ private Integer sort;
+
+ @ApiModelProperty(value = "房屋的经度")
+ private String longitude;
+
+ @ApiModelProperty(value = "房屋的纬度")
+ private String latitude;
+
+ @ApiModelProperty("我的房源时传入1")
+ private Integer isMy;
+
+ @ApiModelProperty(value = "当前用户id", hidden = true)
+ private Long currentUserId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/PageRentingHousesConfigDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/PageRentingHousesConfigDTO.java
new file mode 100644
index 0000000..87b2adc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/PageRentingHousesConfigDTO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.dtos.community.rentingHouses;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageRentingHousesConfigDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description:
+ * @author: hans
+ * @date: 2021/11/23 13:42
+ */
+@Data
+@ApiModel("分页查询房屋租赁配置请求参数")
+public class PageRentingHousesConfigDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ private Long pageSize;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/ReleaseOrCancelHouseDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/ReleaseOrCancelHouseDTO.java
new file mode 100644
index 0000000..3653375
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/ReleaseOrCancelHouseDTO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.dtos.community.rentingHouses;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ReleaseOrCancelHouseDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 发布/取消发布 房源信息请求参数
+ * @author: hans
+ * @date: 2021/11/25 11:10
+ */
+@Data
+@ApiModel("发布/取消发布 房源信息请求参数")
+public class ReleaseOrCancelHouseDTO {
+
+ @ApiModelProperty(value = "请求类型（1.发布 2.取消）", allowableValues = "1,2", required = true)
+ @NotNull(message = "请求类型不能为空")
+ @Min(1)
+ @Max(2)
+ private Integer type;
+
+ @ApiModelProperty(value = "房源登记id", required = true)
+ @NotNull(message = "房源登记id不能为空")
+ private Long registerId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/RentingHouseRegisterDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/RentingHouseRegisterDTO.java
new file mode 100644
index 0000000..68022ef
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/RentingHouseRegisterDTO.java
@@ -0,0 +1,175 @@
+package com.panzhihua.common.model.dtos.community.rentingHouses;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: RentingHouseRegisterDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 房源登记请求类
+ * @author: hans
+ * @date: 2021/11/24 10:26
+ */
+@Data
+@ApiModel("房源登记请求类")
+public class RentingHouseRegisterDTO {
+
+ @ApiModelProperty("id")
+ @NotNull(groups = PutGroup.class, message = "id不能为空")
+ private Long id;
+
+ @ApiModelProperty(value = "地址")
+ @NotBlank(groups = AddGroup.class, message = "地址不能为空")
+ private String address;
+
+ @ApiModelProperty(value = "小区名称")
+ @NotBlank(groups = AddGroup.class, message = "小区名称不能为空")
+ private String villageName;
+
+ @ApiModelProperty(value = "街/路/巷")
+ @NotBlank(groups = AddGroup.class, message = "街/路/巷不能为空")
+ private String alley;
+
+ @ApiModelProperty(value = "街/路/巷号")
+ @NotBlank(groups = AddGroup.class, message = "街/路/巷号不能为空")
+ private String houseNum;
+
+ @ApiModelProperty(value = "楼栋号")
+ private String buildingNo;
+
+ @ApiModelProperty(value = "单元号")
+ private String unitNo;
+
+ @ApiModelProperty(value = "楼层号")
+ private String floor;
+
+ @ApiModelProperty(value = "户室（房间号）")
+ private String houseNo;
+
+ @ApiModelProperty(value = "看房电话")
+ @Pattern(groups = {AddGroup.class}, message = "看房电话格式错误", regexp = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$")
+ private String seeHourseTelephone;
+
+ @ApiModelProperty(value = "租房标题")
+ @NotBlank(groups = AddGroup.class, message = "租房标题不能为空")
+ private String title;
+
+ @ApiModelProperty(value = "室数量")
+ @NotNull(groups = {AddGroup.class}, message = "室数量不能为空")
+ private Integer brn;
+
+ @ApiModelProperty(value = "厅数量")
+ @NotNull(groups = {AddGroup.class}, message = "厅数量不能为空")
+ private Integer lrn;
+
+ @ApiModelProperty(value = "卫数量")
+ @NotNull(groups = {AddGroup.class}, message = "卫数量不能为空")
+ private Integer wcn;
+
+ @ApiModelProperty(value = "月租金")
+ @NotNull(groups = {AddGroup.class}, message = "月租金不能为空")
+ private BigDecimal monthlyRentMoney;
+
+ @ApiModelProperty(value = "保证金")
+ @NotNull(groups = {AddGroup.class}, message = "保证金不能为空")
+ private BigDecimal depositMoney;
+
+ @ApiModelProperty(value = "服务费")
+ @NotNull(groups = {AddGroup.class}, message = "服务费不能为空")
+ private BigDecimal serverCharge;
+
+ @ApiModelProperty(value = "定金")
+ @NotNull(groups = {AddGroup.class}, message = "定金不能为空")
+ private BigDecimal dingMoney;
+
+ @ApiModelProperty(value = "建筑面积")
+ private BigDecimal constructArea;
+
+ @ApiModelProperty(value = "总楼层")
+ @NotBlank(groups = AddGroup.class, message = "总楼层不能为空")
+ private String totalFloor;
+
+ @ApiModelProperty(value = "朝向（1东2南3西4北5东南6东北7西南8西北9南北10东西）")
+ private Integer orientation;
+
+ @ApiModelProperty(value = "装修情况（1.毛坯房 2.简装 3.精装修）")
+ @NotNull(groups = {AddGroup.class}, message = "装修情况不能为空")
+ private Integer decoration;
+
+ @ApiModelProperty(value = "看房时间（1.随时看房 2.提前预约）")
+ @NotNull(groups = {AddGroup.class}, message = "看房时间不能为空")
+ private Integer seeHourseDate;
+
+ @ApiModelProperty(value = "房源介绍")
+ private String hourseDescription;
+
+ @ApiModelProperty(value = "入住要求")
+ private String checkInRequirement;
+
+ @ApiModelProperty(value = "房内物品")
+ private String hourseItem;
+
+ @ApiModelProperty(value = "房屋标签（多个逗号隔开）")
+ private String label;
+
+ @ApiModelProperty(value = "房主姓名")
+ @NotBlank(groups = AddGroup.class, message = "房主姓名不能为空")
+ private String hourseOwnerName;
+
+ @ApiModelProperty(value = "房主身份证")
+ @NotBlank(groups = AddGroup.class, message = "房主身份证不能为空")
+ private String hourseIdCard;
+
+ @ApiModelProperty(value = "房主电话")
+ @Pattern(groups = {AddGroup.class}, message = "房主电话格式错误", regexp = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$")
+ private String hoursePhone;
+
+ @ApiModelProperty(value = "房屋的经度")
+ @NotBlank(groups = AddGroup.class, message = "房屋的经度不能为空")
+ private String longitude;
+
+ @ApiModelProperty(value = "房屋的纬度")
+ @NotBlank(groups = AddGroup.class, message = "房屋的纬度不能为空")
+ private String latitude;
+
+ @ApiModelProperty(value = "房源图片")
+ private List<String> housePictures;
+
+ @ApiModelProperty(value = "产权证明")
+ @NotEmpty(groups = {AddGroup.class}, message = "产权证明不能为空")
+ private List<String> propertyPictures;
+
+ @ApiModelProperty(value = "证件照片")
+ @NotEmpty(groups = {AddGroup.class}, message = "证件照片不能为空")
+ private List<String> credentialsPictures;
+
+ @ApiModelProperty(value = "当前用户", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "认证状态（1、未认证2、已认证）", hidden = true)
+ private Integer authStatus;
+
+ @ApiModelProperty(value = "1、待认证2、待发布3、待出租4、保留中 5出租中6、已超时7、已到期）", hidden = true)
+ private Integer detailStatus;
+
+ @ApiModelProperty(value = "房东的用户ID，用户表记录了房东的详细信息", hidden = true)
+ private Long hourseOwnerUserId;
+
+ @ApiModelProperty(value = "areaCode", hidden = true)
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/RentingHousesConfigDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/RentingHousesConfigDTO.java
new file mode 100644
index 0000000..547a64a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/rentingHouses/RentingHousesConfigDTO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.dtos.community.rentingHouses;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: RentingHousesConfigDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 房屋租赁配置请求参数
+ * @author: hans
+ * @date: 2021/11/23 13:54
+ */
+@Data
+@ApiModel("房屋租赁配置请求参数")
+public class RentingHousesConfigDTO {
+
+ @ApiModelProperty("id")
+ @NotNull(message = "id不能为空")
+ private Long id;
+
+ @ApiModelProperty("配置内容（标签类型用逗号隔开）")
+ @NotBlank(message = "配置内容为空")
+ private String value;
+
+ @ApiModelProperty(value = "当前用户", hidden = true)
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/AddReserveAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/AddReserveAdminDTO.java
new file mode 100644
index 0000000..148c085
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/AddReserveAdminDTO.java
@@ -0,0 +1,49 @@
+package com.panzhihua.common.model.dtos.community.reserve;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("新增预约登记请求参数")
+public class AddReserveAdminDTO {
+
+ @ApiModelProperty(value = "类型(1.预约 2.登记)")
+ private Integer type;
+
+ @ApiModelProperty(value = "主题")
+ private String title;
+
+ @ApiModelProperty(value = "数量上限数量（如果不限制数量，这里传0）")
+ private Integer joinAllCount;
+
+ @ApiModelProperty(value = "图标类型（1.预设1 2.预设2 3.预设3 4.预设4 5.用户自定义图片）")
+ private Integer imgType;
+
+ @ApiModelProperty(value = "图标url（当img_type为5时，此字段的值为图标url地址）")
+ private String imgUrl;
+
+ @ApiModelProperty("广告顶部（1.是 2.否）")
+ private Integer adverPositionTop;
+
+ @ApiModelProperty("广告应用（1.是 2.否）")
+ private Integer adverPositionApplication;
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty("是否可重复提交（1.是 2.否）")
+ private Integer isRepeat;
+
+ @ApiModelProperty("组件json数据")
+ private String jsonObject;
+
+ @ApiModelProperty("是否发布（1.是 2.否）")
+ private Integer isPublish = 2;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/CancelReserveRecordDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/CancelReserveRecordDTO.java
new file mode 100644
index 0000000..fb2c74c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/CancelReserveRecordDTO.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.dtos.community.reserve;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("取消预约登记请求参数")
+public class CancelReserveRecordDTO {
+
+ @ApiModelProperty(value = "需要取消的预约记录id集合")
+ private List<Long> ids;
+
+ @ApiModelProperty(value = "取消原因")
+ private String remark;
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/ComActReserveMakeStatisticsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/ComActReserveMakeStatisticsDTO.java
new file mode 100644
index 0000000..4b55e05
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/ComActReserveMakeStatisticsDTO.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.model.dtos.community.reserve;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("查询预约统计汇总数据请求参数")
+public class ComActReserveMakeStatisticsDTO {
+
+ @ApiModelProperty(value = "开始时间查询")
+ private String startTime;
+
+ @ApiModelProperty(value = "结束时间查询")
+ private String endTime;
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/ComActReserveRegisterStatisticsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/ComActReserveRegisterStatisticsDTO.java
new file mode 100644
index 0000000..16e0b1d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/ComActReserveRegisterStatisticsDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.community.reserve;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("查询登记统计汇总数据请求参数")
+public class ComActReserveRegisterStatisticsDTO {
+
+ @ApiModelProperty(value = "开始时间查询")
+ private String startTime;
+
+ @ApiModelProperty(value = "结束时间查询")
+ private String endTime;
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "分页-当前页数",example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数",example = "10")
+ private Long pageSize = 10L;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/EditComActReserveInfoDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/EditComActReserveInfoDTO.java
new file mode 100644
index 0000000..9714f8d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/EditComActReserveInfoDTO.java
@@ -0,0 +1,49 @@
+package com.panzhihua.common.model.dtos.community.reserve;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 继续预约登记请求参数
+ */
+@Data
+@ApiModel("继续预约登记请求参数")
+public class EditComActReserveInfoDTO {
+ @ApiModelProperty(value = "预约登记id")
+ private Long id;
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+ @ApiModelProperty(value = "主题")
+ private String title;
+
+ @ApiModelProperty(value = "数量上限数量（如果不限制数量，这里传0）")
+ private Integer joinAllCount;
+
+ @ApiModelProperty(value = "图标类型（1.预设1 2.预设2 3.预设3 4.预设4 5.用户自定义图片）")
+ private Integer imgType;
+
+ @ApiModelProperty(value = "图标url（当img_type为5时，此字段的值为图标url地址）")
+ private String imgUrl;
+
+ @ApiModelProperty("广告顶部（1.是 2.否）")
+ private Integer adverPositionTop;
+
+ @ApiModelProperty("广告应用（1.是 2.否）")
+ private Integer adverPositionApplication;
+
+ @ApiModelProperty("是否可重复提交（1.是 2.否）")
+ private Integer isRepeat;
+
+ @ApiModelProperty("是否发布（1.是 2.否）")
+ private Integer isPublish;
+
+ /**
+ * 类型（1.继续 2.停止 3.发布）
+ */
+ public interface type{
+ int jx = 1;
+ int tz = 2;
+ int fb = 3;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/EditComActReserveStatusDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/EditComActReserveStatusDTO.java
new file mode 100644
index 0000000..a3b75b4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/EditComActReserveStatusDTO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.dtos.community.reserve;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 修改预约登记状态请求参数
+ */
+@Data
+@ApiModel("修改预约登记状态请求参数")
+public class EditComActReserveStatusDTO {
+ @ApiModelProperty(value = "预约登记id")
+ private Long id;
+ @ApiModelProperty(value = "类型（1.停止 2.发布）")
+ private Integer type;
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ /**
+ * 类型（1.停止 2.发布）
+ */
+ public interface type{
+ int tz = 1;
+ int fb = 2;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/EditDangerBatchDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/EditDangerBatchDTO.java
new file mode 100644
index 0000000..1bf69f5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/EditDangerBatchDTO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.dtos.community.reserve;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("批量设置排查时间")
+public class EditDangerBatchDTO {
+ @ApiModelProperty("id数组")
+ private List<Long> ids;
+ @ApiModelProperty("排查时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date screenTime;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/EditReserveAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/EditReserveAdminDTO.java
new file mode 100644
index 0000000..3cae87d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/EditReserveAdminDTO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.dtos.community.reserve;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("编辑预约登记请求参数")
+public class EditReserveAdminDTO {
+
+ @ApiModelProperty(value = "预约登记id")
+ private Long id;
+
+ @ApiModelProperty(value = "类型(1.预约 2.登记)")
+ private Integer type;
+
+ @ApiModelProperty(value = "主题")
+ private String title;
+
+ @ApiModelProperty(value = "数量上限数量（如果不限制数量，这里传0）")
+ private Integer joinAllCount;
+
+ @ApiModelProperty(value = "图标类型（1.预设1 2.预设2 3.预设3 4.预设4 5.用户自定义图片）")
+ private Integer imgType;
+
+ @ApiModelProperty(value = "图标url（当img_type为5时，此字段的值为图标url地址）")
+ private String imgUrl;
+
+ @ApiModelProperty("广告顶部（1.是 2.否）")
+ private Integer adverPositionTop;
+
+ @ApiModelProperty("广告应用（1.是 2.否）")
+ private Integer adverPositionApplication;
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty("是否可重复提交（1.是 2.否）")
+ private Integer isRepeat;
+
+ @ApiModelProperty("组件json数据")
+ private String jsonObject;
+
+ @ApiModelProperty("是否发布（1.是 2.否）")
+ private Integer isPublish;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/MakeHandleAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/MakeHandleAdminDTO.java
new file mode 100644
index 0000000..30d1e42
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/MakeHandleAdminDTO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.dtos.community.reserve;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("处理预约记录请求参数")
+public class MakeHandleAdminDTO {
+
+ @ApiModelProperty(value = "批量处理id集合")
+ private List<Long> ids;
+
+ @ApiModelProperty(value = "预约成功时间(格式：yyyy-MM-dd HH:mm:ss)")
+ private String makeTime;
+
+ @ApiModelProperty(value = "预约状态（1.同意 2.拒绝）")
+ private Integer isOk;
+
+ @ApiModelProperty(value = "处理备注")
+ private String remark;
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ private String areaCode;
+
+ /**
+ * 预约状态（1.同意 2.拒绝）
+ */
+ public interface isOk{
+ int yes = 1;
+ int no = 2;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveAdminDTO.java
new file mode 100644
index 0000000..7b06149
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveAdminDTO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.dtos.community.reserve;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("分页查询预约登记列表请求参数")
+public class PageReserveAdminDTO {
+
+ @ApiModelProperty(value = "分页-当前页数",example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数",example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "类型(1.预约 2.登记)")
+ private List<Integer> type;
+
+ @ApiModelProperty(value = "状态(1.进行中 2.已停止 3.待发布)")
+ private Integer status;
+
+ @ApiModelProperty(value = "广告位置(1.无 2.首页顶部 3.首页应用)")
+ private Integer advertType;
+
+ @ApiModelProperty(value = "开始时间查询")
+ private String startTime;
+
+ @ApiModelProperty(value = "结束时间查询")
+ private String endTime;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ private String areaCode;
+
+ private Integer isWjw;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveMakeAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveMakeAdminDTO.java
new file mode 100644
index 0000000..ce5ae30
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveMakeAdminDTO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.dtos.community.reserve;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("分页查询预约登记列表请求参数")
+public class PageReserveMakeAdminDTO {
+
+ @ApiModelProperty(value = "分页-当前页数",example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数",example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "预约登记id")
+ private Long reserveId;
+
+ @ApiModelProperty(value = "开始时间查询")
+ private String startTime;
+
+ @ApiModelProperty(value = "结束时间查询")
+ private String endTime;
+
+ @ApiModelProperty(value = "需要导出id集合")
+ private List<Long> ids;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveMakeHandleAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveMakeHandleAdminDTO.java
new file mode 100644
index 0000000..7870b19
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveMakeHandleAdminDTO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.dtos.community.reserve;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("分页查询预约登记列表请求参数")
+public class PageReserveMakeHandleAdminDTO {
+
+ @ApiModelProperty(value = "分页-当前页数",example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数",example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "开始时间查询")
+ private String startTime;
+
+ @ApiModelProperty(value = "结束时间查询")
+ private String endTime;
+
+ @ApiModelProperty(value = "状态集合")
+ private List<Integer> status;
+
+ @ApiModelProperty(value = "预约登记id")
+ private Long reserveId;
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "需要导出的id集合")
+ private List<Long> ids;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveRegisterDetailedAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveRegisterDetailedAdminDTO.java
new file mode 100644
index 0000000..bead420
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveRegisterDetailedAdminDTO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.dtos.community.reserve;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("分页查询预约登记列表请求参数")
+public class PageReserveRegisterDetailedAdminDTO {
+
+ @ApiModelProperty(value = "分页-当前页数",example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数",example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "开始时间查询")
+ private String startTime;
+
+ @ApiModelProperty(value = "结束时间查询")
+ private String endTime;
+
+ @ApiModelProperty(value = "预约登记id")
+ private Long reserveId;
+
+ @ApiModelProperty(value = "关键字")
+ private String keyword;
+
+ @ApiModelProperty(value = "来攀/离攀开始时间")
+ private String beginTime;
+
+ @ApiModelProperty(value = "来攀/离攀结束时间")
+ private String stopTime;
+
+ @ApiModelProperty(value = "类型 1燃气 2防火")
+ private Integer pdfType;
+
+ @ApiModelProperty(value = "省市区")
+ private String area;
+
+ @ApiModelProperty(value = "出发地")
+ private String from;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/ComMediateTypeDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/ComMediateTypeDTO.java
new file mode 100644
index 0000000..c19e9a0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/ComMediateTypeDTO.java
@@ -0,0 +1,98 @@
+package com.panzhihua.common.model.dtos.community.sanshuo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("创建事件类型入参")
+public class ComMediateTypeDTO {
+ /**
+ * 主键
+ */
+ @ApiModelProperty("id,修改时传")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 类型名称
+ */
+ @ApiModelProperty("类型名称")
+ private String name;
+
+ /**
+ * code码
+ */
+ @ApiModelProperty("code码")
+ private String code;
+
+ /**
+ * 父id((根节点为0))
+ */
+ @ApiModelProperty("父id((根节点为0))")
+ private Long parentId;
+
+ /**
+ * 路径(格式 : `pid1`pid2`id` )
+ */
+ @ApiModelProperty("路径(格式 : `pid1`pid2`id` )")
+ private String pathId;
+
+ /**
+ * 所在层级
+ */
+ @ApiModelProperty("所在层级")
+ private Integer levelIndex;
+
+ /**
+ * 排序
+ */
+ @ApiModelProperty("排序")
+ private Integer sort;
+
+ /**
+ * 启用状态(0:停用,1:启用)
+ */
+ @ApiModelProperty("启用状态(false:停用,true:启用)")
+ private Boolean enabled;
+
+ /**
+ * 备注说明
+ */
+ @ApiModelProperty("备注说明")
+ private String remarks;
+
+ /**
+ * 创建者
+ */
+ @ApiModelProperty("创建者")
+ private Long createUser;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ private Date createDate;
+
+ /**
+ * 修改者
+ */
+ @ApiModelProperty("修改者")
+ private Long modifyUser;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ private Date modifyDate;
+
+ /**
+ * 删除标识(0:未删除,1:已删除)
+ */
+ @ApiModelProperty("false:未删除,true:已删除")
+ private Boolean deleteFlag;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/ComSanShuoIndustryCenterDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/ComSanShuoIndustryCenterDTO.java
new file mode 100644
index 0000000..41ab7b9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/ComSanShuoIndustryCenterDTO.java
@@ -0,0 +1,83 @@
+package com.panzhihua.common.model.dtos.community.sanshuo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("业务中心入参")
+public class ComSanShuoIndustryCenterDTO {
+ /**
+ * id
+ */
+ @ApiModelProperty("id,修改时传")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 行业分中心名称
+ */
+ @ApiModelProperty("行业分中心名称")
+ private String name;
+
+ /**
+ * 调解室电话
+ */
+ @ApiModelProperty("调解室电话")
+ private String phone;
+
+ /**
+ * 登录账号
+ */
+ @ApiModelProperty("登录账号")
+ private String account;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty("创建人")
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ private Date updateTime;
+
+ /**
+ * 状态0禁用1启用
+ */
+ @ApiModelProperty("状态0禁用1启用")
+ private Integer status;
+
+ /**
+ * 0删除1正常
+ */
+ @ApiModelProperty("0删除1正常")
+ private Integer delFlag;
+
+ /**
+ * 所属街道id
+ */
+ @ApiModelProperty("所属街道id")
+ private Long streetId;
+
+ @ApiModelProperty("密码")
+ private String password;
+
+ /**
+ * 所属社区id
+ */
+ @ApiModelProperty("所属社区id")
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/ComSanshuoEventDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/ComSanshuoEventDTO.java
new file mode 100644
index 0000000..cd6f5cd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/ComSanshuoEventDTO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.dtos.community.sanshuo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+@Data
+@ApiModel("三说事件查询入参")
+public class ComSanshuoEventDTO {
+
+ /**
+ * 事件类型名称
+ */
+ @ApiModelProperty("事件类型名称")
+ private String name;
+
+ private Integer page;
+
+ private Integer size;
+
+ /**
+ * 0禁用1启用
+ */
+ @ApiModelProperty("0禁用1启用")
+ private Integer status;
+
+ /**
+ * 0删除1正常
+ */
+ @ApiModelProperty("0删除1正常")
+ private Integer delFlag;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/ComSanshuoExpertDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/ComSanshuoExpertDTO.java
new file mode 100644
index 0000000..a2c0389
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/ComSanshuoExpertDTO.java
@@ -0,0 +1,142 @@
+package com.panzhihua.common.model.dtos.community.sanshuo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import javax.validation.Valid;
+import java.util.Date;
+
+@Data
+@ApiModel("添加或修改专家入参")
+@Valid
+public class ComSanshuoExpertDTO {
+ /**
+ * id
+ */
+ @ApiModelProperty("id,修改时传")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 专家级别(1三说会堂2行业分中心3街道4社区)
+ */
+ @ApiModelProperty("专家级别(1三说会堂2行业分中心3街道4社区)")
+ private Integer level;
+
+ /**
+ * 所属社区id
+ */
+ @ApiModelProperty("所属社区id")
+ private Long communityId;
+
+ /**
+ * 工作时间
+ */
+ @ApiModelProperty("工作时间")
+ private String workTime;
+
+ /**
+ * 擅长解决时间类型
+ */
+ @ApiModelProperty("擅长解决时间类型,多类型用,隔开")
+ private String goodAt;
+
+ /**
+ * 姓名
+ */
+ @ApiModelProperty("姓名")
+ private String name;
+
+ /**
+ * 头像
+ */
+ @ApiModelProperty("头像")
+ private String avatar;
+
+ /**
+ * 手机号
+ */
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ /**
+ * 登陆账号
+ */
+ @ApiModelProperty("登陆账号")
+ private String account;
+
+ /**
+ * 登陆密码
+ */
+ @ApiModelProperty("登陆密码")
+ private String password;
+
+ /**
+ * 0禁用1启用
+ */
+ @ApiModelProperty("0禁用1启用默认1")
+ private Integer status;
+
+ /**
+ * 删除状态0已删除1正常
+ */
+ @ApiModelProperty("删除状态0已删除1正常默认1")
+ private Integer delFlag;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty("创建人")
+ private String createBy;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ private Date updateTime;
+
+ /**
+ * 介绍信息
+ */
+ @ApiModelProperty("介绍信息")
+ private String introduction;
+
+ /**
+ * 所属街道id
+ */
+ @ApiModelProperty("所属街道id")
+ private Long streetId;
+
+ /**
+ * 行业分中心id
+ */
+ @ApiModelProperty("行业分中心id")
+ private Long industryCenterId;
+
+ /**
+ * 备用字段1
+ */
+ private String param1;
+
+ /**
+ * 所属单位
+ */
+ @ApiModelProperty("所属单位")
+ private String unit;
+ private String unitId;
+
+ @ApiModelProperty("appId，区分西区或花城")
+ private String appId;
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/IndexDateDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/IndexDateDTO.java
new file mode 100644
index 0000000..68f3cc0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/IndexDateDTO.java
@@ -0,0 +1,18 @@
+package com.panzhihua.common.model.dtos.community.sanshuo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import springfox.documentation.annotations.ApiIgnore;
+
+@Data
+@ApiModel("大屏事件入参(区三说会堂，行业分中心，街道，社区数据)")
+public class IndexDateDTO {
+ @ApiModelProperty("1区三说会堂，2行业分中心，3街道、镇，4社区/村,空为所有")
+ private Integer type;
+ @ApiModelProperty("行业分中心id或街道id或社区id(type=1不传,type=2传行业分中心id,type=3传街道id,type=4传社区id)")
+ private Long id;
+ @ApiModelProperty(hidden = true)
+ private Integer level;
+ private String appId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/HatchAuditProcessDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/HatchAuditProcessDTO.java
new file mode 100644
index 0000000..b213662
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/HatchAuditProcessDTO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.dtos.community.social;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: HatchAuditProcessDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 孵化流程修改
+ * @author: hans
+ * @date: 2022/04/18 17:36
+ */
+@Data
+@ApiModel("孵化流程修改")
+public class HatchAuditProcessDTO {
+
+ @ApiModelProperty("孵化流程")
+ private String process;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageProjectDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageProjectDTO.java
new file mode 100644
index 0000000..690cd55
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageProjectDTO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.dtos.community.social;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageProjectDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询项目数据请求参数
+ * @author: hans
+ * @date: 2022/04/19 15:23
+ */
+@Data
+@ApiModel("分页查询项目数据请求参数")
+public class PageProjectDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1", required = true)
+ @NotNull(message = "分页参数不能为空")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10", required = true)
+ @NotNull(message = "分页参数不能为空")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageProjectSignListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageProjectSignListDTO.java
new file mode 100644
index 0000000..54e0876
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageProjectSignListDTO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.dtos.community.social;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageProjectSignListDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询项目报名列表请求参数
+ * @author: hans
+ * @date: 2022/04/15 13:39
+ */
+@Data
+@ApiModel("分页查询项目报名列表请求参数")
+public class PageProjectSignListDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1", required = true)
+ @NotNull(message = "分页参数不能为空")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10", required = true)
+ @NotNull(message = "分页参数不能为空")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "项目id", example = "1", required = true)
+ @NotNull(message = "项目id不能为空")
+ private Long projectId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageSocialOrgHatchAuditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageSocialOrgHatchAuditDTO.java
new file mode 100644
index 0000000..fda6999
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageSocialOrgHatchAuditDTO.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.dtos.community.social;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageSocialOrgHatchAuditDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询孵化申请请求参数
+ * @author: hans
+ * @date: 2022/04/18 14:34
+ */
+@Data
+@ApiModel("分页查询孵化申请请求参数")
+public class PageSocialOrgHatchAuditDTO {
+
+ @ApiModelProperty(value = "关键字")
+ private String keyword;
+
+ @ApiModelProperty("孵化单位")
+ private Long hatchUnit;
+
+ @ApiModelProperty("孵化单位类型（1.街道 2.社区）")
+ private Integer hatchUnitType;
+
+ @ApiModelProperty("申请状态（1.待审核 2.审核通过 3.已驳回）")
+ private Integer status;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageSocialOrgHatchDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageSocialOrgHatchDTO.java
new file mode 100644
index 0000000..13e765b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/PageSocialOrgHatchDTO.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.dtos.community.social;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageSocialOrgHatchAuditDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询孵化申请请求参数
+ * @author: hans
+ * @date: 2022/04/18 14:34
+ */
+@Data
+@ApiModel("分页查询孵化申请请求参数")
+public class PageSocialOrgHatchDTO {
+
+ @ApiModelProperty(value = "关键字")
+ private String keyword;
+
+ @ApiModelProperty("孵化单位")
+ private Long hatchUnit;
+
+ @ApiModelProperty("孵化单位类型（1.街道 2.社区）")
+ private Integer hatchUnitType;
+
+ @ApiModelProperty("孵化状态（1.孵化中 2.孵化成功）")
+ private Integer status;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/SocialOrgHatchAuditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/SocialOrgHatchAuditDTO.java
new file mode 100644
index 0000000..1ba7ccf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/social/SocialOrgHatchAuditDTO.java
@@ -0,0 +1,64 @@
+package com.panzhihua.common.model.dtos.community.social;
+
+import javax.validation.constraints.NotNull;
+
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: SocialOrgHatchAuditDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 新增/编辑孵化申请请求参数
+ * @author: hans
+ * @date: 2022/04/18 15:18
+ */
+@Data
+@ApiModel("新增/编辑孵化申请请求参数")
+public class SocialOrgHatchAuditDTO {
+
+ @ApiModelProperty("孵化申请id")
+ @NotNull(groups = {PutGroup.class}, message = "孵化申请id不能为空")
+ private Long id;
+
+ @ApiModelProperty("准社会组织名称")
+ private String name;
+
+ @ApiModelProperty("负责人")
+ private String responsibility;
+
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ @ApiModelProperty("孵化单位")
+ private Long hatchUnit;
+
+ @ApiModelProperty("孵化单位类型（1.街道 2.社区）")
+ private Integer hatchUnitType;
+
+ @ApiModelProperty("孵化单位名称")
+ private String hatchUnitName;
+
+ @ApiModelProperty("申请状态（1.待审核 2.审核通过 3.已驳回）")
+ private Integer status;
+
+ @ApiModelProperty("组织介绍")
+ private String introduction;
+
+ @ApiModelProperty("组织标识")
+ private String logo;
+
+ @ApiModelProperty("申请原因")
+ private String applyReason;
+
+ @ApiModelProperty("服务范围")
+ private String serviceScope;
+
+ @ApiModelProperty("驳回原因")
+ private String refuseReason;
+
+ @ApiModelProperty(value = "申请用户", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/switchs/SearchCommunityDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/switchs/SearchCommunityDTO.java
new file mode 100644
index 0000000..edec834
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/switchs/SearchCommunityDTO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.dtos.community.switchs;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("搜索社区请求参数")
+public class SearchCommunityDTO {
+
+ @ApiModelProperty(value = "纬度", required = true)
+ private String latitude;
+
+ @ApiModelProperty(value = "经度", required = true)
+ private String longitude;
+
+ @ApiModelProperty(value = "距离(千米)", required = true)
+ private Integer distance;
+
+ private String areaCode;
+
+ private String appId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/ComActWalletDetailDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/ComActWalletDetailDTO.java
new file mode 100644
index 0000000..6b76506
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/ComActWalletDetailDTO.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.dtos.community.wallet;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("钱包详情返回参数")
+public class ComActWalletDetailDTO {
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/ComActWalletSettlementAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/ComActWalletSettlementAdminDTO.java
new file mode 100644
index 0000000..f25b783
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/ComActWalletSettlementAdminDTO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.dtos.community.wallet;
+
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("用户结算收益请求参数")
+public class ComActWalletSettlementAdminDTO {
+
+ @ApiModelProperty("钱包id")
+ private Long id;
+
+ @ApiModelProperty("结算金额")
+ private BigDecimal settlementAmount;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty(value = "登录用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletAdminDTO.java
new file mode 100644
index 0000000..b5d6e59
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletAdminDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.community.wallet;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("收益结算列表请求参数")
+public class PageComActWalletAdminDTO {
+
+ @ApiModelProperty("用户名称")
+ private String name;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty(value = "社区主键", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletTradeAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletTradeAdminDTO.java
new file mode 100644
index 0000000..ec8977e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletTradeAdminDTO.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.model.dtos.community.wallet;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("收益结算列表请求参数")
+public class PageComActWalletTradeAdminDTO {
+
+ @ApiModelProperty("用户名称")
+ private String name;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty(value = "社区主键", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("交易类型（1.发布随手拍 2.结算）")
+ private Integer type;
+
+ @ApiModelProperty("开始时间")
+ private String startTime;
+
+ @ApiModelProperty("结束时间")
+ private String endTime;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty("排序（1.升序 2.降序）")
+ private Integer sort;
+
+ @ApiModelProperty("变动类型（1.增加 2.减少）")
+ private Integer changeType;
+
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ @ApiModelProperty("关键词")
+ private String keyWord;
+
+ @ApiModelProperty("关键词")
+ private String expenditureKeyWord;
+
+ @ApiModelProperty("奖励内容")
+ private String remark;
+
+ @ApiModelProperty("导出id集合")
+ private List<Long> tradeIds;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletTradeDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletTradeDTO.java
new file mode 100644
index 0000000..9998c47
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletTradeDTO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.dtos.community.wallet;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("钱包详情返回参数")
+public class PageComActWalletTradeDTO {
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ComActWarehouseApplyDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ComActWarehouseApplyDTO.java
new file mode 100644
index 0000000..61d21d3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ComActWarehouseApplyDTO.java
@@ -0,0 +1,54 @@
+package com.panzhihua.common.model.dtos.community.warehouse;
+
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyVO;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComActWarehouseApplyDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 后台物品领用信息
+ * @author: hans
+ * @date: 2021/10/13 14:33
+ */
+@Data
+@ApiModel("后台物品领用信息")
+public class ComActWarehouseApplyDTO {
+
+ @ApiModelProperty("领用人")
+ @Length(groups = {AddGroup.class}, max = 10, message = "领用人最多支持10个字符")
+ private String applyName;
+
+ @ApiModelProperty("联系电话")
+ @Pattern(groups = {AddGroup.class}, message = "联系电话格式错误", regexp = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$")
+ private String applyPhone;
+
+ @ApiModelProperty("领用物品，传入goodsId，goodsNum即可")
+ @NotEmpty(groups = {AddGroup.class}, message = "领用物品不能为空")
+ private List<ComActWarehouseApplyVO> applyItems;
+
+ @ApiModelProperty("遇到的困难")
+ @NotBlank(groups = {AddGroup.class}, message = "困难描述不可为空")
+ @Length(groups = {AddGroup.class}, max = 100, message = "遇到的困难最多支持100个字符")
+ private String reason;
+
+ @ApiModelProperty("领用图片")
+ private String receiveUrl;
+
+ @ApiModelProperty(value = "操作人id", hidden = true)
+ private Long operateUserId;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ComActWarehouseDonatesDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ComActWarehouseDonatesDTO.java
new file mode 100644
index 0000000..85bacf3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ComActWarehouseDonatesDTO.java
@@ -0,0 +1,72 @@
+package com.panzhihua.common.model.dtos.community.warehouse;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComActWarehouseDonatesDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 新增/编辑物品捐赠
+ * @author: hans
+ * @date: 2021/10/11 14:18
+ */
+@Data
+@ApiModel("新增/编辑物品捐赠")
+public class ComActWarehouseDonatesDTO {
+
+ @ApiModelProperty("捐赠物品ID")
+ @NotNull(groups = {PutGroup.class}, message = "捐赠物品ID不能为空")
+ private Long id;
+
+ @ApiModelProperty("捐赠用户")
+ @Length(groups = {AddGroup.class}, max = 10, message = "捐赠用户最多支持10个字符")
+ private String name;
+
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ @ApiModelProperty("捐赠物品")
+ @NotBlank(groups = {AddGroup.class}, message = "捐赠物品不能为空")
+ @Length(groups = {AddGroup.class}, max = 10, message = "捐赠物品名称最多支持10个字符")
+ private String item;
+
+ @ApiModelProperty("捐赠数量")
+ @NotNull(groups = {AddGroup.class}, message = "捐赠数量不能为空")
+ @Min(1)
+ private Integer quantity;
+
+ @ApiModelProperty("物品图片")
+ @NotBlank(groups = {AddGroup.class}, message = "物品图片不能为空")
+ private String image;
+
+ @ApiModelProperty("匿名捐赠（1.是 2.否）")
+ @NotNull(groups = {AddGroup.class}, message = "是否匿名捐赠不能为空")
+ private Integer isAnonymous;
+
+ @ApiModelProperty("留言信息")
+ @Length(groups = {AddGroup.class}, max = 100, message = "留言信息最多支持100个字符")
+ private String message;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "登记人", hidden = true)
+ private Long registerBy;
+
+ @ApiModelProperty(value = "捐赠人用户绑定id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "签收人", hidden = true)
+ private Long signingBy;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ExportDonatesDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ExportDonatesDTO.java
new file mode 100644
index 0000000..6380be4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ExportDonatesDTO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.dtos.community.warehouse;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ExportDonatesDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 捐赠物品导出请求参数
+ * @author: hans
+ * @date: 2021/10/11 11:09
+ */
+@Data
+@ApiModel("捐赠物品导出请求参数")
+public class ExportDonatesDTO {
+
+ @ApiModelProperty(value = "批量勾选时传参数组")
+ private List<Long> ids;
+
+ @ApiModelProperty("关键词")
+ private String keyword;
+
+ @ApiModelProperty("捐赠状态（1.待签收 2.已签收 3.已取消）")
+ private Integer status;
+
+ @ApiModelProperty("是否匿名捐赠（1.是 2.否）")
+ private Integer isAnonymous;
+
+ @ApiModelProperty("签收时间-起")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date signingAtBegin;
+
+ @ApiModelProperty("签收时间-止")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date signingAtEnd;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/PageDonatesDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/PageDonatesDTO.java
new file mode 100644
index 0000000..5b90338
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/PageDonatesDTO.java
@@ -0,0 +1,60 @@
+package com.panzhihua.common.model.dtos.community.warehouse;
+
+import java.util.Date;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageDonatesDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询捐赠物品请求参数
+ * @author: hans
+ * @date: 2021/10/11 13:56
+ */
+@Data
+@ApiModel("分页查询捐赠物品请求参数")
+public class PageDonatesDTO {
+
+ @ApiModelProperty("关键词")
+ private String keyword;
+
+ @ApiModelProperty("捐赠状态（1.待签收 2.已签收 3.已取消）")
+ private Integer status;
+
+ @ApiModelProperty("是否匿名捐赠（1.是 2.否）")
+ private Integer isAnonymous;
+
+ @ApiModelProperty("签收时间-起")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date signingAtBegin;
+
+ @ApiModelProperty("签收时间-止")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date signingAtEnd;
+
+ @ApiModelProperty("小程序使用，1.个人中心捐赠记录 2.捐赠物品管理 3.爱心义仓捐赠列表")
+ private Integer isWhich;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(message = "分页参数不能为空")
+ @Min(value = 1)
+ private Long pageSize;
+
+
+ @ApiModelProperty(value = "当前访问用户", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthGetResultDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthGetResultDTO.java
new file mode 100644
index 0000000..68a2745
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthGetResultDTO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.dtos.elders;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("人脸核身获取结果请求参数")
+public class ComEldersAuthGetResultDTO {
+
+ @NotNull()
+ @ApiModelProperty(value = "用户eidToken")
+ private String eidToken;
+
+ @NotNull()
+ @ApiModelProperty(value = "老人id")
+ private Long authUserId;
+
+ @ApiModelProperty(value = "人脸核身结果数据", hidden = true)
+ private String verificationResult;
+
+ @ApiModelProperty(value = "当前登录用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthPageDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthPageDTO.java
new file mode 100644
index 0000000..e0a271f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthPageDTO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.dtos.elders;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("人脸核身获取结果请求参数")
+public class ComEldersAuthPageDTO {
+
+ @ApiModelProperty(value = "页数大小")
+ private Integer pageSize = 10;
+
+ @ApiModelProperty(value = "页数")
+ private Integer pageNum = 1;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthUserAddAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthUserAddAppDTO.java
new file mode 100644
index 0000000..8688dc3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthUserAddAppDTO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.dtos.elders;
+
+import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
+import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("人脸核身获取结果请求参数")
+@EncryptQueryClass
+public class ComEldersAuthUserAddAppDTO {
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "身份证号码")
+ @EncryptQuery
+ private String idCard;
+
+ @ApiModelProperty(value = "与本人关系(1.父母 2.配偶 3.子女 4.兄弟姐妹 5.祖/外祖父母 6.本人 7.其他)")
+ private Integer relation;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "老人id")
+ private Long elderId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionExchangeRecordDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionExchangeRecordDto.java
new file mode 100644
index 0000000..70a537b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionExchangeRecordDto.java
@@ -0,0 +1,86 @@
+package com.panzhihua.common.model.dtos.equipment;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ApiModel("兑换记录表")
+public class UnionExchangeRecordDto{
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private String id;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private String userId;
+
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNum;
+
+ @ApiModelProperty(value = "商品id")
+ private String goodsId;
+
+ @ApiModelProperty(value = "订单状态（1待发货 2待收货 3待自提 4已完成 5已取消 ）")
+ private String orderType;
+
+ @ApiModelProperty(value = "消费积分")
+ private String consumptionPoints;
+
+ @ApiModelProperty(value = "收件人")
+ private String consignee;
+
+ @ApiModelProperty(value = "收货人手机号")
+ private String consigneePhone;
+
+ @ApiModelProperty(value = "收货地址")
+ private String consigneeAddress;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ @ApiModelProperty(value = "购买数量")
+ private String goodsNum;
+
+ @ApiModelProperty(value = "物流公司")
+ private String logisticsCompany;
+
+ @ApiModelProperty(value = "物流单号")
+ private String logisticsNum;
+
+ @ApiModelProperty(value = "实际支付积分")
+ private String playIntegral;
+
+ @ApiModelProperty(value = "取货方式（1邮寄 2自提）")
+ private String pickUpMethod;
+
+ @ApiModelProperty(value = "自提地址")
+ private String pickUpAddress;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionInspectionDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionInspectionDto.java
new file mode 100644
index 0000000..ebd2efa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionInspectionDto.java
@@ -0,0 +1,109 @@
+package com.panzhihua.common.model.dtos.equipment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+@Data
+@ApiModel("户外劳工站巡查表")
+public class UnionInspectionDto {
+
+ /**
+ * ,主键
+ */
+ @ApiModelProperty(value = "主键")
+ private Integer id;
+
+ /**
+ * 创建人户外劳工站id
+ */
+ @ApiModelProperty(value = "创建人户外劳工站id")
+ private Long createUnionUserId;
+
+ /**
+ * 站点id
+ */
+ @ApiModelProperty(value = "站点id")
+ private Integer siteId;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createUserId;
+
+ /**
+ * 类型（1正常2异常）
+ */
+ @ApiModelProperty(value = "类型（1正常2异常）")
+ private Integer type;
+
+ /**
+ * 内容
+ */
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+ /**
+ * 图片地址
+ */
+ @ApiModelProperty(value = "图片地址")
+ private String url;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private LocalDateTime createAt;
+
+ /**
+ * 标题
+ */
+ @ApiModelProperty(value = "标题")
+ private String title;
+
+ /**
+ * 处理人户外劳工站id
+ */
+ @ApiModelProperty(value = "处理人户外劳工站id")
+ private Integer disposeUnionUserId;
+
+ /**
+ * 处理内容
+ */
+ @ApiModelProperty(value = "处理内容")
+ private String disposeContent;
+
+ /**
+ * 处理时间
+ */
+ @ApiModelProperty(value = "处理时间")
+ private LocalDateTime disposeAt;
+
+ /**
+ * 处理照片地址
+ */
+ @ApiModelProperty(value = "处理照片地址")
+ private String disposeUrl;
+
+ /**
+ * 状态（1未回复2已回复）
+ */
+ @ApiModelProperty(value = "状态（1未接单2已接单3已解决）")
+ private Integer status;
+
+
+ /**
+ * 是否小程序
+ */
+ @ApiModelProperty(value = "是否小程序 1是 0否(后台) 3H5")
+ private Integer isApplets;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionIntegralRecordDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionIntegralRecordDto.java
new file mode 100644
index 0000000..a71374e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionIntegralRecordDto.java
@@ -0,0 +1,76 @@
+package com.panzhihua.common.model.dtos.equipment;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ApiModel("积分明细记录")
+public class UnionIntegralRecordDto implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private String id;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private String userId;
+
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+
+ /**
+ * 积分状态（1开门 2兑换）
+ */
+ @ApiModelProperty(value = "积分状态（1开门 2兑换）")
+ private String integralType;
+
+ /**
+ * 增加1 减少 0
+ */
+ @ApiModelProperty(value = "增加1 减少 0")
+ private String type;
+
+ /**
+ * 积分状态（1开门 2兑换）
+ */
+ @ApiModelProperty(value = "积分")
+ private String integral;
+
+ /**
+ * 用户姓名
+ */
+ @ApiModelProperty(value = "用户姓名")
+ private String usserName;
+
+
+ /**
+ * 用户姓名
+ */
+ @ApiModelProperty(value = "用户手机号")
+ private String phone;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionIntegralSummarizeDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionIntegralSummarizeDto.java
new file mode 100644
index 0000000..6686c9c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionIntegralSummarizeDto.java
@@ -0,0 +1,52 @@
+package com.panzhihua.common.model.dtos.equipment;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ApiModel("用户积分总表")
+public class UnionIntegralSummarizeDto implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private String id;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private String userId;
+
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+
+
+ /**
+ * 积分
+ */
+ @ApiModelProperty(value = "积分")
+ private String allIntegral;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionOutdoorLaborDynamicDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionOutdoorLaborDynamicDto.java
new file mode 100644
index 0000000..0eda280
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionOutdoorLaborDynamicDto.java
@@ -0,0 +1,92 @@
+package com.panzhihua.common.model.dtos.equipment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@ApiModel("总工会-户外劳工站-动态")
+@Data
+public class UnionOutdoorLaborDynamicDto {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ,主键
+ */
+ @ApiModelProperty(value = "主键")
+ private Long id;
+
+ /**
+ * 标题
+ */
+ @ApiModelProperty(value = "标题")
+ private String title;
+
+ /**
+ * 状态 0 待发布 1 已发布
+ */
+ @ApiModelProperty(value = "状态 0 待发布 1 已发布")
+ private Integer status;
+
+ /**
+ * 是否置顶 0 否 1 是
+ */
+ @ApiModelProperty(value = "是否置顶 0 否 1 是")
+ private Integer isTopping;
+
+ /**
+ * 发布时间
+ */
+ @ApiModelProperty(value = " 发布时间")
+ private LocalDateTime publishAt;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private LocalDateTime createAt;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty(value = "修改时间")
+ private LocalDateTime updateAt;
+
+ /**
+ * 动态内容 富文本
+ */
+ @ApiModelProperty(value = "动态内容 富文本")
+ private String content;
+
+ /**
+ * 封面
+ */
+ @ApiModelProperty(value = "封面")
+ private String cover;
+
+ /**
+ * 类型（1.通知公告 2.使用指南 3.工会信息）
+ */
+ @ApiModelProperty(value = "类型（1.通知公告 2.使用指南 3.工会信息）")
+ private Integer type;
+
+ /**
+ * 阅读量
+ */
+ @ApiModelProperty(value = "阅读量")
+ private Integer readNum;
+
+ /**
+ * 图片链接
+ */
+ @ApiModelProperty(value = "图片链接")
+ private String imageUrl;
+
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionOutdoorSiteDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionOutdoorSiteDto.java
new file mode 100644
index 0000000..4367726
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionOutdoorSiteDto.java
@@ -0,0 +1,184 @@
+package com.panzhihua.common.model.dtos.equipment;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+/**
+ * <p>
+ * 总工会户外劳工站
+ * </p>
+ *
+ * @author fengjin
+ * @since 2023-08-23
+ */
+@Data
+@ApiModel("总工会户外劳工站")
+public class UnionOutdoorSiteDto{
+
+ private static final long serialVersionUID = 1L;
+
+ private Integer id;
+
+ /**
+ * 商家名称
+ */
+ @ApiModelProperty(value = "商家名称")
+ private String name;
+
+ /**
+ * 商家logo
+ */
+ @ApiModelProperty(value = "商家logo")
+ private String logo;
+
+ /**
+ * 联系人
+ */
+ @ApiModelProperty(value = "联系人")
+ private String contacts;
+
+ /**
+ * 身份证号
+ */
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+
+ /**
+ * 咨询电话
+ */
+ @ApiModelProperty(value = "咨询电话")
+ private String phone;
+
+ /**
+ * 商家地址
+ */
+ @ApiModelProperty(value = "商家地址")
+ private String address;
+
+ /**
+ * 详细地址
+ */
+ @ApiModelProperty(value = "详细地址")
+ private String detailedAddress;
+
+ /**
+ * 纬度
+ */
+ @ApiModelProperty(value = "主键")
+ private String lat;
+
+ /**
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private String lon;
+
+ /**
+ * 营业开始时间
+ */
+ @ApiModelProperty(value = "营业开始时间")
+ private LocalTime beginAt;
+
+ /**
+ * 营业结束时间
+ */
+ @ApiModelProperty(value = "营业结束时间")
+ private LocalTime endAt;
+
+ /**
+ * 商家介绍
+ */
+ @ApiModelProperty(value = "商家介绍")
+ private String introduction;
+
+ /**
+ * 是否营业中
+ */
+ @ApiModelProperty(value = "是否营业中")
+ private Boolean businessStatus;
+
+ /**
+ * 商家绑定账户id
+ */
+ @ApiModelProperty(value = "商家绑定账户id")
+ private Long userId;
+
+ /**
+ * 咨询量
+ */
+ @ApiModelProperty(value = "咨询量")
+ private Integer consultationVolume;
+
+ /**
+ * 浏览量
+ */
+ @ApiModelProperty(value = "浏览量")
+ private Integer viewNum;
+
+ /**
+ * 是否删除
+ */
+ @ApiModelProperty(value = "是否删除")
+ private Boolean isDel;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private LocalDateTime createdAt;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createdBy;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ private LocalDateTime updatedAt;
+
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人")
+ private Long updatedBy;
+
+ /**
+ * 区域编码
+ */
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
+
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String mobilePhone;
+
+ /**
+ * 关键词
+ */
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ /**
+ * 服务范围
+ */
+ @ApiModelProperty(value = "服务范围")
+ private String serviceRange;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionReportDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionReportDto.java
new file mode 100644
index 0000000..03aedd9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionReportDto.java
@@ -0,0 +1,113 @@
+package com.panzhihua.common.model.dtos.equipment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@ApiModel("户外劳工站上报表")
+public class UnionReportDto {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ,主键
+ */
+ @ApiModelProperty(value = "主键")
+ private Integer id;
+
+ /**
+ * 创建人户外劳工站id
+ */
+ @ApiModelProperty(value = "创建人户外劳工站id")
+ private Long createUnionUserId;
+
+ /**
+ * 站点id
+ */
+ @ApiModelProperty(value = "站点id")
+ private Integer siteId;
+
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createUserId;
+
+
+ /**
+ * 类型(1意见反馈2故障保修)
+ */
+ @ApiModelProperty(value = "类型(1意见反馈2故障保修)")
+ private Integer type;
+
+ /**
+ * 内容
+ */
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+ /**
+ * 图片地址
+ */
+ @ApiModelProperty(value = "图片地址")
+ private String url;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private LocalDateTime createAt;
+
+ /**
+ * 标题
+ */
+ @ApiModelProperty(value = "标题")
+ private String title;
+
+ /**
+ * 处理人户外劳工站id
+ */
+ @ApiModelProperty(value = "处理人户外劳工站id")
+ private Integer disposeUnionUserId;
+
+ /**
+ * 处理内容
+ */
+ @ApiModelProperty(value = "处理内容")
+ private String disposeContent;
+
+ /**
+ * 处理时间
+ */
+ @ApiModelProperty(value = "处理时间")
+ private LocalDateTime disposeAt;
+
+ /**
+ * 处理照片地址
+ */
+ @ApiModelProperty(value = "处理照片地址")
+ private String disposeUrl;
+
+ /**
+ * 是否小程序
+ */
+ @ApiModelProperty(value = "是否小程序或h5 1是 0否")
+ private Integer isApplets;
+
+ /**
+ * 状态（1未回复2已回复）
+ */
+ @ApiModelProperty(value = "状态（1未回复2已回复）")
+ private Integer status;
+
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionShippingAddressDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionShippingAddressDto.java
new file mode 100644
index 0000000..e6c02bd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionShippingAddressDto.java
@@ -0,0 +1,72 @@
+package com.panzhihua.common.model.dtos.equipment;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ApiModel("收货地址")
+public class UnionShippingAddressDto implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private String id;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private String userId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+
+ @ApiModelProperty(value = "收货地址")
+ private String address;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ @ApiModelProperty(value = "收货人手机号")
+ private String phone;
+
+ @ApiModelProperty(value = "收货人姓名")
+ private String name;
+
+ @ApiModelProperty(value = "是否默认(0 不是 1是)")
+ private String isDefault;
+
+ @ApiModelProperty(value = "性别（0 女士 1先生）")
+ private String gender;
+
+ @ApiModelProperty(value = "楼号门牌")
+ private String houseNum;
+
+ @ApiModelProperty(value = "收货城市")
+ private String city;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionStoreDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionStoreDto.java
new file mode 100644
index 0000000..e447c1e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionStoreDto.java
@@ -0,0 +1,108 @@
+package com.panzhihua.common.model.dtos.equipment;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+@ApiModel("户外劳工站商品参数")
+public class UnionStoreDto implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private String id;
+ /**
+ * 商品名称
+ */
+ @ApiModelProperty(value = "商品名称")
+ private String goodName;
+ /**
+ * 兑换价格
+ */
+ @ApiModelProperty(value = "兑换价格")
+ private String conversionPrice;
+ /**
+ * 库存
+ */
+ @ApiModelProperty(value = "库存")
+ private String stock;
+ /**
+ * 提货方式（1邮寄 2自提 3邮寄/自提）
+ */
+ @ApiModelProperty(value = "提货方式（1邮寄 2自提 3邮寄/自提）")
+ private String pickGoods;
+ /**
+ * 商品图片
+ */
+ @ApiModelProperty(value = "商品图片")
+ private String goodsUrl;
+ /**
+ * 提货地址
+ */
+ @ApiModelProperty(value = "提货地址")
+ private String pickGoodsAddress;
+ /**
+ * 纬度
+ */
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+ /**
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private String lng;
+ /**
+ * 商品内容
+ */
+ @ApiModelProperty(value = "商品内容")
+ private String content;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+ /**
+ * 商品状态（1待审核 2上架 3下架）
+ */
+ @ApiModelProperty(value = "商品状态（1待审核 2上架 3下架）")
+ private String goodsType;
+ /**
+ * 商品编号
+ */
+ @ApiModelProperty(value = "商品编号")
+ private String goodNum;
+
+ /**
+ * 发布人id
+ */
+ @ApiModelProperty(value = "发布人id")
+ private String userId;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "自提时间")
+ private String openingHours;
+
+ @ApiModelProperty(value = "封面")
+ private String goodsCoverUrl;
+
+ @ApiModelProperty(value = "地区名字")
+ private String communityName;
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionUserDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionUserDto.java
new file mode 100644
index 0000000..7ee1428
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/equipment/UnionUserDto.java
@@ -0,0 +1,170 @@
+package com.panzhihua.common.model.dtos.equipment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@ApiModel("总工会户外劳工站")
+public class UnionUserDto {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ /**
+ * （）
+ */
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ /**
+ *商家名称
+ */
+ @ApiModelProperty(value = "商家名称")
+ private String sex;
+
+ /**
+ * 联系方式
+ */
+ @ApiModelProperty(value = "联系方式")
+ private String phone;
+
+ /**
+ * 人员类型（1、普通工会用户 2、巡查人员 3、站点负责人
+ */
+ @ApiModelProperty(value = "人员类型（1、普通工会用户 2、巡查人员 3、站点负责人 ")
+ private String type;
+
+ /**
+ * 删除标识
+ */
+ @ApiModelProperty(value = "删除标识")
+ private Boolean deleteFlag;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private LocalDateTime createAt;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ private LocalDateTime updateAt;
+
+ /**
+ * 修改用户
+ */
+ @ApiModelProperty(value = "修改用户")
+ private Long updateBy;
+
+ /**
+ * 创建用户
+ */
+ @ApiModelProperty(value = "创建用户")
+ private Long createBy;
+
+ /**
+ * 认证照片地址
+ */
+ @ApiModelProperty(value = "认证照片地址")
+ private String certifiedPhotoUrl;
+
+ /**
+ * 微信小程序唯一标识
+ */
+ @ApiModelProperty(value = "微信小程序唯一标识")
+ private String openid;
+
+ /**
+ * 身份证号
+ */
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+
+ /**
+ * 1 启用 2 禁用
+ */
+ @ApiModelProperty(value = "1 启用 2 禁用")
+ private Integer status;
+
+ /**
+ * 账号
+ */
+ @ApiModelProperty(value = "账号")
+ private String account;
+
+ /**
+ * 昵称
+ */
+ @ApiModelProperty(value = "昵称")
+ private String nickName;
+
+ /**
+ * 密码
+ */
+ @ApiModelProperty(value = "密码")
+ private String password;
+
+ /**
+ * 头像
+ */
+ @ApiModelProperty(value = "头像")
+ private String imageUrl;
+
+ /**
+ * 站点id(普通用户为空)
+ */
+ @ApiModelProperty(value = " 站点id(普通用户为空)")
+ private Integer siteId;
+
+ @ApiModelProperty("花城user_id")
+ private Long userId;
+
+
+ /**
+ * 区域编码
+ */
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
+
+ /**
+ * 是否认证
+ */
+ @ApiModelProperty(value = " 是否认证0否1认证")
+ private Integer isAuthenticated;
+
+ /**
+ * 认证图片地址
+ */
+ @ApiModelProperty(value = " 认证图片地址")
+ private String authenticatedUrl;
+
+ /**
+ * 认证图片地址(base_64)
+ */
+ @ApiModelProperty(value = " 认证图片地址(base_64)")
+ private String authenticatedUrlBase;
+
+ /**
+ * 进入方式
+ */
+ @ApiModelProperty(value = "进入方式 1小程序 3H5")
+ private Integer isApplets;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/AddComMngHousePopulationDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/AddComMngHousePopulationDTO.java
new file mode 100644
index 0000000..1c6fc32
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/AddComMngHousePopulationDTO.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 向房屋添加人员请求参数
+ *
+ * @author lyq
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("向房屋添加人员请求参数")
+public class AddComMngHousePopulationDTO {
+
+ @ApiModelProperty(value = "房屋id", required = true)
+ private Long houseId;
+
+ @ApiModelProperty(value = "人员id集合", required = true)
+ private List<Long> populationIds;
+
+ @ApiModelProperty(value = "添加类型（1.户主 2.住户）", required = true)
+ private Integer type;
+
+ /**
+ * 添加类型（1.户主 2.住户）
+ */
+ public interface type {
+ int hz = 1;
+ int zh = 2;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoAddDTO.java
new file mode 100644
index 0000000..e3cf5c2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoAddDTO.java
@@ -0,0 +1,112 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("创建社区活动 》随手拍请求参数")
+public class ComActEasyPhotoAddDTO {
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "发起人id", hidden = false, example = "1")
+ private Long sponsorId;
+
+ @NotBlank()
+ @Length(max = 100)
+ @ApiModelProperty(value = "发生地址", hidden = false, example = "")
+ private String happenAddr;
+
+ @NotBlank(message = "地址备注不能为空")
+ @Length(max = 100)
+ @ApiModelProperty(value = "地址备注", hidden = false, example = "")
+ private String addrRemark;
+
+ @NotNull()
+ @Max(127)
+ @ApiModelProperty(value = "状态 1待处理 2已处理", hidden = false, example = "1")
+ private Integer status;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "处理人id", hidden = false, example = "1")
+ private Long handlerId;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "审核时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date examineAt;
+
+ @Length(max = 65535)
+ @ApiModelProperty(value = "详情", hidden = false, example = "")
+ private String detail;
+
+ @Length(max = 65535)
+ @ApiModelProperty(value = "图片路径列表，逗号分隔", hidden = false, example = "")
+ private String photoPathList;
+
+ @Length(max = 65535)
+ @ApiModelProperty(value = "处理结果", hidden = false, example = "")
+ private String handleResult;
+
+ @Length(max = 65535)
+ @ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔", hidden = false, example = "")
+ private String handlePhotoList;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "社区id", hidden = false, example = "1")
+ private Long communityId;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否匿名发布 0 否 1 是", hidden = false, example = "1")
+ private Integer isHide;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否需要反馈 0 不需要 1 需要", hidden = false, example = "1")
+ private Integer isNeedFeedBack;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "反馈时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date feedbackAt;
+
+ @Length(max = 500)
+ @ApiModelProperty(value = "驳回原因", hidden = false, example = "")
+ private String rejectReason;
+
+ @Length(max = 65535)
+ @ApiModelProperty(value = "封面图片", hidden = false, example = "")
+ private String cover;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否删除 0 否 1 是", hidden = false, example = "1")
+ private Integer delTag;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)", hidden = false, example = "1")
+ private Integer isReport;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否公示(0.否 1.是)", hidden = false, example = "1")
+ private Integer isPublicity;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoDeleteDTO.java
new file mode 100644
index 0000000..bfb14f9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoDeleteDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("删除社区活动 》随手拍请求参数")
+public class ComActEasyPhotoDeleteDTO {
+
+ @ApiModelProperty(value = "自增id", hidden = false, example = "1")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoEditAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoEditAdminDTO.java
new file mode 100644
index 0000000..2b08744
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoEditAdminDTO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 随手拍处理请求参数
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("后台管理随手拍批量操作请求参数")
+public class ComActEasyPhotoEditAdminDTO {
+
+ @ApiModelProperty(value = "随手拍id", required = true)
+ private List<Long> ids;
+
+ @ApiModelProperty(value = "是否公示(0.否 1.是)", hidden = false, example = "1")
+ private Integer isPublicity;
+
+ @ApiModelProperty(value = "1.切换公示状态 2.删除随手拍", required = true)
+ private Integer type;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoEditDTO.java
new file mode 100644
index 0000000..8fca8e4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoEditDTO.java
@@ -0,0 +1,116 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("编辑社区活动 》随手拍请求参数")
+public class ComActEasyPhotoEditDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "自增id", hidden = false, example = "1")
+ private Long id;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "发起人id", hidden = false, example = "1")
+ private Long sponsorId;
+
+ @NotBlank()
+ @Length(max = 100)
+ @ApiModelProperty(value = "发生地址", hidden = false, example = "")
+ private String happenAddr;
+
+ @NotBlank(message = "地址备注不能为空")
+ @Length(max = 100)
+ @ApiModelProperty(value = "地址备注", hidden = false, example = "")
+ private String addrRemark;
+
+ @NotNull()
+ @Max(127)
+ @ApiModelProperty(value = "状态 1待处理 2已处理", hidden = false, example = "1")
+ private Integer status;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "处理人id", hidden = false, example = "1")
+ private Long handlerId;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "审核时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date examineAt;
+
+ @Length(max = 65535)
+ @ApiModelProperty(value = "详情", hidden = false, example = "")
+ private String detail;
+
+ @Length(max = 65535)
+ @ApiModelProperty(value = "图片路径列表，逗号分隔", hidden = false, example = "")
+ private String photoPathList;
+
+ @Length(max = 65535)
+ @ApiModelProperty(value = "处理结果", hidden = false, example = "")
+ private String handleResult;
+
+ @Length(max = 65535)
+ @ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔", hidden = false, example = "")
+ private String handlePhotoList;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "社区id", hidden = false, example = "1")
+ private Long communityId;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否匿名发布 0 否 1 是", hidden = false, example = "1")
+ private Integer isHide;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否需要反馈 0 不需要 1 需要", hidden = false, example = "1")
+ private Integer isNeedFeedBack;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "反馈时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date feedbackAt;
+
+ @Length(max = 500)
+ @ApiModelProperty(value = "驳回原因", hidden = false, example = "")
+ private String rejectReason;
+
+ @Length(max = 65535)
+ @ApiModelProperty(value = "封面图片", hidden = false, example = "")
+ private String cover;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否删除 0 否 1 是", hidden = false, example = "1")
+ private Integer delTag;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)", hidden = false, example = "1")
+ private Integer isReport;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否公示(0.否 1.是)", hidden = false, example = "1")
+ private Integer isPublicity;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoHandleDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoHandleDTO.java
new file mode 100644
index 0000000..295c1d4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoHandleDTO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.List;
+
+import javax.validation.constraints.Max;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 随手拍处理请求参数
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("随手拍处理请求参数")
+public class ComActEasyPhotoHandleDTO {
+
+ @ApiModelProperty(value = "随手拍id")
+ private Long id;
+
+ @Length(max = 65535)
+ @ApiModelProperty(value = "处理结果", hidden = false, example = "")
+ private String handleResult;
+
+ @Length(max = 65535)
+ @ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔", hidden = false, example = "")
+ private String handlePhotoList;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否公示(1.是 2.否)", hidden = false, example = "1")
+ private Integer isPublicity;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long handlerId;
+
+ @ApiModelProperty(value = "随手拍类型id集合")
+ private List<Long> easyTypeIds;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeAddDTO.java
new file mode 100644
index 0000000..96ec399
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeAddDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("创建随手拍类型请求参数")
+public class ComActEasyPhotoTypeAddDTO {
+
+ @Length(max = 50)
+ @ApiModelProperty(value = "随手拍类型名称", hidden = false, example = "")
+ private String name;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeDeleteDTO.java
new file mode 100644
index 0000000..c000614
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeDeleteDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("删除随手拍类型请求参数")
+public class ComActEasyPhotoTypeDeleteDTO {
+
+ @ApiModelProperty(value = "主键id", hidden = false, example = "1")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeEditDTO.java
new file mode 100644
index 0000000..b953821
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeEditDTO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("编辑随手拍类型请求参数")
+public class ComActEasyPhotoTypeEditDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "主键id", hidden = false, example = "1")
+ private Long id;
+
+ @Length(max = 50)
+ @ApiModelProperty(value = "随手拍类型名称", hidden = false, example = "")
+ private String name;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComMngVillageListAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComMngVillageListAppDTO.java
new file mode 100644
index 0000000..f790594
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComMngVillageListAppDTO.java
@@ -0,0 +1,66 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 小区列表-请求参数
+ *
+ * @author lyq
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("小区列表-请求参数")
+public class ComMngVillageListAppDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "小区名称")
+ private String name;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "社区id", hidden = true, example = "1")
+ private Long communityId;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "排序字段, 默认 创建时间：createAt(在住居民数：userSum，楼栋数：buildSum，总户数：houseNum，户籍人口：registerNum)",
+ example = "createAt")
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+
+ @ApiModelProperty(value = "街路巷")
+ private String alley;
+
+ @ApiModelProperty(value = "门牌号")
+ private String houseNum;
+
+ @ApiModelProperty(value = "小区组")
+ private String groupAt;
+
+ @ApiModelProperty(value = "小区地址")
+ private String address;
+
+ @ApiModelProperty(value = "网格id")
+ private Long gridId;
+
+ public String getSortColumns() {
+ // String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return sortAttr;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java
new file mode 100644
index 0000000..7c5c656
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java
@@ -0,0 +1,123 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("事件请求参数")
+public class CommonEventAddDTO {
+
+ @Max(127)
+ @ApiModelProperty(value = "事件分类：1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群上报", hidden = false, example = "1",
+ required = true)
+ @NotNull(message = "事件分类不能为空")
+ private Integer eventType;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "发生时间", hidden = false, example = "2021-05-01 18:05:50", required = true)
+ @NotNull(message = "发生时间不能为空")
+ private Date happenTime;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
+ @NotNull(message = "发生的精度纬度信息不能为空")
+ private String happentLatLng;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生地点-位置备注", hidden = false, example = "")
+ private String happentAddress;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件发生地点", hidden = false, example = "", required = true)
+ private String happenAddress;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "发生区域-网格ID", hidden = false, example = "1", required = true)
+ @NotNull(message = "发生区域-网格ID不能为空")
+ private Long gridId;
+
+ @Length(max = 500, message = "事件描述长度不能超过500")
+ @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
+ @NotNull(message = "事件描述不能为空")
+ private String eventDes;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件类型,逗号隔开", hidden = false, example = "邻里纠纷,土地承包租赁", required = true)
+ @NotNull(message = "事件类型不能为空")
+ private String eventClazz;
+
+ @Max(127)
+ @ApiModelProperty(value = "危险级别:0 (无) 1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
+ @NotNull(message = "危险级别不能为空")
+ private Integer dangerLevel;
+
+ @Max(9999999999L)
+ @Min(value = 0, message = "死亡人数不能为负数")
+ @ApiModelProperty(value = "死亡人数", hidden = false, example = "1", required = true)
+ @NotNull(message = "死亡人数不能为空")
+ private Integer deathsNumber;
+
+ @Max(9999999999L)
+ @Min(value = 0, message = "受伤人数不能为负数")
+ @ApiModelProperty(value = "受伤人数", hidden = false, example = "1", required = true)
+ @NotNull(message = "受伤人数不能为空")
+ private Integer injuriesNumber;
+
+ @ApiModelProperty(value = "是否紧急", hidden = false, example = "true", required = true)
+ @NotNull(message = "是否紧急不能为空")
+ private Boolean urgent;
+
+ @ApiModelProperty(value = "是否重大", hidden = false, example = "true", required = true)
+ @NotNull(message = "是否重大不能为空")
+ private Boolean major;
+
+ @ApiModelProperty(value = "音频(限1个)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
+ private String audio;
+
+ @ApiModelProperty(value = "音频时长(单位：秒)", hidden = false, example = "10")
+ private Integer audioTime;
+
+ @ApiModelProperty(value = "视频(限1个)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
+ private String video;
+
+ @ApiModelProperty(value = "视频时长(单位：秒)", hidden = false, example = "10")
+ private Integer videoTime;
+
+ @ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
+ private String pics;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
+ private String userName;
+ @ApiModelProperty(value = "(当前操作)用户电话", hidden = true, example = "18888888888")
+ @Length(max = 11)
+ private String phone;
+
+ @ApiModelProperty(value = "上报人口id列表,当事件类型为特殊人群上报时此字段不为空", hidden = false)
+ private List<Long> populationIds;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventBatchRepublishDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventBatchRepublishDTO.java
new file mode 100644
index 0000000..5afd11f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventBatchRepublishDTO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 事件重新发布请求参表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("事件重新发布请求参数")
+public class CommonEventBatchRepublishDTO {
+
+ @ApiModelProperty(value = "事件id", hidden = false, example = "1", required = true)
+ @NotNull(message = "事件ID不能为空")
+ private List<String> id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
+ private String userName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventCommunityAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventCommunityAddDTO.java
new file mode 100644
index 0000000..5b853bf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventCommunityAddDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("社区后台添加事件请求参数")
+public class CommonEventCommunityAddDTO extends CommonEventAddDTO {
+
+ @ApiModelProperty(value = "网格员ID", hidden = false, example = "1", required = true)
+ @NotNull(message = "网格员不能为空")
+ private Long gridMemberId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java
new file mode 100644
index 0000000..2ee9e7c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java
@@ -0,0 +1,67 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("事件处理请求参数")
+public class CommonEventDealDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "事件id", hidden = false, example = "1", required = true)
+ @NotNull
+ private Long id;
+
+ @Length(max = 500, message = "办理意见不能超过500个字")
+ @ApiModelProperty(value = "办理意见", hidden = false, example = "", required = true)
+ @NotNull
+ private String processResult;
+
+ @ApiModelProperty(value = "音频(限1个)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
+ private String audio;
+
+ @ApiModelProperty(value = "音频时长(单位：秒)", hidden = false, example = "10")
+ private Integer audioTime;
+
+ @ApiModelProperty(value = "视频(限1个)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
+ private String video;
+
+ @ApiModelProperty(value = "视频时长(单位：秒)", hidden = false, example = "10")
+ private Integer videoTime;
+
+ @ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
+ private String pics;
+
+ @ApiModelProperty(value = "是否验证：社区后台处理时必填", hidden = false, example = "true")
+ private Boolean needVerify;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
+ private String userName;
+
+ @ApiModelProperty(value = "(当前操作)用户类型：0网格员 1 社区后台", hidden = true, example = "1")
+ private Integer operateType;
+ @ApiModelProperty(value = "(当前操作)用户社区ID", hidden = true, example = "1")
+ private Long communityId;
+ @ApiModelProperty(value = "(当前操作)用户社区名称", hidden = true, example = "学园社区")
+ private String communityName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDeleteDTO.java
new file mode 100644
index 0000000..c794b58
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDeleteDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("删除事件请求参数")
+public class CommonEventDeleteDTO {
+
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDirectReportDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDirectReportDTO.java
new file mode 100644
index 0000000..dfe1cbe
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDirectReportDTO.java
@@ -0,0 +1,135 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 上报社区表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("上报社区请求参数")
+public class CommonEventDirectReportDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "事件ID", hidden = false, example = "1")
+ private Long eventId;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "办理意见", hidden = false, example = "", required = true)
+ @NotNull(message = "办理意见不能为空")
+ private String processResult;
+
+ // 事件下游机构或网格员
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "社区ID", hidden = false, example = "1", required = true)
+ @NotNull(message = "社区ID不能为空")
+ private Long toId;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
+ private String userName;
+
+ @ApiModelProperty(value = "(当前操作)用户社区ID", hidden = true, example = "1")
+ private Long communityId;
+
+ @Max(127)
+ @ApiModelProperty(value = "事件分类：1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件", hidden = false, example = "1", required = true)
+ @NotNull(message = "事件分类不能为空")
+ private Integer eventType;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "发生时间", hidden = false, example = "2021-05-01 18:05:50", required = true)
+ @NotNull(message = "发生时间不能为空")
+ private Date happenTime;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
+ @NotNull(message = "发生的精度纬度信息不能为空")
+ private String happentLatLng;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生地点-位置备注", hidden = false, example = "")
+ private String happentAddress;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件发生地点", hidden = false, example = "", required = true)
+ private String happenAddress;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "发生区域-网格ID", hidden = false, example = "1", required = true)
+ @NotNull(message = "发生区域-网格ID不能为空")
+ private Long gridId;
+
+ @Length(max = 500)
+ @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
+ @NotNull(message = "事件描述不能为空")
+ private String eventDes;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件类型,逗号隔开", hidden = false, example = "邻里纠纷,土地承包租赁", required = true)
+ @NotNull(message = "事件类型不能为空")
+ private String eventClazz;
+
+ @Max(127)
+ @ApiModelProperty(value = "危险级别:0 (无) 1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
+ @NotNull(message = "危险级别不能为空")
+ private Integer dangerLevel;
+
+ @Max(9999999999L)
+ @ApiModelProperty(value = "死亡人数", hidden = false, example = "1", required = true)
+ @NotNull(message = "死亡人数不能为空")
+ private Integer deathsNumber;
+
+ @Max(9999999999L)
+ @ApiModelProperty(value = "受伤人数", hidden = false, example = "1", required = true)
+ @NotNull(message = "受伤人数不能为空")
+ private Integer injuriesNumber;
+
+ @ApiModelProperty(value = "是否紧急", hidden = false, example = "true", required = true)
+ @NotNull(message = "是否紧急不能为空")
+ private Boolean urgent;
+
+ @ApiModelProperty(value = "是否重大", hidden = false, example = "true", required = true)
+ @NotNull(message = "是否重大不能为空")
+ private Boolean major;
+
+ @ApiModelProperty(value = "音频(限1个)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
+ private String audio;
+
+ @ApiModelProperty(value = "音频时长(单位：秒)", hidden = false, example = "10")
+ private Integer audioTime;
+
+ @ApiModelProperty(value = "视频(限1个)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
+ private String video;
+
+ @ApiModelProperty(value = "视频时长(单位：秒)", hidden = false, example = "10")
+ private Integer videoTime;
+
+ @ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
+ private String pics;
+
+ @ApiModelProperty(value = "(当前操作)用户电话", hidden = true, example = "18888888888")
+ @Length(max = 11)
+ private String phone;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java
new file mode 100644
index 0000000..ef3ef57
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java
@@ -0,0 +1,125 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("事件编辑请求参数")
+public class CommonEventEditDTO {
+
+ @Max(127)
+ @ApiModelProperty(value = "事件分类：1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群上报", hidden = false, example = "1",
+ required = true)
+ @NotNull(message = "事件分类不能为空")
+ private Integer eventType;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "id,如果是新增则不填", hidden = false, example = "1")
+ private Long id;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "发生时间", hidden = false, example = "2021-05-01 18:05:50", required = true)
+ @NotNull(message = "发生时间不能为空")
+ private Date happenTime;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
+ @NotNull(message = "发生的精度纬度信息不能为空")
+ private String happentLatLng;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生地点-位置备注", hidden = false, example = "")
+ private String happentAddress;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件发生地点", hidden = false, example = "", required = true)
+ private String happenAddress;
+
+ // 位置备注
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "发生区域-网格ID", hidden = false, example = "1", required = true)
+ @NotNull(message = "发生区域-网格ID不能为空")
+ private Long gridId;
+
+ @Length(max = 500)
+ @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
+ @NotNull(message = "事件描述不能为空")
+ private String eventDes;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件类型,逗号隔开", hidden = false, example = "邻里纠纷,土地承包租赁", required = true)
+ @NotNull(message = "事件类型不能为空")
+ private String eventClazz;
+
+ @Max(127)
+ @ApiModelProperty(value = "危险级别:0 (无) 1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
+ @NotNull(message = "危险级别不能为空")
+ private Integer dangerLevel;
+
+ @Max(9999999999L)
+ @ApiModelProperty(value = "死亡人数", hidden = false, example = "1", required = true)
+ @NotNull(message = "死亡人数不能为空")
+ private Integer deathsNumber;
+
+ @Max(9999999999L)
+ @ApiModelProperty(value = "受伤人数", hidden = false, example = "1", required = true)
+ @NotNull(message = "受伤人数不能为空")
+ private Integer injuriesNumber;
+
+ @ApiModelProperty(value = "是否紧急", hidden = false, example = "true", required = true)
+ @NotNull(message = "是否紧急不能为空")
+ private Boolean urgent;
+
+ @ApiModelProperty(value = "是否重大", hidden = false, example = "true", required = true)
+ @NotNull(message = "是否重大不能为空")
+ private Boolean major;
+
+ @ApiModelProperty(value = "音频(限1个)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
+ private String audio;
+
+ @ApiModelProperty(value = "音频时长(单位：秒)", hidden = false, example = "10")
+ private Integer audioTime;
+
+ @ApiModelProperty(value = "视频(限1个)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
+ private String video;
+
+ @ApiModelProperty(value = "视频时长(单位：秒)", hidden = false, example = "10")
+ private Integer videoTime;
+
+ @ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
+ private String pics;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
+ private String userName;
+ @ApiModelProperty(value = "(当前操作)用户电话", hidden = true, example = "18888888888")
+ @Length(max = 11)
+ private String phone;
+
+ @ApiModelProperty(value = "上报人口id列表,当事件类型为特殊人群上报时此字段不为空", hidden = false)
+ private List<Long> populationIds;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventPublicDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventPublicDTO.java
new file mode 100644
index 0000000..94f81ca
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventPublicDTO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 事件重新发布请求参表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("事件重新发布请求参数")
+public class CommonEventPublicDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "事件id", hidden = false, example = "1", required = true)
+ @NotNull(message = "事件ID不能为空")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
+ private String userName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventReportDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventReportDTO.java
new file mode 100644
index 0000000..6de8332
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventReportDTO.java
@@ -0,0 +1,49 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 上报社区表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("上报社区请求参数")
+public class CommonEventReportDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "事件ID", hidden = false, example = "1", required = true)
+ @NotNull(message = "事件ID不能为空")
+ private Long eventId;
+
+ @Length(max = 255, message = "办理意见长度不能超过255")
+ @ApiModelProperty(value = "办理意见", hidden = false, example = "", required = true)
+ @NotNull(message = "办理意见不能为空")
+ private String processResult;
+
+ // 事件下游机构或网格员
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "社区ID", hidden = false, example = "1", required = true)
+ @NotNull(message = "社区ID不能为空")
+ private Long toId;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
+ private String userName;
+
+ @ApiModelProperty(value = "(当前操作)用户社区ID", hidden = true, example = "1")
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventRepublishDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventRepublishDTO.java
new file mode 100644
index 0000000..229060f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventRepublishDTO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 事件重新发布请求参表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("事件重新发布请求参数")
+public class CommonEventRepublishDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "事件id", hidden = false, example = "1", required = true)
+ @NotNull(message = "事件id不能为空")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
+ private String userName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventVerifyDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventVerifyDTO.java
new file mode 100644
index 0000000..700a447
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventVerifyDTO.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("突发事件处理请求参数")
+public class CommonEventVerifyDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "事件id", hidden = false, example = "1")
+ private Long id;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "办理意见", hidden = false, example = "", required = true)
+ @NotNull
+ private String processResult;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
+ private String userName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommunityRepublishEventDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommunityRepublishEventDTO.java
new file mode 100644
index 0000000..da24c66
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommunityRepublishEventDTO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 事件重新发布请求参表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("事件重新发布请求参数")
+public class CommunityRepublishEventDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "事件id", hidden = false, example = "1", required = true)
+ @NotNull(message = "事件id不能为空")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
+ private String userName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/DelComMngHousePopulationDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/DelComMngHousePopulationDTO.java
new file mode 100644
index 0000000..991558c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/DelComMngHousePopulationDTO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 向房屋删除人员请求参数
+ *
+ * @author lyq
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("向房屋删除人员请求参数")
+public class DelComMngHousePopulationDTO {
+
+ @ApiModelProperty(value = "房屋人员关联id", required = true)
+ private Long housePopulationId;
+
+ @ApiModelProperty(value = "添加类型（1.户主 2.住户）", required = true)
+ private Integer type;
+
+ /**
+ * 添加类型（1.户主 2.住户）
+ */
+ public interface type {
+ int hz = 1;
+ int zh = 2;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationAppReleaseAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationAppReleaseAddDTO.java
new file mode 100644
index 0000000..8bc2028
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationAppReleaseAddDTO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("创建APP应用版本信息请求参数")
+public class EventApplicationAppReleaseAddDTO {
+
+ @Max(32767)
+ @ApiModelProperty(value = "应用ID", hidden = false, example = "1")
+ private Integer productId;
+
+ @Length(max = 50)
+ @ApiModelProperty(value = "应用名称", hidden = false, example = "")
+ private String productName;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "版本编号", hidden = false, example = "")
+ private String releaseNumber;
+
+ @Max(32767)
+ @ApiModelProperty(value = "通知行为(1、强制更新2、提示更新)", hidden = false, example = "1")
+ private Integer action;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "版本地址", hidden = false, example = "")
+ private String url;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationAppReleaseDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationAppReleaseDeleteDTO.java
new file mode 100644
index 0000000..dabdbc3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationAppReleaseDeleteDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("删除APP应用版本信息请求参数")
+public class EventApplicationAppReleaseDeleteDTO {
+
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationAppReleaseEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationAppReleaseEditDTO.java
new file mode 100644
index 0000000..23f95da
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationAppReleaseEditDTO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("编辑APP应用版本信息请求参数")
+public class EventApplicationAppReleaseEditDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ private Long id;
+
+ @Max(32767)
+ @ApiModelProperty(value = "应用ID", hidden = false, example = "1")
+ private Integer productId;
+
+ @Length(max = 50)
+ @ApiModelProperty(value = "应用名称", hidden = false, example = "")
+ private String productName;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "版本编号", hidden = false, example = "")
+ private String releaseNumber;
+
+ @Max(32767)
+ @ApiModelProperty(value = "通知行为(1、强制更新2、提示更新)", hidden = false, example = "1")
+ private Integer action;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "版本地址", hidden = false, example = "")
+ private String url;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationUserNoticeAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationUserNoticeAddDTO.java
new file mode 100644
index 0000000..a5bdade
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationUserNoticeAddDTO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("创建用户协议和隐私政策信息请求参数")
+public class EventApplicationUserNoticeAddDTO {
+
+ @Max(32767)
+ @ApiModelProperty(value = "应用ID", hidden = false, example = "1")
+ private Integer productId;
+
+ @Length(max = 50)
+ @ApiModelProperty(value = "应用名称", hidden = false, example = "")
+ private String productName;
+
+ @Max(32767)
+ @ApiModelProperty(value = "通知行为(1、强制通知必须手段确定2、提示更新，自动消退)", hidden = false, example = "1")
+ private Integer action;
+
+ @Length(max = 1000)
+ @ApiModelProperty(value = "内容", hidden = false, example = "")
+ private String content;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationUserNoticeDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationUserNoticeDeleteDTO.java
new file mode 100644
index 0000000..54983bd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationUserNoticeDeleteDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("删除用户协议和隐私政策信息请求参数")
+public class EventApplicationUserNoticeDeleteDTO {
+
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationUserNoticeEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationUserNoticeEditDTO.java
new file mode 100644
index 0000000..4ce0873
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventApplicationUserNoticeEditDTO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("编辑用户协议和隐私政策信息请求参数")
+public class EventApplicationUserNoticeEditDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ private Long id;
+
+ @Max(32767)
+ @ApiModelProperty(value = "应用ID", hidden = false, example = "1")
+ private Integer productId;
+
+ @Length(max = 50)
+ @ApiModelProperty(value = "应用名称", hidden = false, example = "")
+ private String productName;
+
+ @Max(32767)
+ @ApiModelProperty(value = "通知行为(1、强制通知必须手段确定2、提示更新，自动消退)", hidden = false, example = "1")
+ private Integer action;
+
+ @Length(max = 1000)
+ @ApiModelProperty(value = "内容", hidden = false, example = "")
+ private String content;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventBatchRevokeDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventBatchRevokeDTO.java
new file mode 100644
index 0000000..3edfdfb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventBatchRevokeDTO.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("撤销事件请求参数")
+public class EventBatchRevokeDTO {
+
+ @ApiModelProperty(value = "id", hidden = false, example = "1", required = true)
+ @NotNull(message = "事件ID不能为空")
+ private List<String> id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "李四")
+ private String userName;
+
+ @ApiModelProperty(value = "操作人所属社区", hidden = true, example = "学院社区")
+ private String communityName;
+
+ @ApiModelProperty(value = "操作人所属社区", hidden = true, example = "学院社区")
+ private Long communityId;
+
+ @ApiModelProperty(value = "撤销类型 1 网格员 2 社区", hidden = true, example = "1")
+ private Integer revokeType;
+
+ @ApiModelProperty(value = "撤销人/社区ID", hidden = true, example = "1")
+ private Long revokeId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventDeleteDTO.java
new file mode 100644
index 0000000..c8dcdb5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventDeleteDTO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-28
+ */
+@Data
+@ApiModel("删除事件请求参数")
+public class EventDeleteDTO {
+
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ @NotNull(message = "事件ID不能为空")
+ private List<String> id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventDeleteSingleDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventDeleteSingleDTO.java
new file mode 100644
index 0000000..9a96f43
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventDeleteSingleDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-28
+ */
+@Data
+@ApiModel("删除事件请求参数")
+public class EventDeleteSingleDTO {
+
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ @NotNull
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridCascadeListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridCascadeListDTO.java
new file mode 100644
index 0000000..43002bf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridCascadeListDTO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("网格列表级联请求参数")
+public class EventGridCascadeListDTO {
+
+ @ApiModelProperty(value = "类型（1.社区 2.网格）")
+ private Integer type;
+
+ @ApiModelProperty(value = "登陆用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ /**
+ * 类型（1.社区 2.网格）
+ */
+ public interface type {
+ int sq = 1;
+ int wg = 2;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddAdminDTO.java
new file mode 100644
index 0000000..e3cdf84
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddAdminDTO.java
@@ -0,0 +1,69 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 新增网格请求参数
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("新增网格请求参数")
+public class EventGridDataAddAdminDTO {
+
+ @NotBlank()
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格名称", hidden = false, example = "")
+ private String gridName;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "网格描述", hidden = false, example = "")
+ private String remarks;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "面积", hidden = false, example = "")
+ private String area;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格颜色", hidden = false, example = "")
+ private String fillColor;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格边框颜色", hidden = false, example = "")
+ private String lineColor;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格边框宽度", hidden = false, example = "")
+ private String lineBroadband;
+
+ @Length(max = 2147483647)
+ @ApiModelProperty(value = "围栏数据", hidden = false, example = "")
+ private String data;
+
+ @ApiModelProperty(value = "网格员id集合", hidden = false, example = "")
+ private List<Long> memberIds;
+
+ @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
+ private Long gridCommunityId;
+
+ @ApiModelProperty(value = "市平台网格关联id", hidden = false, example = "")
+ private String lcGridId;
+
+ @ApiModelProperty(value = "市平台网格关联名称", hidden = false, example = "")
+ private String lcGridName;
+
+ @ApiModelProperty(value = "当前登录用户id", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddDTO.java
new file mode 100644
index 0000000..16f2fce
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddDTO.java
@@ -0,0 +1,83 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.List;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("创建区县/街道/社区/网格员网格数据管理请求参数")
+public class EventGridDataAddDTO {
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "类型，1、区县网格2街道网格3社区网格", hidden = false, example = "1")
+ private Long type;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "区/县ID", hidden = false, example = "1")
+ private Long zoneId;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
+ private Long gridStreetId;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
+ private Long gridCommunityId;
+
+ @NotBlank()
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格名称", hidden = false, example = "")
+ private String gridName;
+
+ @Max(32767)
+ @ApiModelProperty(value = "所属图层", hidden = false, example = "1")
+ private Integer mapLevel;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "面积", hidden = false, example = "")
+ private String area;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "线条颜色", hidden = false, example = "")
+ private String lineColor;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "线条宽度", hidden = false, example = "")
+ private String lineBroadband;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "填充颜色", hidden = false, example = "")
+ private String fillColor;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "备注", hidden = false, example = "")
+ private String remarks;
+
+ @Length(max = 2147483647)
+ @ApiModelProperty(value = "围栏数据", hidden = false, example = "")
+ private String data;
+
+ @ApiModelProperty(value = "网格员ID", hidden = false, example = "[12,45]")
+ private List<Long> gridMemebers;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataDeleteDTO.java
new file mode 100644
index 0000000..91eb7ac
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataDeleteDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("删除区县/街道/社区/网格员网格数据管理请求参数")
+public class EventGridDataDeleteDTO {
+
+ @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditAdminDTO.java
new file mode 100644
index 0000000..ae008e0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditAdminDTO.java
@@ -0,0 +1,71 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 新增网格请求参数
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("新增网格请求参数")
+public class EventGridDataEditAdminDTO {
+
+ @NotBlank()
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格名称", hidden = false, example = "")
+ private String gridName;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "网格描述", hidden = false, example = "")
+ private String remarks;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "面积", hidden = false, example = "")
+ private String area;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格颜色", hidden = false, example = "")
+ private String fillColor;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格边框颜色", hidden = false, example = "")
+ private String lineColor;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格边框宽度", hidden = false, example = "")
+ private String lineBroadband;
+
+ @Length(max = 2147483647)
+ @ApiModelProperty(value = "围栏数据", hidden = false, example = "")
+ private String data;
+
+ @ApiModelProperty(value = "网格员id集合", hidden = false, example = "")
+ private List<Long> memberIds;
+
+ @ApiModelProperty(value = "网格id", hidden = false, example = "1")
+ private Long gridId;
+
+ @ApiModelProperty(value = "当前登录用户id", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "市平台网格关联id", hidden = false, example = "")
+ private String lcGridId;
+
+ @ApiModelProperty(value = "市平台网格关联名称", hidden = false, example = "")
+ private String lcGridName;
+
+ @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
+ private Long gridCommunityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditDTO.java
new file mode 100644
index 0000000..867d74f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditDTO.java
@@ -0,0 +1,87 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.List;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("编辑区县/街道/社区/网格员网格数据管理请求参数")
+public class EventGridDataEditDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
+ private Long id;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "类型，1、区县网格2街道网格3社区网格", hidden = false, example = "1")
+ private Long type;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "区/县ID", hidden = false, example = "1")
+ private Long zoneId;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
+ private Long gridStreetId;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
+ private Long gridCommunityId;
+
+ @NotBlank()
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格名称", hidden = false, example = "")
+ private String gridName;
+
+ @Max(32767)
+ @ApiModelProperty(value = "所属图层", hidden = false, example = "1")
+ private Integer mapLevel;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "面积", hidden = false, example = "")
+ private String area;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "线条颜色", hidden = false, example = "")
+ private String lineColor;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "线条宽度", hidden = false, example = "")
+ private String lineBroadband;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "填充颜色", hidden = false, example = "")
+ private String fillColor;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "备注", hidden = false, example = "")
+ private String remarks;
+
+ @Length(max = 2147483647)
+ @ApiModelProperty(value = "围栏数据", hidden = false, example = "")
+ private String data;
+
+ @ApiModelProperty(value = "网格员ID", hidden = false, example = "[12,45]")
+ private List<Long> gridMemebers;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberAddDTO.java
new file mode 100644
index 0000000..5b13375
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberAddDTO.java
@@ -0,0 +1,88 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.List;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("创建网格员请求参数")
+public class EventGridMemberAddDTO {
+
+ @NotBlank(message = "账号昵称不能为空")
+ @Length(max = 50)
+ @ApiModelProperty(value = "账号昵称", example = "")
+ private String nickName;
+
+ @NotBlank(message = "登录账号不能为空")
+ @Length(max = 50)
+ @ApiModelProperty(value = "登录账号", hidden = false, example = "")
+ private String account;
+
+ @NotBlank(message = "登录密码不能为空")
+ @Length(min = 8, max = 100)
+ @ApiModelProperty(value = "登录密码", hidden = false, example = "")
+ private String password;
+
+ @NotBlank(message = "联系电话不能为空")
+ @Length(max = 11)
+ @ApiModelProperty(value = "联系电话", hidden = false, example = "")
+ private String phone;
+
+ @NotNull(message = "工作开始时间不能为空")
+ @Max(24)
+ @ApiModelProperty(value = "工作开始时间", hidden = false, example = "")
+ private Integer workStartTime;
+
+ @NotNull(message = "工作结束时间不能为空")
+ @Max(24)
+ @ApiModelProperty(value = "工作结束时间", hidden = false, example = "")
+ private Integer workEndTime;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "头像", hidden = false, example = "")
+ private String imageUrl;
+
+ @ApiModelProperty(value = "账号状态", hidden = false, example = "")
+ private Integer status;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
+ private String userName;
+
+ @ApiModelProperty(value = "社区ID", hidden = true, example = "1")
+ private Long communityId;
+
+ @ApiModelProperty(value = "网格员id", hidden = false, example = "")
+ private Long gridMemberId;
+
+ @ApiModelProperty(value = "市平台网格员关联id")
+ private String lcMemberId;
+
+ @ApiModelProperty(value = "市平台网格员关联名称")
+ private String lcMemberName;
+
+ @ApiModelProperty(value = "市平台网格员关联用户id")
+ private String lcBindUserId;
+
+ @ApiModelProperty(value = "楼栋id集合")
+ private List<Long> buildingIds;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditAdminDTO.java
new file mode 100644
index 0000000..f3b63e6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditAdminDTO.java
@@ -0,0 +1,83 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.List;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("创建网格员请求参数")
+public class EventGridMemberEditAdminDTO {
+
+ @NotBlank(message = "账号昵称不能为空")
+ @Length(max = 50)
+ @ApiModelProperty(value = "账号昵称", example = "")
+ private String nickName;
+
+ @NotBlank(message = "登录账号不能为空")
+ @Length(max = 50)
+ @ApiModelProperty(value = "登录账号", hidden = false, example = "")
+ private String account;
+
+ @NotBlank(message = "联系电话不能为空")
+ @Length(max = 11)
+ @ApiModelProperty(value = "联系电话", hidden = false, example = "")
+ private String phone;
+
+ @NotNull(message = "工作开始时间不能为空")
+ @Max(24)
+ @ApiModelProperty(value = "工作开始时间", hidden = false, example = "")
+ private Integer workStartTime;
+
+ @NotNull(message = "工作结束时间不能为空")
+ @Max(24)
+ @ApiModelProperty(value = "工作结束时间", hidden = false, example = "")
+ private Integer workEndTime;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "头像", hidden = false, example = "")
+ private String imageUrl;
+
+ @ApiModelProperty(value = "账号状态", hidden = false, example = "")
+ private Integer status;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
+ private String userName;
+
+ @ApiModelProperty(value = "社区ID", hidden = true, example = "1")
+ private Long communityId;
+
+ @ApiModelProperty(value = "网格员id", hidden = false, example = "")
+ private Long gridMemberId;
+
+ @ApiModelProperty(value = "市平台网格员关联id")
+ private String lcMemberId;
+
+ @ApiModelProperty(value = "市平台网格员关联名称")
+ private String lcMemberName;
+
+ @ApiModelProperty(value = "市平台网格员关联用户id")
+ private String lcBindUserId;
+
+ @ApiModelProperty(value = "楼栋id集合")
+ private List<Long> buildingIds;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditDTO.java
new file mode 100644
index 0000000..16d57d5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditDTO.java
@@ -0,0 +1,74 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("编辑网格和网格员的关联关系请求参数")
+public class EventGridMemberEditDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "id,如果是新增则不填", hidden = false, example = "1")
+ private Long id;
+
+ @NotBlank()
+ @Length(max = 50)
+ @ApiModelProperty(value = "账号昵称", hidden = false, example = "")
+ private String nickName;
+
+ @NotBlank()
+ @Length(max = 50)
+ @ApiModelProperty(value = "登录账号", hidden = false, example = "")
+ private String account;
+
+ @NotBlank()
+ @Length(min = 8, max = 100)
+ @ApiModelProperty(value = "登录密码", hidden = false, example = "")
+ private String paswd;
+
+ @NotBlank()
+ @Length(max = 11)
+ @ApiModelProperty(value = "联系电话", hidden = false, example = "")
+ private String phone;
+
+ @NotNull()
+ @Max(24)
+ @ApiModelProperty(value = "工作开始时间", hidden = false, example = "")
+ private Integer workStart;
+
+ @NotNull()
+ @Max(24)
+ @ApiModelProperty(value = "工作结束时间", hidden = false, example = "")
+ private String workEnd;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "头像", hidden = false, example = "")
+ private String imageUrl;
+
+ @NotBlank()
+ @Length(max = 100)
+ @ApiModelProperty(value = "账号状态", hidden = false, example = "")
+ private String status;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
+ private String userName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditStatusDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditStatusDTO.java
new file mode 100644
index 0000000..27960a8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditStatusDTO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("修改网格员状态请求参数")
+public class EventGridMemberEditStatusDTO {
+
+ @ApiModelProperty(value = "需要修改的网格员id集合", example = "")
+ private List<Long> ids;
+
+ @ApiModelProperty(value = "状态（1.启用 2.禁用）", example = "")
+ private Integer status;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberGpsLogAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberGpsLogAddDTO.java
new file mode 100644
index 0000000..9277cb9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberGpsLogAddDTO.java
@@ -0,0 +1,61 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("创建网格员定时上报地理信息请求参数")
+public class EventGridMemberGpsLogAddDTO {
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
+ private Long gridStreetId;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
+ private Long gridCommunityId;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
+ private Long gridId;
+
+ @NotBlank()
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格名称", hidden = false, example = "")
+ private String gridName;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员ID", hidden = false, example = "1")
+ private Long gridMemberId;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "精度维度信息，逗号分割", hidden = false, example = "")
+ private String lngLat;
+
+ @Max(127)
+ @ApiModelProperty(value = "位置信息状态（1、为判定2、正常3、是不正常）", hidden = false, example = "1")
+ private Integer positionStation;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberGpsLogDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberGpsLogDeleteDTO.java
new file mode 100644
index 0000000..e524f1b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberGpsLogDeleteDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("删除网格员定时上报地理信息请求参数")
+public class EventGridMemberGpsLogDeleteDTO {
+
+ @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberGpsLogEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberGpsLogEditDTO.java
new file mode 100644
index 0000000..da058e3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberGpsLogEditDTO.java
@@ -0,0 +1,65 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("编辑网格员定时上报地理信息请求参数")
+public class EventGridMemberGpsLogEditDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
+ private Long id;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
+ private Long gridStreetId;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
+ private Long gridCommunityId;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
+ private Long gridId;
+
+ @NotBlank()
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格名称", hidden = false, example = "")
+ private String gridName;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员ID", hidden = false, example = "1")
+ private Long gridMemberId;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "精度维度信息，逗号分割", hidden = false, example = "")
+ private String lngLat;
+
+ @Max(127)
+ @ApiModelProperty(value = "位置信息状态（1、为判定2、正常3、是不正常）", hidden = false, example = "1")
+ private Integer positionStation;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberPassResetDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberPassResetDTO.java
new file mode 100644
index 0000000..e430929
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberPassResetDTO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 网格员密码重置请求参数
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("网格员密码重置请求参数")
+public class EventGridMemberPassResetDTO {
+
+ @NotBlank(message = "登录密码不能为空")
+ @Length(min = 8, max = 100)
+ @ApiModelProperty(value = "登录密码", hidden = false, example = "")
+ private String password;
+
+ @ApiModelProperty(value = "网格员id集合", hidden = false, example = "")
+ private List<Long> ids;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberRelationDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberRelationDeleteDTO.java
new file mode 100644
index 0000000..7a066ea
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberRelationDeleteDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("删除网格和网格员的关联关系请求参数")
+public class EventGridMemberRelationDeleteDTO {
+
+ @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWainDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWainDTO.java
new file mode 100644
index 0000000..b90230a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWainDTO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("网格员预警记录请求参数")
+public class EventGridMemberWainDTO {
+
+ @Length(max = 50)
+ @ApiModelProperty(value = "关键词", example = "")
+ private String keyWord;
+
+ @ApiModelProperty(value = "网格员id", hidden = false, example = "")
+ private Long gridMemberId;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWarnLogAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWarnLogAddDTO.java
new file mode 100644
index 0000000..ac2918c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWarnLogAddDTO.java
@@ -0,0 +1,61 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("创建网格员定时上报地理预警记录请求参数")
+public class EventGridMemberWarnLogAddDTO {
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
+ private Long gridStreetId;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
+ private Long gridCommunityId;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
+ private Long gridId;
+
+ @NotBlank()
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格名称", hidden = false, example = "")
+ private String gridName;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员ID", hidden = false, example = "1")
+ private Long gridMemberId;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "精度维度信息，逗号分割", hidden = false, example = "")
+ private String lngLat;
+
+ @Length(max = 50)
+ @ApiModelProperty(value = "预警信息内容", hidden = false, example = "")
+ private String content;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWarnLogDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWarnLogDeleteDTO.java
new file mode 100644
index 0000000..1a21231
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWarnLogDeleteDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("删除网格员定时上报地理预警记录请求参数")
+public class EventGridMemberWarnLogDeleteDTO {
+
+ @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWarnLogEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWarnLogEditDTO.java
new file mode 100644
index 0000000..7a2acd9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWarnLogEditDTO.java
@@ -0,0 +1,65 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("编辑网格员定时上报地理预警记录请求参数")
+public class EventGridMemberWarnLogEditDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
+ private Long id;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
+ private Long gridStreetId;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
+ private Long gridCommunityId;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
+ private Long gridId;
+
+ @NotBlank()
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格名称", hidden = false, example = "")
+ private String gridName;
+
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员ID", hidden = false, example = "1")
+ private Long gridMemberId;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "精度维度信息，逗号分割", hidden = false, example = "")
+ private String lngLat;
+
+ @Length(max = 50)
+ @ApiModelProperty(value = "预警信息内容", hidden = false, example = "")
+ private String content;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWorkTrajectoryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWorkTrajectoryDTO.java
new file mode 100644
index 0000000..122632a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberWorkTrajectoryDTO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 网格员工作轨迹请求参数
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("网格员工作轨迹请求参数")
+public class EventGridMemberWorkTrajectoryDTO {
+
+ @ApiModelProperty(value = "工作日期(格式：yyyy-MM-dd)", example = "")
+ private String time;
+
+ @ApiModelProperty(value = "网格员id", example = "")
+ private Long gridMemberId;
+
+ @ApiModelProperty(value = "查询开始时间", hidden = true, example = "")
+ private String startTime;
+
+ @ApiModelProperty(value = "查询结束时间", hidden = true, example = "")
+ private String endTime;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridStatisticsDataDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridStatisticsDataDTO.java
new file mode 100644
index 0000000..1fc99b7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridStatisticsDataDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询网格统计信息请求参数")
+public class EventGridStatisticsDataDTO {
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "网格ID", hidden = true, example = "1", required = true)
+ @NotNull
+ private Long gridId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridTodoDataDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridTodoDataDTO.java
new file mode 100644
index 0000000..30d5286
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridTodoDataDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询用户待处理请求参数")
+public class EventGridTodoDataDTO {
+
+ @ApiModelProperty(value = "网格ID", hidden = false, example = "1", required = true)
+ @NotNull(message = "网格ID不能为空")
+ private Long gridId;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventMainMemberAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventMainMemberAddDTO.java
new file mode 100644
index 0000000..fc54ad4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventMainMemberAddDTO.java
@@ -0,0 +1,127 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("创建重点人群记录请求参数")
+public class EventMainMemberAddDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
+ private Long gridMemberStreet;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
+ private Long gridMemberCommunity;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员", hidden = false, example = "1")
+ private Long gridMember;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
+ private String gridMemberName;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
+ private String gridMemberTele;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "需走访人ID", hidden = false, example = "1")
+ private Long visiterId;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人名字", hidden = false, example = "")
+ private String visiterName;
+
+ @Max(32767)
+ @ApiModelProperty(value = "需走访人员性别", hidden = false, example = "1")
+ private Integer visiterSex;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人电话", hidden = false, example = "")
+ private String visiterTele;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人居住地址", hidden = false, example = "")
+ private String visiterAddress;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人地址精度纬度信息（逗号隔开）", hidden = false, example = "")
+ private String visiterAddressLatLng;
+
+ @Max(9999999999L)
+ @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员", hidden = false, example = "1")
+ private Integer visiterType;
+
+ @Max(127)
+ @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
+ private Integer actOpara;
+
+ @Max(9999999999L)
+ @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）", hidden = false, example = "1")
+ private Integer eventStatus;
+
+ @Max(32767)
+ @ApiModelProperty(value = "上报状态", hidden = false, example = "1")
+ private Integer reporting;
+
+ @Max(32767)
+ @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
+ private Integer dellType;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
+ private Long dellUserId;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
+ private String dellUserName;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "处理时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date dellDate;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
+ private String dellDesc;
+
+ @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
+ private Boolean invalid;
+
+ @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
+ private Boolean urgent;
+
+ @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
+ private Boolean urgentDell;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "上报提交时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date submitDate;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "走访频率配置，一个月几次", hidden = false, example = "")
+ private String visiterConfig;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventMainMemberDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventMainMemberDeleteDTO.java
new file mode 100644
index 0000000..027d5d6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventMainMemberDeleteDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("删除重点人群记录请求参数")
+public class EventMainMemberDeleteDTO {
+
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventMainMemberEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventMainMemberEditDTO.java
new file mode 100644
index 0000000..6a9eceb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventMainMemberEditDTO.java
@@ -0,0 +1,131 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("编辑重点人群记录请求参数")
+public class EventMainMemberEditDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ private Long id;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
+ private Long gridMemberStreet;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
+ private Long gridMemberCommunity;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员", hidden = false, example = "1")
+ private Long gridMember;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
+ private String gridMemberName;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
+ private String gridMemberTele;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "需走访人ID", hidden = false, example = "1")
+ private Long visiterId;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人名字", hidden = false, example = "")
+ private String visiterName;
+
+ @Max(32767)
+ @ApiModelProperty(value = "需走访人员性别", hidden = false, example = "1")
+ private Integer visiterSex;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人电话", hidden = false, example = "")
+ private String visiterTele;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人居住地址", hidden = false, example = "")
+ private String visiterAddress;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人地址精度纬度信息（逗号隔开）", hidden = false, example = "")
+ private String visiterAddressLatLng;
+
+ @Max(9999999999L)
+ @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员", hidden = false, example = "1")
+ private Integer visiterType;
+
+ @Max(127)
+ @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
+ private Integer actOpara;
+
+ @Max(9999999999L)
+ @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）", hidden = false, example = "1")
+ private Integer eventStatus;
+
+ @Max(32767)
+ @ApiModelProperty(value = "上报状态", hidden = false, example = "1")
+ private Integer reporting;
+
+ @Max(32767)
+ @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
+ private Integer dellType;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
+ private Long dellUserId;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
+ private String dellUserName;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "处理时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date dellDate;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
+ private String dellDesc;
+
+ @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
+ private Boolean invalid;
+
+ @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
+ private Boolean urgent;
+
+ @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
+ private Boolean urgentDell;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "上报提交时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date submitDate;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "走访频率配置，一个月几次", hidden = false, example = "")
+ private String visiterConfig;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventResourceAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventResourceAddDTO.java
new file mode 100644
index 0000000..cb4d702
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventResourceAddDTO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("创建事件或者走访中关联的图片音频和视频文件请求参数")
+public class EventResourceAddDTO {
+
+ @Max(127)
+ @ApiModelProperty(value = "事件上传的资源类型(1是图片2是音频3是是视频)", hidden = false, example = "1")
+ private Integer type;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "资源名称", hidden = false, example = "")
+ private String resourceName;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "资源大小", hidden = false, example = "")
+ private String resourceSize;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件上传的资源URL地址", hidden = false, example = "")
+ private String url;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventResourceDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventResourceDeleteDTO.java
new file mode 100644
index 0000000..97a77c2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventResourceDeleteDTO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("删除事件或者走访中关联的图片音频和视频文件请求参数")
+public class EventResourceDeleteDTO {
+
+ @ApiModelProperty(value = "分类（1、事件 2、走访）", hidden = false, example = "1")
+ private Integer classification;
+ @ApiModelProperty(value = "事件或者走访任务关联ID", hidden = false, example = "1")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventResourceEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventResourceEditDTO.java
new file mode 100644
index 0000000..9772da0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventResourceEditDTO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("编辑事件或者走访中关联的图片音频和视频文件请求参数")
+public class EventResourceEditDTO {
+
+ @Max(127)
+ @ApiModelProperty(value = "分类（1、事件 2、走访）", hidden = false, example = "1")
+ private Integer classification;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "事件或者走访任务关联ID", hidden = false, example = "1")
+ private Long id;
+
+ @Max(127)
+ @ApiModelProperty(value = "事件上传的资源类型(1是图片2是音频3是是视频)", hidden = false, example = "1")
+ private Integer type;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "资源名称", hidden = false, example = "")
+ private String resourceName;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "资源大小", hidden = false, example = "")
+ private String resourceSize;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件上传的资源URL地址", hidden = false, example = "")
+ private String url;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventRevokeDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventRevokeDTO.java
new file mode 100644
index 0000000..0bd8b2c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventRevokeDTO.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("撤销事件请求参数")
+public class EventRevokeDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "id", hidden = false, example = "1", required = true)
+ @NotNull
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "李四")
+ private String userName;
+
+ @ApiModelProperty(value = "操作人所属社区", hidden = true, example = "学院社区")
+ private String communityName;
+
+ @ApiModelProperty(value = "操作人所属社区", hidden = true, example = "学院社区")
+ private Long communityId;
+
+ @ApiModelProperty(value = "撤销类型 1 网格员 2 社区", hidden = true, example = "1")
+ private Integer revokeType;
+
+ @ApiModelProperty(value = "撤销人/社区ID", hidden = true, example = "1")
+ private Long revokeId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventTransferRecordAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventTransferRecordAddDTO.java
new file mode 100644
index 0000000..2356ae9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventTransferRecordAddDTO.java
@@ -0,0 +1,66 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("创建事件处理流转记录请求参数")
+public class EventTransferRecordAddDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "事件ID", hidden = false, example = "1")
+ private Long eventId;
+
+ @Max(127)
+ @ApiModelProperty(value = "来源类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
+ private Integer fromType;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "事件来源机构或网格员", hidden = false, example = "1")
+ private Long from;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "转交办理人路径名称", hidden = false, example = "")
+ private String fromName;
+
+ @Max(127)
+ @ApiModelProperty(value = "转交类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
+ private Integer toType;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "事件下游机构或网格员", hidden = false, example = "1")
+ private Long to;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "需要办理人路径名称", hidden = false, example = "")
+ private String toName;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "处理结果", hidden = false, example = "")
+ private String processResult;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "处理时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date processDate;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventTransferRecordDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventTransferRecordDeleteDTO.java
new file mode 100644
index 0000000..d49c580
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventTransferRecordDeleteDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("删除事件处理流转记录请求参数")
+public class EventTransferRecordDeleteDTO {
+
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventTransferRecordEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventTransferRecordEditDTO.java
new file mode 100644
index 0000000..e768837
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventTransferRecordEditDTO.java
@@ -0,0 +1,70 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("编辑事件处理流转记录请求参数")
+public class EventTransferRecordEditDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ private Long id;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "事件ID", hidden = false, example = "1")
+ private Long eventId;
+
+ @Max(127)
+ @ApiModelProperty(value = "来源类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
+ private Integer fromType;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "事件来源机构或网格员", hidden = false, example = "1")
+ private Long from;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "转交办理人路径名称", hidden = false, example = "")
+ private String fromName;
+
+ @Max(127)
+ @ApiModelProperty(value = "转交类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
+ private Integer toType;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "事件下游机构或网格员", hidden = false, example = "1")
+ private Long to;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "需要办理人路径名称", hidden = false, example = "")
+ private String toName;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "处理结果", hidden = false, example = "")
+ private String processResult;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "处理时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date processDate;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksAddDTO.java
new file mode 100644
index 0000000..c87ed56
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksAddDTO.java
@@ -0,0 +1,150 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("创建重点人群走访记录请求参数")
+public class EventVisitingTasksAddDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
+ private Long gridMemberStreet;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
+ private Long gridMemberCommunity;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员", hidden = false, example = "1")
+ private Long gridMember;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
+ private String gridMemberName;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
+ private String gridMenberTele;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "需走访人ID", hidden = false, example = "1")
+ private Long visiterId;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人名字", hidden = false, example = "")
+ private String visiterName;
+
+ @Max(32767)
+ @ApiModelProperty(value = "需走访人员性别", hidden = false, example = "1")
+ private Integer visiterSex;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人电话", hidden = false, example = "")
+ private String visiterTele;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人居住地址", hidden = false, example = "")
+ private String visiterAddress;
+
+ @Max(9999999999L)
+ @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员", hidden = false, example = "1")
+ private Integer visiterType;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件标题", hidden = false, example = "")
+ private String eventTitle;
+
+ @Max(127)
+ @ApiModelProperty(value = "事件类型", hidden = false, example = "1")
+ private Integer eventType;
+
+ @Length(max = 500)
+ @ApiModelProperty(value = "事件描述", hidden = false, example = "")
+ private String eventDes;
+
+ @Max(127)
+ @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
+ private Integer actOpara;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "发生时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date happenTime;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生地点", hidden = false, example = "")
+ private String happentAddress;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "")
+ private String happentLatLng;
+
+ @Max(127)
+ @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）", hidden = false, example = "1")
+ private Integer eventStatus;
+
+ @Max(32767)
+ @ApiModelProperty(value = "上报状态", hidden = false, example = "1")
+ private Integer reporting;
+
+ @Max(32767)
+ @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
+ private Integer dellType;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
+ private Long dellUserId;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
+ private String dellUserName;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "处理时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date dellDate;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
+ private String dellDesc;
+
+ @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
+ private Boolean invalid;
+
+ @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
+ private Boolean urgent;
+
+ @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
+ private Boolean urgentDell;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "上报提交时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date submitDate;
+
+ @ApiModelProperty(value = "是否异常行为", hidden = false, example = "true")
+ private Boolean exception;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据", hidden = false, example = "")
+ private String tableContentJson;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksDeleteDTO.java
new file mode 100644
index 0000000..5382949
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksDeleteDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("删除重点人群走访记录请求参数")
+public class EventVisitingTasksDeleteDTO {
+
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksEditDTO.java
new file mode 100644
index 0000000..7f0894e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksEditDTO.java
@@ -0,0 +1,154 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("编辑重点人群走访记录请求参数")
+public class EventVisitingTasksEditDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ private Long id;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
+ private Long gridMemberStreet;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
+ private Long gridMemberCommunity;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员", hidden = false, example = "1")
+ private Long gridMember;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
+ private String gridMemberName;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
+ private String gridMenberTele;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "需走访人ID", hidden = false, example = "1")
+ private Long visiterId;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人名字", hidden = false, example = "")
+ private String visiterName;
+
+ @Max(32767)
+ @ApiModelProperty(value = "需走访人员性别", hidden = false, example = "1")
+ private Integer visiterSex;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人电话", hidden = false, example = "")
+ private String visiterTele;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人居住地址", hidden = false, example = "")
+ private String visiterAddress;
+
+ @Max(9999999999L)
+ @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员", hidden = false, example = "1")
+ private Integer visiterType;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件标题", hidden = false, example = "")
+ private String eventTitle;
+
+ @Max(127)
+ @ApiModelProperty(value = "事件类型", hidden = false, example = "1")
+ private Integer eventType;
+
+ @Length(max = 500)
+ @ApiModelProperty(value = "事件描述", hidden = false, example = "")
+ private String eventDes;
+
+ @Max(127)
+ @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
+ private Integer actOpara;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "发生时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date happenTime;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生地点", hidden = false, example = "")
+ private String happentAddress;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "")
+ private String happentLatLng;
+
+ @Max(127)
+ @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）", hidden = false, example = "1")
+ private Integer eventStatus;
+
+ @Max(32767)
+ @ApiModelProperty(value = "上报状态", hidden = false, example = "1")
+ private Integer reporting;
+
+ @Max(32767)
+ @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
+ private Integer dellType;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
+ private Long dellUserId;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
+ private String dellUserName;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "处理时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date dellDate;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
+ private String dellDesc;
+
+ @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
+ private Boolean invalid;
+
+ @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
+ private Boolean urgent;
+
+ @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
+ private Boolean urgentDell;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "上报提交时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date submitDate;
+
+ @ApiModelProperty(value = "是否异常行为", hidden = false, example = "true")
+ private Boolean exception;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据", hidden = false, example = "")
+ private String tableContentJson;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/GridEventStatisticsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/GridEventStatisticsDTO.java
new file mode 100644
index 0000000..b900dd1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/GridEventStatisticsDTO.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("统计模块-网格事件统计请求参数")
+public class GridEventStatisticsDTO {
+
+ @ApiModelProperty("网格id")
+ private Long gridId;
+
+ @ApiModelProperty("查询开始时间")
+ private String startTime;
+
+ @ApiModelProperty("查询结束时间")
+ private String endTime;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/LcEventVisitingTasksListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/LcEventVisitingTasksListDTO.java
new file mode 100644
index 0000000..2d314ec
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/LcEventVisitingTasksListDTO.java
@@ -0,0 +1,198 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+import java.util.List;
+
+import com.panzhihua.common.model.vos.grid.EventResourceVO;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 浪潮上传走访内容对象
+ *
+ * @author manailin
+ * @version 1.0
+ * @date 2021-06-24
+ * @since 1.0
+ */
+@Data
+public class LcEventVisitingTasksListDTO {
+
+ /**
+ * id 列: id
+ */
+ private Long id;
+ /**
+ * 网格员所处的街道 列: grid_member_street
+ */
+ private Long gridMemberStreet;
+ /**
+ * 网格员所处社区 列: grid_member_community
+ */
+ private Long gridMemberCommunity;
+ /**
+ * 网格员 列: grid_member
+ */
+ private Long gridMember;
+ /**
+ * 网格员名字 列: grid_member_name
+ */
+ private String gridMemberName;
+ /**
+ * 网格员联系方式 列: grid_menber_tele
+ */
+ private String gridMenberTele;
+ /**
+ * 需走访人ID 列: visiter_id
+ */
+ private Long visiterId;
+ /**
+ * 需走访人名字 列: visiter_name
+ */
+ private String visiterName;
+ /**
+ * 需走访人员性别 列: visiter_sex
+ */
+ private Integer visiterSex;
+ /**
+ * 需走访人电话 列: visiter_tele
+ */
+ private String visiterTele;
+ /**
+ * 需走访人居住地址 列: visiter_address
+ */
+ private String visiterAddress;
+ /**
+ * 人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员 列: visiter_type
+ */
+ private Integer visiterType;
+ /**
+ * 事件标题 列: event_title
+ */
+ private String eventTitle;
+ /**
+ * 事件类型 列: event_type
+ */
+ private Integer eventType;
+ /**
+ * 事件描述 列: event_des
+ */
+ private String eventDes;
+ /**
+ * 社区处理(0是无需社区1是社区处理) 列: act_opara
+ */
+ private Integer actOpara;
+ /**
+ * 发生时间 列: happen_time
+ */
+ private Date happenTime;
+ /**
+ * 发生地点 列: happent_address
+ */
+ private String happentAddress;
+ /**
+ * 发生的精度纬度信息（逗号隔开） 列: happent_lat_lng
+ */
+ private String happentLatLng;
+ /**
+ * 事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常） 列: event_status
+ */
+ private Integer eventStatus;
+ /**
+ * 上报状态 列: reporting
+ */
+ private Integer reporting;
+ /**
+ * 当前处理对象类型（1、网格员2、社区3、是街道） 列: dell_type
+ */
+ private Integer dellType;
+ /**
+ * 处理人ID 列: dell_user_id
+ */
+ private Long dellUserId;
+ /**
+ * 处理人名称 列: dell_user_name
+ */
+ private String dellUserName;
+ /**
+ * 处理时间 列: dell_date
+ */
+ private Date dellDate;
+ /**
+ * 解决人针对解决事件的处理描述 列: dell_desc
+ */
+ private String dellDesc;
+ /**
+ * 是否有效 列: invalid
+ */
+ private Boolean invalid;
+ /**
+ * 是否紧急 列: urgent
+ */
+ private Boolean urgent;
+ /**
+ * 是否催办 列: urgent_dell
+ */
+ private Boolean urgentDell;
+ /**
+ * 上报提交时间 列: submit_date
+ */
+ private Date submitDate;
+ /**
+ * 是否异常行为 列: exception
+ */
+ private Integer exception;
+ /**
+ * 走访内容根据重点人员类型输入项不同，录入全部的表单内容数据 列: table_content_json
+ */
+ private String tableContentJson;
+ /**
+ * 创建人 列: create_by
+ */
+ private Long createBy;
+ /**
+ * 创建事件 列: create_at
+ */
+ /**
+ * 创建人 列: create_by
+ */
+ private Long gridId;
+
+ private Date createAt;
+ /**
+ * 修改人 列: update_by
+ */
+ private Long updateBy;
+ /**
+ * 修改时间 列: update_at
+ */
+ private Date updateAt;
+
+ /**
+ * 地址备注
+ */
+ private String addressRemark;
+ /**
+ * 家庭联系电话
+ */
+ private String familyPhone;
+
+ /**
+ * 家庭来源
+ */
+ private String familySource;
+ /**
+ * 是否已经上传浪潮服务器市平台
+ */
+ private Boolean lcUpload;
+
+ @ApiModelProperty(value = "音频")
+ private List<EventResourceVO> audios;
+
+ @ApiModelProperty(value = "视频")
+ private List<EventResourceVO> videos;
+
+ @ApiModelProperty(value = "图片")
+ private List<EventResourceVO> pics;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/MemberStatisticsAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/MemberStatisticsAdminDTO.java
new file mode 100644
index 0000000..413310e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/MemberStatisticsAdminDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("分页查询网格员统计请求参数")
+public class MemberStatisticsAdminDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "查询开始时间")
+ private String startTime;
+
+ @ApiModelProperty(value = "查询结束时间")
+ private String endTime;
+
+ @ApiModelProperty(value = "网格员名称")
+ private String nickName;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComActEasyPhotoDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComActEasyPhotoDTO.java
new file mode 100644
index 0000000..e3b4c56
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComActEasyPhotoDTO.java
@@ -0,0 +1,127 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询社区活动 》随手拍请求参数")
+public class PageComActEasyPhotoDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "自增id", hidden = false, example = "1")
+ private Long id;
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "发起人id", hidden = false, example = "1")
+ private Long sponsorId;
+ @NotBlank()
+ @Length(max = 100)
+ @ApiModelProperty(value = "发生地址", hidden = false, example = "")
+ private String happenAddr;
+ @NotBlank(message = "地址备注不能为空")
+ @Length(max = 50)
+ @ApiModelProperty(value = "地址备注", hidden = false, example = "")
+ private String addrRemark;
+ @NotNull()
+ @Max(127)
+ @ApiModelProperty(value = "状态 1待处理 2已处理", hidden = false, example = "1")
+ private Integer status;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "处理人id", hidden = false, example = "1")
+ private Long handlerId;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtBegin;
+ @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "审核时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date examineAtBegin;
+ @ApiModelProperty(value = "审核时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date examineAtEnd;
+ @Length(max = 65535)
+ @ApiModelProperty(value = "详情", hidden = false, example = "")
+ private String detail;
+ @Length(max = 65535)
+ @ApiModelProperty(value = "图片路径列表，逗号分隔", hidden = false, example = "")
+ private String photoPathList;
+ @Length(max = 65535)
+ @ApiModelProperty(value = "处理结果", hidden = false, example = "")
+ private String handleResult;
+ @Length(max = 65535)
+ @ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔", hidden = false, example = "")
+ private String handlePhotoList;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "社区id", hidden = false, example = "1")
+ private Long communityId;
+ @Max(127)
+ @ApiModelProperty(value = "是否匿名发布 0 否 1 是", hidden = false, example = "1")
+ private Integer isHide;
+ @Max(127)
+ @ApiModelProperty(value = "是否需要反馈 0 不需要 1 需要", hidden = false, example = "1")
+ private Integer isNeedFeedBack;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "反馈时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date feedbackAtBegin;
+ @ApiModelProperty(value = "反馈时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date feedbackAtEnd;
+ @Length(max = 500)
+ @ApiModelProperty(value = "驳回原因", hidden = false, example = "")
+ private String rejectReason;
+ @Length(max = 65535)
+ @ApiModelProperty(value = "封面图片", hidden = false, example = "")
+ private String cover;
+ @Max(127)
+ @ApiModelProperty(value = "是否删除 0 否 1 是", hidden = false, example = "1")
+ private Integer delTag;
+ @Max(127)
+ @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)", hidden = false, example = "1")
+ private Integer isReport;
+ @Max(127)
+ @ApiModelProperty(value = "是否公示(0.否 1.是)", hidden = false, example = "1")
+ private Integer isPublicity;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComActEasyPhotoTypeDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComActEasyPhotoTypeDTO.java
new file mode 100644
index 0000000..0a987ca
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComActEasyPhotoTypeDTO.java
@@ -0,0 +1,61 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询随手拍类型请求参数")
+public class PageComActEasyPhotoTypeDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "主键id", hidden = false, example = "1")
+ private Long id;
+ @Length(max = 50)
+ @ApiModelProperty(value = "随手拍类型名称", hidden = false, example = "")
+ private String name;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtBegin;
+ @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComMngPopulationDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComMngPopulationDTO.java
new file mode 100644
index 0000000..5a19dc9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComMngPopulationDTO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询人员列表请求参数")
+public class PageComMngPopulationDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "已选中实有人口id集合")
+ private List<Long> populationIds;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComMngVillageBuildHouseAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComMngVillageBuildHouseAppDTO.java
new file mode 100644
index 0000000..db62f03
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComMngVillageBuildHouseAppDTO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 小区楼栋下房屋列表-请求参数
+ *
+ * @author lyq
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("小区楼栋下房屋列表-请求参数")
+public class PageComMngVillageBuildHouseAppDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "小区id", required = true)
+ private Long villageId;
+
+ @ApiModelProperty(value = "楼栋号", required = true)
+ private String floor;
+
+ @ApiModelProperty(value = "单元号", required = true)
+ private String unitNo;
+
+ @ApiModelProperty(value = "户室号")
+ private String houseNo;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEasyAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEasyAdminDTO.java
new file mode 100644
index 0000000..4a37f16
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEasyAdminDTO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 随手拍列表请求参数
+ *
+ * @author lyq
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("随手拍列表请求参数")
+public class PageEasyAdminDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "状态 1.待处理 2.已处理")
+ private Integer handleStatus;
+
+ @ApiModelProperty(value = "是否公示(0.否 1.是)")
+ private Integer isPublicity;
+
+ @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)")
+ private Integer isReport;
+
+ @ApiModelProperty(value = "随手拍类型id")
+ private Long easyPhotoTypeId;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "街道id")
+ private Long streetId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEasyAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEasyAppDTO.java
new file mode 100644
index 0000000..d35226d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEasyAppDTO.java
@@ -0,0 +1,56 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Pattern;
+
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 随手拍列表请求参数
+ *
+ * @author lyq
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("随手拍列表请求参数")
+public class PageEasyAppDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt", hidden = true)
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+
+ @ApiModelProperty(value = "状态 1.待处理 2.已上报 3.已公示 4.未公示")
+ private Integer status;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)", hidden = true)
+ private Integer isReport;
+
+ @ApiModelProperty(value = "是否公示(0.否 1.是)", hidden = true)
+ private Integer isPublicity;
+
+ @ApiModelProperty(value = "处理状态（1.待处理 2.已处理）", hidden = true)
+ private Integer handleStatus;
+
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventApplicationAppReleaseDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventApplicationAppReleaseDTO.java
new file mode 100644
index 0000000..4fd8d7b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventApplicationAppReleaseDTO.java
@@ -0,0 +1,76 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询APP应用版本信息请求参数")
+public class PageEventApplicationAppReleaseDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ private Long id;
+ @Max(32767)
+ @ApiModelProperty(value = "应用ID", hidden = false, example = "1")
+ private Integer productId;
+ @Length(max = 50)
+ @ApiModelProperty(value = "应用名称", hidden = false, example = "")
+ private String productName;
+ @Length(max = 255)
+ @ApiModelProperty(value = "版本编号", hidden = false, example = "")
+ private String releaseNumber;
+ @Max(32767)
+ @ApiModelProperty(value = "通知行为(1、强制更新2、提示更新)", hidden = false, example = "1")
+ private Integer action;
+ @Length(max = 255)
+ @ApiModelProperty(value = "版本地址", hidden = false, example = "")
+ private String url;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtBegin;
+ @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "创建人", hidden = false, example = "1")
+ private Long createBy;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventApplicationUserNoticeDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventApplicationUserNoticeDTO.java
new file mode 100644
index 0000000..f52dab7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventApplicationUserNoticeDTO.java
@@ -0,0 +1,73 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询用户协议和隐私政策信息请求参数")
+public class PageEventApplicationUserNoticeDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ private Long id;
+ @Max(32767)
+ @ApiModelProperty(value = "应用ID", hidden = false, example = "1")
+ private Integer productId;
+ @Length(max = 50)
+ @ApiModelProperty(value = "应用名称", hidden = false, example = "")
+ private String productName;
+ @Max(32767)
+ @ApiModelProperty(value = "通知行为(1、强制通知必须手段确定2、提示更新，自动消退)", hidden = false, example = "1")
+ private Integer action;
+ @Length(max = 1000)
+ @ApiModelProperty(value = "内容", hidden = false, example = "")
+ private String content;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtBegin;
+ @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "创建人", hidden = false, example = "1")
+ private Long createBy;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java
new file mode 100644
index 0000000..e207aa4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java
@@ -0,0 +1,206 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询事件请求参数")
+public class PageEventDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格ID", hidden = false, example = "1", required = true)
+ @NotNull(message = "网格ID不能为空")
+ private Long gridId;
+
+ @Max(127)
+ @ApiModelProperty(value = "事件分类：1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群上报", hidden = false, example = "1",
+ required = true)
+ @NotNull(message = "事件分类不能为空")
+ private Integer eventType;
+
+ @Max(value = 6, message = "事件处理状态参数错误")
+ @ApiModelProperty(value = "事件处理状态（为空时查询全部）：1 待处理、2 待验证、3 已上报、4 已解决、5 草稿箱、6已撤销", hidden = false, example = "1")
+ private Integer eventDealStatus;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC", message = "排序方式参数错误")
+ private String sortType = "desc";
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ private Long id;
+ @Length(max = 20)
+ @ApiModelProperty(value = "服务单号", hidden = false, example = "")
+ private String orderSn;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "1、办件事件2是宣传事件3是阅读事件", hidden = false, example = "1")
+ private Long eventCategory;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
+ private Long gridMemberStreet;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
+ private Long gridMemberCommunity;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员", hidden = false, example = "1")
+ private Long gridMemberId;
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
+ private String gridMemberName;
+ @Length(max = 100)
+ @ApiModelProperty(value = "事件类型", hidden = false, example = "")
+ private String eventClazz;
+ @Length(max = 20)
+ @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
+ private String gridMemberTelephone;
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件标题", hidden = false, example = "")
+ private String eventTitle;
+ @Length(max = 255)
+ @ApiModelProperty(value = "宣传类型", hidden = false, example = "1")
+ private String propagandaType;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "宣传时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date propagandaTimeBegin;
+ @ApiModelProperty(value = "宣传时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date propagandaTimeEnd;
+ @Length(max = 500)
+ @ApiModelProperty(value = "事件描述", hidden = false, example = "")
+ private String eventDes;
+ @Length(max = 50)
+ @ApiModelProperty(value = "宣传对象", hidden = false, example = "")
+ private String propagandaObject;
+ @Length(max = 8)
+ @ApiModelProperty(value = "宣传人数", hidden = false, example = "")
+ private String propagandaNum;
+ @Max(127)
+ @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
+ private Integer communityProcess;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "发生时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date happenTimeBegin;
+ @ApiModelProperty(value = "发生时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date happenTimeEnd;
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生地点", hidden = false, example = "")
+ private String happentAddress;
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "")
+ private String happentLatLng;
+ @Max(127)
+ @ApiModelProperty(value = "事件状态（1草稿箱2发布3逻辑删除4、撤销）", hidden = false, example = "1")
+ private Integer eventStatus;
+ @Max(127)
+ @ApiModelProperty(value = "1待处理2已解决3待验证", hidden = false, example = "1")
+ private Integer eventProcessStatus;
+ @Max(127)
+ @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
+ private Integer processType;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
+ private Long processUserId;
+ @Length(max = 100)
+ @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
+ private String processUserName;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "处理时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date processDateBegin;
+ @ApiModelProperty(value = "处理时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date processDateEnd;
+ @Length(max = 255)
+ @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
+ private String processDesc;
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件来源", hidden = false, example = "")
+ private String eventResource;
+ @Max(127)
+ @ApiModelProperty(value = "危险级别", hidden = false, example = "1")
+ private Integer dangerLevel;
+ @ApiModelProperty(value = "红牌", hidden = false, example = "true")
+ private Boolean redCard;
+ @ApiModelProperty(value = "黄牌", hidden = false, example = "true")
+ private Boolean yellowCard;
+ @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
+ private Boolean invalid;
+ @ApiModelProperty(value = "是否重大", hidden = false, example = "true")
+ private Boolean major;
+ @Max(9999999999L)
+ @ApiModelProperty(value = "死亡人数", hidden = false, example = "1")
+ private Integer deathsNumber;
+ @Max(9999999999L)
+ @ApiModelProperty(value = "受伤人数", hidden = false, example = "1")
+ private Integer injuriesNumber;
+ @ApiModelProperty(value = "是否疑难事件", hidden = false, example = "true")
+ private Boolean difficult;
+ @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
+ private Boolean urgent;
+ @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
+ private Boolean urgentDell;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "上报提交时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date submitDateBegin;
+ @ApiModelProperty(value = "上报提交时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date submitDateEnd;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "创建人", hidden = false, example = "1")
+ private Long createBy;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtBegin;
+ @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "修改人", hidden = false, example = "1")
+ private Long updateBy;
+ @ApiModelProperty(value = "撤销类型 1 网格员 2 社区", hidden = true, example = "1")
+ private Integer revokeType;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date updateAtBegin;
+ @ApiModelProperty(value = "修改时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAtEnd;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+ @ApiModelProperty(value = "是否查询全部（1.是 2.否）", hidden = false, example = "true")
+ private Integer isAll;
+
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridDataAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridDataAdminDTO.java
new file mode 100644
index 0000000..ce8f054
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridDataAdminDTO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询网格数据管理请求参数")
+public class PageEventGridDataAdminDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
+ private Long gridStreetId;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
+ private Long gridCommunityId;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+ @ApiModelProperty(value = "关键字", example = "")
+ private String keyWord;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridDataDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridDataDTO.java
new file mode 100644
index 0000000..8796661
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridDataDTO.java
@@ -0,0 +1,113 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询网格数据管理请求参数")
+public class PageEventGridDataDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
+ private Long id;
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "类型，1、区县网格2街道网格3社区网格", hidden = false, example = "1")
+ private Long type;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "区/县ID", hidden = false, example = "1")
+ private Long zoneId;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
+ private Long gridStreetId;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
+ private Long gridCommunityId;
+ @NotBlank()
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格名称", hidden = false, example = "")
+ private String gridName;
+ @Max(32767)
+ @ApiModelProperty(value = "所属图层", hidden = false, example = "1")
+ private Integer mapLevel;
+ @Length(max = 100)
+ @ApiModelProperty(value = "面积", hidden = false, example = "")
+ private String area;
+ @Length(max = 100)
+ @ApiModelProperty(value = "线条颜色", hidden = false, example = "")
+ private String lineColor;
+ @Length(max = 100)
+ @ApiModelProperty(value = "线条宽度", hidden = false, example = "")
+ private String lineBroadband;
+ @Length(max = 100)
+ @ApiModelProperty(value = "填充颜色", hidden = false, example = "")
+ private String fillColor;
+ @Length(max = 255)
+ @ApiModelProperty(value = "备注", hidden = false, example = "")
+ private String remarks;
+ @Length(max = 2147483647)
+ @ApiModelProperty(value = "围栏数据", hidden = false, example = "")
+ private String data;
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "创建人", hidden = false, example = "1")
+ private Long createBy;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtBegin;
+ @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "修改人", hidden = false, example = "1")
+ private Long updateBy;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date updateAtBegin;
+ @ApiModelProperty(value = "修改时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAtEnd;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+ @ApiModelProperty(value = "关键字", example = "")
+ private String keyWord;
+
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberGpsLogDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberGpsLogDTO.java
new file mode 100644
index 0000000..b11d026
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberGpsLogDTO.java
@@ -0,0 +1,89 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询网格员定时上报地理信息请求参数")
+public class PageEventGridMemberGpsLogDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
+ private Long id;
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
+ private Long gridStreetId;
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
+ private Long gridCommunityId;
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
+ private Long gridId;
+ @NotBlank()
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格名称", hidden = false, example = "")
+ private String gridName;
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员ID", hidden = false, example = "1")
+ private Long gridMemberId;
+ @Length(max = 255)
+ @ApiModelProperty(value = "精度维度信息，逗号分割", hidden = false, example = "")
+ private String lngLat;
+ @Max(127)
+ @ApiModelProperty(value = "位置信息状态（1、为判定2、正常3、是不正常）", hidden = false, example = "1")
+ private Integer positionStation;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "创建人", hidden = false, example = "1")
+ private Long createBy;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtBegin;
+ @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberRelationDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberRelationDTO.java
new file mode 100644
index 0000000..b51e7da
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberRelationDTO.java
@@ -0,0 +1,70 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询网格和网格员的关联关系请求参数")
+public class PageEventGridMemberRelationDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属街道id", hidden = false, example = "1")
+ private Long gridStreetId;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属社区id", hidden = false, example = "1")
+ private Long gridCommunityId;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "关键词", hidden = false, example = "")
+ private String keyWord;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格名称", hidden = false, example = "")
+ private String gridName;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "账号昵称", hidden = true, example = "")
+ private String nickName;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "登录账号", hidden = true, example = "")
+ private String account;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "联系电话", hidden = true, example = "")
+ private String phone;
+
+ @ApiModelProperty(value = "账号状态(1.启用 2.禁用)", example = "1")
+ private Integer status;
+
+ @ApiModelProperty(value = "网格员工作状态(1.在岗 2.脱岗 3.已下班)", example = "1")
+ private Integer workStatus;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员ID", hidden = true, example = "1")
+ private String gridMemberId;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberWarnLogDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberWarnLogDTO.java
new file mode 100644
index 0000000..e6964db
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridMemberWarnLogDTO.java
@@ -0,0 +1,89 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询网格员定时上报地理预警记录请求参数")
+public class PageEventGridMemberWarnLogDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
+ private Long id;
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
+ private Long gridStreetId;
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
+ private Long gridCommunityId;
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
+ private Long gridId;
+ @NotBlank()
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格名称", hidden = false, example = "")
+ private String gridName;
+ @NotNull()
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员ID", hidden = false, example = "1")
+ private Long gridMemberId;
+ @Length(max = 255)
+ @ApiModelProperty(value = "精度维度信息，逗号分割", hidden = false, example = "")
+ private String lngLat;
+ @Length(max = 50)
+ @ApiModelProperty(value = "预警信息内容", hidden = false, example = "")
+ private String content;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "创建人", hidden = false, example = "1")
+ private Long createBy;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtBegin;
+ @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridNearbyDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridNearbyDTO.java
new file mode 100644
index 0000000..a2a8e1f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventGridNearbyDTO.java
@@ -0,0 +1,53 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询事件请求参数")
+public class PageEventGridNearbyDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC", message = "排序方式参数错误")
+ private String sortType = "desc";
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开'经度,维度'）", hidden = false, example = "104.060748,30.65769",
+ required = true)
+ @NotNull
+ private String happentLatLng;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userName;
+
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventMainMemberDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventMainMemberDTO.java
new file mode 100644
index 0000000..cc02778
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventMainMemberDTO.java
@@ -0,0 +1,148 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询重点人群记录请求参数")
+public class PageEventMainMemberDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ private Long id;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
+ private Long gridMemberStreet;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
+ private Long gridMemberCommunity;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员", hidden = false, example = "1")
+ private Long gridMember;
+ @Length(max = 255)
+ @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
+ private String gridMemberName;
+ @Length(max = 255)
+ @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
+ private String gridMemberTele;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "需走访人ID", hidden = false, example = "1")
+ private Long visiterId;
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人名字", hidden = false, example = "")
+ private String visiterName;
+ @Max(32767)
+ @ApiModelProperty(value = "需走访人员性别", hidden = false, example = "1")
+ private Integer visiterSex;
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人电话", hidden = false, example = "")
+ private String visiterTele;
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人居住地址", hidden = false, example = "")
+ private String visiterAddress;
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人地址精度纬度信息（逗号隔开）", hidden = false, example = "")
+ private String visiterAddressLatLng;
+ @Max(9999999999L)
+ @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员", hidden = false, example = "1")
+ private Integer visiterType;
+ @Max(127)
+ @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
+ private Integer actOpara;
+ @Max(9999999999L)
+ @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）", hidden = false, example = "1")
+ private Integer eventStatus;
+ @Max(32767)
+ @ApiModelProperty(value = "上报状态", hidden = false, example = "1")
+ private Integer reporting;
+ @Max(32767)
+ @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
+ private Integer dellType;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
+ private Long dellUserId;
+ @Length(max = 255)
+ @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
+ private String dellUserName;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "处理时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date dellDateBegin;
+ @ApiModelProperty(value = "处理时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date dellDateEnd;
+ @Length(max = 255)
+ @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
+ private String dellDesc;
+ @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
+ private Boolean invalid;
+ @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
+ private Boolean urgent;
+ @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
+ private Boolean urgentDell;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "上报提交时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date submitDateBegin;
+ @ApiModelProperty(value = "上报提交时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date submitDateEnd;
+ @Length(max = 255)
+ @ApiModelProperty(value = "走访频率配置，一个月几次", hidden = false, example = "")
+ private String visiterConfig;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "创建人", hidden = false, example = "1")
+ private Long createBy;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建事件-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtBegin;
+ @ApiModelProperty(value = "创建事件-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "修改人", hidden = false, example = "1")
+ private Long updateBy;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date updateAtBegin;
+ @ApiModelProperty(value = "修改时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAtEnd;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventManageDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventManageDTO.java
new file mode 100644
index 0000000..5e4fa72
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventManageDTO.java
@@ -0,0 +1,75 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 事件管理分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询事件请求参数")
+public class PageEventManageDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC", message = "排序方式参数错误")
+ private String sortType = "desc";
+ @ApiModelProperty(value = "撤销类型 1 网格员 2 社区", hidden = true, example = "1")
+ private Integer revokeType;
+ @ApiModelProperty(value = "搜索关键词", hidden = false, example = "1", required = true)
+ private String keyWord;
+ @ApiModelProperty(value = "上报社区处理： 0 否 1 是", hidden = false, example = "1")
+ private Integer communityProcess;
+ @Max(value = 6, message = "事件处理状态参数错误")
+ @ApiModelProperty(value = "事件处理状态（为空时查询全部）：1 待处理、2 待验证、4 已解决、6 已失效", hidden = false, example = "1")
+ private Integer eventDealStatus;
+ @Max(127)
+ @ApiModelProperty(value = "事件分类：1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件", hidden = false, example = "1")
+ // @NotNull(message = "事件分类不能为空")
+ private Integer eventType;
+ @ApiModelProperty(value = "事件类型")
+ private String eventClazz;
+ @Max(127)
+ @ApiModelProperty(value = "危险级别", hidden = false, example = "1")
+ private Integer dangerLevel;
+ @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
+ private Boolean urgent;
+ @ApiModelProperty(value = "是否重大", hidden = false, example = "true")
+ private Boolean major;
+ @ApiModelProperty(value = "红牌", hidden = false, example = "true")
+ private Boolean redCard;
+ @ApiModelProperty(value = "黄牌", hidden = false, example = "true")
+ private Boolean yellowCard;
+ @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
+ private Boolean invalid;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "社区ID", hidden = true, example = "1")
+ private Long communityId;
+
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventResourceDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventResourceDTO.java
new file mode 100644
index 0000000..6d64304
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventResourceDTO.java
@@ -0,0 +1,76 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询事件或者走访中关联的图片音频和视频文件请求参数")
+public class PageEventResourceDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+ @Max(127)
+ @ApiModelProperty(value = "分类（1、事件 2、走访）", hidden = false, example = "1")
+ private Integer classification;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "事件或者走访任务关联ID", hidden = false, example = "1")
+ private Long id;
+ @Max(127)
+ @ApiModelProperty(value = "事件上传的资源类型(1是图片2是音频3是是视频)", hidden = false, example = "1")
+ private Integer type;
+ @Length(max = 255)
+ @ApiModelProperty(value = "资源名称", hidden = false, example = "")
+ private String resourceName;
+ @Length(max = 255)
+ @ApiModelProperty(value = "资源大小", hidden = false, example = "")
+ private String resourceSize;
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件上传的资源URL地址", hidden = false, example = "")
+ private String url;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "创建人", hidden = false, example = "1")
+ private Long createBy;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtBegin;
+ @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventSpecialPopulationDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventSpecialPopulationDTO.java
new file mode 100644
index 0000000..ff25cc7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventSpecialPopulationDTO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询事件特殊人群请求参数")
+public class PageEventSpecialPopulationDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "社区id", hidden = true, example = "2")
+ private Long communityId;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventTransferRecordDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventTransferRecordDTO.java
new file mode 100644
index 0000000..2514ae0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventTransferRecordDTO.java
@@ -0,0 +1,88 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询事件处理流转记录请求参数")
+public class PageEventTransferRecordDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ private Long id;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "事件ID", hidden = false, example = "1")
+ private Long eventId;
+ @Max(127)
+ @ApiModelProperty(value = "来源类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
+ private Integer fromType;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "事件来源机构或网格员", hidden = false, example = "1")
+ private Long from;
+ @Length(max = 255)
+ @ApiModelProperty(value = "转交办理人路径名称", hidden = false, example = "")
+ private String fromName;
+ @Max(127)
+ @ApiModelProperty(value = "转交类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
+ private Integer toType;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "事件下游机构或网格员", hidden = false, example = "1")
+ private Long to;
+ @Length(max = 255)
+ @ApiModelProperty(value = "需要办理人路径名称", hidden = false, example = "")
+ private String toName;
+ @Length(max = 255)
+ @ApiModelProperty(value = "处理结果", hidden = false, example = "")
+ private String processResult;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "处理时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date processDateBegin;
+ @ApiModelProperty(value = "处理时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date processDateEnd;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtBegin;
+ @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventVisitingTasksDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventVisitingTasksDTO.java
new file mode 100644
index 0000000..9890529
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventVisitingTasksDTO.java
@@ -0,0 +1,168 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询重点人群走访记录请求参数")
+public class PageEventVisitingTasksDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ private Long id;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
+ private Long gridMemberStreet;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
+ private Long gridMemberCommunity;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员", hidden = false, example = "1")
+ private Long gridMember;
+ @Length(max = 255)
+ @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
+ private String gridMemberName;
+ @Length(max = 255)
+ @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
+ private String gridMenberTele;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "需走访人ID", hidden = false, example = "1")
+ private Long visiterId;
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人名字", hidden = false, example = "")
+ private String visiterName;
+ @Max(32767)
+ @ApiModelProperty(value = "需走访人员性别", hidden = false, example = "1")
+ private Integer visiterSex;
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人电话", hidden = false, example = "")
+ private String visiterTele;
+ @Length(max = 255)
+ @ApiModelProperty(value = "需走访人居住地址", hidden = false, example = "")
+ private String visiterAddress;
+ @Max(9999999999L)
+ @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员", hidden = false, example = "1")
+ private Integer visiterType;
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件标题", hidden = false, example = "")
+ private String eventTitle;
+ @Max(127)
+ @ApiModelProperty(value = "事件类型", hidden = false, example = "1")
+ private Integer eventType;
+ @Length(max = 500)
+ @ApiModelProperty(value = "事件描述", hidden = false, example = "")
+ private String eventDes;
+ @Max(127)
+ @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
+ private Integer actOpara;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "发生时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date happenTimeBegin;
+ @ApiModelProperty(value = "发生时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date happenTimeEnd;
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生地点", hidden = false, example = "")
+ private String happentAddress;
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "")
+ private String happentLatLng;
+ @Max(127)
+ @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）", hidden = false, example = "1")
+ private Integer eventStatus;
+ @Max(32767)
+ @ApiModelProperty(value = "上报状态", hidden = false, example = "1")
+ private Integer reporting;
+ @Max(32767)
+ @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
+ private Integer dellType;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
+ private Long dellUserId;
+ @Length(max = 255)
+ @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
+ private String dellUserName;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "处理时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date dellDateBegin;
+ @ApiModelProperty(value = "处理时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date dellDateEnd;
+ @Length(max = 255)
+ @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
+ private String dellDesc;
+ @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
+ private Boolean invalid;
+ @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
+ private Boolean urgent;
+ @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
+ private Boolean urgentDell;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "上报提交时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date submitDateBegin;
+ @ApiModelProperty(value = "上报提交时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date submitDateEnd;
+ @ApiModelProperty(value = "是否异常行为", hidden = false, example = "true")
+ private Boolean exception;
+ @Length(max = 255)
+ @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据", hidden = false, example = "")
+ private String tableContentJson;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "创建人", hidden = false, example = "1")
+ private Long createBy;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建事件-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtBegin;
+ @ApiModelProperty(value = "创建事件-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "修改人", hidden = false, example = "1")
+ private Long updateBy;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date updateAtBegin;
+ @ApiModelProperty(value = "修改时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAtEnd;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePopulationListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePopulationListDTO.java
new file mode 100644
index 0000000..b4abb0b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePopulationListDTO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询事件请求参数")
+public class PagePopulationListDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "关键字", example = "1")
+ private String keyWord;
+
+ @ApiModelProperty(value = "社区ID", hidden = true, example = "1")
+ private Long communityId;
+
+ @ApiModelProperty(value = "特殊人员标签")
+ private String label;
+
+ @ApiModelProperty(value = "网格id")
+ private Long gridId;
+
+ private Integer outOrLocal;
+
+ /**
+ * 外地or本地（1.本地 2.外地）
+ */
+ public interface outOrLocal{
+ int bd = 1;
+ int wd = 2;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventCommunityDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventCommunityDTO.java
new file mode 100644
index 0000000..1571c01
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventCommunityDTO.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询宣传教育事件请求参数")
+public class PagePublicityEventCommunityDTO {
+
+ @Max(value = 8, message = "事件处理状态参数错误")
+ @ApiModelProperty(value = "事件处理状态（为空时查询全部）：1 已发布、5 草稿箱、6已撤销", hidden = false, example = "1")
+ private Integer eventDealStatus;
+
+ @Length(max = 50)
+ @ApiModelProperty(value = "关键词", example = "")
+ private String keyWord;
+
+ @ApiModelProperty(value = "分页-当前页数,默认1", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数,默认10", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC", message = "排序方式参数错误")
+ private String sortType = "desc";
+ @ApiModelProperty(value = "撤销类型 1 网格员 2 社区", hidden = true, example = "1")
+ private Integer revokeType;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+ @ApiModelProperty(value = "社区ID", hidden = true, example = "1")
+ private Long communityId;
+
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventDTO.java
new file mode 100644
index 0000000..66a8e4d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventDTO.java
@@ -0,0 +1,197 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询宣传教育事件请求参数")
+public class PagePublicityEventDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格ID", hidden = false, example = "1", required = true)
+ @NotNull(message = "网格ID不能为空")
+ private Long gridId;
+
+ @Max(value = 8, message = "事件处理状态参数错误")
+ @ApiModelProperty(value = "事件处理状态（为空时查询全部）：1 已发布、5 草稿箱、6已撤销", hidden = false, example = "1")
+ private Integer eventDealStatus;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC", message = "排序方式参数错误")
+ private String sortType = "desc";
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "id", hidden = false, example = "1")
+ private Long id;
+ @Length(max = 20)
+ @ApiModelProperty(value = "服务单号", hidden = false, example = "")
+ private String orderSn;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "1、办件事件2是宣传事件3是阅读事件", hidden = false, example = "1")
+ private Long eventCategory;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
+ private Long gridMemberStreet;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
+ private Long gridMemberCommunity;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "网格员", hidden = false, example = "1")
+ private Long gridMemberId;
+ @Length(max = 100)
+ @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
+ private String gridMemberName;
+ @Length(max = 20)
+ @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
+ private String gridMemberTelephone;
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件标题", hidden = false, example = "")
+ private String eventTitle;
+ @Length(max = 255)
+ @ApiModelProperty(value = "宣传类型", hidden = false, example = "1")
+ private String propagandaType;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "宣传时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date propagandaTimeBegin;
+ @ApiModelProperty(value = "宣传时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date propagandaTimeEnd;
+ @Length(max = 500)
+ @ApiModelProperty(value = "事件描述", hidden = false, example = "")
+ private String eventDes;
+ @Length(max = 50)
+ @ApiModelProperty(value = "宣传对象", hidden = false, example = "")
+ private String propagandaObject;
+ @Length(max = 8)
+ @ApiModelProperty(value = "宣传人数", hidden = false, example = "")
+ private String propagandaNum;
+ @Max(127)
+ @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
+ private Integer communityProcess;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "发生时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date happenTimeBegin;
+ @ApiModelProperty(value = "发生时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date happenTimeEnd;
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生地点", hidden = false, example = "")
+ private String happentAddress;
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "")
+ private String happentLatLng;
+ @Max(127)
+ @ApiModelProperty(value = "事件状态（1草稿箱2发布3逻辑删除4、撤销）", hidden = false, example = "1")
+ private Integer eventStatus;
+ @Max(127)
+ @ApiModelProperty(value = "1待处理2已解决3待验证", hidden = false, example = "1")
+ private Integer eventProcessStatus;
+ @Max(127)
+ @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
+ private Integer processType;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
+ private Long processUserId;
+ @Length(max = 100)
+ @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
+ private String processUserName;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "处理时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date processDateBegin;
+ @ApiModelProperty(value = "处理时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date processDateEnd;
+ @Length(max = 255)
+ @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
+ private String processDesc;
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件来源", hidden = false, example = "")
+ private String eventResource;
+ @Max(127)
+ @ApiModelProperty(value = "危险级别", hidden = false, example = "1")
+ private Integer dangerLevel;
+ @ApiModelProperty(value = "红牌", hidden = false, example = "true")
+ private Boolean redCard;
+ @ApiModelProperty(value = "黄牌", hidden = false, example = "true")
+ private Boolean yellowCard;
+ @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
+ private Boolean invalid;
+ @ApiModelProperty(value = "是否重大", hidden = false, example = "true")
+ private Boolean major;
+ @Max(9999999999L)
+ @ApiModelProperty(value = "死亡人数", hidden = false, example = "1")
+ private Integer deathsNumber;
+ @Max(9999999999L)
+ @ApiModelProperty(value = "受伤人数", hidden = false, example = "1")
+ private Integer injuriesNumber;
+ @ApiModelProperty(value = "是否疑难事件", hidden = false, example = "true")
+ private Boolean difficult;
+ @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
+ private Boolean urgent;
+ @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
+ private Boolean urgentDell;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "上报提交时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date submitDateBegin;
+ @ApiModelProperty(value = "上报提交时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date submitDateEnd;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "创建人", hidden = false, example = "1")
+ private Long createBy;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtBegin;
+ @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "修改人", hidden = false, example = "1")
+ private Long updateBy;
+ @ApiModelProperty(value = "撤销类型 1 网格员 2 社区", hidden = true, example = "1")
+ private Integer revokeType;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date updateAtBegin;
+ @ApiModelProperty(value = "修改时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAtEnd;
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+ @ApiModelProperty(value = "社区ID", hidden = true, example = "1")
+ private Long communityId;
+
+ public String getSortColumns() {
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java
new file mode 100644
index 0000000..85ee345
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java
@@ -0,0 +1,112 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.URL;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("宣传教育事件请求参数")
+public class PublicityEventAddDTO {
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "宣传时间", hidden = false, example = "2021-05-01 18:05:50")
+ @NotNull(message = "宣传时间不能为空")
+ private Date propagandaTime;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "宣传地点-精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
+ @NotNull(message = "宣传地点不能为空")
+ private String happentLatLng;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生地点-位置备注", hidden = false, example = "")
+ private String happentAddress;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件发生地点", hidden = false, example = "", required = true)
+ private String happenAddress;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "宣传区域-网格ID", hidden = false, example = "1", required = true)
+ @NotNull(message = "宣传区域不能为空")
+ private Long gridId;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "上报人ID", hidden = false, example = "1", required = true)
+ // @NotNull(message = "上报人不能为空")
+ private Long gridMemberId;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "宣传主题", hidden = false, example = "", required = true)
+ @NotNull(message = "宣传主题不能为空")
+ private String eventTitle;
+
+ @Length(max = 500)
+ @ApiModelProperty(value = "宣传内容", hidden = false, example = "", required = true)
+ @NotNull(message = "宣传内容不能为空")
+ private String eventDes;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "宣传类型", hidden = false, example = "1", required = true)
+ @NotNull(message = "宣传类型不能为空")
+ private String propagandaType;
+
+ @Length(max = 50)
+ @ApiModelProperty(value = "宣传对象", hidden = false, example = "", required = true)
+ @NotNull(message = "宣传对象不能为空")
+ private String propagandaObject;
+
+ @Min(1)
+ @Length(max = 8)
+ @ApiModelProperty(value = "宣传人数", hidden = false, example = "", required = true)
+ @NotNull(message = "宣传人数不能为空")
+ private String propagandaNum;
+
+ @ApiModelProperty(value = "音频(限1个)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
+ @URL
+ private String audio;
+
+ @ApiModelProperty(value = "音频时长(单位：秒)", hidden = false, example = "10")
+ private Integer audioTime;
+
+ @ApiModelProperty(value = "视频(限1个)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
+ @URL
+ private String video;
+
+ @ApiModelProperty(value = "视频时长(单位：秒)", hidden = false, example = "10")
+ private Integer videoTime;
+
+ @ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
+ private String pics;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
+ private String userName;
+ @ApiModelProperty(value = "(当前操作)用户电话", hidden = true, example = "18888888888")
+ @Length(max = 11)
+ private String phone;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventEditDTO.java
new file mode 100644
index 0000000..6700f0f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventEditDTO.java
@@ -0,0 +1,114 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.URL;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("宣传教育事件草稿请求参数")
+public class PublicityEventEditDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "id,如果是新增则不填", hidden = false, example = "1")
+ private Long id;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "宣传时间", hidden = false, example = "2021-05-01 18:05:50")
+ @NotNull(message = "宣传时间不能为空")
+ private Date propagandaTime;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "宣传地点-精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
+ @NotNull(message = "宣传地点不能为空")
+ private String happentLatLng;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生地点-位置备注", hidden = false, example = "")
+ private String happentAddress;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件发生地点", hidden = false, example = "", required = true)
+ private String happenAddress;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "宣传区域-网格ID", hidden = false, example = "1", required = true)
+ @NotNull(message = "宣传区域不能为空")
+ private Long gridId;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "上报人ID", hidden = false, example = "1", required = true)
+ // @NotNull(message = "上报人不能为空")
+ private Long gridMemberId;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "宣传主题", hidden = false, example = "", required = true)
+ @NotNull(message = "宣传主题不能为空")
+ private String eventTitle;
+
+ @Length(max = 500)
+ @ApiModelProperty(value = "宣传内容", hidden = false, example = "", required = true)
+ @NotNull(message = "宣传内容不能为空")
+ private String eventDes;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "宣传类型", hidden = false, example = "1", required = true)
+ @NotNull(message = "宣传类型不能为空")
+ private String propagandaType;
+
+ @Length(max = 50)
+ @ApiModelProperty(value = "宣传对象", hidden = false, example = "", required = true)
+ @NotNull(message = "宣传对象不能为空")
+ private String propagandaObject;
+
+ @Length(max = 8)
+ @ApiModelProperty(value = "宣传人数", hidden = false, example = "", required = true)
+ @NotNull(message = "宣传人数不能为空")
+ private String propagandaNum;
+
+ @ApiModelProperty(value = "音频(限1个)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
+ @URL
+ private String audio;
+
+ @ApiModelProperty(value = "音频时长(单位：秒)", hidden = false, example = "10")
+ private Integer audioTime;
+
+ @ApiModelProperty(value = "视频(限1个)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
+ @URL
+ private String video;
+
+ @ApiModelProperty(value = "视频时长(单位：秒)", hidden = false, example = "10")
+ private Integer videoTime;
+
+ @ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
+ private String pics;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
+ private String userName;
+ @ApiModelProperty(value = "(当前操作)用户电话", hidden = true, example = "18888888888")
+ @Length(max = 11)
+ private String phone;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventAddDTO.java
new file mode 100644
index 0000000..563df7a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventAddDTO.java
@@ -0,0 +1,111 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("特殊人群事件请求参数")
+public class SpecialEventAddDTO {
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "发生时间", hidden = false, example = "2021-05-01 18:05:50", required = true)
+ @NotNull(message = "发生时间不能为空")
+ private Date happenTime;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
+ @NotNull(message = "发生的精度纬度信息不能为空")
+ private String happentLatLng;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生地点-位置备注", hidden = false, example = "")
+ private String happentAddress;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "发生区域-网格ID", hidden = false, example = "1", required = true)
+ @NotNull(message = "发生区域-网格ID不能为空")
+ private Long gridId;
+
+ @Length(max = 500)
+ @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
+ @NotNull(message = "事件描述不能为空")
+ private String eventDes;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件类型,逗号隔开", hidden = false, example = "邻里纠纷,土地承包租赁", required = true)
+ @NotNull(message = "事件类型不能为空")
+ private String eventClazz;
+
+ @Max(127)
+ @ApiModelProperty(value = "危险级别:0 (无) 1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
+ @NotNull(message = "危险级别不能为空")
+ private Integer dangerLevel;
+
+ @Max(9999999999L)
+ @ApiModelProperty(value = "死亡人数", hidden = false, example = "1", required = true)
+ @NotNull(message = "死亡人数不能为空")
+ private Integer deathsNumber;
+
+ @Max(9999999999L)
+ @ApiModelProperty(value = "受伤人数", hidden = false, example = "1", required = true)
+ @NotNull(message = "受伤人数不能为空")
+ private Integer injuriesNumber;
+
+ @ApiModelProperty(value = "是否紧急", hidden = false, example = "true", required = true)
+ @NotNull(message = "是否紧急不能为空")
+ private Boolean urgent;
+
+ @ApiModelProperty(value = "是否重大", hidden = false, example = "true", required = true)
+ @NotNull(message = "是否重大不能为空")
+ private Boolean major;
+
+ @ApiModelProperty(value = "特殊人群", hidden = false, required = true)
+ @NotNull(message = "特殊人员信息不能为空")
+ private List<SpecialPopulationDTO> specialPopulation;
+
+ @ApiModelProperty(value = "音频(限1个)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
+ private String audio;
+
+ @ApiModelProperty(value = "音频时长(单位：秒)", hidden = false, example = "10")
+ private Integer audioTime;
+
+ @ApiModelProperty(value = "视频(限1个)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
+ private String video;
+
+ @ApiModelProperty(value = "视频时长(单位：秒)", hidden = false, example = "10")
+ private Integer videoTime;
+
+ @ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
+ private String pics;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
+ private String userName;
+ @ApiModelProperty(value = "(当前操作)用户电话", hidden = true, example = "18888888888")
+ @Length(max = 11)
+ private String phone;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java
new file mode 100644
index 0000000..93993b9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java
@@ -0,0 +1,114 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("特殊人群事件请求参数")
+public class SpecialEventEditDTO {
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "id,如果是新增则不填", hidden = false, example = "1")
+ private Long id;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "发生时间", hidden = false, example = "2021-05-01 18:05:50", required = true)
+ @NotNull(message = "发生时间不能为空")
+ private Date happenTime;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
+ @NotNull(message = "发生的精度纬度信息不能为空")
+ private String happentLatLng;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "发生地点-位置备注", hidden = false, example = "")
+ private String happentAddress;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "发生区域-网格ID", hidden = false, example = "1", required = true)
+ @NotNull(message = "发生区域-网格ID不能为空")
+ private Long gridId;
+
+ @Length(max = 500)
+ @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
+ @NotNull(message = "事件描述不能为空")
+ private String eventDes;
+
+ @Length(max = 255)
+ @ApiModelProperty(value = "事件类型,逗号隔开", hidden = false, example = "邻里纠纷,土地承包租赁", required = true)
+ @NotNull(message = "事件类型不能为空")
+ private String eventClazz;
+
+ @Max(127)
+ @ApiModelProperty(value = "危险级别:0 (无) 1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
+ @NotNull(message = "危险级别不能为空")
+ private Integer dangerLevel;
+
+ @Max(9999999999L)
+ @ApiModelProperty(value = "死亡人数", hidden = false, example = "1", required = true)
+ @NotNull(message = "死亡人数不能为空")
+ private Integer deathsNumber;
+
+ @Max(9999999999L)
+ @ApiModelProperty(value = "受伤人数", hidden = false, example = "1", required = true)
+ @NotNull(message = "受伤人数不能为空")
+ private Integer injuriesNumber;
+
+ @ApiModelProperty(value = "是否紧急", hidden = false, example = "true", required = true)
+ @NotNull(message = "是否紧急不能为空")
+ private Boolean urgent;
+
+ @ApiModelProperty(value = "是否重大", hidden = false, example = "true", required = true)
+ @NotNull(message = "是否重大不能为空")
+ private Boolean major;
+
+ @ApiModelProperty(value = "特殊人群", hidden = false, required = true)
+ @NotNull(message = "特殊人员信息不能为空")
+ private List<SpecialPopulationDTO> specialPopulation;
+
+ @ApiModelProperty(value = "音频(限1个)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
+ private String audio;
+
+ @ApiModelProperty(value = "音频时长(单位：秒)", hidden = false, example = "10")
+ private Integer audioTime;
+
+ @ApiModelProperty(value = "视频(限1个)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
+ private String video;
+
+ @ApiModelProperty(value = "视频时长(单位：秒)", hidden = false, example = "10")
+ private Integer videoTime;
+
+ @ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
+ private String pics;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
+ private String userName;
+ @ApiModelProperty(value = "(当前操作)用户电话", hidden = true, example = "18888888888")
+ @Length(max = 11)
+ private String phone;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialPopulationDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialPopulationDTO.java
new file mode 100644
index 0000000..3e14d6b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialPopulationDTO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClasssName SpecialPopulationDTO
+ * @Description TODO
+ * @Author cedoo
+ * @Date 2021/5/28
+ * @Version 1.0
+ **/
+@Data
+@ApiModel("特殊人员信息")
+public class SpecialPopulationDTO {
+ @ApiModelProperty(value = "身份证", hidden = false, required = true)
+ @NotNull(message = "身份证不能为空")
+ private String idCard;
+ @ApiModelProperty(value = "姓名", hidden = false, required = true)
+ @NotNull(message = "姓名不能为空")
+ private String name;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationExportDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationExportDTO.java
new file mode 100644
index 0000000..be2f3db
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationExportDTO.java
@@ -0,0 +1,55 @@
+package com.panzhihua.common.model.dtos.grid.admin;
+
+import java.util.List;
+
+import javax.validation.constraints.Max;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 居民列表-请求参数
+ *
+ * @author lyq
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("居民列表-请求参数")
+public class ComMngPopulationExportDTO {
+
+ @ApiModelProperty(value = "走访状态（1待走访2已走访3待验证5已撤销）")
+ private Integer eventStatus;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "人员标签", hidden = false, example = "")
+ private String label;
+
+ @Max(127)
+ @ApiModelProperty(value = "性别 1.男 2.女", hidden = false, example = "1")
+ private Integer sex;
+
+ @Max(10)
+ @ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
+ private Integer politicalOutlook;
+
+ @Max(2)
+ @ApiModelProperty("关联实有房屋（1.是 2.否）")
+ private Integer isHouse;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "关键词", hidden = false, example = "")
+ private String keyWord;
+
+ @ApiModelProperty(value = "人口id集合")
+ private List<Long> populationIds;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "社区id", hidden = true, example = "1")
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationListDTO.java
new file mode 100644
index 0000000..3520e6f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationListDTO.java
@@ -0,0 +1,62 @@
+package com.panzhihua.common.model.dtos.grid.admin;
+
+import javax.validation.constraints.Max;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 居民列表-请求参数
+ *
+ * @author lyq
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("居民列表-请求参数")
+public class ComMngPopulationListDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "走访状态（1待走访2已走访3待验证5已撤销）")
+ private Integer eventStatus;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "人员标签", hidden = false, example = "")
+ private String label;
+
+ @Max(127)
+ @ApiModelProperty(value = "性别 1.男 2.女", hidden = false, example = "1")
+ private Integer sex;
+
+ @Max(10)
+ @ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
+ private Integer politicalOutlook;
+
+ @Max(2)
+ @ApiModelProperty("关联实有房屋（1.是 2.否）")
+ private Integer isHouse;
+
+ @Length(max = 100)
+ @ApiModelProperty(value = "关键词", hidden = false, example = "")
+ private String keyWord;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "社区id", hidden = true, example = "1")
+ private Long communityId;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "身份证号码", hidden = true, example = "1")
+ private String cardNo;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationRelationHouseDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationRelationHouseDTO.java
new file mode 100644
index 0000000..c3c725b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationRelationHouseDTO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.dtos.grid.admin;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 居民关联房屋-请求参数
+ *
+ * @author lyq
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("居民关联房屋-请求参数")
+public class ComMngPopulationRelationHouseDTO {
+
+ @ApiModelProperty(value = "居民id集合", required = true)
+ private List<Long> populationId;
+
+ @ApiModelProperty(value = "房屋id", required = true)
+ private Long houseId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationSubordinateDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationSubordinateDTO.java
new file mode 100644
index 0000000..b63c62d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngPopulationSubordinateDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.grid.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 居民列表筛选下级-请求参数
+ *
+ * @author lyq
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("居民列表筛选下级-请求参数")
+public class ComMngPopulationSubordinateDTO {
+
+ @ApiModelProperty(value = "1.楼栋 2.单元 3.门牌号", required = true)
+ private Integer type;
+
+ @ApiModelProperty(value = "小区id", required = true)
+ private Long villageId;
+
+ @ApiModelProperty(value = "房屋id")
+ private Long houseId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngVillageListExportAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngVillageListExportAdminDTO.java
new file mode 100644
index 0000000..d42efbc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/ComMngVillageListExportAdminDTO.java
@@ -0,0 +1,68 @@
+package com.panzhihua.common.model.dtos.grid.admin;
+
+import java.util.List;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Pattern;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 小区列表导出-请求参数
+ *
+ * @author lyq
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("小区列表-请求参数")
+public class ComMngVillageListExportAdminDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "小区名称")
+ private String name;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "社区id", hidden = true, example = "1")
+ private Long communityId;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "排序字段, 默认 创建时间：createAt(在住居民数：userSum，楼栋数：buildSum，总户数：houseNum，户籍人口：registerNum)",
+ example = "createAt")
+ private String sortAttr = "createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType = "desc";
+
+ @ApiModelProperty(value = "街路巷")
+ private String alley;
+
+ @ApiModelProperty(value = "门牌号")
+ private String houseNum;
+
+ @ApiModelProperty(value = "小区组")
+ private String groupAt;
+
+ @ApiModelProperty(value = "小区地址")
+ private String address;
+
+ @ApiModelProperty(value = "小区id集合")
+ private List<Long> villageIds;
+
+ public String getSortColumns() {
+ // String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return sortAttr;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/EventGridMemberCascadeAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/EventGridMemberCascadeAddDTO.java
new file mode 100644
index 0000000..1a2349d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/EventGridMemberCascadeAddDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.grid.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 添加网格员级联请求参数
+ *
+ * @author lyq
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("添加网格员级联请求参数")
+public class EventGridMemberCascadeAddDTO {
+
+ @ApiModelProperty(value = "类型（1.社区 2.小区 3.楼栋）")
+ private Integer type;
+
+ @ApiModelProperty(value = "上级id")
+ private Long superiorId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/LcGridMemberDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/LcGridMemberDTO.java
new file mode 100644
index 0000000..0234c26
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/LcGridMemberDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.grid.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("修改网格员状态请求参数")
+public class LcGridMemberDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "工号或者名字", example = "")
+ private String param;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/PageComMngVillagePopulationDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/PageComMngVillagePopulationDTO.java
new file mode 100644
index 0000000..96a8da7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/PageComMngVillagePopulationDTO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.dtos.grid.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询人员列表请求参数")
+public class PageComMngVillagePopulationDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "小区id", required = true)
+ private Long villageId;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "人员标签")
+ private String label;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/PageComMngVillagePopulationHouseDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/PageComMngVillagePopulationHouseDTO.java
new file mode 100644
index 0000000..8350e76
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/admin/PageComMngVillagePopulationHouseDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.grid.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 查询人员房屋列表请求参数
+ *
+ * @author lyq
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("查询人员房屋列表请求参数")
+public class PageComMngVillagePopulationHouseDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "居民id", required = true)
+ private Long populationId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java
new file mode 100644
index 0000000..e9c8fad
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java
@@ -0,0 +1,64 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 邻里圈请求参数
+ */
+@Data
+@ApiModel("邻里圈请求参数")
+public class AddComActNeighborCircleAppDTO {
+
+ @ApiModelProperty("邻里圈内容")
+ private String releaseContent;
+
+ @ApiModelProperty("邻里圈图片url")
+ private String releaseImages;
+
+ @ApiModelProperty("邻里圈话题id")
+ private Long topicId;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "发布人电话", hidden = true)
+ private String phone;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "是否需要审核(1.是 2.否)",hidden = true)
+ private Integer isExamine;
+
+ @ApiModelProperty(value = "微信审核结果(1.通过 2.拒绝)",hidden = true)
+ private Integer wxExamineResult;
+
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+
+ @ApiModelProperty("预计服务时长")
+ private String targetServiceTime;
+
+ private String topicName;
+
+ /**
+ * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
+ */
+ public interface BelongType{
+ int LLQ = 1;
+ int WTQD = 2;
+ int XQQD = 3;
+ }
+
+ /**
+ * 是否需要审核(1.是 2.否)
+ */
+ public interface isExamine{
+ int yes = 1;
+ int no = 2;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAdminDTO.java
new file mode 100644
index 0000000..94fc13a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAdminDTO.java
@@ -0,0 +1,48 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @describe 邻里圈话题列表请求参数
+ */
+@Data
+@ApiModel("邻里圈话题列表请求参数")
+public class AddNeighborCircleTopicAdminDTO {
+
+ @ApiModelProperty("话题名称")
+ private String name;
+
+ @ApiModelProperty(value = "登录用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "发布状态(1.启用 2.禁用)")
+ private Integer status;
+
+ @ApiModelProperty("话题id")
+ private Long id;
+
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+
+ @ApiModelProperty("话题logo")
+ private String logo;
+
+ @ApiModelProperty("排序")
+ private Integer sort;
+
+ private Long communityId;
+
+ /**
+ * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
+ */
+ public interface BelongType{
+ int LLQ = 1;
+ int WTQD = 2;
+ int XQQD = 3;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAppDTO.java
new file mode 100644
index 0000000..869a4ea
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAppDTO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 用户添加邻里圈请求参数
+ */
+@Data
+@ApiModel("用户添加邻里圈请求参数")
+public class AddNeighborCircleTopicAppDTO {
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty("邻里圈话题名称")
+ private String name;
+
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+
+ /**
+ * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
+ */
+ public interface BelongType{
+ int LLQ = 1;
+ int WTQD = 2;
+ int XQQD = 3;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborAddBrowseAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborAddBrowseAppDTO.java
new file mode 100644
index 0000000..c1884b1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborAddBrowseAppDTO.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 邻里圈新增浏览记录请求参数
+ */
+@Data
+@ApiModel("邻里圈新增浏览记录请求参数")
+public class ComActNeighborAddBrowseAppDTO {
+
+ @ApiModelProperty("邻里圈id")
+ private Long circleId;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java
new file mode 100644
index 0000000..03f9fba
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java
@@ -0,0 +1,58 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe 邻里圈请求参数
+ */
+@Data
+@ApiModel("邻里圈请求参数")
+public class ComActNeighborCircleAdminDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty("发布开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startAt;
+
+ @ApiModelProperty("发布结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endAt;
+
+ @ApiModelProperty("议事主题")
+ private String releaseContent;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "发布状态(1.待审核 2.显示 3.隐藏 4.驳回)")
+ private Integer status;
+
+ @ApiModelProperty("话题名称")
+ private String topicName;
+
+ @ApiModelProperty("关键词")
+ private String keyWord;
+
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+ @ApiModelProperty("话题id")
+ private Long topicId;
+
+ private Integer solveStatus;
+
+ @ApiModelProperty(value = "社区id集合", hidden = true)
+ private List<Long> communityIds;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java
new file mode 100644
index 0000000..a215a90
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java
@@ -0,0 +1,72 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 邻里圈请求参数
+ */
+@Data
+@ApiModel("邻里圈请求参数")
+public class ComActNeighborCircleAppDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty("邻里圈查询类型（1.热门 2.最新 3.精品）")
+ private Integer type = 1;
+
+ @ApiModelProperty("话题id")
+ private Long topicId;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty("关键词")
+ private String keyWord;
+
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+
+ @ApiModelProperty(value = "处理状态 0 否 1是", example = "1")
+ private Integer solveStatus;
+
+ @ApiModelProperty(value = "接单人id", example = "1")
+ private Long solveId;
+
+ @ApiModelProperty(value = "查看求助列表 默认传1")
+ private Integer isHelp;
+
+ private String phone;
+
+ @ApiModelProperty("接单类型 1单位 2个人")
+ private Integer orderType;
+ @ApiModelProperty("清单状态")
+ private Integer status;
+
+ @ApiModelProperty(value = "单位id", hidden = true)
+ private Long checkUnitId;
+
+ @ApiModelProperty(value = "社区id集合", hidden = true)
+ private List<Long> communityIds;
+ /**
+ * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
+ */
+ public interface BelongType{
+ int LLQ = 1;
+ int WTQD = 2;
+ int XQQD = 3;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleDetailAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleDetailAppDTO.java
new file mode 100644
index 0000000..910620b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleDetailAppDTO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 邻里圈查看详情请求参数
+ */
+@Data
+@ApiModel("邻里圈查看详情请求参数")
+public class ComActNeighborCircleDetailAppDTO {
+
+ @ApiModelProperty("邻里圈id")
+ private Long circleId;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "评论分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "评论分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "评论排序方式（1.倒序 2.顺序）", example = "10")
+ private Integer order = 1;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleTopicAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleTopicAdminDTO.java
new file mode 100644
index 0000000..59fbf28
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleTopicAdminDTO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @describe 邻里圈话题列表请求参数
+ */
+@Data
+@ApiModel("邻里圈话题列表请求参数")
+public class ComActNeighborCircleTopicAdminDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty("话题名称")
+ private String name;
+
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+
+ private Long communityId;
+
+ @ApiModelProperty(value = "发布状态(1.启用 2.禁用)")
+ private Integer status;
+ /**
+ * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
+ */
+ public interface BelongType{
+ int LLQ = 1;
+ int WTQD = 2;
+ int XQQD = 3;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCommentAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCommentAppDTO.java
new file mode 100644
index 0000000..a06ecd4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCommentAppDTO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 邻里圈评论请求参数
+ */
+@Data
+@ApiModel("邻里圈评论请求参数")
+public class ComActNeighborCommentAppDTO {
+
+ @ApiModelProperty("邻里圈id")
+ private Long circleId;
+
+ @ApiModelProperty("邻里圈评论内容")
+ private String content;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "用户手机号", hidden = true)
+ private String phone;
+
+ private String accessToken;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCommentReplyAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCommentReplyAppDTO.java
new file mode 100644
index 0000000..6b5a144
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCommentReplyAppDTO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 邻里圈查询评论下回复请求参数
+ */
+@Data
+@ApiModel("邻里圈查询评论下回复请求参数")
+public class ComActNeighborCommentReplyAppDTO {
+
+ @ApiModelProperty("评论id")
+ private Long commentId;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborFabulousAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborFabulousAppDTO.java
new file mode 100644
index 0000000..f1b7269
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborFabulousAppDTO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 邻里圈点赞请求参数
+ */
+@Data
+@ApiModel("邻里圈点赞请求参数")
+public class ComActNeighborFabulousAppDTO {
+
+ @ApiModelProperty("邻里圈点赞类型（1.邻里圈 2.评论 3.回复）")
+ private Integer type = 1;
+
+ @ApiModelProperty("邻里圈点赞业务id")
+ private Long serviceId;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ /**
+ * 邻里圈点赞类型（1.邻里圈 2.评论 3.回复）
+ */
+ public interface type {
+ int llq = 1;
+ int pl = 2;
+ int hf = 3;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborForwardAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborForwardAppDTO.java
new file mode 100644
index 0000000..8517cfe
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborForwardAppDTO.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 邻里圈转发请求参数
+ */
+@Data
+@ApiModel("邻里圈转发请求参数")
+public class ComActNeighborForwardAppDTO {
+
+ @ApiModelProperty("邻里圈id")
+ private Long circleId;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborReplyAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborReplyAppDTO.java
new file mode 100644
index 0000000..01c8c30
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborReplyAppDTO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 邻里圈回复请求参数
+ */
+@Data
+@ApiModel("邻里圈回复请求参数")
+public class ComActNeighborReplyAppDTO {
+
+ @ApiModelProperty("邻里圈id")
+ private Long circleId;
+
+ @ApiModelProperty("回复类型（1.评论 2.回复）")
+ private Integer type;
+
+ @ApiModelProperty("业务id（当type为1时，这里是评论的id，当type=2时，这里是回复的id）")
+ private Long serviceId;
+
+ @ApiModelProperty("邻里圈回复内容")
+ private String content;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "用户手机号", hidden = true)
+ private String phone;
+
+ /**
+ * 回复类型（1.评论 2.回复）
+ */
+ public interface type {
+ int pl = 1;
+ int hf = 2;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DeleteNeighborCircleAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DeleteNeighborCircleAppDTO.java
new file mode 100644
index 0000000..ca86ff8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DeleteNeighborCircleAppDTO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 用户删除邻里圈请求参数
+ */
+@Data
+@ApiModel("用户删除邻里圈请求参数")
+public class DeleteNeighborCircleAppDTO {
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty("邻里圈id")
+ private Long id;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DetailNeighborAllCommentByAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DetailNeighborAllCommentByAdminDTO.java
new file mode 100644
index 0000000..83cbe79
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DetailNeighborAllCommentByAdminDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("邻里圈查看详情的评论列表")
+public class DetailNeighborAllCommentByAdminDTO {
+ @ApiModelProperty(value = "邻里圈id")
+ @NotNull(message = "邻里圈id不能为空！")
+ private Long id;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DetailNeighborCommentReplyByAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DetailNeighborCommentReplyByAdminDTO.java
new file mode 100644
index 0000000..37b970c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/DetailNeighborCommentReplyByAdminDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("评论回复列表")
+public class DetailNeighborCommentReplyByAdminDTO {
+ @ApiModelProperty(value = "评论id")
+ @NotNull(message = "评论id不能为空！")
+ private Long id;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ServiceStaticBackstageDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ServiceStaticBackstageDTO.java
new file mode 100644
index 0000000..14cc231
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ServiceStaticBackstageDTO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("社区后台双争统计传参")
+public class ServiceStaticBackstageDTO {
+ @ApiModelProperty("年份")
+ private String year;
+ @ApiModelProperty("单位归属")
+ private String beLongTo;
+ @ApiModelProperty("排序方式 1服务次数 2服务时长")
+ private Integer orderBy;
+ @ApiModelProperty("页数")
+ private Integer pageNum;
+ @ApiModelProperty("页数")
+ private Integer pageSize;
+ @ApiModelProperty("查询类型 1报道单位统计 2报道党员统计")
+ private Integer type;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ServiceStaticDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ServiceStaticDTO.java
new file mode 100644
index 0000000..2c50a22
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ServiceStaticDTO.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.dtos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("服务统计参数")
+public class ServiceStaticDTO {
+ @ApiModelProperty("单位id")
+ private Long checkUnitId;
+ @ApiModelProperty("手机号")
+ private String phone;
+ @ApiModelProperty("年份")
+ private String year;
+ @ApiModelProperty("服务方式（1.承接清单 2.单位参与社区活动 3.报到服务活动 4.党员参与社区活动）")
+ private Integer serviceType;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ActivitySignUpDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ActivitySignUpDTO.java
new file mode 100644
index 0000000..8f02914
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ActivitySignUpDTO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 报名、取消报名党建活动
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-30 10:04
+ **/
+@Data
+@ApiModel("报名、取消报名党建活动")
+public class ActivitySignUpDTO {
+
+ @ApiModelProperty(value = "党建活动id", example = "3", required = true)
+ @Min(value = 1, message = "党建活动不能为空")
+ @NotNull(message = "党建活动不能为空")
+ private Long id;
+
+ @ApiModelProperty(value = "操作类型 0取消报名 1 报名", example = "1", required = true)
+ @Min(value = 0, message = "操作类型不能为空")
+ @NotNull(message = "操作类型不能为空")
+ private Integer type;
+
+ @ApiModelProperty(value = "登录用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/AllData.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/AllData.java
new file mode 100644
index 0000000..11adb5a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/AllData.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import com.panzhihua.common.model.vos.partybuilding.PhotoMicroWishData;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class AllData
+{
+ @ApiModelProperty(value = "议事投票数量")
+ int discussNum=0;
+
+ @ApiModelProperty(value = "问卷调查数量")
+ int questnaireNum=0;
+
+ @ApiModelProperty(value = "社区动态数量")
+ int nommunityDynNum=0;
+
+ @ApiModelProperty(value = "社区活动数量")
+ int nommunityActNum=0;
+
+ //议事投票
+ @ApiModelProperty(value = "议事投票")
+ List<PhotoMicroWishData> discussList;
+ //问卷调查
+ @ApiModelProperty(value = "问卷调查")
+ List<PhotoMicroWishData> questnaireNumList;
+ //社区动态
+ @ApiModelProperty(value = "社区动态")
+ List<PhotoMicroWishData> nommunityDynNumList;
+ //社区活动
+ @ApiModelProperty(value = "社区活动")
+ List<PhotoMicroWishData> nommunityActNumList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComActDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComActDTO.java
new file mode 100644
index 0000000..57d0af3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComActDTO.java
@@ -0,0 +1,143 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 社区表
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-07 14:12
+ **/
+@Data
+public class ComActDTO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * community_id
+ */
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ /**
+ * 社区名字
+ */
+ @ApiModelProperty(value = "社区名字")
+ private String name;
+
+ /**
+ * 社区地址
+ */
+ @ApiModelProperty(value = "社区地址")
+ private String address;
+
+ /**
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ /**
+ * 维度
+ */
+ @ApiModelProperty(value = "维度")
+ private String lat;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ /**
+ * 省份地址编码
+ */
+ @ApiModelProperty(value = "省份地址编码")
+ private String provinceCode;
+
+ /**
+ * 市级地址编码
+ */
+ @ApiModelProperty(value = "经度")
+ private String cityCode;
+
+ /**
+ * 区级地址编码
+ */
+ @ApiModelProperty(value = "区级地址编码")
+ private String areaCode;
+
+ /**
+ * 社区面积
+ */
+ @ApiModelProperty(value = "社区面积")
+ private String square;
+
+ /**
+ * 联系人
+ */
+ @ApiModelProperty(value = "联系人")
+ private String contacts;
+
+ /**
+ * 联系人电话
+ */
+ @ApiModelProperty(value = "联系人电话")
+ private String contactsPhone;
+
+ /** 社区总人口 */
+ @ApiModelProperty(value = "社区总人口")
+ private String totalUser;
+ /** 社区书记-用户ID */
+ @ApiModelProperty(value = "社区书记-用户ID")
+ private String managerId;
+ /** 社区书记_名称 */
+ @ApiModelProperty(value = "社区书记_名称")
+ private String managerName;
+ /** 社区介绍 */
+ @ApiModelProperty(value = "社区介绍")
+ private String introduce;
+ /** 层次递归字段（省>市>区县>街道>社区） */
+ @ApiModelProperty(value = "层次递归字段（省>市>区县>街道>社区）")
+ private String path;
+ /**
+ * 超管账号
+ */
+ @ApiModelProperty(value = "超管账号")
+ private String account;
+
+ /**
+ * 账号密码
+ */
+ @ApiModelProperty(value = "账号密码")
+ private String password;
+
+ /**
+ * 状态 0 启用 1 禁用
+ */
+ @ApiModelProperty(value = "状态 0 启用 1 禁用")
+ private String state;
+
+ /**
+ * 街道ID
+ */
+ @ApiModelProperty(value = "街道ID")
+ private String streetId;
+
+ /**
+ * 明文密码
+ */
+ @ApiModelProperty(value = "明文密码")
+ private String plaintextPassword;
+
+
+ @ApiModelProperty(value = "经度")
+ private String appId;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComDataStatisticsOrgDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComDataStatisticsOrgDto.java
new file mode 100644
index 0000000..db05ddc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComDataStatisticsOrgDto.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 查询党建数据统计请求参数
+ */
+@Data
+@ApiModel("查询党建数据统计请求参数")
+public class ComDataStatisticsOrgDto {
+
+ @ApiModelProperty(value = "党员列表分页参数-当前页数")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "党员列表分页参数-每页记录数")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "党组织id",required = true)
+ private Long orgId;
+
+ @ApiModelProperty(value = "查询年份",required = true)
+ private Integer year;
+
+ @ApiModelProperty(value = "查询开始时间",hidden = true)
+ private String startTime;
+
+ @ApiModelProperty(value = "查询结束时间",hidden = true)
+ private String endTime;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "区域编码",hidden = true)
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComListPartyDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComListPartyDTO.java
new file mode 100644
index 0000000..1fda6a1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComListPartyDTO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 查询党组织列表请求参数
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-21 18:05
+ **/
+@Data
+@ApiModel("查询党组织列表请求参数")
+public class ComListPartyDTO {
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbActivityDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbActivityDTO.java
new file mode 100644
index 0000000..8ec1330
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbActivityDTO.java
@@ -0,0 +1,89 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import java.util.Date;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 党员活动
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-22 10:43
+ **/
+@Data
+@ApiModel("党员活动-小程序新增")
+public class ComPbActivityDTO {
+ @ApiModelProperty("id")
+ private Long id;
+
+ @ApiModelProperty(value = "活动名称", required = true)
+ @NotBlank(groups = {AddGroup.class}, message = "活动名称不能为空")
+ private String name;
+
+ @ApiModelProperty(value = "活动地点", required = true)
+ @NotBlank(groups = {AddGroup.class}, message = "活动地点不能为空")
+ private String address;
+
+ @ApiModelProperty(value = "活动最高参入人数", required = true)
+ @Min(value = 1, groups = {AddGroup.class}, message = "活动最高参入人数不能为空")
+ private Integer participationNum;
+
+ @ApiModelProperty(value = "活动最低参入人数-未达到到时间自动取消", required = true)
+ @Min(value = 0, groups = {AddGroup.class}, message = "活动最低参入人数不能为空")
+ private Integer participationLowestNum;
+
+ @ApiModelProperty(value = "活动封面", required = true)
+ @NotBlank(groups = {AddGroup.class}, message = "活动封面不能为空")
+ private String cover;
+
+ @ApiModelProperty(value = "活动内容-富文本", required = true)
+ @NotBlank(groups = {AddGroup.class}, message = "活动内容不能为空")
+ private String richText;
+
+ @ApiModelProperty("1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
+ private Integer status;
+
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ @ApiModelProperty(value = "活动开始时间", required = true, example = "2020-01-02 08:00:00")
+ @NotNull(groups = {AddGroup.class}, message = "活动开始时间不能为空")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date activityTimeBegin;
+
+ @ApiModelProperty(value = "活动结束时间", required = true, example = "2020-01-02 08:00:00")
+ @NotNull(groups = {AddGroup.class}, message = "活动结束时间不能为空")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date activityTimeEnd;
+
+ @ApiModelProperty(value = "报名开始时间", required = true, example = "2020-01-02 08:00:00")
+ @NotNull(groups = {AddGroup.class}, message = "报名开始时间不能为空")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date enrollTimeBegin;
+
+ @ApiModelProperty(value = "报名结束时间", required = true, example = "2020-01-02 08:00:00")
+ @NotNull(groups = {AddGroup.class}, message = "报名结束时间不能为空")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date enrollTimeEnd;
+
+ @ApiModelProperty("取消原因")
+ private String cancelReason;
+
+ @ApiModelProperty("发布人主键")
+ private Long createBy;
+
+ @ApiModelProperty("发布时间")
+ private Date releaseTime;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbCheckUserDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbCheckUserDTO.java
new file mode 100644
index 0000000..bb3cc7a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbCheckUserDTO.java
@@ -0,0 +1,13 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+public class ComPbCheckUserDTO {
+ private String account;
+ private String password;
+ private Long checkUnitId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java
new file mode 100644
index 0000000..af2eab5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java
@@ -0,0 +1,67 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 服务团队新增
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-21 17:42
+ **/
+@Data
+@ApiModel("服务团队")
+public class ComPbServiceTeamDTO {
+
+ @ApiModelProperty("id")
+ private Long id;
+
+ @ApiModelProperty("姓名")
+ @NotBlank(groups = AddGroup.class, message = "姓名不能为空")
+ private String name;
+
+ @ApiModelProperty("职位")
+ @NotBlank(groups = AddGroup.class, message = "职位不能为空")
+ private String job;
+
+ @ApiModelProperty("职位2")
+ private String jobTwo;
+
+ @ApiModelProperty("岗位职责")
+ @NotBlank(groups = AddGroup.class, message = "岗位职责不能为空")
+ private String jobResponsibilities;
+
+ @ApiModelProperty("照片")
+ @NotBlank(groups = AddGroup.class, message = "照片不能为空")
+ private String url;
+
+ @ApiModelProperty("电话")
+ @NotBlank(groups = AddGroup.class, message = "电话不能为空")
+ private String phone;
+
+ @ApiModelProperty("create_at")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "区域编码", hidden = true)
+ private String areaCode;
+
+ @ApiModelProperty(value = "appid", hidden = true)
+ private String appid;
+
+ @ApiModelProperty("物业公司id")
+ private Long propertyId;
+ @ApiModelProperty("1是社区团队 2党员先锋")
+ private Integer type;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/DoubleRegistrationData.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/DoubleRegistrationData.java
new file mode 100644
index 0000000..8d7d974
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/DoubleRegistrationData.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class DoubleRegistrationData implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ //报道需求统计数
+ @ApiModelProperty(value = "报道需求")
+ private Integer NeedNum=0;
+
+ //报道问题
+ @ApiModelProperty(value = "报道问题")
+ private Integer ProblemNum=0;
+
+ //获取旧双报道服务时间
+ @ApiModelProperty(value = "报道服务时间")
+ private Double times=0.0;
+
+ //党建动态数据
+ @ApiModelProperty(value = "党建动态数据")
+ private Integer PartyBuildingNum=0;
+
+ //报到单位总计数据
+ @ApiModelProperty(value = "报到单位总计数据")
+ private Integer UnitNum=0;
+
+ //报到党员总计数据
+ @ApiModelProperty(value = "报到党员总计数据")
+ private Integer MemberNum=0;
+
+ @ApiModelProperty(value = "报到服务次数")
+ private Integer allNum=0;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemClaimDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemClaimDTO.java
new file mode 100644
index 0000000..76d5b3d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemClaimDTO.java
@@ -0,0 +1,54 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("新双争双评需求问题清单认领")
+public class NeedProblemClaimDTO
+{
+ @ApiModelProperty("主键")
+ private String id;
+
+ @ApiModelProperty("任务id")
+ private String taskId;
+
+ @ApiModelProperty("单位id")
+ private String unitId;
+
+ @ApiModelProperty("领取人员id")
+ private String userId;
+
+ @ApiModelProperty("领取人员姓名")
+ private String userName;
+
+ @ApiModelProperty("领取人员头像")
+ private String userImage;
+
+ @ApiModelProperty("服务时间")
+ private String serviceTime;
+
+ @ApiModelProperty("打卡开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date punchStartTime;
+
+ @ApiModelProperty("打卡结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date punchEndTime;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemInventoryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemInventoryDTO.java
new file mode 100644
index 0000000..e0cbb44
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemInventoryDTO.java
@@ -0,0 +1,116 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("新双争双评需求问题清单")
+public class NeedProblemInventoryDTO
+{
+ @ApiModelProperty("主键")
+ private String id;
+
+ @ApiModelProperty("标题")
+ private String title;
+
+ @ApiModelProperty("社区id")
+ private String communityId;
+
+ @ApiModelProperty("分类名称")
+ private String classifyName;
+
+ @ApiModelProperty("分类id")
+ private String classifyId;
+
+ @ApiModelProperty("认领人数限制(-1 不限制) ")
+ private String claimNum;
+
+ @ApiModelProperty("认领人数")
+ private String joinNum;
+
+ @ApiModelProperty("需求地址")
+ private String address;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ private String lon;
+
+ @ApiModelProperty("认领开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date claimStartTime;
+
+ @ApiModelProperty("认领结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date claimEndTime;
+
+ @ApiModelProperty("需求开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date needStartTime;
+
+ @ApiModelProperty("需求结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date needEndTime;
+
+ @ApiModelProperty("联系人")
+ private String linkman;
+
+ @ApiModelProperty("电话")
+ private String phone;
+
+ @ApiModelProperty("签到范围")
+ private String signInScope;
+
+ @ApiModelProperty("签退范围")
+ private String signOutScope;
+
+ @ApiModelProperty("奖励")
+ private String award;
+
+ @ApiModelProperty("内容")
+ private String content;
+
+ @ApiModelProperty("图片")
+ private String imgsUrl;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ @ApiModelProperty("1问题清单 2需求清单")
+ private String kind;
+
+ @ApiModelProperty("创建人id")
+ private String userId;
+
+ @ApiModelProperty("状态 （1认领中 2进行中 3已完成）")
+ private String status;
+
+ @ApiModelProperty("是否参加任务 0未参加 1参加")
+ private String isJoin;
+
+ @ApiModelProperty("服务时长 毫秒值")
+ private String serviceTime;
+
+ @ApiModelProperty("是否显示 1显示 0隐藏 默认显示")
+ private String isDisplay;
+
+ @ApiModelProperty("开始时间打卡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date punchStartTime;
+
+ @ApiModelProperty("结束时间打卡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date punchEndTime;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemUnitTaskDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemUnitTaskDTO.java
new file mode 100644
index 0000000..54ef3cb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemUnitTaskDTO.java
@@ -0,0 +1,103 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("任务需求单位任务")
+public class NeedProblemUnitTaskDTO
+{
+ @ApiModelProperty("主键")
+ private String id;
+
+ @ApiModelProperty("标题")
+ private String title;
+
+ @ApiModelProperty("社区id")
+ private String communityId;
+
+ @ApiModelProperty("分类id")
+ private String classifyId;
+
+ @ApiModelProperty("分类名称")
+ private String classifyName;
+
+ @ApiModelProperty("认领人数")
+ private String claimNum;
+
+ @ApiModelProperty("需求地址")
+ private String address;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ private String lon;
+
+ @ApiModelProperty("认领开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date claimStartTime;
+
+ @ApiModelProperty("认领结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date claimEndTime;
+
+ @ApiModelProperty("需求开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date needStartTime;
+
+ @ApiModelProperty("需求结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date needEndTime;
+
+ @ApiModelProperty("联系人")
+ private String linkman;
+
+ @ApiModelProperty("电话")
+ private String phone;
+
+ @ApiModelProperty("联系电话")
+ private String signInScope;
+
+ @ApiModelProperty("签到范围")
+ private String signOutScope;
+
+ @ApiModelProperty("签退范围")
+ private String award;
+
+ @ApiModelProperty("奖励")
+ private String content;
+
+ @ApiModelProperty("图片")
+ private String imgsUrl;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ @ApiModelProperty("1问题清单 2需求清单")
+ private String kind;
+
+ @ApiModelProperty("创建人id")
+ private String userId;
+
+ @ApiModelProperty("代单位接单人")
+ private String unitUserId;
+
+ @ApiModelProperty("任务id")
+ private String taskId;
+ @ApiModelProperty("公司id")
+ private String unitId;
+
+ @ApiModelProperty("状态 （1认领中 2进行中 3已完成）")
+ private String status;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightCommunityConstructionDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightCommunityConstructionDTO.java
new file mode 100644
index 0000000..8d9b702
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightCommunityConstructionDTO.java
@@ -0,0 +1,75 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ApiModel("新双争双评社区共建")
+public class NewFightCommunityConstructionDTO
+{
+ @ApiModelProperty("主键")
+ private String id;
+
+
+ @ApiModelProperty("项目封面")
+ private String itemCover;
+
+ @ApiModelProperty("项目标题")
+ private String itemTitle;
+
+ @ApiModelProperty("协议标题")
+ private String agreementTitle;
+
+
+ @ApiModelProperty("协议内容")
+ private String agreementContent;
+
+ @ApiModelProperty("共建社区id")
+ private String constructionCommunityId;
+
+ @ApiModelProperty("创建人id")
+ private String userId;
+
+ @ApiModelProperty("社区id")
+ private String communityId;
+
+ @ApiModelProperty("社区名字")
+ private String communityName;
+
+ @ApiModelProperty("是否参与0 未参与 1已参与")
+ private String isJoin="0";
+
+ @ApiModelProperty("状态（1已发布 2进行中 3已完成）")
+ private String status;
+
+ @ApiModelProperty("预计完工时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date estimatedTime;
+
+ @ApiModelProperty("预计开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ @ApiModelProperty("协议定制时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date agreementCustomizationTime;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+
+ @ApiModelProperty("项目规划内容")
+ private List<NewFightProjectPlanDTO> list;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightIntegral.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightIntegral.java
new file mode 100644
index 0000000..aa84c63
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightIntegral.java
@@ -0,0 +1,53 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel("新双争双评积分参数")
+public class NewFightIntegral
+{
+ @ApiModelProperty(value = "用户id", required = true)
+ @Min(value = 1, message = "用户id不能为空")
+ @NotNull(message = "用户id不能为空")
+ private String userId;
+
+ @ApiModelProperty(value = "社区id", required = true)
+ @Min(value = 1, message = "社区id不能为空")
+ @NotNull(message = "社区id不能为空")
+ private String communityId;
+
+
+ @ApiModelProperty(value = "增加还是减少 1增加 2减少")
+ private int addOrReduce=1;
+
+
+ @ApiModelProperty(value = "积分变动数量")
+ private String integralNum="0";
+
+ @ApiModelProperty(value = "商家id")
+ private String merchantId;
+
+ @ApiModelProperty(value = "变动备注")
+ private String remark;
+
+ @ApiModelProperty(value = "业务类型 9商城积分兑换 10商家线下积分兑换 11花城登录 12 查看问题清单 " +
+ "13查看需求清单 14 查看报道服务活动 15查看微心愿 16 查看随手拍 17 每日签到 18 上传“随手拍”或“微心愿",required = true)
+ private String type="9";
+
+ @ApiModelProperty(value = "交易身份类型（1.居民 2.党员 3.志愿者）")
+ private String identityType="1";
+
+ @ApiModelProperty(value = "交易业务id")
+ private String serviceId="0";
+
+ @ApiModelProperty(value = "完成任务领取积分奖励的任务id")
+ private String taskId="0";
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightProjectEvaluateDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightProjectEvaluateDTO.java
new file mode 100644
index 0000000..2474206
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightProjectEvaluateDTO.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("新双争双评项目评论")
+public class NewFightProjectEvaluateDTO
+{
+ @ApiModelProperty("主键")
+ private String id;
+
+
+ @ApiModelProperty("项目id")
+ private String projectId;
+
+
+ @ApiModelProperty("评价内容")
+ private String content;
+
+ @ApiModelProperty("评分")
+ private String score;
+
+ @ApiModelProperty("参与用户id")
+ private String userId;
+
+ @ApiModelProperty("参与用户姓名")
+ private String userName;
+
+ @ApiModelProperty("参与用户头像")
+ private String userImg;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightProjectJoinDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightProjectJoinDTO.java
new file mode 100644
index 0000000..93f0182
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightProjectJoinDTO.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("项目参与人员表")
+public class NewFightProjectJoinDTO
+{
+ @ApiModelProperty("主键")
+ private String id;
+
+
+ @ApiModelProperty("项目id")
+ private String projectId;
+
+ @ApiModelProperty("参与用户id")
+ private String userId;
+
+ @ApiModelProperty("参与用户姓名")
+ private String userName;
+
+ @ApiModelProperty("参与用户头像")
+ private String userImg;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightProjectPlanDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightProjectPlanDTO.java
new file mode 100644
index 0000000..4aed130
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightProjectPlanDTO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("新双争双评社区共建")
+public class NewFightProjectPlanDTO
+{
+ @ApiModelProperty("主键")
+ private String id;
+
+
+ @ApiModelProperty("项目id")
+ private String projectId;
+
+ @ApiModelProperty("协议规划")
+ private String agreementPlan;
+
+ @ApiModelProperty("完工节点")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date completionTime;
+
+ @ApiModelProperty("规划内容")
+ private String planContent;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ @ApiModelProperty("确认完工时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date affirmTime;
+
+ @ApiModelProperty("是否完成 0未完成 1完成")
+ private String accomplish;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightResourceSharingDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightResourceSharingDTO.java
new file mode 100644
index 0000000..9d71e08
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightResourceSharingDTO.java
@@ -0,0 +1,53 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("资源共享")
+public class NewFightResourceSharingDTO
+{
+ @ApiModelProperty("主键")
+ private String id;
+
+ @ApiModelProperty("服务项目名称")
+ private String title;
+
+ @ApiModelProperty("单位id")
+ private String unitId;
+
+ @ApiModelProperty("单位名称")
+ private String unitName;
+
+ @ApiModelProperty("项目id")
+ private String meritId;
+
+ @ApiModelProperty("图片")
+ private String imgUrl;
+
+ @ApiModelProperty("电话")
+ private String phone;
+
+ @ApiModelProperty("联系人姓名")
+ private String linkman;
+
+ @ApiModelProperty(" 社区id")
+ private String communityId;
+
+
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComDataStatisticsMemberDto.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComDataStatisticsMemberDto.java
new file mode 100644
index 0000000..6b1890c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComDataStatisticsMemberDto.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询党建数据统计请求参数
+ */
+@Data
+@ApiModel("分页查询党建数据统计请求参数")
+public class PageComDataStatisticsMemberDto {
+
+ @ApiModelProperty(value = "分页-当前页数")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "年份")
+ private Integer month;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "区域编码", hidden = true)
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComPbServiceTeamDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComPbServiceTeamDTO.java
new file mode 100644
index 0000000..b04379e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComPbServiceTeamDTO.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 分页查询团队成员
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-21 18:05
+ **/
+@Data
+@ApiModel("分页查询团队成员")
+public class PageComPbServiceTeamDTO {
+ @ApiModelProperty(value = "分页-当前页数", example = "1", required = true)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10", required = true)
+ private Long pageSize;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+ @ApiModelProperty("照片")
+ private String url;
+ @ApiModelProperty("职位")
+ private String job;
+ @ApiModelProperty("岗位职责")
+ private String jobResponsibilities;
+ @ApiModelProperty("电话")
+ private String phone;
+ @ApiModelProperty("是否注册")
+ private Integer isReg;
+ @ApiModelProperty(value = "街道id", hidden = true)
+ private Long streetId;
+ @ApiModelProperty("关键字")
+ private String keyword;
+ @ApiModelProperty("物业公司id")
+ private Long propertyId;
+ @ApiModelProperty("1是社区团队 2党员先锋")
+ private Integer type;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PhotoMicroWish.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PhotoMicroWish.java
new file mode 100644
index 0000000..cb64984
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PhotoMicroWish.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import com.panzhihua.common.model.vos.partybuilding.PhotoMicroWishData;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@ApiModel("街道大屏随手拍-微心愿")
+public class PhotoMicroWish
+{
+
+ @ApiModelProperty(value = "随手拍数量")
+ int photoNum=0;
+
+ @ApiModelProperty(value = "微心愿数量")
+ int microWishNum=0;
+
+ @ApiModelProperty(value = "随手拍")
+ List<PhotoMicroWishData> photoList;
+
+ @ApiModelProperty(value = "微心愿")
+ List<PhotoMicroWishData> microWishList;
+
+
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/QryReportResp.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/QryReportResp.java
new file mode 100644
index 0000000..4988e13
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/QryReportResp.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class QryReportResp {
+
+ @ApiModelProperty("分类id")
+ private String categoryId;
+
+ @ApiModelProperty("分类名称")
+ private String categoryName;
+
+ @ApiModelProperty("数量")
+ private String sum;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/StreetCoreData.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/StreetCoreData.java
new file mode 100644
index 0000000..3a4faca
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/StreetCoreData.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 街道大屏核心数据
+ */
+@Data
+public class StreetCoreData implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "小程序用户")
+ private int userNum=0;
+
+ @ApiModelProperty(value = "实有人口总数")
+ private int ActualPopNum=0;
+
+ @ApiModelProperty(value = "小区总数")
+ private int VillageNum=0;
+
+ @ApiModelProperty(value = "志愿者总数")
+ private int VolunteerNum=0;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ThreeNumData.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ThreeNumData.java
new file mode 100644
index 0000000..bd04b3d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ThreeNumData.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 街道大屏三资三务数据
+ */
+@Data
+public class ThreeNumData implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "党务公开")
+ private int partyAffairsNum=0;
+
+ @ApiModelProperty(value = "服务公开")
+ private int serviceNum=0;
+
+ @ApiModelProperty(value = "财务公开")
+ private int financeNum=0;
+
+ @ApiModelProperty(value = "资金公开")
+ private int fundNum=0;
+
+ @ApiModelProperty(value = "资产公开")
+ private int propertyNum=0;
+
+
+ @ApiModelProperty(value = "资源公开")
+ private int naturalResourcesNum=0;
+
+ @ApiModelProperty(value = "村集体经济组织项目")
+ private int villageEconomyNum=0;
+
+
+ @ApiModelProperty(value = "三务总数量")
+ private int threeServiceNum=0;
+
+
+ @ApiModelProperty(value = "三资总数量")
+ private int threeFundNum=0;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/UserRankDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/UserRankDTO.java
new file mode 100644
index 0000000..5944920
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/UserRankDTO.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.dtos.partybuilding;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("用户排序内容")
+public class UserRankDTO
+{
+ @ApiModelProperty("社区id")
+ private String communityId;
+
+ @ApiModelProperty("单位id")
+ private String checkUnitId;
+
+
+ @ApiModelProperty("头像")
+ private String imageUrl;
+
+ @ApiModelProperty("用户id")
+ private String userId;
+
+ @ApiModelProperty("用户名")
+ private String userName;
+
+ @ApiModelProperty("单位名")
+ private String unitName;
+
+ @ApiModelProperty("社区名")
+ private String communityName;
+
+ @ApiModelProperty("积分")
+ private String amount;
+
+ @ApiModelProperty("排名")
+ private String rank;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
new file mode 100644
index 0000000..d027a56
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
@@ -0,0 +1,82 @@
+package com.panzhihua.common.model.dtos.property;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class CommonPage {
+ @ApiModelProperty("页数")
+ private Integer page;
+ @ApiModelProperty("条数")
+ private Integer size;
+ @ApiModelProperty("名称条件")
+ private String name;
+ @ApiModelProperty("状态")
+ private Integer status;
+ @ApiModelProperty("用户姓名")
+ private String username;
+ @ApiModelProperty("手机号")
+ private String phone;
+ @ApiModelProperty("地址参数")
+ private String address;
+ @ApiModelProperty("创建开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date beginTime;
+ @ApiModelProperty("创建结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+ @ApiModelProperty("系统用户姓名")
+ private Date systemName;
+ @ApiModelProperty("用户Id")
+ private Long userId;
+ @ApiModelProperty("参数id")
+ private Long paramId;
+ @ApiModelProperty("类型")
+ private Integer type;
+ @ApiModelProperty("状态开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date statusBeginTime;
+ @ApiModelProperty("状态结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date statusEndTime;
+ @ApiModelProperty("编号")
+ private String serialNo;
+ @ApiModelProperty("小区id")
+ private Long areaId;
+ @ApiModelProperty("关键字")
+ private String keyword;
+ @ApiModelProperty("职务")
+ private String position;
+ @ApiModelProperty("参数id2")
+ private Integer paramId2;
+ @ApiModelProperty("社区id")
+ private Long communityId;
+ @ApiModelProperty("商家id")
+ private Long merchantId;
+ @ApiModelProperty("街道id")
+ private Long streetId;
+ @ApiModelProperty("分类2")
+ private Integer type2;
+ @ApiModelProperty("一级分类")
+ private Integer columnId;
+ @ApiModelProperty("二级分类")
+ private Integer secondColumnId;
+ @ApiModelProperty(value = "是否公示（1.是 2.否）")
+ private Integer isPublicity;
+ @ApiModelProperty(value = "账号类型 1街道 2社区 3社会组织", hidden = true)
+ private Integer userType;
+ @ApiModelProperty(value = "社会组织id", hidden = true)
+ private Long orgId;
+ @ApiModelProperty("物业id")
+ private Long propertyId;
+ @ApiModelProperty("是否为物业查看报事报修")
+ private Integer propertyCheck;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/PagePropertyWorkerDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/PagePropertyWorkerDTO.java
new file mode 100644
index 0000000..bfa6662
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/PagePropertyWorkerDTO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.dtos.property;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PagePropertyWorkerDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页查询物业工作人员请求参数
+ * @author: hans
+ * @date: 2022/04/26 10:21
+ */
+@Data
+@ApiModel("分页查询物业工作人员请求参数")
+public class PagePropertyWorkerDTO {
+
+ @ApiModelProperty(value = "关键字")
+ private String keyword;
+
+ @ApiModelProperty(value = "物业公司关联id")
+ @NotNull
+ private Long refId;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull
+ private Long pageSize;
+ @ApiModelProperty("物业id")
+ private Long propertyId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/PropertyWorkerDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/PropertyWorkerDTO.java
new file mode 100644
index 0000000..3b92d46
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/PropertyWorkerDTO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.dtos.property;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PropertyWorkerDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 新增/编辑物业工作人员请求参数类
+ * @author: hans
+ * @date: 2022/04/26 10:06
+ */
+@Data
+@ApiModel("新增/编辑物业工作人员请求参数类")
+public class PropertyWorkerDTO {
+
+ @ApiModelProperty("物业工作人员id")
+ @NotNull(groups = {PutGroup.class}, message = "物业工作人员id不能为空")
+ private Long id;
+
+ @ApiModelProperty("工作人员姓名")
+ @NotBlank(groups = {AddGroup.class}, message = "工作人员姓名不能为空")
+ private String name;
+
+ @ApiModelProperty("手机号")
+ @NotBlank(groups = {AddGroup.class}, message = "手机号不能为空")
+ private String phone;
+
+ @ApiModelProperty("职务")
+ @NotBlank(groups = {AddGroup.class}, message = "职务不能为空")
+ private String position;
+
+ @ApiModelProperty("照片")
+ private String image;
+
+ @ApiModelProperty("物业公司关联id")
+ @NotNull(groups = {AddGroup.class}, message = "物业公司关联id不能为空")
+ private Long refId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopAddressDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopAddressDTO.java
new file mode 100644
index 0000000..f556140
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopAddressDTO.java
@@ -0,0 +1,52 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 分页查询店铺
+ */
+@Data
+@ApiModel("分页查询店铺")
+public class ComShopAddressDTO {
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty("用户收货地址id")
+ private Long addressId;
+
+ @ApiModelProperty("收货人名称")
+ private String name;
+
+ @ApiModelProperty("收货人手机号")
+ private String phone;
+
+ @ApiModelProperty("收货人省份编码")
+ private String provinceCode;
+
+ @ApiModelProperty("收货人城市编码")
+ private String cityCode;
+
+ @ApiModelProperty("收货人区县编码")
+ private String districtCode;
+
+ @ApiModelProperty("收货人详细地址")
+ private String detailAddress;
+
+ @ApiModelProperty("是否是默认地址(1.是 2.否)")
+ private Integer isDefault;
+
+ @ApiModelProperty("收货人省份名称")
+ private String provinceName;
+
+ @ApiModelProperty("收货人城市名称")
+ private String cityName;
+
+ @ApiModelProperty("收货人区/县名称")
+ private String districtName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopCartDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopCartDTO.java
new file mode 100644
index 0000000..5e0495d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopCartDTO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 购物车
+ */
+@Data
+@ApiModel("购物车")
+public class ComShopCartDTO {
+
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品名称", required = true)
+ private Long goodsId;
+
+ /**
+ * 商品规格id
+ */
+ @ApiModelProperty(value = "商品规格id", required = true)
+ private Long goodsAttrId;
+
+ /**
+ * 数量
+ */
+ @ApiModelProperty(value = "数量", required = true)
+ private Integer number;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopEditNubCartDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopEditNubCartDTO.java
new file mode 100644
index 0000000..9cbbb22
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopEditNubCartDTO.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 购物车修改
+ */
+@Data
+@ApiModel("购物车修改")
+public class ComShopEditNubCartDTO {
+
+ @ApiModelProperty(value = "购物车id", required = true)
+ private Long cartId;
+
+ @ApiModelProperty(value = "购物车商品数量", required = true)
+ private Integer number;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerEvaluateDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerEvaluateDTO.java
new file mode 100644
index 0000000..62009ce
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerEvaluateDTO.java
@@ -0,0 +1,65 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: ComShopFlowerEvaluate
+ * @Author: yh
+ * @Date: 2022/11/9 16:46
+ * @Description: 评价表
+ */
+
+@Data
+@ApiModel("评价信息")
+public class ComShopFlowerEvaluateDTO{
+
+
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private String goodsId;
+
+ /**
+ * 评价人id
+ */
+ @ApiModelProperty(value = "评价人id")
+ private Long userId;
+
+ /**
+ * 评价时间
+ */
+ @ApiModelProperty(value = "评价时间")
+ private Date evaluateTime;
+
+ /**
+ * 评价类型(5.非常满意 4.满意 3.一般 3.不满意 1.糟糕透了)
+ */
+ @ApiModelProperty(value = "评价类型(5.非常满意 4.满意 3.一般 3.不满意 1.糟糕透了)")
+ private Integer evaluateType;
+
+ /**
+ * 评价内容
+ */
+ @ApiModelProperty(value = "评价内容")
+ private String evaluateContent;
+
+ /**
+ * 评价图片
+ */
+ @ApiModelProperty(value = "评价图片")
+ private String evaluatePic;
+
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerGoodsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerGoodsDTO.java
new file mode 100644
index 0000000..1d40636
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerGoodsDTO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther yh
+ * @create 2022-10-21 09:36:09
+ * @describe 查询商品请求参数
+ */
+@Data
+@ApiModel("查询商品请求参数")
+public class ComShopFlowerGoodsDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty("商品名称")
+ private String name;
+
+ @ApiModelProperty("店铺id")
+ private Long storeId;
+
+ @ApiModelProperty("商品状态(1.出售中 2.已下架 3.回收站)")
+ private Integer status;
+
+ @ApiModelProperty("配送方式（1.商家配送 2.快递物流）")
+ private Integer deliveryType;
+
+ @ApiModelProperty(hidden = true)
+ private Long userId;
+
+ @ApiModelProperty("商品分类id")
+ private Long categoriesId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerOrderDeliveryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerOrderDeliveryDTO.java
new file mode 100644
index 0000000..a287e3d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerOrderDeliveryDTO.java
@@ -0,0 +1,62 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 购物车
+ */
+@Data
+@ApiModel("配送单")
+public class ComShopFlowerOrderDeliveryDTO {
+
+ /**
+ * id
+ */
+ @ApiModelProperty(value = "配送单id")
+ private Long id;
+
+ /**
+ * 自提点id
+ */
+ @ApiModelProperty(value = "自提点id")
+ private Long pointId;
+
+ /**
+ * 自提点id
+ */
+ @ApiModelProperty(value = "自提点名称")
+ private String pointName;
+
+ /**
+ * 配送订单数量
+ */
+ @ApiModelProperty(value = "配送订单数量")
+ private Integer deliveryOrderNum;
+
+ /**
+ * 配送商品数量
+ */
+ @ApiModelProperty(value = "配送商品数量")
+ private Integer deliveryGoodsNum;
+
+ /**
+ * 价值
+ */
+ @ApiModelProperty(value = "价值")
+ private BigDecimal deliveryAmount;
+
+
+
+ @ApiModelProperty(value = "订单id集合")
+ private List<Long> orderIds;
+
+ @ApiModelProperty(value = "商品id")
+ private Long storeId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerRefundOrderDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerRefundOrderDTO.java
new file mode 100644
index 0000000..19f5782
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerRefundOrderDTO.java
@@ -0,0 +1,86 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @auther yh
+ * @create 2022-11-08 17:25:45
+ * @describe 退款申请
+ */
+@Data
+@ApiModel("退款申请")
+public class ComShopFlowerRefundOrderDTO {
+
+ /**
+ * 退款订单id
+ */
+ @ApiModelProperty(value = "退款订单id")
+ private Long id;
+
+ /**
+ * 店铺id
+ */
+ @ApiModelProperty(value = "店铺id")
+ private Long storeId;
+
+ /**
+ * 原始订单号
+ */
+ @ApiModelProperty(value = "原始订单号")
+ private String orderNo;
+
+
+ /**
+ * 原始订单id
+ */
+ @ApiModelProperty(value = "原始订单id")
+ private String orderId;
+
+ /**
+ * 支付总金额
+ */
+ @ApiModelProperty(value = "支付总金额")
+ private BigDecimal payAmount;
+
+ /**
+ * 申请退款金额
+ */
+ @ApiModelProperty(value = "申请退款金额")
+ private BigDecimal refundAmount;
+
+ /**
+ * 退款原因
+ */
+ @ApiModelProperty(value = "退款原因")
+ private String refundReason;
+
+ /**
+ * 退款照片
+ */
+ @ApiModelProperty(value = "退款照片")
+ private String refundPic;
+
+ /**
+ * 处理结果
+ */
+ @ApiModelProperty(value = "处理结果(1.同意 2.拒绝)")
+ private String handleResult;
+
+ /**
+ * 商家备注
+ */
+ @ApiModelProperty(value = "商家备注")
+ private String remark;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFundsExportDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFundsExportDTO.java
new file mode 100644
index 0000000..ef90879
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFundsExportDTO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClasssName OrderShipDTO
+ * @Description TODO
+ * @Author cedoo
+ * @Date 2021/4/16
+ * @Version 1.0
+ **/
+@Data
+@ApiModel("订单导出信息")
+public class ComShopFundsExportDTO {
+
+ @ApiModelProperty(value = "订单编号", example = "316356541616")
+ private String orderNo;
+ @ApiModelProperty(value = "支付时间-开始", example = "2021-03-18 19:59:06")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date payTimeStart;
+ @ApiModelProperty(value = "支付时间-结束", example = "2021-04-18 19:59:14")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date payTimeEnd;
+ @ApiModelProperty(value = "订单ID-如果指定了订单ID，只导出指定订单，其它搜索条件将被忽略", notes = "如果指定了订单ID，其它搜索条件将被忽略，只导出指定订单")
+ private Long[] orderIds;
+ @ApiModelProperty(hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopGoodsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopGoodsDTO.java
new file mode 100644
index 0000000..d47c37c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopGoodsDTO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 查询商品请求参数
+ */
+@Data
+@ApiModel("查询商品请求参数")
+public class ComShopGoodsDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty("商品名称")
+ private String name;
+
+ @ApiModelProperty("店铺id")
+ private Long storeId;
+
+ @ApiModelProperty("商品状态(1.出售中 2.已下架 3.回收站)")
+ private Integer status;
+
+ @ApiModelProperty("配送方式（1.商家配送 2.快递物流）")
+ private Integer deliveryType;
+
+ @ApiModelProperty(hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderCreateDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderCreateDTO.java
new file mode 100644
index 0000000..c45e7a3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderCreateDTO.java
@@ -0,0 +1,59 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 创建订单请求参数
+ */
+@Data
+@ApiModel("创建订单请求参数")
+public class ComShopOrderCreateDTO {
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "用户手机号", hidden = true)
+ private String phone;
+
+ @ApiModelProperty(value = "用户openId", hidden = true)
+ private String openId;
+
+ @ApiModelProperty(value = "用户收货地址id", required = true)
+ private Long receiverId;
+
+ @ApiModelProperty(value = "自提点地址id")
+ private Long pointId;
+
+ @ApiModelProperty(value = "订单备注")
+ private String remark;
+
+ @ApiModelProperty(value = "提交订单商品列表", required = true)
+ private List<ComShopOrderCreateGoodsDTO> orderGoodsList;
+
+ @ApiModelProperty(value = "提交类型（1.商品详情提交 2.购物车提交）", required = true)
+ private Integer submitType;
+
+ @ApiModelProperty(value = "购物车记录id集合（当提交类型为2时，此字段必填）")
+ private List<Long> cartIds;
+ /**
+ * 配送方式（1.自提 2.快递）
+ */
+ @ApiModelProperty(value = "配送方式（1.自提 2.快递）")
+ private Integer deliveryType;
+
+ /**
+ * 提交类型（1.商品详情提交 2.购物车提交）
+ */
+ public interface submitType {
+ int details = 1;
+ int cart = 2;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderCreateGoodsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderCreateGoodsDTO.java
new file mode 100644
index 0000000..7db804d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderCreateGoodsDTO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 创建订单商品信息请求参数
+ */
+@Data
+@ApiModel("创建订单商品信息请求参数")
+public class ComShopOrderCreateGoodsDTO {
+
+ @ApiModelProperty(value = "商品id")
+ private Long goodsId;
+
+ @ApiModelProperty(value = "商品规格id")
+ private Long goodsAttrId;
+
+ @ApiModelProperty(value = "购买数量")
+ private Integer num;
+
+ @ApiModelProperty(value = "价格")
+ private BigDecimal price;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderDeliverDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderDeliverDTO.java
new file mode 100644
index 0000000..a5cf949
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderDeliverDTO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClasssName OrderShipDTO
+ * @Description TODO
+ * @Author cedoo
+ * @Date 2021/4/16
+ * @Version 1.0
+ **/
+@Data
+@ApiModel("订单配送信息")
+public class ComShopOrderDeliverDTO {
+ @ApiModelProperty(value = "订单ID")
+ private Long orderId;
+ @ApiModelProperty(value = "操作账号", hidden = true)
+ private String operUserAccount;
+ @ApiModelProperty(value = "是否是管理员", hidden = true)
+ private Boolean isAdmin = false;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderExportDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderExportDTO.java
new file mode 100644
index 0000000..3b60105
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderExportDTO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClasssName OrderShipDTO
+ * @Description TODO
+ * @Author cedoo
+ * @Date 2021/4/16
+ * @Version 1.0
+ **/
+@Data
+@ApiModel("订单导出信息")
+public class ComShopOrderExportDTO {
+
+ @ApiModelProperty(value = "订单编号", example = "316356541616")
+ private String orderNo;
+ @ApiModelProperty(value = "用户账号")
+ private String userAccount;
+ @ApiModelProperty(value = "收货人", example = "张三")
+ private String receiverAccount;
+ @ApiModelProperty(value = "收货人电话", example = "13123456789")
+ private String receiverPhone;
+ @ApiModelProperty(value = "商品", example = "鞋")
+ private String goodsName;
+ @ApiModelProperty(value = "订单状态(1.待付款 2.代发货 3.待收货 4.待评价 5.已完成 6.已取消)", example = "1")
+ private Integer status;
+ @ApiModelProperty(value = "下单时间-开始", example = "2021-04-01 19:58:41")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String createAtStart;
+ @ApiModelProperty(value = "下单时间-结束", example = "2021-04-18 19:58:54")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+ @ApiModelProperty(value = "订单ID-如果指定了订单ID，只导出指定订单，其它搜索条件将被忽略", notes = "")
+ private Long[] orderIds;
+ @ApiModelProperty(hidden = true)
+ private Long userId;
+ @ApiModelProperty(hidden = true)
+ private Long storeUserId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderPreviewDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderPreviewDTO.java
new file mode 100644
index 0000000..b0b47ff
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderPreviewDTO.java
@@ -0,0 +1,62 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 订单预览请求参数
+ */
+@Data
+@ApiModel("订单预览请求参数")
+public class ComShopOrderPreviewDTO {
+
+ /**
+ * 提交类型（1.商品详情提交 2.购物车提交）
+ */
+ @ApiModelProperty(value = "提交类型（1.商品详情提交 2.购物车提交）", required = true)
+ private Integer submitType;
+
+ /**
+ * 商品id（当提交类型为1时，此字段必填）
+ */
+ @ApiModelProperty(value = "商品id（当提交类型为1时，此字段必填）")
+ private Long goodsId;
+
+ /**
+ * 商品规格id（当提交类型为1时，此字段必填）
+ */
+ @ApiModelProperty(value = "商品规格id（当提交类型为1时，此字段必填）")
+ private Long goodsAttrId;
+
+ /**
+ * 购买数量（当提交类型为1时，此字段必填）
+ */
+ @ApiModelProperty(value = "购买数量（当提交类型为1时，此字段必填）")
+ private Integer buyNum;
+
+ /**
+ * 购物车记录id集合（当提交类型为2时，此字段必填）
+ */
+ @ApiModelProperty(value = "提交类型（1.商品详情提交 2.购物车提交）")
+ private List<Long> cartIds;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ /**
+ * 提交类型（1.商品详情提交 2.购物车提交）
+ */
+ public interface submitType {
+ int details = 1;
+ int cart = 2;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderQueryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderQueryDTO.java
new file mode 100644
index 0000000..c6bce07
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderQueryDTO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 请求参数
+ */
+@Data
+@ApiModel("请求参数")
+public class ComShopOrderQueryDTO {
+
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
+
+ @ApiModelProperty(value = "手机号", hidden = true)
+ private String phone;
+
+ @ApiModelProperty(value = "操作账号", hidden = true)
+ private String operUserAccount;
+
+ @ApiModelProperty(value = "是否是管理员", hidden = true)
+ private Boolean isAdmin = false;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderShipDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderShipDTO.java
new file mode 100644
index 0000000..a2bb2d3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderShipDTO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClasssName OrderShipDTO
+ * @Description TODO
+ * @Author cedoo
+ * @Date 2021/4/16
+ * @Version 1.0
+ **/
+@Data
+@ApiModel("订单发货信息")
+public class ComShopOrderShipDTO {
+ @ApiModelProperty(value = "ID")
+ private Long orderId;
+ @ApiModelProperty(value = "物流公司")
+ private String logisticsCompany;
+ @ApiModelProperty(value = "物流单号")
+ private String logisticsNo;
+ @ApiModelProperty(value = "操作账号", hidden = true)
+ private String operUserAccount;
+ @ApiModelProperty(value = "是否是管理员", hidden = true)
+ private Boolean isAdmin;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopSysConfDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopSysConfDTO.java
new file mode 100644
index 0000000..7342bd6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopSysConfDTO.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClasssName ComShopSysConfDTO
+ * @Description 商家配置信息
+ * @Author cedoo
+ * @Date 2021/05/11
+ * @Version 1.0
+ **/
+@Data
+@ApiModel("商家系统配置")
+public class ComShopSysConfDTO {
+ @ApiModelProperty(value = "id", required = true)
+ private Long id;
+ @ApiModelProperty(value = "是否隐藏所有商家 0 否 1是", required = true)
+ private Integer hidden;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ExcelShopFundsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ExcelShopFundsDTO.java
new file mode 100644
index 0000000..0addb59
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ExcelShopFundsDTO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import java.math.BigDecimal;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.NumberFormat;
+
+import lombok.Data;
+
+/**
+ * @description: 商城订单导出
+ * @author: Null
+ * @date: 2021-4-18 16:13:21
+ */
+@Data
+public class ExcelShopFundsDTO {
+
+ @ExcelProperty("金额")
+ @NumberFormat("0.00")
+ private BigDecimal totalAmount;
+
+ @ExcelProperty("支付时间")
+ private String payTime;
+
+ @ExcelProperty("订单编号")
+ private String orderNo;
+
+ @ExcelProperty("支付方式")
+ private String payType;
+
+ @ExcelProperty("收支类型")
+ private String type;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ExcelShopOrderDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ExcelShopOrderDTO.java
new file mode 100644
index 0000000..00ff47d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ExcelShopOrderDTO.java
@@ -0,0 +1,58 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.NumberFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
+/**
+ * @description: 商城订单导出
+ * @author: cedoo
+ * @date: 2021-4-18 16:13:21
+ */
+@Data
+public class ExcelShopOrderDTO {
+
+ @ExcelProperty("商品总额")
+ @NumberFormat("0.00")
+ private BigDecimal goodsTotal;
+
+ @ExcelProperty("全部商品")
+ private String goodsName;
+
+ @ExcelProperty("数量总计")
+ private Integer goodsCount;
+
+ @ExcelProperty("用户账号")
+ private String account;
+
+ @ExcelProperty("收货人")
+ private String receiver;
+
+ @ExcelProperty("收货人电话")
+ private String receiverPhone;
+
+ @ExcelProperty("收货地址")
+ private String receiverAddress;
+
+ @ExcelProperty("店铺名称")
+ private String storeName;
+
+ @ExcelProperty("备注")
+ private String remark;
+
+ @ExcelProperty("订单状态")
+ private String status;
+
+ @ExcelProperty("下单时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ExcelProperty("付款时间")
+ private String payTime;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/OrderPayDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/OrderPayDTO.java
new file mode 100644
index 0000000..10892e6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/OrderPayDTO.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 订单支付请求参数
+ */
+@Data
+@ApiModel("订单支付请求参数")
+public class OrderPayDTO {
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+
+ @ApiModelProperty(value = "订单号", hidden = true)
+ private String openId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderDeliveryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderDeliveryDTO.java
new file mode 100644
index 0000000..46a958c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderDeliveryDTO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther yh
+ * @create 2022-11-08 17:25:45
+ * @describe 分页查询配送单列表
+ */
+@Data
+@ApiModel("花城分页查询配送单列表")
+public class PageComFlowerOrderDeliveryDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "配送单状态(1.配送中 2.已送达)")
+ private Integer deliveryStatus;
+
+ @ApiModelProperty(value = "配送单号")
+ private String deliveryNo;
+
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderListDTO.java
new file mode 100644
index 0000000..b31b4a7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderListDTO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 分页查询订单列表
+ */
+@Data
+@ApiModel("花城分页查询订单列表")
+public class PageComFlowerOrderListDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "订单状态(1.等待配送 2.配送中 3.待收货 4.待评价 5.已完成 6.已取消 7.已退款)")
+ private Integer status;
+
+ @ApiModelProperty(value = "自提点id")
+ private Long pointId;
+
+ @ApiModelProperty(value = "商户id")
+ private Long storeId;
+
+ @ApiModelProperty(value = "配送单id")
+ private Long deliveryId;
+
+ @ApiModelProperty(value = "配送方式（1.自提 2.快递）")
+ private Integer deliveryType;
+
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComOrderListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComOrderListDTO.java
new file mode 100644
index 0000000..0c1b533
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComOrderListDTO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 分页查询订单列表
+ */
+@Data
+@ApiModel("分页查询订单列表")
+public class PageComOrderListDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "订单状态(1.待付款 2.代发货 3.待收货 4.待评价 5.已完成 6.已取消)")
+ private Integer status;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComOrderRefundDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComOrderRefundDTO.java
new file mode 100644
index 0000000..d88168f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComOrderRefundDTO.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 分页查询订单列表
+ */
+@Data
+@ApiModel("分页查询退款订单列表")
+public class PageComOrderRefundDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "订单状态(9.处理中 10.退款成功 11.退款失败 12.已取消 13.退款中)")
+ private Integer status;
+
+ @ApiModelProperty(value = "店铺id")
+ private Long storeId;
+
+ @ApiModelProperty(value = "关键字")
+ private String keyWord;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "商家用户id", hidden = true)
+ private Long backstageUserId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopAddressDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopAddressDTO.java
new file mode 100644
index 0000000..a398b1b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopAddressDTO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 分页查询店铺
+ */
+@Data
+@ApiModel("分页查询店铺")
+public class PageComShopAddressDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerEvaluateDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerEvaluateDTO.java
new file mode 100644
index 0000000..92afe27
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerEvaluateDTO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 分页查询订单列表
+ */
+@Data
+@ApiModel("评价查询")
+public class PageComShopFlowerEvaluateDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "商品id")
+ private Long goodsId;
+
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
+
+ @ApiModelProperty(value = "评价类型(5.非常满意 4.满意 3.一般 3.不满意 1.糟糕透了)")
+ private Integer evaluateType;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerGoodsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerGoodsDTO.java
new file mode 100644
index 0000000..943292c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerGoodsDTO.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther yh
+ * @describe 分页查询商品
+ */
+@ApiModel("分页查询商品")
+@Data
+public class PageComShopFlowerGoodsDTO {
+
+ @ApiModelProperty(value = "商品名称")
+ private String name;
+
+ @ApiModelProperty(value = "店铺名称")
+ private String storeName;
+ @ApiModelProperty(value = "店铺Id")
+ private Long storeId;
+ @ApiModelProperty(value = "商品分类id")
+ private Long categoryIds;
+
+ @ApiModelProperty(value = "商品状态(1.出售中 2.已下架 3.回收站)", example = "1")
+ private Integer status;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+ @ApiModelProperty(value = "用户id",hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerOrderPayDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerOrderPayDTO.java
new file mode 100644
index 0000000..6090a00
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerOrderPayDTO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther yh
+ * @create 2022-11-08 17:25:45
+ * @describe 分页查询支付记录
+ */
+@Data
+@ApiModel("支付退款记录")
+public class PageComShopFlowerOrderPayDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "类型：1.入账 2 出账")
+ private Integer type;
+
+ @ApiModelProperty(value = "商户id")
+ private Long storeId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerStoreDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerStoreDTO.java
new file mode 100644
index 0000000..aa51371
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFlowerStoreDTO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther yh
+ * @create 2022-10-21 09:36:09
+ * @describe 分页查询店铺
+ */
+@Data
+@ApiModel("分页查询店铺")
+public class PageComShopFlowerStoreDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+ @ApiModelProperty(value = "商家姓名")
+ private String contacts;
+ @ApiModelProperty(value = "商家账号")
+ private String account;
+ @ApiModelProperty(value = "店铺名称")
+ private String name;
+ @ApiModelProperty(value = "配送方式（1.自提 2.快递）")
+ private Integer deliveryType;
+ @ApiModelProperty(value = "店铺状态（1.启用 2.禁用）")
+ private Integer status;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty("店铺id")
+ private Long storeId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFundsSearchDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFundsSearchDTO.java
new file mode 100644
index 0000000..7999423
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFundsSearchDTO.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClasssName OrderSearchDTO
+ * @Description 资金管理DTO
+ * @Author cedoo
+ * @Date 2021/4/16
+ * @Version 1.0
+ **/
+@Data
+@ApiModel("资金管理查询参数")
+public class PageComShopFundsSearchDTO {
+ @ApiModelProperty(value = "订单编号", example = "316356541616")
+ private String orderNo;
+ @ApiModelProperty(value = "支付时间-开始", example = "2021-03-18 19:59:06")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date payTimeStart;
+ @ApiModelProperty(value = "支付时间-结束", example = "2021-04-18 19:59:14")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date payTimeEnd;
+ @ApiModelProperty(value = "分页-当前页数", example = "1", required = true)
+ private Long pageNum;
+ @ApiModelProperty(value = "分页-每页记录数", example = "10", required = true)
+ private Long pageSize;
+ @ApiModelProperty(hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopGoodsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopGoodsDTO.java
new file mode 100644
index 0000000..4517409
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopGoodsDTO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe 分页查询商品
+ */
+@ApiModel("分页查询商品")
+@Data
+public class PageComShopGoodsDTO {
+
+ @ApiModelProperty(value = "商品名称")
+ private String name;
+
+ @ApiModelProperty(value = "店铺名称")
+ private String storeName;
+ @ApiModelProperty(value = "店铺Id")
+ private Long storeId;
+
+ @ApiModelProperty(value = "商品状态(1.出售中 2.已下架 3.回收站)", example = "1")
+ private Integer status;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java
new file mode 100644
index 0000000..510add9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java
@@ -0,0 +1,55 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClasssName OrderSearchDTO
+ * @Description 订单搜索DTO
+ * @Author cedoo
+ * @Date 2021/4/16
+ * @Version 1.0
+ **/
+@Data
+public class PageComShopOrderSearchDTO {
+ @ApiModelProperty(value = "订单编号", example = "316356541616")
+ private String orderNo;
+ @ApiModelProperty(value = "用户账号")
+ private String userAccount;
+ @ApiModelProperty(value = "收货人", example = "张三")
+ private String receiverAccount;
+ @ApiModelProperty(value = "收货人电话", example = "13123456789")
+ private String receiverPhone;
+ @ApiModelProperty(value = "商品", example = "鞋")
+ private String goodsName;
+ @ApiModelProperty(value = "店铺名称", example = "小二的店")
+ private String storeName;
+ @ApiModelProperty(value = "订单状态(1.等待配送 2.配送中 3.待收货 4.待评价 5.已完成 6.已取消 7.已退款)", example = "1")
+ private Integer status;
+ @ApiModelProperty(value = "下单时间-开始", example = "2021-4-10 10:38:25")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String createAtStart;
+ @ApiModelProperty(value = "下单时间-结束", example = "2021-4-20 10:38:29")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+ @ApiModelProperty(value = "分页-当前页数", example = "1", required = true)
+ private Long pageNum;
+ @ApiModelProperty(value = "分页-每页记录数", example = "10", required = true)
+ private Long pageSize;
+ @ApiModelProperty(hidden = true)
+ private Long userId;
+ @ApiModelProperty(hidden = true)
+ private Long storeId;
+ @ApiModelProperty(hidden = true)
+ private Long storeUserId;
+
+ @ApiModelProperty("配送方式（1.自提 2.快递）")
+ private Integer deliveryType;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopStoreDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopStoreDTO.java
new file mode 100644
index 0000000..88a5572
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopStoreDTO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 分页查询店铺
+ */
+@Data
+@ApiModel("分页查询店铺")
+public class PageComShopStoreDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+ @ApiModelProperty(value = "商家姓名")
+ private String contacts;
+ @ApiModelProperty(value = "商家账号")
+ private String account;
+ @ApiModelProperty(value = "店铺名称")
+ private String name;
+ @ApiModelProperty(value = "配送方式（1.商家配送 2.快递物流）")
+ private Integer deliveryType;
+ @ApiModelProperty(value = "店铺状态（1.启用 2.禁用）")
+ private Integer status;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty("店铺id")
+ private Long storeId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopSysConfDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopSysConfDTO.java
new file mode 100644
index 0000000..c9037ab
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopSysConfDTO.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe 分页查询商品
+ */
+@ApiModel("分页查询商品")
+@Data
+public class PageComShopSysConfDTO {
+ @ApiModelProperty(value = "分页-当前页数", example = "1", required = false)
+ private Long pageNum = 1l;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10", required = false)
+ private Long pageSize = 10l;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/WxPayNotifyOrderDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/WxPayNotifyOrderDTO.java
new file mode 100644
index 0000000..7ebfd50
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/WxPayNotifyOrderDTO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.dtos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("微信支付回调修改订单参数")
+public class WxPayNotifyOrderDTO {
+
+ @ApiModelProperty(value = "订单号")
+ private String orderTradeNo;
+
+ @ApiModelProperty(value = "微信交易订单号")
+ private String wxTradeNo;
+
+ @ApiModelProperty(value = "订单金额")
+ private String totalFee;
+
+ @ApiModelProperty(value = "支付完成时间")
+ private String payTime;
+
+ @ApiModelProperty(value = "现金支付金额")
+ private String cashFee;
+
+ @ApiModelProperty(value = "支付返回参数信息")
+ private String result;
+
+ @ApiModelProperty(value = "支付附加数据")
+ private String attach;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/ComMngUserTagDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/ComMngUserTagDTO.java
new file mode 100644
index 0000000..7838455
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/ComMngUserTagDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 居民信息excel导入
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-02-04 16:06
+ **/
+@Data
+@ApiModel("特殊群体标签请求参数")
+public class ComMngUserTagDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+ @ApiModelProperty("标签名称")
+ private String tagName;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/ConvenientResetPasswordDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/ConvenientResetPasswordDTO.java
new file mode 100644
index 0000000..48a4015
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/ConvenientResetPasswordDTO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.dtos.user;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ConvenientResetPasswordDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 便民服务商家修改密码
+ * @author: hans
+ * @date: 2021/09/17 17:27
+ */
+@Data
+@ApiModel("便民服务商家修改密码请求参数")
+public class ConvenientResetPasswordDTO {
+
+ @ApiModelProperty("旧密码")
+ @NotBlank(message = "旧密码不能为空")
+ private String oldPassword;
+
+ @ApiModelProperty("新密码")
+ @Pattern(groups = {AddGroup.class}, message = "请输入8-12位登陆密码，由英文，数字和特殊符号组成",
+ regexp = "^(?=.*[A-Za-z])(?=(.*[\\d]){1,})(?=(.*[\\W]){1,})(?!.*\\s).{8,12}$")
+ private String newPassword;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/EexcelUserDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/EexcelUserDTO.java
new file mode 100644
index 0000000..609e1cb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/EexcelUserDTO.java
@@ -0,0 +1,146 @@
+package com.panzhihua.common.model.dtos.user;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 居民信息excel导入
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-02-04 16:06
+ **/
+@Data
+public class EexcelUserDTO {
+
+ /**
+ * 序号
+ */
+ @ExcelProperty("序号")
+ private String order;
+
+ @ExcelProperty("小区")
+ private String areaName;
+
+ /**
+ * 门牌号
+ */
+ @ExcelProperty("门牌号")
+ private String doorNumber;
+ /**
+ * 是否租住
+ */
+ @ExcelProperty("是否租住")
+ private String isRent = "否";
+ /**
+ * 姓名
+ */
+ @ExcelProperty("姓名")
+ private String name;
+ /**
+ * 民族
+ */
+ @ExcelProperty("民族")
+ private String nation;
+ /**
+ * 政治面貌
+ */
+ @ExcelProperty("政治面貌")
+ private String politicalOutlook;
+ /**
+ * 婚姻状态
+ */
+ @ExcelProperty("婚姻状态")
+ private String maritalStatus = "否";
+ /**
+ * 联系方式
+ */
+ @ExcelProperty("联系方式")
+ private String phone;
+ /**
+ * 文化程度
+ */
+ @ExcelProperty("文化程度")
+ private String education;
+ /**
+ * 身份证
+ */
+ @ExcelProperty("身份证")
+ private String idCard;
+ /**
+ * 工作单位（学校）
+ */
+ @ExcelProperty("工作单位（学校）")
+ private String company;
+ /**
+ * 户口所在地
+ */
+ @ExcelProperty("户口所在地")
+ private String residence;
+ /**
+ * 目前是否在攀枝花
+ */
+ @ExcelProperty("目前是否在攀枝花")
+ private String isPanZhiHua = "否";
+ /**
+ * 近一个月离（返）攀情况
+ */
+ @ExcelProperty("近一个月离（返）攀情况")
+ private String situation = "否";
+ /**
+ * 是否有与疑似或确诊病例密切接触史
+ */
+ @ExcelProperty("是否有与疑似或确诊病例密切接触史")
+ private String isContact = "否";
+ /**
+ * 特殊情况（重大过往病史或者孕妇）
+ */
+ @ExcelProperty("特殊情况（重大过往病史或者孕妇")
+ private String major = "否";
+ /**
+ * 退役军人
+ */
+ @ExcelProperty("退役军人")
+ private String soldier = "否";
+ /**
+ * 残疾人
+ */
+ @ExcelProperty("残疾人")
+ private String disability = "否";
+ /**
+ * 低保户
+ */
+ @ExcelProperty("低保户")
+ private String lowIncomeHouseholds = "否";
+ /**
+ * 低收入人员
+ */
+ @ExcelProperty("低收入人员")
+ private String lowIncomePeople = "否";
+ /**
+ * 高龄老人
+ */
+ @ExcelProperty("高龄老人")
+ private String oldPeople = "否";
+ /**
+ * 特服家庭
+ */
+ @ExcelProperty("特服家庭")
+ private String specialServiceFamily = "否";
+ /**
+ * 重点人员
+ */
+ @ExcelProperty("重点人员")
+ private String keyPersonnel = "否";
+
+ @ExcelProperty("标签")
+ private String tags;
+
+ /**
+ * 房屋编码
+ */
+ @ExcelIgnore
+ private String houseCode;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/IndexDataDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/IndexDataDTO.java
new file mode 100644
index 0000000..10e83cb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/IndexDataDTO.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.dtos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(value = "首页数据查询入参")
+public class IndexDataDTO implements Serializable {
+
+ @ApiModelProperty("数据范围,1:所有区县，2：所有街道，3：所有社区，4：跟据街道筛选")
+ private Integer range;
+
+ @ApiModelProperty("街道id")
+ private Long streetId;
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/InputUserTagsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/InputUserTagsDTO.java
new file mode 100644
index 0000000..bea706d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/InputUserTagsDTO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.dtos.user;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 居民标签设置参数
+ * @author: Null
+ * @date: 2021/3/11 10:36
+ */
+@Data
+@ApiModel(value = "居民标签设置参数")
+public class InputUserTagsDTO implements Serializable {
+
+ @ApiModelProperty("用户编号")
+ private Long id;
+
+ @ApiModelProperty("设置用户标签多个用,分割")
+ private String tags;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageFeedBackDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageFeedBackDTO.java
new file mode 100644
index 0000000..d18e042
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageFeedBackDTO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.dtos.user;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import com.panzhihua.common.validated.PageGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 意见反馈
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-05 10:56
+ **/
+@Data
+@ApiModel(value = "意见反馈")
+public class PageFeedBackDTO {
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(groups = {PageGroup.class}, message = "分页-当前页数不能为空")
+ @Min(groups = {PageGroup.class}, value = 1, message = "分页-当前页数不能为空")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(groups = {PageGroup.class}, message = "分页-每页记录数不能为空")
+ @Min(groups = {PageGroup.class}, value = 1, message = "分页-每页记录数不能为空")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "用户昵称", example = "")
+ private String nickName;
+
+ @ApiModelProperty(value = "用户名称", example = "")
+ private String name;
+ @ApiModelProperty(value = "手机号", example = "")
+ private String phone;
+
+ private String areaCode;
+
+ @ApiModelProperty("1投诉建议2问题留言")
+ private Integer type;
+ private Long propertyId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageInputUserDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageInputUserDTO.java
new file mode 100644
index 0000000..33d6b92
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageInputUserDTO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.dtos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 居民信息excel导入
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-02-04 16:06
+ **/
+@Data
+@ApiModel("居民管理分页列表请求参数")
+public class PageInputUserDTO {
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("联系方式")
+ private String phone;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("小区名称")
+ private String areaName;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty("标签")
+ private String tags;
+
+ @ApiModelProperty("标签查询字段 ")
+ private String tagName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageUserAppletsBackstageDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageUserAppletsBackstageDTO.java
new file mode 100644
index 0000000..be3d5f6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageUserAppletsBackstageDTO.java
@@ -0,0 +1,71 @@
+package com.panzhihua.common.model.dtos.user;
+
+import java.util.Date;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.validated.PageGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 运营后台分页查询小程序用户
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-30 11:27
+ **/
+@Data
+@ApiModel(value = "运营后台分页查询小程序用户")
+public class PageUserAppletsBackstageDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ @NotNull(groups = {PageGroup.class}, message = "分页-当前页数不能为空")
+ @Min(groups = {PageGroup.class}, value = 1, message = "分页-当前页数不能为空")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ @NotNull(groups = {PageGroup.class}, message = "分页-每页记录数不能为空")
+ @Min(groups = {PageGroup.class}, value = 1, message = "分页-每页记录数不能为空")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "用户手机号", example = "")
+ private String phone;
+
+ @ApiModelProperty(value = "所属社区", example = "0")
+ private Long communityId;
+
+ @ApiModelProperty(value = "搜索-注册开始时间", example = "2020-01-02 00:00:00")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtBegin;
+
+ @ApiModelProperty(value = "搜索-注册结束时间", example = "2020-12-28 00:00:00")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+
+ @ApiModelProperty(value = "状态 1 启用 2 禁用", example = "0")
+ @NotNull(groups = {PutGroup.class}, message = "状态不能为空")
+ @Min(value = 1, groups = {PutGroup.class}, message = "状态不能为空")
+ private Integer status;
+
+ @ApiModelProperty(value = "搜索-最后登录时间开始", example = "2020-01-02 00:00:00")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date lastLoginTimeBegin;
+
+ @ApiModelProperty(value = "搜索-最后登录时间结束", example = "2020-12-28 00:00:00")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date lastLoginTimeEnd;
+
+ @ApiModelProperty(value = "编辑-用户主键", example = "2")
+ @NotNull(groups = {PutGroup.class}, message = "用户主键不能为空")
+ @Min(value = 1, groups = {PutGroup.class}, message = "用户主键不能为空")
+ private Long userId;
+
+ private String areaCode;
+
+ private String appId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/SysUserEditTipsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/SysUserEditTipsDTO.java
new file mode 100644
index 0000000..e9b8bb7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/SysUserEditTipsDTO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.dtos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "修改用户首页活动提示请求参数")
+public class SysUserEditTipsDTO {
+
+ /**
+ * 小程序首页是否显示公告(1.是 2.否)
+ */
+ @ApiModelProperty("小程序首页是否显示公告(1.是 2.否)")
+ private Integer isTips;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/SysUserFeedbackDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/SysUserFeedbackDTO.java
new file mode 100644
index 0000000..84f04b9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/SysUserFeedbackDTO.java
@@ -0,0 +1,69 @@
+package com.panzhihua.common.model.dtos.user;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 意见反馈
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-31 13:26
+ **/
+@Data
+@ApiModel(value = "意见反馈")
+public class SysUserFeedbackDTO {
+
+ @ApiModelProperty(value = "id", hidden = true)
+ private Long id;
+
+ @ApiModelProperty(value = "反馈内容", required = true)
+ @NotBlank(groups = {AddGroup.class}, message = "反馈内容不能为空")
+ private String content;
+
+ @ApiModelProperty("反馈图片，多个用逗号隔开")
+ private String photoPah;
+
+ @ApiModelProperty(value = "create_at", hidden = true)
+ private Date createAt;
+
+ @ApiModelProperty(value = "update_at", hidden = true)
+ private Date updateAt;
+
+ @ApiModelProperty(value = "用户的id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "小区id", hidden = true)
+ private Long areaId;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "状态 0", hidden = true)
+ private Integer status;
+
+ @ApiModelProperty("1投诉建议2问题留言")
+ private Integer type;
+
+ @ApiModelProperty("页数")
+ private Integer page;
+
+ @ApiModelProperty("每页大小")
+ private Integer size;
+
+ @ApiModelProperty("用户昵称")
+ private String nickName;
+
+ @ApiModelProperty("用户姓名")
+ private String name;
+
+ @ApiModelProperty("电话")
+ private String phone;
+ private Long propertyId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/EnrollUserByAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/EnrollUserByAppDTO.java
new file mode 100644
index 0000000..94201fa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/EnrollUserByAppDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.vaccines;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("用户信息")
+public class EnrollUserByAppDTO {
+
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ @ApiModelProperty("是否是自己（1.是 2.否）")
+ private Integer isUser;
+
+ /**
+ * 是否是自己（1.是 2.否）
+ */
+ public interface isUser {
+ int yes = 1;
+ int no = 2;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesByAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesByAdminDTO.java
new file mode 100644
index 0000000..ad95a6d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesByAdminDTO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.dtos.vaccines;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("疫苗分类列表请求参数")
+public class VaccinesByAdminDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty("疫苗id")
+ private Long id;
+
+ @ApiModelProperty("疫苗类型名称")
+ private String name;
+
+ @ApiModelProperty("疫苗描述")
+ private String describe;
+
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesEnrollByAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesEnrollByAdminDTO.java
new file mode 100644
index 0000000..5b669aa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesEnrollByAdminDTO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.dtos.vaccines;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("疫苗分类列表请求参数")
+public class VaccinesEnrollByAdminDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("身份证号")
+ private String idCard;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("登记时间开始")
+ private String startTime;
+
+ @ApiModelProperty("登记时间结束")
+ private String endTime;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("疫苗名称")
+ private String vaccines;
+
+ @ApiModelProperty("导出id集合")
+ private List<Long> ids;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesEnrollByAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesEnrollByAppDTO.java
new file mode 100644
index 0000000..c9a38ea
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesEnrollByAppDTO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.dtos.vaccines;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("用户报名疫苗请求参数")
+public class VaccinesEnrollByAppDTO {
+
+ @ApiModelProperty("疫苗类型id")
+ private Long vaccinesId;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("报名用户列表")
+ private List<EnrollUserByAppDTO> enrollUserList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesEnrollUserByAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesEnrollUserByAppDTO.java
new file mode 100644
index 0000000..bc9bf50
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesEnrollUserByAppDTO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.dtos.vaccines;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("查询疫苗类型下用户列表请求参数")
+public class VaccinesEnrollUserByAppDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty("疫苗类型id")
+ private Long vaccinesId;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesInoculationByAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesInoculationByAdminDTO.java
new file mode 100644
index 0000000..f54336d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesInoculationByAdminDTO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.dtos.vaccines;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("疫苗接种记录请求参数")
+public class VaccinesInoculationByAdminDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("身份证号")
+ private String idCard;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("接种时间开始")
+ private String startTime;
+
+ @ApiModelProperty("接种时间结束")
+ private String endTime;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("接种剂次")
+ private String dosage;
+
+ @ApiModelProperty("导出id集合")
+ private List<Long> ids;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/visit/EventVisitCompleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/visit/EventVisitCompleteDTO.java
new file mode 100644
index 0000000..ddc1a98
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/visit/EventVisitCompleteDTO.java
@@ -0,0 +1,60 @@
+package com.panzhihua.common.model.dtos.visit;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+import com.panzhihua.common.model.dtos.EventResourceDTO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/24 11:30
+ */
+@ApiModel("完成走访DTO")
+@Data
+public class EventVisitCompleteDTO implements Serializable {
+
+ @ApiModelProperty(value = "音频列表")
+ List<EventResourceDTO> vosList;
+ @ApiModelProperty(value = "图片列表")
+ List<EventResourceDTO> imgList;
+ @ApiModelProperty(value = "视频列表")
+ List<EventResourceDTO> videoList;
+ @NotNull(message = "id不能为空")
+ @ApiModelProperty("id")
+ private Long id;
+ @ApiModelProperty("经纬度（,隔开）")
+ @NotEmpty(message = "经纬度不能为空")
+ private String latLng;
+ @ApiModelProperty("地址")
+ @NotEmpty(message = "地址不能为空")
+ private String address;
+ @ApiModelProperty("地址备注")
+ private String addressRemark;
+ @ApiModelProperty("0正常，1异常")
+ private Integer exception;
+ @ApiModelProperty("异常描述")
+ private String dellDesc;
+ @ApiModelProperty("异常选择")
+ private String option;
+ @ApiModelProperty("家庭联系方式")
+ @NotEmpty(message = "家庭联系方式不能为空")
+ private String familyPhone;
+ @ApiModelProperty("生活来源")
+ @NotEmpty(message = "生活来源不能为空")
+ private String familySource;
+ private Integer eventStatus;
+ @ApiModelProperty("生活来源")
+ private String remark;
+ @ApiModelProperty("完成时间")
+ @NotEmpty(message = "完成时间不能为空")
+ private String submitDate;
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/wx/TemplateData.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/wx/TemplateData.java
new file mode 100644
index 0000000..05cf708
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/wx/TemplateData.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.dtos.wx;
+
+import lombok.Data;
+
+@Data
+public class TemplateData {
+
+ private String value;
+
+ public TemplateData(String value) {
+ this.value = value;
+ }
+
+ public TemplateData() {
+
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/wx/TemplateParam.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/wx/TemplateParam.java
new file mode 100644
index 0000000..f9db4f6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/wx/TemplateParam.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.dtos.wx;
+
+import lombok.Data;
+
+@Data
+public class TemplateParam {
+
+ private String key;
+ private String value;
+
+ public TemplateParam(String key, String value) {
+ this.key = key;
+ this.value = value;
+ }
+
+ public TemplateParam() {
+
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/wx/UnionpayCarWash.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/wx/UnionpayCarWash.java
new file mode 100644
index 0000000..65abc6d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/wx/UnionpayCarWash.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.dtos.wx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@ApiModel("银联支付和洗车订单关联表")
+public class UnionpayCarWash
+{
+ @ApiModelProperty(value = "主键")
+ private String id;
+ @ApiModelProperty(value = "洗车id")
+ private String carWashId;
+ @ApiModelProperty(value = "银联id")
+ private String unionpayOrderId;
+ @ApiModelProperty(value = "交易金额")
+ private String money;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/wx/WxSubscribeDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/wx/WxSubscribeDTO.java
new file mode 100644
index 0000000..ed941e1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/wx/WxSubscribeDTO.java
@@ -0,0 +1,61 @@
+package com.panzhihua.common.model.dtos.wx;
+
+import java.util.List;
+
+import com.panzhihua.common.utlis.StringUtils;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("微信订阅消息请求参数")
+@Data
+public class WxSubscribeDTO {
+
+ @ApiModelProperty("用户在小程序的openid")
+ private String touser;
+
+ @ApiModelProperty("所需下发的订阅模板id")
+ private String template_id;
+
+ @ApiModelProperty("点击模板卡片后的跳转页面，仅限本小程序内的页面。支持带参数,（示例index?foo=bar）。该字段不填则模板无跳转。")
+ private String page;
+
+ @ApiModelProperty("模板内容，格式形如 { \"key1\": { \"value\": any }, \"key2\": { \"value\": any } }")
+ private Object data;
+
+ @ApiModelProperty("跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版")
+ private String miniprogram_state;
+
+ @ApiModelProperty("进入小程序查看”的语言类型，支持zh_CN(简体中文)、en_US(英文)、zh_HK(繁体中文)、zh_TW(繁体中文)，默认为zh_CN")
+ private String lang;
+
+ private List<TemplateParam> templateParamList;
+
+ public String toJSON() {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("{");
+ buffer.append(String.format("\"touser\":\"%s\"", this.touser)).append(",");
+ buffer.append(String.format("\"template_id\":\"%s\"", this.template_id)).append(",");
+ if (StringUtils.isNotEmpty(this.page)) {
+ buffer.append(String.format("\"page\":\"%s\"", this.page)).append(",");
+ }
+ if (StringUtils.isNotEmpty(this.miniprogram_state)) {
+ buffer.append(String.format("\"miniprogram_state\":\"%s\"", this.miniprogram_state)).append(",");
+ }
+ buffer.append("\"data\":{");
+ TemplateParam param = null;
+ for (int i = 0; i < this.templateParamList.size(); i++) {
+ param = templateParamList.get(i);
+ // 判断是否追加逗号
+ if (i < this.templateParamList.size() - 1) {
+ buffer.append(String.format("\"%s\": {\"value\":\"%s\"},", param.getKey(), param.getValue()));
+ } else {
+ buffer.append(String.format("\"%s\": {\"value\":\"%s\"}", param.getKey(), param.getValue()));
+ }
+ }
+ buffer.append("}");
+ buffer.append("}");
+ return buffer.toString();
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/AESUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/AESUtil.java
new file mode 100644
index 0000000..b36bfc7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/AESUtil.java
@@ -0,0 +1,169 @@
+package com.panzhihua.common.model.helper;
+
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.KeySpec;
+import java.util.Arrays;
+import java.util.Base64;
+
+import javax.crypto.*;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.SecretKeySpec;
+
+/**
+ * AES 工具类
+ */
+public class AESUtil {
+
+ private static SecretKeySpec secretKey;
+ private static byte[] key;
+
+ /**
+ * AES 256 加密
+ *
+ * @param strToEncrypt
+ * 要加密的字符串
+ * @param secKey
+ * 秘钥
+ * @param salt
+ * 盐
+ * @return 加密后的字符串
+ */
+ public static String encrypt256(String strToEncrypt, String secKey, String salt) {
+ try {
+ byte[] iv = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+ IvParameterSpec ivspec = new IvParameterSpec(iv);
+
+ SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+ KeySpec spec = new PBEKeySpec(secKey.toCharArray(), salt.getBytes(), 65536, 256);
+ SecretKey tmp = factory.generateSecret(spec);
+ SecretKeySpec secretKey = new SecretKeySpec(tmp.getEncoded(), "AES");
+
+ Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+ cipher.init(Cipher.ENCRYPT_MODE, secretKey, ivspec);
+ return Base64.getEncoder().encodeToString(cipher.doFinal(strToEncrypt.getBytes(StandardCharsets.UTF_8)));
+ } catch (Exception e) {
+ System.out.println("Error while encrypting: " + e.toString());
+ }
+ return null;
+ }
+
+ /**
+ * AES 256 解密
+ *
+ * @param strToDecrypt
+ * 要解密的字符串
+ * @param secKey
+ * 秘钥
+ * @param salt
+ * 盐
+ * @return 解密后的字符串
+ */
+ public static String decrypt256(String strToDecrypt, String secKey, String salt) {
+ try {
+ byte[] iv = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+ IvParameterSpec ivspec = new IvParameterSpec(iv);
+
+ SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
+ KeySpec spec = new PBEKeySpec(secKey.toCharArray(), salt.getBytes(), 65536, 256);
+ SecretKey tmp = factory.generateSecret(spec);
+ SecretKeySpec secretKey = new SecretKeySpec(tmp.getEncoded(), "AES");
+
+ Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING");
+ cipher.init(Cipher.DECRYPT_MODE, secretKey, ivspec);
+ return new String(cipher.doFinal(Base64.getDecoder().decode(strToDecrypt)));
+ } catch (Exception e) {
+ System.out.println("Error while decrypting: " + e.toString());
+ }
+ return null;
+ }
+
+ public static void setKey(String myKey) {
+ MessageDigest sha = null;
+ try {
+ key = myKey.getBytes(StandardCharsets.UTF_8);
+ sha = MessageDigest.getInstance("SHA-1");
+ key = sha.digest(key);
+ key = Arrays.copyOf(key, 16);
+ secretKey = new SecretKeySpec(key, "AES");
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * AES 128(base64)加密
+ *
+ * @param strToEncrypt
+ * 要加密的字符串
+ * @param secret
+ * 秘钥
+ * @return 加密后的字符串
+ */
+ public static String encrypt128(String strToEncrypt, String secret)
+ throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException,
+ BadPaddingException, IllegalBlockSizeException {
+ setKey(secret);
+ Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+ cipher.init(Cipher.ENCRYPT_MODE, secretKey);
+ return Base64.getEncoder().encodeToString(cipher.doFinal(strToEncrypt.getBytes(StandardCharsets.UTF_8)));
+ }
+
+ /**
+ * AES 128(base64) 解密
+ *
+ * @param strToDecrypt
+ * 要解密的字符串
+ * @param secret
+ * 秘钥
+ * @return 解密后的字符串
+ */
+ public static String decrypt128(String strToDecrypt, String secret) throws NoSuchPaddingException,
+ NoSuchAlgorithmException, BadPaddingException, IllegalBlockSizeException, InvalidKeyException {
+ setKey(secret);
+ Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5PADDING");
+ cipher.init(Cipher.DECRYPT_MODE, secretKey);
+ return new String(cipher.doFinal(Base64.getDecoder().decode(strToDecrypt)));
+ }
+
+}
+
+class AES256Example {
+ public static void main(String[] args) {
+ String originalString = "howtodoinjava.com";
+
+ String secKey = "this is my super secrt key";
+ String salt = "salt for me!!!";
+ String encryptedString = AESUtil.encrypt256(originalString, secKey, salt);
+ String decryptedString = AESUtil.decrypt256(encryptedString, secKey, salt);
+
+ System.out.println(originalString);
+ System.out.println(encryptedString);
+ System.out.println(decryptedString);
+ }
+}
+
+class AES128Example {
+ public static void main(String[] args) {
+ String[] originalString = new String[] {"51011234567892013", "13612345678", "四川省成都市高新区", "四川省成都市高新"};
+
+ String key = "5165465461dsfas";
+
+ Arrays.stream(originalString).forEach(os -> {
+ try {
+ String encryptedString = AESUtil.encrypt128(os, key);
+ String decryptedString = AESUtil.decrypt128(encryptedString, key);
+
+ System.out.println(os);
+ System.out.println(encryptedString);
+ System.out.println(decryptedString);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/SerializerBigDecimal.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/SerializerBigDecimal.java
new file mode 100644
index 0000000..770367e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/SerializerBigDecimal.java
@@ -0,0 +1,72 @@
+package com.panzhihua.common.model.helper;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.util.Objects;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.ContextualSerializer;
+
+/**
+ * BigDecimal序列化(默认保留二位小数和四舍五入)
+ *
+ * @author cedoo
+ * @date 2021-4-19 01:24:28
+ */
+public class SerializerBigDecimal extends JsonSerializer<BigDecimal> implements ContextualSerializer {
+
+ protected DecimalFormat decimalFormat;
+
+ public SerializerBigDecimal() {}
+
+ public SerializerBigDecimal(DecimalFormat decimalFormat) {
+ this.decimalFormat = decimalFormat;
+ }
+
+ @Override
+ public void serialize(BigDecimal value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+
+ if (Objects.isNull(value)) {
+ gen.writeNull();
+ } else {
+ if (null != decimalFormat) {
+ gen.writeNumber(decimalFormat.format(value));
+ } else {
+ gen.writeNumber(value.setScale(2, BigDecimal.ROUND_HALF_UP));
+ }
+ }
+ }
+
+ @Override
+ public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty property)
+ throws JsonMappingException {
+
+ JsonFormat.Value format = findFormatOverrides(prov, property, handledType());
+ if (format == null) {
+ return this;
+ }
+
+ if (format.hasPattern()) {
+ DecimalFormat decimalFormat = new DecimalFormat(format.getPattern());
+ decimalFormat.setRoundingMode(RoundingMode.HALF_UP);
+ return new SerializerBigDecimal(decimalFormat);
+ }
+
+ return this;
+ }
+
+ protected JsonFormat.Value findFormatOverrides(SerializerProvider provider, BeanProperty prop,
+ Class<?> typeForDefaults) {
+ if (prop != null) {
+ return prop.findPropertyFormat(provider.getConfig(), typeForDefaults);
+ }
+ return provider.getDefaultPropertyFormat(typeForDefaults);
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/DoEncrytDecrypt.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/DoEncrytDecrypt.java
new file mode 100644
index 0000000..4fd36d7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/DoEncrytDecrypt.java
@@ -0,0 +1,81 @@
+package com.panzhihua.common.model.helper.encrypt;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import com.panzhihua.common.model.helper.AESUtil;
+
+import lombok.extern.slf4j.Slf4j;
+
+/***
+ * 默认实现: AES 128 加密、解密 可自定义实现{@link IEncryptDecrypt }接口
+ *
+ * @author cedoo
+ * @since 2021-4-1 10:40:52
+ */
+@Slf4j
+@Component
+public class DoEncrytDecrypt implements IEncryptDecrypt {
+
+ @Value("${domain.aesKey:}")
+ private String aesKey;
+
+ @Override
+ public <T> T encrypt(Field[] declaredFields, T parameterObject) throws IllegalAccessException {
+ for (Field field : declaredFields) {
+ if (field.getType() == String.class) {
+ field.setAccessible(true);
+ for (Annotation annotation : field.getAnnotations()) {
+ if (annotation.annotationType() == EncryptDecryptField.class
+ || annotation.annotationType() == EncryptQuery.class) {
+ log.debug("加密字段：" + field.getName());
+ Object fieldVal = field.get(parameterObject);
+ if (fieldVal != null) {
+ try {
+ String encryptedStr = AESUtil.encrypt128(fieldVal.toString(), aesKey);
+ field.set(parameterObject, encryptedStr);
+ } catch (Exception e) {
+ log.debug("加密失败");
+ }
+ }
+ }
+ }
+ }
+ }
+ return parameterObject;
+ }
+
+ @Override
+ public <T> T decrypt(T result) throws IllegalAccessException {
+
+ for (Field field : result.getClass().getDeclaredFields()) {
+ try {
+ field.setAccessible(true);
+ if (field.get(result) != null) {
+ for (Annotation annotation : field.getAnnotations()) {
+ if (annotation.annotationType() == EncryptDecryptField.class) {
+ log.debug("解密密字段：" + field.getName());
+ String fieldVal = field.get(result).toString();
+ try {
+ String decryptVal = AESUtil.decrypt128(fieldVal, aesKey);
+ field.set(result, decryptVal != null ? decryptVal : fieldVal);
+ } catch (Exception e) {
+ /**
+ * 兼容原始未加密数据
+ */
+ field.set(result, fieldVal);
+ }
+ }
+ }
+ }
+ } catch (IllegalAccessException e) {
+ throw e;
+ }
+ }
+ return result;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/EncryptDecryptClass.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/EncryptDecryptClass.java
new file mode 100644
index 0000000..02125a3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/EncryptDecryptClass.java
@@ -0,0 +1,12 @@
+package com.panzhihua.common.model.helper.encrypt;
+
+import java.lang.annotation.*;
+
+/**
+ * 需要加解密的类注解
+ */
+@Documented
+@Inherited
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EncryptDecryptClass {}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/EncryptDecryptField.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/EncryptDecryptField.java
new file mode 100644
index 0000000..826ffcf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/EncryptDecryptField.java
@@ -0,0 +1,14 @@
+package com.panzhihua.common.model.helper.encrypt;
+
+import java.lang.annotation.*;
+
+/**
+ * 加密字段注解
+ */
+@Documented
+@Inherited
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EncryptDecryptField {
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/EncryptQuery.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/EncryptQuery.java
new file mode 100644
index 0000000..1b02f64
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/EncryptQuery.java
@@ -0,0 +1,14 @@
+package com.panzhihua.common.model.helper.encrypt;
+
+import java.lang.annotation.*;
+
+/**
+ * 加密字段搜索
+ */
+@Documented
+@Inherited
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EncryptQuery {
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/EncryptQueryClass.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/EncryptQueryClass.java
new file mode 100644
index 0000000..7a0a285
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/EncryptQueryClass.java
@@ -0,0 +1,14 @@
+package com.panzhihua.common.model.helper.encrypt;
+
+import java.lang.annotation.*;
+
+/**
+ * 加密字段搜索
+ */
+@Documented
+@Inherited
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EncryptQueryClass {
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/IEncryptDecrypt.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/IEncryptDecrypt.java
new file mode 100644
index 0000000..d6955e0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/encrypt/IEncryptDecrypt.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.helper.encrypt;
+
+import java.lang.reflect.Field;
+
+public interface IEncryptDecrypt {
+
+ /**
+ * 加密方法
+ *
+ * @param declaredFields
+ * 反射bean成员变量
+ * @param parameterObject
+ * Mybatis入参
+ * @param <T>
+ * @return
+ */
+ <T> T encrypt(Field[] declaredFields, T parameterObject) throws IllegalAccessException;
+
+ /**
+ * 解密方法
+ *
+ * @param result
+ * Mybatis 返回值，需要判断是否是ArrayList类型
+ * @param <T>
+ * @return
+ */
+ <T> T decrypt(T result) throws IllegalAccessException;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/sensitive/Desensitizer.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/sensitive/Desensitizer.java
new file mode 100644
index 0000000..1cf48a8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/sensitive/Desensitizer.java
@@ -0,0 +1,7 @@
+package com.panzhihua.common.model.helper.sensitive;
+
+import java.util.function.Function;
+
+public interface Desensitizer extends Function<String, String> {
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/sensitive/Sensitive.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/sensitive/Sensitive.java
new file mode 100644
index 0000000..5fa5179
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/sensitive/Sensitive.java
@@ -0,0 +1,12 @@
+package com.panzhihua.common.model.helper.sensitive;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface Sensitive {
+ SensitiveStrategy strategy();
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/sensitive/SensitiveStrategy.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/sensitive/SensitiveStrategy.java
new file mode 100644
index 0000000..06449bd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/helper/sensitive/SensitiveStrategy.java
@@ -0,0 +1,51 @@
+package com.panzhihua.common.model.helper.sensitive;
+
+/**
+ * 脱敏策略.
+ *
+ * @author cedoo
+ * @since 2021-4-1 10:40:52
+ */
+public enum SensitiveStrategy {
+ /**
+ * Username sensitive strategy.
+ */
+ USERNAME(s -> s.replaceAll("(\\S)\\S(\\S*)", "$1*$2")),
+ /**
+ * Id card sensitive type.
+ */
+ ID_CARD(s -> s.replaceAll("(\\d{4})\\d{10}(\\w{4})", "$1****$2")),
+ /**
+ * Phone sensitive type.
+ */
+ PHONE(s -> s.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")),
+
+ /**
+ * Address sensitive type.
+ */
+ ADDRESS(s -> s.replaceAll("(\\S{8})\\S{4}(\\S*)\\S{4}", "$1****$2****")),
+
+ /**
+ * 中文地址
+ */
+ ADDRESS_CN(s -> {
+ // List<Word> words = WordSegmenter.seg(s);
+ // Arrays.toString(words.toArray());
+ return s.replaceAll("(\\S{8})(\\S*)\\S{4}", "$1****$2****");
+ });
+
+ private final Desensitizer desensitizer;
+
+ SensitiveStrategy(Desensitizer desensitizer) {
+ this.desensitizer = desensitizer;
+ }
+
+ /**
+ * Gets desensitizer.
+ *
+ * @return the desensitizer
+ */
+ public Desensitizer getDesensitizer() {
+ return desensitizer;
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java
new file mode 100644
index 0000000..e55fa50
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.query.visit;
+
+import java.io.Serializable;
+
+import com.panzhihua.common.model.dtos.PageDTO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/21 15:44
+ */
+@ApiModel("走访查询")
+@Data
+public class EventTasksQuery extends PageDTO implements Serializable {
+
+ @ApiModelProperty("走访任务状态，app：0全部，1待走访，2已完成 | 后台：0全部，1待走访 3正常，6已撤销，7异常")
+ private Integer status;
+
+ @ApiModelProperty("走访记录状态，app：0全部，3正常，7异常")
+ private Integer eventStatus;
+
+ @ApiModelProperty("人员标签")
+ private String tag;
+
+ @ApiModelProperty("是否异常")
+ private Integer isExp;
+
+ @ApiModelProperty("关键字")
+ private String keyWord;
+
+ @ApiModelProperty("需走访人ID")
+ private Long visiterId;
+
+ private Long communityId;
+
+ private Long userId;
+
+ @ApiModelProperty("网格id")
+ private Long gridId;
+
+ @ApiModelProperty("正常状态（0.正常 1.异常）")
+ private Integer exception;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventVisitListQuery.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventVisitListQuery.java
new file mode 100644
index 0000000..89b209b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventVisitListQuery.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.query.visit;
+
+import java.io.Serializable;
+
+import com.panzhihua.common.model.dtos.PageDTO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 后台查询需走访人员
+ *
+ * @author xyh
+ * @date 2021/6/21 15:44
+ */
+@ApiModel("需走访人员查询")
+@Data
+public class EventVisitListQuery extends PageDTO implements Serializable {
+
+ @ApiModelProperty("最近一次走访状态")
+ private Integer status;
+
+ @ApiModelProperty("人员标签")
+ private String tag;
+
+ @ApiModelProperty("性别")
+ private Integer sex;
+
+ @ApiModelProperty("政治面貌")
+ private Integer political;
+
+ @ApiModelProperty("户主")
+ private Integer houseHolder;
+
+ @ApiModelProperty("关联实有房屋")
+ private Integer relationHouse;
+
+ @ApiModelProperty("关键字")
+ private String keyWord;
+
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/AppletUserInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/AppletUserInfoVO.java
new file mode 100644
index 0000000..71d7e0a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/AppletUserInfoVO.java
@@ -0,0 +1,133 @@
+package com.panzhihua.common.model.vos;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Set;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.vos.community.ComActVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 小程序用户信息
+ */
+@Data
+@ApiModel(value = "小程序用户信息")
+public class AppletUserInfoVO {
+
+ @ApiModelProperty("user_id")
+ private Long userId;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("昵称")
+ private String nickName;
+
+ @ApiModelProperty("真实名字")
+ private String name;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("社区名字")
+ private String communityName;
+
+ @ApiModelProperty("性别 1 男 2 女")
+ private Integer sex;
+
+ @ApiModelProperty("生日")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date birthday;
+
+ @ApiModelProperty("头像")
+ private String imageUrl;
+
+ @ApiModelProperty("是否志愿者 0否 1 是")
+ private Integer isVolunteer;
+
+ @ApiModelProperty("是否党员 0 否 1 是")
+ private Integer isPartymember;
+
+ @ApiModelProperty("1 启用 2 禁用")
+ private Integer status;
+
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ @ApiModelProperty("最后登录时间")
+ private Date lastLoginTime;
+
+ @ApiModelProperty("角色集合")
+ private Set<String> roles;
+
+ @ApiModelProperty("权限集合")
+ private Set<String> permissions;
+
+ @ApiModelProperty("身份证号")
+ private String idCard;
+
+ @ApiModelProperty("标签 多个用,隔开")
+ private String tags;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty("人脸采集审核状态 0 待审核 1 审核通过 2驳回")
+ private Integer faceState;
+
+ @ApiModelProperty("操作类型 1通过 2驳回 3删除")
+ private Integer operationType;
+
+ @ApiModelProperty("用户小区id")
+ private Long areaId;
+
+ @ApiModelProperty("用户所在社区信息")
+ private ComActVO comActVO;
+
+ @ApiModelProperty("0 未申请 1 申请中 2 通过 3 驳回")
+ private Integer volunteerStatus;
+
+ @ApiModelProperty("是否注册 0 否 1 是")
+ private Integer isRegister;
+
+ @ApiModelProperty("年龄")
+ private Integer age;
+
+ @ApiModelProperty("政治面貌：1 - 党员；2 - 团员；3 - 群众")
+ private Integer politicalOutlook;
+
+ @ApiModelProperty("是否已实名(1.是 2.否)")
+ private Integer isRealNamed;
+
+ @ApiModelProperty("关键词")
+ private String keyWord;
+
+ @ApiModelProperty("钱包id")
+ private Long walletId;
+
+ @ApiModelProperty("钱包收益总金额")
+ private BigDecimal incomeAmount;
+
+ @ApiModelProperty("钱包可用金额")
+ private BigDecimal availableAmount;
+
+ @ApiModelProperty("钱包结算金额")
+ private BigDecimal settlementAmount;
+
+ @ApiModelProperty("积分总余额")
+ private Integer integralSum;
+
+ @ApiModelProperty("积分可用余额")
+ private Integer integralAvailableSum;
+
+ @ApiModelProperty("积分冻结金额")
+ private Integer integralFrozenSum;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/AppletesBackstageConfigVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/AppletesBackstageConfigVO.java
new file mode 100644
index 0000000..350fb9f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/AppletesBackstageConfigVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.advertisement.ComOpsAdvJumpVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 运营后台编辑配置
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-28 17:45
+ **/
+@Data
+@ApiModel(value = "运营后台编辑配置")
+public class AppletesBackstageConfigVO {
+
+ @ApiModelProperty("广告配置参数集合")
+ private List<ComOpsAdvJumpVO> comOpsAdvJumpDTOS;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/BcDictionaryItemVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/BcDictionaryItemVO.java
new file mode 100644
index 0000000..f7ef6e3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/BcDictionaryItemVO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.vos;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author manailin
+ * @date 2021/6/11 16:27
+ */
+@ApiModel("字典项")
+@Data
+public class BcDictionaryItemVO implements Serializable {
+
+ /**
+ * 字典项名
+ */
+ private String dictItemName;
+
+ /**
+ * 字典项值
+ */
+ private String dictValue;
+
+ /**
+ * 助记码
+ */
+ private String mnemonicCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/BcDictionaryVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/BcDictionaryVO.java
new file mode 100644
index 0000000..05dec7b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/BcDictionaryVO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.vos;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/11 16:27
+ */
+@ApiModel("字典项")
+@Data
+public class BcDictionaryVO implements Serializable {
+
+ @ApiModelProperty(value = "字典项名称")
+ private String dictName;
+ @ApiModelProperty(value = "字典项值")
+ private String dictValue;
+ @ApiModelProperty(value = "字典项助记码")
+ private String code;
+ /**
+ * 字典id
+ */
+ private Long dictId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/ComActSocialMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/ComActSocialMemberVO.java
new file mode 100644
index 0000000..b22a87a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/ComActSocialMemberVO.java
@@ -0,0 +1,98 @@
+package com.panzhihua.common.model.vos;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class ComActSocialMemberVO {
+ private Long id;
+
+ /**
+ * 姓名
+ */
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ /**
+ * 社会组织id
+ */
+ @ApiModelProperty(value = "社会组织id")
+ private Long orgId;
+
+ /**
+ * 职位
+ */
+ @ApiModelProperty(value = "职位")
+ private String position;
+
+ /**
+ * 身份证号
+ */
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+
+ /**
+ * 账号
+ */
+ @ApiModelProperty(value = "账号")
+ private String account;
+
+ /**
+ * 密码
+ */
+ @ApiModelProperty(value = "密码")
+ private String password;
+
+ /**
+ * 状态1启用 0停用
+ */
+ @ApiModelProperty(value = "状态1启用 0停用")
+ private Integer status;
+
+ /**
+ * 照片
+ */
+ @ApiModelProperty(value = "照片")
+ private String image;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 街道id
+ */
+ @ApiModelProperty(value = "街道id")
+ private Long streetId;
+
+ /**
+ * 所属组织
+ */
+ @ApiModelProperty(value = "所属组织")
+ private String orgName;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ /**
+ * 用户id
+ */
+ private Long userId;
+
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/DateVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/DateVO.java
new file mode 100644
index 0000000..c229755
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/DateVO.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.model.vos;
+
+import lombok.Data;
+
+/**
+ * @author Tuzi
+ * @date 2023年02月03日 17:55
+ */
+@Data
+public class DateVO {
+ private String now;
+ private String offset16;
+ private String offset27;
+ private String offset35;
+ private String offset45;
+ private String offset55;
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/DictionaryVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/DictionaryVO.java
new file mode 100644
index 0000000..1df6726
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/DictionaryVO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.vos;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author manailin
+ * @date 2021/6/11 16:27
+ */
+@ApiModel("字典")
+@Data
+public class DictionaryVO implements Serializable {
+ private Long id;
+ @ApiModelProperty(value = "字典项名称")
+ private String dictName;
+ @ApiModelProperty(value = "字典项值")
+ private String dictKey;
+ @ApiModelProperty(value = "字典项助记码")
+ private Long parentId;
+
+ /**
+ * 层级
+ */
+ private Integer levelIndex;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/EditUserInfoAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/EditUserInfoAppDTO.java
new file mode 100644
index 0000000..bae042c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/EditUserInfoAppDTO.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.vos;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "用户修改信息")
+public class EditUserInfoAppDTO {
+
+ @ApiModelProperty("用户昵称")
+ private String nickName;
+
+ @ApiModelProperty("用户头像url")
+ private String imagesUrl;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/EditUserInfoPassAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/EditUserInfoPassAppDTO.java
new file mode 100644
index 0000000..175671c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/EditUserInfoPassAppDTO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.vos;
+
+import javax.validation.constraints.NotBlank;
+
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "用户修改信息")
+public class EditUserInfoPassAppDTO {
+
+ @ApiModelProperty("原密码")
+ @NotBlank(groups = {PutGroup.class}, message = "原密码不能为空")
+ private String oldPassword;
+
+ @ApiModelProperty("新密码")
+ @NotBlank(groups = {PutGroup.class}, message = "新密码不能为空")
+ private String newPassword;
+
+ @ApiModelProperty("确认密码")
+ @NotBlank(groups = {PutGroup.class}, message = "确认密码不能为空")
+ private String confirmPassword;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IPageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IPageVO.java
new file mode 100644
index 0000000..7378073
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IPageVO.java
@@ -0,0 +1,225 @@
+/*
+ * Copyright (c) 2011-2020, baomidou (jobob@qq.com). <p> Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy of the License at <p>
+ * https://www.apache.org/licenses/LICENSE-2.0 <p> Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions and limitations under the
+ * License.
+ */
+package com.panzhihua.common.model.vos;
+
+import static java.util.stream.Collectors.toList;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * 分页 Page 对象接口
+ *
+ * @author
+ * @since
+ */
+public class IPageVO<T> implements Serializable {
+
+ /**
+ * 获取排序信息，排序的字段和正反序
+ *
+ * @return 排序信息
+ */
+ List<Object> orders() {
+ return null;
+ }
+
+ /**
+ * KEY/VALUE 条件
+ *
+ * @return ignore
+ * @deprecated 3.4.0 @2020-06-30
+ */
+ @Deprecated
+ Map<Object, Object> condition() {
+ return null;
+ }
+
+ /**
+ * 自动优化 COUNT SQL【 默认：true 】
+ *
+ * @return true 是 / false 否
+ */
+ boolean optimizeCountSql() {
+ return true;
+ }
+
+ /**
+ * 进行 count 查询 【 默认: true 】
+ *
+ * @return true 是 / false 否
+ */
+ boolean isSearchCount() {
+ return true;
+ }
+
+ /**
+ * 计算当前分页偏移量
+ */
+ long offset() {
+ long current = getCurrent();
+ if (current <= 1L) {
+ return 0L;
+ }
+ return (current - 1) * getSize();
+ }
+
+ /**
+ * 最大每页分页数限制,优先级高于分页插件内的 maxLimit
+ *
+ * @since 3.4.0 @2020-07-17
+ */
+ Long maxLimit() {
+ return null;
+ }
+
+ /**
+ * 当前分页总页数
+ */
+ long getPages() {
+ if (getSize() == 0) {
+ return 0L;
+ }
+ long pages = getTotal() / getSize();
+ if (getTotal() % getSize() != 0) {
+ pages++;
+ }
+ return pages;
+ }
+
+ /**
+ * 内部什么也不干
+ * <p>
+ * 只是为了 json 反序列化时不报错
+ * </p>
+ */
+ IPageVO<T> setPages(long pages) {
+ // to do nothing
+ return this;
+ }
+
+ /**
+ * 设置是否命中count缓存
+ *
+ * @param hit
+ * 是否命中
+ * @since 3.3.1
+ * @deprecated 3.4.0 @2020-06-30 缓存遵循mybatis的一或二缓
+ */
+ @Deprecated
+ void hitCount(boolean hit) {
+
+ }
+
+ /**
+ * 是否命中count缓存
+ *
+ * @return 是否命中count缓存
+ * @since 3.3.1
+ * @deprecated 3.4.0 @2020-06-30 缓存遵循mybatis的一或二缓
+ */
+ @Deprecated
+ boolean isHitCount() {
+ return false;
+ }
+
+ /**
+ * 分页记录列表
+ *
+ * @return 分页对象记录列表
+ */
+ List<T> getRecords() {
+ return null;
+ }
+
+ /**
+ * 设置分页记录列表
+ */
+ IPageVO<T> setRecords(List<T> records) {
+ return null;
+ }
+
+ /**
+ * 当前满足条件总行数
+ *
+ * @return 总条数
+ */
+ long getTotal() {
+ return 0l;
+ }
+
+ /**
+ * 设置当前满足条件总行数
+ */
+ IPageVO<T> setTotal(long total) {
+ return null;
+ }
+
+ /**
+ * 获取每页显示条数
+ *
+ * @return 每页显示条数
+ */
+ long getSize() {
+ return 0;
+ }
+
+ /**
+ * 设置每页显示条数
+ */
+ IPageVO<T> setSize(long size) {
+ return null;
+ }
+
+ /**
+ * 当前页
+ *
+ * @return 当前页
+ */
+ long getCurrent() {
+ return 0l;
+ }
+
+ /**
+ * 设置当前页
+ */
+ IPageVO<T> setCurrent(long current) {
+ return null;
+ }
+
+ /**
+ * IPageVO 的泛型转换
+ *
+ * @param mapper
+ * 转换函数
+ * @param <R>
+ * 转换后的泛型
+ * @return 转换泛型后的 IPageVO
+ */
+ @SuppressWarnings("unchecked")
+ <R> IPageVO<R> convert(Function<? super T, ? extends R> mapper) {
+ List<R> collect = this.getRecords().stream().map(mapper).collect(toList());
+ return ((IPageVO<R>)this).setRecords(collect);
+ }
+
+ /**
+ * 老分页插件不支持
+ * <p>
+ * MappedStatement 的 id
+ *
+ * @return id
+ * @since 3.4.0 @2020-06-19
+ */
+ String countId() {
+ return null;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IndexDataKanbanVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IndexDataKanbanVO.java
new file mode 100644
index 0000000..0c9ff76
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IndexDataKanbanVO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.vos;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 运营后台数据看板
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-05 15:23
+ **/
+@Data
+@ApiModel(value = "运营后台数据看板")
+public class IndexDataKanbanVO {
+
+ @ApiModelProperty("全部用户")
+ private Integer allUser;
+ @ApiModelProperty("新增用户")
+ private Integer addUser;
+ @ApiModelProperty("日活跃用户")
+ private Integer activeDayUser;
+ @ApiModelProperty("周活跃用户")
+ private Integer activeWeekUser;
+ @ApiModelProperty("社区用户量x轴")
+ private List<String> communityUserX;
+ @ApiModelProperty("社区用户量y轴")
+ private List<Integer> communityUserY;
+ @ApiModelProperty("社区活跃度x轴")
+ private List<String> communityActiveUserX;
+ @ApiModelProperty("用户新增数量y轴")
+ private List<Integer> communityAddUserY;
+ @ApiModelProperty("日活跃用户数量y轴")
+ private List<Integer> communityActiveUserY;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IndexDataVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IndexDataVO.java
new file mode 100644
index 0000000..c9daa3e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IndexDataVO.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.vos;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.CommunityActivitiesVO;
+import com.panzhihua.common.model.vos.community.CommunityGovernanceTrendsVO;
+import com.panzhihua.common.model.vos.community.TodoEventsVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 社区管理后台数据看板
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-06 09:39
+ **/
+@Data
+@ApiModel(value = "社区管理后台数据看板")
+public class IndexDataVO {
+
+ @ApiModelProperty("全部用户")
+ private Integer allUser;
+ @ApiModelProperty("已登记房屋")
+ private Integer house;
+ @ApiModelProperty("志愿者人数")
+ private Integer volunteerUser;
+ @ApiModelProperty("党员人数")
+ private Integer partymemberUser;
+ @ApiModelProperty("代办事件")
+ private List<TodoEventsVO> todoEventsVOList;
+ @ApiModelProperty("社区治理动态")
+ private CommunityGovernanceTrendsVO communityGovernanceTrendsVO;
+ @ApiModelProperty("社区活动情况")
+ private List<CommunityActivitiesVO> communityActivitiesVOS;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LiveVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LiveVO.java
new file mode 100644
index 0000000..f10e007
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LiveVO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.vos;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 天气信息对象
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-8-17 12:55
+ **/
+@Data
+@ApiModel(value = "天气信息返回体")
+public class LiveVO {
+ private String adcode;
+ private String city;
+ private String humidity;
+ private String province;
+ private String reporttime;
+ private String temperature;
+ private String weather;
+ private String winddirection;
+ private String windpower;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginReturnVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginReturnVO.java
new file mode 100644
index 0000000..3d0d9c8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginReturnVO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.vos;
+
+import com.panzhihua.common.validated.AddGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 登录返回
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-27 08:55
+ **/
+@Data
+@ApiModel(value = "登录返回体")
+public class LoginReturnVO {
+ @ApiModelProperty("接口请求令牌")
+ private String token;
+ @ApiModelProperty("刷新token有效期长")
+ private String refreshToken;
+ @ApiModelProperty("communityId")
+ private Long communityId;
+ @ApiModelProperty("openId")
+ private String openId;
+ @ApiModelProperty("社区经度")
+ private String lng;
+ @ApiModelProperty("社区维度")
+ private String lat;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginReturnsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginReturnsVO.java
new file mode 100644
index 0000000..8fd27c3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginReturnsVO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.vos;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 登录返回
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-27 08:55
+ **/
+@Data
+@ApiModel(value = "登录返回体")
+public class LoginReturnsVO {
+ @ApiModelProperty("接口请求令牌")
+ private String token;
+ @ApiModelProperty("刷新token有效期长")
+ private String refreshToken;
+ @ApiModelProperty("用户id")
+ private Long userId;
+ @ApiModelProperty("社区id")
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
new file mode 100644
index 0000000..bcc1f03
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -0,0 +1,282 @@
+package com.panzhihua.common.model.vos;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
+import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
+import com.panzhihua.common.model.vos.shop.ComShopUserAddressVO;
+import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
+import com.panzhihua.common.model.vos.user.RoleVO;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 登录用户信息
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 09:35
+ **/
+@Data
+@ApiModel(value = "用户信息")
+public class LoginUserInfoVO {
+
+ @ApiModelProperty("user_id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+
+ @ApiModelProperty("微信会话密钥")
+ private String sessionKey;
+
+ @ApiModelProperty("用户在开放平台的唯一标识符")
+ private String unionid;
+
+ @ApiModelProperty("登录账户")
+ private String account;
+
+ @ApiModelProperty("登录密码")
+ private String password;
+
+ @ApiModelProperty("微信小程序唯一标识")
+ private String openid;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("昵称")
+ private String nickName;
+
+ @ApiModelProperty("真实名字")
+ @NotBlank(groups = {AddGroup.class}, message = "真实名字不能为空")
+ private String name;
+
+ @ApiModelProperty("社区id")
+ @Min(value = 1, groups = {PutGroup.class}, message = "社区id不能为空")
+ @NotNull(groups = {PutGroup.class}, message = "社区id不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ @ApiModelProperty("社区名字")
+ private String communityName;
+
+ @ApiModelProperty("性别 1 男 2 女")
+ private Integer sex;
+
+ @ApiModelProperty("是否本社区的团队或者党委、或是系统管理人员 1 是 2 否")
+ private Integer ismemberrole;
+
+ @ApiModelProperty("生日")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date birthday;
+
+ @ApiModelProperty("头像")
+ private String imageUrl;
+
+ @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台")
+ private Integer type;
+
+ @ApiModelProperty("职业")
+ private String job;
+
+ @ApiModelProperty("是否志愿者 0否 1 是")
+ private Integer isVolunteer;
+
+ @ApiModelProperty("是否党员 0 否 1 是")
+ private Integer isPartymember;
+
+ @ApiModelProperty("1 启用 2 禁用")
+ private Integer status;
+
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ @ApiModelProperty("最后登录时间")
+ private Date lastLoginTime;
+
+ @ApiModelProperty("角色集合")
+ private Set<String> roles;
+
+ @ApiModelProperty("权限集合")
+ private Set<String> permissions;
+
+ @ApiModelProperty("人脸采集照片url")
+ private String faceUrl;
+
+ @ApiModelProperty("驳回原因")
+ private String rejectReson;
+
+ @ApiModelProperty("身份证号")
+ @NotBlank(groups = {AddGroup.class}, message = "身份证号不能为空")
+ private String idCard;
+
+ @ApiModelProperty("标签 多个用,隔开")
+ private String tags;
+
+ @ApiModelProperty("家庭id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long familyId;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty("人脸采集审核状态 0 待审核 1 审核通过 2驳回")
+ private Integer faceState;
+
+ @ApiModelProperty("操作类型 1通过 2驳回 3删除")
+ private Integer operationType;
+
+ @ApiModelProperty("家庭成员")
+ private List<ComMngFamilyInfoVO> comMngFamilyInfoVOS;
+
+ @ApiModelProperty("房屋信息")
+ private List<ComMngStructHouseVO> comMngStructHouseVOS;
+
+ @ApiModelProperty("用户小区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ // @Min(value = 1,groups = {PutGroup.class},message = "用户小区id不能为空")
+ // @NotNull(groups = {PutGroup.class},message = "用户小区id不能为空")
+ private Long areaId;
+
+ @ApiModelProperty("用户所在社区信息")
+ private ComActVO comActVO;
+
+ @ApiModelProperty("小区信息")
+ private ComMngStructAreaVO comMngStructAreaVO;
+
+ @ApiModelProperty("0 未申请 1 申请中 2 通过 3 驳回")
+ private Integer volunteerStatus;
+
+ @ApiModelProperty("是否注册 0 否 1 是")
+ private Integer isRegister;
+
+ @ApiModelProperty("年龄")
+ private Integer age;
+
+ @ApiModelProperty("政治面貌：1 - 党员；2 - 团员；3 - 群众")
+ private Integer politicalOutlook;
+
+ @ApiModelProperty("小程序首页是否显示公告(1.是 2.否)")
+ private Integer isTips;
+
+ @ApiModelProperty("是否已实名")
+ private Boolean isRealNamed;
+
+ @ApiModelProperty("上班时间")
+ private Integer workStartTime;
+
+ @ApiModelProperty("下班时间")
+ private Integer workEndTime;
+
+ @ApiModelProperty("高龄认证显示提示（1.是 2.否）")
+ private Integer bigAgeTips;
+
+ @ApiModelProperty("是否四长四员 1.是 2.否")
+ private Integer isFourMember;
+
+ @ApiModelProperty("是否社区工作人员 1.是 2.否")
+ private Integer isCommunityWorker;
+
+ @ApiModelProperty("是否社工 1.是 2.否")
+ private Integer isSocialWorker;
+
+ @ApiModelProperty("实名认证地址")
+ private String address;
+
+ @ApiModelProperty("是否物业工作人员 1.是 2.否")
+ private Integer isPropertyWorker;
+
+ @ApiModelProperty("是否微团队成员 1.是 2.否")
+ private Integer isFmsMember;
+ @ApiModelProperty("是否网格员 1.是 2.否")
+ private Integer isEasyPhotoMember;
+ @ApiModelProperty("是否社会组织联系人 1.是 2.否")
+ private Integer isOrgContactPeople;
+
+ @ApiModelProperty("是否人大代表成员 1.是 2.否")
+ private Integer isDpcMember;
+ @ApiModelProperty("appid")
+ private String appId;
+ @ApiModelProperty("appSecret")
+ private String appSecret;
+ @ApiModelProperty("areaCode")
+ private String areaCode;
+ @ApiModelProperty("街道id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long streetId;
+
+ @ApiModelProperty("账号类型 1街道 2社区 3社会组织")
+ private Integer userType;
+
+ @ApiModelProperty("社会组织Id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long orgId;
+
+ @ApiModelProperty("是否是防疫工作人员 1.是 2.否")
+ private Integer isAcidMember;
+
+ @ApiModelProperty("绑定单位")
+ private String relationName;
+
+ @ApiModelProperty("区域划分")
+ private String areaName;
+
+ @ApiModelProperty("爱心积分")
+ private String loveIntegral;
+ @ApiModelProperty("爱心积分密码")
+ private String playPwd;
+
+ @ApiModelProperty("是否单位管理员 1是 0否")
+ private Integer isCheckUnitAdmin;
+
+ @ApiModelProperty("报道单位id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long checkUnitId;
+
+ private Long bindingCheckUnitId;
+
+ @ApiModelProperty("后台账号类型")
+ private Integer backstageType;
+
+
+ public String retrieveRelationName() {
+ return this.type == 3 ? relationName : name;
+ }
+
+ @ApiModelProperty("权限等级1-5：超管-行业分中心-街道-社区-专家")
+ private Integer level;
+
+ @ApiModelProperty("物业公司id")
+ private Long propertyId;
+
+ @ApiModelProperty("商家后台账号id")
+ private Long backstageUserId;
+
+ @ApiModelProperty("是否为自提点")
+ private Boolean isPoint;
+
+ @ApiModelProperty("默认地址")
+ private ComShopUserAddressVO comShopUserAddressVO;
+
+ @ApiModelProperty("商家id")
+ private Long storeIdId;
+
+ @ApiModelProperty("角色id")
+ private String roleId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/MenuVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/MenuVO.java
new file mode 100644
index 0000000..e413e23
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/MenuVO.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.vos;
+
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 菜单按钮权限
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-25 15:20
+ **/
+@Data
+public class MenuVO {
+ /**
+ * 菜单路径
+ */
+ private String url;
+ /**
+ * 对应角色标识
+ */
+ private String role;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/PageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/PageVO.java
new file mode 100644
index 0000000..4cdc5c8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/PageVO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.vos;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@ApiModel(value = "分页工具类")
+public class PageVO<T> implements Serializable {
+
+ @ApiModelProperty("记录")
+ private T records;
+
+ @ApiModelProperty("总页数")
+ private Integer pages;
+
+ @ApiModelProperty("当前页")
+ private Integer page;
+
+ @ApiModelProperty("总记录数")
+ private Integer recordsCount;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/PartyMemberListExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/PartyMemberListExcelVO.java
new file mode 100644
index 0000000..afcfdec
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/PartyMemberListExcelVO.java
@@ -0,0 +1,48 @@
+package com.panzhihua.common.model.vos;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+public class PartyMemberListExcelVO {
+ @ExcelProperty(value = "姓名",index = 1)
+ private String name;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ExcelProperty(value = "入党时间",index = 3)
+ private Date joinTime;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ExcelProperty(value = "转正时间",index = 4)
+ private Date employmentTime;
+ @ExcelProperty(value = "党组织名字",index = 5)
+ private String orgName;
+ @ExcelProperty(value = "手机号",index = 0)
+ private String phone;
+ @ExcelProperty(value = "党龄",index = 2)
+ private Integer partyAge;
+ @ExcelProperty(value = "状态",index = 8)
+ private String status;
+ @ExcelProperty(value = "活动时长",index = 6)
+ private Integer partyTime;
+ @ExcelProperty(value = "参与活动获得积分",index = 7)
+ private Integer partyInterval;
+
+ private String checkUnitName;
+
+ private String specialtyName;
+
+ @ExcelProperty(value = "常住社区",index = 1)
+ private String communityName;
+ @ExcelProperty(value = "小区院落",index = 2)
+ private String villageName;
+ @ExcelProperty(value = "工作单位归属",index = 5)
+ private String belongTo;
+ @ExcelProperty(value = "服务社区",index = 6)
+ private String helpCommunityName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/R.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/R.java
new file mode 100644
index 0000000..1e17bb6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/R.java
@@ -0,0 +1,110 @@
+package com.panzhihua.common.model.vos;
+
+import java.io.Serializable;
+import java.lang.reflect.Field;
+
+import org.springframework.util.ObjectUtils;
+
+import com.panzhihua.common.constants.Constants;
+
+import lombok.Data;
+
+/**
+ * 响应信息主体
+ *
+ * @author HUANGHONGFA
+ */
+@Data
+public class R<T> implements Serializable {
+ /**
+ * 成功
+ */
+ public static final int SUCCESS = Constants.SUCCESS;
+ /**
+ * 失败
+ */
+ public static final int FAIL = Constants.FAIL;
+ private static final long serialVersionUID = 1L;
+ private int code;
+
+ private String msg;
+
+ private T data;
+
+ public static <T> R<T> ok() {
+ return restResult(null, SUCCESS, "success");
+ }
+
+ public static <T> R<T> ok(T data) {
+ return restResult(data, SUCCESS, "success");
+ }
+
+ public static <T> R<T> ok(T data, String msg) {
+ return restResult(data, SUCCESS, msg);
+ }
+
+ public static <T> R<T> fail() {
+ return restResult(null, FAIL, null);
+ }
+
+ public static <T> R<T> fail(String msg) {
+ return restResult(null, FAIL, msg);
+ }
+
+ public static <T> R<T> fail(T data) {
+ return restResult(data, FAIL, null);
+ }
+
+ public static <T> R<T> fail(T data, String msg) {
+ return restResult(data, FAIL, msg);
+ }
+
+ public static <T> R<T> fail(int code, String msg) {
+ return restResult(null, code, msg);
+ }
+
+ public static <T> R<T> fail(int code) {
+ return restResult(null, code, null);
+ }
+
+ private static <T> R<T> restResult(T data, int code, String msg) {
+ R<T> apiResult = new R<>();
+ apiResult.setCode(code);
+ apiResult.setData(data);
+ if (ObjectUtils.isEmpty(msg)) {
+ apiResult.setMsg("失败");
+ } else {
+ apiResult.setMsg(msg);
+ }
+
+ return apiResult;
+ }
+
+ /**
+ * 请求是否成功
+ *
+ * @return
+ */
+ public static boolean isOk(R r) {
+ return r.code == Constants.SUCCESS.intValue();
+ }
+
+ /**
+ * code
+ *
+ * @return
+ */
+ public static Integer getCode(R r) {
+ String code = null;
+ try {
+ Field field = r.getData().getClass().getDeclaredField("code");
+ code = field.get("code").toString();
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ } catch (NoSuchFieldException e) {
+ e.printStackTrace();
+ }
+ return Integer.valueOf(code);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/ResultData.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/ResultData.java
new file mode 100644
index 0000000..6675a7f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/ResultData.java
@@ -0,0 +1,95 @@
+package com.panzhihua.common.model.vos;
+
+import com.panzhihua.common.constants.HttpStatus;
+
+public class ResultData<T> {
+ //返回状态码
+ private Integer code;
+ //返回数据
+ private String msg;
+ //返回消息
+ private T date;
+
+ public Integer getCode() {
+ return code;
+ }
+
+ public void setCode(Integer code) {
+ this.code = code;
+ }
+
+ public T getDate() {
+ return date;
+ }
+
+ public void setDate( T success) {
+ this.date = success;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ //Success结果
+ public static <T> ResultData<T> success(T data) {
+ ResultData<T> resultData = new ResultData<>();
+ resultData.setCode(HttpStatus.SUCCESS);
+ resultData.setDate(null);
+ resultData.setMsg("success");
+ return resultData;
+ }
+
+ //Success结果
+ public static <T> ResultData<T> success(T data,String msg) {
+ ResultData<T> resultData = new ResultData<>();
+ resultData.setCode(HttpStatus.SUCCESS);
+ resultData.setDate(null);
+ resultData.setMsg(msg);
+ return resultData;
+ }
+
+ public static <T> ResultData<T> normal(T data) {
+ ResultData<T> resultData = new ResultData<>();
+ resultData.setCode(HttpStatus.NORMAL);
+ resultData.setMsg("success");
+ resultData.setDate(data);
+ return resultData;
+ }
+
+ //Success结果
+ public static <T> ResultData<T> success() {
+ ResultData<T> resultData = new ResultData<>();
+ resultData.setCode(HttpStatus.SUCCESS);
+ resultData.setDate(null);
+ return resultData;
+ }
+
+
+ //Fail结果
+ public static <T> ResultData<T> fail(int code, String message) {
+ ResultData<T> resultData = new ResultData<>();
+ resultData.setCode(code);
+ resultData.setDate(null);
+ return resultData;
+ }
+
+ //Fail结果
+ public static <T> ResultData<T> error(String message) {
+ ResultData<T> resultData = new ResultData<>();
+ resultData.setCode(HttpStatus.ERROR);
+ resultData.setDate(null);
+ return resultData;
+ }
+
+ //Fail结果
+ public static <T> ResultData<T> error() {
+ ResultData<T> resultData = new ResultData<>();
+ resultData.setCode(HttpStatus.ERROR);
+ resultData.setDate(null);
+ return resultData;
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/SanShuoMessageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/SanShuoMessageVO.java
new file mode 100644
index 0000000..3f623b7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/SanShuoMessageVO.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.vos;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SanShuoMessageVO {
+ private String touser;
+ private String thing5;
+ private String thing1;
+ private String thing2;
+ private String time3;
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/StreetVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/StreetVO.java
new file mode 100644
index 0000000..b755493
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/StreetVO.java
@@ -0,0 +1,11 @@
+package com.panzhihua.common.model.vos;
+
+import lombok.Data;
+
+@Data
+public class StreetVO {
+
+ private String streetId;
+
+ private String name;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/SystemmanagementConfigVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/SystemmanagementConfigVO.java
new file mode 100644
index 0000000..d55f6da
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/SystemmanagementConfigVO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.vos;
+
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+
+import com.panzhihua.common.model.vos.community.ComMngStructBuildTypeVO;
+import com.panzhihua.common.model.vos.user.ComMngUserTagVO;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 系统配置
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-25 16:53
+ **/
+@Data
+@ApiModel(value = "系统配置")
+public class SystemmanagementConfigVO {
+ @ApiModelProperty("建筑类型")
+ @NotEmpty(groups = {AddGroup.class}, message = "建筑类型不能为空")
+ List<ComMngStructBuildTypeVO> comMngStructBuildTypeVOList;
+ @ApiModelProperty("用户标签")
+ @NotEmpty(groups = {AddGroup.class}, message = "用户标签不能为空")
+ List<ComMngUserTagVO> comMngUserTagVOList;
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/TreeListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/TreeListVO.java
new file mode 100644
index 0000000..45e5ebb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/TreeListVO.java
@@ -0,0 +1,14 @@
+package com.panzhihua.common.model.vos;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TreeListVO {
+
+ private String orgName;
+
+ private String name;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/UploadFilesVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/UploadFilesVO.java
new file mode 100644
index 0000000..9c6ee8f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/UploadFilesVO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.vos;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("多文件上传返回参数")
+@Data
+public class UploadFilesVO {
+
+ @ApiModelProperty("图片上传url")
+ private String url;
+
+ @ApiModelProperty("描述")
+ private String alt;
+
+ @ApiModelProperty("链接")
+ private String href;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/WeatherVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/WeatherVO.java
new file mode 100644
index 0000000..62dc583
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/WeatherVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 天气信息对象
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-8-17 12:55
+ **/
+@Data
+@ApiModel(value = "天气信息返回体")
+public class WeatherVO {
+ private String count;
+ private String info;
+ private String infocode;
+ private String status;
+ private List<LiveVO> lives;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvJumpVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvJumpVO.java
new file mode 100644
index 0000000..c845862
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvJumpVO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.vos.advertisement;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 跳转内容
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-28 15:49
+ **/
+@Data
+@ApiModel(value = "跳转内容")
+public class ComOpsAdvJumpVO {
+
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("跳转内容")
+ private String jumpContent;
+
+ @ApiModelProperty("是否默认 0 否 1 是")
+ private Integer isDefault;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.java
new file mode 100644
index 0000000..ef3f060
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.vos.advertisement;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 广告位置
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-28 15:52
+ **/
+@Data
+@ApiModel(value = "广告位置")
+public class ComOpsAdvPosVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("广告位置中文描述")
+ private String advDesc;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvVO.java
new file mode 100644
index 0000000..8c79049
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvVO.java
@@ -0,0 +1,63 @@
+package com.panzhihua.common.model.vos.advertisement;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 广告
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-28 15:42
+ **/
+@Data
+@ApiModel(value = "广告")
+public class ComOpsAdvVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("广告位置id 1 表示放在首页")
+ private Integer posId;
+
+ @ApiModelProperty("广告位置名字")
+ private String advDesc;
+
+ @ApiModelProperty("图片路径")
+ private String photoPath;
+
+ @ApiModelProperty("链接类型：0~ 外部链接；1 ~ 内部链接")
+ private Integer linkType;
+
+ @ApiModelProperty("上架时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date onAt;
+
+ @ApiModelProperty("下架时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date offAt;
+
+ @ApiModelProperty("跳转内容id 1 随手拍 2 人脸识别 3 政策文件")
+ private Long jumpId;
+
+ @ApiModelProperty("跳转url地址")
+ private String jumpUrl;
+
+ @ApiModelProperty("跳转内容")
+ private String jumpContent;
+
+ @ApiModelProperty("新增时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("编辑时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/area/AreaAddressVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/area/AreaAddressVO.java
new file mode 100644
index 0000000..ce59261
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/area/AreaAddressVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.area;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "查询社区地址信息")
+public class AreaAddressVO {
+
+ /**
+ * 省份名称
+ */
+ private String province;
+
+ /**
+ * 城市名称
+ */
+ private String city;
+
+ /**
+ * 区域名称
+ */
+ private String district;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/area/AreaInfoVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/area/AreaInfoVo.java
new file mode 100644
index 0000000..3a67fc9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/area/AreaInfoVo.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.area;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 区域信息
+ * @Author: llming
+ */
+@Data
+@ApiModel(value = "区域信息")
+public class AreaInfoVo {
+ @ApiModelProperty("Id")
+ private Long Id;
+ @ApiModelProperty("区域名称")
+ private Long name;
+ @ApiModelProperty("下一级区域信息")
+ private List<AreaInfoVo> AreaInfoVo;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/area/StreetAndBuildVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/area/StreetAndBuildVO.java
new file mode 100644
index 0000000..67e0bcc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/area/StreetAndBuildVO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.vos.area;
+
+import com.panzhihua.common.model.vos.community.screen.event.EventPopulationSpecialStatisticsVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class StreetAndBuildVO {
+
+
+ /**
+ * 社区id
+ */
+ private String communityId;
+ /**
+ * 社区名称
+ */
+ private String name;
+
+ /**
+ * 人口数量
+ */
+ private Integer peopleNum = 0;
+
+ /**
+ * 小区数量
+ */
+ private Integer villageNum = 0;
+
+ /**
+ * 房屋数量
+ */
+ private Integer buildNum = 0;
+
+ @ApiModelProperty("特殊人口数据")
+ private EventPopulationSpecialStatisticsVO specialStatisticsVo;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerDetailsVO.java
new file mode 100644
index 0000000..6736868
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerDetailsVO.java
@@ -0,0 +1,115 @@
+package com.panzhihua.common.model.vos.civil;
+
+import java.util.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.math.BigDecimal;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-03
+ * */
+@Data
+@ApiModel("社工详细返回参数")
+public class ComActSocialWorkerDetailsVO {
+
+ @ApiModelProperty(value = "ID")
+ private Long id;
+
+ @ApiModelProperty(value = "所属组织ID")
+ private Long socialOrgId;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "联系电话")
+ private String telephone;
+
+ @ApiModelProperty(value = "性别0女1男")
+ private Integer gen;
+
+ @ApiModelProperty(value = "所属街道")
+ private Long streetId;
+
+ @ApiModelProperty(value = "所属社区")
+ private Long communityId;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "更新人")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ /**
+ * 身份证
+ */
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ /**
+ * 分类id
+ */
+ @ApiModelProperty(value = "分类id")
+ private Long skillType;
+
+ /**
+ * 入职时间
+ */
+ @ApiModelProperty(value = "入职时间")
+ private Date joinTime;
+
+ /**
+ * 住址
+ */
+ @ApiModelProperty(value = "住址")
+ private String address;
+
+ /**
+ * 图片
+ */
+ @ApiModelProperty(value = "图片")
+ private String image;
+
+ /**
+ * 学历
+ */
+ @ApiModelProperty(value = "学历")
+ private String education;
+
+ /**
+ * 政治面貌
+ */
+ @ApiModelProperty(value = "政治面貌")
+ private String politicalOutlook;
+
+ /**
+ * 民族
+ */
+ @ApiModelProperty(value = "民族")
+ private String nation;
+
+ /**
+ * 是否证件 0否 1是
+ */
+ @ApiModelProperty(value = "是否证件 0否 1是")
+ private Integer credential;
+ /**
+ * 分类名称
+ */
+ @ApiModelProperty(value = "分类id")
+ private String skillTypeName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerVO.java
new file mode 100644
index 0000000..978687a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerVO.java
@@ -0,0 +1,119 @@
+package com.panzhihua.common.model.vos.civil;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-03
+ * */
+@Data
+@ApiModel("社工返回参数")
+public class ComActSocialWorkerVO {
+
+ @ApiModelProperty(value = "ID")
+ private Long id;
+
+ @ApiModelProperty(value = "所属组织ID")
+ private String socialOrgId;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "联系电话")
+ private String telephone;
+
+ @ApiModelProperty(value = "性别0女1男")
+ private String gen;
+
+ @ApiModelProperty(value = "所属街道")
+ private String streetId;
+
+ @ApiModelProperty(value = "所属社区")
+ private String communityId;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "更新人")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ /**
+ * 身份证
+ */
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ /**
+ * 分类id
+ */
+ @ApiModelProperty(value = "分类id")
+ private String skillType;
+
+ /**
+ * 入职时间
+ */
+ @ApiModelProperty(value = "入职时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date joinTime;
+
+ /**
+ * 住址
+ */
+ @ApiModelProperty(value = "住址")
+ private String address;
+
+ /**
+ * 图片
+ */
+ @ApiModelProperty(value = "图片")
+ private String image;
+
+ /**
+ * 学历
+ */
+ @ApiModelProperty(value = "学历")
+ private String education;
+
+ /**
+ * 政治面貌
+ */
+ @ApiModelProperty(value = "政治面貌")
+ private String politicalOutlook;
+
+ /**
+ * 民族
+ */
+ @ApiModelProperty(value = "民族")
+ private String nation;
+
+ /**
+ * 是否证件 0否 1是
+ */
+ @ApiModelProperty(value = "是否证件 0否 1是")
+ private Integer credential;
+
+ @ApiModelProperty(value = "分类名称")
+ private String skillTypeName;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "社区名字")
+ private String communityName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComActEasyPhotoEvaluateVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComActEasyPhotoEvaluateVo.java
new file mode 100644
index 0000000..e588764
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComActEasyPhotoEvaluateVo.java
@@ -0,0 +1,68 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 随手拍、微心愿评价表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 随手拍、微心愿评价表返回参数
+ *
+ * @author lyq
+ * @date 2022-03-01 13:44:37
+ */
+@Data
+@ApiModel("随手拍、微心愿评价表返回参数")
+public class ComActEasyPhotoEvaluateVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+ /**
+ * 业务记录id
+ */
+ @ApiModelProperty(value = "业务记录id")
+ private Long serviceId;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 评分
+ */
+ @ApiModelProperty(value = "评分")
+ private Integer score;
+ /**
+ * 评价内容
+ */
+ @ApiModelProperty(value = "评价内容")
+ private String content;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 业务分类（1.随手拍 2.微心愿）
+ */
+ @ApiModelProperty(value = "业务分类（1.随手拍 2.微心愿）")
+ private Integer serviceType;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComActEasyPhotoHandlerVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComActEasyPhotoHandlerVo.java
new file mode 100644
index 0000000..0aecba6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComActEasyPhotoHandlerVo.java
@@ -0,0 +1,83 @@
+package com.panzhihua.common.model.vos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * title: 随手拍、微心愿处理人绑定表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 随手拍、微心愿处理人绑定表返回参数
+ *
+ * @author lyq
+ * @date 2022-03-01 13:45:12
+ */
+@Data
+@ApiModel("随手拍、微心愿处理人绑定表返回参数")
+public class ComActEasyPhotoHandlerVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+ /**
+ * 处理人id
+ */
+ @ApiModelProperty(value = "处理人id")
+ private Long userId;
+ /**
+ * 业务id
+ */
+ @ApiModelProperty(value = "业务id")
+ private Long serviceId;
+ /**
+ * 人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）
+ */
+ @ApiModelProperty(value = "人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）")
+ private Integer type;
+ /**
+ * 业务类型（1.随手拍 2.微心愿）
+ */
+ @ApiModelProperty(value = "业务类型（1.随手拍 2.微心愿）")
+ private Integer serviceType;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ @ApiModelProperty(value = "状态")
+ private Integer status;
+
+ @ApiModelProperty(value = "发起人名称")
+ private String senderName;
+
+ @ApiModelProperty(value = "得分")
+ private Integer score;
+ /**
+ * 汇报内容
+ */
+ @ApiModelProperty(value = "汇报内容")
+ private String resultContent;
+ /**
+ * 汇报图片
+ */
+ @ApiModelProperty(value = "汇报图片")
+ private String resultUrl;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryActivityTeamVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryActivityTeamVo.java
new file mode 100644
index 0000000..fcbd782
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryActivityTeamVo.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.vos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class ComBatteryActivityTeamVo {
+
+ @ApiModelProperty(value = "是否可以开团（1.是 2.否）")
+ private Integer isOpen = 1;
+
+ @ApiModelProperty(value = "团队id")
+ private Long teamId;
+
+ @ApiModelProperty(value = "拼团结束时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date teamEndTime;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityActivityVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityActivityVo.java
new file mode 100644
index 0000000..f954386
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityActivityVo.java
@@ -0,0 +1,166 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 电动车商城-商家活动表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-商家活动表返回参数
+ *
+ * @author lyq
+ * @date 2022-03-29 13:17:41
+ */
+@Data
+@ApiModel("电动车商城-商家活动表返回参数")
+public class ComBatteryCommodityActivityVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 活动名称
+ */
+ @ApiModelProperty(value = "活动名称")
+ private String name;
+ /**
+ * 活动类型（1.拼团活动 2.砍价活动 3.限时秒杀）
+ */
+ @ApiModelProperty(value = "活动类型（1.拼团活动 2.砍价活动 3.限时秒杀）")
+ private Integer type;
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+ /**
+ * 状态（1.进行中 2.已下架 3.已结束）
+ */
+ @ApiModelProperty(value = "状态（1.进行中 2.已下架 3.已结束）")
+ private Integer status;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 活动价格
+ */
+ @ApiModelProperty(value = "活动价格")
+ private BigDecimal price;
+ /**
+ * 活动截止时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "活动截止时间")
+ private Date endTime;
+ /**
+ * 拼团总团数
+ */
+ @ApiModelProperty(value = "拼团总团数")
+ private Integer collageNum;
+ /**
+ * 拼团人数
+ */
+ @ApiModelProperty(value = "拼团人数")
+ private Integer collagePeopleNum;
+ /**
+ * 活动图片
+ */
+ @ApiModelProperty(value = "活动图片")
+ private String images;
+ /**
+ * 活动商品总数
+ */
+ @ApiModelProperty(value = "活动商品总数")
+ private Integer commodityNum;
+ /**
+ * 活动规则
+ */
+ @ApiModelProperty(value = "活动规则")
+ private String rule;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "活动商品信息")
+ private ComBatteryCommodityVo commodityVo;
+
+ @ApiModelProperty(value = "商品名称")
+ private String commodityName;
+
+ @ApiModelProperty(value = "商品编号")
+ private String commodityCode;
+
+ @ApiModelProperty(value = "商户名称")
+ private String storeName;
+
+ @ApiModelProperty(value = "商户规格id")
+ private Long specsId;
+
+ @ApiModelProperty(value = "商户规格名称")
+ private String specsName;
+
+ @ApiModelProperty(value = "活动已卖出数量")
+ private Integer commoditySaleNum;
+
+ @ApiModelProperty(value = "是否可以开团（1.是 2.否）")
+ private Integer isOpen = 1;
+
+ @ApiModelProperty(value = "团队id")
+ private Long teamId;
+
+ @ApiModelProperty(value = "拼团结束时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date teamEndTime;
+
+ @ApiModelProperty(value = "是否可以砍价（1.是 2.否）")
+ private Integer isBargain = 1;
+
+ @ApiModelProperty(value = "砍价记录id")
+ private Long bargainId;
+
+ @ApiModelProperty(value = "砍价结束时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date bargainEndTime;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainRecordVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainRecordVo.java
new file mode 100644
index 0000000..5e5d49f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainRecordVo.java
@@ -0,0 +1,69 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 电动车商城-订单砍价记录表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-订单砍价记录表返回参数
+ *
+ * @author lyq
+ * @date 2022-03-29 16:06:49
+ */
+@Data
+@ApiModel("电动车商城-订单砍价记录表返回参数")
+public class ComBatteryCommodityOrderBargainRecordVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 砍价记录id
+ */
+ @ApiModelProperty(value = "砍价记录id")
+ private Long bargainId;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 砍价金额
+ */
+ @ApiModelProperty(value = "砍价金额")
+ private BigDecimal amount;
+ /**
+ * 原砍价用户id
+ */
+ @ApiModelProperty(value = "原砍价用户id")
+ private Long oldUserId;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ @ApiModelProperty(value = "用户头像")
+ private String imageUrl;
+
+ @ApiModelProperty(value = "用户昵称")
+ private String nickName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainVo.java
new file mode 100644
index 0000000..9f23b47
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainVo.java
@@ -0,0 +1,107 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 电动车商城-砍价订单记录表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-砍价订单记录表返回参数
+ *
+ * @author lyq
+ * @date 2022-03-29 16:06:37
+ */
+@Data
+@ApiModel("电动车商城-砍价订单记录表返回参数")
+public class ComBatteryCommodityOrderBargainVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+ /**
+ * 活动id
+ */
+ @ApiModelProperty(value = "活动id")
+ private Long activityId;
+ /**
+ * 订单id
+ */
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+ /**
+ * 商品原价
+ */
+ @ApiModelProperty(value = "商品原价")
+ private BigDecimal originalPrice;
+ /**
+ * 目标价格
+ */
+ @ApiModelProperty(value = "目标价格")
+ private BigDecimal targetPrice;
+ /**
+ * 当前价格
+ */
+ @ApiModelProperty(value = "当前价格")
+ private BigDecimal currentPrice;
+ /**
+ * 当前已砍价次数
+ */
+ @ApiModelProperty(value = "当前已砍价次数")
+ private Integer count;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ @ApiModelProperty(value = "好友帮砍价记录列表")
+ private List<ComBatteryCommodityOrderBargainRecordVo> orderBargainRecordList;
+
+ @ApiModelProperty(value = "用户昵称")
+ private String nickName;
+
+ @ApiModelProperty(value = "用户头像")
+ private String imageUrl;
+
+ @ApiModelProperty(value = "商品名称")
+ private String commodityName;
+
+ @ApiModelProperty(value = "商品图片")
+ private String commodityImages;
+
+ @ApiModelProperty(value = "砍价状态（1.砍价中 2.砍价成功 3.砍价失败）")
+ private Integer bargainStatus;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderCollageTeamPeopleVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderCollageTeamPeopleVo.java
new file mode 100644
index 0000000..94be7e3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderCollageTeamPeopleVo.java
@@ -0,0 +1,68 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 电动车商城-拼团活动团队人员表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-拼团活动团队人员表返回参数
+ *
+ * @author lyq
+ * @date 2022-03-29 16:07:11
+ */
+@Data
+@ApiModel("电动车商城-拼团活动团队人员表返回参数")
+public class ComBatteryCommodityOrderCollageTeamPeopleVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 拼团团队id
+ */
+ @ApiModelProperty(value = "拼团团队id")
+ private Long teamId;
+ /**
+ * 团长id
+ */
+ @ApiModelProperty(value = "团长id")
+ private Long headUserId;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 参团类型（1.开团 2.参与拼团）
+ */
+ @ApiModelProperty(value = "参团类型（1.开团 2.参与拼团）")
+ private Integer type;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ @ApiModelProperty(value = "用户头像")
+ private String images;
+
+ @ApiModelProperty(value = "用户昵称")
+ private String nickName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderCollageTeamVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderCollageTeamVo.java
new file mode 100644
index 0000000..c492183
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderCollageTeamVo.java
@@ -0,0 +1,81 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 电动车商城-拼团订单团队表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-拼团订单团队表返回参数
+ *
+ * @author lyq
+ * @date 2022-03-29 16:06:59
+ */
+@Data
+@ApiModel("电动车商城-拼团订单团队表返回参数")
+public class ComBatteryCommodityOrderCollageTeamVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 活动id
+ */
+ @ApiModelProperty(value = "活动id")
+ private Long activityId;
+ /**
+ * 订单id
+ */
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+ /**
+ * 开团用户id
+ */
+ @ApiModelProperty(value = "开团用户id")
+ private Long userId;
+ /**
+ * 状态（1.等待拼团 2.拼团成功 3.拼团失败 4.已退款）
+ */
+ @ApiModelProperty(value = "状态（1.等待拼团 2.拼团成功 3.拼团失败 4.已退款）")
+ private Integer status;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ @ApiModelProperty(value = "已拼人数")
+ private Integer spelledNum;
+
+ @ApiModelProperty(value = "成团人数")
+ private Integer collagePeopleNum;
+
+ @ApiModelProperty(value = "团长头像")
+ private String images;
+
+ @ApiModelProperty(value = "团长昵称")
+ private String nickName;
+
+ @ApiModelProperty(value = "拼团人员列表")
+ private List<ComBatteryCommodityOrderCollageTeamPeopleVo> orderCollageTeamPeopleList;
+
+ @ApiModelProperty(value = "是否可以参与（1.是 2.否）")
+ private Integer isPartake = 1;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderVo.java
new file mode 100644
index 0000000..c209ae4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderVo.java
@@ -0,0 +1,231 @@
+package com.panzhihua.common.model.vos.common;
+
+ import java.math.BigDecimal;
+ import java.util.Date;
+
+ import com.fasterxml.jackson.annotation.JsonFormat;
+ import org.springframework.format.annotation.DateTimeFormat;
+ import io.swagger.annotations.ApiModel;
+ import io.swagger.annotations.ApiModelProperty;
+ import lombok.Data;
+
+/**
+ * title: 电动车商城-订单表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-订单表返回参数
+ *
+ * @author lyq
+ * @date 2022-03-29 13:18:46
+ */
+@Data
+@ApiModel("电动车商城-订单表返回参数")
+public class ComBatteryCommodityOrderVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+ /**
+ * 收货地址id
+ */
+ @ApiModelProperty(value = "收货地址id")
+ private Long addressId;
+ /**
+ * 活动id
+ */
+ @ApiModelProperty(value = "活动id")
+ private Long activityId;
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+ /**
+ * 商品规格id
+ */
+ @ApiModelProperty(value = "商品规格id")
+ private Long specsId;
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+ /**
+ * 活动状态（1.拼团活动 2.砍价活动 3.限时秒杀）
+ */
+ @ApiModelProperty(value = "活动状态（1.拼团活动 2.砍价活动 3.限时秒杀）")
+ private Integer activityType;
+ /**
+ * 订单状态（1.待付款 2.待发货 3.待收货 4.已完成 5.待拼团 6.待砍价 7.已退款 8.已关闭）
+ */
+ @ApiModelProperty(value = "订单状态（1.待付款 2.待发货 3.待收货 4.已完成 5.待拼团 6.待砍价 7.已退款 8.已关闭）")
+ private Integer status;
+ /**
+ * 拼团状态（1.拼团中 2.拼团成功 3.拼团失败）
+ */
+ @ApiModelProperty(value = "拼团状态（1.拼团中 2.拼团成功 3.拼团失败）")
+ private Integer collageStatus;
+ /**
+ * 砍价状态（1.砍价中 2.砍价成功 3.砍价失败）
+ */
+ @ApiModelProperty(value = "砍价状态（1.砍价中 2.砍价成功 3.砍价失败）")
+ private Integer bargainStatus;
+ /**
+ * 支付状态(1.未支付 2.已支付)
+ */
+ @ApiModelProperty(value = "支付状态(1.未支付 2.已支付)")
+ private Integer payStatus;
+ /**
+ * 是否已删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否已删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 支付方式（1.微信支付）
+ */
+ @ApiModelProperty(value = "支付方式（1.微信支付）")
+ private Integer payType;
+ /**
+ * 购买商品数量
+ */
+ @ApiModelProperty(value = "购买商品数量")
+ private Integer count;
+ /**
+ * 商品单价
+ */
+ @ApiModelProperty(value = "商品单价")
+ private BigDecimal price;
+ /**
+ * 订单金额
+ */
+ @ApiModelProperty(value = "订单金额")
+ private BigDecimal amount;
+ /**
+ * 运费
+ */
+ @ApiModelProperty(value = "运费")
+ private BigDecimal freight;
+ /**
+ * 物流单号
+ */
+ @ApiModelProperty(value = "物流单号")
+ private String logisticsNo;
+ /**
+ * 物流公司
+ */
+ @ApiModelProperty(value = "物流公司")
+ private String logisticsCompany;
+ /**
+ * 订单最终金额
+ */
+ @ApiModelProperty(value = "订单最终金额")
+ private BigDecimal finalAmount;
+ /**
+ * 支付单号
+ */
+ @ApiModelProperty(value = "支付单号")
+ private String payNo;
+ /**
+ * 支付总金额
+ */
+ @ApiModelProperty(value = "支付总金额")
+ private BigDecimal payAmount;
+ /**
+ * 订单备注
+ */
+ @ApiModelProperty(value = "订单备注")
+ private String remark;
+ /**
+ * 发货时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "发货时间")
+ private Date deliveryTime;
+ /**
+ * 收货时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "收货时间")
+ private Date receivingTime;
+ /**
+ * 下单时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "下单时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "商品名称")
+ private String commodityName;
+
+ @ApiModelProperty(value = "商品规格名称")
+ private String specsName;
+
+ @ApiModelProperty(value = "商户名称")
+ private String storeName;
+
+ @ApiModelProperty(value = "用户账号")
+ private String phone;
+
+ @ApiModelProperty(value = "订单商品信息")
+ private ComBatteryCommodityVo commodityVo;
+
+ @ApiModelProperty(value = "订单商品规格信息")
+ private ComBatteryCommoditySpecsVo commoditySpecsVo;
+
+ @ApiModelProperty(value = "用户绑定收货地址")
+ private ComBatteryUserAddressVo userAddressVo;
+
+ @ApiModelProperty(value = "收件人")
+ private String receivingName;
+
+ @ApiModelProperty(value = "收件人联系方式")
+ private String receivingPhone;
+
+ @ApiModelProperty(value = "收货人地区")
+ private String receivingRegion;
+
+ @ApiModelProperty(value = "收货人详细地址")
+ private String receivingAddress;
+
+ @ApiModelProperty(value = "商品规格图片")
+ private String commodityImages;
+
+ @ApiModelProperty(value = "收货地区编码")
+ private String receivingRegionCode;
+
+ @ApiModelProperty(value = "用户昵称")
+ private String nickName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommoditySpecsVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommoditySpecsVo.java
new file mode 100644
index 0000000..e295b84
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommoditySpecsVo.java
@@ -0,0 +1,96 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 电动车商城-商品规格表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-商品规格表返回参数
+ *
+ * @author lyq
+ * @date 2022-03-28 15:16:22
+ */
+@Data
+@ApiModel("电动车商城-商品规格表返回参数")
+public class ComBatteryCommoditySpecsVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+ /**
+ * 规格名称
+ */
+ @ApiModelProperty(value = "规格名称")
+ private String name;
+ /**
+ * 规格库存数量
+ */
+ @ApiModelProperty(value = "规格库存数量")
+ private Integer stock;
+ /**
+ * 规格价格
+ */
+ @ApiModelProperty(value = "规格价格")
+ private BigDecimal price;
+ /**
+ * 规格图片
+ */
+ @ApiModelProperty(value = "规格图片")
+ private String images;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "商品名称")
+ private String commodityName;
+
+ @ApiModelProperty(value = "邮费")
+ private BigDecimal postage;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityVo.java
new file mode 100644
index 0000000..de44121
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityVo.java
@@ -0,0 +1,123 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 电动车商城-商品表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-商品表返回参数
+ *
+ * @author lyq
+ * @date 2022-03-28 15:00:00
+ */
+@Data
+@ApiModel("电动车商城-商品表返回参数")
+public class ComBatteryCommodityVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 商品名称
+ */
+ @ApiModelProperty(value = "商品名称")
+ private String name;
+ /**
+ * 商品编号
+ */
+ @ApiModelProperty(value = "商品编号")
+ private String code;
+ /**
+ * 商品价格
+ */
+ @ApiModelProperty(value = "商品价格")
+ private BigDecimal price;
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+ /**
+ * 状态（1.上架 2.下架）
+ */
+ @ApiModelProperty(value = "状态（1.上架 2.下架）")
+ private Integer status;
+ /**
+ * 商品分类id
+ */
+ @ApiModelProperty(value = "商品分类id")
+ private Long classId;
+ /**
+ * 商品简介
+ */
+ @ApiModelProperty(value = "商品简介")
+ private String introduce;
+ /**
+ * 邮费
+ */
+ @ApiModelProperty(value = "邮费")
+ private BigDecimal postage;
+ /**
+ * 商品图片
+ */
+ @ApiModelProperty(value = "商品图片")
+ private String images;
+ /**
+ * 商品详情
+ */
+ @ApiModelProperty(value = "商品详情")
+ private String detail;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "商家名称")
+ private String storeName;
+
+ @ApiModelProperty(value = "商品分类名称")
+ private String className;
+
+ @ApiModelProperty(value = "商品规格列表")
+ private List<ComBatteryCommoditySpecsVo> commoditySpecsVoList;
+
+ @ApiModelProperty(value = "商品月销量")
+ private Integer monthSale;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryStoreClassVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryStoreClassVo.java
new file mode 100644
index 0000000..5f0dbfa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryStoreClassVo.java
@@ -0,0 +1,78 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 电动车商城-商家分类表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-商家分类表返回参数
+ *
+ * @author lyq
+ * @date 2022-03-29 11:01:57
+ */
+@Data
+@ApiModel("电动车商城-商家分类表返回参数")
+public class ComBatteryStoreClassVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 分类名称
+ */
+ @ApiModelProperty(value = "分类名称")
+ private String name;
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+ /**
+ * 状态（1.启用 2.禁用）
+ */
+ @ApiModelProperty(value = "状态（1.启用 2.禁用）")
+ private Integer status;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "分类下商品列表")
+ private List<ComBatteryCommodityVo> commodityList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryStoreVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryStoreVo.java
new file mode 100644
index 0000000..67b4c1a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryStoreVo.java
@@ -0,0 +1,122 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 电动车商城-商家表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-商家表返回参数
+ *
+ * @author lyq
+ * @date 2022-03-28 13:44:59
+ */
+@Data
+@ApiModel("电动车商城-商家表返回参数")
+public class ComBatteryStoreVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 商家名称
+ */
+ @ApiModelProperty(value = "商家名称")
+ private String name;
+ /**
+ * 注册手机
+ */
+ @ApiModelProperty(value = "注册手机")
+ private String regPhone;
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+ /**
+ * 商家账号
+ */
+ @ApiModelProperty(value = "商家账号")
+ private String account;
+ /**
+ * 商家密码
+ */
+ @ApiModelProperty(value = "商家密码")
+ private String password;
+ /**
+ * 状态（1.启用 2.禁用）
+ */
+ @ApiModelProperty(value = "状态（1.启用 2.禁用）")
+ private Integer status;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 商家logo
+ */
+ @ApiModelProperty(value = "商家logo")
+ private String logo;
+ /**
+ * 商家简介
+ */
+ @ApiModelProperty(value = "商家简介")
+ private String introduction;
+ /**
+ * 商家地址
+ */
+ @ApiModelProperty(value = "商家地址")
+ private String address;
+ /**
+ * 详细地址
+ */
+ @ApiModelProperty(value = "详细地址")
+ private String detailAddress;
+ /**
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private String longitude;
+ /**
+ * 纬度
+ */
+ @ApiModelProperty(value = "纬度")
+ private String latitude;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+ /**
+ * 更新人id
+ */
+ @ApiModelProperty(value = "更新人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "月销量")
+ private Integer monthSale;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryTradeOrderVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryTradeOrderVo.java
new file mode 100644
index 0000000..01f2b64
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryTradeOrderVo.java
@@ -0,0 +1,118 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 电动车商城-微信交易流水表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-微信交易流水表返回参数
+ *
+ * @author lyq
+ * @date 2022-04-01 13:18:51
+ */
+@Data
+@ApiModel("电动车商城-微信交易流水表返回参数")
+public class ComBatteryTradeOrderVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 用户openid
+ */
+ @ApiModelProperty(value = "用户openid")
+ private String openId;
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+ /**
+ * 订单状态（1.待支付 2.已支付 3.申请退款 4.已退款 5.已关闭）
+ */
+ @ApiModelProperty(value = "订单状态（1.待支付 2.已支付 3.申请退款 4.已退款 5.已关闭）")
+ private Integer status;
+ /**
+ * 支付类型（1.微信 ）
+ */
+ @ApiModelProperty(value = "支付类型（1.微信 ）")
+ private Integer payType;
+ /**
+ * 订单支付状态（1.待支付 2.已支付）
+ */
+ @ApiModelProperty(value = "订单支付状态（1.待支付 2.已支付）")
+ private Integer payStatus;
+ /**
+ * 订单金额
+ */
+ @ApiModelProperty(value = "订单金额")
+ private BigDecimal orderAmount;
+ /**
+ * 实际支付金额
+ */
+ @ApiModelProperty(value = "实际支付金额")
+ private BigDecimal payAmount;
+ /**
+ * 支付单号
+ */
+ @ApiModelProperty(value = "支付单号")
+ private String payNo;
+ /**
+ * 支付时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "支付时间")
+ private Date payTime;
+ /**
+ * 交易类型（1.电动车商城购买商品）
+ */
+ @ApiModelProperty(value = "交易类型（1.电动车商城购买商品）")
+ private Integer tradeType;
+ /**
+ * 交易业务订单id
+ */
+ @ApiModelProperty(value = "交易业务订单id")
+ private Long tradeOrderId;
+ /**
+ * 交易业务订单号
+ */
+ @ApiModelProperty(value = "交易业务订单号")
+ private String tradeOrderNo;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryUserAddressVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryUserAddressVo.java
new file mode 100644
index 0000000..9d012a7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryUserAddressVo.java
@@ -0,0 +1,107 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 电动车商城-用户收货地址表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-用户收货地址表返回参数
+ *
+ * @author lyq
+ * @date 2022-03-29 13:18:21
+ */
+@Data
+@ApiModel("电动车商城-用户收货地址表返回参数")
+public class ComBatteryUserAddressVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 姓名
+ */
+ @ApiModelProperty(value = "姓名")
+ private String name;
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+ /**
+ * 详细地址
+ */
+ @ApiModelProperty(value = "详细地址")
+ private String address;
+ /**
+ * 是否是默认地址（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否是默认地址（1.是 2.否）")
+ private Integer isDefault;
+ /**
+ * 省份行政区划代码
+ */
+ @ApiModelProperty(value = "省份行政区划代码")
+ private String provinceAdcode;
+ /**
+ * 省份名称
+ */
+ @ApiModelProperty(value = "省份名称")
+ private String provinceName;
+ /**
+ * 城市行政区划代码
+ */
+ @ApiModelProperty(value = "城市行政区划代码")
+ private String cityAdcode;
+ /**
+ * 城市名称
+ */
+ @ApiModelProperty(value = "城市名称")
+ private String cityName;
+ /**
+ * 区县行政区划代码
+ */
+ @ApiModelProperty(value = "区县行政区划代码")
+ private String districtAdcode;
+ /**
+ * 区县名称
+ */
+ @ApiModelProperty(value = "区县名称")
+ private String districtName;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarBrandVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarBrandVo.java
new file mode 100644
index 0000000..a891dd3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarBrandVo.java
@@ -0,0 +1,82 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 换新车-品牌表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-品牌表返回参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:37:25
+ */
+@Data
+@ApiModel("换新车-品牌表返回参数")
+public class ComChangeCarBrandVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 品牌编号
+ */
+ @ApiModelProperty(value = "品牌编号")
+ private String code;
+ /**
+ * 品牌名称
+ */
+ @ApiModelProperty(value = "品牌名称")
+ private String name;
+ /**
+ * 状态（1.启用 2.禁用）
+ */
+ @ApiModelProperty(value = "状态（1.启用 2.禁用）")
+ private Integer status;
+ /**
+ * 品牌logo
+ */
+ @ApiModelProperty(value = "品牌logo")
+ private String logo;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "创建人名称")
+ private String createByName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarInquiryVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarInquiryVo.java
new file mode 100644
index 0000000..56ebcb6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarInquiryVo.java
@@ -0,0 +1,70 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 换新车-分期询价表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-分期询价表返回参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:39:07
+ */
+@Data
+@ApiModel("换新车-分期询价表返回参数")
+public class ComChangeCarInquiryVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 用户称呼
+ */
+ @ApiModelProperty(value = "用户称呼")
+ private String name;
+ /**
+ * 用户手机号
+ */
+ @ApiModelProperty(value = "用户手机号")
+ private String phone;
+ /**
+ * 类型（1.分期 2.询价）
+ */
+ @ApiModelProperty(value = "类型（1.分期 2.询价）")
+ private Integer type;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ @ApiModelProperty(value = "用户昵称")
+ private String userName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarModelRelationVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarModelRelationVo.java
new file mode 100644
index 0000000..8972a14
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarModelRelationVo.java
@@ -0,0 +1,63 @@
+package com.panzhihua.common.model.vos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * title: 换新车-车型与规格关联表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-车型与规格关联表返回参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:55:31
+ */
+@Data
+@ApiModel("换新车-车型与规格关联表返回参数")
+public class ComChangeCarModelRelationVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 车型id
+ */
+ @ApiModelProperty(value = "车型id")
+ private Long modelId;
+ /**
+ * 车型规格id
+ */
+ @ApiModelProperty(value = "车型规格id")
+ private Long modelSpecsId;
+ /**
+ * 车型子规格id
+ */
+ @ApiModelProperty(value = "车型子规格id")
+ private Long modelSpecsChildrenId;
+
+ @ApiModelProperty(value = "车型名称")
+ private String modelName;
+
+ @ApiModelProperty(value = "车型价格")
+ private BigDecimal minPrice;
+
+ @ApiModelProperty(value = "车型图片")
+ private String images;
+
+ @ApiModelProperty(value = "品牌名称")
+ private String brandName;
+
+ @ApiModelProperty(value = "车型规格名称")
+ private String specsName;
+
+ @ApiModelProperty(value = "车型规格下子规格名称")
+ private String specsChildrenName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarModelSpecsChildrenVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarModelSpecsChildrenVo.java
new file mode 100644
index 0000000..42f5d45
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarModelSpecsChildrenVo.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 换新车-车型子规格表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-车型子规格表返回参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:55:35
+ */
+@Data
+@ApiModel("换新车-车型子规格表返回参数")
+public class ComChangeCarModelSpecsChildrenVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 主规格id
+ */
+ @ApiModelProperty(value = "主规格id")
+ private Long specsId;
+ /**
+ * 子规格名称
+ */
+ @ApiModelProperty(value = "子规格名称")
+ private String name;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarModelSpecsVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarModelSpecsVo.java
new file mode 100644
index 0000000..a839e13
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarModelSpecsVo.java
@@ -0,0 +1,77 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 换新车-车型规格表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-车型规格表返回参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:55:32
+ */
+@Data
+@ApiModel("换新车-车型规格表返回参数")
+public class ComChangeCarModelSpecsVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 规格编号
+ */
+ @ApiModelProperty(value = "规格编号")
+ private String code;
+ /**
+ * 规格名称
+ */
+ @ApiModelProperty(value = "规格名称")
+ private String name;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "规格值")
+ private String specsString;
+
+ @ApiModelProperty(value = "规格下子规格列表")
+ private List<ComChangeCarModelSpecsChildrenVo> modelSpecsChildrenList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarModelVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarModelVo.java
new file mode 100644
index 0000000..84f5dc6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComChangeCarModelVo.java
@@ -0,0 +1,97 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 换新车-车型管理表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-车型管理表返回参数
+ *
+ * @author lyq
+ * @date 2022-04-07 13:41:56
+ */
+@Data
+@ApiModel("换新车-车型管理表返回参数")
+public class ComChangeCarModelVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 车型名称
+ */
+ @ApiModelProperty(value = "车型名称")
+ private String name;
+ /**
+ * 图片url，多张以,隔开
+ */
+ @ApiModelProperty(value = "图片url，多张以,隔开")
+ private String images;
+ /**
+ * 最低价格
+ */
+ @ApiModelProperty(value = "最低价格")
+ private BigDecimal minPrice;
+ /**
+ * 品牌id
+ */
+ @ApiModelProperty(value = "品牌id")
+ private Long brandId;
+
+ @ApiModelProperty(value = "品牌名称")
+ private String brandName;
+ /**
+ * 车辆详情
+ */
+ @ApiModelProperty(value = "车辆详情")
+ private String detail;
+ /**
+ * 是否删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 状态（1.上架 2.下架）
+ */
+ @ApiModelProperty(value = "状态（1.上架 2.下架）")
+ private Integer status;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "车型绑定规格列表")
+ private List<ComChangeCarModelRelationVo> carModelRelationList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerOrgTeamVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerOrgTeamVo.java
new file mode 100644
index 0000000..4c1ef06
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerOrgTeamVo.java
@@ -0,0 +1,76 @@
+package com.panzhihua.common.model.vos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 志愿者组织队伍表返回参数
+ *
+ * @author lyq
+ * @since 2021-10-30 16:06:57
+ */
+@Data
+@ApiModel("志愿者组织队伍表返回参数")
+public class ComMngVolunteerOrgTeamVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ private String name;
+ /**
+ * 父级id,为0时则为组织，不为0则为队伍
+ */
+ @ApiModelProperty(value = "父级id,为0时则为组织，不为0则为队伍")
+ private Long parentId;
+ /**
+ * 服务类型
+ */
+ @ApiModelProperty(value = "服务类型")
+ private Long serviceTypeId;
+ /**
+ * 服务类型名称
+ */
+ @ApiModelProperty(value = "服务类型名称")
+ private String serviceTypeName;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+
+ @ApiModelProperty(value = "组织下队伍列表")
+ private List<ComMngVolunteerOrgTeamVo> childList;
+
+ @ApiModelProperty(value = "创建人名字")
+ private String createByName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerServiceTypeVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerServiceTypeVo.java
new file mode 100644
index 0000000..bb5fe0d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerServiceTypeVo.java
@@ -0,0 +1,74 @@
+package com.panzhihua.common.model.vos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 志愿者服务类型表返回参数
+ *
+ * @author lyq
+ * @since 2021-10-30 16:47:10
+ */
+@Data
+@ApiModel("志愿者服务类型表返回参数")
+public class ComMngVolunteerServiceTypeVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ private String name;
+ /**
+ * 备注
+ */
+ @ApiModelProperty(value = "备注")
+ private String remark;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 创建人名称
+ */
+ @ApiModelProperty(value = "创建人名称")
+ private String createByName;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerSkillVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerSkillVo.java
new file mode 100644
index 0000000..342f0a7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerSkillVo.java
@@ -0,0 +1,74 @@
+package com.panzhihua.common.model.vos.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 志愿者技能表返回参数
+ *
+ * @author lyq
+ * @since 2021-10-30 16:47:37
+ */
+@Data
+@ApiModel("志愿者技能表返回参数")
+public class ComMngVolunteerSkillVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ private String name;
+ /**
+ * 备注
+ */
+ @ApiModelProperty(value = "备注")
+ private String remark;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 创建人名称
+ */
+ @ApiModelProperty(value = "创建人名称")
+ private String createByName;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerStatisticsVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerStatisticsVo.java
new file mode 100644
index 0000000..e3cbf4a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComMngVolunteerStatisticsVo.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.vos.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 志愿者组织统计返回参数
+ *
+ * @author lyq
+ * @since 2021-10-30 16:06:57
+ */
+@Data
+@ApiModel("志愿者组织统计返回参数")
+public class ComMngVolunteerStatisticsVo {
+
+ @ApiModelProperty(value = "组织数量")
+ private Integer orgTotal;
+
+ @ApiModelProperty(value = "队伍数量")
+ private Integer teamTotal;
+
+ @ApiModelProperty(value = "志愿者数量")
+ private Integer volunteerTotal;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComPbCheckUnitVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComPbCheckUnitVo.java
new file mode 100644
index 0000000..1b3f7f2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComPbCheckUnitVo.java
@@ -0,0 +1,134 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 党建-报到单位返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 党建-报到单位返回参数
+ *
+ * @author lyq
+ * @date 2022-02-16 16:22:40
+ */
+@Data
+@ApiModel("党建-报到单位返回参数")
+public class ComPbCheckUnitVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ /**
+ * 单位名称
+ */
+ @ApiModelProperty(value = "单位名称")
+ private String name;
+ /**
+ * 单位类别（1.国有企业 2.国有控股企业 3.外资企业 4.合资企业 5.私营企业 6.事业单位 7.国家行政机关 8.政府）
+ */
+ @ApiModelProperty(value = "单位类别（1.国有企业 2.国有控股企业 3.外资企业 4.合资企业 5.私营企业 6.事业单位 7.国家行政机关 8.政府）")
+ private Integer type;
+ /**
+ * 负责人
+ */
+ @ApiModelProperty(value = "负责人")
+ private String contacts;
+ /**
+ * 负责人联系电话
+ */
+ @ApiModelProperty(value = "负责人联系电话")
+ private String phone;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "党组织名称")
+ private String orgName;
+
+ @ApiModelProperty(value = "党组织logo")
+ private String logo;
+
+ @ApiModelProperty(value = "所属社区名称")
+ private String communityName;
+
+ @ApiModelProperty(value = "党员人数")
+ private Integer count;
+
+ @ApiModelProperty(value = "区域")
+ private String areaName;
+
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
+
+ @ApiModelProperty(value = "街道")
+ private String streetName;
+
+ @ApiModelProperty(value = "地址")
+ private String address;
+
+
+ @ApiModelProperty(value = "特长描述")
+ private String specialtyName;
+ @ApiModelProperty(value = "帮扶社区id")
+ private Long helpCommunityId;
+ @ApiModelProperty(value = "帮扶社区名字")
+ private String helpCommunityName;
+ @ApiModelProperty(value = "帮扶社区手机号")
+ private String helpCommunityContacts;
+ @ApiModelProperty(value = "帮扶社区联系人")
+ private String helpCommunityContactsName;
+ @ApiModelProperty(value = "小区id")
+ private Long villageId;
+ @ApiModelProperty(value = "小区名字")
+ private String villageName;
+
+ private String natureName;
+
+ private Integer natureId;
+ @ApiModelProperty(value = "管理员名称")
+ private String adminName;
+ @ApiModelProperty(value = "管理员电话")
+ private String adminPhone;
+ @ApiModelProperty(value = "其他")
+ private String otherRemark;
+ @ApiModelProperty(value = "单位所属")
+ private String belongTo;
+ @ApiModelProperty(value = "联系人json")
+ private String adminJson;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/PbCheckUnitStatisticsVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/PbCheckUnitStatisticsVo.java
new file mode 100644
index 0000000..6bdc868
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/PbCheckUnitStatisticsVo.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.vos.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * @title: PbCheckUnitStatisticsTopVo
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 报到单位统计返回参数
+ * @author: hans
+ * @date: 2022/07/25 10:51
+ */
+@Data
+@ApiModel("报到单位统计返回参数")
+public class PbCheckUnitStatisticsVo {
+
+ @ApiModelProperty(value = "单位归属")
+ private String belongTo;
+
+ @ApiModelProperty(value = "报到单位总数")
+ private Integer unitTotal;
+
+ @ApiModelProperty(value = "已报到机关单位")
+ private Integer organTotal;
+
+ @ApiModelProperty(value = "已报到企事业单位")
+ private Integer businessTotal;
+
+ @ApiModelProperty(value = "已报到党员")
+ private Integer partyMemberTotal;
+
+ @ApiModelProperty(value = "机关单位累计总积分")
+ private Integer organSumIntegral;
+
+ @ApiModelProperty(value = "服务时长")
+ private Double serviceTime;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/SysUserVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/SysUserVo.java
new file mode 100644
index 0000000..64d0672
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/SysUserVo.java
@@ -0,0 +1,217 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * title: 用户表 后台用户+小程序用户返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 用户表 后台用户+小程序用户返回参数
+ *
+ * @author lyq
+ * @date 2022-03-28 14:28:10
+ */
+@Data
+@ApiModel("用户表 后台用户+小程序用户返回参数")
+public class SysUserVo {
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private Long userId;
+ /**
+ * 登录账户
+ */
+ @ApiModelProperty(value = "登录账户")
+ private String account;
+ /**
+ * 登录密码
+ */
+ @ApiModelProperty(value = "登录密码")
+ private String password;
+ /**
+ * 微信小程序唯一标识
+ */
+ @ApiModelProperty(value = "微信小程序唯一标识")
+ private String openid;
+ /**
+ * 会话密钥
+ */
+ @ApiModelProperty(value = "会话密钥")
+ private String sessionKey;
+ /**
+ * 用户在开放平台的唯一标识符
+ */
+ @ApiModelProperty(value = "用户在开放平台的唯一标识符")
+ private String unionid;
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+ /**
+ * 昵称
+ */
+ @ApiModelProperty(value = "昵称")
+ private String nickName;
+ /**
+ * 真实名字
+ */
+ @ApiModelProperty(value = "真实名字")
+ private String name;
+ /**
+ * 社区ID
+ */
+ @ApiModelProperty(value = "社区ID")
+ private Long communityId;
+ /**
+ * 性别 1 男 2 女
+ */
+ @ApiModelProperty(value = "性别 1 男 2 女")
+ private Integer sex;
+ /**
+ * 身份证号
+ */
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+ /**
+ * 生日
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "生日")
+ private Date birthday;
+ /**
+ * 头像
+ */
+ @ApiModelProperty(value = "头像")
+ private String imageUrl;
+ /**
+ * 用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10一键报警app
+ */
+ @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10一键报警app")
+ private Integer type;
+ /**
+ * 职业
+ */
+ @ApiModelProperty(value = "职业")
+ private String job;
+ /**
+ * 是否志愿者 0 否 1 是
+ */
+ @ApiModelProperty(value = "是否志愿者 0 否 1 是")
+ private Integer isVolunteer;
+ /**
+ * 是否党员 0 否 1 是
+ */
+ @ApiModelProperty(value = "是否党员 0 否 1 是")
+ private Integer isPartymember;
+ /**
+ * 1 启用 2 禁用
+ */
+ @ApiModelProperty(value = "1 启用 2 禁用")
+ private Integer status;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ /**
+ * 最后登录时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "最后登录时间")
+ private Date lastLoginTime;
+ /**
+ * 标签多个用,隔开
+ */
+ @ApiModelProperty(value = "标签多个用,隔开")
+ private String tags;
+ /**
+ * 家庭id
+ */
+ @ApiModelProperty(value = "家庭id")
+ private Long familyId;
+ /**
+ * 人脸采集照片url
+ */
+ @ApiModelProperty(value = "人脸采集照片url")
+ private String faceUrl;
+ /**
+ * 人脸采集审核状态 0 待审核 1 审核通过 2驳回
+ */
+ @ApiModelProperty(value = "人脸采集审核状态 0 待审核 1 审核通过 2驳回")
+ private Integer faceState;
+ /**
+ * 驳回原因
+ */
+ @ApiModelProperty(value = "驳回原因")
+ private String rejectReson;
+ /**
+ * 小区id
+ */
+ @ApiModelProperty(value = "小区id")
+ private Long areaId;
+ /**
+ * 证件照（人相面）照片
+ */
+ @ApiModelProperty(value = "证件照（人相面）照片")
+ private String cardPhotoFront;
+ /**
+ * 证件照（国徽面）照片
+ */
+ @ApiModelProperty(value = "证件照（国徽面）照片")
+ private String cardPhotoBack;
+ /**
+ * 户口本
+ */
+ @ApiModelProperty(value = "户口本")
+ private String familyBook;
+ /**
+ * 连续登陆天数 每天凌晨定时任务更新
+ */
+ @ApiModelProperty(value = "连续登陆天数 每天凌晨定时任务更新")
+ private Integer continuousLandingDays;
+ /**
+ * 小程序首页是否显示公告(1.是 2.否)
+ */
+ @ApiModelProperty(value = "小程序首页是否显示公告(1.是 2.否)")
+ private Integer isTips;
+ /**
+ * 网格员工作状态(1.在岗 2.脱岗 3.已下班)
+ */
+ @ApiModelProperty(value = "网格员工作状态(1.在岗 2.脱岗 3.已下班)")
+ private Integer workStatus;
+ /**
+ * 网格员上班开始时间
+ */
+ @ApiModelProperty(value = "网格员上班开始时间")
+ private Integer workStartTime;
+ /**
+ * 网格员上班结束时间
+ */
+ @ApiModelProperty(value = "网格员上班结束时间")
+ private Integer workEndTime;
+ /**
+ * 高龄认证显示提示(1.是 2.否)
+ */
+ @ApiModelProperty(value = "高龄认证显示提示(1.是 2.否)")
+ private Integer bigAgeTips;
+ /**
+ * 明文密码
+ */
+ @ApiModelProperty(value = "明文密码")
+ private String plaintextPassword;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivityInviteVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivityInviteVO.java
new file mode 100644
index 0000000..8c906f6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivityInviteVO.java
@@ -0,0 +1,49 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ActivityInviteVO
+ * @projectName:
+ * @description: 活动邀请信息
+ * @author: hans
+ * @date: 2022/08/02 10:54
+ */
+@Data
+@ApiModel("活动邀请信息")
+public class ActivityInviteVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("受邀活动id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long activityId;
+
+ @ApiModelProperty("受邀用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+
+ @ApiModelProperty("受邀用户姓名")
+ private String name;
+
+ @ApiModelProperty("受邀用户电话")
+ private String phone;
+
+ @ApiModelProperty("是否报名，true-报名，false-未报名")
+ private Boolean isSign;
+
+ @ApiModelProperty("邀请人")
+ private Long createdBy;
+
+ @ApiModelProperty("邀请时间")
+ private Date createdAt;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignInRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignInRecordVO.java
new file mode 100644
index 0000000..49a8276
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignInRecordVO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: ActivitySignInRecordVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 活动报名签到记录
+ * @author: hans
+ * @date: 2021/10/19 9:22
+ */
+@Data
+@ApiModel("活动报名签到记录")
+public class ActivitySignInRecordVO {
+
+ @ApiModelProperty("活动类型，1.居民/志愿者活动 2.党员活动")
+ private Integer type;
+
+ @ApiModelProperty("活动主键")
+ private Long activityId;
+
+ @ApiModelProperty("真实名字")
+ private String name;
+
+ @ApiModelProperty("报名时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ @ApiModelProperty("参与次数")
+ private Integer times;
+
+ @ApiModelProperty("活动限制次数")
+ private Integer limit;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java
new file mode 100644
index 0000000..f087b23
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java
@@ -0,0 +1,79 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 社区活动报名名单
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-08 16:48
+ **/
+@Data
+@ApiModel("社区活动报名名单")
+public class ActivitySignVO {
+
+ @ApiModelProperty("活动主键")
+ private Long activityId;
+ @ApiModelProperty("表主键")
+ private Long id;
+ @ApiModelProperty("名字")
+ private String name;
+ @ApiModelProperty("用户昵称")
+ private String nickName;
+ @ApiModelProperty("身份")
+ private String identity;
+ @ApiModelProperty("人群标签")
+ private String tags;
+ @ApiModelProperty("手机号")
+ private String phone;
+ @ApiModelProperty("报名时间")
+ private String createAt;
+ @ApiModelProperty("人员头像")
+ private String imageUrl;
+ @ApiModelProperty("以什么身份报名（1.居民 2.党员 3.志愿者）")
+ private Integer signIdentity;
+ @ApiModelProperty(value = "列表人员类型 1 普通居民 2 志愿者", hidden = true)
+ private Integer type;
+ @ApiModelProperty("人员主键")
+ private Long userId;
+ @ApiModelProperty("用户openid")
+ private String openid;
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+ /**
+ * 报名状态 0 已取消 1已报名
+ */
+ @ApiModelProperty("报名状态 0 已取消 1已报名")
+ private Integer status;
+
+ /**
+ * 取消原因
+ */
+ @ApiModelProperty("取消原因")
+ private String reason;
+
+ /**
+ * 参与次数
+ */
+ @ApiModelProperty("参与次数")
+ private Integer times;
+
+ /**
+ * 获取奖励
+ */
+ @ApiModelProperty("获取奖励")
+ private Integer award;
+
+ /**
+ * 活动限制次数
+ */
+ @ApiModelProperty("活动限制次数")
+ private Integer limit;
+
+ @ApiModelProperty("是否邀请参与")
+ private Boolean isInvite;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/Base64File.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/Base64File.java
new file mode 100644
index 0000000..16babaf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/Base64File.java
@@ -0,0 +1,11 @@
+package com.panzhihua.common.model.vos.community;
+
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+public class Base64File {
+ private String file;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/BatchhouseVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/BatchhouseVO.java
new file mode 100644
index 0000000..573d361
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/BatchhouseVO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 批量建房
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-16 09:40
+ **/
+@Data
+@ApiModel("批量建房")
+public class BatchhouseVO {
+
+ @ApiModelProperty(value = "楼栋区间-开始", example = "1")
+ private Integer buildingBegin;
+ @ApiModelProperty(value = "楼栋区间-结束", example = "10")
+ private Integer buildingEnd;
+ @ApiModelProperty(value = "单元区间-结束", example = "3")
+ private Integer unitEnd;
+ @ApiModelProperty(value = "单元区间-开始", example = "1")
+ private Integer unitBegin;
+ @ApiModelProperty(value = "楼层区间-开始", example = "1")
+ private Integer floorBegin;
+ @ApiModelProperty(value = "楼层区间-结束", example = "30")
+ private Integer floorEnd;
+ @ApiModelProperty(value = "门牌号区间-结束", example = "6")
+ private Integer doorEnd;
+ @ApiModelProperty(value = "门牌号区间-开始", example = "1")
+ private Integer doorBegin;
+ @ApiModelProperty(value = "门牌号规则-楼层", example = "1")
+ private String ruleFloor;
+ @ApiModelProperty(value = "门牌号规则-连接符", example = "-")
+ private String ruleConnector;
+ @ApiModelProperty(value = "门牌号规则-门牌号", example = "001")
+ private String ruleDoor;
+ @ApiModelProperty(value = "门牌编号是否累加 0 否 1 是", example = "0")
+ private Integer isAccumulation;
+ @ApiModelProperty(value = "小区地址编码")
+ private String areaCode;
+ @ApiModelProperty(value = "添加同级-类型 2楼栋 3 单元 4楼层 5门牌号")
+ private Integer type;
+ @ApiModelProperty(value = "添加同级-上级地址编码")
+ private String parentCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/BuildingVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/BuildingVO.java
new file mode 100644
index 0000000..a9e32e9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/BuildingVO.java
@@ -0,0 +1,9 @@
+package com.panzhihua.common.model.vos.community;
+
+import lombok.Data;
+
+@Data
+public class BuildingVO {
+ private String label;
+ private String value;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActEvaluateExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActEvaluateExcelVO.java
new file mode 100644
index 0000000..e592068
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActEvaluateExcelVO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * title: ComActActEvaluateDO 社区活动评价表
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 记录和展示社区活动评价内容
+ *
+ * @author txb
+ * @date 2021/8/24 10:21
+ */
+
+@Data
+@ApiModel("社区活动评价表")
+public class ComActActEvaluateExcelVO {
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "身份", index = 2)
+ private String identity;
+
+ @ExcelProperty(value = "电话", index = 3)
+ private String phone;
+
+ @ExcelProperty(value = "评价时间", index = 0)
+ private Date createAt;
+
+ @ExcelProperty(value = "评分星级", index = 4)
+ private String starLevel;
+
+ @ExcelProperty(value = "评价详情", index = 5)
+ private String evaluateContent;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActEvaluateVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActEvaluateVO.java
new file mode 100644
index 0000000..768e3a8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActEvaluateVO.java
@@ -0,0 +1,89 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * title: ComActActEvaluateDO 社区活动评价表
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 记录和展示社区活动评价内容
+ *
+ * @author txb
+ * @date 2021/8/24 10:21
+ */
+
+@Data
+@ApiModel("社区活动评价表")
+public class ComActActEvaluateVO{
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("所属活动id")
+ private Long activityId;
+
+ @ApiModelProperty("用户id, 和用户信息表的相关id关联")
+ private Long userId;
+
+ @ApiModelProperty("名字")
+ private String name;
+
+ @ApiModelProperty("用户昵称")
+ private String nickName;
+
+ @ApiModelProperty("身份")
+ private String identity;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("人员头像")
+ private String imageUrl;
+
+ @ApiModelProperty(value = "列表人员类型 1 普通居民 2 志愿者", hidden = true)
+ private Integer type;
+
+ @ApiModelProperty("评价时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("评分星级1.差 2.一般 3.还不错 4.很满意 5.强烈推荐")
+ private Integer starLevel;
+
+ @ApiModelProperty("评价内容")
+ private String evaluateContent;
+
+ @ApiModelProperty("人群标签")
+ private String tags;
+
+ @ApiModelProperty("照片（多张以逗号隔开）")
+ private String photo;
+
+ @ApiModelProperty("用户openid")
+ private String openid;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty("开始时间")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+ @ApiModelProperty("结束时间")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActPictureVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActPictureVO.java
new file mode 100644
index 0000000..114de51
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActPictureVO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * title: ComActActPictureDO 社区》活动》历史上传图片实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 社区》活动》历史上传图片实体类
+ *
+ * @author txb
+ * @date 2021/8/27 14:21
+ */
+
+@Data
+@ApiModel("社区活动封面")
+public class ComActActPictureVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("所属活动id")
+ private Long activityId;
+
+ @ApiModelProperty("类型（1.党建 2.节日 3.天气预报 4.疫情 5.灾害预警 6.志愿者）")
+ private Integer type;
+
+ @ApiModelProperty("用户id, 和用户信息表的相关id关联")
+ private Long userId;
+
+ @ApiModelProperty("上传时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("上传图片")
+ private String uploadPicture;
+
+ @ApiModelProperty("图片名称")
+ private String pictureName;
+
+ @ApiModelProperty("是否系统预置（1.是 0.否）")
+ private Integer sysFlag;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActPrizeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActPrizeVO.java
new file mode 100644
index 0000000..61a1119
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActPrizeVO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 活动奖品
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-07 14:17
+ **/
+@Data
+@ApiModel("社区》活动》活动奖品")
+public class ComActActPrizeVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("所属活动id")
+ private Long activityId;
+
+ @ApiModelProperty("奖品名称")
+ private String prizeName;
+
+ @ApiModelProperty("奖品图片路径")
+ private String prizePhoto;
+
+ @ApiModelProperty("是否报名既有 1 是 0 不是")
+ private Integer type;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistExcelNewVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistExcelNewVO.java
new file mode 100644
index 0000000..3e892af
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistExcelNewVO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * title: ComActActRegistExcelVO 社区活动签到表
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 记录和展示社区活动签到内容
+ *
+ * @author txb
+ * @date 2021/8/24 10:21
+ */
+
+@Data
+@ApiModel("社区活动签到表")
+public class ComActActRegistExcelNewVO {
+
+ @ExcelProperty(value = "姓名", index = 3)
+ private String name;
+
+ @ExcelProperty(value = "身份", index = 4)
+ private String identity;
+
+ @ExcelProperty(value = "电话", index = 6)
+ private String phone;
+
+ @ExcelProperty(value = "签到时间", index = 0)
+ private Date startTime;
+
+ @ExcelProperty(value = "人群标签", index = 5)
+ private String tags;
+
+ @ExcelProperty(value = "签到地点", index = 1)
+ private String position;
+
+ @ExcelProperty(value = "参加次数序号", index = 2)
+ private Integer times;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistExcelVO.java
new file mode 100644
index 0000000..bfbfc8c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistExcelVO.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * title: ComActActRegistExcelVO 社区活动签到表
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 记录和展示社区活动签到内容
+ *
+ * @author txb
+ * @date 2021/8/24 10:21
+ */
+
+@Data
+@ApiModel("社区活动签到表")
+public class ComActActRegistExcelVO {
+
+ @ExcelProperty(value = "姓名", index = 4)
+ private String name;
+
+ @ExcelProperty(value = "身份", index = 5)
+ private String identity;
+
+ @ExcelProperty(value = "电话", index = 7)
+ private String phone;
+
+ @ExcelProperty(value = "签到时间", index = 0)
+ private Date startTime;
+
+ @ExcelProperty(value = "签退时间", index = 1)
+ private Date endTime;
+
+ @ExcelProperty(value = "人群标签", index = 6)
+ private String tags;
+
+ @ExcelProperty(value = "签到地点", index = 2)
+ private String position;
+
+ @ExcelProperty(value = "参加次数序号", index = 3)
+ private Integer times;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistVO.java
new file mode 100644
index 0000000..458cfcc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistVO.java
@@ -0,0 +1,104 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
+
+/**
+ * title: ComActActEvaluateDO 社区活动签到表
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 记录和展示社区活动签到内容
+ *
+ * @author txb
+ * @date 2021/8/24 10:21
+ */
+
+@Data
+@ApiModel("社区活动签到表")
+public class ComActActRegistVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("所属活动id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long activityId;
+
+ @ApiModelProperty("用户id, 和用户信息表的相关id关联")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+
+ @ApiModelProperty("名字")
+ private String name;
+
+ @ApiModelProperty("用户昵称")
+ private String nickName;
+
+ @ApiModelProperty("身份")
+ private String identity;
+
+ @ApiModelProperty("人群标签")
+ private String tags;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("人员头像")
+ private String imageUrl;
+
+ @ApiModelProperty(value = "列表人员类型 1 普通居民 2 志愿者", hidden = true)
+ private Integer type;
+
+ @ApiModelProperty("签到时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("以什么身份报名（1.居民 2.党员 3.志愿者）")
+ private Integer signIdentity;
+
+ @ApiModelProperty("用户openid")
+ private String openid;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "签到位置")
+ private String position;
+
+ @ApiModelProperty(value = "签到次数")
+ private Integer times;
+
+ @ApiModelProperty(value = "二维码id")
+ private Long codeId;
+
+ @ApiModelProperty(value = "本次签到获取的积分奖励")
+ private Integer award;
+
+ @ApiModelProperty(value = "活动类型 1居民，志愿者 2党员")
+ private Integer activityType;
+
+ @ApiModelProperty("签到开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ @ApiModelProperty("签到结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+
+ @ApiModelProperty("1签到 2签退")
+ private Integer signType;
+
+ @ApiModelProperty("时长")
+ private Integer duration;
+
+ @ApiModelProperty("活动状态 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
+ private Integer status;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActSignExcelNewVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActSignExcelNewVO.java
new file mode 100644
index 0000000..8c31ea4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActSignExcelNewVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * title: ComActActSignExcelVO 社区活动报名名单
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 记录和展示社区活动报名名单
+ *
+ * @author txb
+ * @date 2021/8/24 10:21
+ */
+
+@Data
+@ApiModel("社区活动签到表")
+public class ComActActSignExcelNewVO {
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "身份", index = 2)
+ private String identity;
+
+ @ExcelProperty(value = "手机号", index = 3)
+ private String phone;
+
+ @ExcelProperty(value = "报名时间", index = 0)
+ private Date createAt;
+ @ExcelProperty(value = "报名状态",index = 4)
+ private String status;
+
+ @ExcelProperty(value = "取消原因", index = 5)
+ private String reason;
+
+ @ExcelProperty(value = "报名次数序号", index = 6)
+ private Integer times;
+
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActSignExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActSignExcelVO.java
new file mode 100644
index 0000000..981bc6a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActSignExcelVO.java
@@ -0,0 +1,59 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * title: ComActActSignExcelVO 社区活动报名名单
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 记录和展示社区活动报名名单
+ *
+ * @author txb
+ * @date 2021/8/24 10:21
+ */
+
+@Data
+@ApiModel("社区活动签到表")
+public class ComActActSignExcelVO {
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "身份", index = 2)
+ private String identity;
+
+ @ExcelProperty(value = "电话", index = 4)
+ private String phone;
+
+ @ExcelProperty(value = "报名时间", index = 0)
+ private Date createAt;
+
+ @ExcelProperty(value = "人员标签", index = 3)
+ private String tags;
+
+ @ExcelProperty(value = "报名状态",index = 5)
+ private String status;
+
+ @ExcelProperty(value = "取消原因", index = 6)
+ private String reason;
+
+ @ExcelProperty(value = "参与情况", index = 7)
+ private String condition;
+
+ @ExcelProperty(value = "获得奖励", index = 8)
+ private String award;
+ @ExcelIgnore
+ private Integer times;
+ @ExcelIgnore
+ private Integer limit;
+
+ public void generateCondition() {
+ if(this.times!=null&&this.limit!=null){
+ this.condition = "("+times+"/"+ (limit.equals(-1) ? "无限" : limit) +")";
+ }
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityBigScreenVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityBigScreenVO.java
new file mode 100644
index 0000000..caba8d5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityBigScreenVO.java
@@ -0,0 +1,59 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
+import com.panzhihua.common.validated.AddGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 社区活动
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-07 14:01
+ **/
+@Data
+@ApiModel("大屏-社区活动")
+public class ComActActivityBigScreenVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("活动封面")
+ private String cover;
+
+ @ApiModelProperty("活动类型")
+ private String activityType;
+
+ @ApiModelProperty("活动名称")
+ private String activityName;
+
+ @ApiModelProperty("活动状态 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
+ private Integer status;
+
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date publishAt;
+
+ @ApiModelProperty("活动结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endAt;
+
+ @ApiModelProperty("活动开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date beginAt;
+
+ @ApiModelProperty("参加人数")
+ private Integer personNum;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityStatisticsVO.java
new file mode 100644
index 0000000..478c45f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityStatisticsVO.java
@@ -0,0 +1,91 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 社区活动数据统计返回参数
+ */
+@Data
+@ApiModel("社区活动数据统计返回参数")
+public class ComActActivityStatisticsVO {
+
+ /**
+ * 应报名总人数
+ */
+ @ApiModelProperty("应报名总人数")
+ private Integer signTotal;
+ /**
+ * 应报名总人数Str
+ */
+ @ApiModelProperty("应报名总人数Str")
+ private String signTotalStr;
+ /**
+ * 实际报名总人数
+ */
+ @ApiModelProperty("实际报名总人数")
+ private Integer reallySignTotal;
+ /**
+ * 未报名报名总人数
+ */
+ @ApiModelProperty("未报名报名总人数")
+ private Integer noSignTotal;
+ /**
+ * 未报名报名总人数Str
+ */
+ @ApiModelProperty("未报名报名总人数Str")
+ private String noSignTotalStr;
+ /**
+ * 报名总人数百分比
+ */
+ @ApiModelProperty("报名总人数百分比")
+ private String signPersent;
+ /**
+ * 应签到总人数
+ */
+ @ApiModelProperty("应签到总人数")
+ private Integer registTotal;
+
+ /**
+ * 实际签到总人数
+ */
+ @ApiModelProperty("实际签到总人数")
+ private Integer reallyRegistTotal;
+
+ /**
+ * 未签到总人数
+ */
+ @ApiModelProperty("未签到总人数")
+ private Integer noRegistTotal;
+
+ /**
+ * 签到总人数百分比
+ */
+ @ApiModelProperty("签到总人数百分比")
+ private String registPersent;
+
+ /**
+ * 应评价总人数
+ */
+ @ApiModelProperty("应评价总人数")
+ private Integer evaluateTotal;
+
+ /**
+ * 实际评价总人数
+ */
+ @ApiModelProperty("实际评价总人数")
+ private Integer reallyEvaluateTotal;
+
+ /**
+ * 未评价总人数
+ */
+ @ApiModelProperty("未评价总人数")
+ private Integer noEvaluateTotal;
+
+ /**
+ * 评价人数百分比
+ */
+ @ApiModelProperty("评价人数百分比")
+ private String evaluatePersent;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityTypeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityTypeVO.java
new file mode 100644
index 0000000..19f5ad3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityTypeVO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.vos.community;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.panzhihua.common.validated.AddGroup;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComActActivityTypeVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 活动分类vo
+ * @author: hans
+ * @date: 2021/10/21 11:11
+ */
+@Data
+@ApiModel("活动分类vo")
+public class ComActActivityTypeVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("类型名称")
+ @NotBlank(groups = AddGroup.class, message = "类型名称不能为空")
+ private String name;
+
+ @ApiModelProperty("活动类型（1.志愿者 2.居民 3.党员）")
+ @NotNull(groups = AddGroup.class, message = "活动类型不能为空")
+ private Integer type;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
new file mode 100644
index 0000000..01f822a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -0,0 +1,345 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 社区活动
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-07 14:01
+ **/
+@Data
+@ApiModel("社区活动")
+public class ComActActivityVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("活动名称")
+ @NotBlank(groups = AddGroup.class, message = "活动名称不可为空")
+ private String activityName;
+
+ @ApiModelProperty("负责人userID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long sponsorId;
+
+ @ApiModelProperty("负责人名字")
+ private String sponsorName;
+
+ @ApiModelProperty("活动地址")
+ @NotBlank(groups = AddGroup.class, message = "活动地址不可为空")
+ private String activityAddr;
+
+ @ApiModelProperty("纬度")
+ @NotBlank(groups = AddGroup.class, message = "纬度不可为空")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ @NotBlank(groups = AddGroup.class, message = "经度不可为空")
+ private String lng;
+
+ @ApiModelProperty("活动状态 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
+ private Integer status;
+
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date publishAt;
+
+ @ApiModelProperty("活动结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @NotNull(groups = AddGroup.class, message = "活动结束时间不可为空")
+ private Date endAt;
+
+ @ApiModelProperty("活动开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @NotNull(groups = AddGroup.class, message = "活动开始时间不可为空")
+ private Date beginAt;
+
+ @ApiModelProperty("报名开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @NotNull(groups = AddGroup.class, message = "报名开始时间不可为空")
+ private Date signUpBegin;
+
+ @ApiModelProperty("报名结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @NotNull(groups = AddGroup.class, message = "报名结束时间不可为空")
+ private Date signUpEnd;
+
+ @ApiModelProperty("参加人群（多个以逗号隔开）")
+ private String aattendPeople;
+
+ @ApiModelProperty("志愿者人数下线")
+ private Integer volunteerMin;
+
+ @ApiModelProperty("志愿者人数上限（不需要则不填写）")
+ private Integer volunteerMax;
+
+ @ApiModelProperty("当前志愿者数量")
+ private Integer volunteerNow;
+
+ @ApiModelProperty("居民人数下线")
+ private Integer participantMin;
+
+ @ApiModelProperty("居民人数上限（不填写则默认不限人数）")
+ private Integer participantMax;
+
+ @ApiModelProperty("当前居民数量")
+ private Integer participantNow;
+
+ @ApiModelProperty("活动封面")
+ @NotBlank(groups = AddGroup.class, message = "活动封面不可为空")
+ private String cover;
+
+ @ApiModelProperty("是否有奖品 1 有 0 无")
+ private Integer hasPrize;
+
+ @ApiModelProperty("是否二维码签到 1 是 0否")
+ private Integer isQrCode;
+
+ @ApiModelProperty("用户签到记录列表")
+ private List<ComActActRegistVO> activitySignInList;
+
+ @ApiModelProperty("联系人姓名")
+ private String contactName;
+
+ @ApiModelProperty("联系人电话")
+ private String contactPhone;
+
+ @ApiModelProperty("是否签到 1 是 0否")
+ private Integer isRegist;
+
+ @ApiModelProperty("是否顶部 1 是 0否")
+ private Integer isTop;
+
+ @ApiModelProperty("奖品备注")
+ private String prizeRemark;
+
+ @ApiModelProperty("奖励说明")
+ private String rewardDesc;
+
+ @ApiModelProperty("活动内容")
+ @NotBlank(groups = AddGroup.class, message = "活动内容不可为空")
+ private String content;
+
+ @ApiModelProperty("活动奖品集合")
+ private List<ComActActPrizeVO> comActActPrizeVOList;
+
+ @ApiModelProperty("活动评价集合")
+ private List<ComActActEvaluateVO> comActActEvaluateVOList;
+
+ @ApiModelProperty("活动评价总数")
+ private Long evaluateAmount;
+
+ @ApiModelProperty("活动评分星级平均数")
+ private BigDecimal evaluateLevel;
+
+ @ApiModelProperty("当前用户对活动的评分")
+ private Integer myRating;
+
+ @ApiModelProperty("活动是否已默认好评")
+ private Integer isDefaultPraise;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "社区id集合", hidden = true)
+ private List<Long> communityIds;
+
+ @ApiModelProperty(value = "社区名称")
+ private String communityName;
+
+ @ApiModelProperty(value = "当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "每页记录数", example = "10")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "取消原因")
+ private String cancelReason;
+
+ @ApiModelProperty(value = "是否已经报名 1 已报名 0 未报名")
+ private Integer isSign = 0;
+
+ @ApiModelProperty(value = "以什么身份报名（1.居民 2.党员 3.志愿者）")
+ private Integer signIdentity;
+
+ @ApiModelProperty(value = "当前登录者id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty("活动参加普通人员集合")
+ private List<ActivitySignVO> activitySignVOList;
+
+ @ApiModelProperty("活动参加志愿者人员集合")
+ private List<ActivitySignVO> activityVolunteerList;
+
+ @ApiModelProperty("活动参加党员人员集合")
+ private List<ActivitySignVO> activityPbList;
+
+ @ApiModelProperty("活动类型 1 社区活动 4项目活动 5服务活动")
+ private Integer type;
+
+ @ApiModelProperty("活动创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "是否是小程序访问 1 是 ", hidden = true)
+ private Integer isApplets;
+
+ @ApiModelProperty("活动积分")
+ private Integer integral;
+
+ @ApiModelProperty(value = "是不是请求进行中 1 是", hidden = true)
+ private Integer isIng;
+
+ @ApiModelProperty("用户实际报名时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date singDate;
+
+ @ApiModelProperty("党员活动是否个人发布 1 是 0 否")
+ private Integer isPerson;
+
+ @ApiModelProperty(value = "查询筛选：0-本小区 1-全部")
+ private Integer choice;
+
+ @ApiModelProperty("签到范围，默认0无限制")
+ @NotNull(groups = AddGroup.class, message = "签到范围不可为空")
+ private Integer range;
+
+ @ApiModelProperty("是否有积分奖励（1.是 2.否）")
+ @NotNull(groups = AddGroup.class, message = "是否有积分奖励不可为空")
+ private Integer haveIntegralReward;
+
+ @ApiModelProperty("居民积分奖励方式（1.按次奖励 2.记时奖励）")
+ private Integer participantRewardWay;
+
+ @ApiModelProperty("居民参与签到/打卡奖励积分")
+ private Integer participantRewardIntegral;
+
+ @ApiModelProperty("志愿者积分奖励方式（1.按次奖励 2.记时奖励）")
+ private Integer volunteerRewardWay;
+
+ @ApiModelProperty("志愿者参与签到/打卡奖励积分")
+ private Integer volunteerRewardIntegral;
+
+ @ApiModelProperty("党员积分奖励方式（1.按次奖励 2.记时奖励）")
+ private Integer pbRewardWay;
+
+ @ApiModelProperty("党员参与签到/打卡奖励积分")
+ private Integer pbRewardIntegral;
+
+ @ApiModelProperty("参与次数上限，按次奖励需传入，无次数限制-1")
+ private Integer limit;
+
+ @ApiModelProperty("是否允许取消（1.允许 2.不允许）")
+ @NotNull(groups = AddGroup.class, message = "是否允许取消不可为空")
+ private Integer canCancel;
+
+ @ApiModelProperty("取消活动扣除积分数目")
+ private Integer cancelDeduct;
+
+ @ApiModelProperty("用户已参与次数")
+ private Integer times;
+
+ @ApiModelProperty("已获取积分")
+ private Integer award;
+
+ @ApiModelProperty("二维码类型 1居民，志愿者 2党员")
+ private Integer codeType;
+
+ @ApiModelProperty("活动类型")
+ private String activityType;
+
+ private String areaCode;
+
+ @ApiModelProperty("单次活动时长（小时）")
+ private Integer duration;
+
+ @ApiModelProperty("项目Id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long projectId;
+
+ @ApiModelProperty("项目名称")
+ private String projectName;
+
+ @ApiModelProperty("社工数")
+ private Integer socialCount;
+
+
+ /**
+ * 党员参与者人数下线
+ */
+ @ApiModelProperty("党员参与者人数下线")
+ private Integer partyMemberMin;
+
+ /**
+ * 党员参与者人数上限
+ */
+ @ApiModelProperty("党员参与者人数上限")
+ private Integer partyMemberMax;
+
+ @ApiModelProperty("当前党员数量")
+ private Integer partyMemberNow;
+
+ /**
+ * 签退范围，默认0无限制
+ */
+ @ApiModelProperty("签退范围，默认0无限制")
+ private Integer signOutRange;
+
+ @ApiModelProperty("1签到 2签退")
+ private Integer signType;
+
+ @ApiModelProperty("是否可以评价 1是 0 否")
+ private Integer isComment;
+
+ private Integer signCount;
+
+ private Integer registerCount;
+
+ private Integer isArticle;
+
+ private String jumpArticleUrl;
+ @ApiModelProperty("关联服务id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long relationId;
+ @ApiModelProperty("关联手机")
+ private String phone;
+ @ApiModelProperty("单位id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long checkUnitId;
+
+ @ApiModelProperty("活动话题id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long topicId;
+
+ @ApiModelProperty("活动邀请人员")
+ private List<ActivityInviteDTO> activityInviteList;
+
+ @ApiModelProperty(value = "街道id", hidden = true)
+ private Long streetId;
+
+ @ApiModelProperty("清单信息")
+ private ComActNeighborCircleDetailAppVO listDetail;
+
+ @ApiModelProperty("奖励金汇币")
+ private String jinhuiCoinAward;
+
+ @ApiModelProperty("惩罚金汇币")
+ private String jinhuiCoinPunishment;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java
new file mode 100644
index 0000000..26cdb62
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java
@@ -0,0 +1,65 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class ComActAnnouncementVO {
+
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 内容
+ */
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
+
+ /**
+ * 发布人id
+ */
+ @ApiModelProperty(value = "发布人id")
+ private Long userId;
+
+ /**
+ * 通知类型id
+ */
+ @ApiModelProperty(value = "通知类型id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long columnId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ /**
+ * 发布人
+ */
+ @ApiModelProperty("发布人")
+ private String username;
+
+ @ApiModelProperty("分类名称")
+ private String columnName;
+
+ @ApiModelProperty("propertyId")
+ private Long propertyId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnLevelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnLevelVO.java
new file mode 100644
index 0000000..92ff55f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnLevelVO.java
@@ -0,0 +1,69 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class ComActColumnLevelVO {
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 分类名称
+ */
+ @ApiModelProperty(value = "分类名称")
+ private String name;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 修改人
+ */
+ @ApiModelProperty(value = "修改人")
+ private String updateBy;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty(value = "修改时间")
+ private Date updateTime;
+
+ /**
+ * 状态 0禁用 1启用
+ */
+ @ApiModelProperty(value = "状态 0禁用 1启用")
+ private Integer status;
+
+ /**
+ * 分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类
+ */
+ @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类")
+ private Integer type;
+
+ private Long communityId;
+
+ @ApiModelProperty(value = "父类id")
+ private Long parentId;
+ @ApiModelProperty(value = "二级目录集合")
+ List<ComActColumnVO> comActColumnVOList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java
new file mode 100644
index 0000000..9a612aa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java
@@ -0,0 +1,75 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class ComActColumnVO {
+
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 分类名称
+ */
+ @ApiModelProperty(value = "分类名称")
+ private String name;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 修改人
+ */
+ @ApiModelProperty(value = "修改人")
+ private String updateBy;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty(value = "修改时间")
+ private Date updateTime;
+
+ /**
+ * 状态 0禁用 1启用
+ */
+ @ApiModelProperty(value = "状态 0禁用 1启用")
+ private Integer status;
+
+ /**
+ * 分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类
+ */
+ @ApiModelProperty(value = "分类类型 1服务范围分类 2技能分类 3通知公告 4项目分类")
+ private Integer type;
+
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ @ApiModelProperty(value = "父类id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long parentId;
+
+ @ApiModelProperty("街道id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long streetId;
+
+ private String description;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActCommiteeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActCommiteeVO.java
new file mode 100644
index 0000000..5e556db
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActCommiteeVO.java
@@ -0,0 +1,73 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("业主委员会实体")
+public class ComActCommiteeVO {
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ private String name;
+
+ /**
+ * 联系人
+ */
+ @ApiModelProperty(value = "联系人")
+ private String contactName;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+
+ /**
+ * 小区id
+ */
+ @ApiModelProperty(value = "小区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long areaId;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+
+ /**
+ * 社区id
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ @ApiModelProperty("账号")
+ private String account;
+
+ @ApiModelProperty("密码")
+ private String password;
+
+ @ApiModelProperty("权限id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long roleId;
+
+ @ApiModelProperty("小区名称")
+ private String areaName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java
new file mode 100644
index 0000000..912d7ba
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java
@@ -0,0 +1,91 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 一起议评论详情
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-23 13:44
+ **/
+@Data
+@ApiModel("一起议评论详情")
+public class ComActDiscussCommentVO {
+ @ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("一起议主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long discussId;
+
+ @ApiModelProperty("评论内容")
+ private String comment;
+
+ @ApiModelProperty("是否置顶 0 否 1 是")
+ private Integer isTopping;
+
+ @ApiModelProperty("评论时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("是否作者本人回复 0 否 1 是")
+ private Integer isAuthor;
+
+ @ApiModelProperty("上级评论id 默认0表示一级评论")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long parentId;
+
+ @ApiModelProperty("用户主键")
+ private Long userId;
+
+ @ApiModelProperty("评论人名字")
+ private String userName;
+
+ @ApiModelProperty("评论人昵称")
+ private String userNickName;
+
+ @ApiModelProperty("回复人名字")
+ private String userNameBack;
+
+ @ApiModelProperty("回复人昵称")
+ private String userNickNameBack;
+
+ @ApiModelProperty("评论人手机号")
+ private String phone;
+
+ @ApiModelProperty("评论人头像")
+ private String imageUrl;
+
+ @ApiModelProperty("点赞数量")
+ private Integer num;
+
+ @ApiModelProperty("是否点赞 1 是 0 否")
+ private Integer haveSign = 0;
+
+ @ApiModelProperty("回复内容")
+ private String commentBack;
+
+ @ApiModelProperty("回复时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date timeBack;
+
+ @ApiModelProperty("二级评论集合")
+ private List<ComActDiscussCommentVO> comActDiscussCommentVOList;
+
+ @ApiModelProperty("评论人用户类型（1.小程序用户（其他均为后台用户））")
+ private Integer userType;
+
+ @ApiModelProperty("回复量")
+ private Integer replyNum;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionUserVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionUserVO.java
new file mode 100644
index 0000000..47e2f6a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionUserVO.java
@@ -0,0 +1,60 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComActDiscussOptionUserVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 一起议投票记录详情
+ * @author: hans
+ * @date: 2021/09/08 16:14
+ */
+@Data
+@ApiModel("一起议投票记录详情")
+public class ComActDiscussOptionUserVO {
+
+ @ApiModelProperty("投票记录主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("一起议选项id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long discussOptionId;
+
+ @ApiModelProperty("投票人id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+
+ @ApiModelProperty("投票时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("一起议id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long discussId;
+
+ @ApiModelProperty("投票人昵称")
+ private String userNickName;
+
+ @ApiModelProperty("投票人头像")
+ private String imageUrl;
+
+ @ApiModelProperty("签名")
+ private String signUrl;
+
+ @ApiModelProperty("投票原因")
+ private String reason;
+
+ @ApiModelProperty("选项内容")
+ private String optionContent;
+
+ @ApiModelProperty("选项图片url")
+ private String optionUrl;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java
new file mode 100644
index 0000000..7f0b27b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java
@@ -0,0 +1,55 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 一起议选项
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-22 16:08
+ **/
+@Data
+@ApiModel("一起议选项")
+public class ComActDiscussOptionVO {
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("一起议主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long discussId;
+
+ @ApiModelProperty("选项内容")
+ private String optionContent;
+
+ @ApiModelProperty("选项图片url")
+ private String optionUrl;
+
+ @ApiModelProperty("create_at")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("投票数量")
+ private Integer num;
+
+ @ApiModelProperty("投票总数量")
+ private Integer allNum;
+
+ @ApiModelProperty("是否已经投票 1 是 0 否")
+ private Integer haveVote = 0;
+
+ @ApiModelProperty("投票选项占比")
+ private BigDecimal percent;
+
+ @ApiModelProperty("是否需要填写原因")
+ private Boolean needReason;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java
new file mode 100644
index 0000000..a417396
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java
@@ -0,0 +1,153 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 一起议议详情
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-22 16:07
+ **/
+@Data
+@ApiModel("一起议议详情")
+public class ComActDiscussVO {
+ @ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("主题")
+ private String discussSubject;
+
+ @ApiModelProperty("类型 1 议事 2 投票")
+ private Integer type;
+
+ @ApiModelProperty("图片地址 多个用逗号隔开")
+ private String photoPah;
+
+ @ApiModelProperty("地址")
+ private String address;
+
+ @ApiModelProperty("发布人主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+
+ @ApiModelProperty("社区主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ @ApiModelProperty("create_at")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("1 单选 2 多选")
+ private Integer discussOption;
+
+ @ApiModelProperty("投票标题")
+ private String voteTitle;
+
+ @ApiModelProperty("选项")
+ private List<ComActDiscussOptionVO> comActDiscussOptionVOS;
+
+ @ApiModelProperty("评论数量")
+ private Integer commentNum;
+
+ @ApiModelProperty("点赞数量")
+ private Integer signNum;
+
+ @ApiModelProperty("浏览量")
+ private Integer viewsNum;
+
+ @ApiModelProperty("发布人名字")
+ private String userName;
+
+ @ApiModelProperty("发布人昵称")
+ private String userNickName;
+
+ @ApiModelProperty("发布人头像")
+ private String imageUrl;
+
+ @ApiModelProperty("是否已经点赞 1 是 0 否")
+ private Integer haveSign = 0;
+
+ @ApiModelProperty("是否已经投票 1 是 0 否")
+ private Integer haveVote = 0;
+
+ @ApiModelProperty("用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台")
+ private Integer userType;
+
+ @ApiModelProperty("状态（1.未开始 2.进行中 3.待公布 4.已公布 5.已发布）")
+ private Integer status;
+
+ @ApiModelProperty("公布结果")
+ private String publishResult;
+
+ @ApiModelProperty("公布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date publishAt;
+
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date releaseAt;
+
+ @ApiModelProperty("投票开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ @ApiModelProperty("投票结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+
+ @ApiModelProperty("参与讨论人数")
+ private Integer joinNum;
+
+ @ApiModelProperty("单张图片宽度")
+ private BigDecimal imgWidth;
+
+ @ApiModelProperty("单张图片高度")
+ private BigDecimal imgHeight;
+
+ @ApiModelProperty("是否可重复投票（1.是 2.否）")
+ private Integer isRepeat;
+
+ @ApiModelProperty("每人票数")
+ private Integer count;
+
+ @ApiModelProperty("议事投票评论列表")
+ private List<ComActDiscussCommentVO> discussCommentList;
+
+ @ApiModelProperty("剩余可投票数")
+ private Integer remainingVotes;
+
+ @ApiModelProperty("已投票记录列表")
+ private List<ComActDiscussOptionUserVO> comActDiscussOptionUserVOList;
+
+ @ApiModelProperty("议事内容类型（1.社区议事 2.院落议事 3.党群议事 4.居民议事 5.其他）")
+ private Integer contentType;
+
+ @ApiModelProperty("已参与投票人数")
+ private Integer votedPersonNum;
+
+ @ApiModelProperty("投票范围（1.全部居民 2.志愿者 3.党员）")
+ private Integer voteScope;
+
+ @ApiModelProperty("是否需要签名")
+ private Boolean needSign;
+
+ /**
+ * 类型 1 议事 2 投票
+ */
+ public interface type{
+ int ys = 1;
+ int tp = 2;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDpcVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDpcVO.java
new file mode 100644
index 0000000..4d54555
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDpcVO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComActDpcVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 人大代表信息
+ * @author: hans
+ * @date: 2022/06/07 11:08
+ */
+@Data
+@ApiModel("人大代表信息")
+public class ComActDpcVO {
+
+ @ApiModelProperty("人大代表id")
+ private Long id;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("民族")
+ private String nation;
+
+ @ApiModelProperty("性别（1.男 2.女 3.未知）")
+ private Integer sex;
+
+ @ApiModelProperty("选区")
+ private String area;
+
+ @ApiModelProperty("所属家/站")
+ private String belong;
+
+ @ApiModelProperty("代表类别")
+ private String category;
+
+ @ApiModelProperty("单位职务")
+ private String position;
+
+ @ApiModelProperty("照片")
+ private String photo;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynTypeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynTypeVO.java
new file mode 100644
index 0000000..18fbbdd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynTypeVO.java
@@ -0,0 +1,48 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 社区动态分类
+ */
+@Data
+@ApiModel("社区动态分类")
+public class ComActDynTypeVO {
+
+ @ApiModelProperty("主键(分类编码)")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("分类名称")
+ private String name;
+
+ @ApiModelProperty("分类字体颜色")
+ private String color;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("创建人")
+ private String createBy;
+
+ @ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty("修改人")
+ private String updateBy;
+
+ @ApiModelProperty("社区id，当此值为0时，该社区动态分类为系统预设，不可操作")
+ private Long communityId;
+
+ private String category;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java
new file mode 100644
index 0000000..cc0aa1b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java
@@ -0,0 +1,139 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 社区动态
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-08 17:25
+ **/
+@Data
+@ApiModel("社区活动 》社区动态")
+public class ComActDynVO {
+
+ @ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("标题")
+ private String title;
+
+ @ApiModelProperty("阅读数")
+ private Integer readNum;
+
+ @ApiModelProperty("状态 0 待发布 1 已发布")
+ private Integer status;
+
+ @ApiModelProperty("是否置顶 0 否 1 是")
+ private Integer isTopping;
+
+ @ApiModelProperty("街道id")
+ private Long streetId;
+
+ @ApiModelProperty(value = "发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date publishAt;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private String communityId;
+
+ @ApiModelProperty(value = "当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "每页记录数", example = "10")
+ private Long pageSize;
+
+ @ApiModelProperty("发布搜索开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date publishAtBegin;
+
+ @ApiModelProperty("发布搜索结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date publishAtEnd;
+
+ @ApiModelProperty("动态内容富文本")
+ private String content;
+
+ @ApiModelProperty("动态内容富文本--纯文本")
+ private String contentText;
+
+ @ApiModelProperty(value = "社区名字")
+ private String communityName;
+
+ @ApiModelProperty(value = "封面")
+ private String cover;
+
+ @ApiModelProperty(value = "是否增加 1 增加 0 不增加")
+ private Integer isAdd;
+
+ @ApiModelProperty(value = "社区动态分类id 1 2 3 4")
+ private String type;
+
+ @ApiModelProperty(value = "社区动态分类名称")
+ private String typeName;
+
+ @ApiModelProperty(value = "社区动态分类颜色")
+ private String typeColor;
+
+ @ApiModelProperty(value = "封面模式：1-小图展示 2-大图展示")
+ private Integer coverMode;
+
+ @ApiModelProperty(value = "查询筛选：0-本小区 1-全部")
+ private Integer choice;
+
+ @ApiModelProperty(value = "社区动态跳转链接")
+ private String jumpUrl;
+
+ @ApiModelProperty("跳转状态")
+ private Integer jumpType;
+
+ private String areaCode;
+
+ @ApiModelProperty("是否培训公共")
+ private Integer isOrgHatch;
+
+ @ApiModelProperty("类别（1.社区动态 2.招募公告 3.考察记录 4.评审公示 5.孵化培育 6.出壳成果 10.社区主题 11 花城金汇智慧党建）")
+ private Integer category;
+
+ @ApiModelProperty("显示时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date releaseTime;
+
+ /**
+ * 是否置顶
+ * */
+ @ApiModelProperty("广告是否置顶0否1是")
+ private Integer onTop;
+
+ /**
+ * 图片链接
+ * */
+ @ApiModelProperty("图片链接")
+ private String imageUrl;
+
+
+ private String typeS;
+
+ private List<String> typeList;
+
+ @ApiModelProperty("社区id集合")
+ private List<String> communityList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoActivityVO.java
new file mode 100644
index 0000000..d9f9590
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoActivityVO.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("随手拍活动返回参数")
+public class ComActEasyPhotoActivityVO {
+
+ @ApiModelProperty("活动id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("活动状态（1.待开始 2.进行中 3.已结束 4.已取消）")
+ private Integer status;
+
+ @ApiModelProperty("活动简介")
+ private String content;
+
+ @ApiModelProperty("活动开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date activityStartAt;
+
+ @ApiModelProperty("活动结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date activityEndAt;
+
+ @ApiModelProperty("优质奖励金额")
+ private BigDecimal goodReward;
+
+ @ApiModelProperty("精良奖励金额")
+ private BigDecimal excellentReward;
+
+ @ApiModelProperty("普通奖励金额")
+ private BigDecimal ordinaryReward;
+
+ @ApiModelProperty("一般奖励金额")
+ private BigDecimal commonlyReward;
+
+ @ApiModelProperty("活动图片")
+ private String logo;
+
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date releaseAt;
+
+ @ApiModelProperty("随手拍参与次数")
+ private Integer count;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoCommentVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoCommentVO.java
new file mode 100644
index 0000000..bed94b6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoCommentVO.java
@@ -0,0 +1,53 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 随手拍评论
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-21 14:03
+ **/
+@Data
+@ApiModel("随手拍评论")
+public class ComActEasyPhotoCommentVO {
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("随手拍主键")
+ private Long easyPhotoId;
+
+ @ApiModelProperty("varchar(500)")
+ private String comment;
+
+ @ApiModelProperty("评论者id")
+ private Long userId;
+
+ @ApiModelProperty("评论时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("评论人名字")
+ private String name;
+
+ @ApiModelProperty("评论人昵称")
+ private String nickName;
+
+ @ApiModelProperty("评论人头像")
+ private String url;
+
+ @ApiModelProperty("点赞数量")
+ private Integer num;
+
+ @ApiModelProperty("会否已经点赞 1 是 0 否")
+ private Integer haveSign = 0;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoFeedbackVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoFeedbackVO.java
new file mode 100644
index 0000000..102d419
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoFeedbackVO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 随手拍反馈信息
+ */
+@Data
+@ApiModel("随手拍反馈信息")
+public class ComActEasyPhotoFeedbackVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("随手拍id")
+ private Long easyId;
+
+ @ApiModelProperty("反馈内容")
+ private String feedbackContent;
+
+ @ApiModelProperty("反馈图片列表")
+ private String feedbackImg;
+
+ @ApiModelProperty("反馈时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("反馈人名字")
+ private String createByName;
+
+ @ApiModelProperty("反馈人头像")
+ private String createByImage;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoRewardVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoRewardVO.java
new file mode 100644
index 0000000..7fa8222
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoRewardVO.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 用户获得随手拍奖励返回参数
+ */
+@Data
+@ApiModel("用户获得随手拍奖励返回参数")
+public class ComActEasyPhotoRewardVO {
+
+ @ApiModelProperty("奖励金额")
+ private BigDecimal amount;
+
+ @ApiModelProperty("随手拍最新活动")
+ private ComActEasyPhotoActivityVO easyPhotoActivityVO;
+
+ @ApiModelProperty("正在进行中的弹窗问卷调查")
+ private ComActQuestnaireAppVO popupQuestnaireVO;
+
+ @ApiModelProperty("banner图位置问卷调查列表")
+ private List<ComActQuestnaireAppVO> bannerQuestnaireList;
+
+ @ApiModelProperty("banner图位置活动列表")
+ private List<ComActActivityVO> bannerActivityList;
+
+ @ApiModelProperty("应用位置问卷调查列表")
+ private List<ComActQuestnaireAppVO> applicationQuestnaireList;
+
+ @ApiModelProperty("banner预约/登记列表")
+ private List<ComActReserveIndexVo> comActReserveIndexBannerVos;
+
+ @ApiModelProperty("应用预约/登记列表")
+ private List<ComActReserveIndexVo> comActReserveIndexApplicationVos;
+
+ @ApiModelProperty("动态banner")
+ private List<BannerVO> bannerVOS;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
new file mode 100644
index 0000000..544127b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
@@ -0,0 +1,250 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.vos.common.ComActEasyPhotoEvaluateVo;
+import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 随手拍
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-07 14:19
+ **/
+@Data
+@ApiModel("社区活动 》随手拍")
+public class ComActEasyPhotoVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("发起人id")
+ private Long sponsorId;
+
+ @ApiModelProperty("发起人名字")
+ private String sponsorName;
+
+ @ApiModelProperty("发布人昵称")
+ private String userNickName;
+
+ @ApiModelProperty("发生地址")
+ @NotBlank(groups = {AddGroup.class}, message = "发生地址不能为空")
+ private String happenAddr;
+
+ @ApiModelProperty("发起人头像")
+ private String imageUrl;
+
+ @ApiModelProperty("状态 1待审核 2进行中 3已驳回 4待评价 5.已完成")
+ private Integer status;
+
+ @ApiModelProperty("处理人id")
+ private Long handlerId;
+
+ @ApiModelProperty("处理人名字")
+ private String handlerName;
+
+ @ApiModelProperty("查询-创建开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createBegin;
+
+ @ApiModelProperty("查询-创建结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createEnd;
+
+ @ApiModelProperty("详情")
+ @NotBlank(groups = {AddGroup.class}, message = "详情不能为空")
+ private String detail;
+
+ @ApiModelProperty("图片路径列表，逗号分隔")
+ @NotBlank(groups = {AddGroup.class}, message = "图片路径列表不能为空")
+ private String photoPathList;
+
+ @ApiModelProperty("处理结果")
+ private String handleResult;
+
+ @ApiModelProperty("处理结果，图片路径列表，逗号分隔")
+ private String handlePhotoList;
+
+ @ApiModelProperty("当前页数")
+ private Long pageNum;
+
+ @ApiModelProperty("每页记录数")
+ private Long pageSize;
+
+ @ApiModelProperty("审核时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date examineAt;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
+
+ @ApiModelProperty("点赞数量")
+ private Integer giveThumbsUpNum;
+
+ @ApiModelProperty("评论数量")
+ private Integer commentNum;
+
+ @ApiModelProperty("是否匿名发布 0 否 1 是")
+ @Min(value = 0, groups = {AddGroup.class}, message = "是否匿名发布不能为空")
+ private Integer isHide;
+
+ @ApiModelProperty("是否点赞 0 否 1 是")
+ private Integer haveGiveThumbsUp = 0;
+
+ @ApiModelProperty(value = "是否需要反馈 1 是 0 不是", example = "0")
+ private Integer isNeedFeedBack;
+
+ @ApiModelProperty("操作类型 1处理随手拍 2驳回 3反馈 4.完成随手拍")
+ private Integer type;
+
+ @ApiModelProperty(value = "登录用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "登录用户id", hidden = true)
+ private Long logInUserId;
+
+ @ApiModelProperty("反馈时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date feedbackAt;
+
+ @ApiModelProperty("发起人手机号")
+ private String phone;
+
+ @ApiModelProperty("拒绝原因")
+ private String rejectReason;
+
+ @ApiModelProperty(value = "后台登录人员id", hidden = true)
+ private Long backUserId;
+
+ @ApiModelProperty(value = "地址备注")
+ private String addrRemark;
+
+ @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)")
+ private Integer isReport;
+
+ @ApiModelProperty(value = "是否公示(0.否 1.是)")
+ private Integer isPublicity;
+
+ @ApiModelProperty(value = "处理状态（1.待处理 2.已处理）")
+ private Integer handleStatus;
+
+ @ApiModelProperty(value = "发生地址经纬度信息，逗号分割(长的在前面，短的在后面)")
+ private String lngLat;
+
+ @ApiModelProperty(value = "随手拍标签（1.优质 2.精良 3.普通 4.一般 5.无）")
+ private Integer activityType;
+
+ @ApiModelProperty(value = "参加活动奖励金额")
+ private BigDecimal activityAmount;
+
+ @ApiModelProperty(value = "活动奖励金额")
+ private BigDecimal activityMoney;
+
+ @ApiModelProperty(value = "随手拍活动id")
+ private Long activityId;
+
+ @ApiModelProperty(value = "类型（1.心情类 2.治理类）")
+ private Integer easyType;
+
+ @ApiModelProperty(value = "随手拍活动")
+ private ComActEasyPhotoActivityVO easyPhotoActivityVO;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "反馈信息列表")
+ private List<ComActEasyPhotoFeedbackVO> photoFeedbackList;
+
+ @ApiModelProperty(value = "人大代表反馈信息列表")
+ private List<ComActEasyPhotoFeedbackVO> photoFeedbackListForDpc;
+
+ @ApiModelProperty(value = "完成人名称")
+ private String completeName;
+
+ @ApiModelProperty(value = "是否上报到人大代表（ 0未上报 1已上报）")
+ private Integer isReportDpc;
+
+ @ApiModelProperty(value = "是否上报城管 0未上报 1已上报 2已退回")
+ private Integer isReportUrban;
+
+ @ApiModelProperty(value = "城管移交说明（备注）")
+ private String transferReason;
+
+ @ApiModelProperty("移交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date transferTime;
+
+ @ApiModelProperty(value = "城管安排状态 0未安排 1已安排 2已处理")
+ private Integer urbanStatus;
+
+ @ApiModelProperty(value = "随手拍分类id")
+ private Long classifyId;
+
+ @ApiModelProperty(value = "随手拍分类名称")
+ private String classifyName;
+
+ @ApiModelProperty(value = "1 随手拍 2网格治理")
+ private String addType;
+
+ /**
+ * 是否上报城管 0未上报 1已上报 2已退回
+ */
+ public interface isReportUrban {
+ int no = 0;
+ int yes = 1;
+ int ret = 2;
+ }
+ @ApiModelProperty(value = "单张图片宽度")
+ private BigDecimal imgWidth;
+
+ @ApiModelProperty(value = "单张图片高度")
+ private BigDecimal imgHeight;
+
+ @ApiModelProperty(value = "评价时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date evaluateDate;
+
+ @ApiModelProperty(value = "评价分数")
+ private Integer score;
+
+ @ApiModelProperty(value = "评价内容")
+ private String content;
+
+ @ApiModelProperty(value = "评价记录")
+ private List<ComActEasyPhotoEvaluateVo> evaluateList;
+
+ @ApiModelProperty(value = "微心愿分配人员集合")
+ private List<ComActMicroWishHandleVO> handleList;
+
+ @ApiModelProperty(value = "人大代表是否反馈（1.未反馈 2.已反馈）")
+ private Integer isFeedBackForDpc;
+
+ @ApiModelProperty(value = "是否人大代表成员 1.是 2.否", hidden = true)
+ private Integer isDpcMember;
+
+ @ApiModelProperty(value = "处理记录")
+ private List<ComActEasyPhotoHandlerVo> handleRecordList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEnterpriseTypeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEnterpriseTypeVO.java
new file mode 100644
index 0000000..edc16e2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEnterpriseTypeVO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComActEnterpriseTypeVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 社区企业服务分类信息
+ * @author: hans
+ * @date: 2022/06/06 16:05
+ */
+@Data
+@ApiModel("社区企业服务分类信息")
+public class ComActEnterpriseTypeVO {
+
+ @ApiModelProperty("分类id")
+ private Long id;
+
+ @ApiModelProperty("服务分类名称")
+ private String name;
+
+ @ApiModelProperty("描述")
+ private String description;
+
+ @ApiModelProperty("状态（1.启用 2.停用）")
+ private Integer status;
+
+ @ApiModelProperty("创建人")
+ private String createdBy;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createdAt;
+
+ @ApiModelProperty("由谁更新")
+ private String updatedBy;
+
+ @ApiModelProperty("最后更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updatedAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEnterpriseVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEnterpriseVO.java
new file mode 100644
index 0000000..3e31170
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEnterpriseVO.java
@@ -0,0 +1,61 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComActEnterpriseVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 社区企业信息
+ * @author: hans
+ * @date: 2022/05/31 13:42
+ */
+@Data
+@ApiModel("社区企业信息")
+public class ComActEnterpriseVO {
+
+ @ApiModelProperty("企业id")
+ private Long id;
+
+ @ApiModelProperty("企业名称")
+ private String name;
+
+ @ApiModelProperty("统一社会信用代码")
+ private String agencyCode;
+
+ @ApiModelProperty("法定代表人")
+ private String legalRepresentative;
+
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ @ApiModelProperty("注册时间")
+ private Date registeAt;
+
+ @ApiModelProperty("所属社区")
+ private Long communityId;
+
+ @ApiModelProperty("所属社区名称")
+ private String communityName;
+
+ @ApiModelProperty("地址")
+ private String address;
+
+ @ApiModelProperty("企业介绍")
+ private String introduct;
+
+ @ApiModelProperty("企业logo")
+ private String logo;
+
+ @ApiModelProperty("服务类型id")
+ private Long type;
+
+ @ApiModelProperty("服务类型名称")
+ private String typeName;
+
+ @ApiModelProperty("状态（1.启用 2.禁用）")
+ private Integer status;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActFourMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActFourMemberVO.java
new file mode 100644
index 0000000..f6e63c9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActFourMemberVO.java
@@ -0,0 +1,103 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.validated.AddGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Pattern;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("四长四员实体")
+public class ComActFourMemberVO {
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+
+ /**
+ * 职位
+ */
+ @ApiModelProperty(value = "职位")
+ private String position;
+
+ /**
+ * 管辖区域
+ */
+ @ApiModelProperty(value = "管辖区域")
+ private String jurisdiction;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ @ApiModelProperty("账户")
+ @Pattern(groups = {AddGroup.class}, message = "【账户】2-20个字符，英文，数字", regexp = "^[0-9A-Za-z]{2,20}$")
+ private String account;
+
+ @ApiModelProperty("密码")
+ @Pattern(groups = {AddGroup.class}, message = "【密码】格式为6-16个字符，英文，数字，且必须包含英文和数字",
+ regexp = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$")
+ private String password;
+
+ @ApiModelProperty("用户名称")
+ @Pattern(groups = {AddGroup.class}, message = "【用户名称】2-16个字符，英文，中文，数字", regexp = "^[0-9A-Za-z\u4e00-\u9fa5]{2,16}$")
+ private String name;
+
+ @ApiModelProperty("角色")
+ @Min(value = 1, groups = {AddGroup.class}, message = "角色不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long roleId;
+
+ @ApiModelProperty("手机号")
+ @Pattern(groups = {AddGroup.class}, message = "【手机号】格式错误", regexp = "1[3|4|5|7|8][0-9]\\d{8}")
+ private String phone;
+
+ @ApiModelProperty("状态 1 启用 2 禁用")
+ @Min(groups = {AddGroup.class}, value = 1, message = "账户状态不能为空")
+ private Integer status;
+
+ @ApiModelProperty("身份证号码")
+ private String idCard;
+
+ @ApiModelProperty("管辖区域内容")
+ private List<String> buildings;
+
+ @ApiModelProperty("图片")
+ private String url;
+
+ @ApiModelProperty("id数组")
+ private Integer[] ids;
+
+ @ApiModelProperty("管辖区域")
+ private String jurisdictionContent;
+
+ @ApiModelProperty("管辖区域数组")
+ private List<String> jurisdictionContentList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageBackVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageBackVO.java
new file mode 100644
index 0000000..dbf0f2b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageBackVO.java
@@ -0,0 +1,65 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("留言回复")
+public class ComActMessageBackVO {
+ @ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("留言id")
+ private Long msgId;
+
+ @ApiModelProperty("回复内容")
+ @NotBlank(groups = {AddGroup.class}, message = "回复内容不能为空")
+ private String msgContent;
+
+ @ApiModelProperty("图片地址 多个用逗号隔开")
+ private String photoPah;
+
+ @ApiModelProperty(value = "联系方式", hidden = true)
+ private String phone;
+
+ @ApiModelProperty(value = "留言人id", hidden = true)
+ private Long sendtoUserId;
+
+ @ApiModelProperty(value = "留言人姓名", hidden = true)
+ private String sendtoUserName;
+
+ @ApiModelProperty(value = "状态 1 待回复 2 已回复", hidden = true)
+ private Integer status;
+
+ @ApiModelProperty(value = "是否公开 1 公开 2 保密", hidden = true)
+ private Integer ispublic;
+
+ @ApiModelProperty(value = "回复人主键", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "回复人账号", hidden = true)
+ private String userAccount;
+
+ @ApiModelProperty(value = "回复人姓名", hidden = true)
+ private String userName;
+
+ @ApiModelProperty(value = "回复人职位")
+ private String userJob;
+
+ @ApiModelProperty(value = "社区主键", hidden = true)
+ private Long communityId;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "回复时间", hidden = true)
+ private Date createAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageVO.java
new file mode 100644
index 0000000..536a208
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageVO.java
@@ -0,0 +1,74 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("留言")
+public class ComActMessageVO {
+ @ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("留言内容")
+ @NotBlank(groups = {AddGroup.class}, message = "留言内容不能为空")
+ private String msgContent;
+
+ @ApiModelProperty("图片地址 多个用逗号隔开")
+ private String photoPah;
+
+ @ApiModelProperty(value = "留言对象联系方式", hidden = true)
+ private String phone;
+
+ @ApiModelProperty("回复人id")
+ private Long sendtoUserId;
+
+ @ApiModelProperty(value = "留言对象姓名", hidden = false)
+ private String sendtoUserName;
+
+ @ApiModelProperty(value = "状态 1 待回复 2 已回复", hidden = false)
+ private Integer status;
+
+ @ApiModelProperty(value = "是否公开 1 公开 2 保密", hidden = false)
+ private Integer ispublic;
+
+ @ApiModelProperty(value = "留言人主键", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "留言人账号", hidden = false)
+ private String userAccount;
+
+ @ApiModelProperty("留言人电话")
+ @NotBlank(groups = {AddGroup.class}, message = "联系方式不能为空")
+ private String userPhone;
+ @ApiModelProperty(value = "留言人姓名", hidden = false)
+ private String userName;
+
+ @ApiModelProperty(value = "社区主键", hidden = true)
+ private Long communityId;
+ @ApiModelProperty(value = "留言对象 1社区团队 2社区团委 3人大代表", hidden = false)
+ private Long type;
+ @ApiModelProperty(value = "回复时间", hidden = true)
+ private Date createAt;
+ @ApiModelProperty("当前页数")
+ private Long pageNum;
+
+ @ApiModelProperty("每页记录数")
+ private Long pageSize;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("发布开始时间")
+ private Date publishAtBegin;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("发布结束时间")
+ private Date publishAtEnd;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishFeedbackVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishFeedbackVO.java
new file mode 100644
index 0000000..fed556a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishFeedbackVO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel
+public class ComActMicroWishFeedbackVO {
+ /**
+ * 反馈内容
+ */
+ @ApiModelProperty("反馈内容")
+ private String content;
+
+ /**
+ * 反馈图片
+ */
+ @ApiModelProperty("反馈图片")
+ private String imgUrl;
+
+ /**
+ * 反馈时间
+ */
+ @ApiModelProperty("反馈时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * 反馈人
+ */
+ @ApiModelProperty("反馈人")
+ private String name;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishHandleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishHandleVO.java
new file mode 100644
index 0000000..5edde10
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishHandleVO.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 微心愿处理人请求参数
+ */
+@Data
+@ApiModel("微心愿处理人请求参数")
+public class ComActMicroWishHandleVO {
+
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ @ApiModelProperty("处理人类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员 6普通居民）")
+ private Integer type;
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishOperationRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishOperationRecordVO.java
new file mode 100644
index 0000000..e574479
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishOperationRecordVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ApiModel
+public class ComActMicroWishOperationRecordVO {
+ /**
+ * 操作内容
+ */
+ @ApiModelProperty("操作内容")
+ private String content;
+
+ /**
+ * 人员姓名
+ */
+ @ApiModelProperty("人员姓名")
+ private String name;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("记录时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+ /**
+ * 操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成
+ */
+ @ApiModelProperty("操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成 7反馈 8自动确认")
+ private Integer type;
+
+ @ApiModelProperty("操作备注")
+ private String remark;
+
+ @ApiModelProperty("反馈图片")
+ private String imgUrl;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
new file mode 100644
index 0000000..4f502ca
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
@@ -0,0 +1,180 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.validated.AddGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 微心愿
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-07 14:25
+ **/
+@Data
+@ApiModel("社区活动 》微心愿")
+public class ComActMicroWishVO {
+
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("发起人id")
+ private Long sponsorId;
+
+ @ApiModelProperty("发起人电话号码")
+ private String sponsorPhone;
+
+ @ApiModelProperty("发起人名字")
+ private String sponsorName;
+
+ @ApiModelProperty("发起人昵称")
+ private String userNickName;
+
+ @ApiModelProperty("发起人头像")
+ private String imageUrl;
+
+ @ApiModelProperty("微心愿名称")
+// @NotBlank(groups = {AddGroup.class},message = "微心愿名称不能为空")
+ private String wishName;
+
+ @ApiModelProperty("状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成 7集心中")
+ private Integer status;
+
+ @ApiModelProperty("集星数")
+ private Integer starNum;
+
+ @ApiModelProperty("形式 1分配人员 2发起活动 3用户一键认领 ")
+ private Integer form;
+
+ @ApiModelProperty("责任人id")
+ private Long responsibleId;
+
+ @ApiModelProperty("责任人名字")
+ private String responsibleName;
+
+ @ApiModelProperty("查询-创建开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createBegin;
+
+ @ApiModelProperty("查询-创建结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createEnd;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("审核 时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date examineAt;
+
+ @ApiModelProperty("分配 时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date distributionAt;
+
+ @ApiModelProperty("完成时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date finishAt;
+
+ @ApiModelProperty("评分")
+ private Integer score;
+
+ @ApiModelProperty("详情")
+ @NotBlank(groups = {AddGroup.class},message = "详情不能为空")
+ private String detail;
+
+ @ApiModelProperty("图片路径列表，逗号分隔")
+ //@NotBlank(groups = {AddGroup.class},message = "图片路径列表不能为空")
+ private String photoPathList;
+
+ @ApiModelProperty("当前页数")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty("每页记录数")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "社区id",hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("用户评价")
+ private String evaluate;
+
+ @ApiModelProperty("用户评价时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date evaluateAt;
+
+ @ApiModelProperty("集心完成时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date feedbackAt;
+
+ @ApiModelProperty("完成情况图片列表，逗号分隔")
+ private String finishPhotoPathList;
+
+ @ApiModelProperty("完成情况描述")
+ private String finish;
+
+ @ApiModelProperty("驳回理由")
+ private String rejectReason;
+
+ @ApiModelProperty("反馈文字")
+ private String feedback;
+
+ @ApiModelProperty("反馈图片集合，逗号分隔")
+ private String feedbackPhotoPathList;
+
+ @ApiModelProperty(value = "操作类型 1 审核通过 2驳回 3分配人员 4发起活动 5反馈",example = "1")
+ private Integer type;
+
+ @ApiModelProperty(value = "小程序请求 1 是 0 不是",hidden = true)
+ private Integer isApplets;
+
+ @ApiModelProperty(value = "是否点赞 1 是 0 不是",example = "1")
+ private Integer haveGiveThumbsUp = 0;
+
+ @ApiModelProperty(value = "登录用户",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "社区后台登录用户",hidden = true)
+ private Long backUserId;
+
+ @ApiModelProperty(value = "是否是分页查询微心愿接口调用",hidden = true)
+ private Integer isPageMyWish;
+
+ @ApiModelProperty(value = "预约社区集心数")
+ private Integer aimNum;
+
+ @ApiModelProperty(value = "反馈列表")
+ private List<ComActMicroWishFeedbackVO> feedbackVOList;
+
+ @ApiModelProperty(value = "操作记录 只有审核和驳回得纪录 其他从当前数据提取")
+ private List<ComActMicroWishOperationRecordVO> operationRecordVOList;
+
+ @ApiModelProperty(value = "下一个id数组")
+ private List<Long> idList;
+
+ @ApiModelProperty(value = "单张图片宽度")
+ private BigDecimal imgWidth;
+
+ @ApiModelProperty(value = "单张图片高度")
+ private BigDecimal imgHeight;
+
+ @ApiModelProperty(value = "微心愿分配人id集合")
+ private List<Long> handleIds;
+
+ @ApiModelProperty(value = "微心愿分配人员集合")
+ private List<ComActMicroWishHandleVO> handleList;
+
+ @ApiModelProperty(value = "微心愿处理人id，多个以逗号隔开")
+ private String handleId;
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActPasswordVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActPasswordVo.java
new file mode 100644
index 0000000..320a576
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActPasswordVo.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 社区账号密码返回参数
+ */
+@Data
+@ApiModel("社区账号密码返回参数")
+public class ComActPasswordVo {
+
+ @ApiModelProperty("账号")
+ private String account;
+
+ @ApiModelProperty("密码")
+ private String password;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActPictureLibraryVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActPictureLibraryVO.java
new file mode 100644
index 0000000..c9a0d22
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActPictureLibraryVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComActPictureLibraryVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 公共预设图库信息
+ * @author: hans
+ * @date: 2021/11/23 17:16
+ */
+@Data
+@ApiModel("公共预设图库信息")
+public class ComActPictureLibraryVO {
+
+ @ApiModelProperty("操作内容")
+ private List<String> presetPictures;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActProceedingsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActProceedingsVO.java
new file mode 100644
index 0000000..2307d68
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActProceedingsVO.java
@@ -0,0 +1,81 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ComActProceedingsVO implements Serializable {
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("id")
+ private Long id;
+
+ /**
+ * 姓名
+ */
+ @ApiModelProperty("姓名")
+ private String name;
+
+ /**
+ * 所属单位名
+ */
+ @ApiModelProperty("所属单位名")
+ private String unitName;
+
+ /**
+ * 所属单位id
+ */
+ @ApiModelProperty("所属单位id")
+ private Long unitId;
+
+ /**
+ * 简介
+ */
+ @ApiModelProperty("简介")
+ private String introduce;
+
+ /**
+ * 是否删除0否1是
+ */
+ @ApiModelProperty("是否删除")
+ private Boolean delFlag;
+
+ /**
+ * 状态0可用1禁用
+ */
+ @ApiModelProperty("是否可用")
+ private Boolean status;
+
+ /**
+ * 创建时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+ /**
+ * 创建人
+ */
+ private String createBy;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 修改人
+ */
+ private Date updateBy;
+
+ @ApiModelProperty("工作时间")
+ private String workTime;
+ private String logo;
+
+ private static final long serialVersionUID = 1L;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAnswerContentVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAnswerContentVO.java
new file mode 100644
index 0000000..86856ae
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAnswerContentVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("问卷回答记录内容")
+public class ComActQuestnaireAnswerContentVO {
+ @ApiModelProperty("问卷回答选项")
+ private String choice;
+ @ApiModelProperty("问卷回答内容")
+ private String answerContent;
+ @ApiModelProperty("问卷题目ID")
+ private Long subId;
+ @ApiModelProperty("用户Id")
+ private Long userId;
+ @ApiModelProperty("用户姓名")
+ private String userName;
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+ @ApiModelProperty("选项类型 0 固定选项 1 自定义选项")
+ private Integer type;
+ @ApiModelProperty("题目选项ID")
+ private Long selectionId;
+ @ApiModelProperty("答题记录id")
+ private Long reserveRecordId;
+ @ApiModelProperty("题目id")
+ private Long reserveSubId;
+ @ApiModelProperty("填报时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date time;
+ @ApiModelProperty("用户昵称")
+ private String nickName;
+ @ApiModelProperty("选项类型（0 单选 1 多选 2 输入框 3 手机号 4 身份证 5 文字描述 6 日期选择 7 时间选择 8 可换行的输入框 9姓名输入框 10图片选择 11文件上传 12签名）")
+ private Integer optionType;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAppVO.java
new file mode 100644
index 0000000..a9599d1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAppVO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("正在进行中的调查问卷")
+public class ComActQuestnaireAppVO {
+
+ @ApiModelProperty("调查问卷id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ @ApiModelProperty("组件唯一key")
+ private String projectKey;
+ @ApiModelProperty("标题(问卷调查主题)")
+ private String title;
+ @ApiModelProperty("问卷调查备注(应用名称)")
+ private String remark;
+ @ApiModelProperty("是否是封面（1.是 2.否）")
+ private Integer isCover;
+ @ApiModelProperty("是否强制调研(1.是 2.否)")
+ private Integer isForce;
+ @ApiModelProperty("广告弹窗（1.是 2.否 ）")
+ private Integer adverPositionPopup;
+ @ApiModelProperty("广告顶部（1.是 2.否）")
+ private Integer adverPositionTop;
+ @ApiModelProperty("广告应用（1.是 2.否）")
+ private Integer adverPositionApplication;
+ @ApiModelProperty("是否显示提醒（1.是 2.否）")
+ private Integer isDisplay = 2;
+ @ApiModelProperty("提供居民（1.是 2.否 ）")
+ private Integer forMasses;
+ @ApiModelProperty("提供党员（1.是 2.否 ）")
+ private Integer forParty;
+ @ApiModelProperty("提供志愿者（1.是 2.否 ）")
+ private Integer forVolunteer;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubSelectionVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubSelectionVO.java
new file mode 100644
index 0000000..c4702b3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubSelectionVO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("问卷题目选项")
+public class ComActQuestnaireSubSelectionVO {
+ @ApiModelProperty("ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ @ApiModelProperty("问题题目ID")
+ private Long queSubId;
+ @ApiModelProperty("选项名")
+ private String optionName;
+ @ApiModelProperty("选项内容")
+ private String content;
+ @ApiModelProperty("选项类型 0 固定选项 1 自定义选项")
+ private Integer type;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubVO.java
new file mode 100644
index 0000000..673665e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("问卷题目")
+public class ComActQuestnaireSubVO {
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ @ApiModelProperty("类型 0 单选 1 多选 2 输入框 3 手机号 4 身份证 5 文字描述 6 日期选择 7 时间选择 8 可换行的输入框 9姓名输入框")
+ private int type;
+ @ApiModelProperty("题目内容")
+ private String content;
+ @ApiModelProperty("序号")
+ private int sort;
+ @ApiModelProperty("调查问卷Id")
+ private Long queId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireVO.java
new file mode 100644
index 0000000..9770588
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireVO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("调查问卷 问卷表")
+public class ComActQuestnaireVO {
+ @ApiModelProperty("主键id")
+ private Long id;
+ @ApiModelProperty("标题")
+ private String title;
+ @ApiModelProperty("状态 1 待发布 2调研中 3已结束")
+ private int state;
+ @ApiModelProperty("参与人数")
+ private Integer joinCount;
+ @ApiModelProperty("社区ID")
+ private Long communityId;
+ @ApiModelProperty("是否封面（1.是 2.否）")
+ private Integer isCover;
+ @ApiModelProperty("填报项数量")
+ private Integer count;
+ @ApiModelProperty("浏览量")
+ private Long viewNum;
+ @ApiModelProperty("问卷调查备注(应用名称)")
+ private String remark;
+ @ApiModelProperty("问卷组件唯一key")
+ private String projectKey;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActReserveCommitVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActReserveCommitVO.java
new file mode 100644
index 0000000..2c841c6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActReserveCommitVO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("提交预约/登记参数")
+public class ComActReserveCommitVO {
+ @ApiModelProperty("记录id")
+ private Long id;
+ @ApiModelProperty("表单json")
+ private String jsonObject;
+ @ApiModelProperty("用户id")
+ private Long userId;
+ @ApiModelProperty("社区id")
+ private Long communityId;
+ @ApiModelProperty("手机号")
+ private String phone;
+ @ApiModelProperty("类型 1预约 2登记")
+ private Integer type;
+ @ApiModelProperty("预约时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reserveTime;
+ @ApiModelProperty("姓名")
+ private String name;
+ @ApiModelProperty("预约内容")
+ private String content;
+ @ApiModelProperty("填报记录id")
+ private Long recordId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActReserveIndexVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActReserveIndexVo.java
new file mode 100644
index 0000000..fd13a06
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActReserveIndexVo.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("预约/登记返回参数")
+public class ComActReserveIndexVo {
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ @ApiModelProperty("标题")
+ private String title;
+ @ApiModelProperty("类型（1.预约 2.登记） ")
+ private Integer type;
+ @ApiModelProperty("图标类型（1.预设1 2.预设2 3.预设3 4.预设4 5.用户自定义图片）")
+ private Integer imgType;
+ @ApiModelProperty("图标url（当img_type为5时，此字段的值为图标url地址）")
+ private String imgUrl;
+ @ApiModelProperty("是否是首页顶部（1.是 2.否）")
+ private Integer adverPositionTop;
+ @ApiModelProperty("是否是首页应用（1.是 2.否）")
+ private Integer adverPositionApplication;
+ @ApiModelProperty("是否填报 1是2否")
+ private Integer isCommit;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java
new file mode 100644
index 0000000..95c045c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java
@@ -0,0 +1,314 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("社会组织实体参数")
+public class ComActSocialOrgVO {
+ /**
+ * ID
+ */
+ @ApiModelProperty(value = "ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 单位名称
+ */
+ @ApiModelProperty(value = "单位名称")
+ private String name;
+
+ /**
+ * 工商登记号
+ */
+ @ApiModelProperty(value = "工商登记号")
+ private String businessNumber;
+
+ /**
+ * 成立时间
+ */
+ @ApiModelProperty(value = "成立时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date buildDate;
+
+ /**
+ * 机构代码
+ */
+ @ApiModelProperty(value = "机构代码")
+ private String agencyCode;
+
+ /**
+ * 微信公众号
+ */
+ @ApiModelProperty(value = "微信公众号")
+ private String weixinOfficialAccounts;
+
+ /**
+ * 单位类别： 1 社会团体、2 民办非企业单位、3 基金会
+ */
+ @ApiModelProperty(value = "单位类别： 1 社会团体、2 民办非企业单位、3 基金会")
+ private Integer companyType;
+
+ /**
+ * 注册资金（万元）
+ */
+ @ApiModelProperty(value = "注册资金（万元）")
+ private Integer registFee;
+
+ /**
+ * 资产总额（万元）
+ */
+ @ApiModelProperty(value = "资产总额（万元）")
+ private Integer assetsTotal;
+
+ /**
+ * 净资产（万元）
+ */
+ @ApiModelProperty(value = "净资产（万元）")
+ private Integer assetsNet;
+
+ /**
+ * 销售额（万元）
+ */
+ @ApiModelProperty(value = "销售额（万元）")
+ private Double salesFee;
+
+ /**
+ * 上年纳税额（万元）
+ */
+ @ApiModelProperty(value = "上年纳税额（万元）")
+ private Double taxesLastYear;
+
+ /**
+ * 职工人数（人）
+ */
+ @ApiModelProperty(value = "职工人数（人）")
+ private Integer staffCount;
+
+ /**
+ * 通讯地址
+ */
+ @ApiModelProperty(value = "通讯地址")
+ private String maillingAddr;
+
+ /**
+ * 邮编
+ */
+ @ApiModelProperty(value = "邮编")
+ private String postCode;
+
+ /**
+ * 官方网址
+ */
+ @ApiModelProperty(value = "官方网址")
+ private String officialUrl;
+
+ /**
+ * 法人姓名
+ */
+ @ApiModelProperty(value = "法人姓名")
+ private String corporationName;
+
+ /**
+ * 法人性别0女1男
+ */
+ @ApiModelProperty(value = "法人性别0女1男")
+ private String corporationGen;
+
+ /**
+ * 法人工作电话
+ */
+ @ApiModelProperty(value = "法人工作电话")
+ private String corporationOfficePhone;
+
+ /**
+ * 法人职位
+ */
+ @ApiModelProperty(value = "法人职位")
+ private String corporationPosition;
+
+ /**
+ * 法人手机
+ */
+ @ApiModelProperty(value = "法人手机")
+ private String corporationPhone;
+
+ /**
+ * 法人邮箱
+ */
+ @ApiModelProperty(value = "法人邮箱")
+ private String corporationEmail;
+
+ /**
+ * 联系人姓名
+ */
+ @ApiModelProperty(value = "联系人姓名")
+ private String contactName;
+
+ /**
+ * 联系人性别0女1男
+ */
+ @ApiModelProperty(value = "联系人性别0女1男")
+ private String contactGen;
+
+ /**
+ * 联系人工作电话
+ */
+ @ApiModelProperty(value = "联系人工作电话")
+ private String contactOfficePhone;
+
+ /**
+ * 联系人职位
+ */
+ @ApiModelProperty(value = "联系人职位")
+ private String contactPosition;
+
+ /**
+ * 联系人手机
+ */
+ @ApiModelProperty(value = "联系人手机")
+ private String contactPhone;
+
+ /**
+ * 联系人邮箱
+ */
+ @ApiModelProperty(value = "联系人邮箱")
+ private String contactEmail;
+
+ /**
+ * 业务范围/专业领域
+ */
+ @ApiModelProperty(value = "业务范围/专业领域")
+ private String businessScope;
+
+ /**
+ * 运营情况及行业影响（含所获荣誉）
+ */
+ @ApiModelProperty(value = "运营情况及行业影响（含所获荣誉）")
+ private String businessImpact;
+
+ /**
+ * 附件（以逗号隔开）
+ */
+ @ApiModelProperty(value = "附件（以逗号隔开）")
+ private String attachUrl;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createAt;
+
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人")
+ private Long updateBy;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date updateAt;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ /**
+ * 登录用户id
+ */
+ @ApiModelProperty(value = "登录用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+
+ @ApiModelProperty("账号")
+ private String account;
+
+ @ApiModelProperty("密码")
+ private String password;
+
+ @ApiModelProperty("权限id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long roleId;
+
+ @ApiModelProperty("状态")
+ private Integer status;
+
+ @ApiModelProperty("成立方式 1社区孵化 2民政注册")
+ private Integer buildType;
+
+ @ApiModelProperty("经度")
+ private String longitude;
+
+ @ApiModelProperty("纬度")
+ private String latitude;
+
+ @ApiModelProperty("服务类型")
+ private String serviceType;
+
+ @ApiModelProperty("街道id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long streetId;
+
+ @ApiModelProperty("服务类型名称")
+ private String serviceName;
+
+ @ApiModelProperty("所属机构名称")
+ private String streetName;
+
+ @ApiModelProperty("是否三社 0否1是")
+ private Integer isSociety;
+
+ /**
+ * 描述
+ */
+ @ApiModelProperty("描述")
+ private String description;
+
+ @ApiModelProperty("社区名字")
+ private String communityName;
+
+ @ApiModelProperty("孵化单位")
+ private Long hatchUnit;
+
+ @ApiModelProperty("孵化单位类型（1.街道 2.社区）")
+ private Integer hatchUnitType;
+
+ @ApiModelProperty("孵化单位名称")
+ private String hatchUnitName;
+
+ @ApiModelProperty("挂靠单位")
+ private Long affiliatedUnit;
+
+ @ApiModelProperty("挂靠单位类型（1.街道 2.社区）")
+ private Integer affiliatedUnitType;
+
+ @ApiModelProperty("挂靠单位名称")
+ private String affiliatedUnitName;
+
+ @ApiModelProperty("承办项目数")
+ private Integer undertakeProjectNum;
+
+ @ApiModelProperty("开展活动数")
+ private Integer startActNum;
+
+ @ApiModelProperty("孵化进度（1.已进驻 2.孵化中 3.通过评估 4.出壳）")
+ private Integer hatchSchedule;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActUserWalletTradeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActUserWalletTradeExcelVO.java
new file mode 100644
index 0000000..62bc354
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActUserWalletTradeExcelVO.java
@@ -0,0 +1,49 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导出钱包交易记录
+ * @author: Null
+ * @date: 2021/3/11 17:11
+ */
+@Data
+public class ComActUserWalletTradeExcelVO implements Serializable {
+ /**
+ * 金额
+ */
+ @ExcelProperty(value = "金额", index = 0)
+ private BigDecimal amount;
+ /**
+ * 姓名
+ */
+ @ExcelProperty(value = "姓名", index = 1)
+ private String userName;
+
+ /**
+ * 用户手机号
+ */
+ @ExcelProperty(value = "账号", index = 2)
+ private String phone;
+
+ /**
+ * 时间
+ */
+ @ExcelProperty(value = "时间", index = 3)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ /**
+ * 操作人
+ */
+ @ExcelProperty(value = "操作人", index = 4)
+ private String createBy;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActUserWalletTradeRewardExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActUserWalletTradeRewardExcelVO.java
new file mode 100644
index 0000000..cdea78d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActUserWalletTradeRewardExcelVO.java
@@ -0,0 +1,55 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导出奖励台账记录
+ * @author: Null
+ * @date: 2021/3/11 17:11
+ */
+@Data
+public class ComActUserWalletTradeRewardExcelVO implements Serializable {
+ /**
+ * 金额
+ */
+ @ExcelProperty(value = "金额", index = 0)
+ private BigDecimal amount;
+ /**
+ * 姓名
+ */
+ @ExcelProperty(value = "姓名", index = 1)
+ private String userName;
+
+ /**
+ * 用户手机号
+ */
+ @ExcelProperty(value = "用户手机号", index = 2)
+ private String phone;
+
+ @ExcelProperty(value = "奖励类别", index = 3)
+ private String type;
+
+ @ExcelProperty(value = "奖励内容", index = 4)
+ private String remark;
+
+ /**
+ * 时间
+ */
+ @ExcelProperty(value = "时间", index = 5)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ /**
+ * 操作人
+ */
+ @ExcelProperty(value = "操作人", index = 6)
+ private String createBy;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java
new file mode 100644
index 0000000..3331b0d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.java
@@ -0,0 +1,101 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 社区
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-15 10:06
+ **/
+@Data
+@ApiModel("社区表")
+public class ComActVO {
+
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ @ApiModelProperty("社区名字")
+ @NotBlank(groups = {AddGroup.class}, message = "社区名字不能为空")
+ private String name;
+
+ @ApiModelProperty("社区地址")
+ @NotBlank(groups = {AddGroup.class}, message = "社区地址不能为空")
+ private String address;
+
+ @ApiModelProperty("经度")
+ @NotBlank(groups = {AddGroup.class}, message = "经度不能为空")
+ private String lng;
+
+ @ApiModelProperty("维度")
+ @NotBlank(groups = {AddGroup.class}, message = "纬度不能为空")
+ private String lat;
+
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ @ApiModelProperty("省份地址编码")
+ @NotBlank(groups = {AddGroup.class}, message = "省份地址编码不能为空")
+ private String provinceCode;
+
+ @ApiModelProperty("市级地址编码")
+ @NotBlank(groups = {AddGroup.class}, message = "市级地址编码不能为空")
+ private String cityCode;
+
+ @ApiModelProperty("区级地址编码")
+ @NotBlank(groups = {AddGroup.class}, message = "区级地址编码不能为空")
+ private String areaCode;
+
+ @ApiModelProperty("区级地址编码-名字")
+ private String areaName;
+
+ @ApiModelProperty("社区面积")
+ @Min(value = 1, groups = {AddGroup.class}, message = "社区面积不能为空")
+ private Double square;
+
+ @ApiModelProperty("联系人")
+ @NotBlank(groups = {AddGroup.class}, message = "联系人不能为空")
+ private String contacts;
+
+ @ApiModelProperty("联系人电话")
+ @NotBlank(groups = {AddGroup.class}, message = "联系人电话不能为空")
+ private String contactsPhone;
+
+ @ApiModelProperty("超管账号")
+ @NotBlank(groups = {AddGroup.class}, message = "超管账号不能为空")
+ private String account;
+
+ @ApiModelProperty("账号密码")
+ @NotBlank(groups = {AddGroup.class}, message = "账号密码不能为空")
+ private String password;
+
+ @ApiModelProperty(value = "状态 0 启用 1 禁用", example = "0")
+ private Integer state;
+
+ @ApiModelProperty("距离-单位米")
+ private String distance;
+
+ @ApiModelProperty("街道Id")
+ private Long streetId;
+
+ @ApiModelProperty("行政区域")
+ private String administrativeRegions;
+
+ @ApiModelProperty("调解站电话")
+ private String solvePhone;
+
+ private String appId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideAppletsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideAppletsVO.java
new file mode 100644
index 0000000..196acea
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideAppletsVO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.google.common.collect.Lists;
+import com.panzhihua.common.validated.AddGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * 办事指南分类列表
+ */
+@Data
+@ApiModel("办事指南分类列表")
+public class ComActWorkGuideAppletsVO {
+
+ @ApiModelProperty("分类id")
+ private Long id;
+
+ @ApiModelProperty("分类名称")
+ private String classifyName;
+
+ @ApiModelProperty("分类图标url")
+ private String pictureUrl;
+
+ @ApiModelProperty("办事指南数量")
+ private Integer count;
+
+ @ApiModelProperty("办事指南列表")
+ private List<ComActWorkGuideDetailAppletsVO> guideDetailList = Lists.newArrayList();
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideClassifyVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideClassifyVO.java
new file mode 100644
index 0000000..d4d775a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideClassifyVO.java
@@ -0,0 +1,49 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * title: ComActWorkGuideClassifyVO 社区》办事指南》分类管理展示类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 社区》办事指南》分类管理展示类
+ *
+ * @author txb
+ * @date 2021/8/31 14:21
+ */
+
+@Data
+@ApiModel("办事指南-分类管理")
+public class ComActWorkGuideClassifyVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("分类名称")
+ private String classifyName;
+
+ @ApiModelProperty("图标地址")
+ private String pictureUrl;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("系统预置：1-是 0-否")
+ private Integer sysFlag;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+ private String areaCode;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideDetailAppletsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideDetailAppletsVO.java
new file mode 100644
index 0000000..06c8eaf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideDetailAppletsVO.java
@@ -0,0 +1,58 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.google.common.collect.Lists;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @auther llming
+ * @describe 办事指南
+ */
+@Data
+@ApiModel("办事指南信息")
+public class ComActWorkGuideDetailAppletsVO {
+ @ApiModelProperty("办事指南id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("办事指南标题")
+ private String title;
+
+ @ApiModelProperty("办事指南内容")
+ private String content;
+
+ @ApiModelProperty("所属分类")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long classify;
+
+ @ApiModelProperty("办理时间")
+ private String timeAt;
+
+ @ApiModelProperty("创建时间")
+ private String createAt;
+
+ @ApiModelProperty("办理地点")
+ private String address;
+
+ @ApiModelProperty("咨询电话")
+ private String phone;
+
+ @ApiModelProperty("经度")
+ private String lon;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "组件json数据")
+ private String jsonObject;
+
+ @ApiModelProperty(value = "是否在线 （0 不在线 1在线）")
+ private String isOnLine;
+
+ private List<ComActWorkGuideMaterialVO> materials = Lists.newArrayList();
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideMaterialVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideMaterialVO.java
new file mode 100644
index 0000000..402816f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideMaterialVO.java
@@ -0,0 +1,18 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("办事指南材料")
+public class ComActWorkGuideMaterialVO {
+ @ApiModelProperty("办事指南材料id")
+ private Long id;
+ @ApiModelProperty("申报材料名称")
+ private String materialName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java
new file mode 100644
index 0000000..ae7dd15
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java
@@ -0,0 +1,69 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.google.common.collect.Lists;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe 办事指南
+ */
+@Data
+@ApiModel("办事指南")
+public class ComActWorkGuideVO {
+ @ApiModelProperty("办事指南id")
+ private String id;
+
+ @ApiModelProperty("办事指南标题")
+ @NotBlank(groups = {AddGroup.class}, message = "标题不能为空")
+ @Length(groups = {AddGroup.class}, max = 35)
+ private String title;
+
+ @ApiModelProperty("办事指南内容")
+ @NotBlank(groups = {AddGroup.class}, message = "内容不能为空")
+ @Length(groups = {AddGroup.class}, max = 5000)
+ private String content;
+
+ @ApiModelProperty("所属分类")
+ private String classify;
+
+ @ApiModelProperty("所属分类名称")
+ private String classifyName;
+
+ @ApiModelProperty("办理时间")
+ private String timeAt;
+
+ @ApiModelProperty("创建时间")
+ private String createAt;
+
+ @ApiModelProperty("办理地点")
+ private String address;
+
+ @ApiModelProperty("咨询电话")
+ private String phone;
+
+ @ApiModelProperty("经度")
+ private String lon;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ private String areaCode;
+
+ @ApiModelProperty(value = "组件json数据")
+ private String jsonObject;
+
+ @ApiModelProperty(value = "是否在线 （0 不在线 1在线）")
+ private String isOnLine;
+
+ private List<ComActWorkGuideMaterialVO> materials = Lists.newArrayList();
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComAreaTownCommunityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComAreaTownCommunityVO.java
new file mode 100644
index 0000000..48c434d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComAreaTownCommunityVO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.vos.community;
+
+import lombok.Data;
+
+/**
+ * @title: ComAreaTownCommunityVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description:
+ * @author: hans
+ * @date: 2022/05/06 11:13
+ */
+@Data
+public class ComAreaTownCommunityVO {
+
+ private Long id;
+
+ private String area;
+
+ private String town;
+
+ private String community;
+
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComBasicDataVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComBasicDataVo.java
new file mode 100644
index 0000000..00e40f3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComBasicDataVo.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yh
+ * 基础数据
+ */
+@Data
+@ApiModel("统计-基础数据")
+public class ComBasicDataVo {
+ @ApiModelProperty(value = "社区数")
+ Integer community;
+ @ApiModelProperty(value = "商家数")
+ Integer merchants;
+ @ApiModelProperty(value = "党员数")
+ Integer pbMember;
+ @ApiModelProperty(value = "报道单位")
+ Integer pbUnit;
+ @ApiModelProperty(value = "实有人口")
+ Integer population;
+ @ApiModelProperty(value = "实有房屋")
+ Integer populationHouse;
+ @ApiModelProperty(value = "社会组织")
+ Integer socialOrg;
+ @ApiModelProperty(value = "志愿者")
+ Integer volunteer;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCorrectPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCorrectPopulationVO.java
new file mode 100644
index 0000000..f8417d0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCorrectPopulationVO.java
@@ -0,0 +1,286 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther txb
+ * @create 2021-08-10 15:57:35
+ * @describe 社区矫正人员表实体类
+ */
+
+@Data
+@ApiModel("社区矫正表")
+@EncryptDecryptClass
+public class ComCorrectPopulationVO {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("社区矫正人员id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 人口id
+ */
+ @ApiModelProperty("人口id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long populationId;
+
+ /**
+ * 街道id
+ */
+ @ApiModelProperty("街道id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long streetId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ /**
+ * 名字
+ */
+ @ApiModelProperty("名字")
+ private String name;
+
+ /**
+ * 身份证号码
+ */
+ @ApiModelProperty("身份证号码")
+ @EncryptDecryptField
+ private String cardNo;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ /**
+ * 矫正类别
+ */
+ @ApiModelProperty("矫正类别")
+ private String correctType;
+
+ /**
+ * 矫正开始时间
+ */
+ @ApiModelProperty("矫正开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date correctBegin;
+
+ /**
+ * 矫正结束时间
+ */
+ @ApiModelProperty("矫正结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date correctEnd;
+
+ /**
+ * 接收方式
+ */
+ @ApiModelProperty("接收方式")
+ private String receiveMethod;
+
+ /**
+ * 是否累惯犯（1.是 0.否）
+ */
+ @ApiModelProperty("是否累惯犯（1.是 0.否）")
+ private Integer isRecidivist;
+
+ /**
+ * 四史情况
+ */
+ @ApiModelProperty("四史情况")
+ private String fourHistory;
+
+ /**
+ * 三涉情况
+ */
+ @ApiModelProperty("三涉情况")
+ private String threeInvovle;
+
+ /**
+ * 是否建立矫正小组（1.是 0.否）
+ */
+ @ApiModelProperty("是否建立矫正小组（1.是 0.否）")
+ private Integer isCorrectGroup;
+
+ /**
+ * 矫正小组人员组成情况
+ */
+ @ApiModelProperty("矫正小组人员组成情况")
+ private String correctGroupConstitute;
+
+ /**
+ * 矫正解除（终止）类型
+ */
+ @ApiModelProperty("矫正解除（终止）类型")
+ private String correctRelieveType;
+
+ /**
+ * 是否有脱管（1.是 0.否）
+ */
+ @ApiModelProperty("是否有脱管（1.是 0.否）")
+ private Integer isOutControl;
+
+ /**
+ * 脱管原因
+ */
+ @ApiModelProperty("脱管原因")
+ private String outControlReason;
+
+ /**
+ * 脱管纠正情况
+ */
+ @ApiModelProperty("脱管纠正情况")
+ private String outControlCorrect;
+
+ /**
+ * 检察监督脱管情况
+ */
+ @ApiModelProperty("检察监督脱管情况")
+ private String inspectOutControl;
+
+ /**
+ * 是否有漏管（1.是 0.否）
+ */
+ @ApiModelProperty("是否有漏管（1.是 0.否）")
+ private Integer isMissControl;
+
+ /**
+ * 漏管原因
+ */
+ @ApiModelProperty("漏管原因")
+ private String missControlReason;
+
+ /**
+ * 漏管纠正情况
+ */
+ @ApiModelProperty("漏管纠正情况")
+ private String missControlCorrect;
+
+ /**
+ * 检察监督漏管
+ */
+ @ApiModelProperty("检察监督漏管")
+ private String inspectMissControl;
+
+ /**
+ * 奖惩情况
+ */
+ @ApiModelProperty("奖惩情况")
+ private String rewardAndPunishiment;
+
+ /**
+ * 是否重新犯罪（1.是 0.否）
+ */
+ @ApiModelProperty("是否重新犯罪（1.是 0.否）")
+ private Integer isAgainCrime;
+
+ /**
+ * 重新犯罪名称
+ */
+ @ApiModelProperty("重新犯罪名称")
+ private String againCrimeName;
+
+ /**
+ * 刑罚变更执行情况
+ */
+ @ApiModelProperty("刑罚变更执行情况")
+ private String pubishmentChange;
+
+ /**
+ * 案件类别
+ */
+ @ApiModelProperty("案件类别")
+ private String caseType;
+
+ /**
+ * 具体罪名
+ */
+ @ApiModelProperty("具体罪名")
+ private String specificCharge;
+
+ /**
+ * 原判刑期
+ */
+ @ApiModelProperty("原判刑期")
+ private String originalTerm;
+
+ /**
+ * 原判刑开始日期
+ */
+ @ApiModelProperty("原判刑开始日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date originalTermBegin;
+
+ /**
+ * 原判刑结束日期
+ */
+ @ApiModelProperty("原判刑结束日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date originalTermEnd;
+
+ /**
+ * 学历
+ */
+ @ApiModelProperty("学历")
+ private String cultureLevel;
+
+ /**
+ * 社区矫正人员编号
+ */
+ @ApiModelProperty("社区矫正人员编号")
+ private String correctPersonCode;
+
+ /**
+ * 原羁押场所
+ */
+ @ApiModelProperty("原羁押场所")
+ private String originalCustodyplace;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty("备注")
+ private String remark;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ /**
+ * 创建用户
+ */
+ @ApiModelProperty("创建用户")
+ private Long createBy;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ private Date updateAt;
+
+ /**
+ * 修改用户
+ */
+ @ApiModelProperty("修改用户")
+ private Long updateBy;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCultPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCultPopulationVO.java
new file mode 100644
index 0000000..56eda6a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCultPopulationVO.java
@@ -0,0 +1,121 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther txb
+ * @create 2021-08-10 15:58:07
+ * @describe 邪教人员表实体类
+ */
+
+@Data
+@ApiModel("邪教人员表")
+@EncryptDecryptClass
+public class ComCultPopulationVO {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("邪教矫正人员id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 人口id
+ */
+ @ApiModelProperty("人口id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long populationId;
+
+ /**
+ * 街道id
+ */
+ @ApiModelProperty("街道id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long streetId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ /**
+ * 名字
+ */
+ @ApiModelProperty("名字")
+ private String name;
+
+ /**
+ * 身份证号码
+ */
+ @ApiModelProperty("身份证号码")
+ @EncryptDecryptField
+ private String cardNo;
+
+ /**
+ * 邪教名称
+ */
+ @ApiModelProperty("邪教名称")
+ private String cultName;
+
+ /**
+ * 基本情况（参加邪教的活动情况）
+ */
+ @ApiModelProperty("基本情况（参加邪教的活动情况）")
+ private String basicSituation;
+
+ /**
+ * 参加邪教时间
+ */
+ @ApiModelProperty("参加邪教时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date joinCultDate;
+
+ /**
+ * 是否对外宣传（1.是 0.否）
+ */
+ @ApiModelProperty("是否对外宣传（1.是 0.否）")
+ private Integer isExternalPublicity;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty("备注")
+ private String remark;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ /**
+ * 创建用户
+ */
+ @ApiModelProperty("创建用户")
+ private Long createBy;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ private Date updateAt;
+
+ /**
+ * 修改用户
+ */
+ @ApiModelProperty("修改用户")
+ private Long updateBy;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtBusinessCategoryServeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtBusinessCategoryServeVO.java
new file mode 100644
index 0000000..ba6a687
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtBusinessCategoryServeVO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 小程序便民服务商家服务分类
+ * @author: Null
+ * @date: 2021/3/12 13:36
+ */
+@Data
+@ApiModel("便民服务商家服务分类")
+public class ComCvtBusinessCategoryServeVO implements Serializable {
+
+ private static final long serialVersionUID = 925697143924235721L;
+
+ @ApiModelProperty("商家服务分类名称")
+ private String categoryName;
+
+ @ApiModelProperty("商家分类服务列表")
+ private List<ComCvtServeVO> comCvtServeVOS;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtBusinessDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtBusinessDetailVO.java
new file mode 100644
index 0000000..96059b7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtBusinessDetailVO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 小程序便民服务商家详情信息
+ * @author: Null
+ * @date: 2021/3/12 13:36
+ */
+@Data
+@ApiModel("便民服务商家详情信息")
+public class ComCvtBusinessDetailVO implements Serializable {
+
+ private static final long serialVersionUID = 8381895998705845852L;
+ @ApiModelProperty("服务范围集合")
+ List<String> comActVOS;
+ @ApiModelProperty("分类服务")
+ List<ComCvtBusinessCategoryServeVO> categoryServeVOS;
+ @ApiModelProperty("商家ID")
+ private Long id;
+ @ApiModelProperty("商家名称")
+ private String name;
+ @ApiModelProperty("联系人")
+ private String contacts;
+ @ApiModelProperty("联系方式")
+ private String contactsPhone;
+ @ApiModelProperty("详细地址")
+ private String address;
+ @ApiModelProperty("主营业务")
+ private String busScope;
+ @ApiModelProperty("服务范围标记：1-全攀枝花市，2-部分地区")
+ private Integer areaFlag;
+ @ApiModelProperty("商家logo")
+ private String logo;
+ @ApiModelProperty(value = "社区主键", hidden = true)
+ private Long communityId;
+ @ApiModelProperty("商家介绍媒体文件类型：1-图片 2-视频")
+ private Integer mediaType;
+ @ApiModelProperty("介绍媒体文件集合")
+ private List<String> mediaPaths;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtBusinessVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtBusinessVO.java
new file mode 100644
index 0000000..8870316
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtBusinessVO.java
@@ -0,0 +1,64 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 便民服务 商家信息
+ * @author: Null
+ * @date: 2021/3/11 10:36
+ */
+@Data
+@ApiModel("商家信息")
+public class ComCvtBusinessVO implements Serializable {
+
+ @ApiModelProperty("服务范围集合")
+ List<ComActVO> comActVOS;
+ @ApiModelProperty("商家ID")
+ private Long id;
+ @ApiModelProperty("商家名称")
+ @NotBlank(groups = {AddGroup.class}, message = "商家名称不能为空")
+ private String name;
+ @ApiModelProperty("联系人")
+ @NotBlank(groups = {AddGroup.class}, message = "联系人不能为空")
+ private String contacts;
+ @ApiModelProperty("联系方式")
+ @NotBlank(groups = {AddGroup.class}, message = "联系方式不能为空")
+ private String contactsPhone;
+ @ApiModelProperty("详细地址")
+ @NotBlank(groups = {AddGroup.class}, message = "详细地址不能为空")
+ private String address;
+ @ApiModelProperty("主营业务")
+ @NotBlank(groups = {AddGroup.class}, message = "主营业务不能为空")
+ private String busScope;
+ @ApiModelProperty("服务范围标记：1-全攀枝花市，2-部分地区")
+ @NotBlank(groups = {AddGroup.class}, message = "主营业务不能为空")
+ private Integer areaFlag;
+ @ApiModelProperty("商家logo")
+ @NotBlank(groups = {AddGroup.class}, message = "商家logo不能为空")
+ private String logo;
+ @ApiModelProperty("创建人")
+ private String createBy;
+ @ApiModelProperty("创建人名称")
+ private String createByName;
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+ @ApiModelProperty(value = "社区主键", hidden = true)
+ private Long communityId;
+ @ApiModelProperty("商家介绍媒体文件类型：1-图片 2-视频")
+ private Integer mediaType;
+
+ @ApiModelProperty("介绍媒体文件集合")
+ private List<String> mediaPaths;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtCategoryVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtCategoryVO.java
new file mode 100644
index 0000000..94bd0c6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtCategoryVO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 便民服务 分类信息
+ * @author: Null
+ * @date: 2021/3/11 17:11
+ */
+@Data
+@ApiModel("分类信息")
+public class ComCvtCategoryVO implements Serializable {
+
+ @ApiModelProperty("分类ID")
+ private Long id;
+
+ @ApiModelProperty("分类名称")
+ @NotBlank(groups = {AddGroup.class}, message = "分类名称不能为空")
+ private String name;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("权重")
+ @NotBlank(groups = {AddGroup.class}, message = "权重不能为空")
+ private Integer weight;
+
+ @ApiModelProperty("创建人")
+ private String createBy;
+
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtServeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtServeExcelVO.java
new file mode 100644
index 0000000..107c94f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtServeExcelVO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入便民服务
+ * @author: Null
+ * @date: 2021/3/11 17:11
+ */
+@Data
+public class ComCvtServeExcelVO implements Serializable {
+ /**
+ * 服务分类
+ */
+ @ExcelProperty(value = "服务分类", index = 0)
+ private String categoryName;
+ /**
+ * 服务名称
+ */
+ @ExcelProperty(value = "服务名称", index = 1)
+ private String serviceName;
+ /**
+ * 服务价格（元）
+ */
+ @ExcelProperty(value = "服务价格（元）", index = 2)
+ private BigDecimal servicePrice;
+ /**
+ * 服务描述
+ */
+ @ExcelProperty(value = "服务描述", index = 3)
+ private String serviceDesc;
+ /**
+ * 商家名称
+ */
+ @ExcelProperty(value = "商家名称", index = 4)
+ private String businessName;
+ /**
+ * 备注
+ */
+ @ExcelProperty(value = "备注", index = 5)
+ private String remark;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtServeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtServeVO.java
new file mode 100644
index 0000000..a2c34a6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtServeVO.java
@@ -0,0 +1,56 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 便民服务列表
+ * @author: Null
+ * @date: 2021/3/11 10:52
+ */
+@Data
+@ApiModel("便民服务")
+public class ComCvtServeVO implements Serializable {
+
+ private static final long serialVersionUID = -7734682979200558948L;
+ @ApiModelProperty("服务主键ID")
+ private Long id;
+
+ @ApiModelProperty("服务名称")
+ private String serviceName;
+
+ @ApiModelProperty("服务价格")
+ private BigDecimal servicePrice;
+
+ @ApiModelProperty("服务分类ID")
+ private Long categoryId;
+
+ @ApiModelProperty("服务分类名称")
+ private String categoryName;
+
+ @ApiModelProperty("服务描述")
+ private String serviceDesc;
+
+ @ApiModelProperty("所属商家ID")
+ private Long businessId;
+
+ @ApiModelProperty("所属商家名称")
+ private String businessName;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("创建人")
+ private Long createBy;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComDisabilityPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComDisabilityPopulationVO.java
new file mode 100644
index 0000000..538a1a7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComDisabilityPopulationVO.java
@@ -0,0 +1,119 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther txb
+ * @create 2021-08-09 19:48:22
+ * @describe 实有人口导入》残疾人表实体类
+ */
+
+@Data
+@ApiModel("残疾人表")
+@EncryptDecryptClass
+public class ComDisabilityPopulationVO {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("残疾人id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 人口id
+ */
+ @ApiModelProperty("人口id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long populationId;
+
+ /**
+ * 街道id
+ */
+ @ApiModelProperty("街道id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long streetId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ /**
+ * 名字
+ */
+ @ApiModelProperty("名字")
+ private String name;
+
+ /**
+ * 身份证号码
+ */
+ @ApiModelProperty("身份证号码")
+ @EncryptDecryptField
+ private String cardNo;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ /**
+ * 办证状况
+ */
+ @ApiModelProperty("办证状况")
+ private String certificateSituation;
+
+ /**
+ * 残疾类别
+ */
+ @ApiModelProperty("残疾类别")
+ private String disType;
+
+ /**
+ * 残疾等级
+ */
+ @ApiModelProperty("残疾等级")
+ private String disLevel;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty("备注")
+ private String remark;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ /**
+ * 创建用户
+ */
+ @ApiModelProperty("创建用户")
+ private Long createBy;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ private Date updateAt;
+
+ /**
+ * 修改用户
+ */
+ @ApiModelProperty("修改用户")
+ private Long updateBy;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComDrugPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComDrugPopulationVO.java
new file mode 100644
index 0000000..03e162d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComDrugPopulationVO.java
@@ -0,0 +1,169 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther txb
+ * @create 2021-08-10 15:57:18
+ * @describe 吸毒人员表实体类
+ */
+
+@Data
+@ApiModel("吸毒人员表")
+@EncryptDecryptClass
+public class ComDrugPopulationVO {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("吸毒人员id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 人口id
+ */
+ @ApiModelProperty("人口id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long populationId;
+
+ /**
+ * 街道id
+ */
+ @ApiModelProperty("街道id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long streetId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ /**
+ * 名字
+ */
+ @ApiModelProperty("名字")
+ private String name;
+
+ /**
+ * 身份证号码
+ */
+ @EncryptDecryptField
+ @ApiModelProperty("身份证号码")
+ private String cardNo;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ /**
+ * 初次发现日期
+ */
+ @ApiModelProperty("初次发现日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date firstDate;
+
+ /**
+ * 管控情况
+ */
+ @ApiModelProperty("管控情况")
+ private String controlSituation;
+
+ /**
+ * 管控人姓名
+ */
+ @ApiModelProperty("管控人姓名")
+ private String controlPerson;
+
+ /**
+ * 管控人联系方式
+ */
+ @ApiModelProperty("管控人联系方式")
+ private String controlPersonPhone;
+
+ /**
+ * 帮扶情况
+ */
+ @ApiModelProperty("帮扶情况")
+ private String helpSituation;
+
+ /**
+ * 帮扶人姓名
+ */
+ @ApiModelProperty("帮扶人姓名")
+ private String helpPerson;
+
+ /**
+ * 帮扶人联系方式
+ */
+ @ApiModelProperty("帮扶人联系方式")
+ private String helpPersonPhone;
+
+ /**
+ * 吸毒原因
+ */
+ @ApiModelProperty("吸毒原因")
+ private String drugReason;
+
+ /**
+ * 吸毒后果
+ */
+ @ApiModelProperty("吸毒后果")
+ private String drugResult;
+
+ /**
+ * 有无犯罪史
+ */
+ @ApiModelProperty("有无犯罪史")
+ private String haveCrime;
+
+ /**
+ * 违法犯罪情况
+ */
+ @ApiModelProperty("违法犯罪情况")
+ private String crimeSutiation;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty("备注")
+ private String remark;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ /**
+ * 创建用户
+ */
+ @ApiModelProperty("创建用户")
+ private Long createBy;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ private Date updateAt;
+
+ /**
+ * 修改用户
+ */
+ @ApiModelProperty("修改用户")
+ private Long updateBy;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthElderliesVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthElderliesVO.java
new file mode 100644
index 0000000..f2664e0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthElderliesVO.java
@@ -0,0 +1,86 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * title: ComElderAuthElderliesVO 社区政务》高龄老人认证》高龄老人表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 社区政务》高龄老人认证》高龄老人表实体类
+ *
+ * @author txb
+ * @date 2021/9/01 14:12
+ */
+
+@Data
+@ApiModel("高龄认证记录")
+public class ComElderAuthElderliesVO {
+
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "人口id")
+ private Long populationId;
+
+ @ApiModelProperty(value = "街道id")
+ private Long streetId;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+
+ @ApiModelProperty(value = "性别")
+ private Integer sex;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "出生日期")
+ private String birthday;
+
+ @ApiModelProperty(value = "人员类别（1.80-89周岁 2.90-99周岁 3.100周岁（含）以上）")
+ private Integer personnelCategory;
+
+ @ApiModelProperty(value = "是否高龄老人登记（1.是 0.否）")
+ private Integer isRegister;
+
+ @ApiModelProperty(value = "是否健在（1.是 0.否）")
+ private Integer isAlive;
+
+ @ApiModelProperty(value = "居住地址")
+ private String address;
+
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ @ApiModelProperty(value = "高龄津贴开始领取日期")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date receiveAllowanceBegin;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "创建用户")
+ private Long createBy;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty(value = "修改用户")
+ private Long updateBy;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordExcleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordExcleVO.java
new file mode 100644
index 0000000..7bf775a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordExcleVO.java
@@ -0,0 +1,73 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: ComElderAuthRecordVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 高龄认证记录
+ * @author: hans
+ * @date: 2021/09/01 16:16
+ */
+@Data
+@ApiModel("高龄认证记录")
+@EncryptDecryptClass
+public class ComElderAuthRecordExcleVO {
+
+ @ExcelProperty(value = "提交用户", index = 0)
+ private String submitUserName;
+
+ @ExcelProperty(value = "联系电话", index = 1)
+ private String phone;
+
+ @ExcelProperty(value = "认证姓名", index = 2)
+ private String name;
+
+ @ExcelProperty(value = "身份证号", index = 3)
+ @EncryptDecryptField
+ private String idCard;
+
+ @ExcelProperty(value = "性别", index = 4)
+ private String sex;
+
+ @ExcelProperty(value = "年龄", index = 5)
+ private Integer age;
+
+ @ExcelProperty(value = "出生日期", index = 6)
+ private String birthday;
+
+ @ExcelProperty(value = "人员类别", index = 7)
+ private String personnelCategory;
+
+ @ExcelProperty(value = "现居住地址", index = 8)
+ private String address;
+
+ @ExcelProperty(value = "健在", index = 9)
+ private String isAlive;
+
+ @ExcelProperty(value = "认证期数", index = 10)
+ private String authPeriod;
+
+ @ExcelProperty(value = "认证时间", index = 11)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date authDate;
+
+ @ExcelProperty(value = "认证方式", index = 12)
+ private String authMethod;
+
+ @ExcelProperty(value = "标记", index = 13)
+ private String mark;
+
+ @ExcelProperty(value = "审核状态", index = 14)
+ private String approvalStatus;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordImportExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordImportExcelVO.java
new file mode 100644
index 0000000..57e6725
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordImportExcelVO.java
@@ -0,0 +1,62 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @description: 批量导入吸毒人员
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComElderAuthRecordImportExcelVO implements Serializable {
+
+ @ExcelProperty(value = "认证姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "认证身份证号码", index = 1)
+ @EncryptDecryptField
+ private String idCard;
+
+ @ExcelProperty(value = "联系电话", index = 2)
+ private String phone;
+
+ @ExcelProperty(value = "现居住地址", index = 3)
+ private String nowAddress;
+
+ @ExcelProperty(value = "认证时间", index = 4)
+ private Date authDate;
+
+ @ExcelProperty(value = "认证期数", index = 5)
+ private String authPeriod;
+
+ @ExcelProperty(value = "标记", index = 6)
+ private String mark;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 性别（1.男 2.女）
+ */
+ private Integer sex;
+
+ /**
+ * 出生年月日
+ */
+ private String birthday;
+
+ /**
+ * 地址
+ */
+ private String address;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordImportMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordImportMistakeExcelVO.java
new file mode 100644
index 0000000..0f05227
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordImportMistakeExcelVO.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @description: 批量导入吸毒人员
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComElderAuthRecordImportMistakeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "认证姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "认证身份证号码", index = 1)
+ @EncryptDecryptField
+ private String idCard;
+
+ @ExcelProperty(value = "联系电话", index = 2)
+ private String phone;
+
+ @ExcelProperty(value = "现居住地址", index = 3)
+ private String nowAddress;
+
+ @ExcelProperty(value = "认证时间", index = 4)
+ private String authDate;
+
+ @ExcelProperty(value = "认证期数", index = 5)
+ private String authPeriod;
+
+ @ExcelProperty(value = "标记", index = 6)
+ private String mark;
+
+ @ExcelProperty(value = "错误信息", index = 7)
+ private String mistake;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordStatisticExcleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordStatisticExcleVO.java
new file mode 100644
index 0000000..26331c3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordStatisticExcleVO.java
@@ -0,0 +1,68 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: ComElderAuthRecordStatisticExcleVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 高龄认证记录统计
+ * @author: hans
+ * @date: 2021/09/01 16:16
+ */
+@Data
+@ApiModel("高龄认证记录统计")
+@EncryptDecryptClass
+public class ComElderAuthRecordStatisticExcleVO {
+
+ @ExcelProperty(value = "联系电话", index = 0)
+ private String phone;
+
+ @ExcelProperty(value = "认证姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "身份证号", index = 2)
+ @EncryptDecryptField
+ private String idCard;
+
+ @ExcelProperty(value = "性别", index = 3)
+ private String sex;
+
+ @ExcelProperty(value = "年龄", index = 4)
+ private Integer age;
+
+ @ExcelProperty(value = "出生日期", index = 6)
+ private String birthday;
+
+ @ExcelProperty(value = "人员类别", index = 5)
+ private String personnelCategory;
+
+ @ExcelProperty(value = "现居住地址", index = 7)
+ private String address;
+
+ @ExcelProperty(value = "健在", index = 8)
+ private String isAlive;
+
+ @ExcelProperty(value = "认证期数", index = 9)
+ private String authPeriod;
+
+ @ExcelProperty(value = "认证时间", index = 10)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date authDate;
+
+ @ExcelProperty(value = "认证方式", index = 11)
+ private String authMethod;
+
+
+ @ExcelProperty(value = "标记", index = 12)
+ private String mark;
+
+ @ExcelProperty(value = "认证状态", index = 13)
+ private String authStatus;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordVO.java
new file mode 100644
index 0000000..2b87c56
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComElderAuthRecordVO.java
@@ -0,0 +1,131 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComElderAuthRecordVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 高龄认证记录
+ * @author: hans
+ * @date: 2021/09/01 16:16
+ */
+@Data
+@ApiModel("高龄认证记录")
+@EncryptDecryptClass
+public class ComElderAuthRecordVO {
+
+ @ApiModelProperty(value = "自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty(value = "高龄老人id")
+ private Long elderliesId;
+
+ @ApiModelProperty(value = "认证期数")
+ private String authPeriod;
+
+ @ApiModelProperty(value = "提交用户id")
+ private Long submitUserId;
+
+ @ApiModelProperty(value = "认证方式（1.视频认证 2.人脸认证）")
+ private Integer authMethod;
+
+ @ApiModelProperty(value = "提交用户姓名")
+ private String submitUserName;
+
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "身份证号")
+ @EncryptDecryptField
+ private String idCard;
+
+ @ApiModelProperty(value = "性别（1.男 2.女 3.其他）")
+ private String sex;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "出生日期")
+ private String birthday;
+
+ @ApiModelProperty(value = "人员类别（1.80-89周岁 2.90-99周岁 3.100周岁（含）以上）")
+ private Integer personnelCategory;
+
+ @ApiModelProperty(value = "是否高龄老人登记（1.是 0.否）")
+ private Integer isRegister;
+
+ @ApiModelProperty(value = "是否健在（1.是 0.否）")
+ private Integer isAlive;
+
+ @ApiModelProperty(value = "居住地址")
+ private String address;
+
+ @ApiModelProperty(value = "认证视频url")
+ private String authVideo;
+
+ @ApiModelProperty(value = "审核人员id")
+ private Long approverId;
+
+ @ApiModelProperty(value = "审核人员姓名")
+ private String approverName;
+
+ @ApiModelProperty(value = "审核状态（1.待审核 2.驳回 3.通过）")
+ private Integer approvalStatus;
+
+ @ApiModelProperty(value = "审核时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date approvalDate;
+
+ @ApiModelProperty(value = "标记")
+ private String mark;
+
+ @ApiModelProperty(value = "驳回原因")
+ private String rejectReason;
+
+ @ApiModelProperty(value = "认证状态")
+ private Integer authStatus;
+
+ @ApiModelProperty(value = "认证时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date authDate;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty(value = "本期认证总人数")
+ private Integer authAmount;
+
+ @ApiModelProperty(value = "本期认证成功人数")
+ private Integer authSucceedAmount;
+
+ @ApiModelProperty(value = "本期未认证人数")
+ private Integer authNoAmount;
+
+ @ApiModelProperty(value = "待审核状态id集合列表")
+ private List<String> nextIds;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthElderlyDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthElderlyDetailsVO.java
new file mode 100644
index 0000000..19011b3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthElderlyDetailsVO.java
@@ -0,0 +1,76 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-09
+ */
+@Data
+@ApiModel("高龄老人库详细返回参数")
+public class ComEldersAuthElderlyDetailsVO {
+
+ @ApiModelProperty(value = "ID")
+ private Long id;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "认证时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "更新人")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ @ApiModelProperty(value = "认证人姓名")
+ private String authUserName;
+
+ @ApiModelProperty(value = "视频地址")
+ private String videoUrl;
+
+ @ApiModelProperty(value = "提交人")
+ private Long sumitUserId;
+
+ @ApiModelProperty(value = "户籍地")
+ private String domicile;
+
+ @ApiModelProperty(value = "状态")
+ private String status;
+
+ @ApiModelProperty(value = "出生日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date birthDay;
+
+ @ApiModelProperty(value = "家庭成员ID")
+ private Long familyUserId;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "管辖社区")
+ private String communityName;
+
+ @ApiModelProperty(value = "核验类型（1.视频认证 2.人脸核验）")
+ private Integer type;
+
+ @ApiModelProperty(value = "反馈信息")
+ private List<EldersAuthFeedbackVO> feedback;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthElderlyVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthElderlyVO.java
new file mode 100644
index 0000000..e592081
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthElderlyVO.java
@@ -0,0 +1,72 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import com.panzhihua.common.model.helper.sensitive.Sensitive;
+import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-09
+ */
+@Data
+@ApiModel("高龄老人库返回参数")
+@EncryptDecryptClass
+public class ComEldersAuthElderlyVO {
+
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "名称")
+ private String name;
+
+ @ApiModelProperty(value = "身份证号码")
+ @EncryptDecryptField
+ private String idCard;
+
+ @ApiModelProperty(value = "出生年月")
+ private String birthday;
+
+ @ApiModelProperty(value = "人员类别（1.80-89周岁 2.90-99周岁 3.100周岁（含）以上）")
+ private Integer level;
+
+ @ApiModelProperty(value = "户籍地")
+ private String domicile;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "是否健在（1.是 2.否）")
+ private Integer isExist;
+
+ @ApiModelProperty(value = "是否办理高龄津贴（1.是 2.否）")
+ private Integer isBigAge;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "创建用户")
+ private Long createBy;
+
+ @ApiModelProperty(value = "修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty(value = "修改用户")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthHistoryRecordDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthHistoryRecordDetailsVO.java
new file mode 100644
index 0000000..de6688d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthHistoryRecordDetailsVO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-10
+ */
+@Data
+@ApiModel("高龄老人认证记录详细返回参数")
+public class ComEldersAuthHistoryRecordDetailsVO {
+
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "老人用户id")
+ private Long userId;
+
+ @ApiModelProperty(value = "名称")
+ private String name;
+
+ @ApiModelProperty(value = "身份证号码")
+ private String idCard;
+
+ @ApiModelProperty(value = "出生年月")
+ private String brithday;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "户籍地")
+ private String domicile;
+
+ @ApiModelProperty(value = "本月是否已认证（1.是 2.否）")
+ private Integer isAuth;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthHistoryRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthHistoryRecordVO.java
new file mode 100644
index 0000000..e870e36
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthHistoryRecordVO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-10
+ */
+@Data
+@ApiModel("高龄老人认证记录返回参数")
+public class ComEldersAuthHistoryRecordVO {
+
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "老人用户id")
+ private Long userId;
+
+ @ApiModelProperty(value = "名称")
+ private String name;
+
+ @ApiModelProperty(value = "身份证号码")
+ private String idCard;
+
+ @ApiModelProperty(value = "出生年月")
+ private String brithday;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "户籍地")
+ private String domicile;
+
+ @ApiModelProperty(value = "本月是否已认证（1.是 2.否）")
+ private Integer isAuth;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthHistoryVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthHistoryVO.java
new file mode 100644
index 0000000..7ed910f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthHistoryVO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-09
+ */
+@Data
+@ApiModel("高龄老人报表记录返回参数")
+public class ComEldersAuthHistoryVO {
+
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "年份")
+ private Integer year;
+
+ @ApiModelProperty(value = "月份")
+ private Integer month;
+
+ @ApiModelProperty(value = "高龄老人总人数")
+ private Integer sum;
+
+ @ApiModelProperty(value = "已认证人数")
+ private Integer authSum;
+
+ @ApiModelProperty(value = "未认证人数")
+ private Integer noAuthSum;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthRecordForCommunityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthRecordForCommunityVO.java
new file mode 100644
index 0000000..9c62f6e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthRecordForCommunityVO.java
@@ -0,0 +1,79 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import com.panzhihua.common.model.helper.sensitive.Sensitive;
+import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-09
+ */
+@Data
+@ApiModel("高龄认证记录返回参数")
+@EncryptDecryptClass
+public class ComEldersAuthRecordForCommunityVO {
+
+ @ApiModelProperty(value = "ID")
+ private Long id;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "认证时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "更新人")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty(value = "身份证")
+ @EncryptDecryptField
+ private String idCard;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "认证人姓名")
+ private String authUserName;
+
+ @ApiModelProperty(value = "视频地址")
+ private String videoUrl;
+
+ @ApiModelProperty(value = "申请人")
+ private Long sumitUserId;
+
+ @ApiModelProperty(value = "户籍地")
+ private String domicile;
+
+ @ApiModelProperty(value = "状态")
+ private String status;
+
+ @ApiModelProperty(value = "出生日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date birthDay;
+
+ @ApiModelProperty(value = "申请人姓名")
+ private String sumitUserName;
+
+ @ApiModelProperty(value = "认证方式（1.视频认证 2.人脸核验）")
+ private Integer type;
+
+ @ApiModelProperty(value = "申请人账号")
+ private String sumitUserAccount;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthRecordVO.java
new file mode 100644
index 0000000..619d388
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthRecordVO.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-09
+ */
+@Data
+@ApiModel("高龄认证记录返回参数")
+public class ComEldersAuthRecordVO {
+
+ @ApiModelProperty(value = "id")
+ private Long id;
+
+ @ApiModelProperty(value = "年份")
+ private String yearMonth;
+
+ @ApiModelProperty(value = "核验类型（1.视频认证 2.人脸核验）")
+ private Integer type;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "有反馈")
+ private Boolean hasFeed;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthStatisticsDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthStatisticsDetailsVO.java
new file mode 100644
index 0000000..53f55d7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthStatisticsDetailsVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-10
+ */
+@Data
+@ApiModel("老人认证月统计详细返回参数")
+public class ComEldersAuthStatisticsDetailsVO {
+
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "年份")
+ private Integer year;
+
+ @ApiModelProperty(value = "月份")
+ private Integer month;
+
+ @ApiModelProperty(value = "总人数")
+ private Integer sum;
+
+ @ApiModelProperty(value = "认证人数")
+ private Integer authSum;
+
+ @ApiModelProperty(value = "未认证人数")
+ private Integer noAuthSum;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthStatisticsVO.java
new file mode 100644
index 0000000..810987d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthStatisticsVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-10
+ */
+@Data
+@ApiModel("老人认证月统计返回参数")
+public class ComEldersAuthStatisticsVO {
+
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "年份")
+ private Integer year;
+
+ @ApiModelProperty(value = "月份")
+ private Integer month;
+
+ @ApiModelProperty(value = "总人数")
+ private Integer sum;
+
+ @ApiModelProperty(value = "认证人数")
+ private Integer authSum;
+
+ @ApiModelProperty(value = "未认证人数")
+ private Integer noAuthSum;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthUserVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthUserVO.java
new file mode 100644
index 0000000..5c3a842
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthUserVO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-09
+ */
+@Data
+@ApiModel("用户绑定老人关系返回参数")
+public class ComEldersAuthUserVO {
+
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+ @ApiModelProperty(value = "与本人关系(1.父母 2.配偶 3.子女 4.兄弟姐妹 5.祖/外祖父母 6.本人 7.其他)")
+ private Integer relation;
+
+ @ApiModelProperty(value = "是否已认证（1.是 2.否）")
+ private Integer isAuth;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "身份证号码")
+ private String idCard;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "高龄老人库id")
+ private Long bigAgeId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComExServicemanVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComExServicemanVO.java
new file mode 100644
index 0000000..e5835a4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComExServicemanVO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 退役军人Vo
+ */
+@Data
+@ApiModel("退役军人")
+public class ComExServicemanVO {
+
+ /**
+ * 退役军人id
+ */
+ @ApiModelProperty("退役军人id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComKeyPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComKeyPopulationVO.java
new file mode 100644
index 0000000..abb95bf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComKeyPopulationVO.java
@@ -0,0 +1,101 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther txb
+ * @create 2021-08-09 17:41:05
+ * @describe 实体类
+ */
+
+@Data
+@ApiModel("重点上访人员表")
+@EncryptDecryptClass
+public class ComKeyPopulationVO {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("重点上访人员id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 人口id
+ */
+ @ApiModelProperty("人口id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long populationId;
+
+ /**
+ * 街道id
+ */
+ @ApiModelProperty("街道id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long streetId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ /**
+ * 名字
+ */
+ @ApiModelProperty("名字")
+ private String name;
+
+ /**
+ * 身份证号码
+ */
+ @ApiModelProperty("身份证号码")
+ @EncryptDecryptField
+ private String cardNo;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty("备注")
+ private String remark;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ /**
+ * 创建用户
+ */
+ @ApiModelProperty("创建用户")
+ private Long createBy;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ private Date updateAt;
+
+ /**
+ * 修改用户
+ */
+ @ApiModelProperty("修改用户")
+ private Long updateBy;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComLowSecurityPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComLowSecurityPopulationVO.java
new file mode 100644
index 0000000..52af852
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComLowSecurityPopulationVO.java
@@ -0,0 +1,285 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther txb
+ * @create 2021-08-09 19:48:38
+ * @describe 实有人口导入》低保户人员表实体类
+ */
+
+@Data
+@ApiModel("低保户人员表")
+@EncryptDecryptClass
+public class ComLowSecurityPopulationVO {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("低保户人员id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 人口id
+ */
+ @ApiModelProperty("人口id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long populationId;
+
+ /**
+ * 街道id
+ */
+ @ApiModelProperty("街道id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long streetId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ /**
+ * 名字
+ */
+ @ApiModelProperty("名字")
+ private String name;
+
+ /**
+ * 身份证号码
+ */
+ @ApiModelProperty("身份证号码")
+ @EncryptDecryptField
+ private String cardNo;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ /**
+ * 地区
+ */
+ @ApiModelProperty("地区")
+ private String region;
+
+ /**
+ * 家庭编码
+ */
+ @ApiModelProperty("家庭编码")
+ private String familyCode;
+
+ /**
+ * 组名称
+ */
+ @ApiModelProperty("组名称")
+ private String groupName;
+
+ /**
+ * 分类救助类别
+ */
+ @ApiModelProperty("分类救助类别")
+ private String classifiedRescueCategory;
+
+ /**
+ * 申请日期
+ */
+ @ApiModelProperty("申请日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date applyDate;
+
+ /**
+ * 户主姓名
+ */
+ @ApiModelProperty("户主姓名")
+ private String houseHolderName;
+
+ /**
+ * 户主身份证
+ */
+ @ApiModelProperty("户主身份证")
+ private String houseHolderCardNo;
+
+ /**
+ * 户主编码
+ */
+ @ApiModelProperty("户主编码")
+ private String houseHolderCode;
+
+ /**
+ * 居住地邮编
+ */
+ @ApiModelProperty("居住地邮编")
+ private String residencePostalCode;
+
+ /**
+ * 救助证号
+ */
+ @ApiModelProperty("救助证号")
+ private String salvageCertificateNo;
+
+ /**
+ * 保障人口数
+ */
+ @ApiModelProperty("保障人口数")
+ private Integer guaranteedPopulationNumber;
+
+ /**
+ * 家庭人口数
+ */
+ @ApiModelProperty("家庭人口数")
+ private Integer familyPopulationNumber;
+
+ /**
+ * 开户人
+ */
+ @ApiModelProperty("开户人")
+ private String accountPerson;
+
+ /**
+ * 开户银行
+ */
+ @ApiModelProperty("开户银行")
+ private String accountBank;
+
+ /**
+ * 开户人身份证号
+ */
+ @ApiModelProperty("开户人身份证号")
+ private String accountCardNo;
+
+ /**
+ * 银行账号
+ */
+ @ApiModelProperty("银行账号")
+ private String bankAccount;
+
+ /**
+ * 供养机构
+ */
+ @ApiModelProperty("供养机构")
+ private String supportInstitutions;
+
+ /**
+ * 资金发放方式
+ */
+ @ApiModelProperty("资金发放方式")
+ private String distributionMethod;
+
+ /**
+ * 保障金额
+ */
+ @ApiModelProperty("保障金额")
+ private BigDecimal guaranteedAmount;
+
+ /**
+ * 调剂金额
+ */
+ @ApiModelProperty("调剂金额")
+ private BigDecimal reallocationAmount;
+
+ /**
+ * 差额救助金额
+ */
+ @ApiModelProperty("差额救助金额")
+ private BigDecimal differenceReliefAmount;
+
+ /**
+ * 分类施保金额
+ */
+ @ApiModelProperty("分类施保金额")
+ private BigDecimal classifiedInsuredAmount;
+
+ /**
+ * 家庭月总收入
+ */
+ @ApiModelProperty("家庭月总收入")
+ private BigDecimal totalMonthlyFamilyIncome;
+
+ /**
+ * 家庭月均收入
+ */
+ @ApiModelProperty("家庭月均收入")
+ private BigDecimal averageMonthlyFamilyIncome;
+
+ /**
+ * 家庭月支出
+ */
+ @ApiModelProperty("家庭月支出")
+ private BigDecimal totalMonthlyFamilyExpenditure;
+
+ /**
+ * 经度
+ */
+ @ApiModelProperty("经度")
+ private String lng;
+
+ /**
+ * 纬度
+ */
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ /**
+ * 始发年月
+ */
+ @ApiModelProperty("始发年月")
+ private Date originateDate;
+
+ /**
+ * 护理费
+ */
+ @ApiModelProperty("护理费")
+ private BigDecimal nursingFee;
+
+ /**
+ * 申请理由
+ */
+ @ApiModelProperty("申请理由")
+ private String applyReason;
+
+ /**
+ * 审核意见
+ */
+ @ApiModelProperty("审核意见")
+ private String reviewComment;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ /**
+ * 创建用户
+ */
+ @ApiModelProperty("创建用户")
+ private Long createBy;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ private Date updateAt;
+
+ /**
+ * 修改用户
+ */
+ @ApiModelProperty("修改用户")
+ private Long updateBy;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMajorPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMajorPopulationVO.java
new file mode 100644
index 0000000..ae9ef8e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMajorPopulationVO.java
@@ -0,0 +1,173 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther txb
+ * @create 2021-08-10 15:57:54
+ * @describe 重精人员表实体类
+ */
+
+@Data
+@ApiModel("重精人员表")
+@EncryptDecryptClass
+public class ComMajorPopulationVO {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("重精人员id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 人口id
+ */
+ @ApiModelProperty("人口id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long populationId;
+
+ /**
+ * 街道id
+ */
+ @ApiModelProperty("街道id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long streetId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ /**
+ * 名字
+ */
+ @ApiModelProperty("名字")
+ private String name;
+
+ /**
+ * 身份证号码
+ */
+ @ApiModelProperty("身份证号码")
+ @EncryptDecryptField
+ private String cardNo;
+
+ /**
+ * 经济状况
+ */
+ @ApiModelProperty("经济状况")
+ private String economicCondition;
+
+ /**
+ * 人员类型
+ */
+ @ApiModelProperty("人员类型")
+ private String personType;
+
+ /**
+ * 家庭情况
+ */
+ @ApiModelProperty("家庭情况")
+ private String familySituation;
+
+ /**
+ * 监护人姓名
+ */
+ @ApiModelProperty("监护人姓名")
+ private String custodyPerson;
+
+ /**
+ * 与监护人关系
+ */
+ @ApiModelProperty("与监护人关系")
+ private String custodyRelation;
+
+ /**
+ * 监护人公民身份号码
+ */
+ @ApiModelProperty("监护人公民身份号码")
+ private String custodyCardNo;
+
+ /**
+ * 监护人联系方式
+ */
+ @ApiModelProperty("监护人联系方式")
+ private String custodyPersonPhone;
+
+ /**
+ * 监护人居住详址
+ */
+ @ApiModelProperty("监护人居住详址")
+ private String custodyAddress;
+
+ /**
+ * 帮扶人姓名
+ */
+ @ApiModelProperty("帮扶人姓名")
+ private String helpPerson;
+
+ /**
+ * 帮扶人联系方式
+ */
+ @ApiModelProperty("帮扶人联系方式")
+ private String helpPersonPhone;
+
+ /**
+ * 帮扶手段
+ */
+ @ApiModelProperty("帮扶手段")
+ private String helpMethod;
+
+ /**
+ * 帮扶情况
+ */
+ @ApiModelProperty("帮扶情况")
+ private String helpSituation;
+
+ /**
+ * 是否违法犯罪（1.是 0.否）
+ */
+ @ApiModelProperty("是否违法犯罪（1.是 0.否）")
+ private Integer isCrime;
+
+ /**
+ * 违法犯罪情况
+ */
+ @ApiModelProperty("违法犯罪情况")
+ private String crimeSutiation;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ /**
+ * 创建用户
+ */
+ @ApiModelProperty("创建用户")
+ private Long createBy;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ private Date updateAt;
+
+ /**
+ * 修改用户
+ */
+ @ApiModelProperty("修改用户")
+ private Long updateBy;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngAreaVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngAreaVO.java
new file mode 100644
index 0000000..48f9968
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngAreaVO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.List;
+
+import com.google.common.collect.Lists;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("区域tree信息")
+public class ComMngAreaVO {
+ /** 城市行政区划代码 */
+ @ApiModelProperty("城市行政区划代码")
+ private Integer code;
+
+ /** 城市行政区划代码 */
+ @ApiModelProperty("街道id")
+ private String streetId;
+
+ /** 城市名称 */
+ @ApiModelProperty("城市名称")
+ private String Name;
+
+ @ApiModelProperty("子级区域")
+ private List<ComMngAreaVO> Children = Lists.newArrayList();
+
+ public ComMngAreaVO(Integer code, String name) {
+ this.code = code;
+ Name = name;
+ }
+
+ public ComMngAreaVO(Integer code, String name,String streetId) {
+ this.code = code;
+ Name = name;
+ this.streetId = streetId;
+ }
+
+ public ComMngAreaVO() {}
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngBuildingExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngBuildingExcelVO.java
new file mode 100644
index 0000000..00dfe6d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngBuildingExcelVO.java
@@ -0,0 +1,65 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/10 12:43
+ */
+@Data
+public class ComMngBuildingExcelVO implements Serializable {
+
+ private static final long serialVersionUID = 1719392023800643085L;
+
+ private Long id;
+// @ExcelProperty(value = "楼房属性", index = 0)
+// private String useType;
+// @ExcelProperty(value = "建筑类型", index = 1)
+// private String buildType;
+
+ @ExcelProperty(value = "街路巷", index = 0)
+ private String alley;
+
+ @ExcelProperty(value = "小区名称", index = 1)
+ private String villageName;
+
+ @ExcelProperty(value = "街路巷号", index = 2)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼栋号", index = 3)
+ private String name;
+
+// @ExcelProperty(value = "单元数", index = 6)
+// private Integer unitTotal;
+//
+// @ExcelProperty(value = "楼层数", index = 7)
+// private Integer buildFloorSum;
+//
+// @ExcelProperty(value = "每层户数", index = 8)
+// private Integer everyFloorSum;
+//
+// @ExcelProperty(value = "总户数", index = 9)
+// private Integer buildUserSum;
+//
+// @ExcelProperty(value = "电梯", index = 10)
+// private Integer elevatorTotal;
+//
+// @ExcelProperty(value = "物业公司名称", index = 11)
+// private String propertyCompanyName;
+//
+// @ExcelProperty(value = "建筑年代", index = 12)
+// private Date buildDate;
+//
+// @ExcelProperty(value = "备注", index = 13)
+// private String remark;
+//
+// @ExcelProperty(value = "网格划分", index = 14)
+// private String gridId;
+
+ private String gridName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarExcelVO.java
new file mode 100644
index 0000000..332327a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarExcelVO.java
@@ -0,0 +1,61 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入车辆管理
+ * @author: Null
+ * @date: 2021/3/11 17:11
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngCarExcelVO implements Serializable {
+ /**
+ * 小区名称
+ */
+ @ExcelProperty(value = "小区名称", index = 0)
+ private String areaName;
+ /**
+ * 车主姓名
+ */
+ @ExcelProperty(value = "车主姓名", index = 1)
+ private String userName;
+
+ /**
+ * 车主身份证号码
+ */
+ @EncryptDecryptField
+ @ExcelProperty(value = "车主身份证号码", index = 2)
+ private String cardNo;
+
+ /**
+ * 品牌型号
+ */
+ @ExcelProperty(value = "品牌型号", index = 5)
+ private String brand;
+
+ /**
+ * 车牌号
+ */
+ @ExcelProperty(value = "车牌号", index = 4)
+ private String plateNum;
+
+ /**
+ * 车身颜色
+ */
+ @ExcelProperty(value = "颜色", index = 6)
+ private String color;
+
+ /**
+ * 联系方式
+ */
+ @ExcelProperty(value = "联系方式", index = 3)
+ private String mobile;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarVO.java
new file mode 100644
index 0000000..a7277a1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarVO.java
@@ -0,0 +1,75 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 车辆管理
+ * @author: Null
+ * @date: 2021/3/16 14:28
+ */
+@Data
+@ApiModel("车辆管理")
+@EncryptDecryptClass
+public class ComMngCarVO implements Serializable {
+
+ @ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("社区ID")
+ private Long communityId;
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
+
+ @ApiModelProperty("小区名称")
+ private String areaName;
+
+ @ApiModelProperty("小区ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long areaId;
+
+ @ApiModelProperty("详细住址")
+ private String address;
+
+ @ApiModelProperty("车主姓名")
+ private String userName;
+
+ @ApiModelProperty("车主身份证号码")
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ApiModelProperty("车主用户ID")
+ private Long userId;
+
+ @ApiModelProperty("车主手机号码")
+ private String mobile;
+
+ @ApiModelProperty("车牌号")
+ private String plateNum;
+
+ @ApiModelProperty("车辆品牌型号")
+ private String brand;
+
+ @ApiModelProperty("车身颜色")
+ private String color;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("创建人")
+ private String createBy;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCascadeHouseVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCascadeHouseVO.java
new file mode 100644
index 0000000..5a23b42
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCascadeHouseVO.java
@@ -0,0 +1,56 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("级联菜单返回参数")
+public class ComMngCascadeHouseVO {
+
+ /**
+ * 房屋id
+ */
+ @ApiModelProperty("房屋id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long houseId;
+
+ /**
+ * 街路巷
+ */
+ @ApiModelProperty("街路巷")
+ private String alley;
+
+ /**
+ * 门牌号
+ */
+ @ApiModelProperty("门牌号")
+ private String houseNum;
+
+ /**
+ * 楼排号
+ */
+ @ApiModelProperty("楼排号")
+ private String floor;
+
+ /**
+ * 单元号
+ */
+ @ApiModelProperty("单元号")
+ private String unitNo;
+
+ /**
+ * 户室（房间号）
+ */
+ @ApiModelProperty("户室（房间号）")
+ private String houseNo;
+
+ /**
+ * 公共显示字段
+ */
+ @ApiModelProperty("公共显示字段")
+ private String name;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCityVO.java
new file mode 100644
index 0000000..731f3d6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCityVO.java
@@ -0,0 +1,18 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("城市")
+public class ComMngCityVO {
+
+ /** 城市名称 */
+ @ApiModelProperty("城市名称")
+ private String cityName;
+
+ /** 城市行政区划代码 */
+ @ApiModelProperty("城市行政区划代码")
+ private Integer cityAdcode;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngDistrictVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngDistrictVO.java
new file mode 100644
index 0000000..7298410
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngDistrictVO.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("区县")
+public class ComMngDistrictVO {
+
+ @ApiModelProperty("区县名称")
+ private String districtName;
+
+ @ApiModelProperty("区县行政区划代码")
+ private Integer districtAdcode;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCarVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCarVO.java
new file mode 100644
index 0000000..be606ff
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCarVO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 实有人口详情车辆信息
+ * @author: lyq
+ * @date: 2021/5/19 12:28
+ */
+@Data
+@ApiModel("实有人口详情车辆信息")
+public class ComMngPopulationCarVO implements Serializable {
+
+ @ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("车牌号")
+ private String plateNum;
+
+ @ApiModelProperty("车辆品牌型号")
+ private String brand;
+
+ @ApiModelProperty("车身颜色")
+ private String color;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCommunityTagsVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCommunityTagsVo.java
new file mode 100644
index 0000000..94e602e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCommunityTagsVo.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 基础数据》人口社区特殊群体关系表
+ * @author lyq
+ */
+@Data
+@ApiModel
+public class ComMngPopulationCommunityTagsVo {
+ /**
+ * 实有人口id
+ */
+ @ApiModelProperty("实有人口id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long populationId;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ private Long communityId;
+ /**
+ * 社区标签
+ */
+ @ApiModelProperty("社区标签")
+ private String label;
+ /**
+ * 社区标签
+ */
+ @ApiModelProperty("社区名字")
+ private String communityName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java
new file mode 100644
index 0000000..ec99012
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java
@@ -0,0 +1,195 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入社区矫正人员
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationCorrectExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 3)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "联系电话", index = 4)
+ private String phone;
+
+ @ExcelProperty(value = "是否租住", index = 10)
+ private Integer isRent;
+
+ @ExcelProperty(value = "街/路/巷", index = 5)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 6)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 7)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 8)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 9)
+ private String houseNo;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 11)
+ private Integer houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 12)
+ private Integer housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 13)
+ private Integer controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 14)
+ private Integer outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 15)
+ private String censusRegister;
+
+ @ExcelProperty(value = "学历", index = 16)
+ private String cultureLevel;
+
+ @ExcelProperty(value = "社区矫正人员编号", index = 17)
+ private String correctPersonCode;
+
+ @ExcelProperty(value = "原羁押场所", index = 18)
+ private String originalCustodyplace;
+
+ @ExcelProperty(value = "矫正类别", index = 19)
+ private String correctType;
+
+ @ExcelProperty(value = "案件类别", index = 20)
+ private String caseType;
+
+ @ExcelProperty(value = "具体罪名", index = 21)
+ private String specificCharge;
+
+ @ExcelProperty(value = "原判刑期", index = 22)
+ private String originalTerm;
+
+ @ExcelProperty(value = "原判刑开始日期", index = 23)
+ private Date originalTermBegin;
+
+ @ExcelProperty(value = "原判刑结束日期", index = 24)
+ private Date originalTermEnd;
+
+ @ExcelProperty(value = "矫正开始时间", index = 25)
+ private Date correctBegin;
+
+ @ExcelProperty(value = "矫正结束时间", index = 26)
+ private Date correctEnd;
+
+ @ExcelProperty(value = "接收方式", index = 27)
+ private String receiveMethod;
+
+ @ExcelProperty(value = "是否累惯犯（1.是 0.否）", index = 28)
+ private Integer isRecidivist;
+
+ @ExcelProperty(value = "四史情况", index = 29)
+ private String fourHistory;
+
+ @ExcelProperty(value = "三涉情况", index = 30)
+ private String threeInvovle;
+
+ @ExcelProperty(value = "是否建立矫正小组（1.是 0.否）", index = 31)
+ private Integer isCorrectGroup;
+
+ @ExcelProperty(value = "矫正小组人员组成情况", index = 32)
+ private String correctGroupConstitute;
+
+ @ExcelProperty(value = "矫正解除（终止）类型", index = 33)
+ private String correctRelieveType;
+
+ @ExcelProperty(value = "是否有脱管（1.是 0.否）", index = 34)
+ private Integer isOutControl;
+
+ @ExcelProperty(value = "脱管原因", index = 35)
+ private String outControlReason;
+
+ @ExcelProperty(value = "脱管纠正情况", index = 36)
+ private String outControlCorrect;
+
+ @ExcelProperty(value = "检察监督脱管情况", index = 37)
+ private String inspectOutControl;
+
+ @ExcelProperty(value = "是否有漏管（1.是 0.否）", index = 38)
+ private Integer isMissControl;
+
+ @ExcelProperty(value = "漏管原因", index = 39)
+ private String missControlReason;
+
+ @ExcelProperty(value = "漏管纠正情况", index = 40)
+ private String missControlCorrect;
+
+ @ExcelProperty(value = "检察监督漏管", index = 41)
+ private String inspectMissControl;
+
+ @ExcelProperty(value = "奖惩情况", index = 42)
+ private String rewardAndPunishiment;
+
+ @ExcelProperty(value = "是否重新犯罪（1.是 0.否）", index = 43)
+ private Integer isAgainCrime;
+
+ @ExcelProperty(value = "重新犯罪名称", index = 44)
+ private String againCrimeName;
+
+ @ExcelProperty(value = "刑罚变更执行情况", index = 45)
+ private String pubishmentChange;
+
+ @ExcelProperty(value = "备注", index = 46)
+ private String remark;
+
+ /**
+ * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
+ */
+ private String distinctPass;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 性别（1.男 2.女）
+ */
+ private Integer sex;
+
+ /**
+ * 出生年月日
+ */
+ private String birthday;
+
+ /**
+ * 扩展字段用逗号隔开
+ */
+ private List<String> userTagStr = Lists.newArrayList();
+
+ private Long houseId;
+
+ /**
+ * 地址
+ */
+ private String address;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectMistakeExcelVO.java
new file mode 100644
index 0000000..85652f5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectMistakeExcelVO.java
@@ -0,0 +1,163 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入社区矫正人员
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationCorrectMistakeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 3)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "联系电话", index = 4)
+ private String phone;
+
+ @ExcelProperty(value = "是否租住", index = 10)
+ private String isRent;
+
+ @ExcelProperty(value = "街/路/巷", index = 5)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 6)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 7)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 8)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 9)
+ private String houseNo;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 11)
+ private String houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 12)
+ private String housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 13)
+ private String controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 14)
+ private String outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 15)
+ private String censusRegister;
+
+ @ExcelProperty(value = "学历", index = 16)
+ private String cultureLevel;
+
+ @ExcelProperty(value = "社区矫正人员编号", index = 17)
+ private String correctPersonCode;
+
+ @ExcelProperty(value = "原羁押场所", index = 18)
+ private String originalCustodyplace;
+
+ @ExcelProperty(value = "矫正类别", index = 19)
+ private String correctType;
+
+ @ExcelProperty(value = "案件类别", index = 20)
+ private String caseType;
+
+ @ExcelProperty(value = "具体罪名", index = 21)
+ private String specificCharge;
+
+ @ExcelProperty(value = "原判刑期", index = 22)
+ private String originalTerm;
+
+ @ExcelProperty(value = "原判刑开始日期", index = 23)
+ private String originalTermBegin;
+
+ @ExcelProperty(value = "原判刑结束日期", index = 24)
+ private String originalTermEnd;
+
+ @ExcelProperty(value = "矫正开始时间", index = 25)
+ private String correctBegin;
+
+ @ExcelProperty(value = "矫正结束时间", index = 26)
+ private String correctEnd;
+
+ @ExcelProperty(value = "接收方式", index = 27)
+ private String receiveMethod;
+
+ @ExcelProperty(value = "是否累惯犯（1.是 0.否）", index = 28)
+ private String isRecidivist;
+
+ @ExcelProperty(value = "四史情况", index = 29)
+ private String fourHistory;
+
+ @ExcelProperty(value = "三涉情况", index = 30)
+ private String threeInvovle;
+
+ @ExcelProperty(value = "是否建立矫正小组（1.是 0.否）", index = 31)
+ private String isCorrectGroup;
+
+ @ExcelProperty(value = "矫正小组人员组成情况", index = 32)
+ private String correctGroupConstitute;
+
+ @ExcelProperty(value = "矫正解除（终止）类型", index = 33)
+ private String correctRelieveType;
+
+ @ExcelProperty(value = "是否有脱管（1.是 0.否）", index = 34)
+ private String isOutControl;
+
+ @ExcelProperty(value = "脱管原因", index = 35)
+ private String outControlReason;
+
+ @ExcelProperty(value = "脱管纠正情况", index = 36)
+ private String outControlCorrect;
+
+ @ExcelProperty(value = "检察监督脱管情况", index = 37)
+ private String inspectOutControl;
+
+ @ExcelProperty(value = "是否有漏管（1.是 0.否）", index = 38)
+ private String isMissControl;
+
+ @ExcelProperty(value = "漏管原因", index = 39)
+ private String missControlReason;
+
+ @ExcelProperty(value = "漏管纠正情况", index = 40)
+ private String missControlCorrect;
+
+ @ExcelProperty(value = "检察监督漏管", index = 41)
+ private String inspectMissControl;
+
+ @ExcelProperty(value = "奖惩情况", index = 42)
+ private String rewardAndPunishiment;
+
+ @ExcelProperty(value = "是否重新犯罪（1.是 0.否）", index = 43)
+ private String isAgainCrime;
+
+ @ExcelProperty(value = "重新犯罪名称", index = 44)
+ private String againCrimeName;
+
+ @ExcelProperty(value = "刑罚变更执行情况", index = 45)
+ private String pubishmentChange;
+
+ @ExcelProperty(value = "备注", index = 46)
+ private String remark;
+
+ @ExcelProperty(value = "错误信息", index = 47)
+ private String mistake;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultExcelVO.java
new file mode 100644
index 0000000..cb05ad5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultExcelVO.java
@@ -0,0 +1,126 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入邪教人员
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationCultExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 2)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "民族", index = 3)
+ private String nation;
+
+ @ExcelProperty(value = "职业", index = 4)
+ private String profession;
+
+ @ExcelProperty(value = "婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)", index = 5)
+ private Integer marriage;
+
+ @ExcelProperty(value = "文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)", index = 6)
+ private Integer cultureLevel;
+
+ @ExcelProperty(value = "政治面貌", index = 7)
+ private Integer politicalOutlook;
+
+ @ExcelProperty(value = "街/路/巷", index = 8)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 9)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 10)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 11)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 12)
+ private String houseNo;
+
+ @ExcelProperty(value = "是否租住", index = 13)
+ private Integer isRent;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 14)
+ private Integer houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 15)
+ private Integer housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 16)
+ private Integer controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 17)
+ private Integer outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 18)
+ private String censusRegister;
+
+ @ExcelProperty(value = "邪教名称（涉邪组织）", index = 19)
+ private String cultName;
+
+ @ExcelProperty(value = "基本情况（参加邪教的活动情况）", index = 20)
+ private String basicSituation;
+
+ @ExcelProperty(value = "参加邪教时间", index = 21)
+ private Date joinCultDate;
+
+ @ExcelProperty(value = "是否对外宣传（1.是 0.否）", index = 22)
+ private Integer isExternalPublicity;
+
+ @ExcelProperty(value = "备注", index = 23)
+ private String remark;
+
+ /**
+ * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
+ */
+ private String distinctPass;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 性别（1.男 2.女）
+ */
+ private Integer sex;
+
+ /**
+ * 出生年月日
+ */
+ private String birthday;
+
+ /**
+ * 扩展字段用逗号隔开
+ */
+ private List<String> userTagStr = Lists.newArrayList();
+
+ private Long houseId;
+
+ /**
+ * 出生年月日
+ */
+ private String address;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultMistakeExcelVO.java
new file mode 100644
index 0000000..a045200
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCultMistakeExcelVO.java
@@ -0,0 +1,94 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入邪教人员
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationCultMistakeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 2)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "民族", index = 3)
+ private String nation;
+
+ @ExcelProperty(value = "职业", index = 4)
+ private String profession;
+
+ @ExcelProperty(value = "婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)", index = 5)
+ private String marriage;
+
+ @ExcelProperty(value = "文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)", index = 6)
+ private String cultureLevel;
+
+ @ExcelProperty(value = "政治面貌", index = 7)
+ private String politicalOutlook;
+
+ @ExcelProperty(value = "街/路/巷", index = 8)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 9)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 10)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 11)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 12)
+ private String houseNo;
+
+ @ExcelProperty(value = "是否租住", index = 13)
+ private String isRent;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 14)
+ private String houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 15)
+ private String housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 16)
+ private String controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 17)
+ private String outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 18)
+ private String censusRegister;
+
+ @ExcelProperty(value = "邪教名称（涉邪组织）", index = 19)
+ private String cultName;
+
+ @ExcelProperty(value = "基本情况（参加邪教的活动情况）", index = 20)
+ private String basicSituation;
+
+ @ExcelProperty(value = "参加邪教时间）", index = 21)
+ private String joinCultDate;
+
+ @ExcelProperty(value = "是否对外宣传（1.是 0.否）", index = 22)
+ private String isExternalPublicity;
+
+ @ExcelProperty(value = "备注", index = 23)
+ private String remark;
+
+ @ExcelProperty(value = "错误信息", index = 24)
+ private String mistake;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDetailVO.java
new file mode 100644
index 0000000..651f6f1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDetailVO.java
@@ -0,0 +1,187 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import com.panzhihua.common.model.helper.sensitive.Sensitive;
+import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
+import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
+import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
+import com.panzhihua.common.model.vos.user.ComMngHouseVo;
+import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
+import com.panzhihua.common.validated.AddGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class ComMngPopulationDetailVO {
+ /**
+ * 自增 id
+ */
+ @ApiModelProperty("实有人口id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ /**
+ * 街道id
+ */
+ @ApiModelProperty("街道id")
+ private Integer streetId;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ private Integer actId;
+ /**
+ * 小区id（实有房屋id）
+ */
+ @ApiModelProperty("小区id（实有房屋id）")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private long villageId;
+ /**
+ * 家庭成员（姓名）
+ */
+ @ApiModelProperty("家庭成员（姓名）")
+ @NotBlank(groups = {AddGroup.class}, message = "家庭成员（姓名）不可为空")
+ private String name;
+
+ @ApiModelProperty("性别（1.男 2.女 3.未知）")
+ @NotBlank(groups = {AddGroup.class}, message = "性别不可为空")
+ private Integer sex;
+
+ @ApiModelProperty("年龄")
+ @NotBlank(groups = {AddGroup.class}, message = "年龄不可为空")
+ private Integer age;
+
+ @ApiModelProperty("身份证号码")
+ @NotBlank(groups = {AddGroup.class}, message = "身份证号码不可为空")
+ private String cardNo;
+
+ @ApiModelProperty("出生年月")
+ private String birthday;
+
+ @ApiModelProperty("街路巷")
+ @NotBlank(groups = {AddGroup.class}, message = "街路巷不可为空")
+ private String road;
+
+ @ApiModelProperty("门牌号")
+ @NotBlank(groups = {AddGroup.class}, message = "门牌号不可为空")
+ private String doorNo;
+
+ @ApiModelProperty("楼排号")
+ @NotBlank(groups = {AddGroup.class}, message = "楼排号不可为空")
+ private String floor;
+
+ @ApiModelProperty("单元号")
+ @NotBlank(groups = {AddGroup.class}, message = "单元号不可为空")
+ private String unitNo;
+
+ @ApiModelProperty("户室（房间号）")
+ private String houseNo;
+
+ @ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
+ private Integer politicalOutlook;
+
+ @ApiModelProperty("政治面貌名称")
+ private String politicalOutlookName;
+
+ @ApiModelProperty("工作单位")
+ private String workCompany;
+
+ @ApiModelProperty("特殊情况")
+ private String specialSituation;
+
+ @ApiModelProperty("联系方式")
+ private String phone;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("标签集合（多个标签以,隔开,如物业工作人员,物业")
+ private String label;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty("籍贯")
+ private String nativePlace;
+
+ @ApiModelProperty("民族")
+ private String nationCode;
+
+ @ApiModelProperty("民族")
+ private String nation;
+
+ @ApiModelProperty("小区名字")
+ private String alley;
+
+ @ApiModelProperty("户主关系列表")
+ private List<ComHouseMemberVo> comMngFamilyInfoVOS;
+
+ @ApiModelProperty("家庭成员信息")
+ private List<ComMngFamilyInfoVO> familyInfoVOList;
+
+ @ApiModelProperty("用户电子档信息")
+ private UserElectronicFileVO userElectronicFileVO;
+
+ @ApiModelProperty("是否租住 是否租住(0.否 1.是)")
+ @NotBlank(groups = {AddGroup.class}, message = "是否租住不可为空")
+ private Integer isRent;
+
+ @ApiModelProperty("文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)")
+ private Integer cultureLevel;
+
+ @ApiModelProperty("文化程度名称")
+ private String cultureLevelName;
+
+ @ApiModelProperty("职业")
+ private String profession;
+
+ @ApiModelProperty("婚姻状况(10.未婚 20.已婚 21.初婚 22.再婚 23.复婚 30.丧偶 40.离婚 90.未说明的婚姻状况 60.其他)")
+ private Integer marriage;
+
+ @ApiModelProperty("婚姻状况名称")
+ private String marriageName;
+
+ @ApiModelProperty("健康状况")
+ private String healthy;
+
+ @ApiModelProperty("外地or本地（1.本地 2.外地）")
+ private Integer outOrLocal;
+
+ @ApiModelProperty("户口所在地")
+ private String censusRegister;
+
+ /**
+ * 居住地址
+ */
+ @ApiModelProperty("居住地址")
+ private String address;
+
+ @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
+ private Integer relation;
+
+ @ApiModelProperty("与户主关系名称")
+ private String relationName;
+
+ @ApiModelProperty("身份证无加密字段")
+ private String cardNoStr;
+
+ @ApiModelProperty("房屋列表")
+ private List<ComMngHouseVo> houseList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDisabilityExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDisabilityExcelVO.java
new file mode 100644
index 0000000..0dfba82
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDisabilityExcelVO.java
@@ -0,0 +1,115 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入残疾人
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationDisabilityExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 2)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "办证状况", index = 3)
+ private String certificateSituation;
+
+ @ExcelProperty(value = "文化程度", index = 4)
+ private Integer cultureLevel;
+
+ @ExcelProperty(value = "民族", index = 5)
+ private String nation;
+
+ @ExcelProperty(value = "残疾类别", index = 6)
+ private String disType;
+
+ @ExcelProperty(value = "残疾等级", index = 7)
+ private String disLevel;
+
+ @ExcelProperty(value = "联系电话", index = 8)
+ private String phone;
+
+ @ExcelProperty(value = "街/路/巷", index = 9)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 10)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 11)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 12)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 13)
+ private String houseNo;
+
+ @ExcelProperty(value = "是否租住", index = 14)
+ private Integer isRent;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 15)
+ private Integer houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 16)
+ private Integer housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 17)
+ private Integer controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 18)
+ private Integer outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 19)
+ private String censusRegister;
+
+ @ExcelProperty(value = "备注", index = 20)
+ private String remark;
+ /**
+ * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
+ */
+ private String distinctPass;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 性别（1.男 2.女）
+ */
+ private Integer sex;
+
+ /**
+ * 出生年月日
+ */
+ private String birthday;
+
+ /**
+ * 扩展字段用逗号隔开
+ */
+ private List<String> userTagStr = Lists.newArrayList();
+
+ private Long houseId;
+
+ /**
+ * 地址
+ */
+ private String address;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDisabilityMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDisabilityMistakeExcelVO.java
new file mode 100644
index 0000000..e155ded
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDisabilityMistakeExcelVO.java
@@ -0,0 +1,85 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入残疾人
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationDisabilityMistakeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 2)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "办证状况", index = 3)
+ private String certificateSituation;
+
+ @ExcelProperty(value = "文化程度", index = 4)
+ private String cultureLevel;
+
+ @ExcelProperty(value = "民族", index = 5)
+ private String nation;
+
+ @ExcelProperty(value = "残疾类别", index = 6)
+ private String disType;
+
+ @ExcelProperty(value = "残疾等级", index = 7)
+ private String disLevel;
+
+ @ExcelProperty(value = "联系电话", index = 8)
+ private String phone;
+
+ @ExcelProperty(value = "街/路/巷", index = 9)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 10)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 11)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 12)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 13)
+ private String houseNo;
+
+ @ExcelProperty(value = "是否租住", index = 14)
+ private String isRent;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 15)
+ private String houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 16)
+ private String housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 17)
+ private String controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 18)
+ private String outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 19)
+ private String censusRegister;
+
+ @ExcelProperty(value = "备注", index = 20)
+ private String remark;
+
+ @ExcelProperty(value = "错误信息", index = 21)
+ private String mistake;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugExcelVO.java
new file mode 100644
index 0000000..2f01147
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugExcelVO.java
@@ -0,0 +1,138 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入吸毒人员
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationDrugExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 3)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "联系电话", index = 4)
+ private String phone;
+
+ @ExcelProperty(value = "是否租住", index = 10)
+ private Integer isRent;
+
+ @ExcelProperty(value = "街/路/巷", index = 5)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 6)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 7)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 8)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 9)
+ private String houseNo;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 11)
+ private Integer houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 12)
+ private Integer housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 13)
+ private Integer controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 14)
+ private Integer outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 15)
+ private String censusRegister;
+
+ @ExcelProperty(value = "初次发现日期", index = 16)
+ private Date firstDate;
+
+ @ExcelProperty(value = "管控情况", index = 17)
+ private String controlSituation;
+
+ @ExcelProperty(value = "管控人姓名", index = 18)
+ private String controlPerson;
+
+ @ExcelProperty(value = "管控人联系方式", index = 19)
+ private String controlPersonPhone;
+
+ @ExcelProperty(value = "帮扶情况", index = 20)
+ private String helpSituation;
+
+ @ExcelProperty(value = "帮扶人姓名", index = 21)
+ private String helpPerson;
+
+ @ExcelProperty(value = "帮扶人联系方式", index = 22)
+ private String helpPersonPhone;
+
+ @ExcelProperty(value = "吸毒原因", index = 23)
+ private String drugReason;
+
+ @ExcelProperty(value = "吸毒后果", index = 24)
+ private String drugResult;
+
+ @ExcelProperty(value = "有无犯罪史", index = 25)
+ private String haveCrime;
+
+ @ExcelProperty(value = "违法犯罪情况", index = 26)
+ private String crimeSutiation;
+
+ @ExcelProperty(value = "备注", index = 27)
+ private String remark;
+
+ /**
+ * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
+ */
+ private String distinctPass;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 性别（1.男 2.女）
+ */
+ private Integer sex;
+
+ /**
+ * 出生年月日
+ */
+ private String birthday;
+
+ /**
+ * 扩展字段用逗号隔开
+ */
+ private List<String> userTagStr = Lists.newArrayList();
+
+ private Long houseId;
+
+ /**
+ * 地址
+ */
+ private String address;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugMistakeExcelVO.java
new file mode 100644
index 0000000..fc01eb1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDrugMistakeExcelVO.java
@@ -0,0 +1,106 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入吸毒人员
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationDrugMistakeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 3)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "联系电话", index = 4)
+ private String phone;
+
+ @ExcelProperty(value = "是否租住", index = 10)
+ private String isRent;
+
+ @ExcelProperty(value = "街/路/巷", index = 5)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 6)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 7)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 8)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 9)
+ private String houseNo;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 11)
+ private String houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 12)
+ private String housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 13)
+ private String controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 14)
+ private String outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 15)
+ private String censusRegister;
+
+ @ExcelProperty(value = "初次发现日期", index = 16)
+ private String firstDate;
+
+ @ExcelProperty(value = "管控情况", index = 17)
+ private String controlSituation;
+
+ @ExcelProperty(value = "管控人姓名", index = 18)
+ private String controlPerson;
+
+ @ExcelProperty(value = "管控人联系方式", index = 19)
+ private String controlPersonPhone;
+
+ @ExcelProperty(value = "帮扶情况", index = 20)
+ private String helpSituation;
+
+ @ExcelProperty(value = "帮扶人姓名", index = 21)
+ private String helpPerson;
+
+ @ExcelProperty(value = "帮扶人联系方式", index = 22)
+ private String helpPersonPhone;
+
+ @ExcelProperty(value = "吸毒原因", index = 23)
+ private String drugReason;
+
+ @ExcelProperty(value = "吸毒后果", index = 24)
+ private String drugResult;
+
+ @ExcelProperty(value = "有无犯罪史", index = 25)
+ private String haveCrime;
+
+ @ExcelProperty(value = "违法犯罪情况", index = 26)
+ private String crimeSutiation;
+
+ @ExcelProperty(value = "备注", index = 27)
+ private String remark;
+
+ @ExcelProperty(value = "错误信息", index = 28)
+ private String mistake;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationElderExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationElderExcelVO.java
new file mode 100644
index 0000000..53de524
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationElderExcelVO.java
@@ -0,0 +1,132 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * title: ComMngPopulationElderExcelVO 批量导入高龄老人
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 批量导入高龄老人
+ *
+ * @author txb
+ * @date 2021/9/01 13:12
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationElderExcelVO {
+
+ @ExcelProperty(value = "姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 1)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "政治面貌", index = 3)
+ private Integer politicalOutlook;
+
+ @ExcelProperty(value = "是否租住", index = 4)
+ private Integer isRent;
+
+ @ExcelProperty(value = "街/路/巷", index = 5)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 6)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 7)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 8)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 9)
+ private String houseNo;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 10)
+ private Integer houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 11)
+ private Integer housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 12)
+ private Integer controlStatus;
+
+ @ExcelProperty(value = "联系方式", index = 13)
+ private String phone;
+
+ @ExcelProperty(value = "籍贯", index = 14)
+ private String nativePlace;
+
+ @ExcelProperty(value = "文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)", index = 15)
+ private Integer cultureLevel;
+
+ @ExcelProperty(value = "婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)", index = 16)
+ private Integer marriage;
+
+ @ExcelProperty(value = "健康状况", index = 17)
+ private String healthy;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 18)
+ private Integer outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 19)
+ private String censusRegister;
+
+ @ExcelProperty(value = "高龄老人登记（是/否）", index = 20)
+ private Integer isRegister;
+
+ @ExcelProperty(value = "健在（是/否）", index = 21)
+ private Integer isAlive;
+
+ @ExcelProperty(value = "*高龄津贴开始领取时间（年-月-日）", index = 22)
+ private Date receiveAllowanceBegin;
+
+ @ExcelProperty(value = "*现居住地址", index = 23)
+ private String nowAddress;
+
+ @ExcelProperty(value = "备注", index = 24)
+ private String remark;
+
+ /**
+ * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
+ */
+ private String distinctPass;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 性别（1.男 2.女）
+ */
+ private Integer sex;
+
+ /**
+ * 出生年月日
+ */
+ private String birthday;
+
+ /**
+ * 扩展字段用逗号隔开
+ */
+ private List<String> userTagStr = Lists.newArrayList();
+
+ private Long houseId;
+
+ /**
+ * 地址
+ */
+ private String address;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationElderMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationElderMistakeExcelVO.java
new file mode 100644
index 0000000..2794a29
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationElderMistakeExcelVO.java
@@ -0,0 +1,101 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * title: ComMngPopulationElderExcelVO 批量导入高龄老人
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 批量导入高龄老人
+ *
+ * @author txb
+ * @String 2021/9/01 13:12
+ */
+@Data
+public class ComMngPopulationElderMistakeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 1)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "政治面貌", index = 3)
+ private String politicalOutlook;
+
+ @ExcelProperty(value = "是否租住", index = 4)
+ private String isRent;
+
+ @ExcelProperty(value = "街/路/巷", index = 5)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 6)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 7)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 8)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 9)
+ private String houseNo;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 10)
+ private String houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 11)
+ private String housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 12)
+ private String controlStatus;
+
+ @ExcelProperty(value = "联系方式", index = 13)
+ private String phone;
+
+ @ExcelProperty(value = "籍贯", index = 14)
+ private String nativePlace;
+
+ @ExcelProperty(value = "文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)", index = 15)
+ private String cultureLevel;
+
+ @ExcelProperty(value = "婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)", index = 16)
+ private String marriage;
+
+ @ExcelProperty(value = "健康状况", index = 17)
+ private String healthy;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 18)
+ private String outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 19)
+ private String censusRegister;
+
+ @ExcelProperty(value = "高龄老人登记（是/否）", index = 20)
+ private String isRegister;
+
+ @ExcelProperty(value = "健在（是/否）", index = 21)
+ private String isAlive;
+
+ @ExcelProperty(value = "*高龄津贴开始领取时间（年-月-日）", index = 22)
+ private String receiveAllowanceBegin;
+
+ @ExcelProperty(value = "*现居住地址", index = 23)
+ private String nowAddress;
+
+ @ExcelProperty(value = "备注", index = 24)
+ private String remark;
+
+ @ExcelProperty(value = "错误信息", index = 25)
+ private String mistake;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationExcelVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationExcelVo.java
new file mode 100644
index 0000000..627d12c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationExcelVo.java
@@ -0,0 +1,61 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ComMngPopulationExcelVo {
+
+ @ExcelProperty(value = "姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 1)
+ private String cardNo;
+
+ @ExcelProperty(value = "人员类型", index = 2)
+ private String personType;
+
+ @ExcelProperty(value = "人员标签", index = 3)
+ private String tags;
+
+ @ExcelProperty(value = "居住地址", index = 4)
+ private String address;
+
+ @ExcelProperty(value = "性别", index = 5)
+ private String sex;
+
+ @ExcelProperty(value = "民族", index = 6)
+ private String nation;
+
+ @ExcelProperty(value = "政治面貌", index = 7)
+ private String politicalOutlook;
+
+ @ExcelProperty(value = "出生年月日", index = 8)
+ private String birthday;
+
+ @ExcelProperty(value = "年龄", index = 9)
+ private Integer age;
+
+ @ExcelProperty(value = "联系方式", index = 10)
+ private String phone;
+
+ @ExcelProperty(value = "籍贯", index = 11)
+ private String nativePlace;
+
+ @ExcelProperty(value = "本地外地", index = 12)
+ private String outOrLacal;
+
+ @ExcelProperty(value = "文化程度", index = 13)
+ private String cultureLevel;
+
+ @ExcelProperty(value = "婚姻状况", index = 14)
+ private String marriage;
+
+ @ExcelProperty(value = "健康状况", index = 15)
+ private String healthy;
+
+ @ExcelProperty(value = "工作单位", index = 16)
+ private String workCompany;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationHouseAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationHouseAdminVO.java
new file mode 100644
index 0000000..65f0881
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationHouseAdminVO.java
@@ -0,0 +1,63 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 实有房屋Vo
+ */
+@Data
+@ApiModel("实有房屋")
+public class ComMngPopulationHouseAdminVO {
+
+ /**
+ * 实有房屋id
+ */
+ @ApiModelProperty("实有房屋id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ /**
+ * 房屋地址
+ */
+ @ApiModelProperty("房屋地址")
+ private String address;
+ /**
+ * 街/路/巷
+ */
+ @ApiModelProperty("街/路/巷")
+ private String alley;
+ /**
+ * 门牌号
+ */
+ @ApiModelProperty("门牌号")
+ private String houseNum;
+ /**
+ * 小区/组
+ */
+ @ApiModelProperty("小区/组")
+ private String groupAt;
+
+ @ApiModelProperty("房屋状态(1.自住 2.租住 3.其他)")
+ private Integer status;
+
+ @ApiModelProperty("房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)")
+ private Integer purpose;
+
+ @ApiModelProperty("管控状态(1.常规 2.关注 3.管控)")
+ private Integer controlStatus;
+
+ @ApiModelProperty("空户(1.是 2.否)")
+ private Integer isEmpty;
+
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationHouseDetailAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationHouseDetailAdminVO.java
new file mode 100644
index 0000000..ea2f6ab
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationHouseDetailAdminVO.java
@@ -0,0 +1,59 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 实有房屋Vo
+ */
+@Data
+@ApiModel("实有房屋详情")
+public class ComMngPopulationHouseDetailAdminVO {
+
+ /**
+ * 实有房屋id
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("实有房屋id")
+ private Long id;
+ /**
+ * 房屋地址
+ */
+ @ApiModelProperty("房屋地址")
+ private String address;
+
+ @ApiModelProperty("房屋状态(1.自住 2.租住 3.其他)")
+ private Integer status;
+
+ @ApiModelProperty("房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)")
+ private Integer purpose;
+
+ @ApiModelProperty("管控状态(1.常规 2.关注 3.管控)")
+ private Integer controlStatus;
+
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty("建筑面积")
+ private BigDecimal constructArea;
+
+ @ApiModelProperty("建筑用途")
+ private String constructPurpose;
+
+ @ApiModelProperty("房屋编号")
+ private String code;
+
+ @ApiModelProperty("实有房屋住户信息")
+ private List<ComMngPopulationHouseUserAdminVO> houseUserList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationHouseTotalVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationHouseTotalVO.java
new file mode 100644
index 0000000..59f1f67
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationHouseTotalVO.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 实有房屋统计返回参数
+ */
+@Data
+@ApiModel("实有房屋统计返回参数")
+public class ComMngPopulationHouseTotalVO {
+
+ /**
+ * 房屋数量
+ */
+ @ApiModelProperty("房屋数量")
+ private Integer houseTotal = 0;
+ /**
+ * 空房屋数量
+ */
+ @ApiModelProperty("空房屋数量")
+ private Integer emptyTotal = 0;
+ /**
+ * 关注人口数量
+ */
+ @ApiModelProperty("关注人口数量")
+ private Integer followTotal = 0;
+ /**
+ * 管控人口数量
+ */
+ @ApiModelProperty("管控人口数量")
+ private Integer controlTotal = 0;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationHouseUserAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationHouseUserAdminVO.java
new file mode 100644
index 0000000..f9938f6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationHouseUserAdminVO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 实有房屋内人口信息Vo
+ */
+@Data
+@ApiModel("实有房屋内住户信息")
+@EncryptDecryptClass
+public class ComMngPopulationHouseUserAdminVO {
+
+ @ApiModelProperty("实有人口id")
+ private String id;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("身份证号码")
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ApiModelProperty("手机号")
+ @EncryptDecryptField
+ private String phone;
+
+ @ApiModelProperty("住户来源（1.系统录入 2.小程序登记）")
+ private Integer source = 1;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationImportErrorVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationImportErrorVO.java
new file mode 100644
index 0000000..a383f61
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationImportErrorVO.java
@@ -0,0 +1,60 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+@Data
+public class ComMngPopulationImportErrorVO implements Serializable {
+
+// @ExcelProperty(value = "楼房属性", index = 0)
+// private String useType;
+// @ExcelProperty(value = "建筑类型", index = 1)
+// private String buildType;
+
+ @ExcelProperty(value = "街路巷", index = 0)
+ private String alley;
+
+ @ExcelProperty(value = "小区名称", index = 1)
+ private String villageName;
+
+ @ExcelProperty(value = "街路巷号", index = 2)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼栋号", index = 3)
+ private String name;
+
+// @ExcelProperty(value = "单元数", index = 6)
+// private Integer unitTotal;
+//
+// @ExcelProperty(value = "楼层数", index = 7)
+// private Integer buildFloorSum;
+//
+// @ExcelProperty(value = "每层户数", index = 8)
+// private Integer everyFloorSum;
+//
+// @ExcelProperty(value = "总户数", index = 9)
+// private Integer buildUserSum;
+//
+// @ExcelProperty(value = "电梯", index = 10)
+// private Integer elevatorTotal;
+//
+// @ExcelProperty(value = "物业公司名称", index = 11)
+// private String propertyCompanyName;
+//
+// @ExcelProperty(value = "建筑时间", index = 12)
+// private Date buildDate;
+//
+// @ExcelProperty(value = "备注", index = 13)
+// private String remark;
+//
+// @ExcelProperty(value = "网格划分", index = 14)
+// private String gridId;
+
+ @ExcelProperty(value = "错误原因", index = 4)
+ private String errorMsg;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationKeyExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationKeyExcelVO.java
new file mode 100644
index 0000000..59c5309
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationKeyExcelVO.java
@@ -0,0 +1,106 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入重点上访人员
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationKeyExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "身份证号码", index = 3)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "联系电话", index = 4)
+ private String phone;
+
+ @ExcelProperty(value = "籍贯", index = 5)
+ private String nativePlace;
+
+ @ExcelProperty(value = "街/路/巷", index = 6)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 7)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 8)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 9)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 10)
+ private String houseNo;
+
+ @ExcelProperty(value = "是否租住", index = 11)
+ private Integer isRent;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 12)
+ private Integer houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 13)
+ private Integer housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 14)
+ private Integer controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 15)
+ private Integer outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 16)
+ private String censusRegister;
+
+ @ExcelProperty(value = "备注", index = 17)
+ private String remark;
+ /**
+ * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
+ */
+ private String distinctPass;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 性别（1.男 2.女）
+ */
+ private Integer sex;
+
+ /**
+ * 出生年月日
+ */
+ private String birthday;
+
+ /**
+ * 扩展字段用逗号隔开
+ */
+ private List<String> userTagStr = Lists.newArrayList();
+
+ private Long houseId;
+
+ /**
+ * 地址
+ */
+ private String address;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationKeyMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationKeyMistakeExcelVO.java
new file mode 100644
index 0000000..ca540df
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationKeyMistakeExcelVO.java
@@ -0,0 +1,76 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入重点上访人员
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationKeyMistakeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "身份证号码", index = 3)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "联系电话", index = 4)
+ private String phone;
+
+ @ExcelProperty(value = "籍贯", index = 5)
+ private String nativePlace;
+
+ @ExcelProperty(value = "街/路/巷", index = 6)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 7)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 8)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 9)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 10)
+ private String houseNo;
+
+ @ExcelProperty(value = "是否租住", index = 11)
+ private String isRent;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 12)
+ private String houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 13)
+ private String housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 14)
+ private String controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 15)
+ private String outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 16)
+ private String censusRegister;
+
+ @ExcelProperty(value = "备注", index = 17)
+ private String remark;
+
+ @ExcelProperty(value = "错误信息", index = 18)
+ private String mistake;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationLowSecurityExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationLowSecurityExcelVO.java
new file mode 100644
index 0000000..b9ba6e7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationLowSecurityExcelVO.java
@@ -0,0 +1,193 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入低保户
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationLowSecurityExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 2)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "联系电话", index = 3)
+ private String phone;
+
+ @ExcelProperty(value = "地区", index = 4)
+ private String region;
+
+ @ExcelProperty(value = "家庭编码", index = 5)
+ private String familyCode;
+
+ @ExcelProperty(value = "组名称", index = 6)
+ private String groupName;
+
+ @ExcelProperty(value = "分类救助类别", index = 7)
+ private String classifiedRescueCategory;
+
+ @ExcelProperty(value = "申请日期", index = 8)
+ private Date applyDate;
+
+ @ExcelProperty(value = "户主姓名", index = 9)
+ private String houseHolderName;
+
+ @ExcelProperty(value = "户主身份证", index = 10)
+ private String houseHolderCardNo;
+
+ @ExcelProperty(value = "户主编码", index = 11)
+ private String houseHolderCode;
+
+ @ExcelProperty(value = "街/路/巷", index = 12)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 13)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 14)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 15)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 16)
+ private String houseNo;
+
+ @ExcelProperty(value = "是否租住", index = 17)
+ private Integer isRent;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 18)
+ private Integer houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 19)
+ private Integer housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 20)
+ private Integer controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 21)
+ private Integer outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 22)
+ private String censusRegister;
+
+ @ExcelProperty(value = "居住地邮编", index = 23)
+ private String residencePostalCode;
+
+ @ExcelProperty(value = "救助证号", index = 24)
+ private String salvageCertificateNo;
+
+ @ExcelProperty(value = "保障人口数", index = 25)
+ private Integer guaranteedPopulationNumber;
+
+ @ExcelProperty(value = "家庭人口数", index = 26)
+ private Integer familyPopulationNumber;
+
+ @ExcelProperty(value = "开户人", index = 27)
+ private String accountPerson;
+
+ @ExcelProperty(value = "开户银行", index = 28)
+ private String accountBank;
+
+ @ExcelProperty(value = "开户人身份证号", index = 29)
+ private String accountCardNo;
+
+ @ExcelProperty(value = "银行账号", index = 30)
+ private String bankAccount;
+
+ @ExcelProperty(value = "供养机构", index = 31)
+ private String supportInstitutions;
+
+ @ExcelProperty(value = "资金发放方式", index = 32)
+ private String distributionMethod;
+
+ @ExcelProperty(value = "保障金额", index = 33)
+ private BigDecimal guaranteedAmount;
+
+ @ExcelProperty(value = "调剂金额", index = 34)
+ private BigDecimal reallocationAmount;
+
+ @ExcelProperty(value = "差额救助金额", index = 35)
+ private BigDecimal differenceReliefAmount;
+
+ @ExcelProperty(value = "分类施保金额", index = 36)
+ private BigDecimal classifiedInsuredAmount;
+
+ @ExcelProperty(value = "家庭月总收入", index = 37)
+ private BigDecimal totalMonthlyFamilyIncome;
+
+ @ExcelProperty(value = "家庭月均收入", index = 38)
+ private BigDecimal averageMonthlyFamilyIncome;
+
+ @ExcelProperty(value = "家庭月支出", index = 39)
+ private BigDecimal totalMonthlyFamilyExpenditure;
+
+ @ExcelProperty(value = "经度", index = 40)
+ private String lng;
+
+ @ExcelProperty(value = "纬度", index = 41)
+ private String lat;
+
+ @ExcelProperty(value = "始发年月", index = 42)
+ private String originateDate;
+
+ @ExcelProperty(value = "护理费", index = 43)
+ private BigDecimal nursingFee;
+
+ @ExcelProperty(value = "申请理由", index = 44)
+ private String applyReason;
+
+ @ExcelProperty(value = "审核意见", index = 45)
+ private String reviewComment;
+
+ /**
+ * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
+ */
+ private String distinctPass;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 性别（1.男 2.女）
+ */
+ private Integer sex;
+
+ /**
+ * 出生年月日
+ */
+ private String birthday;
+
+ /**
+ * 扩展字段用逗号隔开
+ */
+ private List<String> userTagStr = Lists.newArrayList();
+
+ private Long houseId;
+
+ /**
+ * 地址
+ */
+ private String address;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationLowSecurityMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationLowSecurityMistakeExcelVO.java
new file mode 100644
index 0000000..2fd18b6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationLowSecurityMistakeExcelVO.java
@@ -0,0 +1,160 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入低保户
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationLowSecurityMistakeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 2)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "联系电话", index = 3)
+ private String phone;
+
+ @ExcelProperty(value = "地区", index = 4)
+ private String region;
+
+ @ExcelProperty(value = "家庭编码", index = 5)
+ private String familyCode;
+
+ @ExcelProperty(value = "组名称", index = 6)
+ private String groupName;
+
+ @ExcelProperty(value = "分类救助类别", index = 7)
+ private String classifiedRescueCategory;
+
+ @ExcelProperty(value = "申请日期", index = 8)
+ private String applyDate;
+
+ @ExcelProperty(value = "户主姓名", index = 9)
+ private String houseHolderName;
+
+ @ExcelProperty(value = "户主身份证", index = 10)
+ private String houseHolderCardNo;
+
+ @ExcelProperty(value = "户主编码", index = 11)
+ private String houseHolderCode;
+
+ @ExcelProperty(value = "街/路/巷", index = 12)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 13)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 14)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 15)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 16)
+ private String houseNo;
+
+ @ExcelProperty(value = "是否租住", index = 17)
+ private String isRent;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 18)
+ private String houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 19)
+ private String housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 20)
+ private String controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 21)
+ private String outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 22)
+ private String censusRegister;
+
+ @ExcelProperty(value = "居住地邮编", index = 23)
+ private String residencePostalCode;
+
+ @ExcelProperty(value = "救助证号", index = 24)
+ private String salvageCertificateNo;
+
+ @ExcelProperty(value = "保障人口数", index = 25)
+ private String guaranteedPopulationNumber;
+
+ @ExcelProperty(value = "家庭人口数", index = 26)
+ private String familyPopulationNumber;
+
+ @ExcelProperty(value = "开户人", index = 27)
+ private String accountPerson;
+
+ @ExcelProperty(value = "开户银行", index = 28)
+ private String accountBank;
+
+ @ExcelProperty(value = "开户人身份证号", index = 29)
+ private String accountCardNo;
+
+ @ExcelProperty(value = "银行账号", index = 30)
+ private String bankAccount;
+
+ @ExcelProperty(value = "供养机构", index = 31)
+ private String supportInstitutions;
+
+ @ExcelProperty(value = "资金发放方式", index = 32)
+ private String distributionMethod;
+
+ @ExcelProperty(value = "保障金额", index = 33)
+ private String guaranteedAmount;
+
+ @ExcelProperty(value = "调剂金额", index = 34)
+ private String reallocationAmount;
+
+ @ExcelProperty(value = "差额救助金额", index = 35)
+ private String differenceReliefAmount;
+
+ @ExcelProperty(value = "分类施保金额", index = 36)
+ private String classifiedInsuredAmount;
+
+ @ExcelProperty(value = "家庭月总收入", index = 37)
+ private String totalMonthlyFamilyIncome;
+
+ @ExcelProperty(value = "家庭月均收入", index = 38)
+ private String averageMonthlyFamilyIncome;
+
+ @ExcelProperty(value = "家庭月支出", index = 39)
+ private String totalMonthlyFamilyExpenditure;
+
+ @ExcelProperty(value = "经度", index = 40)
+ private String lng;
+
+ @ExcelProperty(value = "纬度", index = 41)
+ private String lat;
+
+ @ExcelProperty(value = "始发年月", index = 42)
+ private String originateDate;
+
+ @ExcelProperty(value = "护理费", index = 43)
+ private String nursingFee;
+
+ @ExcelProperty(value = "申请理由", index = 44)
+ private String applyReason;
+
+ @ExcelProperty(value = "审核意见", index = 45)
+ private String reviewComment;
+
+ @ExcelProperty(value = "错误信息", index = 46)
+ private String mistake;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java
new file mode 100644
index 0000000..2d983e9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java
@@ -0,0 +1,140 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入重精人员
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationMajorExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 2)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "街/路/巷", index = 3)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 4)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 5)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 6)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 7)
+ private String houseNo;
+
+ @ExcelProperty(value = "是否租住", index = 8)
+ private Integer isRent;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 9)
+ private Integer houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 10)
+ private Integer housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 11)
+ private Integer controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 12)
+ private Integer outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 13)
+ private String censusRegister;
+
+ @ExcelProperty(value = "文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)", index = 14)
+ private Integer cultureLevel;
+
+ @ExcelProperty(value = "经济状况", index = 15)
+ private String economicCondition;
+
+ @ExcelProperty(value = "人员类型", index = 16)
+ private String personType;
+
+ @ExcelProperty(value = "家庭情况", index = 17)
+ private String familySituation;
+
+ @ExcelProperty(value = "监护人姓名", index = 18)
+ private String custodyPerson;
+
+ @ExcelProperty(value = "与监护人关系", index = 19)
+ private String custodyRelation;
+
+ @ExcelProperty(value = "监护人公民身份号码", index = 20)
+ private String custodyCardNo;
+
+ @ExcelProperty(value = "监护人联系方式", index = 21)
+ private String custodyPersonPhone;
+
+ @ExcelProperty(value = "监护人居住详址", index = 22)
+ private String custodyAddress;
+
+ @ExcelProperty(value = "帮扶人姓名", index = 23)
+ private String helpPerson;
+
+ @ExcelProperty(value = "帮扶人联系方式", index = 24)
+ private String helpPersonPhone;
+
+ @ExcelProperty(value = "帮扶手段", index = 25)
+ private String helpMethod;
+
+ @ExcelProperty(value = "帮扶情况", index = 26)
+ private String helpSituation;
+
+ @ExcelProperty(value = "是否违法犯罪（1.是 0.否）", index = 27)
+ private Integer isCrime;
+
+ @ExcelProperty(value = "违法犯罪情况", index = 28)
+ private String crimeSutiation;
+
+ /**
+ * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
+ */
+ private String distinctPass;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 性别（1.男 2.女）
+ */
+ private Integer sex;
+
+ /**
+ * 出生年月日
+ */
+ private String birthday;
+
+ /**
+ * 扩展字段用逗号隔开
+ */
+ private List<String> userTagStr = Lists.newArrayList();
+
+ private Long houseId;
+
+ /**
+ * 地址
+ */
+ private String address;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorMistakeExcelVO.java
new file mode 100644
index 0000000..8675783
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorMistakeExcelVO.java
@@ -0,0 +1,109 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入重精人员
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationMajorMistakeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 2)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "街/路/巷", index = 3)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 4)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 5)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 6)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 7)
+ private String houseNo;
+
+ @ExcelProperty(value = "是否租住", index = 8)
+ private String isRent;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 9)
+ private String houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 10)
+ private String housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 11)
+ private String controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 12)
+ private String outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 13)
+ private String censusRegister;
+
+ @ExcelProperty(value = "文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)", index = 14)
+ private String cultureLevel;
+
+ @ExcelProperty(value = "经济状况", index = 15)
+ private String economicCondition;
+
+ @ExcelProperty(value = "人员类型", index = 16)
+ private String personType;
+
+ @ExcelProperty(value = "家庭情况", index = 17)
+ private String familySituation;
+
+ @ExcelProperty(value = "监护人姓名", index = 18)
+ private String custodyPerson;
+
+ @ExcelProperty(value = "与监护人关系", index = 19)
+ private String custodyRelation;
+
+ @ExcelProperty(value = "监护人公民身份号码", index = 20)
+ private String custodyCardNo;
+
+ @ExcelProperty(value = "监护人联系方式", index = 21)
+ private String custodyPersonPhone;
+
+ @ExcelProperty(value = "监护人居住详址", index = 22)
+ private String custodyAddress;
+
+ @ExcelProperty(value = "帮扶人姓名", index = 23)
+ private String helpPerson;
+
+ @ExcelProperty(value = "帮扶人联系方式", index = 24)
+ private String helpPersonPhone;
+
+ @ExcelProperty(value = "帮扶手段", index = 25)
+ private String helpMethod;
+
+ @ExcelProperty(value = "帮扶情况", index = 26)
+ private String helpSituation;
+
+ @ExcelProperty(value = "是否违法犯罪（1.是 0.否）", index = 27)
+ private String isCrime;
+
+ @ExcelProperty(value = "违法犯罪情况", index = 28)
+ private String crimeSutiation;
+
+ @ExcelProperty(value = "错误信息", index = 29)
+ private String mistake;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java
new file mode 100644
index 0000000..866223b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMistakeExcelVO.java
@@ -0,0 +1,144 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入实有人口
+ * @author: llming
+ */
+@Data
+public class ComMngPopulationMistakeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "身份证号", index = 1)
+ private String cardNo;
+
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "政治面貌(群众/中共党员/共青团员)", index = 3)
+ private String politicalOutlook;
+
+ @ExcelProperty(value = "是否租住", index = 4)
+ private String isRent;
+
+ @ExcelProperty(value = "与户主关系", index = 5)
+ private String relation;
+
+ @ExcelProperty(value = "街/路/巷", index = 6)
+ private String road;
+
+ @ExcelProperty(value = "小区号（政府对于每个小区都有特定编号）", index = 7)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 8)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 9)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（四位数表示。前两位楼层，后两位户号）", index = 10)
+ private String houseNo;
+
+ @ExcelProperty(value = "建筑用途", index = 11)
+ private String buildPurpose;
+
+ @ExcelProperty(value = "建筑面积", index = 12)
+ private String buildArea;
+
+ @ExcelProperty(value = "房屋状态(自住/租住/其他)", index = 13)
+ private String houseStatus;
+
+ @ExcelProperty(value = "房屋用途(住宅/公寓/宿舍/仓库/其他）", index = 14)
+ private String housePurpose;
+
+ @ExcelProperty(value = "管控状态(常规/关注/管控)", index = 15)
+ private String controlStatus;
+
+ @ExcelProperty(value = "联系方式", index = 16)
+ private String phone;
+
+ @ExcelProperty(value = "籍贯", index = 17)
+ private String nativePlace;
+
+ @ExcelProperty(value = "文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)", index = 18)
+ private String cultureLevel;
+
+ @ExcelProperty(value = "婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)", index = 19)
+ private String marriage;
+
+ @ExcelProperty(value = "健康状况", index = 20)
+ private String healthy;
+
+ @ExcelProperty(value = "血型", index = 21)
+ private String bloodType;
+
+ @ExcelProperty(value = "宗教信仰", index = 22)
+ private String religion;
+
+ @ExcelProperty(value = "职业", index = 23)
+ private String profession;
+
+ @ExcelProperty(value = "工作单位/学校", index = 24)
+ private String workCompany;
+
+ @ExcelProperty(value = "本地/外地", index = 25)
+ private String outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 26)
+ private String censusRegister;
+
+ @ExcelProperty(value = "是否居住地(是/否)", index = 27)
+ private String residence;
+
+ // @ExcelProperty(value = "居住地址", index = 28)
+ // private String address;
+
+ @ExcelProperty(value = "人员类型（户籍人口/留守人员/外地人员/境外人员/流动人口/常住人口/暂住人口）", index = 28)
+ private String personType;
+
+ @ExcelProperty(value = "国家", index = 29)
+ private String country;
+
+ @ExcelProperty(value = "离开日期（境外人员填写）", index = 30)
+ private String StringOfDeparture;
+
+ @ExcelProperty(value = "人员状态（正常/失联/出国）", index = 31)
+ private String personStatus;
+
+ @ExcelProperty(value = "月收入情况", index = 32)
+ private String monthlyIncome;
+
+ @ExcelProperty(value = "家庭情况", index = 33)
+ private String familyStatus;
+
+ @ExcelProperty(value = "来华目的（境外人员填写）", index = 34)
+ private String goalInChina;
+
+ @ExcelProperty(value = "抵达日期（境外人员填写）", index = 35)
+ private String StringOfArrival;
+
+ @ExcelProperty(value = "备注", index = 36)
+ private String remark;
+
+ @ExcelProperty(value = "证件照（人面像）照片", index = 37)
+ private String idCardPositive;
+
+ @ExcelProperty(value = "证件照（国徽面）照片", index = 38)
+ private String idCardBack;
+
+ @ExcelProperty(value = "户口本照片", index = 39)
+ private String houseHold;
+
+ @ExcelProperty(value = "是否死亡(是/否)", index = 40)
+ private String death;
+
+ @ExcelProperty(value = "错误信息", index = 41)
+ private String mistake;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationNoSecretVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationNoSecretVO.java
new file mode 100644
index 0000000..0d26392
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationNoSecretVO.java
@@ -0,0 +1,253 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import com.panzhihua.common.model.helper.sensitive.Sensitive;
+import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
+import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
+import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
+import com.panzhihua.common.model.vos.user.ComMngHouseVo;
+import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
+import com.panzhihua.common.validated.AddGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 实有人口Vo
+ */
+@Data
+@ApiModel("实有人口表")
+@EncryptDecryptClass
+public class ComMngPopulationNoSecretVO {
+
+ /**
+ * 自增 id
+ */
+ @ApiModelProperty("实有人口id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ /**
+ * 街道id
+ */
+ @ApiModelProperty("街道id")
+ private Integer streetId;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ private Integer actId;
+ /**
+ * 小区id（实有房屋id）
+ */
+ @ApiModelProperty("小区id（实有房屋id）")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private long villageId;
+ /**
+ * 家庭成员（姓名）
+ */
+ @ApiModelProperty("家庭成员（姓名）")
+ @NotBlank(groups = {AddGroup.class}, message = "家庭成员（姓名）不可为空")
+ private String name;
+
+ @ApiModelProperty("性别（1.男 2.女 3.未知）")
+ @NotBlank(groups = {AddGroup.class}, message = "性别不可为空")
+ private Integer sex;
+
+ @ApiModelProperty("年龄")
+ @NotBlank(groups = {AddGroup.class}, message = "年龄不可为空")
+ private Integer age;
+
+ @ApiModelProperty("身份证号码")
+ private String cardNo;
+
+ @ApiModelProperty("出生年月")
+ private String birthday;
+
+ @ApiModelProperty("街路巷")
+ @NotBlank(groups = {AddGroup.class}, message = "街路巷不可为空")
+ private String road;
+
+ @ApiModelProperty("门牌号")
+ @NotBlank(groups = {AddGroup.class}, message = "门牌号不可为空")
+ private String doorNo;
+
+ @ApiModelProperty("楼排号")
+ @NotBlank(groups = {AddGroup.class}, message = "楼排号不可为空")
+ private String floor;
+
+ @ApiModelProperty("单元号")
+ @NotBlank(groups = {AddGroup.class}, message = "单元号不可为空")
+ private String unitNo;
+
+ @ApiModelProperty("户室（房间号）")
+ @NotBlank(groups = {AddGroup.class}, message = "户室（房间号）不可为空")
+ private String houseNo;
+
+ @ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
+ @NotBlank(groups = {AddGroup.class}, message = "政治面貌不可为空")
+ private Integer politicalOutlook;
+
+ @ApiModelProperty("政治面貌名称")
+ private String politicalOutlookName;
+
+ @ApiModelProperty("工作单位")
+ private String workCompany;
+
+ @ApiModelProperty("特殊情况")
+ private String specialSituation;
+
+ @ApiModelProperty("联系方式")
+ @NotBlank(groups = {AddGroup.class}, message = "联系方式不可为空")
+ @EncryptDecryptField
+ private String phone;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("标签集合（多个标签以,隔开,如物业工作人员,物业")
+ private String label;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty("籍贯")
+ private String nativePlace;
+
+ @ApiModelProperty("民族")
+ private String nationCode;
+
+ @ApiModelProperty("民族")
+ private String nation;
+
+ @ApiModelProperty("小区名字")
+ private String alley;
+
+ @ApiModelProperty("户主关系列表")
+ private List<ComHouseMemberVo> comMngFamilyInfoVOS;
+
+ @ApiModelProperty("家庭成员信息")
+ private List<ComMngFamilyInfoVO> familyInfoVOList;
+
+ @ApiModelProperty("用户电子档信息")
+ private UserElectronicFileVO userElectronicFileVO;
+
+ @ApiModelProperty("是否租住 是否租住(0.否 1.是)")
+ @NotBlank(groups = {AddGroup.class}, message = "是否租住不可为空")
+ private Integer isRent;
+
+ @ApiModelProperty("文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)")
+ private Integer cultureLevel;
+
+ @ApiModelProperty("文化程度名称")
+ private String cultureLevelName;
+
+ @ApiModelProperty("职业")
+ private String profession;
+
+ @ApiModelProperty("婚姻状况(10.未婚 20.已婚 21.初婚 22.再婚 23.复婚 30.丧偶 40.离婚 90.未说明的婚姻状况 60.其他)")
+ private Integer marriage;
+
+ @ApiModelProperty("婚姻状况名称")
+ private String marriageName;
+
+ @ApiModelProperty("健康状况")
+ private String healthy;
+
+ @ApiModelProperty("外地or本地（1.本地 2.外地）")
+ private Integer outOrLocal;
+
+ @ApiModelProperty("户口所在地")
+ private String censusRegister;
+
+ /**
+ * 居住地址
+ */
+ @ApiModelProperty("居住地址")
+ private String address;
+
+ @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
+ private Integer relation;
+
+ @ApiModelProperty("与户主关系名称")
+ private String relationName;
+
+ @ApiModelProperty("身份证无加密字段")
+ private String cardNoStr;
+
+ @ApiModelProperty("房屋列表")
+ private List<ComMngHouseVo> houseList;
+
+ @ApiModelProperty("车辆列表")
+ private List<ComMngPopulationCarVO> carList;
+
+ @ApiModelProperty("吸毒信息")
+ private List<ComDrugPopulationVO> comDrugPopulationVOs;
+
+ @ApiModelProperty("社区矫正信息")
+ private List<ComCorrectPopulationVO> comCorrectPopulationVOs;
+
+ @ApiModelProperty("精神障碍信息")
+ private List<ComMajorPopulationVO> comMajorPopulationVOs;
+
+ @ApiModelProperty("邪教信息")
+ private List<ComCultPopulationVO> comCultPopulationVOs;
+
+ @ApiModelProperty("刑释信息")
+ private List<ComRehabilitationPopulationVO> comRehabilitationPopulationVOs;
+
+ @ApiModelProperty("上访信息")
+ private List<ComKeyPopulationVO> comKeyPopulationVOs;
+
+ @ApiModelProperty("退役军人信息")
+ private List<ComVeteransPopulationVO> comVeteransPopulationVOs;
+
+ @ApiModelProperty("残疾人信息")
+ private List<ComDisabilityPopulationVO> comDisabilityPopulationVOs;
+
+ @ApiModelProperty("低保户信息")
+ private List<ComLowSecurityPopulationVO> comLowSecurityPopulationVOs;
+
+ @ApiModelProperty("高龄老人信息")
+ private List<ComElderAuthElderliesVO> comElderAuthElderliesVOList;
+
+ @ApiModelProperty("养老人员信息")
+ private List<ComPensionAuthPensionerVO> comPensionAuthPensionerVOList;
+
+ public interface sex {
+ int nan = 1;
+ int nv = 2;
+ int no = 3;
+ }
+
+ /**
+ * 是否租住
+ */
+ public interface isOk {
+ int yes = 1;
+ int no = 0;
+ }
+
+ /**
+ * 政治面貌
+ */
+ public interface politicalOutlook {
+ int dang = 1;
+ int tuan = 3;
+ int wu = 12;
+ int qun = 13;
+ int no = 13;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationPensionExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationPensionExcelVO.java
new file mode 100644
index 0000000..390ab5f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationPensionExcelVO.java
@@ -0,0 +1,132 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * title: ComMngPopulationPensionExcelVO 批量导入养老金人员
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 批量导入养老金人员
+ *
+ * @author txb
+ * @date 2021/9/01 13:12
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationPensionExcelVO implements Serializable {
+
+ @ExcelProperty(value = "姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 1)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "政治面貌", index = 3)
+ private Integer politicalOutlook;
+
+ @ExcelProperty(value = "是否租住", index = 4)
+ private Integer isRent;
+
+ @ExcelProperty(value = "街/路/巷", index = 5)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 6)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 7)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 8)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 9)
+ private String houseNo;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 10)
+ private Integer houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 11)
+ private Integer housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 12)
+ private Integer controlStatus;
+
+ @ExcelProperty(value = "联系方式", index = 13)
+ private String phone;
+
+ @ExcelProperty(value = "籍贯", index = 14)
+ private String nativePlace;
+
+ @ExcelProperty(value = "文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)", index = 15)
+ private Integer cultureLevel;
+
+ @ExcelProperty(value = "婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)", index = 16)
+ private Integer marriage;
+
+ @ExcelProperty(value = "健康状况", index = 17)
+ private String healthy;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 18)
+ private Integer outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 19)
+ private String censusRegister;
+
+ @ExcelProperty(value = "养老登记（是/否）", index = 20)
+ private Integer isRegister;
+
+ @ExcelProperty(value = "健在（是/否）", index = 21)
+ private Integer isAlive;
+
+ @ExcelProperty(value = "*养老金开始领取时间（年-月-日）", index = 22)
+ private Date receiveAllowanceBegin;
+
+ @ExcelProperty(value = "*现居住地址", index = 23)
+ private String nowAddress;
+
+ @ExcelProperty(value = "备注", index = 24)
+ private String remark;
+
+ /**
+ * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
+ */
+ private String distinctPass;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 性别（1.男 2.女）
+ */
+ private Integer sex;
+
+ /**
+ * 出生年月日
+ */
+ private String birthday;
+
+ /**
+ * 扩展字段用逗号隔开
+ */
+ private List<String> userTagStr = Lists.newArrayList();
+
+ private Long houseId;
+
+ /**
+ * 地址
+ */
+ private String address;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationPensionMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationPensionMistakeExcelVO.java
new file mode 100644
index 0000000..734c7fe
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationPensionMistakeExcelVO.java
@@ -0,0 +1,99 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * title: ComMngPopulationPensionMistakeExcelVO 批量导入养老金人员
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 批量导入养老金人员
+ *
+ * @author txb
+ * @String 2021/9/01 13:12
+ */
+@Data
+public class ComMngPopulationPensionMistakeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 1)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "政治面貌", index = 3)
+ private String politicalOutlook;
+
+ @ExcelProperty(value = "是否租住", index = 4)
+ private String isRent;
+
+ @ExcelProperty(value = "街/路/巷", index = 5)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 6)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 7)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 8)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 9)
+ private String houseNo;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 10)
+ private String houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 11)
+ private String housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 12)
+ private String controlStatus;
+
+ @ExcelProperty(value = "联系方式", index = 13)
+ private String phone;
+
+ @ExcelProperty(value = "籍贯", index = 14)
+ private String nativePlace;
+
+ @ExcelProperty(value = "文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)", index = 15)
+ private String cultureLevel;
+
+ @ExcelProperty(value = "婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)", index = 16)
+ private String marriage;
+
+ @ExcelProperty(value = "健康状况", index = 17)
+ private String healthy;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 18)
+ private String outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 19)
+ private String censusRegister;
+
+ @ExcelProperty(value = "高龄老人登记（是/否）", index = 20)
+ private String isRegister;
+
+ @ExcelProperty(value = "健在（是/否）", index = 21)
+ private String isAlive;
+
+ @ExcelProperty(value = "*高龄津贴开始领取时间（年-月-日）", index = 22)
+ private String receiveAllowanceBegin;
+
+ @ExcelProperty(value = "*现居住地址", index = 23)
+ private String nowAddress;
+
+ @ExcelProperty(value = "备注", index = 24)
+ private String remark;
+
+ @ExcelProperty(value = "错误信息", index = 25)
+ private String mistake;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java
new file mode 100644
index 0000000..942caf3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java
@@ -0,0 +1,171 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入刑释人员
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationRehabilitationExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "身份证号码", index = 3)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "联系电话", index = 4)
+ private String phone;
+
+ @ExcelProperty(value = "籍贯", index = 5)
+ private String nativePlace;
+
+ @ExcelProperty(value = "街/路/巷", index = 6)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 7)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 8)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 9)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 10)
+ private String houseNo;
+
+ @ExcelProperty(value = "是否租住", index = 11)
+ private Integer isRent;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 12)
+ private Integer houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 13)
+ private Integer housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 14)
+ private Integer controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 15)
+ private Integer outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 16)
+ private String censusRegister;
+
+ @ExcelProperty(value = "主要亲属", index = 17)
+ private String mainRelatives;
+
+ @ExcelProperty(value = "与人员关系", index = 18)
+ private String patientRelation;
+
+ @ExcelProperty(value = "列管原因及类型", index = 19)
+ private String rehabReasonAndType;
+
+ @ExcelProperty(value = "是否列管", index = 20)
+ private Integer isRehab;
+
+ @ExcelProperty(value = "是否累惯犯（1.是 0.否）", index = 21)
+ private Integer isRecidivist;
+
+ @ExcelProperty(value = "原判刑期", index = 22)
+ private String originalTerm;
+
+ @ExcelProperty(value = "服刑日期", index = 23)
+ private Date sentenceBegin;
+
+ @ExcelProperty(value = "原罪名", index = 24)
+ private String originalCharge;
+
+ @ExcelProperty(value = "释放日期", index = 25)
+ private Date sentenceEnd;
+
+ @ExcelProperty(value = "服刑场所", index = 26)
+ private String sentencePlace;
+
+ @ExcelProperty(value = "危险性评估", index = 27)
+ private String riskAssessment;
+
+ @ExcelProperty(value = "衔接日期", index = 28)
+ private Date joinDate;
+
+ @ExcelProperty(value = "衔接情况", index = 29)
+ private String joinSituation;
+
+ @ExcelProperty(value = "是否重新犯罪（1.是 0.否）", index = 30)
+ private Integer isAgainCrime;
+
+ @ExcelProperty(value = "重新犯罪名称", index = 31)
+ private String againCrimeName;
+
+ @ExcelProperty(value = "安置情况", index = 32)
+ private String placeSituation;
+
+ @ExcelProperty(value = "安置日期", index = 33)
+ private Date placeDate;
+
+ @ExcelProperty(value = "未安置原因", index = 34)
+ private String notPlaceReason;
+
+ @ExcelProperty(value = "帮教开始", index = 35)
+ private Date helpBegin;
+
+ @ExcelProperty(value = "帮教结束", index = 36)
+ private Date helpEnd;
+
+ @ExcelProperty(value = "帮教情况", index = 37)
+ private String helpSituation;
+
+ @ExcelProperty(value = "备注", index = 38)
+ private String remark;
+
+ /**
+ * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
+ */
+ private String distinctPass;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 性别（1.男 2.女）
+ */
+ private Integer sex;
+
+ /**
+ * 出生年月日
+ */
+ private String birthday;
+
+ /**
+ * 扩展字段用逗号隔开
+ */
+ private List<String> userTagStr = Lists.newArrayList();
+
+ private Long houseId;
+
+ /**
+ * 地址
+ */
+ private String address;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationMistakeExcelVO.java
new file mode 100644
index 0000000..923018b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationMistakeExcelVO.java
@@ -0,0 +1,139 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入刑释人员
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationRehabilitationMistakeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "身份证号码", index = 3)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "联系电话", index = 4)
+ private String phone;
+
+ @ExcelProperty(value = "籍贯", index = 5)
+ private String nativePlace;
+
+ @ExcelProperty(value = "街/路/巷", index = 6)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 7)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 8)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 9)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 10)
+ private String houseNo;
+
+ @ExcelProperty(value = "是否租住", index = 11)
+ private String isRent;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 12)
+ private String houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 13)
+ private String housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 14)
+ private String controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 15)
+ private String outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 16)
+ private String censusRegister;
+
+ @ExcelProperty(value = "主要亲属", index = 17)
+ private String mainRelatives;
+
+ @ExcelProperty(value = "与人员关系", index = 18)
+ private String patientRelation;
+
+ @ExcelProperty(value = "列管原因及类型", index = 19)
+ private String rehabReasonAndType;
+
+ @ExcelProperty(value = "是否列管", index = 20)
+ private String isRehab;
+
+ @ExcelProperty(value = "是否累惯犯（1.是 0.否）", index = 21)
+ private String isRecidivist;
+
+ @ExcelProperty(value = "原判刑期", index = 22)
+ private String originalTerm;
+
+ @ExcelProperty(value = "服刑日期", index = 23)
+ private String sentenceBegin;
+
+ @ExcelProperty(value = "原罪名", index = 24)
+ private String originalCharge;
+
+ @ExcelProperty(value = "释放日期", index = 25)
+ private String sentenceEnd;
+
+ @ExcelProperty(value = "服刑场所", index = 26)
+ private String sentencePlace;
+
+ @ExcelProperty(value = "危险性评估", index = 27)
+ private String riskAssessment;
+
+ @ExcelProperty(value = "衔接日期", index = 28)
+ private String joinDate;
+
+ @ExcelProperty(value = "衔接情况", index = 29)
+ private String joinSituation;
+
+ @ExcelProperty(value = "是否重新犯罪（1.是 0.否）", index = 30)
+ private String isAgainCrime;
+
+ @ExcelProperty(value = "重新犯罪名称", index = 31)
+ private String againCrimeName;
+
+ @ExcelProperty(value = "安置情况", index = 32)
+ private String placeSituation;
+
+ @ExcelProperty(value = "安置日期", index = 33)
+ private String placeDate;
+
+ @ExcelProperty(value = "未安置原因", index = 34)
+ private String notPlaceReason;
+
+ @ExcelProperty(value = "帮教开始", index = 35)
+ private String helpBegin;
+
+ @ExcelProperty(value = "帮教结束", index = 36)
+ private String helpEnd;
+
+ @ExcelProperty(value = "帮教情况", index = 37)
+ private String helpSituation;
+
+ @ExcelProperty(value = "备注", index = 38)
+ private String remark;
+
+ @ExcelProperty(value = "错误信息", index = 39)
+ private String mistake;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationSentenceExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationSentenceExcelVO.java
new file mode 100644
index 0000000..5308c7c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationSentenceExcelVO.java
@@ -0,0 +1,122 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入服刑人员
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationSentenceExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "身份证号码", index = 3)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "联系电话", index = 4)
+ private String phone;
+
+ @ExcelProperty(value = "配偶", index = 5)
+ private String spouse;
+
+ @ExcelProperty(value = "职业", index = 6)
+ private String profession;
+
+ @ExcelProperty(value = "街/路/巷", index = 7)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 8)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 9)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 10)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 11)
+ private String houseNo;
+
+ @ExcelProperty(value = "是否租住", index = 12)
+ private Integer isRent;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 13)
+ private Integer houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 14)
+ private Integer housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 15)
+ private Integer controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 16)
+ private Integer outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 17)
+ private String censusRegister;
+
+ @ExcelProperty(value = "服刑地", index = 18)
+ private String sentencePlace;
+
+ @ExcelProperty(value = "服刑开始时间", index = 19)
+ private Date sentenceBegin;
+
+ @ExcelProperty(value = "服刑结束时间", index = 20)
+ private Date sentenceEnd;
+
+ @ExcelProperty(value = "罪名", index = 21)
+ private String charge;
+
+ @ExcelProperty(value = "备注", index = 22)
+ private String remark;
+ /**
+ * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
+ */
+ private String distinctPass;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 性别（1.男 2.女）
+ */
+ private Integer sex;
+
+ /**
+ * 出生年月日
+ */
+ private String birthday;
+
+ /**
+ * 扩展字段用逗号隔开
+ */
+ private List<String> userTagStr = Lists.newArrayList();
+
+ private Long houseId;
+
+ /**
+ * 地址
+ */
+ private String address;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationSentenceMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationSentenceMistakeExcelVO.java
new file mode 100644
index 0000000..8e42346
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationSentenceMistakeExcelVO.java
@@ -0,0 +1,91 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入服刑人员
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationSentenceMistakeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "身份证号码", index = 3)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "联系电话", index = 4)
+ private String phone;
+
+ @ExcelProperty(value = "配偶", index = 5)
+ private String spouse;
+
+ @ExcelProperty(value = "职业", index = 6)
+ private String profession;
+
+ @ExcelProperty(value = "街/路/巷", index = 7)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 8)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 9)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 10)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 11)
+ private String houseNo;
+
+ @ExcelProperty(value = "是否租住", index = 12)
+ private String isRent;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 13)
+ private String houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 14)
+ private String housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 15)
+ private String controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 16)
+ private String outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 17)
+ private String censusRegister;
+
+ @ExcelProperty(value = "服刑地", index = 18)
+ private String sentencePlace;
+
+ @ExcelProperty(value = "服刑开始时间", index = 19)
+ private String sentenceBegin;
+
+ @ExcelProperty(value = "服刑结束时间", index = 20)
+ private String sentenceEnd;
+
+ @ExcelProperty(value = "罪名", index = 21)
+ private String charge;
+
+ @ExcelProperty(value = "备注", index = 22)
+ private String remark;
+
+ @ExcelProperty(value = "错误信息", index = 23)
+ private String mistake;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
new file mode 100644
index 0000000..7b48bd8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
@@ -0,0 +1,206 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入实有人口
+ * @author: llming
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationServeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 1)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "政治面貌", index = 3)
+ private Integer politicalOutlook;
+
+ @ExcelProperty(value = "是否租住", index = 4)
+ private Integer isRent;
+
+ @ExcelProperty(value = "与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)", index = 5)
+ private Integer relation;
+ private String relationStr;
+
+ @ExcelProperty(value = "街/路/巷", index = 6)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 7)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 8)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 9)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 10)
+ private String houseNo;
+
+ @ExcelProperty(value = "建筑用途", index = 11)
+ private String buildPurpose;
+
+ @ExcelProperty(value = "建筑面积", index = 12)
+ private String buildArea;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 13)
+ private Integer houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 14)
+ private Integer housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 15)
+ private Integer controlStatus;
+
+ @ExcelProperty(value = "联系方式", index = 16)
+ private String phone;
+
+ @ExcelProperty(value = "籍贯", index = 17)
+ private String nativePlace;
+
+ @ExcelProperty(value = "文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)", index = 18)
+ private Integer cultureLevel;
+
+ @ExcelProperty(value = "婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)", index = 19)
+ private Integer marriage;
+
+ private String marriageStr;
+
+ @ExcelProperty(value = "健康状况", index = 20)
+ private String healthy;
+
+ @ExcelProperty(value = "血型", index = 21)
+ private String bloodType;
+
+ @ExcelProperty(value = "宗教信仰", index = 22)
+ private String religion;
+
+ @ExcelProperty(value = "职业", index = 23)
+ private String profession;
+
+ @ExcelProperty(value = "工作单位/学校", index = 24)
+ private String workCompany;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 25)
+ private Integer outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 26)
+ private String censusRegister;
+
+ @ExcelProperty(value = "是否居住地 1是 、0否", index = 27)
+ private Integer residence;
+
+ @ExcelProperty(value = "居住地址", index = 28)
+ private String address;
+
+ @ExcelProperty(value = "人员类型（1、户籍人口2、留守人员3、外地人员4、境外人员5、流动人口6、常住人口7、暂住人口）", index = 29)
+ private Integer personType;
+
+ @ExcelProperty(value = "国家", index = 30)
+ private String country;
+
+ @ExcelProperty(value = "离开日期（境外人员填写）", index = 31)
+ private Date dateOfDeparture;
+
+ @ExcelProperty(value = "人员状态", index = 32)
+ private String personStatus;
+
+ @ExcelProperty(value = "月收入情况", index = 33)
+ private String monthlyIncome;
+
+ @ExcelProperty(value = "家庭情况", index = 34)
+ private String familyStatus;
+
+ @ExcelProperty(value = "来华目的（境外人员填写）", index = 35)
+ private String goalInChina;
+
+ @ExcelProperty(value = "抵达日期（境外人员填写）", index = 36)
+ private Date dateOfArrival;
+
+ @ExcelProperty(value = "备注", index = 37)
+ private String remark;
+
+ @ExcelProperty(value = "证件照（人面像）照片", index = 38)
+ private String idCardPositive;
+
+ @ExcelProperty(value = "证件照（国徽面）照片", index = 39)
+ private String idCardBack;
+
+ @ExcelProperty(value = "户口本照片", index = 40)
+ private String houseHold;
+
+ @ExcelProperty(value = "是否死亡(是/否)", index = 41)
+ private Integer death;
+
+ @ExcelProperty(value = "退役军人(是/否)", index = 42)
+ private Integer veterans;
+
+ @ExcelProperty(value = "残疾人(是/否)", index = 43)
+ private Integer disabled;
+
+ @ExcelProperty(value = "低保户(是/否)", index = 44)
+ private Integer lowIncomeHold;
+
+ @ExcelProperty(value = "低收入人员(是/否)", index = 45)
+ private Integer lowIncome;
+
+ @ExcelProperty(value = "高龄老人(是/否)", index = 46)
+ private Integer elder;
+
+ @ExcelProperty(value = "特服家庭(是/否)", index = 47)
+ private Integer specialFamily;
+
+ @ExcelProperty(value = "重点人员(是/否)", index = 48)
+ private Integer important;
+
+ @ExcelProperty(value = "特殊情况（重大病史/孕）(是/否)", index = 49)
+ private Integer specialCase;
+
+ @ExcelProperty(value = "错误信息", index = 50)
+ private Integer mistake;
+
+ /**
+ * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
+ */
+ private String distinctPass;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 性别（1.男 2.女）
+ */
+ private Integer sex;
+
+ /**
+ * 出生年月日
+ */
+ private String birthday;
+
+ /**
+ * 扩展字段用逗号隔开
+ */
+ private List<String> userTagStr = Lists.newArrayList();
+
+ private Long houseId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationSpecialExcelVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationSpecialExcelVo.java
new file mode 100644
index 0000000..ca8e011
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationSpecialExcelVo.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+public class ComMngPopulationSpecialExcelVo {
+
+ @ExcelProperty(value = "所在小区", index = 0)
+ private String areaName;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "人员标签", index = 2)
+ private String tags;
+
+ @ExcelProperty(value = "联系方式", index = 3)
+ private String phone;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationTotalVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationTotalVO.java
new file mode 100644
index 0000000..64487f6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationTotalVO.java
@@ -0,0 +1,123 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 实有人口统计返回参数
+ */
+@Data
+@ApiModel("实有人口统计返回参数")
+public class ComMngPopulationTotalVO {
+
+ /**
+ * 人口总数
+ */
+ @ApiModelProperty("人口总数")
+ private Long populationTotal;
+ /**
+ * 本地人口
+ */
+ @ApiModelProperty("本地人口")
+ private Integer localTotal;
+ /**
+ * 外地人口
+ */
+ @ApiModelProperty("外地人口")
+ private Integer outTotal;
+ /**
+ * 特殊群体
+ */
+ @ApiModelProperty("特殊群体")
+ private Integer specialTotal;
+
+ /**
+ * 小区总数
+ */
+ @ApiModelProperty("小区总数")
+ private Integer villageTotal;
+
+ /**
+ * 吸毒人员
+ */
+ @ApiModelProperty("吸毒人员")
+ private Integer drugTotal;
+
+ /**
+ * 社区矫正人员
+ */
+ @ApiModelProperty("社区矫正人员")
+ private Integer correctTotal;
+
+ /**
+ * 重精人员
+ */
+ @ApiModelProperty("重精人员")
+ private Integer majorTotal;
+
+ /**
+ * 邪教人员
+ */
+ @ApiModelProperty("邪教人员")
+ private Integer cultTotal;
+
+ /**
+ * 刑释人员
+ */
+ @ApiModelProperty("刑释人员")
+ private Integer rehabilitationTotal;
+
+ /**
+ * 重点上访人员
+ */
+ @ApiModelProperty("重点上访人员")
+ private Integer keyTotal;
+
+ /**
+ * 退役军人
+ */
+ @ApiModelProperty("退役军人")
+ private Integer veteransTotal;
+ /**
+ * 残疾人
+ */
+ @ApiModelProperty("残疾人")
+ private Integer disabilityTotal;
+
+ /**
+ * 低保户
+ */
+ @ApiModelProperty("低保户")
+ private Integer LowSecurityTotal;
+
+ @ApiModelProperty("高龄老人")
+ private Integer elderTotal;
+
+ @ApiModelProperty("养老金人员")
+ private Integer pensionTotal;
+
+ @ApiModelProperty("楼栋数")
+ private Integer buildNum;
+
+ @ApiModelProperty("户籍人口")
+ private Integer houseRegTotal;
+
+ @ApiModelProperty("流动人口")
+ private Integer floatingTotal;
+
+ @ApiModelProperty("常住人口")
+ private Integer permanentTotal;
+
+ @ApiModelProperty("暂住人口")
+ private Integer temporaryTotal;
+
+ @ApiModelProperty("外地人员")
+ private Integer outOfTownTotal;
+
+ @ApiModelProperty("留守人员")
+ private Integer leftTotal;
+
+ @ApiModelProperty("境外人员")
+ private Integer overseasTotal;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
new file mode 100644
index 0000000..ff6a28f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
@@ -0,0 +1,267 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import com.panzhihua.common.model.helper.sensitive.Sensitive;
+import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
+import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
+import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
+import com.panzhihua.common.model.vos.user.ComMngHouseVo;
+import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 实有人口Vo
+ */
+@Data
+@ApiModel("实有人口表")
+@EncryptDecryptClass
+public class ComMngPopulationVO {
+
+ /**
+ * 自增 id
+ */
+ @ApiModelProperty("实有人口id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ /**
+ * 街道id
+ */
+ @ApiModelProperty("街道id")
+ private Long streetId;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ private Long actId;
+ /**
+ * 小区id（实有房屋id）
+ */
+ @ApiModelProperty("小区id（实有房屋id）")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private long villageId;
+ /**
+ * 家庭成员（姓名）
+ */
+ @ApiModelProperty("家庭成员（姓名）")
+ @NotBlank(groups = {AddGroup.class}, message = "家庭成员（姓名）不可为空")
+ private String name;
+
+ @ApiModelProperty("性别（1.男 2.女 3.未知）")
+ @NotBlank(groups = {AddGroup.class}, message = "性别不可为空")
+ private Integer sex;
+
+ @ApiModelProperty("年龄")
+ @NotBlank(groups = {AddGroup.class}, message = "年龄不可为空")
+ private Integer age;
+
+ @ApiModelProperty("身份证号码")
+ @NotBlank(groups = {AddGroup.class}, message = "身份证号码不可为空")
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ApiModelProperty("出生年月")
+ private String birthday;
+
+ @ApiModelProperty("街路巷")
+ @NotBlank(groups = {AddGroup.class}, message = "街路巷不可为空")
+ private String road;
+
+ @ApiModelProperty("门牌号")
+ @NotBlank(groups = {AddGroup.class}, message = "门牌号不可为空")
+ private String doorNo;
+
+ @ApiModelProperty("楼排号")
+ @NotBlank(groups = {AddGroup.class}, message = "楼排号不可为空")
+ private String floor;
+
+ @ApiModelProperty("单元号")
+ @NotBlank(groups = {AddGroup.class}, message = "单元号不可为空")
+ private String unitNo;
+
+ @ApiModelProperty("户室（房间号）")
+ @NotBlank(groups = {AddGroup.class}, message = "户室（房间号）不可为空")
+ private String houseNo;
+
+ @ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
+ @NotBlank(groups = {AddGroup.class}, message = "政治面貌不可为空")
+ private Integer politicalOutlook;
+
+ @ApiModelProperty("政治面貌名称")
+ private String politicalOutlookName;
+
+ @ApiModelProperty("工作单位")
+ private String workCompany;
+
+ @ApiModelProperty("特殊情况")
+ private String specialSituation;
+
+ @ApiModelProperty("联系方式")
+ @NotBlank(groups = {AddGroup.class}, message = "联系方式不可为空")
+ @EncryptDecryptField
+ @Sensitive(strategy = SensitiveStrategy.PHONE)
+ private String phone;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("标签集合（多个标签以,隔开,如物业工作人员,物业")
+ private String label;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty("籍贯")
+ private String nativePlace;
+
+ @ApiModelProperty("民族")
+ private String nationCode;
+
+ @ApiModelProperty("民族")
+ private String nation;
+
+ @ApiModelProperty("小区名字")
+ private String alley;
+
+ @ApiModelProperty("户主关系列表")
+ private List<ComHouseMemberVo> comMngFamilyInfoVOS;
+
+ @ApiModelProperty("家庭成员信息")
+ private List<ComMngFamilyInfoVO> familyInfoVOList;
+
+ @ApiModelProperty("用户电子档信息")
+ private UserElectronicFileVO userElectronicFileVO;
+
+ @ApiModelProperty("是否租住 是否租住(0.否 1.是)")
+ @NotBlank(groups = {AddGroup.class}, message = "是否租住不可为空")
+ private Integer isRent;
+
+ @ApiModelProperty("文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)")
+ private Integer cultureLevel;
+
+ @ApiModelProperty("文化程度名称")
+ private String cultureLevelName;
+
+ @ApiModelProperty("职业")
+ private String profession;
+
+ @ApiModelProperty("婚姻状况(10.未婚 20.已婚 21.初婚 22.再婚 23.复婚 30.丧偶 40.离婚 90.未说明的婚姻状况 60.其他)")
+ private Integer marriage;
+
+ @ApiModelProperty("婚姻状况名称")
+ private String marriageName;
+
+ @ApiModelProperty("健康状况")
+ private String healthy;
+
+ @ApiModelProperty("外地or本地（1.本地 2.外地）")
+ private Integer outOrLocal;
+
+ @ApiModelProperty("户口所在地")
+ private String censusRegister;
+
+ /**
+ * 居住地址
+ */
+ @ApiModelProperty("居住地址")
+ private String address;
+
+ @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
+ private Integer relation;
+
+ @ApiModelProperty("与户主关系名称")
+ private String relationName;
+
+ @ApiModelProperty("身份证无加密字段")
+ private String cardNoStr;
+
+ @ApiModelProperty("是否健在 0是 、1否")
+ private Integer death;
+
+ @ApiModelProperty("人员类型 1 80-89 2 90-99 3 100以上")
+ private Integer type;
+
+ @ApiModelProperty("人员类型（1、户籍人口2、留守人员3、外地人员4、境外人员5、流动人口6、常住人口7、暂住人口）")
+ private String personType;
+
+ @ApiModelProperty("房屋列表")
+ private List<ComMngHouseVo> houseList;
+
+ @ApiModelProperty("车辆列表")
+ private List<ComMngPopulationCarVO> carList;
+
+ @ApiModelProperty("吸毒信息")
+ private List<ComDrugPopulationVO> comDrugPopulationVOs;
+
+ @ApiModelProperty("社区矫正信息")
+ private List<ComCorrectPopulationVO> comCorrectPopulationVOs;
+
+ @ApiModelProperty("精神障碍信息")
+ private List<ComMajorPopulationVO> comMajorPopulationVOs;
+
+ @ApiModelProperty("邪教信息")
+ private List<ComCultPopulationVO> comCultPopulationVOs;
+
+ @ApiModelProperty("刑释信息")
+ private List<ComRehabilitationPopulationVO> comRehabilitationPopulationVOs;
+
+ @ApiModelProperty("上访信息")
+ private List<ComKeyPopulationVO> comKeyPopulationVOs;
+
+ @ApiModelProperty("退役军人信息")
+ private List<ComVeteransPopulationVO> comVeteransPopulationVOs;
+
+ @ApiModelProperty("残疾人信息")
+ private List<ComDisabilityPopulationVO> comDisabilityPopulationVOs;
+
+ @ApiModelProperty("低保户信息")
+ private List<ComLowSecurityPopulationVO> comLowSecurityPopulationVOs;
+
+ @ApiModelProperty("高龄老人信息")
+ private List<ComElderAuthElderliesVO> comElderAuthElderliesVOList;
+
+ @ApiModelProperty("养老人员信息")
+ private List<ComPensionAuthPensionerVO> comPensionAuthPensionerVOList;
+
+ public interface sex {
+ int nan = 1;
+ int nv = 2;
+ int no = 3;
+ }
+
+ /**
+ * 是否租住
+ */
+ public interface isOk {
+ int yes = 1;
+ int no = 0;
+ }
+
+ /**
+ * 政治面貌
+ */
+ public interface politicalOutlook {
+ int dang = 1;
+ int tuan = 3;
+ int wu = 12;
+ int qun = 13;
+ int no = 13;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVeteransExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVeteransExcelVO.java
new file mode 100644
index 0000000..d87ac20
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVeteransExcelVO.java
@@ -0,0 +1,240 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入退役军人
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationVeteransExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "人员状态：正常、失联、出国(取字典表）", index = 1)
+ private String personStatus;
+
+ @ExcelProperty(value = "机构", index = 2)
+ private String organization;
+
+ @ExcelProperty(value = "姓名", index = 3)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 4)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "联系电话", index = 5)
+ private String phone;
+
+ @ExcelProperty(value = "照片", index = 6)
+ private String photo;
+
+ @ExcelProperty(value = "户籍性质", index = 7)
+ private String regiterNature;
+
+ @ExcelProperty(value = "户口所在地", index = 8)
+ private String censusRegister;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 9)
+ private Integer outOrLocal;
+
+ @ExcelProperty(value = "街/路/巷", index = 10)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 11)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 12)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 13)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 14)
+ private String houseNo;
+
+ @ExcelProperty(value = "是否租住", index = 15)
+ private Integer isRent;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 16)
+ private Integer houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 17)
+ private Integer housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 18)
+ private Integer controlStatus;
+
+ @ExcelProperty(value = "入伍时间", index = 19)
+ private Date enlistDate;
+
+ @ExcelProperty(value = "退伍时间", index = 20)
+ private Date retireDate;
+
+ @ExcelProperty(value = "人员类别", index = 21)
+ private String personCategory;
+
+ @ExcelProperty(value = "民族", index = 22)
+ private String nation;
+
+ @ExcelProperty(value = "健康状况", index = 23)
+ private String healthy;
+
+ @ExcelProperty(value = "政治面貌", index = 24)
+ private Integer politicalOutlook;
+
+ @ExcelProperty(value = "婚姻状况", index = 25)
+ private Integer marriage;
+
+ @ExcelProperty(value = "住房状况", index = 26)
+ private String houseSituation;
+
+ @ExcelProperty(value = "住房状况其他", index = 27)
+ private String houseSituationOther;
+
+ @ExcelProperty(value = "建筑面积", index = 28)
+ private String buildArea;
+
+ @ExcelProperty(value = "现就业情况", index = 29)
+ private String employmentSituation;
+
+ @ExcelProperty(value = "在职情况类型", index = 30)
+ private String incumbencyType;
+
+ @ExcelProperty(value = "现就业情况其他", index = 31)
+ private String employmentSituationOther;
+
+ @ExcelProperty(value = "养老保险", index = 32)
+ private String endowmentInsurance;
+
+ @ExcelProperty(value = "医疗保险", index = 33)
+ private String medicalInsurance;
+
+ @ExcelProperty(value = "现个人年收入（单位：元）", index = 34)
+ private String annualIncome;
+
+ @ExcelProperty(value = "父亲健康状况", index = 35)
+ private String fatherHealthy;
+
+ @ExcelProperty(value = "母亲健康状况", index = 36)
+ private String motherHealthy;
+
+ @ExcelProperty(value = "配偶健康状况", index = 37)
+ private String spouseHealthy;
+
+ @ExcelProperty(value = "儿子健康状况", index = 38)
+ private String sonHealthy;
+
+ @ExcelProperty(value = "女儿健康状况", index = 39)
+ private String daughterHealthy;
+
+ @ExcelProperty(value = "主要困难", index = 40)
+ private String mainDifficulty;
+
+ @ExcelProperty(value = "其他困难", index = 41)
+ private String otherDifficulty;
+
+ @ExcelProperty(value = "主要诉求", index = 42)
+ private String mainDemand;
+
+ @ExcelProperty(value = "主要诉求其他事项问题（手填）", index = 43)
+ private String mainDemandOther;
+
+ @ExcelProperty(value = "需参加的学历培训", index = 44)
+ private String academicTraining;
+
+ @ExcelProperty(value = "是否已参加退役军人培训（政府性质）", index = 45)
+ private Integer isVeteransTraining;
+
+ @ExcelProperty(value = "入伍前学历", index = 46)
+ private String educationBeforeEnlistment;
+
+ @ExcelProperty(value = "再教育学历", index = 47)
+ private String reEducation;
+
+ @ExcelProperty(value = "所学专业", index = 48)
+ private String major;
+
+ @ExcelProperty(value = "所学专业其他", index = 49)
+ private String majorOther;
+
+ @ExcelProperty(value = "曾从事行业（含现从事行业）", index = 50)
+ private String onceEngagedIndustry;
+
+ @ExcelProperty(value = "曾从事行业（含现从事行业）其他（手填）", index = 51)
+ private String onceEngagedIndustryOther;
+
+ @ExcelProperty(value = "意向就业地点", index = 52)
+ private String intendedPlaceOfEmployment;
+
+ @ExcelProperty(value = "意向就业地点其他地区（手填）", index = 53)
+ private String intendedPlaceOfEmploymentOther;
+
+ @ExcelProperty(value = "待业期间的求职意向", index = 54)
+ private String unemploymedEngagedIndustry;
+
+ @ExcelProperty(value = "待业期间的求职意向其他（手填）", index = 55)
+ private String unemploymedEngagedIndustryOther;
+
+ @ExcelProperty(value = "是否有创业意愿", index = 56)
+ private Integer isBusiness;
+
+ @ExcelProperty(value = "创业意愿", index = 57)
+ private String businessDesire;
+
+ @ExcelProperty(value = "备注", index = 58)
+ private String remark;
+
+ @ExcelProperty(value = "填表单位", index = 59)
+ private String fillUnit;
+
+ @ExcelProperty(value = "填表人", index = 60)
+ private String fillPerson;
+
+ @ExcelProperty(value = "填表人联系电话", index = 61)
+ private String fillPersonPhone;
+
+ /**
+ * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
+ */
+ private String distinctPass;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 性别（1.男 2.女）
+ */
+ private Integer sex;
+
+ /**
+ * 出生年月日
+ */
+ private String birthday;
+
+ /**
+ * 扩展字段用逗号隔开
+ */
+ private List<String> userTagStr = Lists.newArrayList();
+
+ private Long houseId;
+
+ /**
+ * 地址
+ */
+ private String address;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVeteransMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVeteransMistakeExcelVO.java
new file mode 100644
index 0000000..6e6f902
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVeteransMistakeExcelVO.java
@@ -0,0 +1,208 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入退役军人
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationVeteransMistakeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "人员状态：正常、失联、出国(取字典表）", index = 1)
+ private String personStatus;
+
+ @ExcelProperty(value = "机构", index = 2)
+ private String organization;
+
+ @ExcelProperty(value = "姓名", index = 3)
+ private String name;
+
+ @ExcelProperty(value = "身份证号码", index = 4)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "联系电话", index = 5)
+ private String phone;
+
+ @ExcelProperty(value = "照片", index = 6)
+ private String photo;
+
+ @ExcelProperty(value = "户籍性质（1.城镇户口 2.农村户口）", index = 7)
+ private String regiterNature;
+
+ @ExcelProperty(value = "户口所在地", index = 8)
+ private String censusRegister;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 9)
+ private String outOrLocal;
+
+ @ExcelProperty(value = "街/路/巷", index = 10)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 11)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 12)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 13)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 14)
+ private String houseNo;
+
+ @ExcelProperty(value = "是否租住", index = 15)
+ private String isRent;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 16)
+ private String houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 17)
+ private String housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 18)
+ private String controlStatus;
+
+ @ExcelProperty(value = "入伍时间", index = 19)
+ private String enlistDate;
+
+ @ExcelProperty(value = "入伍时间", index = 20)
+ private String retireDate;
+
+ @ExcelProperty(value = "人员类别", index = 21)
+ private String personCategory;
+
+ @ExcelProperty(value = "民族", index = 22)
+ private String nation;
+
+ @ExcelProperty(value = "健康状况", index = 23)
+ private String healthy;
+
+ @ExcelProperty(value = "政治面貌", index = 24)
+ private String politicalOutlook;
+
+ @ExcelProperty(value = "婚姻状况", index = 25)
+ private String marriage;
+
+ @ExcelProperty(value = "住房状况", index = 26)
+ private String houseSituation;
+
+ @ExcelProperty(value = "住房状况其他", index = 27)
+ private String houseSituationOther;
+
+ @ExcelProperty(value = "建筑面积", index = 28)
+ private String buildArea;
+
+ @ExcelProperty(value = "现就业情况", index = 29)
+ private String employmentSituation;
+
+ @ExcelProperty(value = "在职情况类型", index = 30)
+ private String incumbencyType;
+
+ @ExcelProperty(value = "现就业情况其他", index = 31)
+ private String employmentSituationOther;
+
+ @ExcelProperty(value = "养老保险", index = 32)
+ private String endowmentInsurance;
+
+ @ExcelProperty(value = "医疗保险", index = 33)
+ private String medicalInsurance;
+
+ @ExcelProperty(value = "现个人年收入（单位：元）", index = 34)
+ private String annualIncome;
+
+ @ExcelProperty(value = "父亲健康状况", index = 35)
+ private String fatherHealthy;
+
+ @ExcelProperty(value = "母亲健康状况", index = 36)
+ private String motherHealthy;
+
+ @ExcelProperty(value = "配偶健康状况", index = 37)
+ private String spouseHealthy;
+
+ @ExcelProperty(value = "儿子健康状况", index = 38)
+ private String sonHealthy;
+
+ @ExcelProperty(value = "女儿健康状况", index = 39)
+ private String daughterHealthy;
+
+ @ExcelProperty(value = "主要困难", index = 40)
+ private String mainDifficulty;
+
+ @ExcelProperty(value = "其他困难", index = 41)
+ private String otherDifficulty;
+
+ @ExcelProperty(value = "主要诉求", index = 42)
+ private String mainDemand;
+
+ @ExcelProperty(value = "主要诉求其他事项问题（手填）", index = 43)
+ private String mainDemandOther;
+
+ @ExcelProperty(value = "需参加的学历培训", index = 44)
+ private String academicTraining;
+
+ @ExcelProperty(value = "是否已参加退役军人培训（政府性质）", index = 45)
+ private String isVeteransTraining;
+
+ @ExcelProperty(value = "入伍前学历", index = 46)
+ private String educationBeforeEnlistment;
+
+ @ExcelProperty(value = "再教育学历", index = 47)
+ private String reEducation;
+
+ @ExcelProperty(value = "所学专业", index = 48)
+ private String major;
+
+ @ExcelProperty(value = "所学专业其他", index = 49)
+ private String majorOther;
+
+ @ExcelProperty(value = "曾从事行业（含现从事行业）", index = 50)
+ private String onceEngagedIndustry;
+
+ @ExcelProperty(value = "曾从事行业（含现从事行业）其他（手填）", index = 51)
+ private String onceEngagedIndustryOther;
+
+ @ExcelProperty(value = "意向就业地点", index = 52)
+ private String intendedPlaceOfEmployment;
+
+ @ExcelProperty(value = "意向就业地点其他地区（手填）", index = 53)
+ private String intendedPlaceOfEmploymentOther;
+
+ @ExcelProperty(value = "待业期间的求职意向", index = 54)
+ private String unemploymedEngagedIndustry;
+
+ @ExcelProperty(value = "待业期间的求职意向其他（手填）", index = 55)
+ private String unemploymedEngagedIndustryOther;
+
+ @ExcelProperty(value = "是否有创业意愿", index = 56)
+ private String isBusiness;
+
+ @ExcelProperty(value = "创业意愿", index = 57)
+ private String businessDesire;
+
+ @ExcelProperty(value = "备注", index = 58)
+ private String remark;
+
+ @ExcelProperty(value = "填表单位", index = 59)
+ private String fillUnit;
+
+ @ExcelProperty(value = "填表人", index = 60)
+ private String fillPerson;
+
+ @ExcelProperty(value = "填表人联系电话", index = 61)
+ private String fillPersonPhone;
+
+ @ExcelProperty(value = "错误信息", index = 62)
+ private String mistake;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngProvinceVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngProvinceVO.java
new file mode 100644
index 0000000..1cad9fa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngProvinceVO.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("省份")
+public class ComMngProvinceVO {
+
+ @ApiModelProperty("省份名称")
+ private String provinceName;
+
+ @ApiModelProperty("省份行政区划代码")
+ private Integer provinceAdcode;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealAssetsExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealAssetsExcelVO.java
new file mode 100644
index 0000000..8d2c01b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealAssetsExcelVO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @description: 实有单位
+ * @author: Null
+ * @date: 2021/3/19 12:02
+ */
+@Data
+public class ComMngRealAssetsExcelVO implements Serializable {
+
+ @ExcelProperty(value = "资产名称", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "位置", index = 1)
+ private String address;
+
+ @ExcelProperty(value = "分类", index = 2)
+ private String category;
+
+ @ExcelProperty(value = "占地面积", index = 3)
+ private BigDecimal square;
+
+ @ExcelProperty(value = "数量", index = 4)
+ private Integer num;
+
+ @ExcelProperty(value = "建筑类型", index = 5)
+ private String buildTypeName;
+
+ @ExcelProperty(value = "楼层类型", index = 6)
+ private String floorType;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealAssetsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealAssetsVO.java
new file mode 100644
index 0000000..f4904b2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealAssetsVO.java
@@ -0,0 +1,68 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 实有单位
+ * @author: Null
+ * @date: 2021/3/19 12:02
+ */
+@Data
+public class ComMngRealAssetsVO implements Serializable {
+
+ @ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty(value = "社区ID", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("资产名称")
+ private String name;
+
+ @ApiModelProperty("分类:1-建筑类 2-公共设施类")
+ private Integer category;
+
+ @ApiModelProperty("建筑类型ID")
+ private Long buildTypeId;
+
+ @ApiModelProperty("建筑类型名称")
+ private String buildTypeName;
+
+ @ApiModelProperty("楼层类型：1-高层 2-中层 3-底层")
+ private Integer floorType;
+
+ @ApiModelProperty("数量")
+ private Integer num;
+
+ @ApiModelProperty("面积")
+ private BigDecimal square;
+
+ @ApiModelProperty("省份行政区划代码")
+ private Integer provinceAdcode;
+
+ @ApiModelProperty("城市行政区划代码")
+ private Integer cityAdcode;
+
+ /** 区县行政区划代码 */
+ @ApiModelProperty("区县行政区划代码")
+ private Integer districtAdcode;
+
+ @ApiModelProperty("详细地址")
+ private String address;
+
+ /** 创建时间 */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealCompanyBelongsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealCompanyBelongsVO.java
new file mode 100644
index 0000000..3f3a5bf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealCompanyBelongsVO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 实有单位归属
+ * @author: Null
+ * @date: 2021/3/19 12:02
+ */
+@Data
+public class ComMngRealCompanyBelongsVO implements Serializable {
+
+ @ApiModelProperty("省份行政区划代码")
+ private Integer provinceAdcode;
+
+ @ApiModelProperty("省份行政区划名称")
+ private String provinceName;
+
+ @ApiModelProperty("城市行政区划代码")
+ private Integer cityAdcode;
+
+ @ApiModelProperty("城市行政区划名称")
+ private String cityName;
+
+ /** 区县行政区划代码 */
+ @ApiModelProperty("区县行政区划代码")
+ private Integer districtAdcode;
+
+ @ApiModelProperty("区县行政区划名称")
+ private String districtName;
+
+ @ApiModelProperty("街道标识")
+ private Long streetId;
+
+ @ApiModelProperty("街道名称")
+ private String streetName;
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealCompanyExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealCompanyExcelVO.java
new file mode 100644
index 0000000..150d370
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealCompanyExcelVO.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @description: 实有单位
+ * @author: Null
+ * @date: 2021/3/19 12:02
+ */
+@Data
+public class ComMngRealCompanyExcelVO implements Serializable {
+
+ @ExcelProperty(value = "单位名称", index = 0)
+ private String comName;
+
+ @ExcelProperty(value = "公司法人", index = 1)
+ private String legalPerson;
+
+ @ExcelProperty(value = "负责人", index = 2)
+ private String leader;
+
+ @ExcelProperty(value = "联系方式", index = 3)
+ private String contactsPhone;
+
+ @ExcelProperty(value = "人员规模", index = 4)
+ private Integer scope;
+
+ @ExcelProperty(value = "详细地址", index = 5)
+ private String address;
+
+ @ExcelProperty(value = "统一社会信用代码", index = 6)
+ private String creditCode;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealCompanyTotalVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealCompanyTotalVO.java
new file mode 100644
index 0000000..03a42d8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealCompanyTotalVO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 实有单位统计返回参数
+ */
+@Data
+@ApiModel("实有单位统计返回参数")
+public class ComMngRealCompanyTotalVO {
+
+ /**
+ * 实有单位总数
+ */
+ @ApiModelProperty("实有单位总数")
+ private Long companyTotal;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealCompanyVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealCompanyVO.java
new file mode 100644
index 0000000..7fba1a2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealCompanyVO.java
@@ -0,0 +1,64 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 实有单位
+ * @author: Null
+ * @date: 2021/3/19 12:02
+ */
+@Data
+public class ComMngRealCompanyVO implements Serializable {
+
+ @ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty(value = "社区ID", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("单位名称")
+ private String comName;
+
+ @ApiModelProperty("法人")
+ private String legalPerson;
+
+ @ApiModelProperty("负责人")
+ private String leader;
+
+ @ApiModelProperty("联系方式")
+ private String contactsPhone;
+
+ @ApiModelProperty("人员规模")
+ private Integer scope;
+
+ @ApiModelProperty("统一社会信用代码")
+ private String creditCode;
+
+ @ApiModelProperty("省份行政区划代码")
+ private Integer provinceAdcode;
+
+ @ApiModelProperty("城市行政区划代码")
+ private Integer cityAdcode;
+
+ /** 区县行政区划代码 */
+ @ApiModelProperty("区县行政区划代码")
+ private Integer districtAdcode;
+
+ @ApiModelProperty("详细地址")
+ private String address;
+
+ /** 创建时间 */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaCityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaCityVO.java
new file mode 100644
index 0000000..c0e07bb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaCityVO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 城市
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-28 14:11
+ **/
+@Data
+@ApiModel("城市表")
+public class ComMngStructAreaCityVO {
+
+ @ApiModelProperty("自增 id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("城市名称")
+ private String cityName;
+
+ @ApiModelProperty("城市行政区划代码")
+ private Integer cityAdcode;
+
+ @ApiModelProperty("省份行政区划代码")
+ private Integer provinceAdcode;
+
+ @ApiModelProperty("省份 id")
+ private Long provinceId;
+
+ @ApiModelProperty("下属区县")
+ private List<ComMngStructAreaDistrictVO> comMngStructAreaDistrictVOS;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaDistrictVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaDistrictVO.java
new file mode 100644
index 0000000..73d307d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaDistrictVO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 县区
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-27 15:05
+ **/
+@Data
+@ApiModel("区县")
+public class ComMngStructAreaDistrictVO {
+ @ApiModelProperty("自增 id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("区县名称")
+ private String districtName;
+
+ @ApiModelProperty("区县行政区划代码")
+ private Integer districtAdcode;
+
+ @ApiModelProperty("城市行政区划代码")
+ private Integer cityAdcode;
+
+ @ApiModelProperty("城市 id")
+ private Long cityId;
+
+ @ApiModelProperty("省份行政区划代码")
+ private Integer provinceAdcode;
+
+ @ApiModelProperty("省份 id")
+ private Long provinceId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaProvinceVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaProvinceVO.java
new file mode 100644
index 0000000..01ce1ed
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaProvinceVO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 省份
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-28 14:10
+ **/
+@Data
+@ApiModel("省份表")
+public class ComMngStructAreaProvinceVO {
+
+ @ApiModelProperty("自增 id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("省份名称")
+ private String provinceName;
+
+ @ApiModelProperty("省份行政区划代码")
+ private Integer provinceAdcode;
+
+ @ApiModelProperty("下属城市")
+ private List<ComMngStructAreaCityVO> comMngStructAreaCityVOS;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.java
new file mode 100644
index 0000000..9a5520b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.java
@@ -0,0 +1,65 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+
+import com.panzhihua.common.validated.AddGroup;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 小区
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-14 17:01
+ **/
+@Data
+@ApiModel("小区")
+public class ComMngStructAreaVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("小区名称")
+ @NotBlank(groups = {AddGroup.class}, message = "小区名称不能为空")
+ private String areaName;
+
+ @ApiModelProperty("地址详情")
+ @NotBlank(groups = {AddGroup.class}, message = "地址详情不能为空")
+ private String addressDetail;
+
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ @ApiModelProperty("分页页数")
+ private Long pageNum;
+
+ @ApiModelProperty("每页记录数")
+ private Long pageSize;
+
+ @ApiModelProperty("地址编码")
+ private String areaCode;
+
+ @ApiModelProperty("楼层规则 1 01 001")
+ private String roleFloor;
+
+ @ApiModelProperty("连接符 空格 或者 -")
+ private String roleConnector;
+
+ @ApiModelProperty("门牌号规则 1 01 001")
+ private String roleDoor;
+
+ @ApiModelProperty("是否累加门牌号 0 否 1 是")
+ private Integer isAccumulation;
+
+ @ApiModelProperty("小区门牌号导入规则")
+ private String doorNum;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructBuildTypeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructBuildTypeVO.java
new file mode 100644
index 0000000..9e2b255
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructBuildTypeVO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 其他建筑
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-14 17:03
+ **/
+@Data
+@ApiModel("其他建筑-查询")
+public class ComMngStructBuildTypeVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("建筑类型名称")
+ private String name;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.java
new file mode 100644
index 0000000..9e10a6d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.java
@@ -0,0 +1,79 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 房屋
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-14 17:10
+ **/
+@Data
+@ApiModel("房屋地址")
+public class ComMngStructHouseVO {
+
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("房屋地址编号")
+ @NotBlank(groups = {AddGroup.class}, message = "房屋地址编号不能为空")
+ private String houseCode;
+
+ @ApiModelProperty("房屋地址")
+ private String houseName;
+
+ @ApiModelProperty("房屋地址简称")
+ private String houseShortName;
+
+ @ApiModelProperty("父类地址编码")
+ private String parentCode;
+
+ @ApiModelProperty("地址类型 1小区 2楼栋 3 单元 4楼层 5房间")
+ private Integer type;
+
+ @ApiModelProperty("create_at")
+ private Date createAt;
+
+ @ApiModelProperty("update_at")
+ private Date updateAt;
+
+ @ApiModelProperty("房屋面积")
+ @Min(value = 1, groups = {AddGroup.class}, message = "房屋面积不能为空")
+ private Double square;
+
+ @ApiModelProperty("居住用户名字-多个用，隔开")
+ private String names;
+
+ @ApiModelProperty("居住用户手机号-多个用，隔开")
+ private String phones;
+
+ @ApiModelProperty("房屋状态 1 自主 2 租住 3 商用")
+ @Min(value = 1, groups = {AddGroup.class}, message = "房屋状态不能为空")
+ private Integer state;
+
+ @ApiModelProperty("身份 1租户 2房主")
+ @Min(value = 1, groups = {AddGroup.class}, message = "身份不能为空")
+ private Integer identity;
+
+ @ApiModelProperty(value = "登录用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "小区地址id", hidden = true)
+ private Long areaId;
+
+ @ApiModelProperty(value = "小区地址编码", hidden = true)
+ private String areaCode;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructOtherBuildVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructOtherBuildVO.java
new file mode 100644
index 0000000..2401b01
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructOtherBuildVO.java
@@ -0,0 +1,58 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 其他建筑
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-14 17:22
+ **/
+@Data
+@ApiModel("其他建筑-入参")
+public class ComMngStructOtherBuildVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("建筑名称")
+ private String name;
+
+ @ApiModelProperty("建筑类型id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long typeId;
+
+ @ApiModelProperty("面积")
+ private Double square;
+
+ @ApiModelProperty("建筑地址")
+ private String address;
+
+ @ApiModelProperty("建筑状态 1建筑中 2使用中")
+ private Integer state;
+
+ @ApiModelProperty("楼层类型 高层 中层 底层")
+ private String layerType;
+
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ @ApiModelProperty(value = "当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "每页记录数", example = "10")
+ private Long pageSize;
+
+ @ApiModelProperty("建筑类型名字")
+ private String buileTypeName;
+
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageRegionVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageRegionVO.java
new file mode 100644
index 0000000..ba2f255
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageRegionVO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("查询社区的省市区")
+public class ComMngVillageRegionVO {
+
+ @ApiModelProperty("省份行政区划代码")
+ private Integer provinceAdcode;
+
+ @ApiModelProperty("省份行政区划名称")
+ private String provinceName;
+
+ @ApiModelProperty("城市行政区划代码")
+ private Integer cityAdcode;
+
+ @ApiModelProperty("城市行政区划名称")
+ private String cityName;
+
+ @ApiModelProperty("区县行政区划代码")
+ private Integer districtAdcode;
+
+ @ApiModelProperty("区县行政区划名称")
+ private String districtName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageServeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageServeExcelVO.java
new file mode 100644
index 0000000..003fe15
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageServeExcelVO.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入实有房屋（小区）
+ * @author: llming
+ */
+@Data
+public class ComMngVillageServeExcelVO implements Serializable {
+ /**
+ * villageId
+ */
+ private Long villageId;
+ /**
+ * 服务分类
+ */
+ @ExcelProperty(value = "街路巷", index = 0)
+ private String alley;
+
+ @ExcelProperty(value = "门牌号", index = 1)
+ private String houseNum;
+
+ @ExcelProperty(value = "小区（组）", index = 2)
+ private String groupAt;
+ /**
+ * 小区类型（1.城镇 2.农村 3.未知）
+ */
+ @ExcelProperty(value = "小区类型", index = 3)
+ private String type;
+ /** 如果是城镇小区填写楼栋数量 */
+ @ExcelProperty(value = "小区（组）", index = 4)
+ private Integer buildSum;
+ /** (城镇)建筑年代 */
+ @ExcelProperty(value = "小区（组）", index = 5)
+ private Date buildYear;
+ /** (城镇)建筑类型 */
+ @ExcelProperty(value = "小区（组）", index = 6)
+ private Long buildType;
+ /** (城镇)是否存在物业公司 */
+ @ExcelProperty(value = "小区（组）", index = 7)
+ private String property;
+ /** (城镇)开发商 */
+ @ExcelProperty(value = "小区（组）", index = 8)
+ private String developers;
+ /** (城镇)小区总共居民数量/这户一共住了几口人 */
+ @ExcelProperty(value = "小区（组）", index = 9)
+ private Integer userSum;
+ private Date createAt;
+
+ private String address;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageTotalVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageTotalVO.java
new file mode 100644
index 0000000..ffc7278
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageTotalVO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 小区统计返回参数
+ */
+@Data
+@ApiModel("小区统计返回参数")
+public class ComMngVillageTotalVO {
+
+ /**
+ * 小区数量
+ */
+ @ApiModelProperty("小区数量")
+ private Integer villageTotal = 0;
+ /**
+ * 城镇小区数量
+ */
+ @ApiModelProperty("城镇小区数量")
+ private Integer townTotal = 0;
+ /**
+ * 农村小区数量
+ */
+ @ApiModelProperty("农村小区数量")
+ private Integer countrysideTotal = 0;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageVO.java
new file mode 100644
index 0000000..cc51046
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageVO.java
@@ -0,0 +1,70 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author: llming
+ * @description: 实有房屋（小区）
+ **/
+@Data
+@ApiModel("实有房屋（小区）")
+public class ComMngVillageVO {
+
+ @ApiModelProperty("小区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long villageId;
+
+ @ApiModelProperty("街路巷")
+ @NotBlank(groups = {AddGroup.class}, message = "街路巷不能为空")
+ private String alley;
+
+ @ApiModelProperty("门牌号")
+ @NotBlank(groups = {AddGroup.class}, message = "门牌号不能为空")
+ private String houseNum;
+
+ @ApiModelProperty("小区（组）")
+ private String groupAt;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ @ApiModelProperty("小区类型（1.城镇 2.农村 3.未知）")
+ private Integer type;
+
+ @ApiModelProperty("小区地址")
+ private String address;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("更新时间")
+ private Date updateAt;
+
+ @ApiModelProperty("栋数")
+ private Integer floorTotal = 0;
+
+ @ApiModelProperty("户数")
+ private Integer houseTotal = 0;
+
+ @ApiModelProperty("人口数")
+ private Integer populationTotal = 0;
+
+ @ApiModelProperty("车辆数")
+ private Integer carTotal = 0;
+
+ @ApiModelProperty("名称")
+ private String name;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngAppletsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngAppletsVO.java
new file mode 100644
index 0000000..63a71c7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngAppletsVO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 支援者详情小程序
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-31 15:20
+ **/
+@Data
+@ApiModel("支援者详情小程序")
+public class ComMngVolunteerMngAppletsVO {
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("电话号码")
+ private String phone;
+
+ @ApiModelProperty("照片路径")
+ private String photoPath;
+
+ @ApiModelProperty("积分")
+ private Integer integral;
+
+ @ApiModelProperty("志愿者参加的已经完成的活动")
+ private List<ComActActivityVO> comActActivityVOList;
+
+ @ApiModelProperty("时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java
new file mode 100644
index 0000000..87c6b66
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java
@@ -0,0 +1,137 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.validated.AddGroup;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 志愿者
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-15 09:51
+ **/
+@Data
+@ApiModel("社区》管理》志愿者服务 》志愿者管理")
+public class ComMngVolunteerMngVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("状态：1- 申请；2 - 通过；3 - 驳回")
+ private Integer state;
+
+ @ApiModelProperty("姓名")
+ @NotBlank(groups = {AddGroup.class}, message = "姓名不能为空")
+ private String name;
+
+ @ApiModelProperty("电话号码")
+ private String phone;
+
+ @ApiModelProperty("照片路径")
+ private String photoPath;
+
+ @ApiModelProperty("政治面貌：1 - 党员；2- 团员；3 - 群众")
+ @Min(value = 1, groups = {AddGroup.class}, message = "政治面貌不能为空")
+ private Integer politicalFace;
+
+ @ApiModelProperty("拒绝原因")
+ private String rejectReson;
+
+ @ApiModelProperty("申请原因")
+ @NotBlank(groups = {AddGroup.class}, message = "申请原因不能为空")
+ private String applyReson;
+
+ @ApiModelProperty("居住地址")
+ @NotBlank(groups = {AddGroup.class}, message = "居住地址不能为空")
+ private String address;
+
+ @ApiModelProperty("当前页数")
+ private Long pageNum;
+
+ @ApiModelProperty("每页记录数")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "年龄", example = "15")
+ @Min(value = 1, groups = {AddGroup.class}, message = "年龄不能为空")
+ private Integer age;
+
+ @ApiModelProperty(value = "职业", example = "家庭主妇")
+ @NotBlank(groups = {AddGroup.class}, message = "职业不能为空")
+ private String job;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "积分", hidden = true)
+ private Integer integral;
+
+ @ApiModelProperty(value = "用户userid", hidden = true)
+ @Deprecated
+ private Long userId;
+
+ @ApiModelProperty(value = "申请提交人ID", hidden = true)
+ private Long submitUserId;
+
+ private Long streetId;
+
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+
+ @ApiModelProperty(value = "组织id")
+ private Long orgId;
+
+ @ApiModelProperty(value = "队伍id")
+ private Long teamId;
+
+ @ApiModelProperty(value = "技能id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long skillId;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "组织名称")
+ private String orgName;
+
+ @ApiModelProperty(value = "队伍名称")
+ private String teamName;
+
+ @ApiModelProperty(value = "技能名称")
+ private String skillName;
+
+ @ApiModelProperty(value = "服务类型id")
+ private Long serviceTypeId;
+
+ @ApiModelProperty(value = "服务类型名称")
+ private String serviceTypeName;
+
+ @ApiModelProperty(value = "是否是在校大学生（1.是 2.否）")
+ private Integer isUniversity;
+
+ @Length(max = 30)
+ @ApiModelProperty(value = "大学名称")
+ private String universityName;
+
+ private String communityName;
+ @ApiModelProperty("物业公司Id")
+ private Long propertyId;
+
+ @ApiModelProperty("爱心积分")
+ private String loveIntegral;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseUndercarriageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseUndercarriageVO.java
new file mode 100644
index 0000000..2705a59
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseUndercarriageVO.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotNull;
+
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 房屋租售上下架请求对象
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-22 14:48
+ **/
+@Data
+public class ComOpsHouseUndercarriageVO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 房屋租售记录id
+ */
+ @ApiModelProperty(value = "房屋租售记录id")
+ @NotNull(groups = {PutGroup.class}, message = "租售记录id不能为空")
+ private Long id;
+ /**
+ * 状态 0待审核 1已上架 2已驳回 3已下架
+ */
+ @ApiModelProperty(value = "状态 0待审核 1已上架 2已驳回 3已下架")
+ @NotNull(groups = {PutGroup.class}, message = "状态不可为空")
+ private Integer status;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseVO.java
new file mode 100644
index 0000000..499a4f2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseVO.java
@@ -0,0 +1,162 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 房屋租售
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-22 14:48
+ **/
+@Data
+public class ComOpsHouseVO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ /**
+ * 状态 0待审核 1已上架 2已驳回 3已下架
+ */
+ @ApiModelProperty(value = "状态 0待审核 1已上架 2已驳回 3已下架")
+ private Integer status;
+ /**
+ * 房屋所在社区id
+ */
+ @ApiModelProperty(value = "房屋所在社区id")
+ private Long houseCommunityId;
+ /**
+ * 房屋所在社区名字
+ */
+ @ApiModelProperty(value = "房屋所在社区名字")
+ private String houseCommunityName;
+ /**
+ * 房屋标题
+ */
+ @ApiModelProperty(value = "房屋标题")
+ private String title;
+ /**
+ * 租售类型 1 出租 2 出售
+ */
+ @ApiModelProperty(value = "租售类型 1 出租 2 出售")
+ private Integer houseType;
+ /**
+ * 租房类型 1 整租 2 合租
+ */
+ @ApiModelProperty(value = "租房类型 1 整租 2 合租")
+ private Integer rentType;
+ /**
+ * 价格
+ */
+ @ApiModelProperty(value = "价格")
+ private Double amount;
+ /**
+ * 面积
+ */
+ @ApiModelProperty(value = "面积")
+ private Integer area;
+ /**
+ * 室数量
+ */
+ @ApiModelProperty(value = "室数量")
+ private Integer brn;
+ /**
+ * 厅数量
+ */
+ @ApiModelProperty(value = "厅数量")
+ private Integer lrn;
+ /**
+ * 卫数量
+ */
+ @ApiModelProperty(value = "卫数量")
+ private Integer wcn;
+ /**
+ * 所在楼层
+ */
+ @ApiModelProperty(value = "所在楼层")
+ private Integer floor;
+ /**
+ * 总楼层
+ */
+ @ApiModelProperty(value = "总楼层")
+ private Integer totalFloor;
+ /**
+ * 朝向 0无1东2南3西4北5东南6东北7西南8西北9南北10东西
+ */
+ @ApiModelProperty(value = "朝向 0无1东2南3西4北5东南6东北7西南8西北9南北10东西")
+ private Integer orient;
+ /**
+ * 装修情况
+ */
+ @ApiModelProperty(value = "装修情况")
+ private String decoration;
+ /**
+ * 房屋简介
+ */
+ @ApiModelProperty(value = "房屋简介")
+ private String introduction;
+ /**
+ * 联系方式
+ */
+ @ApiModelProperty(value = "联系方式")
+ private String mobile;
+ /**
+ * 拒绝原因
+ */
+ @ApiModelProperty(value = "拒绝原因")
+ private String reason;
+ /**
+ * 图片地址 多个用逗号隔开
+ */
+ @ApiModelProperty(value = "图片地址 多个用逗号隔开")
+ private String photoPah;
+ /**
+ * 发布人id
+ */
+ @ApiModelProperty(value = "发布人id")
+ private Long userId;
+ /**
+ * 用户类型 1 小程序 2 运营平台 3 社区平台
+ */
+ @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台")
+ private Integer userType;
+ /**
+ * 社区主键
+ */
+ @ApiModelProperty(value = "社区主键")
+ private Long communityId;
+ /**
+ *
+ */
+ @ApiModelProperty(value = "")
+ private LocalDateTime approveAt;
+ /**
+ * 审核人id
+ */
+ @ApiModelProperty(value = "审核人id")
+ private Long approveBy;
+
+ /**
+ * create_at
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+ @ApiModelProperty("发布人名字")
+ private String userName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthPensionerVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthPensionerVO.java
new file mode 100644
index 0000000..8c65edc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthPensionerVO.java
@@ -0,0 +1,84 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @title: ComPensionAuthPensionerVO 养老金人员表实体类
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 养老金人员表实体类
+ * @author: hans
+ * @date: 2021/09/01 16:30
+ */
+@Data
+@ApiModel("养老认证记录")
+public class ComPensionAuthPensionerVO {
+
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "人口id")
+ private Long populationId;
+
+ @ApiModelProperty(value = "街道id")
+ private Long streetId;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+
+ @ApiModelProperty(value = "性别")
+ private Integer sex;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "出生日期")
+ private String birthday;
+
+ @ApiModelProperty(value = "人员类别（1.80-89周岁 2.90-99周岁 3.100周岁（含）以上）")
+ private Integer personnelCategory;
+
+ @ApiModelProperty(value = "是否养老登记（1.是 0.否）")
+ private Integer isRegister;
+
+ @ApiModelProperty(value = "是否健在（1.是 0.否）")
+ private Integer isAlive;
+
+ @ApiModelProperty(value = "居住地址")
+ private String address;
+
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ @ApiModelProperty(value = "养老金开始领取日期")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date receiveAllowanceBegin;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "创建用户")
+ private Long createBy;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty(value = "修改用户")
+ private Long updateBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordExcleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordExcleVO.java
new file mode 100644
index 0000000..b91890d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordExcleVO.java
@@ -0,0 +1,58 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: ComPensionAuthRecordExcleVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 养老认证记录
+ * @author: txb
+ * @date: 2021/09/07 16:16
+ */
+@Data
+@ApiModel("养老认证记录")
+@EncryptDecryptClass
+public class ComPensionAuthRecordExcleVO {
+
+ @ExcelProperty(value = "提交用户", index = 0)
+ private String submitUserName;
+
+ @ExcelProperty(value = "联系电话", index = 1)
+ private String phone;
+
+ @ExcelProperty(value = "认证姓名", index = 2)
+ private String name;
+
+ @ExcelProperty(value = "认证身份证号", index = 3)
+ @EncryptDecryptField
+ private String idCard;
+
+ @ExcelProperty(value = "现居住地址", index = 4)
+ private String address;
+
+ @ExcelProperty(value = "健在", index = 5)
+ private String isAlive;
+
+ @ExcelProperty(value = "认证期数", index = 6)
+ private String authPeriod;
+
+ @ExcelProperty(value = "认证时间", index = 7)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date authDate;
+
+ @ExcelProperty(value = "认证方式", index = 8)
+ private String authMethod;
+
+ @ExcelProperty(value = "标记", index = 9)
+ private String mark;
+
+ @ExcelProperty(value = "审核状态", index = 10)
+ private String approvalStatus;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordImportExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordImportExcelVO.java
new file mode 100644
index 0000000..30f520e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordImportExcelVO.java
@@ -0,0 +1,63 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @title: ComPensionAuthRecordImportExcelVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 养老线下认证导入
+ * @author: txb
+ * @date: 2021/09/08 09:16
+ */
+@Data
+@EncryptDecryptClass
+public class ComPensionAuthRecordImportExcelVO implements Serializable {
+
+ @ExcelProperty(value = "认证姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "认证身份证号码", index = 1)
+ @EncryptDecryptField
+ private String idCard;
+
+ @ExcelProperty(value = "联系电话", index = 2)
+ private String phone;
+
+ @ExcelProperty(value = "现居住地址", index = 3)
+ private String nowAddress;
+
+ @ExcelProperty(value = "认证时间", index = 4)
+ private Date authDate;
+
+ @ExcelProperty(value = "认证期数", index = 5)
+ private String authPeriod;
+
+ @ExcelProperty(value = "标记", index = 6)
+ private String mark;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 性别（1.男 2.女）
+ */
+ private Integer sex;
+
+ /**
+ * 出生年月日
+ */
+ private String birthday;
+
+ /**
+ * 地址
+ */
+ private String address;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordImportMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordImportMistakeExcelVO.java
new file mode 100644
index 0000000..b7562a9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordImportMistakeExcelVO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @title: ComPensionAuthRecordImportMistakeExcelVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 养老线下认证导入错误记录
+ * @author: txb
+ * @date: 2021/09/08 09:16
+ */
+@Data
+@EncryptDecryptClass
+public class ComPensionAuthRecordImportMistakeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "认证姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "认证身份证号码", index = 1)
+ @EncryptDecryptField
+ private String idCard;
+
+ @ExcelProperty(value = "联系电话", index = 2)
+ private String phone;
+
+ @ExcelProperty(value = "现居住地址", index = 3)
+ private String nowAddress;
+
+ @ExcelProperty(value = "认证时间", index = 4)
+ private String authDate;
+
+ @ExcelProperty(value = "健在（是/否）", index = 5)
+ private String isAlive;
+
+ @ExcelProperty(value = "错误信息", index = 6)
+ private String mistake;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordStatisticExcleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordStatisticExcleVO.java
new file mode 100644
index 0000000..e646347
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordStatisticExcleVO.java
@@ -0,0 +1,55 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: ComPensionAuthRecordStatisticExcleVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 养老认证记录统计
+ * @author: txb
+ * @date: 2021/09/08 16:16
+ */
+@Data
+@ApiModel("养老认证记录统计")
+@EncryptDecryptClass
+public class ComPensionAuthRecordStatisticExcleVO {
+
+ @ExcelProperty(value = "联系电话", index = 0)
+ private String phone;
+
+ @ExcelProperty(value = "认证姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "身份证号", index = 2)
+ @EncryptDecryptField
+ private String idCard;
+
+ @ExcelProperty(value = "现居住地址", index = 3)
+ private String address;
+
+ @ExcelProperty(value = "健在", index = 4)
+ private String isAlive;
+
+ @ExcelProperty(value = "认证期数", index = 5)
+ private String authPeriod;
+
+ @ExcelProperty(value = "认证时间", index = 6)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date authDate;
+
+ @ExcelProperty(value = "认证方式", index = 7)
+ private String authMethod;
+
+ @ExcelProperty(value = "标记", index = 8)
+ private String mark;
+
+ @ExcelProperty(value = "认证状态", index = 9)
+ private String authStatus;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordVO.java
new file mode 100644
index 0000000..f403a07
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordVO.java
@@ -0,0 +1,122 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComPensionAuthRecordVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 养老认证记录
+ * @author: hans
+ * @date: 2021/09/01 16:59
+ */
+@Data
+@ApiModel("养老认证记录")
+@EncryptDecryptClass
+public class ComPensionAuthRecordVO {
+
+ @ApiModelProperty(value = "自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty(value = "养老金用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long pensionerId;
+
+ @ApiModelProperty(value = "认证方式（1.视频认证 2.人脸认证）")
+ private Integer authMethod;
+
+ @ApiModelProperty(value = "认证期数")
+ private String authPeriod;
+
+ @ApiModelProperty(value = "提交用户")
+ private Long submitUserId;
+
+ @ApiModelProperty(value = "提交用户姓名")
+ private String submitUserName;
+
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "身份证号")
+ @EncryptDecryptField
+ private String idCard;
+
+ @ApiModelProperty(value = "性别（1.男 2.女 3.其他）")
+ private String sex;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "出生日期")
+ private String birthday;
+
+ @ApiModelProperty(value = "人员类别（1.80-89周岁 2.90-99周岁 3.100周岁（含）以上）")
+ private Integer personnelCategory;
+
+ @ApiModelProperty(value = "是否高龄老人登记（1.是 0.否）")
+ private Integer isRegister;
+
+ @ApiModelProperty(value = "是否健在（1.是 0.否）")
+ private Integer isAlive;
+
+ @ApiModelProperty(value = "居住地址")
+ private String address;
+
+ @ApiModelProperty(value = "认证视频url")
+ private String authVideo;
+
+ @ApiModelProperty(value = "审核人员id")
+ private Long approverId;
+
+ @ApiModelProperty(value = "审核人员名称")
+ private String approverName;
+
+ @ApiModelProperty(value = "审核状态（1.待审核 2.驳回 3.通过）")
+ private Integer approvalStatus;
+
+ @ApiModelProperty(value = "审核时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date approvalDate;
+
+ @ApiModelProperty(value = "标记")
+ private String mark;
+
+ @ApiModelProperty(value = "驳回原因")
+ private String rejectReason;
+
+ @ApiModelProperty(value = "认证状态")
+ private Integer authStatus;
+
+ @ApiModelProperty(value = "认证时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date authDate;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty(value = "待处理id集合")
+ private List<String> nextIds;
+
+ private Long communityId;
+
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPopulationActVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPopulationActVO.java
new file mode 100644
index 0000000..9c53c53
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPopulationActVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("通过社区id查询社区信息返回参数")
+public class ComPopulationActVO {
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+ @ApiModelProperty(value = "社区名称")
+ private String name;
+ @ApiModelProperty(value = "省份名称")
+ private String provinceName;
+ @ApiModelProperty(value = "城市名称")
+ private String cityName;
+ @ApiModelProperty(value = "区域名称")
+ private String districtName;
+ @ApiModelProperty(value = "街道id")
+ private Long streetId;
+ @ApiModelProperty(value = "街道名称")
+ private String streetName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPropertyPublicityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPropertyPublicityVO.java
new file mode 100644
index 0000000..748181d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPropertyPublicityVO.java
@@ -0,0 +1,68 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComPropertyPublicityVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 物业宣传信息
+ * @author: hans
+ * @date: 2021/11/11 10:15
+ */
+@Data
+@ApiModel("物业宣传信息")
+public class ComPropertyPublicityVO {
+
+ @ApiModelProperty("物业宣传id")
+ private Long id;
+
+ @ApiModelProperty("宣传标题")
+ private String title;
+
+ @ApiModelProperty("宣传类型（0.其他 1.停水通知 2.停电通知 3.停气通知 4.物业公告 5.优秀业主）")
+ private Integer publicityType;
+
+ @ApiModelProperty("其他类型自定义名称")
+ private String other;
+
+ @ApiModelProperty("封面")
+ private String cover;
+
+ @ApiModelProperty("内容形式（1.文章链接 2.自定义内容）")
+ private Integer contentType;
+
+ @ApiModelProperty("文章链接")
+ private String articleUrl;
+
+ @ApiModelProperty("自定义内容")
+ private String diyContent;
+
+ @ApiModelProperty("物业公司id")
+ private Long propertyId;
+
+ @ApiModelProperty("物业公司名称")
+ private String propertyName;
+
+ @ApiModelProperty("所属小区")
+ private String villageName;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("浏览量")
+ private Integer viewNum;
+
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createdAt;
+
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updatedAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPropertyVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPropertyVO.java
new file mode 100644
index 0000000..9683d9a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPropertyVO.java
@@ -0,0 +1,100 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("物业公司实体")
+public class ComPropertyVO {
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ private String name;
+
+ /**
+ * 简介
+ */
+ @ApiModelProperty(value = "简介")
+ private String introduction;
+
+ /**
+ * 联系人姓名
+ */
+ @ApiModelProperty(value = "联系人姓名")
+ private String contactName;
+
+ /**
+ * 联系人手机
+ */
+ @ApiModelProperty(value = "联系人手机")
+ private String phone;
+
+ /**
+ * 地址
+ */
+ @ApiModelProperty(value = "地址")
+ private String address;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ @ApiModelProperty("账号")
+ private String account;
+
+ @ApiModelProperty("密码")
+ private String password;
+
+ @ApiModelProperty("权限id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long roleId;
+
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+ @ApiModelProperty("小区名称")
+ private String areaName;
+
+ @ApiModelProperty("小区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long areaId;
+
+ @ApiModelProperty("评价星级（1~5）")
+ private Integer star;
+
+ @ApiModelProperty("红色物业（1.是 2.否）")
+ private Integer isRed;
+
+ @ApiModelProperty("logo")
+ private String logo;
+
+ private String appId;
+
+ private Long createUserId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComRehabilitationPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComRehabilitationPopulationVO.java
new file mode 100644
index 0000000..26f688d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComRehabilitationPopulationVO.java
@@ -0,0 +1,229 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther txb
+ * @create 2021-08-10 15:58:23
+ * @describe 实体类
+ */
+
+@Data
+@ApiModel("刑满释放人员表")
+@EncryptDecryptClass
+public class ComRehabilitationPopulationVO {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("刑满释放人员id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 人口id
+ */
+ @ApiModelProperty("人口id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long populationId;
+
+ /**
+ * 街道id
+ */
+ @ApiModelProperty("街道id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long streetId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ /**
+ * 名字
+ */
+ @ApiModelProperty("名字")
+ private String name;
+
+ /**
+ * 身份证号码
+ */
+ @ApiModelProperty("身份证号码")
+ @EncryptDecryptField
+ private String cardNo;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ /**
+ * 与人员关系
+ */
+ @ApiModelProperty("与人员关系")
+ private String patientRelation;
+
+ /**
+ * 列管原因及类型
+ */
+ @ApiModelProperty("列管原因及类型")
+ private String rehabReasonAndType;
+
+ /**
+ * 是否列管（1.是 0.否）
+ */
+ @ApiModelProperty("是否列管（1.是 0.否）")
+ private Integer isRehab;
+
+ /**
+ * 是否累惯犯（1.是 0.否）
+ */
+ @ApiModelProperty("是否累惯犯（1.是 0.否）")
+ private Integer isRecidivist;
+
+ /**
+ * 原判刑期
+ */
+ @ApiModelProperty("原判刑期")
+ private String originalTerm;
+
+ /**
+ * 服刑日期
+ */
+ @ApiModelProperty("服刑日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date sentenceBegin;
+
+ /**
+ * 原罪名
+ */
+ @ApiModelProperty("原罪名")
+ private String originalCharge;
+
+ /**
+ * 释放日期
+ */
+ @ApiModelProperty("释放日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date sentenceEnd;
+
+ /**
+ * 服刑场所
+ */
+ @ApiModelProperty("服刑场所")
+ private String sentencePlace;
+
+ /**
+ * 危险性评估
+ */
+ @ApiModelProperty("危险性评估")
+ private String riskAssessment;
+
+ /**
+ * 衔接日期
+ */
+ @ApiModelProperty("衔接日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date joinDate;
+
+ /**
+ * 衔接情况
+ */
+ @ApiModelProperty("衔接情况")
+ private String joinSituation;
+
+ /**
+ * 是否重新犯罪（1.是 0.否）
+ */
+ @ApiModelProperty("是否重新犯罪（1.是 0.否）")
+ private Integer isAgainCrime;
+
+ /**
+ * 重新犯罪名称
+ */
+ @ApiModelProperty("重新犯罪名称")
+ private String againCrimeName;
+
+ /**
+ * 安置情况
+ */
+ @ApiModelProperty("安置情况")
+ private String placeSituation;
+
+ /**
+ * 安置日期
+ */
+ @ApiModelProperty("安置日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date placeDate;
+
+ /**
+ * 未安置原因
+ */
+ @ApiModelProperty("未安置原因")
+ private String notPlaceReason;
+
+ /**
+ * 帮教开始
+ */
+ @ApiModelProperty("帮教开始")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date helpBegin;
+
+ /**
+ * 帮教结束
+ */
+ @ApiModelProperty("帮教结束")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date helpEnd;
+
+ /**
+ * 帮教情况
+ */
+ @ApiModelProperty("帮教情况")
+ private String helpSituation;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty("备注")
+ private String remark;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ /**
+ * 创建用户
+ */
+ @ApiModelProperty("创建用户")
+ private Long createBy;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ private Date updateAt;
+
+ /**
+ * 修改用户
+ */
+ @ApiModelProperty("修改用户")
+ private Long updateBy;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComStreetVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComStreetVO.java
new file mode 100644
index 0000000..360fdb3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComStreetVO.java
@@ -0,0 +1,66 @@
+package com.panzhihua.common.model.vos.community;
+
+import javax.validation.constraints.NotBlank;
+
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author: llming
+ * @description: 街道
+ **/
+@Data
+@ApiModel("街道表")
+public class ComStreetVO {
+
+ @ApiModelProperty("街道Id")
+ private Long streetId;
+
+ @ApiModelProperty("街道名字")
+ @NotBlank(groups = {AddGroup.class}, message = "社区名字不能为空")
+ private String name;
+
+ @ApiModelProperty("省份地址编码")
+ @NotBlank(groups = {AddGroup.class}, message = "省份地址编码不能为空")
+ private Integer provinceCode;
+
+ @ApiModelProperty("市级地址编码")
+ @NotBlank(groups = {AddGroup.class}, message = "市级地址编码不能为空")
+ private Integer cityCode;
+
+ @ApiModelProperty("区级地址编码")
+ @NotBlank(groups = {AddGroup.class}, message = "纬度不能为空")
+ private Integer areaCode;
+
+ @ApiModelProperty("街道地址")
+ @NotBlank(groups = {AddGroup.class}, message = "街道地址不能为空")
+ private String address;
+
+ @ApiModelProperty("经度")
+ @NotBlank(groups = {AddGroup.class}, message = "经度不能为空")
+ private String lng;
+
+ @ApiModelProperty("纬度")
+ @NotBlank(groups = {AddGroup.class}, message = "纬度不能为空")
+ private String lat;
+
+ @ApiModelProperty("超管账号")
+ @NotBlank(groups = {AddGroup.class}, message = "超管账号不能为空")
+ private String account;
+
+ @ApiModelProperty("账号密码")
+ @NotBlank(groups = {AddGroup.class}, message = "账号密码不能为空")
+ private String password;
+
+ @ApiModelProperty("行政区域")
+ private String administrativeRegions;
+
+ @ApiModelProperty("调节站电话")
+ private String solvePhone;
+
+ @ApiModelProperty("状态1启用0禁用")
+ private Integer status;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportExcelVO.java
new file mode 100644
index 0000000..75963ac
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportExcelVO.java
@@ -0,0 +1,88 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导出隐患报告台账管理
+ * @author: Null
+ * @date: 2021/7/28 17:11
+ */
+@Data
+public class ComSwDangerReportExcelVO implements Serializable {
+ /**
+ * 小区名称
+ */
+ @ExcelProperty(value = "安全隐患地址", index = 0)
+ private String address;
+ /**
+ * 隐患简述
+ */
+ @ExcelProperty(value = "隐患简述", index = 1)
+ private String dagerDescription;
+
+ /**
+ * 隐患类型
+ */
+ @ExcelProperty(value = "隐患类型", index = 2)
+ private String dangerType;
+
+ /**
+ * 状态
+ */
+ @ExcelProperty(value = "状态", index = 3)
+ private String status;
+
+ /**
+ * 风险等级
+ */
+ @ExcelProperty(value = "风险等级", index = 4)
+ private String dangerLevel;
+
+ /**
+ * 巡查人员
+ */
+ @ExcelProperty(value = "巡查人员", index = 5)
+ private String ppersonName;
+
+ /**
+ * 联系电话
+ */
+ @ExcelProperty(value = "联系电话", index = 6)
+ private String ppersonPhone;
+
+ /**
+ * 填报时间
+ */
+ @ExcelProperty(value = "填报时间", index = 7)
+ private Date createAt;
+
+ /**
+ * 备注
+ */
+ @ExcelProperty(value = "备注", index = 8)
+ private String remark;
+
+ /**
+ * 整改人员
+ */
+ @ExcelProperty(value = "整改人员", index = 9)
+ private String dpersonName;
+
+ /**
+ * 联系电话
+ */
+ @ExcelProperty(value = "联系电话", index = 10)
+ private String dpersonPhone;
+
+ /**
+ * 整改时间
+ */
+ @ExcelProperty(value = "整改时间", index = 11)
+ private Date rectifyTime;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java
new file mode 100644
index 0000000..6a6c500
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java
@@ -0,0 +1,329 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther txb
+ * @create 2021-07-23 14:38:38
+ * @describe 社区》安全工作》巡查记录实体类
+ */
+
+@Data
+@ApiModel("隐患报告表")
+public class ComSwDangerReportVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 隐患报告id
+ */
+ @ApiModelProperty("隐患报告id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区名称")
+ private String communityName;
+
+ /**
+ * 巡查时间
+ */
+ @ApiModelProperty("巡查时间")
+ private String PatrolTime;
+
+ /**
+ * (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
+ */
+ @ApiModelProperty("巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)，多条以逗号隔开")
+ private String patrolType;
+
+ /**
+ * 巡查领导id
+ */
+ @ApiModelProperty("巡查领导id")
+ private String patrolLeader;
+
+ /**
+ * 巡查领导名字
+ */
+ @ApiModelProperty("巡查领导名字")
+ private String patrolLeaderName;
+
+ /**
+ * 巡查人员，多个以逗号隔开
+ */
+ @ApiModelProperty("巡查人员id，多个以逗号隔开")
+ private String patrolPerson;
+
+ /**
+ * 巡查人员名字，多个以逗号隔开
+ */
+ @ApiModelProperty("巡查人员名字，多个以逗号隔开")
+ private String pPersonName;
+
+ /**
+ * 巡查人员电话，多个以逗号隔开
+ */
+ @ApiModelProperty("巡查人员电话，多个以逗号隔开")
+ private String pPersonPhone;
+
+ /**
+ * 巡查地址
+ */
+ @ApiModelProperty("巡查地址")
+ private String address;
+
+ /**
+ * 巡查记录
+ */
+ @ApiModelProperty("巡查记录")
+ private String recordContent;
+
+ /**
+ * 发现记录
+ */
+ @ApiModelProperty("发现记录")
+ private String findRecord;
+
+ /**
+ * 记录照片
+ */
+ @ApiModelProperty("记录照片")
+ private String recordPhoto;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty("备注")
+ private String remark;
+
+ /**
+ * 是否存在隐患（1是 、0否）
+ */
+ @ApiModelProperty("是否存在隐患（1是 、0否）")
+ private Integer isHiddenDanger;
+
+ /**
+ * 隐患名称
+ */
+ @ApiModelProperty("隐患名称")
+ private String dangerName;
+
+ /**
+ * 排查时间
+ */
+ @ApiModelProperty("排查时间")
+ private String checkTime;
+
+ /**
+ * 主体部门、单位或个人全称
+ */
+ @ApiModelProperty("主体部门、单位或个人全称")
+ private String unitName;
+
+ /**
+ * 隐患简述
+ */
+ @ApiModelProperty("隐患简述")
+ private String dagerDescription;
+
+ /**
+ * 隐患编号
+ */
+ @ApiModelProperty("隐患编号")
+ private Integer dangerNo;
+
+ /**
+ * 隐患类型（1.火灾隐患 2.汛情隐患 3.疫情隐患）
+ */
+ @ApiModelProperty("隐患类型（1.火灾隐患 2.汛情隐患 3.疫情隐患）")
+ private String dangerType;
+
+ /**
+ * 状态（1.待查看 2.待处理 3.待整改 4.已整改）
+ */
+ @ApiModelProperty("状态（1.待处理 2.待整改 3.已整改）")
+ private String status;
+
+ /**
+ * 风险等级（1.红色预警 2.橙色预警 3.黄色预警 4.蓝色预警）
+ */
+ @ApiModelProperty("风险等级（1.红色预警 2.橙色预警 3.黄色预警 4.蓝色预警）")
+ private String dangerLevel;
+
+ /**
+ * 是否立即整改（1是 、0否）
+ */
+ @ApiModelProperty("是否立即整改（1是 、0否）")
+ private Integer isRectifyImmediately;
+
+ /**
+ * 采取措施
+ */
+ @ApiModelProperty("采取措施")
+ private String takeSteps;
+
+ /**
+ * 采取措施照片
+ */
+ @ApiModelProperty("采取措施照片")
+ private String stepsPhoto;
+
+ /**
+ * 整改人员
+ */
+ @ApiModelProperty("整改人员")
+ private String rectifyPerson;
+
+ /**
+ * 整改人员名字，多个以逗号隔开
+ */
+ @ApiModelProperty("整改人员名字，多个以逗号隔开")
+ private String dPersonName;
+
+ /**
+ * 整改人员电话，多个以逗号隔开
+ */
+ @ApiModelProperty("整改人员电话，多个以逗号隔开")
+ private String dPersonPhone;
+
+ /**
+ * 整改时间
+ */
+ @ApiModelProperty("整改时间")
+ private String rectifyTime;
+
+ /**
+ * 社区处理建议
+ */
+ @ApiModelProperty("社区处理建议")
+ private String communitySuggestion;
+
+ /**
+ * 街道安全人员管理建议
+ */
+ @ApiModelProperty("街道安全人员管理建议")
+ private String streetSuggestion;
+
+ /**
+ * 承办记录
+ */
+ @ApiModelProperty("承办记录")
+ private String undertakeRecord;
+
+ /**
+ * 领导意见
+ */
+ @ApiModelProperty("领导意见")
+ private String leaderSuggestion;
+
+ /**
+ * 指派人员
+ */
+ @ApiModelProperty("指派人员")
+ private String assignPerson;
+
+ @ApiModelProperty("指派人员名称")
+ private String assignPersonName;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty("创建人")
+ private Long createBy;
+
+ @ApiModelProperty("创建人姓名")
+ private String createName;
+
+ @ApiModelProperty("巡查人姓名")
+ private String personName;
+
+ /**
+ * 是否指派
+ */
+ @ApiModelProperty("是否指派(1.是 0.否)")
+ private Integer isAssign;
+
+ @ApiModelProperty("巡查人员名称")
+ private String patrolName;
+
+ /**
+ * 接班领导id
+ */
+ @ApiModelProperty("接班领导id")
+ private String successionLeader;
+
+ /**
+ * 接班领导名字
+ */
+ @ApiModelProperty("接班领导名字")
+ private String successionLeaderName;
+
+ /**
+ * 接班人员id
+ */
+ @ApiModelProperty("接班人员id")
+ private String successionPerson;
+
+ /**
+ * 接班人员名字
+ */
+ @ApiModelProperty("接班人员名字")
+ private String successionPersonName;
+
+ /**
+ * 接班时间
+ */
+ @ApiModelProperty("接班时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date successionTime;
+
+ /**
+ * 巡查类型
+ */
+ public interface patrolType {
+ int huo = 1;
+ int xun = 2;
+ int yi = 3;
+ }
+
+ /**
+ * 是否
+ */
+ public interface isOk {
+ int yes = 1;
+ int no = 0;
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordStatisticsVO.java
new file mode 100644
index 0000000..0032158
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordStatisticsVO.java
@@ -0,0 +1,105 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 巡查记录统计返回参数
+ */
+@Data
+@ApiModel("巡查记录统计返回参数")
+public class ComSwPatrolRecordStatisticsVO {
+
+ /**
+ * 巡查记录总数
+ */
+ @ApiModelProperty("巡查记录总数")
+ private Long patrolRecordTotal;
+ /**
+ * 防火巡查
+ */
+ @ApiModelProperty("防火巡查")
+ private Integer huoTotal;
+ /**
+ * 防汛巡查
+ */
+ @ApiModelProperty("防汛巡查")
+ private Integer xunTotal;
+ /**
+ * 防疫巡查
+ */
+ @ApiModelProperty("防疫巡查")
+ private Integer yiTotal;
+ /**
+ * 安全工作记录总数
+ */
+ @ApiModelProperty("安全工作记录总数")
+ private Integer safetyWorkTotal;
+
+ /**
+ * 隐患报告总数
+ */
+ @ApiModelProperty("隐患报告总数")
+ private Integer dangerTotal;
+
+ /**
+ * 已处理隐患总数
+ */
+ @ApiModelProperty("已处理隐患数")
+ private Integer handledDangerTotal;
+
+ /**
+ * 火灾隐患总数
+ */
+ @ApiModelProperty("火灾隐患总数")
+ private Integer huoDangerTotal;
+
+ /**
+ * 汛情隐患总数
+ */
+ @ApiModelProperty("汛情隐患总数")
+ private Integer xunDangerTotal;
+
+ /**
+ * 疫情隐患总数
+ */
+ @ApiModelProperty("疫情隐患总数")
+ private Integer yiDangerTotal;
+
+ /**
+ * 已整改火灾隐患总数
+ */
+ @ApiModelProperty("已整改火灾隐患总数")
+ private Integer huoHandledDangerTotal;
+
+ /**
+ * 未整改火灾隐患总数
+ */
+ @ApiModelProperty("未整改火灾隐患总数")
+ private Integer huoHandlingDangerTotal;
+
+ /**
+ * 已整改汛情隐患总数
+ */
+ @ApiModelProperty("已整改汛情隐患总数")
+ private Integer xunHandledDangerTotal;
+
+ /**
+ * 未整改汛情隐患总数
+ */
+ @ApiModelProperty("未整改汛情隐患总数")
+ private Integer xunHandlingDangerTotal;
+
+ /**
+ * 已整改疫情隐患总数
+ */
+ @ApiModelProperty("已整改疫情隐患总数")
+ private Integer yiHandledDangerTotal;
+
+ /**
+ * 未整改疫情隐患总数
+ */
+ @ApiModelProperty("未整改疫情隐患总数")
+ private Integer yiHandlingDangerTotal;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java
new file mode 100644
index 0000000..63b8ff1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java
@@ -0,0 +1,246 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther txb
+ * @create 2021-07-23 14:38:38
+ * @describe 社区》安全工作》巡查记录实体类
+ */
+
+@Data
+@ApiModel("巡查记录表")
+public class ComSwPatrolRecordVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 巡查记录id
+ */
+ @ApiModelProperty("巡查记录id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ /**
+ * 报告id
+ */
+ @ApiModelProperty("报告id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long reportId;
+
+ /**
+ * 巡查时间
+ */
+ @ApiModelProperty("巡查时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date patrolTime;
+
+ /**
+ * (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
+ */
+ @ApiModelProperty("巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)，多条以逗号隔开")
+ private String patrolType;
+
+ /**
+ * 巡查领导
+ */
+ @ApiModelProperty("巡查领导")
+ private String patrolLeader;
+
+ /**
+ * 巡查人员
+ */
+ @ApiModelProperty("巡查人员")
+ private String patrolPerson;
+
+ /**
+ * 巡查人员名字，多个以逗号隔开
+ */
+ @ApiModelProperty("巡查人员名字，多个以逗号隔开")
+ private String personName;
+
+ /**
+ * 巡查人员电话，多个以逗号隔开
+ */
+ @ApiModelProperty("巡查人员电话，多个以逗号隔开")
+ private String personPhone;
+
+ /**
+ * 巡查地址
+ */
+ @ApiModelProperty("巡查地址")
+ private String address;
+
+ /**
+ * 巡查记录
+ */
+ @ApiModelProperty("巡查记录")
+ private String recordContent;
+
+ /**
+ * 发现记录
+ */
+ @ApiModelProperty("发现记录")
+ private String findRecord;
+
+ /**
+ * 记录照片
+ */
+ @ApiModelProperty("记录照片")
+ private String recordPhoto;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty("备注")
+ private String remark;
+
+ /**
+ * 接班领导
+ */
+ @ApiModelProperty("接班领导")
+ private String successionLeader;
+
+ /**
+ * 接班人员
+ */
+ @ApiModelProperty("接班人员")
+ private String successionPerson;
+
+ /**
+ * 接班时间
+ */
+ @ApiModelProperty("接班时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date successionTime;
+
+ /**
+ * 是否存在隐患（1是 、0否）
+ */
+ @ApiModelProperty("是否存在隐患（1是 、0否）")
+ private Integer isHiddenDanger;
+
+ /**
+ * 隐患名称
+ */
+ @ApiModelProperty("隐患名称")
+ private String dagerName;
+
+ /**
+ * 排查时间
+ */
+ @ApiModelProperty("排查时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date checkTime;
+
+ /**
+ * 主体部门、单位或个人全称
+ */
+ @ApiModelProperty("主体部门、单位或个人全称")
+ private String unitName;
+
+ /**
+ * 隐患简述
+ */
+ @ApiModelProperty("隐患简述")
+ private String dagerDescription;
+
+ /**
+ * 是否立即整改（1是 、0否）
+ */
+ @ApiModelProperty("是否立即整改（1是 、0否）")
+ private Integer isRectifyImmediately;
+
+ /**
+ * 采取措施
+ */
+ @ApiModelProperty("采取措施")
+ private String takeSteps;
+
+ /**
+ * 采取措施照片
+ */
+ @ApiModelProperty("采取措施照片")
+ private String stepsPhoto;
+
+ /**
+ * 整改人员
+ */
+ @ApiModelProperty("整改人员")
+ private String rectifyPerson;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty("创建人")
+ private Long createBy;
+
+ @ApiModelProperty("填报人名称")
+ private String createName;
+
+ /**
+ * 安全记录/隐患报告显示按钮
+ */
+ @ApiModelProperty("安全记录/隐患报告显示按钮（1.查看安全工作记录 2.隐患报告待填写 3.查看隐患报告）")
+ private Integer displayButton;
+
+ @ApiModelProperty("隐患/安全记录id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long serviceId;
+
+ @ApiModelProperty("隐患or安全记录（1.隐患 2.安全记录）")
+ private Integer dangerOrRecord;
+
+ @ApiModelProperty("社区名字")
+ private String communityName;
+
+ @ApiModelProperty("隐患编号")
+ private Integer dagerNo;
+
+ /**
+ * 巡查类型
+ */
+ public interface patrolType {
+ int huo = 1;
+ int xun = 2;
+ int yi = 3;
+ }
+
+ /**
+ * 是否
+ */
+ public interface isOk {
+ int yes = 1;
+ int no = 0;
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaExcelVO.java
new file mode 100644
index 0000000..64c9a23
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaExcelVO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @description: 批量导入值班表
+ * @author: Null
+ * @date: 2021/7/31 11:11
+ */
+@Data
+public class ComSwRotaExcelVO implements Serializable {
+ /**
+ * 时间
+ */
+ @ExcelProperty(value = "时间", index = 0)
+ private String rotaDate;
+
+ /**
+ * 值班人员
+ */
+ @ExcelProperty(value = "值班人员", index = 1)
+ private String personName;
+
+ /**
+ * 值班人员联系电话
+ */
+ @ExcelProperty(value = "值班人员联系电话", index = 2)
+ private String personPhone;
+
+ /**
+ * 值班领导
+ */
+ @ExcelProperty(value = "值班领导(多个以逗号隔开)", index = 3)
+ private String leaderName;
+
+ /**
+ * 值班人员联系电话
+ */
+ @ExcelProperty(value = "值班领导联系电话(多个以逗号隔开)", index = 4)
+ private String leaderPhone;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaPersonVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaPersonVO.java
new file mode 100644
index 0000000..0664b8d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaPersonVO.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther txb
+ * @create 2021-07-23 14:38:38
+ * @describe 社区》安全工作》值班人员信息
+ */
+
+@Data
+@ApiModel("值班人员信息")
+public class ComSwRotaPersonVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * id
+ */
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 值班人
+ */
+ @ApiModelProperty("值班人")
+ private String name;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ @ApiModelProperty("头像url")
+ private String imageUrl;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaVO.java
new file mode 100644
index 0000000..0ae2ed0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwRotaVO.java
@@ -0,0 +1,85 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther txb
+ * @create 2021-07-23 14:38:38
+ * @describe 社区》安全工作》值班表
+ */
+
+@Data
+@ApiModel("值班表")
+public class ComSwRotaVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 值班表id
+ */
+ @ApiModelProperty("值班表id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ /**
+ * 星期
+ */
+ @ApiModelProperty("星期")
+ private String weekDay;
+
+ /**
+ * 值班时间
+ */
+ @ApiModelProperty("值班时间")
+ private String rotaDate;
+
+ /**
+ * 值班领导，多个以逗号隔开
+ */
+ @ApiModelProperty("值班领导，多个以逗号隔开")
+ private String rotaLeader;
+
+ /**
+ * 领导名字，多个以逗号隔开
+ */
+ @ApiModelProperty("领导名字，多个以逗号隔开")
+ private String leaderName;
+
+ /**
+ * 领导联系电话，多个以逗号隔开
+ */
+ @ApiModelProperty("领导联系电话，多个以逗号隔开")
+ private String leaderPhone;
+
+ /**
+ * 值班人员，多个以逗号隔开
+ */
+ @ApiModelProperty("值班人员，多个以逗号隔开")
+ private String rotaPerson;
+
+ /**
+ * 人员联系电话，多个以逗号隔开
+ */
+ @ApiModelProperty("人员联系电话，多个以逗号隔开")
+ private String personName;
+
+ /**
+ * 人员联系电话，多个以逗号隔开
+ */
+ @ApiModelProperty("人员联系电话，多个以逗号隔开")
+ private String personPhone;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java
new file mode 100644
index 0000000..607c13a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwSafetyWorkRecordVO.java
@@ -0,0 +1,170 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther txb
+ * @create 2021-07-23 14:38:38
+ * @describe 社区》安全工作》巡查记录实体类
+ */
+
+@Data
+@ApiModel("安全工作记录表")
+public class ComSwSafetyWorkRecordVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 安全工作记录id
+ */
+ @ApiModelProperty("安全工作记录id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ /**
+ * 社区名称
+ */
+ @ApiModelProperty("社区名称")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private String communityName;
+
+ /**
+ * 巡查时间
+ */
+ @ApiModelProperty("巡查时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date patrolTime;
+
+ /**
+ * (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
+ */
+ @ApiModelProperty("巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)，多条以逗号隔开")
+ private String patrolType;
+
+ /**
+ * 巡查领导id
+ */
+ @ApiModelProperty("巡查领导id")
+ private String patrolLeader;
+
+ /**
+ * 巡查人员
+ */
+ @ApiModelProperty("巡查人员")
+ private String patrolPerson;
+
+ /**
+ * 巡查地址
+ */
+ @ApiModelProperty("巡查地址")
+ private String address;
+
+ /**
+ * 巡查记录
+ */
+ @ApiModelProperty("巡查记录")
+ private String recordContent;
+
+ /**
+ * 发现记录
+ */
+ @ApiModelProperty("发现记录")
+ private String findRecord;
+
+ /**
+ * 记录照片
+ */
+ @ApiModelProperty("记录照片")
+ private String recordPhoto;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty("备注")
+ private String remark;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty("创建人")
+ private Long createBy;
+
+ @ApiModelProperty("填报人名字")
+ private String createName;
+
+ /**
+ * 巡查人员名字，多个以逗号隔开
+ */
+ @ApiModelProperty("巡查人员名字，多个以逗号隔开")
+ private String personName;
+
+ /**
+ * 接班领导id
+ */
+ @ApiModelProperty("接班领导id")
+ private String successionLeader;
+
+ /**
+ * 接班领导名字
+ */
+ @ApiModelProperty("接班领导名字")
+ private String successionLeaderName;
+
+ /**
+ * 接班人员id
+ */
+ @ApiModelProperty("接班人员id")
+ private String successionPerson;
+
+ /**
+ * 接班人员名字
+ */
+ @ApiModelProperty("接班人员名字")
+ private String successionPersonName;
+
+ /**
+ * 接班时间
+ */
+ @ApiModelProperty("接班时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date successionTime;
+
+ /**
+ * 巡查类型
+ */
+ public interface patrolType {
+ int huo = 1;
+ int xun = 2;
+ int yi = 3;
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComVeteransPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComVeteransPopulationVO.java
new file mode 100644
index 0000000..c38ec3b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComVeteransPopulationVO.java
@@ -0,0 +1,356 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther txb
+ * @create 2021-08-09 19:48:54
+ * @describe 实有人口导入》退役军人表实体类
+ */
+
+@Data
+@ApiModel("退役军人表")
+@EncryptDecryptClass
+public class ComVeteransPopulationVO {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("退役军人id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 人口id
+ */
+ @ApiModelProperty("人口id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long populationId;
+
+ /**
+ * 街道id
+ */
+ @ApiModelProperty("街道id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long streetId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ /**
+ * 名字
+ */
+ @ApiModelProperty("名字")
+ private String name;
+
+ /**
+ * 身份证号码
+ */
+ @ApiModelProperty("身份证号码")
+ @EncryptDecryptField
+ private String cardNo;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ /**
+ * 人员状态：正常、失联、出国(取字典表）
+ */
+ @ApiModelProperty("人员状态：正常、失联、出国(取字典表）")
+ private String personStatus;
+
+ /**
+ * 机构
+ */
+ @ApiModelProperty("机构")
+ private String organization;
+
+ /**
+ * 照片
+ */
+ @ApiModelProperty("照片")
+ private String photo;
+
+ /**
+ * 户籍性质
+ */
+ @ApiModelProperty("户籍性质")
+ private String regiterNature;
+
+ /**
+ * 入伍时间
+ */
+ @ApiModelProperty("入伍时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date enlistDate;
+
+ /**
+ * 退伍时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty("退伍时间")
+ private Date retireDate;
+
+ /**
+ * 人员类别
+ */
+ @ApiModelProperty("人员类别")
+ private String personCategory;
+
+ /**
+ * 住房状况
+ */
+ @ApiModelProperty("住房状况")
+ private String houseSituation;
+
+ /**
+ * 住房状况其他
+ */
+ @ApiModelProperty("住房状况其他")
+ private String houseSituationOther;
+
+ /**
+ * 建筑面积
+ */
+ @ApiModelProperty("建筑面积")
+ private String buildArea;
+
+ /**
+ * 现就业情况
+ */
+ @ApiModelProperty("现就业情况")
+ private String employmentSituation;
+
+ /**
+ * 在职情况类型
+ */
+ @ApiModelProperty("在职情况类型")
+ private String incumbencyType;
+
+ /**
+ * 现就业情况其他
+ */
+ @ApiModelProperty("现就业情况其他")
+ private String employmentSituationOther;
+
+ /**
+ * 养老保险
+ */
+ @ApiModelProperty("养老保险")
+ private String endowmentInsurance;
+
+ /**
+ * 医疗保险
+ */
+ @ApiModelProperty("医疗保险")
+ private String medicalInsurance;
+
+ /**
+ * 现个人年收入（单位：元）
+ */
+ @ApiModelProperty("现个人年收入（单位：元）")
+ private String annualIncome;
+
+ /**
+ * 父亲健康状况
+ */
+ @ApiModelProperty("父亲健康状况")
+ private String fatherHealthy;
+
+ /**
+ * 母亲健康状况
+ */
+ @ApiModelProperty("母亲健康状况")
+ private String motherHealthy;
+
+ /**
+ * 配偶健康状况
+ */
+ @ApiModelProperty("配偶健康状况")
+ private String spouseHealthy;
+
+ /**
+ * 儿子健康状况
+ */
+ @ApiModelProperty("儿子健康状况")
+ private String sonHealthy;
+
+ /**
+ * 女儿健康状况
+ */
+ @ApiModelProperty("女儿健康状况")
+ private String daughterDealthy;
+
+ /**
+ * 主要困难
+ */
+ @ApiModelProperty("主要困难")
+ private String mainDifficulty;
+
+ /**
+ * 其他困难
+ */
+ @ApiModelProperty("其他困难")
+ private String otherDifficulty;
+
+ /**
+ * 主要诉求
+ */
+ @ApiModelProperty("主要诉求")
+ private String mainDemand;
+
+ /**
+ * 主要诉求其他事项问题（手填）
+ */
+ @ApiModelProperty("主要诉求其他事项问题（手填）")
+ private String mainDemandOther;
+
+ /**
+ * 需参加的学历培训
+ */
+ @ApiModelProperty("需参加的学历培训")
+ private String academicTraining;
+
+ /**
+ * 是否已参加退役军人培训（政府性质）1.是 2.否
+ */
+ @ApiModelProperty("是否已参加退役军人培训（政府性质）1.是 2.否")
+ private Integer isVeteransTraining;
+
+ /**
+ * 入伍前学历
+ */
+ @ApiModelProperty("入伍前学历")
+ private String educationBeforeEnlistment;
+
+ /**
+ * 再教育学历
+ */
+ @ApiModelProperty("再教育学历")
+ private String reEducation;
+
+ /**
+ * 所学专业
+ */
+ @ApiModelProperty("所学专业")
+ private String major;
+
+ /**
+ * 所学专业其他
+ */
+ @ApiModelProperty("所学专业其他")
+ private String majorOther;
+
+ /**
+ * 曾从事行业（含现从事行业）
+ */
+ @ApiModelProperty("曾从事行业（含现从事行业）")
+ private String onceEngagedIndustry;
+
+ /**
+ * 曾从事行业（含现从事行业）其他（手填）
+ */
+ @ApiModelProperty("曾从事行业（含现从事行业）其他（手填）")
+ private String onceEngagedIndustryOther;
+
+ /**
+ * 意向就业地点
+ */
+ @ApiModelProperty("意向就业地点")
+ private String intendedPlaceOfEmployment;
+
+ /**
+ * 意向就业地点其他地区（手填）
+ */
+ @ApiModelProperty("意向就业地点其他地区（手填）")
+ private String intendedPlaceOfEmploymentOther;
+
+ /**
+ * 待业期间的求职意向
+ */
+ @ApiModelProperty("待业期间的求职意向")
+ private String unemploymedEngagedIndustry;
+
+ /**
+ * 待业期间的求职意向其他（手填）
+ */
+ @ApiModelProperty("待业期间的求职意向其他（手填）")
+ private String unemploymedEngagedIndustryOther;
+
+ /**
+ * 是否有创业意愿（1.是 2.否）
+ */
+ @ApiModelProperty("是否有创业意愿（1.是 2.否）")
+ private Integer isBusiness;
+
+ /**
+ * 创业意愿
+ */
+ @ApiModelProperty("创业意愿")
+ private String businessDesire;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty("备注")
+ private String remark;
+
+ /**
+ * 填表单位
+ */
+ @ApiModelProperty("填表单位")
+ private String fillUnit;
+
+ /**
+ * 填表人
+ */
+ @ApiModelProperty("填表人")
+ private String fillPerson;
+
+ /**
+ * 填表人联系电话
+ */
+ @ApiModelProperty("填表人联系电话")
+ private String fillPersonPhone;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ /**
+ * 创建用户
+ */
+ @ApiModelProperty("创建用户")
+ private Long createBy;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ private Date updateAt;
+
+ /**
+ * 修改用户
+ */
+ @ApiModelProperty("修改用户")
+ private Long updateBy;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/CommunityActivitiesVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/CommunityActivitiesVO.java
new file mode 100644
index 0000000..ea74361
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/CommunityActivitiesVO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 社区活动情况
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-28 15:08
+ **/
+@Data
+@ApiModel("社区活动情况")
+public class CommunityActivitiesVO {
+ @ApiModelProperty("随手拍")
+ private Integer eashPhoto;
+ @ApiModelProperty("微心愿")
+ private Integer microWish;
+ @ApiModelProperty("社区活动")
+ private Integer actActivity;
+ @ApiModelProperty("党员活动")
+ private Integer pbActivity;
+ @ApiModelProperty("一起议")
+ private Integer discuss;
+ @ApiModelProperty("日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date date;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/CommunityGovernanceTrendsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/CommunityGovernanceTrendsVO.java
new file mode 100644
index 0000000..fb55942
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/CommunityGovernanceTrendsVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 社区治理动态
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-28 15:04
+ **/
+@Data
+@ApiModel("社区治理动态")
+public class CommunityGovernanceTrendsVO {
+ @ApiModelProperty("治理类型")
+ private List<String> x;
+ @ApiModelProperty("动态条数")
+ private List<String> y;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/CommunityPublicityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/CommunityPublicityVO.java
new file mode 100644
index 0000000..47b1da1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/CommunityPublicityVO.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.vos.community;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("社区宣传表")
+public class CommunityPublicityVO {
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ /**
+ * 内容
+ */
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/DataCount.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/DataCount.java
new file mode 100644
index 0000000..2fa7706
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/DataCount.java
@@ -0,0 +1,16 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("问题清单、需求清单、报到服务活动数量")
+public class DataCount {
+ @ApiModelProperty("问题清单数")
+ private Integer questions;
+ @ApiModelProperty("需求清单数")
+ private Integer demands;
+ @ApiModelProperty("报道服务活动数")
+ private Integer activities;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EditComMngPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EditComMngPopulationVO.java
new file mode 100644
index 0000000..19674b2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EditComMngPopulationVO.java
@@ -0,0 +1,153 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotBlank;
+
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import com.panzhihua.common.model.helper.sensitive.Sensitive;
+import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 实有人口Vo
+ */
+@Data
+@ApiModel("实有人口编辑表")
+@EncryptDecryptClass
+public class EditComMngPopulationVO implements Serializable {
+
+ /**
+ * 自增 id
+ */
+ @ApiModelProperty("实有人口id")
+ private Long id;
+ /**
+ * 小区id（实有房屋id）
+ */
+ @ApiModelProperty("小区id（实有房屋id）")
+ private Integer villageId;
+ /**
+ * 家庭成员（姓名）
+ */
+ @ApiModelProperty("家庭成员（姓名）")
+ @NotBlank(groups = {AddGroup.class}, message = "家庭成员（姓名）不可为空")
+ private String name;
+
+ @ApiModelProperty("性别（1.男 2.女 3.未知）")
+ @NotBlank(groups = {AddGroup.class}, message = "性别不可为空")
+ private Integer sex;
+
+ @ApiModelProperty("年龄")
+ @NotBlank(groups = {AddGroup.class}, message = "年龄不可为空")
+ private Integer age;
+
+ @NotBlank(groups = {AddGroup.class}, message = "身份证号码不可为空")
+ @ApiModelProperty("身份证号码")
+ @EncryptDecryptField
+ @Sensitive(strategy = SensitiveStrategy.ID_CARD)
+ private String cardNo;
+
+ @ApiModelProperty("街路巷")
+ @NotBlank(groups = {AddGroup.class}, message = "街路巷不可为空")
+ private String road;
+
+ @ApiModelProperty("门牌号")
+ @NotBlank(groups = {AddGroup.class}, message = "门牌号不可为空")
+ private String doorNo;
+
+ @ApiModelProperty("楼排号")
+ @NotBlank(groups = {AddGroup.class}, message = "楼排号不可为空")
+ private String floor;
+
+ @ApiModelProperty("单元号")
+ @NotBlank(groups = {AddGroup.class}, message = "单元号不可为空")
+ private String unitNo;
+
+ @ApiModelProperty("户室（房间号）")
+ @NotBlank(groups = {AddGroup.class}, message = "户室（房间号）不可为空")
+ private String houseNo;
+
+ @ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
+ @NotBlank(groups = {AddGroup.class}, message = "政治面貌不可为空")
+ private Integer politicalOutlook;
+
+ @ApiModelProperty("工作单位")
+ private String workCompany;
+
+ @ApiModelProperty("特殊情况")
+ private String specialSituation;
+
+ @ApiModelProperty("联系方式")
+ @NotBlank(groups = {AddGroup.class}, message = "联系方式不可为空")
+ @EncryptDecryptField
+ @Sensitive(strategy = SensitiveStrategy.ID_CARD)
+ private String phone;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("标签集合（多个标签以,隔开,如物业工作人员,物业")
+ private String label;
+
+ @ApiModelProperty("籍贯")
+ private String nativePlace;
+
+ @ApiModelProperty("民族")
+ private String nation;
+
+ @ApiModelProperty("小区名字")
+ private String alley;
+
+ @ApiModelProperty("是否租住 是否租住(0.否 1.是)")
+ @NotBlank(groups = {AddGroup.class}, message = "是否租住不可为空")
+ private Integer isRent;
+
+ @ApiModelProperty("文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)")
+ private Integer cultureLevel;
+
+ @ApiModelProperty("婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)")
+ private Integer marriage;
+
+ @ApiModelProperty("健康状况")
+ private String healthy;
+
+ @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
+ private Integer relation;
+
+ @ApiModelProperty("外地or本地（1.本地 2.外地）")
+ private Integer outOrLocal;
+
+ @ApiModelProperty("户口所在地")
+ private String censusRegister;
+
+ public interface sex {
+ int nan = 1;
+ int nv = 2;
+ int no = 3;
+ }
+
+ /**
+ * 是否租住
+ */
+ public interface isOk {
+ int yes = 1;
+ int no = 0;
+ }
+
+ /**
+ * 政治面貌
+ */
+ public interface politicalOutlook {
+ int dang = 1;
+ int tuan = 3;
+ int wu = 12;
+ int qun = 13;
+ int no = 13;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthDetailsVO.java
new file mode 100644
index 0000000..0ba505a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthDetailsVO.java
@@ -0,0 +1,86 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import com.panzhihua.common.model.helper.sensitive.Sensitive;
+import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel("高龄认证返回参数")
+@EncryptDecryptClass
+public class EldersAuthDetailsVO {
+
+ @ApiModelProperty(value = "ID")
+ private Long id;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "认证时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "更新人")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty(value = "身份证")
+ @Sensitive(strategy = SensitiveStrategy.ID_CARD)
+ @EncryptDecryptField
+ private String idCard;
+
+ @ApiModelProperty(value = "认证人姓名")
+ private String authUserName;
+
+ @ApiModelProperty(value = "视频地址")
+ private String videoUrl;
+
+ @ApiModelProperty(value = "提交人")
+ private Long sumitUserId;
+
+ @ApiModelProperty(value = "户籍地")
+ private String domicile;
+
+ @ApiModelProperty(value = "状态")
+ private String status;
+
+ @ApiModelProperty(value = "出生日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date birthDay;
+
+ @ApiModelProperty(value = "申请人")
+ private String submitUserName;
+
+ @ApiModelProperty(value = "申请账号")
+ private String submitUserAccount;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "社区反馈")
+ private List<EldersAuthFeedbackVO> eldersAuthFeedbackVOList;
+
+ @ApiModelProperty(value = "家庭成员ID")
+ private Long familyUserId;
+
+ @ApiModelProperty(value = "核验类型（1.视频认证 2.人脸核验）")
+ private Integer type;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthElderlyExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthElderlyExcelVO.java
new file mode 100644
index 0000000..688ca73
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthElderlyExcelVO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/9 14:54
+ */
+@Data
+public class EldersAuthElderlyExcelVO implements Serializable {
+
+ private static final long serialVersionUID = -6256711519268125208L;
+
+ @ExcelProperty(value = "姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "身份证号", index = 1)
+ private String idCard;
+
+ @ExcelProperty(value = "是否健在", index = 2)
+ private String isExist;
+
+ @ExcelProperty(value = "是否登记", index = 3)
+ private String isBigAge;
+
+ private String birthday;
+ private Integer level;
+ private String domicile;
+ private Long communityId;
+ private Long createBy;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthFeedbackDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthFeedbackDetailsVO.java
new file mode 100644
index 0000000..e6c3845
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthFeedbackDetailsVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel("高龄认证社区反馈返回参数")
+public class EldersAuthFeedbackDetailsVO {
+
+ @ApiModelProperty(value = "ID")
+ private Long id;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "更新人")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty(value = "认证ID")
+ private Long authId;
+
+ @ApiModelProperty(value = "反馈结果")
+ private String feedBack;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthFeedbackVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthFeedbackVO.java
new file mode 100644
index 0000000..866e682
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthFeedbackVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel("高龄认证社区反馈返回参数")
+public class EldersAuthFeedbackVO {
+
+ @ApiModelProperty(value = "ID")
+ private Long id;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "更新人")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty(value = "认证ID")
+ private Long authId;
+
+ @ApiModelProperty(value = "反馈结果")
+ private String feedBack;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthRecordExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthRecordExcelVO.java
new file mode 100644
index 0000000..e89d17e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthRecordExcelVO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/9 14:54
+ */
+@Data
+public class EldersAuthRecordExcelVO implements Serializable {
+
+ private static final long serialVersionUID = -6256711519268125208L;
+
+ @ExcelProperty(value = "姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "身份证号", index = 1)
+ private String idCard;
+
+ @ExcelProperty(value = "是否健在", index = 2)
+ private String isExist;
+
+ @ExcelProperty(value = "是否登记", index = 3)
+ private String isBigAge;
+
+ private String birthday;
+ private Integer level;
+ private String domicile;
+ private Long communityId;
+ private Long createBy;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthVO.java
new file mode 100644
index 0000000..92d16f1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthVO.java
@@ -0,0 +1,85 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import com.panzhihua.common.model.helper.sensitive.Sensitive;
+import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel("高龄认证返回参数")
+@EncryptDecryptClass
+public class EldersAuthVO {
+
+ @ApiModelProperty(value = "ID")
+ private Long id;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "申请时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "更新人")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty(value = "身份证")
+ @EncryptDecryptField
+ @Sensitive(strategy = SensitiveStrategy.ID_CARD)
+ private String idCard;
+
+ @ApiModelProperty(value = "认证人姓名")
+ private String authUserName;
+
+ @ApiModelProperty(value = "视频地址")
+ private String videoUrl;
+
+ @ApiModelProperty(value = "提交人")
+ private Long sumitUserId;
+
+ @ApiModelProperty(value = "申请人")
+ private String submitUserName;
+
+ @ApiModelProperty(value = "申请账号")
+ private String submitUserAccount;
+
+ @ApiModelProperty(value = "户籍地")
+ private String domicile;
+
+ @ApiModelProperty(value = "状态")
+ private String status;
+
+ @ApiModelProperty(value = "出生日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date birthDay;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "家庭成员ID")
+ private Long familyUserId;
+
+ @ApiModelProperty(value = "核验类型（1.视频认证 2.人脸核验）")
+ private Integer type;
+
+ @ApiModelProperty(value = "人脸核验结果数据")
+ private Integer verificationResult;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/FourMemberDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/FourMemberDetailVO.java
new file mode 100644
index 0000000..3fc7a5a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/FourMemberDetailVO.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.panzhihua.common.model.vos.partybuilding.ComPbMemberVO;
+import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class FourMemberDetailVO {
+ @ApiModelProperty("基础数据及房屋数据")
+ private ComMngPopulationNoSecretVO comMngPopulationVO;
+ @ApiModelProperty("党员数据")
+ private ComPbMemberVO partyBuildingMemberVO;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/GrantIntegral.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/GrantIntegral.java
new file mode 100644
index 0000000..7253533
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/GrantIntegral.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.vos.community;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel
+public class GrantIntegral
+{
+ @ApiModelProperty("活动id")
+ private String activityId;
+
+ @ApiModelProperty("社区id")
+ private String communityId;
+
+ @ApiModelProperty("主键id")
+ private String id;
+
+ @ApiModelProperty("志愿者id")
+ private String volunteerId;
+
+ @ApiModelProperty("用户id")
+ private String userId;
+
+ @ApiModelProperty("发放积分")
+ private String grantIntegral="0";
+
+ @ApiModelProperty("活动id")
+ private List<GrantIntegral> peopleAndGranList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IdentityAuthRecordDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IdentityAuthRecordDetailVO.java
new file mode 100644
index 0000000..bc75db9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IdentityAuthRecordDetailVO.java
@@ -0,0 +1,60 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import com.panzhihua.common.model.helper.sensitive.Sensitive;
+import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: IdentityAuthRecordDetailVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 身份认证记录详情
+ * @author: hans
+ * @date: 2021/09/03 15:32
+ */
+@Data
+@ApiModel("身份认证记录详情")
+@EncryptDecryptClass
+public class IdentityAuthRecordDetailVO {
+
+ @ApiModelProperty(value = "自增id")
+ private Long id;
+
+ @ApiModelProperty(value = "姓名")
+ @Sensitive(strategy = SensitiveStrategy.USERNAME)
+ private String name;
+
+ @ApiModelProperty(value = "身份证号")
+ @Sensitive(strategy = SensitiveStrategy.ID_CARD)
+ @EncryptDecryptField
+ private String idCard;
+
+ @ApiModelProperty(value = "现居住地址")
+ private String address;
+
+ @ApiModelProperty(value = "认证期数")
+ private String authPeriod;
+
+ @ApiModelProperty(value = "管辖社区")
+ private String communityName;
+
+ @ApiModelProperty(value = "认证时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date authDate;
+
+ @ApiModelProperty(value = "认证状态（1.待审核 2.认证失败 3.已认证）")
+ private Integer approvalStatus;
+
+ @ApiModelProperty(value = "认证视频url")
+ private String authVideo;
+
+ @ApiModelProperty(value = "驳回原因")
+ private String rejectReason;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IndexUserCommunityVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IndexUserCommunityVo.java
new file mode 100644
index 0000000..8d2b1e5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IndexUserCommunityVo.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 运营后台-首页社区通用户街道下社区统计汇总
+ */
+@Data
+@ApiModel("运营后台-首页社区通用户街道下社区统计汇总")
+public class IndexUserCommunityVo {
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "社区下注册用户数量")
+ private Integer userNum;
+
+ @ApiModelProperty(value = "社区名称")
+ private String name;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IndexUserStatisticsVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IndexUserStatisticsVo.java
new file mode 100644
index 0000000..2ae5b4e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IndexUserStatisticsVo.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author lyq
+ * 运营后台-首页社区通用户统计汇总
+ */
+@Data
+@ApiModel("运营后台-首页社区通用户统计汇总")
+public class IndexUserStatisticsVo {
+
+ @ApiModelProperty(value = "街道统计数据")
+ private List<IndexUserStreetVo> streetList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IndexUserStreetExcelExportVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IndexUserStreetExcelExportVo.java
new file mode 100644
index 0000000..8cf614d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IndexUserStreetExcelExportVo.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author lyq
+ * 运营后台-首页社区通用户街道统计汇总
+ */
+@Data
+@ApiModel("运营后台-首页社区通用户街道统计汇总")
+public class IndexUserStreetExcelExportVo {
+
+ @ExcelProperty(value = "街道名称", index = 0)
+ private String streetName;
+
+ @ExcelProperty(value = "社区名称", index = 1)
+ private String communityName;
+
+ @ExcelProperty(value = "街道下注册用户数量", index = 2)
+ private Integer streetNum;
+
+ @ExcelProperty(value = "社区下注册用户数量", index = 3)
+ private Integer userNum;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IndexUserStreetVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IndexUserStreetVo.java
new file mode 100644
index 0000000..2f5131d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/IndexUserStreetVo.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author lyq
+ * 运营后台-首页社区通用户街道统计汇总
+ */
+@Data
+@ApiModel("运营后台-首页社区通用户街道统计汇总")
+public class IndexUserStreetVo {
+
+ @ApiModelProperty(value = "街道下社区统计数据")
+ private List<IndexUserCommunityVo> communityList;
+
+ @ApiModelProperty(value = "街道id")
+ private Long streetId;
+
+ @ApiModelProperty(value = "街道下注册用户数量")
+ private Integer userNum;
+
+ @ApiModelProperty(value = "街道名称")
+ private String name;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/MostBeautifulVolunteerVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/MostBeautifulVolunteerVO.java
new file mode 100644
index 0000000..37fb296
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/MostBeautifulVolunteerVO.java
@@ -0,0 +1,60 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("最美志愿者")
+public class MostBeautifulVolunteerVO {
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**
+ * 志愿者姓名
+ */
+ @ApiModelProperty(value = "志愿者姓名")
+ private String name;
+ /**
+ * 志愿者证件url
+ */
+ @ApiModelProperty(value = "志愿者证件url")
+ private String certificateUrl;
+ /**
+ * 自我介绍
+ */
+ @ApiModelProperty(value = "自我介绍")
+ private String selfIntroduction;
+ /**
+ * 志愿者风采
+ */
+ @ApiModelProperty(value = "志愿者风采")
+ private String volunteerStyle;
+ /**
+ * 权重排序
+ */
+ @ApiModelProperty(value = "权重排序")
+ private String weightSorting;
+ /**
+ * 上下架状态( 0 下架 1 上架 )
+ */
+ @ApiModelProperty(value = "上下架状态( 0 下架 1 上架 )")
+ private String unmountType;
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/MyActivityEvaluateVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/MyActivityEvaluateVO.java
new file mode 100644
index 0000000..a6893e2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/MyActivityEvaluateVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: MyActivityEvaluateVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 我的评价vo
+ * @author: hans
+ * @date: 2021/10/21 17:14
+ */
+@Data
+@ApiModel("我的评价vo")
+public class MyActivityEvaluateVO {
+
+ @ApiModelProperty("是否展示评价按钮（1.展示 0.不展示）")
+ private Integer isDisplay;
+
+ @ApiModelProperty("评论详情")
+ private List<ComActActEvaluateVO> myEvaluateList;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PageComActMessageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PageComActMessageVO.java
new file mode 100644
index 0000000..d6f4789
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PageComActMessageVO.java
@@ -0,0 +1,73 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("留言")
+public class PageComActMessageVO {
+ @ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("留言内容")
+ @NotBlank(groups = {AddGroup.class}, message = "留言内容不能为空")
+ private String msgContent;
+
+ @ApiModelProperty("图片地址 多个用逗号隔开")
+ private String photoPah;
+
+ @ApiModelProperty("留言对象联系方式")
+ private String phone;
+
+ @ApiModelProperty("回复人id")
+ private Long sendtoUserId;
+
+ @ApiModelProperty("回复人姓名")
+ private String sendtoUserName;
+
+ @ApiModelProperty("状态 1 待回复 2 已回复")
+ private Integer status;
+
+ @ApiModelProperty("是否公开 1 公开 2 保密")
+ private Integer ispublic;
+
+ @ApiModelProperty("留言人主键")
+ private Long userId;
+
+ @ApiModelProperty("留言人账号")
+ private String userAccount;
+
+ @ApiModelProperty("留言人电话")
+ @NotBlank(groups = {AddGroup.class}, message = "联系方式不能为空")
+ private String userPhone;
+ @ApiModelProperty("留言人姓名")
+ private String userName;
+
+ @ApiModelProperty("社区主键")
+ private Long communityId;
+ @ApiModelProperty("留言对象 1社区团队2社区团委")
+ private Long type;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("回复时间")
+ private Date createAt;
+
+ private List<ComActMessageBackVO> backList;
+
+ @ApiModelProperty("当前页数")
+ private Long pageNum;
+
+ @ApiModelProperty("每页记录数")
+ private Long pageSize;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyActivityLine.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyActivityLine.java
new file mode 100644
index 0000000..64f42be
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyActivityLine.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("党员活动柱状图")
+public class PartyActivityLine {
+ @ApiModelProperty("月份")
+ private String x;
+ @ApiModelProperty("数量")
+ private Integer y;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyActivityStatics.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyActivityStatics.java
new file mode 100644
index 0000000..85b6a1d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyActivityStatics.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("党员统计")
+public class PartyActivityStatics {
+ @ApiModelProperty("活动总数")
+ private Integer activityCount;
+ @ApiModelProperty("党员总数")
+ private Integer memberCount;
+ @ApiModelProperty("活动饼状图")
+ private List<PartyActivityTypeChart> partyActivityTypeChartList;
+ @ApiModelProperty("活动柱状图")
+ private List<PartyActivityLine> partyActivityLines;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyActivityTypeChart.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyActivityTypeChart.java
new file mode 100644
index 0000000..84d034c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyActivityTypeChart.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("党员活动类型饼状图")
+public class PartyActivityTypeChart {
+ @ApiModelProperty("名称")
+ private String name;
+ @ApiModelProperty("数量")
+ private Integer count;
+ @ApiModelProperty("百分比")
+ private Integer percent;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyMemberDetailExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyMemberDetailExcelVO.java
new file mode 100644
index 0000000..577e7e1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyMemberDetailExcelVO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+public class PartyMemberDetailExcelVO {
+
+ @ExcelProperty("活动名称")
+ private String activityName;
+
+ @ExcelProperty("活动地址")
+ private String activityAddr;
+
+ @ExcelProperty("参与日期")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date beginAt;
+
+ @ExcelProperty(value = "签到地点")
+ private String position;
+
+ @ExcelProperty("签到时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ @ExcelProperty("签退时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+
+ @ExcelProperty("活动时长（小时）")
+ private Integer duration;
+
+ @ExcelProperty("获得积分")
+ private Integer rewardIntegral;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyMemberDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyMemberDetailVO.java
new file mode 100644
index 0000000..ef0db21
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/PartyMemberDetailVO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.validated.AddGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class PartyMemberDetailVO {
+
+ @ApiModelProperty("活动名称")
+ private String activityName;
+
+ @ApiModelProperty("活动地址")
+ private String activityAddr;
+
+ @ApiModelProperty("活动开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date beginAt;
+
+ @ApiModelProperty(value = "签到位置")
+ private String position;
+
+ @ApiModelProperty("签到开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ @ApiModelProperty("签到结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+
+ @ApiModelProperty("单次活动时长（小时）")
+ private Integer duration;
+
+ @ApiModelProperty("参与签到/打卡奖励积分")
+ private Integer rewardIntegral;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ProvinceCityReturnVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ProvinceCityReturnVO.java
new file mode 100644
index 0000000..7ad45e0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ProvinceCityReturnVO.java
@@ -0,0 +1,15 @@
+package com.panzhihua.common.model.vos.community;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+public class ProvinceCityReturnVO {
+ private String name;
+ private String code;
+ private List<ProvinceCityReturnVO> provinceCityReturnVOList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/QRActivityCodeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/QRActivityCodeVO.java
new file mode 100644
index 0000000..1794c16
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/QRActivityCodeVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class QRActivityCodeVO {
+ @ApiModelProperty("数据主键id")
+ private String id;
+ @ApiModelProperty("二维码类型 1 支援者活动 2 普通社区活动 3 党建活动 4项目活动")
+ private Integer type;
+ @ApiModelProperty(value = "二维码id",example = "1")
+ private String codeId;
+ @ApiModelProperty("签到类型 1签到 2签退")
+ private Integer signType;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ResetComActMessageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ResetComActMessageVO.java
new file mode 100644
index 0000000..cd6e270
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ResetComActMessageVO.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("留言-批量设置公开隐藏")
+public class ResetComActMessageVO {
+ @ApiModelProperty("主键集合")
+ private List<Long> ids;
+
+ @ApiModelProperty(value = "是否公开 1 公开 2 保密")
+ private Integer ispublic;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/SignactivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/SignactivityVO.java
new file mode 100644
index 0000000..a2a491c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/SignactivityVO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.vos.community;
+
+import javax.validation.constraints.Min;
+
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 报名活动
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-10 13:59
+ **/
+@Data
+@ApiModel("报名活动")
+public class SignactivityVO {
+
+ @ApiModelProperty(value = "类型 1 报名 2 取消报名", example = "1", required = true)
+ @Min(value = 1, groups = {AddGroup.class}, message = "操作类型不能为空")
+ private Integer type;
+ @ApiModelProperty(value = "以什么身份报名（1.居民 2.党员 3.志愿者）", example = "1", required = true)
+ @Min(value = 1, groups = {AddGroup.class}, message = "报名身份不能为空")
+ private Integer signIdentity;
+ @ApiModelProperty(value = "活动主键", required = true)
+ @Min(value = 1, groups = {AddGroup.class}, message = "活动主键不能为空")
+ private Long activityId;
+ @ApiModelProperty(value = "当前登录用户id", hidden = true)
+ private Long userId;
+ @ApiModelProperty(value = "单位id（党员以单位名义报名社区活动）")
+ private Long checkUnitId;
+ @ApiModelProperty("取消原因")
+ private String reason;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/StatisticsCommVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/StatisticsCommVO.java
new file mode 100644
index 0000000..5c96481
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/StatisticsCommVO.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: StatisticsCommVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description:
+ * @author: hans
+ * @date: 2021/12/06 10:51
+ */
+@Data
+@ApiModel("统计通用信息")
+public class StatisticsCommVO {
+
+ @ApiModelProperty(value = "统计日期")
+ private String statisticsDate;
+
+ @ApiModelProperty(value = "统计项")
+ private String filed;
+
+ @ApiModelProperty(value = "数量")
+ private Integer num;
+
+ @ApiModelProperty("统计项占比")
+ private BigDecimal percent;
+
+ @ApiModelProperty("统计数据列表")
+ private List<StatisticsCommVO> statisticsCommVOS;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/StatisticsPhotoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/StatisticsPhotoVO.java
new file mode 100644
index 0000000..c42f0e5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/StatisticsPhotoVO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @title: StatisticsCommVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description:
+ * @author: hans
+ * @date: 2021/12/06 10:51
+ */
+@Data
+@ApiModel("统计随手拍")
+public class StatisticsPhotoVO {
+
+ @ApiModelProperty("数量")
+ private Integer countNum;
+ @ApiModelProperty("类型名称")
+ private String countName;
+ @ApiModelProperty("统计日期")
+ private String statisticsDate;
+ @ApiModelProperty("百分比")
+ private BigDecimal percent = BigDecimal.ZERO;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/SysConfVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/SysConfVO.java
new file mode 100644
index 0000000..8ba5342
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/SysConfVO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.community;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-09
+ */
+@Data
+@ApiModel("系统配置返回参数")
+public class SysConfVO {
+
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "参数名")
+ private String name;
+
+ @ApiModelProperty(value = "参数唯一编码")
+ private String code;
+
+ @ApiModelProperty(value = "参数值")
+ private String value;
+
+ @ApiModelProperty(value = "参数描述")
+ private String describe;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "创建用户")
+ private Long createBy;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/TodoEventsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/TodoEventsVO.java
new file mode 100644
index 0000000..554b00d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/TodoEventsVO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 代办事件
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-06 10:07
+ **/
+@Data
+@ApiModel("代办事件")
+public class TodoEventsVO {
+ @ApiModelProperty("数量")
+ private Integer num;
+ @ApiModelProperty("类型 1随手拍 2微心愿 3一起议 4志愿者审核")
+ private Integer type;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VillageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VillageVO.java
new file mode 100644
index 0000000..f3565de
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VillageVO.java
@@ -0,0 +1,12 @@
+package com.panzhihua.common.model.vos.community;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class VillageVO {
+ private String value;
+ private String label;
+ List<BuildingVO> children;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerActivitiesPeopleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerActivitiesPeopleVO.java
new file mode 100644
index 0000000..bf9bdd5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerActivitiesPeopleVO.java
@@ -0,0 +1,74 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("志愿者活动参与人员表")
+public class VolunteerActivitiesPeopleVO
+{
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ /**
+ * 活动id
+ */
+ @ApiModelProperty(value = "主键")
+ private String activityId;
+ /**
+ * 活动名称
+ */
+ @ApiModelProperty(value = "志愿者id")
+ private String volunteerId;
+
+ /**
+ * 活动名称
+ */
+ @ApiModelProperty(value = "用户id")
+ private String userId;
+
+ /**
+ * 联系人姓名
+ */
+ @ApiModelProperty(value = "联系人姓名")
+ private String contactName;
+ /**
+ * 联系人电话
+ */
+ @ApiModelProperty(value = "联系人电话")
+ private String contactPhone;
+
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ @ApiModelProperty(value = "奖励发放状态( 0 未发放 1已发放 )")
+ private String issueStatus;
+
+ @ApiModelProperty(value = "发放积分")
+ private String issuePoints;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerActivityVO.java
new file mode 100644
index 0000000..26158c9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerActivityVO.java
@@ -0,0 +1,140 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("志愿者活动")
+public class VolunteerActivityVO
+{
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**
+ * 活动名称
+ */
+ @ApiModelProperty(value = "活动名称")
+ private String name;
+
+ /**
+ * 活动状态
+ */
+ @ApiModelProperty(value = "活动状态")
+ private String acType;
+ /**
+ * 活动地址
+ */
+ @ApiModelProperty(value = "活动地址")
+ private String address;
+ /**
+ * 志愿者人数
+ */
+ @ApiModelProperty(value = "志愿者人数")
+ private String volunteerNum;
+ /**
+ * 活动状态
+ */
+ @ApiModelProperty(value = "活动状态")
+ private String acState;
+ /**
+ * 奖励发放状态
+ */
+ @ApiModelProperty(value = "奖励发放状态")
+ private String awardState;
+ /**
+ * 发布时间
+ */
+ @ApiModelProperty(value = "发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date issueTime;
+ /**
+ * 报名开始时间
+ */
+ @ApiModelProperty(value = "报名开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date applyBeginTime;
+ /**
+ * 报名结束时间
+ */
+ @ApiModelProperty(value = "报名结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date applyEndTime;
+ /**
+ * 活动开始时间
+ */
+ @ApiModelProperty(value = "活动开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date actityBeginTime;
+ /**
+ * 活动结束时间
+ */
+ @ApiModelProperty(value = "活动结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date actityEndTime;
+ /**
+ * 志愿者上限（0无限 大于0 就是限制）
+ */
+ @ApiModelProperty(value = "志愿者上限（0无限 大于0 就是限制）")
+ private String volunteerLimit;
+ /**
+ * 奖励积分
+ */
+ @ApiModelProperty(value = "奖励积分")
+ private String bonusPoints;
+ /**
+ * 是否可以报名后取消（0 不可以 1可以）
+ */
+ @ApiModelProperty(value = "是否可以报名后取消（0 不可以 1可以）")
+ private String isCancelled;
+ /**
+ * 联系人姓名
+ */
+ @ApiModelProperty(value = "联系人姓名")
+ private String contactName;
+ /**
+ * 联系人电话
+ */
+ @ApiModelProperty(value = "联系人电话")
+ private String contactPhone;
+ /**
+ * 活动封面
+ */
+ @ApiModelProperty(value = "活动封面")
+ private String activityCoverUrl;
+ /**
+ * 活动内容
+ */
+ @ApiModelProperty(value = "活动内容")
+ private String activityContent;
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerCommunityConfigVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerCommunityConfigVO.java
new file mode 100644
index 0000000..a889d36
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerCommunityConfigVO.java
@@ -0,0 +1,63 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("志愿者社区商家配置")
+public class VolunteerCommunityConfigVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ @ApiModelProperty(value = "折扣id")
+ private String discountId;
+
+ @ApiModelProperty(value = "兑换地址")
+ private String address;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ @ApiModelProperty(value = "是否开启提现 0不开 1开启")
+ private String isOpneWithdraw;
+
+ @ApiModelProperty(value = "兑换状态（1每天 2周一到周五 3周末）")
+ private String businessType;
+
+ @ApiModelProperty(value = "兑换开始时间")
+ private String businessStartTime;
+
+ @ApiModelProperty(value = "结束开始时间")
+ private String businessEndTime;
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerCommunityDiscountVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerCommunityDiscountVO.java
new file mode 100644
index 0000000..4cfcde7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerCommunityDiscountVO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.community;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("社区折扣")
+public class VolunteerCommunityDiscountVO {
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**
+ * 折扣
+ */
+ @ApiModelProperty(value = "折扣")
+ private String discount;
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ @ApiModelProperty(value = "积分")
+ private String integral;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerCreditsExchangeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerCreditsExchangeVO.java
new file mode 100644
index 0000000..2bab390
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerCreditsExchangeVO.java
@@ -0,0 +1,110 @@
+package com.panzhihua.common.model.vos.community;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("商城积分兑换订单")
+public class VolunteerCreditsExchangeVO {
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**
+ * 活动名称
+ */
+ @ApiModelProperty(value = "商品名称")
+ private String goodsName;
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date creationTime;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNumber;
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private String goodsId;
+ /**
+ * 商品图片
+ */
+ @ApiModelProperty(value = "商品图片")
+ private String goodsUrl;
+ /**
+ * 所需积分
+ */
+ @ApiModelProperty(value = "所需积分")
+ private String needScore;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private String userId;
+ /**
+ * 核销状态（0未核销 1已核销 2已取消）
+ */
+ @ApiModelProperty(value = "核销状态（0未核销 1已核销 2已取消）")
+ private String condition;
+ /**
+ * 核销时间
+ */
+ @ApiModelProperty(value = "核销时间")
+ private String disposeTime;
+
+ /**
+ * 商品数量
+ */
+ @ApiModelProperty(value = "1 社区兑换订单 2商家商品购买订单")
+ private String orderType;
+
+
+ /**
+ * 商品数量
+ */
+ @ApiModelProperty(value = "实际支付积分")
+ private String palyIntegral;
+
+ /**
+ * 商品数量
+ */
+ @ApiModelProperty(value = "商家id")
+ private String merchantId;
+
+ /**
+ * 商品购买数量
+ */
+ @ApiModelProperty(value = "商品购买数量")
+ private String palyNum;
+
+ /**
+ * 是否评价 0未评价 1已评价
+ */
+ @ApiModelProperty(value = "是否评价 0未评价 1已评价")
+ private String isEvaluate;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerIntegralMerchantVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerIntegralMerchantVO.java
new file mode 100644
index 0000000..142ffac
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerIntegralMerchantVO.java
@@ -0,0 +1,105 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("爱心积分商城商品")
+public class VolunteerIntegralMerchantVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**
+ * 活动名称
+ */
+ @ApiModelProperty(value = "活动名称")
+ private String name;
+
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+
+ /**
+ * 商品价值
+ */
+ @ApiModelProperty(value = "商品价值")
+ private String commodityValue;
+
+
+ /**
+ * 所需积分
+ */
+ @ApiModelProperty(value = "所需积分")
+ private String integral;
+ /**
+ * 上架状态 0下架 1上架
+ */
+ @ApiModelProperty(value = "上架状态 0下架 1上架")
+ private String state;
+ /**
+ * 商品封面url
+ */
+ @ApiModelProperty(value = "商品封面url")
+ private String coverUrl;
+ /**
+ * 商品详情
+ */
+ @ApiModelProperty(value = "商品详情")
+ private String content;
+
+
+ @ApiModelProperty(value = "0 社区商品 1 商家商品")
+ private String goodType;
+
+ @ApiModelProperty(value = "商家id")
+ private String merchantId;
+
+
+ /**
+ * 商品数量
+ */
+ @ApiModelProperty(value = "商品数量")
+ private String goodNum;
+
+
+
+ /**
+ * 商品数量
+ */
+ @ApiModelProperty(value = "商品图片")
+ private String goodImgs;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerIntegralRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerIntegralRecordVO.java
new file mode 100644
index 0000000..a54a952
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerIntegralRecordVO.java
@@ -0,0 +1,48 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("路北社区积分记录明细")
+public class VolunteerIntegralRecordVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "1志愿者活动 2 社区兑换 3商家抵扣")
+ private String iType;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String creationTime;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String updateTime;
+
+ @ApiModelProperty(value = "积分数量")
+ private String integral;
+
+ @ApiModelProperty(value = "志愿者id")
+ private String volunteerId;
+
+ @ApiModelProperty(value = "用户id")
+ private String userId;
+
+
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantEvaluateVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantEvaluateVO.java
new file mode 100644
index 0000000..6256145
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantEvaluateVO.java
@@ -0,0 +1,95 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("志愿者商家商品评价")
+public class VolunteerMerchantEvaluateVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "商家id")
+ private String merchantId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "评论人用户id")
+ private String userId;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "评价内容")
+ private String evaluateContent;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "评价图片")
+ private String evaluateUrl;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "商品id")
+ private String goodId;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "评价分数")
+ private String evaluateGrade;
+
+ /**
+ * 订单id
+ */
+ @ApiModelProperty(value = "订单id")
+ private String orderId;
+
+
+ @ApiModelProperty(value = "商家名称")
+ private String merchantName;
+
+ @ApiModelProperty(value = "用户名称")
+ private String userName;
+
+ @ApiModelProperty(value = "用户头像")
+ private String userUrl;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantVO.java
new file mode 100644
index 0000000..21c8043
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantVO.java
@@ -0,0 +1,154 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("路北商家表")
+public class VolunteerMerchantVO implements Serializable
+{
+ private static final long serialVersionUID = -70884515430727555L;
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**
+ * 活动名称
+ */
+ @ApiModelProperty(value = "活动名称")
+ private String name;
+
+ /**
+ * 商家类型
+ */
+ @ApiModelProperty(value = "商家类型")
+ private String merchantType;
+ /**
+ * 商家logo封面
+ */
+ @ApiModelProperty(value = "商家logo封面")
+ private String logoUrl;
+ /**
+ * 商家地址
+ */
+ @ApiModelProperty(value = "商家地址")
+ private String address;
+ /**
+ * 纬度
+ */
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+ /**
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private String lon;
+ /**
+ * 管理员id
+ */
+ @ApiModelProperty(value = "管理员id")
+ private String userId;
+ /**
+ * 对外服务电话
+ */
+ @ApiModelProperty(value = "对外服务电话")
+ private String serviceCall;
+ /**
+ * 商家简介
+ */
+ @ApiModelProperty(value = "商家简介")
+ private String merchantContent;
+ /**
+ * 商家图片
+ */
+ @ApiModelProperty(value = "商家图片")
+ private String merchantUrl;
+ /**
+ * 法人名字
+ */
+ @ApiModelProperty(value = "法人名字")
+ private String legalPersonName;
+ /**
+ * 法人联系电话
+ */
+ @ApiModelProperty(value = "法人联系电话")
+ private String legalPersonPhone;
+ /**
+ * 法人身份证
+ */
+ @ApiModelProperty(value = "法人身份证")
+ private String legalPersonIdCard;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+ /**
+ * 营业状态（1每天 2周一到周五 3周末）
+ */
+ @ApiModelProperty(value = "营业状态（1每天 2周一到周五 3周末）")
+ private String businessType;
+ /**
+ * 营业开始时间
+ */
+ @ApiModelProperty(value = "营业开始时间")
+ private String businessStartTime;
+ /**
+ * 营业结束时间
+ */
+ @ApiModelProperty(value = "营业结束时间")
+ private String businessEndTime;
+ /**
+ * 活动名称
+ */
+ @ApiModelProperty(value = "商家状态0禁用 1启用")
+ private String merchantState;
+ /**
+ * 活动名称
+ */
+ @ApiModelProperty(value = "商家折扣")
+ private String merchantDiscount;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+
+ @ApiModelProperty(value = "商家联系电话")
+ private String merchantPhone;
+
+ @ApiModelProperty(value = "商家联系人")
+ private String merchantLinkman;
+
+ @ApiModelProperty(value = "商家类型名称")
+ private String merchantTypeName;
+
+ @ApiModelProperty(value = "商家评分")
+ private String merchantGrade;
+
+ @ApiModelProperty(value = "商家积分")
+ private String merchantIntegral;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantWithdrawVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantWithdrawVO.java
new file mode 100644
index 0000000..0fea277
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantWithdrawVO.java
@@ -0,0 +1,54 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("路北社区商家提现")
+public class VolunteerMerchantWithdrawVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "商家id")
+ private String merchantId;
+
+ @ApiModelProperty(value = "商家名称")
+ private String merchantName;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ @ApiModelProperty(value = "提取积分")
+ private String withdrawIntegral;
+
+ @ApiModelProperty(value = "处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date disposeTime;
+
+ @ApiModelProperty(value = "处理状态 0 待处理 1已处理")
+ private String disposeType;
+
+ @ApiModelProperty(value = "0 未删除 1 已删除")
+ private String isDelete;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerTypeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerTypeVO.java
new file mode 100644
index 0000000..42dcaf8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerTypeVO.java
@@ -0,0 +1,48 @@
+package com.panzhihua.common.model.vos.community;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("志愿者活动类型表")
+public class VolunteerTypeVO {
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**
+ * 活动名称
+ */
+ @ApiModelProperty(value = "活动名称")
+ private String name;
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ /**
+ * 状态类型
+ */
+ @ApiModelProperty(value = "1 志愿者活动 2 商家类型")
+ private String type;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/WeatherVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/WeatherVO.java
new file mode 100644
index 0000000..cbe7104
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/WeatherVO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("天气返回参数")
+public class WeatherVO {
+
+ @ApiModelProperty("省份名")
+ private String province;
+
+ @ApiModelProperty("城市名")
+ private String city;
+
+ @ApiModelProperty("区域编码")
+ private String adcode;
+
+ @ApiModelProperty("天气现象（汉字描述）")
+ private String weather;
+
+ @ApiModelProperty("实时气温，单位：摄氏度")
+ private String reporttime;
+
+ @ApiModelProperty("风向描述")
+ private String temperature;
+
+ @ApiModelProperty("风力级别，单位：级")
+ private String winddirection;
+
+ @ApiModelProperty("空气湿度")
+ private String windpower;
+
+ @ApiModelProperty("数据发布的时间")
+ private String humidity;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComAcidAreaVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComAcidAreaVO.java
new file mode 100644
index 0000000..4a01bb5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComAcidAreaVO.java
@@ -0,0 +1,12 @@
+package com.panzhihua.common.model.vos.community.acid;
+
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+public class ComAcidAreaVO {
+ private String name;
+ private Integer count;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComAcidStaticVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComAcidStaticVO.java
new file mode 100644
index 0000000..bba132e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComAcidStaticVO.java
@@ -0,0 +1,15 @@
+package com.panzhihua.common.model.vos.community.acid;
+
+import com.panzhihua.common.model.vos.community.reserve.FiveCount;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+public class ComAcidStaticVO extends FiveCount {
+ private String areaName;
+ private List<ComAcidAreaVO> comAcidAreaVOS;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidCharts.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidCharts.java
new file mode 100644
index 0000000..4997a96
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidCharts.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.community.acid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class ComActAcidCharts {
+ @ApiModelProperty("报备人数")
+ private List<ComActAcidChartsVO> acidList;
+ @ApiModelProperty("风险人数")
+ private List<ComActAcidChartsVO> dangerList;
+ @ApiModelProperty("处理情况")
+ private List<ComActAcidChartsVO> checkList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidChartsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidChartsVO.java
new file mode 100644
index 0000000..7888653
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidChartsVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.community.acid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class ComActAcidChartsVO {
+ @ApiModelProperty("名字")
+ private String name;
+ @ApiModelProperty("数量一")
+ private Integer numOne;
+ @ApiModelProperty("数量二")
+ private Integer numTwo;
+ @ApiModelProperty("百分比")
+ private BigDecimal percent;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidCheckRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidCheckRecordVO.java
new file mode 100644
index 0000000..b85244a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidCheckRecordVO.java
@@ -0,0 +1,68 @@
+package com.panzhihua.common.model.vos.community.acid;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 排查跟进表(ComActAcidCheckRecord)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 排查跟进表相关功能
+ *
+ * @author zzj
+ * @since 2022-04-24 16:14:25
+ */
+@Data
+@ApiModel("排查跟进表")
+public class ComActAcidCheckRecordVO implements Serializable {
+
+ private static final long serialVersionUID = 511018347419682300L;
+
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 人员id
+ */
+ @ApiModelProperty(value = "人员id")
+ private Long memberId;
+
+ /**
+ * 处理情况 1：集中隔离 2：居家隔离 3：健康监测 4：失联或尚需追踪 5：排除风险 6：暂未管控
+ */
+ @ApiModelProperty(value = "处理情况 1：集中隔离 2：居家隔离 3：健康监测 4：失联或尚需追踪 5：排除风险 6：暂未管控")
+ private Integer status;
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 操作人
+ */
+ @ApiModelProperty(value = "操作人")
+ private String username;
+
+ @ApiModelProperty("记录时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date checkTime;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidColorChartsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidColorChartsVO.java
new file mode 100644
index 0000000..922de95
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidColorChartsVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.community.acid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author yh
+ */
+@Data
+@ApiModel()
+public class ComActAcidColorChartsVO {
+ @ApiModelProperty("数量")
+ private Integer countNum;
+ @ApiModelProperty("类型名称")
+ private String countName;
+ @ApiModelProperty("健康码颜色")
+ private String colorMark;
+ @ApiModelProperty("百分比")
+ private BigDecimal percent = BigDecimal.ZERO;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidDangerMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidDangerMemberVO.java
new file mode 100644
index 0000000..e38fd09
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidDangerMemberVO.java
@@ -0,0 +1,118 @@
+package com.panzhihua.common.model.vos.community.acid;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 风险人员表(ComActAcidDangerMember)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 风险人员表相关功能
+ *
+ * @author zzj
+ * @since 2022-04-24 16:12:09
+ */
+@Data
+@ApiModel("风险人员表")
+public class ComActAcidDangerMemberVO implements Serializable {
+
+ private static final long serialVersionUID = 889636932941876579L;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * 填报记录id
+ */
+ @ApiModelProperty(value = "填报记录id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long recordId;
+
+ /**
+ * 姓名
+ */
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ /**
+ * 人员类型 1风险人员 2未填地址人员
+ */
+ @ApiModelProperty(value = "人员类型 1风险人员 2未填地址人员")
+ private Integer type;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ private Date updateTime;
+
+ /**
+ * 数据来源
+ */
+ @ApiModelProperty(value = "数据来源 1系统")
+ private Integer source;
+
+ /**
+ * 处理情况 1：集中隔离 2：居家隔离 3：健康监测 4：失联或尚需追踪 5：排除风险 6：暂未管控
+ */
+ @ApiModelProperty(value = "当前处理情况 1：集中隔离 2：居家隔离 3：健康监测 4：失联或尚需追踪 5：排除风险 6：暂未管控")
+ private Integer status;
+
+ @ApiModelProperty(value = "健康码颜色")
+ private String colorMark;
+
+ @ApiModelProperty(value = "核酸检测")
+ private String acidTest;
+
+ @ApiModelProperty(value = "排查时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date checkTime;
+
+ @ApiModelProperty(value = "报备时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reportTime;
+
+ /**
+ * 身份证
+ */
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ /**
+ * 绑定单位
+ */
+ @ApiModelProperty(value = "绑定单位")
+ private String relationName;
+
+ @ApiModelProperty(value = "定位地址")
+ private String realAddress;
+
+ @ApiModelProperty(value = "风险类别")
+ private String riskType;
+
+ @ApiModelProperty(value = "在攀居住地")
+ private String localCity;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidMemberVO.java
new file mode 100644
index 0000000..007d105
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidMemberVO.java
@@ -0,0 +1,66 @@
+package com.panzhihua.common.model.vos.community.acid;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 防疫工作人员表(ComActAcidMember)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 防疫工作人员表相关功能
+ *
+ * @author zzj
+ * @since 2022-04-24 16:12:06
+ */
+@Data
+@ApiModel("防疫工作人员表")
+public class ComActAcidMemberVO implements Serializable {
+
+ private static final long serialVersionUID = -88592294208705755L;
+
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 姓名
+ */
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ /**
+ * 是否推送 1是 0否
+ */
+ @ApiModelProperty(value = "是否推送 1是 0否")
+ private Integer pushStatus;
+
+ /**
+ * 绑定单位
+ */
+ @ApiModelProperty(value = "绑定单位")
+ private String relationName;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ @ApiModelProperty(value = "关联小程序用户openid")
+ private String openid;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelReturn.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelReturn.java
new file mode 100644
index 0000000..a92e5d7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelReturn.java
@@ -0,0 +1,149 @@
+package com.panzhihua.common.model.vos.community.acid;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.net.URL;
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+public class ComActAcidRecordExcelReturn {
+
+ private Long id;
+ /**
+ * 姓名
+ */
+ @ExcelProperty(value = "姓名")
+ private String name;
+
+ /**
+ * 身份证
+ */
+ @ExcelProperty(value = "身份证")
+ private String idCard;
+
+ /**
+ * 手机号
+ */
+ @ExcelProperty(value = "手机号")
+ private String phone;
+
+ /**
+ * 出发城市
+ */
+ @ExcelProperty(value = "出发城市")
+ private String departureCity;
+
+
+ @ExcelProperty(value = "出发详细地址")
+ private String departureAddress;
+
+ /**
+ * 出发日期
+ */
+ @ExcelProperty(value = "出发日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat("yyyy-MM-dd")
+ private Date departureDate;
+
+ /**
+ * 旅居城市
+ */
+ @ExcelProperty(value = "中途旅居城市")
+ private String touristCity;
+
+ /**
+ * 在攀居住地
+ */
+ @ExcelProperty(value = "在攀居住地")
+ private String localCity;
+
+ /**
+ * 在攀地址
+ */
+ @ExcelProperty(value = "详细地址")
+ private String localAddress;
+
+ /**
+ * 到达日期
+ */
+ @ExcelProperty(value = "到达日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat("yyyy-MM-dd")
+ private Date arriveDate;
+
+ /**
+ * 健康码颜色
+ */
+ @ExcelProperty(value = "健康码状态")
+ private String colorMark;
+
+ /**
+ * 行程码
+ */
+ @ExcelProperty(value = "行程码是否带*")
+ private String travelCard;
+
+ /**
+ * 危险区
+ */
+ @ExcelProperty(value = "14天内是否到过中高风险地区")
+ private String dangerArea;
+
+ /**
+ * 境外城市
+ */
+ @ExcelProperty(value = "28天内是否到过境外或边境口岸城市")
+ private String outsideCity;
+
+ /**
+ * 疫苗接种
+ */
+ @ExcelProperty(value = "新冠疫苗接种情况")
+ private String vaccination;
+
+ /**
+ * 核酸检测
+ */
+ @ExcelProperty(value = "48小时内核酸检测")
+ private String acidTest;
+
+ @ExcelProperty("健康码截图")
+ private String colorImage;
+
+ @ExcelProperty("行程码截图")
+ private String travelImage;
+
+ @ExcelProperty("48小时核酸截图")
+ private String acidImage;
+
+ @ExcelProperty("疫苗接种截图")
+ private String vaccinationImage;
+
+ private Integer status;
+
+
+ @ApiModelProperty("交通方式")
+ private String transport;
+
+ @ApiModelProperty("行程信息")
+ private String transportInfo;
+
+
+ @ExcelProperty("是否核对")
+ private Integer checkStatus;
+
+ @ExcelProperty("是否特殊职业")
+ private String isSpecialJob;
+
+ @ExcelProperty("户籍地")
+ private String registerResidence;
+ @ExcelProperty("是否为入（返）川学生")
+ private String isStudent;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java
new file mode 100644
index 0000000..051ab79
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java
@@ -0,0 +1,140 @@
+package com.panzhihua.common.model.vos.community.acid;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.net.URL;
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+public class ComActAcidRecordExcelVO {
+ /**
+ * 姓名
+ */
+ @ExcelProperty(value = "姓名")
+ private String name;
+
+ /**
+ * 身份证
+ */
+ @ExcelProperty(value = "身份证")
+ private String idCard;
+
+ /**
+ * 手机号
+ */
+ @ExcelProperty(value = "手机号")
+ private String phone;
+
+ /**
+ * 出发城市
+ */
+ @ExcelProperty(value = "出发城市")
+ private String departureCity;
+
+ @ExcelProperty(value = "出发详细地址")
+ private String departureAddress;
+
+ /**
+ * 出发日期
+ */
+ @ExcelProperty(value = "出发日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat("yyyy-MM-dd")
+ private Date departureDate;
+
+ /**
+ * 旅居城市
+ */
+ @ExcelProperty(value = "中途旅居城市")
+ private String touristCity;
+
+ /**
+ * 在攀居住地
+ */
+ @ExcelProperty(value = "在攀居住地")
+ private String localCity;
+
+ /**
+ * 在攀地址
+ */
+ @ExcelProperty(value = "详细地址")
+ private String localAddress;
+
+ /**
+ * 到达日期
+ */
+ @ExcelProperty(value = "到达日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat("yyyy-MM-dd")
+ private Date arriveDate;
+
+ /**
+ * 健康码颜色
+ */
+ @ExcelProperty(value = "健康码状态")
+ private String colorMark;
+
+ /**
+ * 行程码
+ */
+ @ExcelProperty(value = "行程码是否带*")
+ private String travelCard;
+
+ /**
+ * 危险区
+ */
+ @ExcelProperty(value = "14天内是否到过中高风险地区")
+ private String dangerArea;
+
+ /**
+ * 境外城市
+ */
+ @ExcelProperty(value = "28天内是否到过境外或边境口岸城市")
+ private String outsideCity;
+
+ /**
+ * 疫苗接种
+ */
+ @ExcelProperty(value = "新冠疫苗接种情况")
+ private String vaccination;
+
+ /**
+ * 核酸检测
+ */
+ @ExcelProperty(value = "48小时内核酸检测")
+ private String acidTest;
+
+// @ExcelProperty("健康码截图")
+// private URL colorImage;
+//
+// @ExcelProperty("行程码截图")
+// private URL travelImage;
+//
+// @ExcelProperty("48小时核酸截图")
+// private URL acidImage;
+
+// @ExcelProperty("疫苗接种截图")
+// private URL vaccinationImage;
+
+ @ExcelProperty("交通工具")
+ private String transport;
+
+ @ExcelProperty("车次信息")
+ private String transportInfo;
+
+ @ExcelProperty("是否核对")
+ private String checkStatus;
+
+ @ExcelProperty("是否冷链、运输、海口等特殊行业从业者")
+ private String isSpecialJob;
+
+ @ExcelProperty("是否为入（返）川学生")
+ private String isStudent;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordTimeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordTimeVO.java
new file mode 100644
index 0000000..c358f20
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordTimeVO.java
@@ -0,0 +1,182 @@
+package com.panzhihua.common.model.vos.community.acid;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * (ComActAcidRecord)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 相关功能
+ *
+ * @author zzj
+ * @since 2022-04-12 15:29:57
+ */
+@Data
+@ApiModel("防疫登记实体")
+public class ComActAcidRecordTimeVO implements Serializable {
+
+ private static final long serialVersionUID = 681488919320181854L;
+
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 姓名
+ */
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ /**
+ * 身份证
+ */
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ /**
+ * 出发城市
+ */
+ @ApiModelProperty(value = "出发城市")
+ private String departureCity;
+
+ /**
+ * 出发地址
+ */
+ @ApiModelProperty(value = "出发地址")
+ private String departureAddress;
+
+ /**
+ * 出发日期
+ */
+ @ApiModelProperty(value = "出发日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date departureDate;
+
+ /**
+ * 旅居城市
+ */
+ @ApiModelProperty(value = "旅居城市")
+ private String touristCity;
+
+ /**
+ * 在攀居住地
+ */
+ @ApiModelProperty(value = "在攀居住地")
+ private String localCity;
+
+ /**
+ * 在攀地址
+ */
+ @ApiModelProperty(value = "在攀地址")
+ private String localAddress;
+
+ /**
+ * 到达日期
+ */
+ @ApiModelProperty(value = "到达日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date arriveDate;
+
+ /**
+ * 健康码颜色
+ */
+ @ApiModelProperty(value = "健康码颜色")
+ private String colorMark;
+
+ /**
+ * 行程码
+ */
+ @ApiModelProperty(value = "行程码")
+ private String travelCard;
+
+ /**
+ * 危险区
+ */
+ @ApiModelProperty(value = "危险区")
+ private String dangerArea;
+
+ /**
+ * 境外城市
+ */
+ @ApiModelProperty(value = "境外城市")
+ private String outsideCity;
+
+ /**
+ * 疫苗接种
+ */
+ @ApiModelProperty(value = "疫苗接种")
+ private String vaccination;
+
+ /**
+ * 核酸检测
+ */
+ @ApiModelProperty(value = "核酸检测")
+ private String acidTest;
+
+ /**
+ * 填报类型 1自己填报 2为他人填报
+ */
+ @ApiModelProperty(value = "填报类型 1自己填报 2为他人填报")
+ private Integer type;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+ @ApiModelProperty("定位地址")
+ private String realAddress;
+
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createTime;
+
+ @ApiModelProperty("健康码截图")
+ private String colorImage;
+
+ @ApiModelProperty("行程码截图")
+ private String travelImage;
+
+ @ApiModelProperty("48小时核酸截图")
+ private String acidImage;
+
+ @ApiModelProperty("疫苗接种截图")
+ private String vaccinationImage;
+
+ @ApiModelProperty("交通方式")
+ private String transport;
+
+ @ApiModelProperty("行程信息")
+ private String transportInfo;
+
+ @ApiModelProperty("是否特殊职业")
+ private String isSpecialJob;
+
+ @ApiModelProperty("户籍地")
+ private String registerResidence;
+
+ @ApiModelProperty("是否学生")
+ private String isStudent;
+ @ApiModelProperty("证件类型")
+ private String cardType;
+
+
+ public interface type{
+ int zj=1;
+ int tr=2;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordVO.java
new file mode 100644
index 0000000..2fbcdc2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordVO.java
@@ -0,0 +1,206 @@
+package com.panzhihua.common.model.vos.community.acid;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * (ComActAcidRecord)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 相关功能
+ *
+ * @author zzj
+ * @since 2022-04-12 15:29:57
+ */
+@Data
+@ApiModel("防疫登记实体")
+public class ComActAcidRecordVO implements Serializable {
+
+ private static final long serialVersionUID = 681488919320181854L;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 姓名
+ */
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ /**
+ * 身份证
+ */
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ /**
+ * 出发城市
+ */
+ @ApiModelProperty(value = "出发城市")
+ private String departureCity;
+
+ /**
+ * 出发地址
+ */
+ @ApiModelProperty(value = "出发地址")
+ private String departureAddress;
+
+ /**
+ * 出发日期
+ */
+ @ApiModelProperty(value = "出发日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date departureDate;
+
+ /**
+ * 旅居城市
+ */
+ @ApiModelProperty(value = "旅居城市")
+ private String touristCity;
+
+ /**
+ * 在攀居住地
+ */
+ @ApiModelProperty(value = "在攀居住地")
+ private String localCity;
+
+ /**
+ * 在攀地址
+ */
+ @ApiModelProperty(value = "在攀地址")
+ private String localAddress;
+
+ /**
+ * 到达日期
+ */
+ @ApiModelProperty(value = "到达日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date arriveDate;
+
+ /**
+ * 健康码颜色
+ */
+ @ApiModelProperty(value = "健康码颜色")
+ private String colorMark;
+
+ /**
+ * 行程码
+ */
+ @ApiModelProperty(value = "行程码")
+ private String travelCard;
+
+ /**
+ * 危险区
+ */
+ @ApiModelProperty(value = "危险区")
+ private String dangerArea;
+
+ /**
+ * 境外城市
+ */
+ @ApiModelProperty(value = "境外城市")
+ private String outsideCity;
+
+ /**
+ * 疫苗接种
+ */
+ @ApiModelProperty(value = "疫苗接种")
+ private String vaccination;
+
+ /**
+ * 核酸检测
+ */
+ @ApiModelProperty(value = "核酸检测")
+ private String acidTest;
+
+ /**
+ * 填报类型 1自己填报 2为他人填报
+ */
+ @ApiModelProperty(value = "填报类型 1自己填报 2为他人填报")
+ private Integer type;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+
+ @ApiModelProperty("定位地址")
+ private String realAddress;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date createTime;
+
+ @ApiModelProperty("健康码截图")
+ private String colorImage;
+
+ @ApiModelProperty("行程码截图")
+ private String travelImage;
+
+ @ApiModelProperty("48小时核酸截图")
+ private String acidImage;
+
+ @ApiModelProperty("疫苗接种截图")
+ private String vaccinationImage;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("核对状态 0未核对 1已核对")
+ private Integer checkStatus;
+
+
+ @ApiModelProperty("交通方式")
+ private String transport;
+
+ @ApiModelProperty("行程信息")
+ private String transportInfo;
+
+ @ApiModelProperty("上一条id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long lastId;
+
+ @ApiModelProperty("下一条id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long nextId;
+
+
+ @ApiModelProperty("是否特殊职业")
+ private String isSpecialJob;
+
+ @ApiModelProperty("户籍地")
+ private String registerResidence;
+
+
+ @ApiModelProperty("是否学生")
+ private String isStudent;
+
+ @ApiModelProperty("证件类型")
+ private String cardType;
+
+ @ApiModelProperty("修改记录")
+ private List<ComActAcidUpdateRecordVO> comActAcidUpdateRecordVOList;
+
+ public interface type{
+ int zj=1;
+ int tr=2;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidUpdateRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidUpdateRecordVO.java
new file mode 100644
index 0000000..0e38fb7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidUpdateRecordVO.java
@@ -0,0 +1,59 @@
+package com.panzhihua.common.model.vos.community.acid;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * (ComActAcidUpdateRecord)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 相关功能
+ *
+ * @author zzj
+ * @since 2022-05-30 14:57:03
+ */
+@Data
+@ApiModel("")
+public class ComActAcidUpdateRecordVO implements Serializable {
+
+ private static final long serialVersionUID = -90587224071702612L;
+
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 记录id
+ */
+ @ApiModelProperty(value = "记录id")
+ private Long recordId;
+
+ /**
+ * 修改人
+ */
+ @ApiModelProperty(value = "修改人")
+ private String name;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty(value = "修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComAreaCounty.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComAreaCounty.java
new file mode 100644
index 0000000..25c21a2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComAreaCounty.java
@@ -0,0 +1,18 @@
+package com.panzhihua.common.model.vos.community.acid;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+public class ComAreaCounty {
+ private String value;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+ private List<ComAreaCounty> children;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BaseInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BaseInfo.java
new file mode 100644
index 0000000..f409221
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BaseInfo.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("基础数据")
+public class BaseInfo {
+ @ApiModelProperty("人口数")
+ private Integer population;
+ @ApiModelProperty("注册用户量")
+ private Integer user;
+ @ApiModelProperty("入住小区")
+ private Integer village;
+ @ApiModelProperty("实有房屋")
+ private Integer house;
+ @ApiModelProperty("实有单位")
+ private Integer company;
+ @ApiModelProperty("党员数")
+ private Integer partyMember;
+ @ApiModelProperty("志愿者")
+ private Integer volunteer;
+ @ApiModelProperty("党组织")
+ private Integer partyOrg;
+ @ApiModelProperty("人大代表")
+ private Integer dpcNum;
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenActivityLine.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenActivityLine.java
new file mode 100644
index 0000000..dd9858b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenActivityLine.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("大屏党建活动折线图")
+public class BigScreenActivityLine {
+ @ApiModelProperty("月份")
+ private String x;
+ @ApiModelProperty("新增数")
+ private Integer y;
+ @ApiModelProperty("累计数")
+ private Integer countY;
+
+ private String year;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenActivityTop.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenActivityTop.java
new file mode 100644
index 0000000..2e02116
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenActivityTop.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("党员积分排名")
+public class BigScreenActivityTop {
+ @ApiModelProperty("姓名")
+ private String name;
+ @ApiModelProperty("党组织名")
+ private String orgName;
+ @ApiModelProperty("党员分数")
+ private Integer score;
+ @ApiModelProperty("头像")
+ private String url;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenAlarmStatisticsInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenAlarmStatisticsInfo.java
new file mode 100644
index 0000000..d7a6092
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenAlarmStatisticsInfo.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BigScreenAlarmStatisticsInfo
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 杨家坪定制-居家养老大屏统计数据
+ * @author: hans
+ * @date: 2022/02/28 17:23
+ */
+@Data
+@ApiModel("杨家坪定制-居家养老大屏统计数据")
+public class BigScreenAlarmStatisticsInfo {
+
+ @ApiModelProperty(value = "监测设备数量")
+ private Integer abnormalAlarmTotal;
+
+ @ApiModelProperty("服务设备数量")
+ private Integer oneKeyAlarmTotal;
+
+ @ApiModelProperty("异常总次数")
+ private Integer abnormalTotal;
+
+ @ApiModelProperty("服务总次数")
+ private Integer oneKeyTotal;
+
+ @ApiModelProperty("待处理异常总数")
+ private Integer pendingAbnormalTotal;
+
+ @ApiModelProperty("已处理异常总数")
+ private Integer completeAbnormalTotal;
+
+ @ApiModelProperty("待服务总数")
+ private Integer pendingServiceTotal;
+
+ @ApiModelProperty("已服务总数")
+ private Integer completeServiceTotal;
+
+ @ApiModelProperty(value = "异常新增折线数据")
+ private List<StatisticsCommVO> abnormalAddPolylineData;
+
+ @ApiModelProperty(value = "异常累计折线数据")
+ private List<StatisticsCommVO> abnormalTotalPolylineData;
+
+ @ApiModelProperty(value = "服务新增折线数据")
+ private List<StatisticsCommVO> serviceAddPolylineData;
+
+ @ApiModelProperty(value = "服务累计折线数据")
+ private List<StatisticsCommVO> serviceTotalPolylineData;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenCommunityStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenCommunityStatisticsVO.java
new file mode 100644
index 0000000..fe3f62d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenCommunityStatisticsVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.event.EventGridStatisticsVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BigScreenCommunityStatisticsVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 大屏社区服务统计信息
+ * @author: hans
+ * @date: 2021/12/10 13:16
+ */
+@Data
+@ApiModel("大屏社区服务统计信息")
+public class BigScreenCommunityStatisticsVO {
+
+ @ApiModelProperty("大屏网格数据")
+ private List<EventGridStatisticsVO> gridStatisticsList;
+
+ @ApiModelProperty("小区列表数据")
+ private List<CivilVillageStatisticsVO> villageStatisticsList;
+
+ @ApiModelProperty("商家地图点位数据")
+ private List<ConvenientMerchantVO> merchantMapDataList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenCourtyardStatisticsInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenCourtyardStatisticsInfo.java
new file mode 100644
index 0000000..9ceecdf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenCourtyardStatisticsInfo.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BigScreenCourtyardStatisticsInfo
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 金沙定制页面-院落议事大屏统计数据
+ * @author: hans
+ * @date: 2022/03/10 10:04
+ */
+@Data
+@ApiModel("金沙定制页面-院落议事大屏统计数据")
+public class BigScreenCourtyardStatisticsInfo {
+
+ @ApiModelProperty("院落议事数量")
+ private Integer discussTotal;
+
+ @ApiModelProperty("议事类")
+ private Integer ysTotal;
+
+ @ApiModelProperty("投票类")
+ private Integer tpTotal;
+
+ @ApiModelProperty(value = "院落议事新增折线数据")
+ private List<StatisticsCommVO> discussAddPolylineData;
+
+ @ApiModelProperty(value = "院落议事累计折线数据")
+ private List<StatisticsCommVO> discussTotalPolylineData;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenDpcStatisticsInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenDpcStatisticsInfo.java
new file mode 100644
index 0000000..533649f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenDpcStatisticsInfo.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BigScreenEasyPhotoStatisticsInfo
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 随手拍大屏统计数据
+ * @author: hans
+ * @date: 2021/12/16 13:31
+ */
+@Data
+@ApiModel("随手拍大屏统计数据")
+public class BigScreenDpcStatisticsInfo {
+
+ @ApiModelProperty("人大个数")
+ private Integer dpcNum;
+
+ @ApiModelProperty(value = "随手拍新增折线数据")
+ private List<StatisticsCommVO> easyPhotoAddPolylineData;
+
+ @ApiModelProperty(value = "随手拍累计折线数据")
+ private List<StatisticsCommVO> easyPhotoTotalPolylineData;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenDynStatisticsInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenDynStatisticsInfo.java
new file mode 100644
index 0000000..08ccc22
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenDynStatisticsInfo.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BigScreenDynStatisticsInfo
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 社区动态大屏统计数据
+ * @author: hans
+ * @date: 2021/12/17 10:19
+ */
+@Data
+@ApiModel("社区动态大屏统计数据")
+public class BigScreenDynStatisticsInfo {
+
+ @ApiModelProperty("社区动态总数")
+ private Integer dynNum = 0;
+
+ @ApiModelProperty(value = "社区动态饼图数据")
+ private List<StatisticsCommVO> dynCircleData;
+
+ @ApiModelProperty(value = "社区动态新增折线数据")
+ private List<StatisticsCommVO> dynAddPolylineData;
+
+ @ApiModelProperty(value = "社区动态累计折线数据")
+ private List<StatisticsCommVO> dynTotalPolylineData;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenEasyPhotoStatisticsInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenEasyPhotoStatisticsInfo.java
new file mode 100644
index 0000000..e748e21
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenEasyPhotoStatisticsInfo.java
@@ -0,0 +1,51 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BigScreenEasyPhotoStatisticsInfo
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 随手拍大屏统计数据
+ * @author: hans
+ * @date: 2021/12/16 13:31
+ */
+@Data
+@ApiModel("随手拍大屏统计数据")
+public class BigScreenEasyPhotoStatisticsInfo {
+
+ @ApiModelProperty("随手拍累计解决数量")
+ private Integer eventDealTotal = 0;
+
+ @ApiModelProperty("突发事件报告解决数")
+ private Integer eventTFDeal = 0;
+
+ @ApiModelProperty("治安防控事件解决数")
+ private Integer eventZADeal = 0;
+
+ @ApiModelProperty("矛盾劝解事件解决数")
+ private Integer eventMDDeal = 0;
+
+ @ApiModelProperty("特殊人群服务事件解决数")
+ private Integer eventTSDeal = 0;
+
+ @ApiModelProperty("民生服务事件解决数")
+ private Integer eventMSDeal = 0;
+
+ @ApiModelProperty("防灾减灾事件解决数")
+ private Integer eventFJDeal = 0;
+
+ @ApiModelProperty("其他事件解决数")
+ private Integer otherDeal = 0;
+
+ @ApiModelProperty(value = "随手拍新增折线数据")
+ private List<StatisticsCommVO> easyPhotoAddPolylineData;
+
+ @ApiModelProperty(value = "随手拍累计折线数据")
+ private List<StatisticsCommVO> easyPhotoTotalPolylineData;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenFiveAssociationsStatisticsInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenFiveAssociationsStatisticsInfo.java
new file mode 100644
index 0000000..cd29b50
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenFiveAssociationsStatisticsInfo.java
@@ -0,0 +1,48 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BigScreenFiveAssociationsStatisticsInfo
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五社联动大屏统计数据
+ * @author: hans
+ * @date: 2022/06/06 10:48
+ */
+@Data
+@ApiModel("五社联动大屏统计数据")
+public class BigScreenFiveAssociationsStatisticsInfo {
+
+ @ApiModelProperty("社区数")
+ private Integer communityNum;
+
+ @ApiModelProperty("社会组织数")
+ private Integer socialOrgNum;
+
+ @ApiModelProperty("社区企业数")
+ private Integer enterpriseNum;
+
+ @ApiModelProperty("社区工作者数")
+ private Integer socialWorkerNum;
+
+ @ApiModelProperty("社区志愿者数")
+ private Integer volunteerNum;
+
+ @ApiModelProperty("社会组织承接项目数")
+ private Integer acceptProjectTotal;
+
+ @ApiModelProperty(value = "社区企业服务分类占比圆形图数据")
+ private List<StatisticsCommVO> enterpriseServiceTypeCircleData;
+
+ @ApiModelProperty(value = "社区工作者年龄段占比圆形图数据")
+ private List<StatisticsCommVO> socialWorkerAgeStageCircleData;
+
+ @ApiModelProperty(value = "社区工作者服务分类占比圆形图数据")
+ private List<StatisticsCommVO> socialWorkerServiceTypeCircleData;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenFmsStatisticsInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenFmsStatisticsInfo.java
new file mode 100644
index 0000000..522a806
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenFmsStatisticsInfo.java
@@ -0,0 +1,72 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BigScreenFmsStatisticsInfo
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 杨家坪定制-五微服务大屏统计数据
+ * @author: hans
+ * @date: 2022/02/26 14:57
+ */
+@Data
+@ApiModel("杨家坪定制-五微服务大屏统计数据")
+public class BigScreenFmsStatisticsInfo {
+
+ @ApiModelProperty(value = "团队/微团队总数")
+ private Integer teamTotal;
+
+ @ApiModelProperty("成员总数")
+ private Integer memberTotal;
+
+ @ApiModelProperty("服务/微服务总数")
+ private Integer serviceTotal;
+
+ @ApiModelProperty("已服务总数")
+ private Integer completeServiceTotal;
+
+ @ApiModelProperty("微讲堂/开课总数")
+ private Integer classroomTotal;
+
+ @ApiModelProperty("微调节")
+ private Integer adjustTotal;
+
+ @ApiModelProperty("微防控")
+ private Integer controlTotal;
+
+ @ApiModelProperty("参与学习人数")
+ private Integer learnTotal;
+
+ @ApiModelProperty("发现隐患数")
+ private Integer fxyhTotal;
+
+ @ApiModelProperty("解决隐患数")
+ private Integer jjyhTotal;
+
+ @ApiModelProperty(value = "团队类型占比圆形图数据")
+ private List<StatisticsCommVO> teamTypeCircleData;
+
+ @ApiModelProperty(value = "微服务新增折线数据")
+ private List<StatisticsCommVO> serviceAddPolylineData;
+
+ @ApiModelProperty(value = "微服务累计折线数据")
+ private List<StatisticsCommVO> serviceTotalPolylineData;
+
+ @ApiModelProperty(value = "微调节矛盾类型占比圆形图数据")
+ private List<StatisticsCommVO> adjustCircleData;
+
+ @ApiModelProperty(value = "新增解决矛盾折线数据")
+ private List<StatisticsCommVO> adjustAddPolylineData;
+
+ @ApiModelProperty(value = "累计解决矛盾折线数据")
+ private List<StatisticsCommVO> adjustTotalPolylineData;
+
+ @ApiModelProperty(value = "微防控防控类型占比圆形图数据")
+ private List<StatisticsCommVO> controlCircleData;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenFourMemberStatisticsInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenFourMemberStatisticsInfo.java
new file mode 100644
index 0000000..fbff3b0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenFourMemberStatisticsInfo.java
@@ -0,0 +1,70 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BigScreenPartyBuildIngStatisticsInfo
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 金沙定制-四长四员大屏统计数据
+ * @author: hans
+ * @date: 2022/02/21 16:22
+ */
+@Data
+@ApiModel("金沙定制-四长四员大屏统计数据")
+public class BigScreenFourMemberStatisticsInfo {
+
+ @ApiModelProperty(value = "四长四员总数/群众线总数")
+ private Integer szsyTotal;
+
+ @ApiModelProperty("居民小组长")
+ private Integer jmxzzTotal;
+
+ @ApiModelProperty("妇女小组长")
+ private Integer fnxzzTotal;
+
+ @ApiModelProperty("楼栋党小组长")
+ private Integer dxzzTotal;
+
+ @ApiModelProperty("楼栋长")
+ private Integer ldzTotal;
+
+ @ApiModelProperty("调解员")
+ private Integer tjyTotal;
+
+ @ApiModelProperty("安全员")
+ private Integer aqyTotal;
+
+ @ApiModelProperty("宣传员")
+ private Integer xcyTotal;
+
+ @ApiModelProperty("监督员")
+ private Integer jdyTotal;
+
+ @ApiModelProperty("解决问题数")
+ private Integer jjwtTotal;
+
+ @ApiModelProperty("院落议事数")
+ private Integer ylysTotal;
+
+ @ApiModelProperty(value = "解决问题新增折线数据")
+ private List<StatisticsCommVO> jjwtAddPolylineData;
+
+ @ApiModelProperty(value = "解决问题累计折线数据")
+ private List<StatisticsCommVO> jjwtTotalPolylineData;
+
+ @ApiModelProperty(value = "院落议事新增折线数据")
+ private List<StatisticsCommVO> ylysAddPolylineData;
+
+ @ApiModelProperty(value = "院落议事累计折线数据")
+ private List<StatisticsCommVO> ylysTotalPolylineData;
+
+ @ApiModelProperty("四长四员组织列表")
+ private List<FourMemberOrgRelationVO> fourMemberOrgList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenGridStaticsReturn.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenGridStaticsReturn.java
new file mode 100644
index 0000000..0306808
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenGridStaticsReturn.java
@@ -0,0 +1,18 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+public class BigScreenGridStaticsReturn {
+ private Integer count;
+ private Integer num;
+ private BigDecimal percent;
+ private String title;
+ private List<BigScreenGridStaticsReturn> bigScreenGridStaticsReturnList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHatchStatisticsInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHatchStatisticsInfo.java
new file mode 100644
index 0000000..3d76812
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHatchStatisticsInfo.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BigScreenHatchStatisticsInfo
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 孵化中心大屏统计数据
+ * @author: hans
+ * @date: 2022/05/31 17:50
+ */
+@Data
+@ApiModel("孵化中心大屏统计数据")
+public class BigScreenHatchStatisticsInfo {
+
+ @ApiModelProperty("孵化中心数量/孵化进度数量")
+ private Integer hatchCenterTotal;
+
+ @ApiModelProperty("西区社区组织数量")
+ private Integer westAreaOrgTotal;
+
+ @ApiModelProperty("孵化成果数量")
+ private Integer hatchResultTotal;
+
+ @ApiModelProperty(value = "孵化进程占比圆形图数据")
+ private List<StatisticsCommVO> hatchScheduleCircleData;
+
+ @ApiModelProperty(value = "孵化状态占比柱形数据")
+ private List<StatisticsCommVO> hatchStatusColumnData;
+
+ @ApiModelProperty(value = "街道组织占比柱形数据")
+ private List<StatisticsCommVO> streetOrgColumnData;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkBaseInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkBaseInfo.java
new file mode 100644
index 0000000..48b57ab
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkBaseInfo.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("大屏首页数据")
+public class BigScreenHmkBaseInfo {
+ @ApiModelProperty("项目管理")
+ private BigScreenHmkProjectInfo bigScreenHmkProjectInfo;
+ @ApiModelProperty("项目数")
+ private Integer projectCount;
+ @ApiModelProperty("活动数")
+ private Integer activityCount;
+ @ApiModelProperty("社工数")
+ private Integer socialWorkerCount;
+ @ApiModelProperty("居民数")
+ private Integer userCount;
+ @ApiModelProperty("社会组织数")
+ private Integer socialOrgCount;
+ @ApiModelProperty("服务次数")
+ private Integer serviceCount;
+ @ApiModelProperty("社会组织管理")
+ private BigScreenHmkSocialOrgInfo bigScreenHmkSocialOrgInfo;
+ @ApiModelProperty("社工分析数据")
+ private BigScreenHmkSocialWorkerInfo bigScreenHmkSocialWorkerInfo;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkProjectInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkProjectInfo.java
new file mode 100644
index 0000000..10e4de9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkProjectInfo.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("项目数据")
+public class BigScreenHmkProjectInfo {
+ @ApiModelProperty("项目数")
+ private Integer count;
+ @ApiModelProperty("项目类型饼状图")
+ private List<BigScreenHmkProjectTypeInfo> typeInfoList;
+ @ApiModelProperty("项目活动类型饼状图")
+ private List<BigScreenHmkProjectTypeInfo> activityTypeInfoList;
+ @ApiModelProperty("已分派")
+ private Integer assigned;
+ @ApiModelProperty("待分派")
+ private Integer assign;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkProjectTypeInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkProjectTypeInfo.java
new file mode 100644
index 0000000..81d2908
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkProjectTypeInfo.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("项目饼状图")
+public class BigScreenHmkProjectTypeInfo {
+ @ApiModelProperty("名字")
+ private String name;
+ @ApiModelProperty("数量")
+ private Integer count;
+ @ApiModelProperty("百分比")
+ private Integer percent;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkSocialOrgInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkSocialOrgInfo.java
new file mode 100644
index 0000000..7c6d487
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkSocialOrgInfo.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("社会组织饼状图")
+public class BigScreenHmkSocialOrgInfo {
+ @ApiModelProperty("总数")
+ private Integer count;
+ @ApiModelProperty("服务数")
+ private Integer serviceCount;
+ @ApiModelProperty("组织分类图")
+ List<BigScreenHmkProjectTypeInfo> typeInfoList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkSocialWorkerInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkSocialWorkerInfo.java
new file mode 100644
index 0000000..923cc01
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkSocialWorkerInfo.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("社工基础数据")
+public class BigScreenHmkSocialWorkerInfo {
+ @ApiModelProperty("社工年龄分布")
+ private List<BigScreenHmkProjectTypeInfo> socialWorkerAge;
+ @ApiModelProperty("社工技能分析")
+ private List<BigScreenHmkProjectTypeInfo> socialWorkerSkill;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenMerchantStatisticsInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenMerchantStatisticsInfo.java
new file mode 100644
index 0000000..29e3c06
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenMerchantStatisticsInfo.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BigScreenMerchantStatisticsInfo
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 便民商家大屏统计数据
+ * @author: hans
+ * @date: 2021/12/17 15:05
+ */
+@Data
+@ApiModel("便民商家大屏统计数据")
+public class BigScreenMerchantStatisticsInfo {
+
+ @ApiModelProperty("资源类型数")
+ private Integer resourceTypeNum = 0;
+
+ @ApiModelProperty("服务类型数")
+ private Integer serviceTypeNum = 0;
+
+ @ApiModelProperty("商家数量")
+ private Integer merchantNum = 0;
+
+ @ApiModelProperty("已提供服务次数")
+ private Integer serviceTimes = 0;
+
+ @ApiModelProperty(value = "资源类型饼图数据")
+ private List<StatisticsCommVO> resourceTypeCircleData;
+
+ @ApiModelProperty(value = "服务类型饼图数据")
+ private List<StatisticsCommVO> serviceTypeCircleData;
+
+ @ApiModelProperty(value = "服务量新增折线数据")
+ private List<StatisticsCommVO> serviceTimesAddPolylineData;
+
+ @ApiModelProperty(value = "服务量累计折线数据")
+ private List<StatisticsCommVO> serviceTimesTotalPolylineData;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenMicroWishStatisticsInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenMicroWishStatisticsInfo.java
new file mode 100644
index 0000000..140cf72
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenMicroWishStatisticsInfo.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BigScreenMicroWishStatisticsInfo
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 微心愿大屏统计数据
+ * @author: hans
+ * @date: 2021/12/15 16:56
+ */
+@Data
+@ApiModel("微心愿大屏统计数据")
+public class BigScreenMicroWishStatisticsInfo {
+
+ @ApiModelProperty("心愿总数量")
+ private Integer microWishTotal;
+
+ @ApiModelProperty("心愿已实现数量")
+ private Integer microWishRealized;
+
+ @ApiModelProperty("心愿未实现数量")
+ private Integer microWishUnrealized;
+
+ @ApiModelProperty(value = "微心愿新增折线数据")
+ private List<StatisticsCommVO> microWishAddPolylineData;
+
+ @ApiModelProperty(value = "微心愿累计折线数据")
+ private List<StatisticsCommVO> microWishTotalPolylineData;
+
+ @ApiModelProperty(value = "微心愿展示列表")
+ private List<ComActMicroWishVO> microWishDisplayList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenNeighborStatisticsInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenNeighborStatisticsInfo.java
new file mode 100644
index 0000000..f36c04e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenNeighborStatisticsInfo.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BigScreenNeighborStatisticsInfo
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 邻里圈大屏统计数据
+ * @author: hans
+ * @date: 2021/12/17 13:19
+ */
+@Data
+@ApiModel("邻里圈大屏统计数据")
+public class BigScreenNeighborStatisticsInfo {
+
+ @ApiModelProperty("邻里圈发布内容数")
+ private Integer publishContentNum = 0;
+
+ @ApiModelProperty("邻里圈发布话题数")
+ private Integer publishTopicNum = 0;
+
+ @ApiModelProperty(value = "邻里圈饼图数据")
+ private List<StatisticsCommVO> neighborCircleData;
+
+ @ApiModelProperty(value = "邻里圈新增折线数据")
+ private List<StatisticsCommVO> neighborAddPolylineData;
+
+ @ApiModelProperty(value = "邻里圈累计折线数据")
+ private List<StatisticsCommVO> neighborTotalPolylineData;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenPartyBuildIngStatisticsInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenPartyBuildIngStatisticsInfo.java
new file mode 100644
index 0000000..38b2696
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenPartyBuildIngStatisticsInfo.java
@@ -0,0 +1,114 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.ComActDynVO;
+import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
+import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BigScreenPartyBuildIngStatisticsInfo
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 金沙定制-党建引领大屏统计数据
+ * @author: hans
+ * @date: 2022/02/21 16:22
+ */
+@Data
+@ApiModel("金沙定制-党建引领大屏统计数据")
+public class BigScreenPartyBuildIngStatisticsInfo {
+
+ @ApiModelProperty("党建动态数")
+ private Integer djdtTotal;
+
+ @ApiModelProperty("党建活动数")
+ private Integer djhdTotal;
+
+ @ApiModelProperty(value = "议事投票总数/议事线总数")
+ private Integer ystpTotal;
+
+ @ApiModelProperty(value = "议事投票总参与人数")
+ private Integer ystpcyTotal;
+
+ @ApiModelProperty(value = "议事总数")
+ private Integer ysTotal;
+
+ @ApiModelProperty(value = "投票总数")
+ private Integer tpTotal;
+
+ @ApiModelProperty(value = "院落议事总数")
+ private Integer ylysTotal = 0;
+
+ @ApiModelProperty(value = "社区议事总数")
+ private Integer sqysTotal = 0;
+
+ @ApiModelProperty(value = "党员线总数")
+ private Integer dyTotal;
+
+ @ApiModelProperty(value = "志愿线总数")
+ private Integer zyfwTotal;
+
+ @ApiModelProperty(value = "四长四员总数/群众线总数")
+ private Integer szsyTotal;
+
+ @ApiModelProperty(value = "安全线总数")
+ private Integer aqxTotal;
+
+ @ApiModelProperty("居民小组长")
+ private Integer jmxzzTotal;
+
+ @ApiModelProperty("妇女小组长")
+ private Integer fnxzzTotal;
+
+ @ApiModelProperty("楼栋党小组长")
+ private Integer dxzzTotal;
+
+ @ApiModelProperty("楼栋长")
+ private Integer ldzTotal;
+
+ @ApiModelProperty("调解员")
+ private Integer tjyTotal;
+
+ @ApiModelProperty("安全员")
+ private Integer aqyTotal;
+
+ @ApiModelProperty("宣传员")
+ private Integer xcyTotal;
+
+ @ApiModelProperty("监督员")
+ private Integer jdyTotal;
+
+ @ApiModelProperty("志愿线总服务次数")
+ private Integer zyxServiceTotal;
+
+ @ApiModelProperty("志愿线帮助群众次数")
+ private Integer zyxHelpTotal;
+
+ @ApiModelProperty("居民宣传次数")
+ private Integer jmxcTotal;
+
+ @ApiModelProperty("商户监督次数")
+ private Integer shjdTotal = 0;
+
+ @ApiModelProperty("辖区巡查次数")
+ private Integer xqxcTotal;
+
+ @ApiModelProperty("群众满意度分数")
+ private Double qzmydStar;
+
+ @ApiModelProperty("随手拍治安防控记录列表")
+ private List<ComActEasyPhotoVO> zafkList;
+
+ @ApiModelProperty("居民宣传记录列表")
+ private List<ComActDynVO> jmxcList;
+
+ @ApiModelProperty("商户监督记录列表")
+ private List shjdList;
+
+ @ApiModelProperty("辖区巡查记录列表")
+ private List<ComSwPatrolRecordVO> xqxcList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenQuestionnaireStatisticsInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenQuestionnaireStatisticsInfo.java
new file mode 100644
index 0000000..62fa308
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenQuestionnaireStatisticsInfo.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BigScreenQuestionnaireStatisticsInfo
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 社区问卷大屏统计数据
+ * @author: hans
+ * @date: 2021/12/16 16:11
+ */
+@Data
+@ApiModel("社区问卷大屏统计数据")
+public class BigScreenQuestionnaireStatisticsInfo {
+
+ @ApiModelProperty("社区问卷发起总数")
+ private Integer questionnaireNum = 0;
+
+ @ApiModelProperty("社区问卷参与人数")
+ private Integer joinNum = 0;
+
+ @ApiModelProperty(value = "社区问卷新增折线数据")
+ private List<StatisticsCommVO> questionnaireAddPolylineData;
+
+ @ApiModelProperty(value = "社区问卷累计折线数据")
+ private List<StatisticsCommVO> questionnaireTotalPolylineData;
+
+ @ApiModelProperty(value = "社区问卷展示列表")
+ private List<ComActQuestnaireVO> questionnaireDisplayList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenResidentActStatisticsInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenResidentActStatisticsInfo.java
new file mode 100644
index 0000000..fe0a78b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenResidentActStatisticsInfo.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BigScreenResidentActStatisticsInfo
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 居民活动大屏统计数据
+ * @author: hans
+ * @date: 2021/12/24 15:06
+ */
+@Data
+@ApiModel("居民活动大屏统计数据")
+public class BigScreenResidentActStatisticsInfo {
+
+ @ApiModelProperty("居民活动发布次数")
+ private Integer publishNum = 0;
+
+ @ApiModelProperty("居民活动参与人数")
+ private Integer joinNum = 0;
+
+ @ApiModelProperty(value = "居民活动饼图数据")
+ private List<StatisticsCommVO> actCircleData;
+
+ @ApiModelProperty(value = "居民活动新增折线数据")
+ private List<StatisticsCommVO> actAddPolylineData;
+
+ @ApiModelProperty(value = "居民活动累计折线数据")
+ private List<StatisticsCommVO> actTotalPolylineData;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenServiceData.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenServiceData.java
new file mode 100644
index 0000000..d10698f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenServiceData.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("服务数据")
+public class BigScreenServiceData {
+ @ApiModelProperty("办事指南")
+ private Integer guide;
+ @ApiModelProperty("通知公告")
+ private Integer announcement;
+ @ApiModelProperty("高龄认证")
+ private Integer eldersAuth;
+ @ApiModelProperty("便民商家")
+ private Integer convenient;
+ @ApiModelProperty("房屋租赁")
+ private Integer rentingHouse;
+ @ApiModelProperty("一键服务")
+ private Integer oneButton;
+ @ApiModelProperty("社区工作者")
+ private Integer socialWorker = 0;
+ @ApiModelProperty("养老认证")
+ private Integer pensionAuth;
+ @ApiModelProperty("逝世申报")
+ private Integer death=0;
+ @ApiModelProperty("高龄补贴")
+ private Integer eldersAllowance=0;
+ @ApiModelProperty("服务咨询")
+ private Integer serviceConsultation=0;
+ @ApiModelProperty("政策文件")
+ private Integer partyDyn;
+ @ApiModelProperty("便民设施")
+ private Integer equipment=0;
+ @ApiModelProperty("物业公司")
+ private Integer property;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenServiceUser.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenServiceUser.java
new file mode 100644
index 0000000..7a20fa1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenServiceUser.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("服务居民")
+public class BigScreenServiceUser {
+ @ApiModelProperty("小区名")
+ private String villageName;
+ @ApiModelProperty("人数")
+ private Integer num;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStaticsReserve.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStaticsReserve.java
new file mode 100644
index 0000000..974e5ef
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStaticsReserve.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("安全防控")
+public class BigScreenStaticsReserve {
+ @ApiModelProperty("总数")
+ private Integer count;
+ @ApiModelProperty("防疫管控")
+ private Integer epidemicCount;
+ @ApiModelProperty("燃气登记")
+ private Integer gasCount;
+ @ApiModelProperty("防火登记")
+ private Integer fireCount;
+ @ApiModelProperty("返攀登记")
+ private Integer reserveCount;
+ @ApiModelProperty("居家隔离登记")
+ private Integer homeCount;
+ @ApiModelProperty("返攀登记百分比")
+ private BigDecimal reservePercent;
+ @ApiModelProperty("居家隔离百分比")
+ private BigDecimal homePercent;
+ @ApiModelProperty("燃气登记百分比")
+ private BigDecimal gasPercent;
+ @ApiModelProperty("防火登记百分比")
+ private BigDecimal firePercent;
+ @ApiModelProperty("折线图数据")
+ private List<BigScreenStaticsReserveMonth> bigScreenStaticsReserveMonthList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStaticsReserveMonth.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStaticsReserveMonth.java
new file mode 100644
index 0000000..55d4bb9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStaticsReserveMonth.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("每月安全防空数据")
+public class BigScreenStaticsReserveMonth {
+ @ApiModelProperty("x轴")
+ private String x;
+ @ApiModelProperty("燃气登记")
+ private Integer gasCount;
+ @ApiModelProperty("防火登记")
+ private Integer fireCount;
+ @ApiModelProperty("返攀登记")
+ private Integer reserveCount;
+ @ApiModelProperty("居家隔离登记")
+ private Integer homeCount;
+ @ApiModelProperty("总量")
+ private Integer count;
+
+ private String year;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticAgeGender.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticAgeGender.java
new file mode 100644
index 0000000..41df6ef
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticAgeGender.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClasssName BigScreenStatisticParty
+ * @Description 大屏数据党建统计信息
+ * @Author cedoo
+ * @Date 2021/6/15
+ * @Version 1.0
+ **/
+@Data
+public class BigScreenStatisticAgeGender {
+
+ @ApiModelProperty(value = "男性占比")
+ private Double manPer;
+ @ApiModelProperty(value = "男性数量")
+ private Integer manTotal;
+ @ApiModelProperty(value = "女性占比")
+ private Double womenPer;
+ @ApiModelProperty(value = "女性数量")
+ private Integer womeTotal;
+
+ @ApiModelProperty(value = "年龄段总数 30以下")
+ private Double thirtyPer;
+ @ApiModelProperty(value = "年龄段占比 30以下")
+ private Integer thirtyTotal;
+
+ @ApiModelProperty(value = "年龄段总数 30-60")
+ private Double sixtyPer;
+ @ApiModelProperty(value = "年龄段占比 30-60")
+ private Integer sixtyTotal;
+
+ @ApiModelProperty(value = "年龄段总数 60以上")
+ private Double biggerPer;
+ @ApiModelProperty(value = "年龄段占比 60以上")
+ private Integer biggerTotal;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyActivity.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyActivity.java
new file mode 100644
index 0000000..724b04b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyActivity.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClasssName BigScreenStatisticParty
+ * @Description 大屏数据党建统计信息
+ * @Author cedoo
+ * @Date 2021/6/15
+ * @Version 1.0
+ **/
+@Data
+public class BigScreenStatisticPartyActivity {
+
+ @ApiModelProperty(value = "顺序")
+ private Integer idx;
+
+ @ApiModelProperty(value = "显示名称")
+ private String idxName;
+
+ @ApiModelProperty(value = "党员数量")
+ private Integer total;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyActivityTopUser.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyActivityTopUser.java
new file mode 100644
index 0000000..9ae1411
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyActivityTopUser.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClasssName BigScreenStatisticParty
+ * @Description 大屏数据党建统计信息
+ * @Author cedoo
+ * @Date 2021/6/15
+ * @Version 1.0
+ **/
+@Data
+public class BigScreenStatisticPartyActivityTopUser {
+
+ @ApiModelProperty(value = "党员活动排行榜")
+ List<PartyBuildingMemberVO> topUser;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyBuild.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyBuild.java
new file mode 100644
index 0000000..baac2e5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyBuild.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClasssName BigScreenStatisticParty
+ * @Description 大屏数据党建统计信息
+ * @Author cedoo
+ * @Date 2021/6/15
+ * @Version 1.0
+ **/
+@Data
+public class BigScreenStatisticPartyBuild {
+
+ @ApiModelProperty(value = "党组织数")
+ private Integer orgCount;
+ @ApiModelProperty(value = "党员数")
+ private Integer memberCount;
+ @ApiModelProperty(value = "党员活动数")
+ private Integer activityCount;
+ @ApiModelProperty(value = "党建宣传数")
+ private Integer dynCount;// 党建动态
+ @ApiModelProperty(value = "社区党委")
+ private Integer committeeCount;
+ @ApiModelProperty("覆盖率")
+ private Integer coverPercent=0;
+ @ApiModelProperty("单位党组织")
+ private Integer orgPartyCount=0;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyDyn.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyDyn.java
new file mode 100644
index 0000000..c9d2aa9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyDyn.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClasssName BigScreenStatisticParty
+ * @Description 大屏数据党建统计信息
+ * @Author cedoo
+ * @Date 2021/6/15
+ * @Version 1.0
+ **/
+@Data
+public class BigScreenStatisticPartyDyn {
+
+ @ApiModelProperty(value = "党组织ID")
+ private Long id;
+ @ApiModelProperty(value = "党组织名称")
+ private String name;
+ @ApiModelProperty(value = "党员数量")
+ private Integer total;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyMemeber.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyMemeber.java
new file mode 100644
index 0000000..7cbaef5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyMemeber.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClasssName BigScreenStatisticParty
+ * @Description 大屏数据党建统计信息
+ * @Author cedoo
+ * @Date 2021/6/15
+ * @Version 1.0
+ **/
+@Data
+public class BigScreenStatisticPartyMemeber {
+
+ @ApiModelProperty(value = "党组织ID")
+ private Long id;
+ @ApiModelProperty(value = "党组织名称")
+ private String name;
+ @ApiModelProperty(value = "党员数量")
+ private Integer total;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyOrg.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyOrg.java
new file mode 100644
index 0000000..c803d70
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStatisticPartyOrg.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClasssName BigScreenStatisticParty
+ * @Description 大屏数据党建统计信息
+ * @Author cedoo
+ * @Date 2021/6/15
+ * @Version 1.0
+ **/
+@Data
+public class BigScreenStatisticPartyOrg {
+
+ @ApiModelProperty(value = "党组织ID")
+ private Long id;
+ @ApiModelProperty(value = "党组织名称")
+ private String name;
+ @ApiModelProperty(value = "党员数量")
+ private Integer total;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenVolunteerActStatisticsInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenVolunteerActStatisticsInfo.java
new file mode 100644
index 0000000..e73ac08
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenVolunteerActStatisticsInfo.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BigScreenVolunteerActStatisticsInfo
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 志愿者活动大屏统计数据
+ * @author: hans
+ * @date: 2021/12/24 16:25
+ */
+@Data
+@ApiModel("志愿者活动大屏统计数据")
+public class BigScreenVolunteerActStatisticsInfo {
+
+ @ApiModelProperty("志愿者活动发布次数")
+ private Integer publishNum = 0;
+
+ @ApiModelProperty("志愿者活动参与人数")
+ private Integer joinNum = 0;
+
+ @ApiModelProperty(value = "志愿者活动饼图数据")
+ private List<StatisticsCommVO> actCircleData;
+
+ @ApiModelProperty(value = "志愿者活动新增折线数据")
+ private List<StatisticsCommVO> actAddPolylineData;
+
+ @ApiModelProperty(value = "志愿者活动累计折线数据")
+ private List<StatisticsCommVO> actTotalPolylineData;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenVolunteerStatisticsInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenVolunteerStatisticsInfo.java
new file mode 100644
index 0000000..ea25f1d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenVolunteerStatisticsInfo.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: BigScreenVolunteerStatisticsInfo
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 杨家坪定制-志愿服务大屏统计数据
+ * @author: hans
+ * @date: 2022/03/02 15:25
+ */
+@Data
+@ApiModel("杨家坪定制-志愿服务大屏统计数据")
+public class BigScreenVolunteerStatisticsInfo extends BigScreenVolunteerActStatisticsInfo {
+
+ @ApiModelProperty("志愿者人数")
+ private Integer volunteerNum = 0;
+
+ @ApiModelProperty("志愿者组织")
+ private Integer volunteerOrgNum = 0;
+
+ @ApiModelProperty("志愿者队伍")
+ private Integer volunteerTeamNum = 0;
+
+ @ApiModelProperty(value = "志愿者统计-组织人数直方图")
+ private List<StatisticsCommVO> volunteerOrgHistogram;
+
+ @ApiModelProperty(value = "志愿者服务类型占比圆形图")
+ private List<StatisticsCommVO> volunteerServiceTypeCircleData;
+
+ @ApiModelProperty(value = "志愿者年龄段占比圆形图")
+ private List<StatisticsCommVO> volunteerAgeCircleData;
+
+ @ApiModelProperty(value = "志愿者技能占比圆形图")
+ private List<StatisticsCommVO> volunteerSkillCircleData;
+
+ @ApiModelProperty(value = "志愿者组织关系")
+ private List<VolunteerOrgRelationVO> volunteerOrgRelationList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigscreenGridsGovernanceStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigscreenGridsGovernanceStatisticsVO.java
new file mode 100644
index 0000000..ccc09db
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigscreenGridsGovernanceStatisticsVO.java
@@ -0,0 +1,55 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.event.EventGridIncidentStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.event.EventGridStatisticsVO;
+import com.panzhihua.common.model.vos.screen.ScreenDrawEventPopulationTotalVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @title: GridsGovernanceStatisticsVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 清网治格统计信息
+ * @author: hans
+ * @date: 2021/12/08 14:38
+ */
+@Data
+@ApiModel("清网治格统计信息")
+public class BigscreenGridsGovernanceStatisticsVO {
+
+ @ApiModelProperty("事件总数")
+ private Integer eventTotal = 0;
+
+ @ApiModelProperty("突发事件报告总数")
+ private Integer eventTFTotal = 0;
+
+ @ApiModelProperty("治安防控事件总数")
+ private Integer eventZATotal = 0;
+
+ @ApiModelProperty("矛盾劝解事件总数")
+ private Integer eventMDTotal = 0;
+
+ @ApiModelProperty("特殊人群服务事件总数")
+ private Integer eventTSTotal = 0;
+
+ @ApiModelProperty("民生服务事件总数")
+ private Integer eventMSTotal = 0;
+
+ @ApiModelProperty("防灾减灾事件总数")
+ private Integer eventFJTotal = 0;
+
+ @ApiModelProperty("法规宣传事件总数")
+ private Integer eventFGTotal = 0;
+
+ @ApiModelProperty("安全巡查")
+ private Integer safety=0;
+
+ @ApiModelProperty("其他事件总数")
+ private Integer otherTotal = 0;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/EquipmentPointMapDataVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/EquipmentPointMapDataVO.java
new file mode 100644
index 0000000..4c55728
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/EquipmentPointMapDataVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
+
+import com.panzhihua.common.model.vos.property.ComPropertyEquipmentVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: EquipmentPointMapDataVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 设备点位图数据
+ * @author: hans
+ * @date: 2022/03/02 11:21
+ */
+@Data
+public class EquipmentPointMapDataVO {
+
+ @ApiModelProperty("经纬度位置")
+ private String position;
+
+ @ApiModelProperty("设备数")
+ private Integer equipmentNum;
+
+ @ApiModelProperty("点位展示颜色（1.红色 2.黄色 3.绿色）")
+ private Integer pointColor;
+
+ @ApiModelProperty("设备")
+ List<ComPropertyEquipmentVO> equipments;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/FourMemberOrgRelationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/FourMemberOrgRelationVO.java
new file mode 100644
index 0000000..6ea6147
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/FourMemberOrgRelationVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: FourMemberOrgRelationVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 四长四员组织关系
+ * @author: hans
+ * @date: 2022/02/25 16:57
+ */
+@Data
+public class FourMemberOrgRelationVO {
+
+ @ApiModelProperty("关系")
+ private String relation;
+
+ @ApiModelProperty("成员")
+ List<ComActFourMemberVO> members;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/GridsGovernanceStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/GridsGovernanceStatisticsVO.java
new file mode 100644
index 0000000..d34a8c9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/GridsGovernanceStatisticsVO.java
@@ -0,0 +1,110 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.event.EventGridStatisticsVO;
+import com.panzhihua.common.model.vos.screen.ScreenDrawEventPopulationTotalVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: GridsGovernanceStatisticsVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 清网治格统计信息
+ * @author: hans
+ * @date: 2021/12/08 14:38
+ */
+@Data
+@ApiModel("清网治格统计信息")
+public class GridsGovernanceStatisticsVO {
+
+ @ApiModelProperty("事件总数")
+ private Integer eventTotal = 0;
+
+ @ApiModelProperty("已处理事件总数")
+ private Integer dealTotal = 0;
+
+ @ApiModelProperty("待处理事件总数")
+ private Integer unDealTotal = 0;
+
+ @ApiModelProperty("突发事件报告总数")
+ private Integer eventTFTotal = 0;
+
+ @ApiModelProperty("治安防控事件总数")
+ private Integer eventZATotal = 0;
+
+ @ApiModelProperty("矛盾劝解事件总数")
+ private Integer eventMDTotal = 0;
+
+ @ApiModelProperty("特殊人群服务事件总数")
+ private Integer eventTSTotal = 0;
+
+ @ApiModelProperty("民生服务事件总数")
+ private Integer eventMSTotal = 0;
+
+ @ApiModelProperty("防灾减灾事件总数")
+ private Integer eventFJTotal = 0;
+
+ @ApiModelProperty("其他事件总数")
+ private Integer otherTotal = 0;
+
+ @ApiModelProperty("突发事件报告完成数")
+ private Integer eventTFDeal = 0;
+
+ @ApiModelProperty("治安防控事件完成数")
+ private Integer eventZADeal = 0;
+
+ @ApiModelProperty("矛盾劝解事件完成数")
+ private Integer eventMDDeal = 0;
+
+ @ApiModelProperty("特殊人群服务事件完成数")
+ private Integer eventTSDeal = 0;
+
+ @ApiModelProperty("民生服务事件完成数")
+ private Integer eventMSDeal = 0;
+
+ @ApiModelProperty("防灾减灾事件完成数")
+ private Integer eventFJDeal = 0;
+
+ @ApiModelProperty("其他事件完成数")
+ private Integer otherDeal = 0;
+
+ @ApiModelProperty("网格数")
+ private Integer gridTotal = 0;
+
+ @ApiModelProperty("调解员")
+ private Integer gridMemberTotal = 0;
+
+ @ApiModelProperty("大屏网格数据")
+ private List<EventGridStatisticsVO> gridStatisticsList;
+
+ @ApiModelProperty("小区列表数据")
+ private List<CivilVillageStatisticsVO> villageStatisticsList;
+
+ @ApiModelProperty("人口统计")
+ private ScreenDrawEventPopulationTotalVO drawEventPopulationTotalVO;
+
+ @ApiModelProperty("年龄段统计")
+ private List<StatisticsCommVO> ageGroupStatistics;
+
+ @ApiModelProperty("事件分析新增折线数据")
+ private List<StatisticsCommVO> eventAddPolylineData;
+
+ @ApiModelProperty("事件分析累计折线数据")
+ private List<StatisticsCommVO> eventTotalPolylineData;
+
+ @ApiModelProperty("绘制事件类型统计圆形图")
+ private List<StatisticsCommVO> eventTypeCircleDrawData;
+
+ public void generateStatisticsData() {
+ this.eventTotal = this.eventTFTotal + this.eventZATotal + this.eventMDTotal +
+ this.eventTSTotal + this.eventMSTotal + this.eventFJTotal + this.otherTotal;
+ this.dealTotal = this.eventTFDeal + this.eventZADeal + this.eventMDDeal +
+ this.eventTSDeal + this.eventMSDeal + this.eventFJDeal + this.otherDeal;
+ this.unDealTotal = this.eventTotal - this.dealTotal;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexBackReserve.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexBackReserve.java
new file mode 100644
index 0000000..e012e3f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexBackReserve.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("返攀登记数据")
+public class IndexBackReserve {
+ @ApiModelProperty("总数")
+ private Integer count;
+ @ApiModelProperty("标题数量")
+ private List<IndexReserveSub> indexReserveSubList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexDynamic.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexDynamic.java
new file mode 100644
index 0000000..d555428
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexDynamic.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("首页业务模块统计")
+public class IndexDynamic {
+ @ApiModelProperty("微心愿")
+ private Integer microWish;
+ @ApiModelProperty("随手拍")
+ private Integer easyPhoto;
+ @ApiModelProperty("居民活动")
+ private Integer residentActivity=0;
+ @ApiModelProperty("志愿服务")
+ private Integer volunteerActivity=0;
+ @ApiModelProperty("党员活动")
+ private Integer partyActivity;
+ @ApiModelProperty("社区问卷")
+ private Integer questionnaire;
+ @ApiModelProperty("社区动态")
+ private Integer dynamic;
+ @ApiModelProperty("邻里圈")
+ private Integer neighbor;
+ @ApiModelProperty("便民商家")
+ private Integer convenient;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexHomeQuarantine.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexHomeQuarantine.java
new file mode 100644
index 0000000..97e21d2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexHomeQuarantine.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("居家隔离数据")
+public class IndexHomeQuarantine {
+ @ApiModelProperty("总数")
+ private Integer count;
+ @ApiModelProperty("标题数量")
+ private List<IndexReserveSub> indexReserveSubList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexInfo.java
new file mode 100644
index 0000000..c49cf8a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexInfo.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import com.panzhihua.common.model.vos.community.screen.index.IndexEventGridStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.index.IndexPopulationStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.index.IndexSpecialStatisticsVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("大屏首页返回数据")
+public class IndexInfo {
+ @ApiModelProperty("基础数据")
+ private BaseInfo baseInfo;
+ @ApiModelProperty("实有人口数据")
+ private IndexPopulationStatisticsVO indexPopulationStatisticsVO;
+ @ApiModelProperty("特殊人群统计模块数据")
+ private List<IndexSpecialStatisticsVO> specialStatisticsVOList;
+ @ApiModelProperty("网格化治理模块数据")
+ private IndexEventGridStatisticsVO eventGridStatisticsVO;
+ @ApiModelProperty("返攀登记居家隔离数据统计")
+ private IndexReserve indexReserve;
+ @ApiModelProperty("业务统计")
+ private IndexDynamic indexDynamic;
+ @ApiModelProperty("杨戬要求修改")
+ private BigScreenGridStaticsReturn bigScreenGridStaticsReturn;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexReserve.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexReserve.java
new file mode 100644
index 0000000..08b0786
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexReserve.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("返攀登记居家隔离数据")
+public class IndexReserve {
+ @ApiModelProperty("返攀登记数据")
+ private IndexBackReserve indexBackReserve;
+ @ApiModelProperty("居家隔离数据")
+ private IndexHomeQuarantine indexHomeQuarantine;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexReserveSub.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexReserveSub.java
new file mode 100644
index 0000000..a5e0456
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/IndexReserveSub.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("返攀登记居家隔离数据标题数量")
+public class IndexReserveSub {
+ @ApiModelProperty("标题值")
+ private Integer key;
+ @ApiModelProperty("数量")
+ private Integer num;
+ @ApiModelProperty("总数")
+ private Integer allCount;
+ @ApiModelProperty("占比")
+ private BigDecimal percent;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/PagePartyOrganizationMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/PagePartyOrganizationMemberVO.java
new file mode 100644
index 0000000..30d6a0d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/PagePartyOrganizationMemberVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 分页党员
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-30 16:10
+ **/
+@Data
+@ApiModel(value = "分页查询党员")
+public class PagePartyOrganizationMemberVO {
+
+ @ApiModelProperty(value = "组织ID")
+ private Long orgId;
+
+ @ApiModelProperty(value = "当前页数，默认1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "每页记录数，默认10")
+ private Long pageSize = 10L;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/PartyBuildingMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/PartyBuildingMemberVO.java
new file mode 100644
index 0000000..2cbccb7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/PartyBuildingMemberVO.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 党建
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-30 10:03
+ **/
+@Data
+@ApiModel("党员活动参加用户排行榜")
+public class PartyBuildingMemberVO {
+
+ @ApiModelProperty(value = "党员唯一标识id")
+ private Long id;
+
+ @ApiModelProperty(value = "党员活动id")
+ private Long activityId;
+
+ @ApiModelProperty(value = "党员id")
+ private Long memberId;
+
+ @ApiModelProperty(value = "用户ID")
+ private Long userId;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "头像图片路径")
+ private String photoPath;
+
+ @ApiModelProperty(value = "报名时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "参与活动数量")
+ private Integer total;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/ResidentAutonomyStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/ResidentAutonomyStatisticsVO.java
new file mode 100644
index 0000000..ee19ddc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/ResidentAutonomyStatisticsVO.java
@@ -0,0 +1,147 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ResidentAutonomyStatisticsVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 居民自治统计信息
+ * @author: hans
+ * @date: 2021/12/06 14:27
+ */
+@Data
+@ApiModel("居民自治统计信息")
+public class ResidentAutonomyStatisticsVO {
+
+ @ApiModelProperty(value = "随手拍本月总数")
+ private Integer easyPhotoCurrentMonCount;
+
+ @ApiModelProperty(value = "随手拍总数")
+ private Integer easyPhotoTotalCount;
+
+ @ApiModelProperty(value = "随手拍分类柱状统计")
+ private List<StatisticsCommVO> easyPhotoHistogram;
+
+ @ApiModelProperty(value = "微心愿本月总数")
+ private Integer microWishCurrentMonCount;
+
+ @ApiModelProperty(value = "集心池")
+ private Integer aimNum;
+
+ @ApiModelProperty(value = "微心愿总数")
+ private Integer microWishTotal;
+
+ @ApiModelProperty(value = "微心愿待实现&已实现数目及占比")
+ private List<StatisticsCommVO> microWishRealizePercent;
+
+ @ApiModelProperty(value = "微心愿图片")
+ private List<String> microWishImages;
+
+ @ApiModelProperty(value = "业主委员会本月总数")
+ private Integer committeeCurrentMonCount;
+
+ @ApiModelProperty(value = "业主委员会总数")
+ private Integer committeeTotal;
+
+ @ApiModelProperty(value = "业主委员会小区覆盖率")
+ private BigDecimal areaCoverPercent;
+
+ @ApiModelProperty(value = "业主委员会党员占比大于50%数量")
+ private Integer committeeMostlyTotal = 0;
+
+ @ApiModelProperty(value = "业主委员会党员占比")
+ private List<StatisticsCommVO> committeePartyPercent;
+
+ @ApiModelProperty(value = "议事投票本月总数")
+ private Integer discussCurrentMonCount;
+
+ @ApiModelProperty(value = "议事投票总数")
+ private Integer discussTotal;
+
+ @ApiModelProperty(value = "议事参与人总数")
+ private Integer discussCount;
+
+ @ApiModelProperty(value = "投票参与人总数")
+ private Integer voteCount;
+
+ @ApiModelProperty(value = "议事标题")
+ private List<String> discussTitles;
+
+ @ApiModelProperty(value = "投票标题")
+ private List<String> voteTitles;
+
+ @ApiModelProperty(value = "议事投票类型占比")
+ private List<StatisticsCommVO> discussTypePercent;
+
+ @ApiModelProperty(value = "邻里圈本月总数")
+ private Integer neighborCurrentMonCount;
+
+ @ApiModelProperty(value = "邻里圈总数")
+ private Integer neighborTotal;
+
+ @ApiModelProperty(value = "邻里圈点赞量")
+ private Integer neighborFabulousNum;
+
+ @ApiModelProperty(value = "邻里圈分享量")
+ private Integer neighborForwardNum;
+
+ @ApiModelProperty(value = "邻里圈评论量")
+ private Integer neighborCommentNum;
+
+ @ApiModelProperty(value = "邻里圈图片")
+ private List<String> neighborImages;
+
+ @ApiModelProperty(value = "邻里圈文本内容")
+ private List<String> neighborContents;
+
+ @ApiModelProperty(value = "报事报修本月总数")
+ private Integer repairCurrentMonCount;
+
+ @ApiModelProperty(value = "报事报修总数")
+ private Integer repairTotal;
+
+ @ApiModelProperty(value = "报事报修新增折线数据")
+ private List<StatisticsCommVO> repairAddPolylineData;
+
+ @ApiModelProperty(value = "报事报修累计折线数据")
+ private List<StatisticsCommVO> repairTotalPolylineData;
+
+ @ApiModelProperty(value = "爱心义仓本月总数")
+ private Integer warehouseCurrentMonCount;
+
+ @ApiModelProperty(value = "爱心义仓总捐赠数")
+ private Integer warehouseTotal;
+
+ @ApiModelProperty(value = "爱心义仓剩余物品数")
+ private Integer warehouseSurplusTotal;
+
+ @ApiModelProperty(value = "爱心义仓已领取物品数")
+ private Integer warehouseApplyTotal;
+
+ @ApiModelProperty(value = "爱心义仓捐赠记录")
+ private List<String> warehouseDonateRecords;
+
+ @ApiModelProperty(value = "爱心义仓爱心传递")
+ private List<String> warehouseLoveTransfer;
+
+ @ApiModelProperty(value = "爱心义仓捐赠物品图片")
+ private List<String> warehouseImages;
+
+ @ApiModelProperty(value = "居民活动本月总数")
+ private Integer residentActCurrentMonCount;
+
+ @ApiModelProperty(value = "居民活动总数")
+ private Integer residentActTotalCount;
+
+ @ApiModelProperty(value = "居民活动分类柱状统计")
+ private List<StatisticsCommVO> residentActHistogram;
+
+ @ApiModelProperty(value = "居民自治组织数")
+ private Integer residentAutonomyOrgCount = 0;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/ScreenStatics.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/ScreenStatics.java
new file mode 100644
index 0000000..c2fd80b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/ScreenStatics.java
@@ -0,0 +1,64 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ScreenStatics {
+ @ApiModelProperty("注册人数")
+ private Integer user;
+ @ApiModelProperty("日活跃")
+ private Integer dayUser;
+ @ApiModelProperty("月访问量")
+ private Integer countUser;
+ @ApiModelProperty("志愿者")
+ private Integer volunteer;
+ @ApiModelProperty("微心愿")
+ private Integer microWish;
+ @ApiModelProperty("社区活动")
+ private Integer activity;
+ @ApiModelProperty("随手拍")
+ private Integer neighbor;
+ @ApiModelProperty("党组织")
+ private Integer partyOrg;
+ @ApiModelProperty("党员")
+ private Integer partyMember;
+ @ApiModelProperty("红色物业")
+ private Integer red;
+ @ApiModelProperty("网格治理")
+ private Integer grid;
+ @ApiModelProperty("议事投票")
+ private Integer discuss;
+ @ApiModelProperty("共建协议")
+ private Integer agreement;
+ @ApiModelProperty("报道党员")
+ private Integer arrivePartyMember;
+
+ @ApiModelProperty("办事指南")
+ private Integer transactionEvent;
+
+ @ApiModelProperty("便民商家")
+ private Integer merchantsCount;
+
+ @ApiModelProperty("商家累计资询量")
+ private Integer consultationStatistics;
+ @ApiModelProperty("网格员")
+ private Integer gridMember;
+
+
+ @ApiModelProperty("随手拍完成率")
+ private Float easyPhotoPercentage;
+ @ApiModelProperty("微心愿成率")
+ private Float microWishPercentage;
+ @ApiModelProperty("会议完成率")
+ private Float discussPercentage;
+
+ @ApiModelProperty("志愿者队伍")
+ private Integer volunteerTeam;
+ @ApiModelProperty("志愿者组织")
+ private Integer volunteerOrg;
+ @ApiModelProperty("议事投票")
+ private Integer discussCount;
+ @ApiModelProperty("问卷调查")
+ private Integer questnaireCount;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/VolunteerOrgRelationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/VolunteerOrgRelationVO.java
new file mode 100644
index 0000000..2d524a9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/VolunteerOrgRelationVO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: VolunteerOrgRelationVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 志愿者组织关系
+ * @author: hans
+ * @date: 2022/03/03 13:30
+ */
+@Data
+public class VolunteerOrgRelationVO {
+
+ @ApiModelProperty("组织")
+ private String org;
+
+ @ApiModelProperty("组织人数")
+ private Integer orgPersonNum;
+
+ @ApiModelProperty("志愿者")
+ List<ComMngVolunteerMngVO> volunteers;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/WestScreenStatics.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/WestScreenStatics.java
new file mode 100644
index 0000000..e686b39
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/WestScreenStatics.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("西区大屏治理数据")
+public class WestScreenStatics {
+ @ApiModelProperty("注册人数")
+ private Integer user;
+ @ApiModelProperty("党组织")
+ private Integer partyOrg;
+ @ApiModelProperty("党员")
+ private Integer partyMember;
+ @ApiModelProperty("志愿者")
+ private Integer volunteer;
+ @ApiModelProperty("微心愿")
+ private Integer microWish;
+ @ApiModelProperty("安全巡查")
+ private Integer safety;
+ @ApiModelProperty("社区活动")
+ private Integer activity;
+ @ApiModelProperty("疫情防控")
+ private Integer reserve;
+ @ApiModelProperty("随手拍")
+ private Integer neighbor;
+ @ApiModelProperty("一起议")
+ private Integer discuss;
+ @ApiModelProperty("日活跃")
+ private Integer dayUser;
+ @ApiModelProperty("累计用户")
+ private Integer countUser;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/BuildingVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/BuildingVO.java
new file mode 100644
index 0000000..5ebd807
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/BuildingVO.java
@@ -0,0 +1,9 @@
+package com.panzhihua.common.model.vos.community.building;
+
+import lombok.Data;
+
+@Data
+public class BuildingVO {
+ private String label;
+ private String value;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/IntegratingTaskVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/IntegratingTaskVO.java
new file mode 100644
index 0000000..a2253de
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/IntegratingTaskVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.community.building;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("用户积分任务表")
+public class IntegratingTaskVO
+{
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "是否领取1未领取 2完成")
+ private String isDraw;
+
+ @ApiModelProperty(value = "状态 11花城登录 12 查看问题清单 13查看需求清单 14 查看报道服务活动 15查看微心愿 16 查看随手拍 18 上传“随手拍”或“微心愿")
+ private String status;
+
+ @ApiModelProperty(value = "用户id")
+ private String userId;
+
+ @ApiModelProperty(value = "积分")
+ private String num;
+
+
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightConfigVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightConfigVO.java
new file mode 100644
index 0000000..7c9d159
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightConfigVO.java
@@ -0,0 +1,58 @@
+package com.panzhihua.common.model.vos.community.building;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("社区商家配置")
+public class NewFightConfigVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ @ApiModelProperty(value = "兑换地址")
+ private String address;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ @ApiModelProperty(value = "兑换状态（1每天 2周一到周五 3周末）")
+ private String businessType;
+
+ @ApiModelProperty(value = "兑换开始时间")
+ private String businessStartTime;
+
+ @ApiModelProperty(value = "兑换结束时间")
+ private String businessEndTime;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightConvenientMerchantVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightConvenientMerchantVO.java
new file mode 100644
index 0000000..188cc80
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightConvenientMerchantVO.java
@@ -0,0 +1,86 @@
+package com.panzhihua.common.model.vos.community.building;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: ConvenientMerchantVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 便民服务商家信息
+ * @author: hans
+ * @date: 2021/09/16 13:49
+ */
+@Data
+@ApiModel("便民服务商家信息")
+public class NewFightConvenientMerchantVO {
+
+ @ApiModelProperty("商家ID")
+ private String id;
+
+ @ApiModelProperty("商家名称")
+ private String name;
+
+ @ApiModelProperty("商家logo")
+ private String logo;
+
+ @ApiModelProperty("联系人")
+ private String contacts;
+
+ @ApiModelProperty("咨询电话")
+ private String phone;
+
+ @ApiModelProperty("商家地址")
+ private String address;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ private String lon;
+
+ @ApiModelProperty("商家详细地址")
+ private String detailedAddress;
+
+
+ @ApiModelProperty("商家介绍")
+ private String introduction;
+
+
+ @ApiModelProperty("是否删除")
+ private String isDel;
+
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+ private Date createdAt;
+
+
+ @ApiModelProperty("创建人")
+ private String createdBy;
+
+
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+ private Date updatedAt;
+
+ @ApiModelProperty("商家图片")
+ private String imgUrl;
+
+ @ApiModelProperty("1启用 2禁用")
+ private String status;
+
+
+ @ApiModelProperty("营业积分")
+ private String businessCredit;
+
+ @ApiModelProperty("社区id")
+ private String communityId;
+
+
+ @ApiModelProperty("绑定用户id")
+ private String userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightShoppingOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightShoppingOrderVO.java
new file mode 100644
index 0000000..aeb1811
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightShoppingOrderVO.java
@@ -0,0 +1,104 @@
+package com.panzhihua.common.model.vos.community.building;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("商城订单表")
+public class NewFightShoppingOrderVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNumber;
+
+ @ApiModelProperty(value = "商品id")
+ private String goodsId;
+
+ @ApiModelProperty(value = "下单人id")
+ private String userId;
+
+ @ApiModelProperty(value = "核销状态（0待核销 1已核销 2订单已取消）")
+ private String cancelType;
+
+ @ApiModelProperty(value = "核销时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date cancelTime;
+
+ @ApiModelProperty(value = "支付金额")
+ private String palyMoney;
+
+ @ApiModelProperty(value = "创建时间（兑换时间）")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "取消时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date abolishTime;
+
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodName;
+
+ @ApiModelProperty(value = "商品价格")
+ private String goodPrice;
+
+ @ApiModelProperty(value = "商品图片")
+ private String coverImgUrl;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "电话")
+ private String phone;
+
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ @ApiModelProperty(value = "兑换地址")
+ private String address;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ @ApiModelProperty(value = "商家id")
+ private String merchantId;
+
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ @ApiModelProperty(value = "订单类型 1 线上订单 2线下商家订单")
+ private String orderType;
+
+ @ApiModelProperty(value = "兑换状态（1每天 2周一到周五 3周末）")
+ private String businessType;
+
+ @ApiModelProperty(value = "兑换开始时间")
+ private String businessStartTime;
+
+ @ApiModelProperty(value = "兑换结束时间")
+ private String businessEndTime;
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightShoppingVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightShoppingVO.java
new file mode 100644
index 0000000..202ad9c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightShoppingVO.java
@@ -0,0 +1,70 @@
+package com.panzhihua.common.model.vos.community.building;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("商城商品表")
+public class NewFightShoppingVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodName;
+
+ @ApiModelProperty(value = "商品价格")
+ private String goodPrice;
+
+ @ApiModelProperty(value = "商品状态（0下架 1上架）")
+ private String goodType;
+
+ @ApiModelProperty(value = "商品封面")
+ private String coverImgUrl;
+
+ @ApiModelProperty(value = "商品详情内容")
+ private String content;
+
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "地址")
+ private String address;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ @ApiModelProperty(value = "兑换状态（1每天 2周一到周五 3周末）")
+ private String businessType;
+
+ @ApiModelProperty(value = "兑换开始时间")
+ private String businessStartTime;
+
+ @ApiModelProperty(value = "兑换结束时间")
+ private String businessEndTime;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/admin/BuildingDetailAdminVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/admin/BuildingDetailAdminVo.java
new file mode 100644
index 0000000..fedd9b6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/admin/BuildingDetailAdminVo.java
@@ -0,0 +1,49 @@
+package com.panzhihua.common.model.vos.community.building.admin;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 楼栋详情返回参数
+ */
+
+@Data
+@ApiModel("楼栋详情返回参数")
+public class BuildingDetailAdminVo {
+
+ @ApiModelProperty("楼栋主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("街路巷")
+ private String alley;
+
+ @ApiModelProperty("街路巷号")
+ private String doorNum;
+
+ @ApiModelProperty("楼栋号")
+ private String name;
+
+ @ApiModelProperty("小区名称")
+ private String villageName;
+
+ @ApiModelProperty("小区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long villageId;
+
+ @ApiModelProperty("房屋总户数")
+ private Integer houseNum;
+
+ @ApiModelProperty("自住房屋数量")
+ private Integer liveTotal;
+
+ @ApiModelProperty("出租房屋数量")
+ private Integer leaseTotal;
+
+ @ApiModelProperty("空置房屋数量")
+ private Integer vacantNum;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/admin/BuildingListHeaderStatisticsAdminVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/admin/BuildingListHeaderStatisticsAdminVo.java
new file mode 100644
index 0000000..b8e431b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/admin/BuildingListHeaderStatisticsAdminVo.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community.building.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 楼栋列表表头统计返回参数
+ */
+
+@Data
+@ApiModel("楼栋列表表头统计返回参数")
+public class BuildingListHeaderStatisticsAdminVo {
+
+ @ApiModelProperty("楼栋数")
+ private Integer buildNum;
+
+ @ApiModelProperty("总户数")
+ private Integer houseNum;
+
+ @ApiModelProperty("居民人数")
+ private Integer populationNum;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/admin/BuildingUnitHouseListAdminVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/admin/BuildingUnitHouseListAdminVo.java
new file mode 100644
index 0000000..f8eb0ee
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/admin/BuildingUnitHouseListAdminVo.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.vos.community.building.admin;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingHouseVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author lyq
+ * 楼栋单元下房屋列表返回参数
+ */
+
+@Data
+@ApiModel("楼栋单元下房屋列表返回参数")
+public class BuildingUnitHouseListAdminVo {
+
+ @ApiModelProperty("楼栋单元下房屋列表")
+ private List<ComMngVillageBuildingHouseVO> houseList;
+
+ @ApiModelProperty("房屋总户数")
+ private Integer houseNum = 0;
+
+ @ApiModelProperty("自住房屋数量")
+ private Integer liveTotal = 0;
+
+ @ApiModelProperty("出租房屋数量")
+ private Integer leaseTotal = 0;
+
+ @ApiModelProperty("空置房屋数量")
+ private Integer vacantNum = 0;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/admin/PageBuildingListAdminVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/admin/PageBuildingListAdminVo.java
new file mode 100644
index 0000000..9ebdb03
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/admin/PageBuildingListAdminVo.java
@@ -0,0 +1,49 @@
+package com.panzhihua.common.model.vos.community.building.admin;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询楼栋列表返回参数
+ */
+
+@Data
+@ApiModel("分页查询楼栋列表返回参数")
+public class PageBuildingListAdminVo {
+
+ @ApiModelProperty("楼栋主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("街路巷")
+ private String alley;
+
+ @ApiModelProperty("楼栋号")
+ private String name;
+
+ @ApiModelProperty("小区名称")
+ private String villageName;
+
+ @ApiModelProperty("小区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long villageId;
+
+ @ApiModelProperty("单元数")
+ private Integer unitTotal;
+
+ @ApiModelProperty("楼层数")
+ private String buildFloorSum;
+
+ @ApiModelProperty("总户数")
+ private Integer houseNum;
+
+ @ApiModelProperty("居民人数")
+ private Integer populationNum;
+
+ @ApiModelProperty("门牌号")
+ private String doorNum;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/PageClusterMemberVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/PageClusterMemberVo.java
new file mode 100644
index 0000000..a9d0200
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/PageClusterMemberVo.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.vos.community.cluster;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询群团组织成员返回参数
+ */
+@Data
+@ApiModel("分页查询群团组织成员返回参数")
+public class PageClusterMemberVo {
+
+ @ApiModelProperty("主键id")
+ private Long id;
+
+ @ApiModelProperty("群团组织成员名称")
+ private String name;
+
+ @ApiModelProperty("群团组织成员照片")
+ private String imageUrl;
+
+ @ApiModelProperty("群团组织成员职务")
+ private String job;
+
+ @ApiModelProperty("群团组织成员电话")
+ private String phone;
+
+ @ApiModelProperty("群团组织成员住址")
+ private String address;
+
+ @ApiModelProperty("群团组织成员身份证号码")
+ private String idCard;
+
+ @ApiModelProperty("所属群团组织id")
+ private Long clusterId;
+
+ @ApiModelProperty("所属群团组织名称")
+ private String clusterName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/PageClusterVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/PageClusterVo.java
new file mode 100644
index 0000000..f19c7af
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/PageClusterVo.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.vos.community.cluster;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询群团组织成员返回参数
+ */
+@Data
+@ApiModel("分页查询群团组织成员返回参数")
+public class PageClusterVo {
+
+ @ApiModelProperty("主键id")
+ private Long id;
+
+ @ApiModelProperty("群团组织成员名称")
+ private String name;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ClusterDetailAdminVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ClusterDetailAdminVo.java
new file mode 100644
index 0000000..833e362
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ClusterDetailAdminVo.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.vos.community.cluster.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 群团组织详情返回参数
+ */
+@Data
+@ApiModel("群团组织详情返回参数")
+public class ClusterDetailAdminVo {
+
+ @ApiModelProperty("主键id")
+ private Long id;
+
+ @ApiModelProperty("群团组织成员名称")
+ private String name;
+
+ @ApiModelProperty("群团组织成员logo")
+ private String logo;
+
+ @ApiModelProperty("群团组织成员电话")
+ private String phone;
+
+ @ApiModelProperty("群团组织成员地址")
+ private String address;
+
+ @ApiModelProperty("状态（1.启用 2.禁用）")
+ private Integer status;
+
+ @ApiModelProperty("经度")
+ private String lng;
+
+ @ApiModelProperty("维度")
+ private String lat;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ClusterMemberNationVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ClusterMemberNationVo.java
new file mode 100644
index 0000000..6284ada
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ClusterMemberNationVo.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.vos.community.cluster.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 查询系统民族列表返回参数
+ */
+@Data
+@ApiModel("查询系统民族列表返回参数")
+public class ClusterMemberNationVo {
+
+ @ApiModelProperty("民族code")
+ private String nationCode;
+
+ @ApiModelProperty("民族名称")
+ private String nationName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ComClusterMemberExcelErrorVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ComClusterMemberExcelErrorVO.java
new file mode 100644
index 0000000..2e45831
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ComClusterMemberExcelErrorVO.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.vos.community.cluster.admin;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @description: 批量导入群团组织成员
+ * @author : lyq
+ */
+@Data
+public class ComClusterMemberExcelErrorVO implements Serializable {
+
+ @ExcelProperty(value = "姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "组织名称", index = 1)
+ private String clusterName;
+
+ @ExcelProperty(value = "职务", index = 2)
+ private String job;
+
+ @ExcelProperty(value = "联系电话", index = 3)
+ private String phone;
+
+ @ExcelProperty(value = "民族", index = 4)
+ private String nation;
+
+ @ExcelProperty(value = "住址", index = 5)
+ private String address;
+
+ @ExcelProperty(value = "身份证号码", index = 6)
+ private String idCard;
+
+ @ExcelProperty(value = "错误信息", index = 7)
+ private String error;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ComClusterMemberExcelExportAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ComClusterMemberExcelExportAdminVO.java
new file mode 100644
index 0000000..34c06f3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ComClusterMemberExcelExportAdminVO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.vos.community.cluster.admin;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author lyq
+ * title 群团组织导出对象
+ */
+@Data
+public class ComClusterMemberExcelExportAdminVO {
+
+ @ExcelProperty(value = "姓名" ,index = 0)
+ private String name;
+ @ExcelProperty(value = "所属组织" ,index = 1)
+ private String clusterName;
+ @ExcelProperty(value = "职务" ,index = 2)
+ private String job;
+ @ExcelProperty(value = "联系电话" ,index = 3)
+ private String phone;
+ @ExcelProperty(value = "状态" ,index = 4)
+ private String status;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ComClusterMemberExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ComClusterMemberExcelVO.java
new file mode 100644
index 0000000..01507dc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/ComClusterMemberExcelVO.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.vos.community.cluster.admin;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @description: 批量导入群团组织成员
+ * @author : lyq
+ */
+@Data
+public class ComClusterMemberExcelVO implements Serializable {
+
+ @ExcelProperty(value = "姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "组织名称", index = 1)
+ private String clusterName;
+
+ @ExcelProperty(value = "职务", index = 2)
+ private String job;
+
+ @ExcelProperty(value = "联系电话", index = 3)
+ private String phone;
+
+ @ExcelProperty(value = "民族", index = 4)
+ private String nation;
+
+ @ExcelProperty(value = "住址", index = 5)
+ private String address;
+
+ @ExcelProperty(value = "身份证号码", index = 6)
+ private String idCard;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/PageClusterAdminVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/PageClusterAdminVo.java
new file mode 100644
index 0000000..db3ad06
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/PageClusterAdminVo.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.vos.community.cluster.admin;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询群团组织成员返回参数
+ */
+@Data
+@ApiModel("分页查询群团组织返回参数")
+public class PageClusterAdminVo {
+
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("群团组织名称")
+ private String name;
+
+ @ApiModelProperty("群团组织logo")
+ private String logo;
+
+ @ApiModelProperty("群团组织电话")
+ private String phone;
+
+ @ApiModelProperty("群团组织地址")
+ private String address;
+
+ @ApiModelProperty("状态（1.启用 2.禁用）")
+ private Integer status;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/PageClusterMemberAdminVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/PageClusterMemberAdminVo.java
new file mode 100644
index 0000000..a0db5b8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/PageClusterMemberAdminVo.java
@@ -0,0 +1,52 @@
+package com.panzhihua.common.model.vos.community.cluster.admin;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询群团组织成员返回参数
+ */
+@Data
+@ApiModel("分页查询群团组织成员返回参数")
+public class PageClusterMemberAdminVo {
+
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("群团组织成员名称")
+ private String name;
+
+ @ApiModelProperty("群团组织成员照片")
+ private String imageUrl;
+
+ @ApiModelProperty("群团组织成员职务")
+ private String job;
+
+ @ApiModelProperty("群团组织成员电话")
+ private String phone;
+
+ @ApiModelProperty("群团组织成员住址")
+ private String address;
+
+ @ApiModelProperty("群团组织成员身份证号码")
+ private String idCard;
+
+ @ApiModelProperty("所属群团组织id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long clusterId;
+
+ @ApiModelProperty("所属群团组织名称")
+ private String clusterName;
+
+ @ApiModelProperty("状态（1.启用 2禁用）")
+ private Integer status;
+
+ @ApiModelProperty("民族code")
+ private String nationCode;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientConsultationStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientConsultationStatisticsVO.java
new file mode 100644
index 0000000..f04d740
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientConsultationStatisticsVO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.vos.community.convenient;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @title: ConvenientConsultationStatisticsVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 便民服务商家咨询量
+ * @author: hans
+ * @date: 2021/09/16 13:49
+ */
+@Data
+@ApiModel("便民服务商家咨询量")
+public class ConvenientConsultationStatisticsVO {
+
+ private Long merchantId;
+
+ private Integer totalConsultationNum;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointOrderVO.java
new file mode 100644
index 0000000..d3e465d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointOrderVO.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.vos.community.convenient;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName: ConvenientElevatingPointVO
+ * @Author: yh
+ * @Date: 2022/11/8 9:54
+ * @Description: 便民服自提点
+ */
+@Data
+@ApiModel("开始配送/未配送详情")
+public class ConvenientElevatingPointOrderVO {
+
+ @ApiModelProperty("自提点信息")
+ private ConvenientElevatingPointVO convenientElevatingPointVO;
+ @ApiModelProperty("订单分页")
+ private Object iPage;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java
new file mode 100644
index 0000000..51c117f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java
@@ -0,0 +1,115 @@
+package com.panzhihua.common.model.vos.community.convenient;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName: ConvenientElevatingPointVO
+ * @Author: yh
+ * @Date: 2022/11/8 9:54
+ * @Description: 便民服自提点
+ */
+@Data
+@ApiModel("便民服自提点")
+public class ConvenientElevatingPointVO implements Comparable<ConvenientElevatingPointVO>{
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ /**
+ * 自提点名称
+ */
+ @ApiModelProperty("自提点名称")
+ private String name;
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ private String communityId;
+ /**
+ * 社区名称
+ */
+ @ApiModelProperty("社区名称")
+ private String communityName;
+ /**
+ * 提货点地址
+ */
+ @ApiModelProperty("提货点地址")
+ private String address;
+ /**
+ * 联系人
+ */
+ @ApiModelProperty("联系人")
+ private String contacts;
+ /**
+ * 纬度
+ */
+ @ApiModelProperty("纬度")
+ private String lat;
+ /**
+ * 经度
+ */
+ @ApiModelProperty("经度")
+ private String lon;
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty("联系电话")
+ private String phone;
+ /**
+ * 微信账号
+ */
+ @ApiModelProperty("微信账号")
+ private String wechatAccount;
+ /**
+ * 状态，1：显示，2：隐藏
+ */
+ @ApiModelProperty("状态，1：显示，2：隐藏")
+ private Integer businessStatus;
+ /**
+ * 累计商品数量
+ */
+ @ApiModelProperty("累计商品数量")
+ private Long cumulativeGoodsNum;
+ /**
+ * 待提货数量
+ */
+ @ApiModelProperty("待提货数量")
+ private Long prepareGoodsNum;
+ /**
+ * 已提货数量
+ */
+ @ApiModelProperty("已提货数量")
+ private Long alreadyGoodsNum;
+
+ /**
+ * 距离手机定位距离
+ */
+ @ApiModelProperty("距离手机定位距离")
+ private Double distance;
+
+ /**
+ * 配送订单数量
+ */
+ @ApiModelProperty(value = "配送订单数量")
+ private Integer deliveryOrderNum;
+
+ /**
+ * 配送商品数量
+ */
+ @ApiModelProperty(value = "配送商品数量")
+ private Integer deliveryGoodsNum;
+
+ @ApiModelProperty(value = "提货点详细地址")
+ private String detailAddress;
+
+ @Override
+ public int compareTo(ConvenientElevatingPointVO o) {
+ return this.getDistance().compareTo(o.getDistance()); //定义你自己的排序规则
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientGoodsCategoryVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientGoodsCategoryVO.java
new file mode 100644
index 0000000..847f1b3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientGoodsCategoryVO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.vos.community.convenient;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: ConvenientGoodsCategoryVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 商品分类信息
+ * @author: yh
+ * @date: 2022-10-21 09:36:09
+ */
+@Data
+@ApiModel("商品分类信息")
+public class ConvenientGoodsCategoryVO {
+
+ @ApiModelProperty("分类ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("分类名称")
+ private String name;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("权重")
+ private Integer weight;
+
+ @ApiModelProperty("创建人")
+ private String createdBy;
+
+ @ApiModelProperty("创建时间")
+ private Date createdAt;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java
new file mode 100644
index 0000000..162b304
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientMerchantVO.java
@@ -0,0 +1,135 @@
+package com.panzhihua.common.model.vos.community.convenient;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.enums.MerchantBusinessPeriod;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ConvenientMerchantVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 便民服务商家信息
+ * @author: hans
+ * @date: 2021/09/16 13:49
+ */
+@Data
+@ApiModel("便民服务商家信息")
+public class ConvenientMerchantVO {
+
+ @ApiModelProperty("商家ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("商家名称")
+ private String name;
+
+ @ApiModelProperty("商家logo")
+ private String logo;
+
+ @ApiModelProperty("联系人")
+ private String contacts;
+
+ @ApiModelProperty("负责人身份证号码")
+ private String idCard;
+
+ @ApiModelProperty("咨询电话")
+ private String phone;
+
+ @ApiModelProperty("商家地址")
+ private String address;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ private String lon;
+
+ @ApiModelProperty("营业开始时间")
+ @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+ private Date beginAt;
+
+ @ApiModelProperty("营业截止时间")
+ @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+ private Date endAt;
+
+ @ApiModelProperty("营业周期")
+ private MerchantBusinessPeriod period;
+
+ @ApiModelProperty("商家介绍")
+ private String introduction;
+
+ @ApiModelProperty("营业状态")
+ private Integer businessStatus;
+
+ @ApiModelProperty("总咨询量")
+ private Integer consultationVolume;
+
+ @ApiModelProperty("月咨询量")
+ private Integer monthConsultationVolume;
+
+ @ApiModelProperty("日咨询量")
+ private Integer dayConsultationVolume;
+
+ @ApiModelProperty("总浏览量")
+ private Integer viewNum;
+
+ @ApiModelProperty("月浏览量")
+ private Integer monthViewNum;
+
+ @ApiModelProperty("日总浏览量")
+ private Integer dayViewNum;
+
+ @ApiModelProperty("商家绑定账户")
+ private String account;
+
+ @ApiModelProperty("商家账户状态（1.启用 2.禁用）")
+ private Integer accountStatus;
+
+ @ApiModelProperty("所属社区id")
+ private String communityId;
+
+ @ApiModelProperty("所属社区名称")
+ private String communityName;
+
+ @ApiModelProperty("服务范围，多个服务类型','拼接")
+ private String serviceScope;
+
+ @ApiModelProperty("服务类型id列表")
+ private List<String> serviceIds;
+
+ @ApiModelProperty("该商家存有商品，最多返回两条")
+ private List<ConvenientProductVO> productVOList;
+
+ @ApiModelProperty("服务范围")
+ private Integer serviceRange;
+
+ @ApiModelProperty("手机号")
+ private String mobilePhone;
+
+ @ApiModelProperty("店铺销量")
+ private Integer sale;
+
+ @ApiModelProperty("店铺销售额")
+ private BigDecimal saleVolume;
+
+ @ApiModelProperty("详细地址")
+ private String detailedAddress;
+
+ @ApiModelProperty("商家评分")
+ private BigDecimal score;
+
+ public void setPeriod(String period) {
+ this.period = MerchantBusinessPeriod.valueOf(period);
+ }
+
+ public void setBusinessStatus(Boolean businessStatus) {
+ this.businessStatus = businessStatus ? 1 : 0;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductCategoryVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductCategoryVO.java
new file mode 100644
index 0000000..25d4071
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductCategoryVO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.vos.community.convenient;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: ConvenientProductCategoryVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 产品分类信息
+ * @author: hans
+ * @date: 2021/09/20 11:08
+ */
+@Data
+@ApiModel("产品分类信息")
+public class ConvenientProductCategoryVO {
+
+ @ApiModelProperty("分类ID")
+ private Long id;
+
+ @ApiModelProperty("分类名称")
+ private String name;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("权重")
+ private Integer weight;
+
+ @ApiModelProperty("创建人")
+ private String createdBy;
+
+ @ApiModelProperty("创建时间")
+ private Date createdAt;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductLevelInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductLevelInfoVO.java
new file mode 100644
index 0000000..e350d31
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductLevelInfoVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community.convenient;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ConvenientProductLevelInfoVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 商品层级信息VO
+ * @author: hans
+ * @date: 2021/09/23 9:55
+ */
+@Data
+@ApiModel("商品层级信息VO")
+public class ConvenientProductLevelInfoVO {
+
+ @ApiModelProperty("商品分类名称")
+ private String categoryName;
+
+ @ApiModelProperty("该分类下商品")
+ private List<ConvenientProductVO> productVOList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductShelfVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductShelfVO.java
new file mode 100644
index 0000000..d9a87c4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductShelfVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.community.convenient;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ConvenientProductShelfVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 便民服务商家后台产品信息
+ * @author: hans
+ * @date: 2021/09/20 21:23
+ */
+@Data
+@ApiModel("便民服务商家后台产品信息")
+public class ConvenientProductShelfVO {
+
+ @ApiModelProperty("上架产品数量")
+ private Integer onShelfTotalNum;
+
+ @ApiModelProperty("下架产品数量")
+ private Integer offShelfTotalNum;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductSpecificationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductSpecificationVO.java
new file mode 100644
index 0000000..f1153f8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductSpecificationVO.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.vos.community.convenient;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @title: ConvenientProductSpecificationVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 产品规格信息
+ * @author: hans
+ * @date: 2021/09/20 20:43
+ */
+@Data
+@ApiModel("产品规格信息")
+public class ConvenientProductSpecificationVO {
+
+ @ApiModelProperty("规格ID")
+ private Long id;
+
+ @ApiModelProperty("规格名称")
+ private String name;
+
+ @ApiModelProperty("价格")
+ private BigDecimal price;
+
+ @ApiModelProperty("产品图片")
+ private String image;
+
+ @ApiModelProperty("规格所属产品ID")
+ private Long productId;
+
+ @ApiModelProperty("创建时间")
+ private Date createdAt;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductVO.java
new file mode 100644
index 0000000..b4711ed
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductVO.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.model.vos.community.convenient;
+
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ConvenientProductVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 便民服务商家后台产品信息
+ * @author: hans
+ * @date: 2021/09/20 21:23
+ */
+@Data
+@ApiModel("便民服务商家后台产品信息")
+public class ConvenientProductVO {
+
+ @ApiModelProperty("产品ID")
+ private Long id;
+
+ @ApiModelProperty("产品名称")
+ private String name;
+
+ @ApiModelProperty("产品图片")
+ private String image;
+
+ @ApiModelProperty("产品介绍")
+ private String introduction;
+
+ @ApiModelProperty("所属分类")
+ private Long categoryId;
+
+ @ApiModelProperty("所属商家")
+ private Long merchantId;
+
+ @ApiModelProperty("所属分类名称")
+ private String categoryName;
+
+ @ApiModelProperty("产品规格")
+ private List<ConvenientProductSpecificationVO> productSpecificationVOList;
+
+ @ApiModelProperty("上架状态，1.上架 0.下架")
+ private Integer onShelf;
+
+ @ApiModelProperty("上架时间")
+ private Date onShelfAt;
+
+ @ApiModelProperty("浏览量")
+ private Integer viewNum;
+
+ public void setOnShelf(Boolean onShelf) {
+ this.onShelf = onShelf ? 1 : 0;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientServiceCategoryVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientServiceCategoryVO.java
new file mode 100644
index 0000000..36d32b4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientServiceCategoryVO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.vos.community.convenient;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ConvenientServiceCategoryVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 便民服务分类信息
+ * @author: hans
+ * @date: 2021/09/16 10:06
+ */
+@Data
+@ApiModel("便民服务分类信息")
+public class ConvenientServiceCategoryVO {
+
+ @ApiModelProperty("分类ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("分类名称")
+ private String name;
+
+ @ApiModelProperty("分类图标")
+ private String icon;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("权重")
+ private Integer weight;
+
+ @ApiModelProperty("创建人")
+ private String createdBy;
+
+ @ApiModelProperty("创建时间")
+ private Date createdAt;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientViewStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientViewStatisticsVO.java
new file mode 100644
index 0000000..ceb9561
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientViewStatisticsVO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.vos.community.convenient;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @title: ConvenientViewStatisticsVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 便民服务商家浏览量
+ * @author: hans
+ * @date: 2021/09/16 13:49
+ */
+@Data
+@ApiModel("便民服务商家浏览量")
+public class ConvenientViewStatisticsVO {
+
+ private Long merchantId;
+
+ private Integer totalViewNum;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ExportMerchantVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ExportMerchantVO.java
new file mode 100644
index 0000000..6bee3cc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ExportMerchantVO.java
@@ -0,0 +1,85 @@
+package com.panzhihua.common.model.vos.community.convenient;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @title: ExportMerchantVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 商家导出VO
+ * @author: hans
+ * @date: 2021/09/23 15:41
+ */
+@Data
+public class ExportMerchantVO {
+
+ private Long id;
+
+ @ExcelProperty("商家名称")
+ private String name;
+
+ @ExcelProperty("联系人")
+ private String contacts;
+
+ @ExcelProperty("负责人身份证号")
+ private String idCard;
+
+ @ExcelProperty("咨询电话")
+ private String phone;
+
+ @ExcelProperty("商家地址")
+ private String address;
+
+ @ExcelProperty("营业时间")
+ private String businessTime;
+
+ @ExcelProperty("商家介绍")
+ private String introduction;
+
+ @ExcelProperty("营业状态")
+ private String businessStatus;
+
+ @ExcelProperty("总咨询量")
+ private Integer consultationVolume;
+
+ @ExcelProperty("管理账号")
+ private String account;
+
+ @ExcelProperty("账户状态")
+ private String accountStatus;
+
+ @ExcelProperty("所属社区")
+ private String communityName;
+
+ @ExcelProperty("服务范围")
+ private String serviceScope;
+
+ public void setBusinessStatus(Boolean businessStatus) {
+ this.businessStatus = businessStatus ? "在营" : "已关闭";
+ }
+
+ public void setBusinessStatus(String businessStatus) {
+ this.businessStatus = businessStatus;
+ }
+
+ public void setAccountStatus(Integer accountStatus) {
+ this.accountStatus = accountStatus.intValue() == 1 ? "启用" : "禁用";
+ }
+
+ public void setAccountStatus(String accountStatus) {
+ this.accountStatus = accountStatus;
+ }
+
+ public void setBusinessTimeTime(String businessTime) {
+ if (businessTime.contains("EVERY_DAY")) {
+ this.businessTime = businessTime.replace("EVERY_DAY", "每天：");
+ } else if (businessTime.contains("WEEKDAY")) {
+ this.businessTime = businessTime.replace("WEEKDAY", "周一至周五：");
+ } else if (businessTime.contains("WEEKEND")) {
+ this.businessTime = businessTime.replace("WEEKEND", "周末：");
+ } else {
+ this.businessTime = businessTime;
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java
new file mode 100644
index 0000000..a46213a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java
@@ -0,0 +1,89 @@
+package com.panzhihua.common.model.vos.community.convenient;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: ConvenientMerchantVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 便民服务商家信息
+ * @author: hans
+ * @date: 2021/09/16 13:49
+ */
+@Data
+@ApiModel("便民服务商家信息")
+public class JinhuiConvenientMerchantVO {
+
+ @ApiModelProperty("商家ID")
+ private String id;
+
+ @ApiModelProperty("商家名称")
+ private String name;
+
+ @ApiModelProperty("商家logo")
+ private String logo;
+
+ @ApiModelProperty("联系人")
+ private String contacts;
+
+ @ApiModelProperty("咨询电话")
+ private String phone;
+
+ @ApiModelProperty("商家地址")
+ private String address;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ private String lon;
+
+ @ApiModelProperty("商家详细地址")
+ private String detailedAddress;
+
+
+ @ApiModelProperty("商家介绍")
+ private String introduction;
+
+
+ @ApiModelProperty("是否删除")
+ private String isDel;
+
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+ private Date createdAt;
+
+
+ @ApiModelProperty("创建人")
+ private String createdBy;
+
+
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+ private Date updatedAt;
+
+
+ @ApiModelProperty("商家类型id")
+ private String convenientType;
+
+ @ApiModelProperty("商家类型名称")
+ private String convenientName;
+
+ @ApiModelProperty("商家图片")
+ private String imgUrl;
+
+ @ApiModelProperty("审核状态 （1待审核 2已通过 3未通过 ）")
+ private String auditType;
+
+ @ApiModelProperty("审核意见")
+ private String auditOpinion;
+
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/BannerVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/BannerVO.java
new file mode 100644
index 0000000..6920ff9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/BannerVO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.vos.community.easyPhoto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class BannerVO {
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ @ApiModelProperty("1社区动态、2居民活动、志愿者活动、3党员活动、4问卷调查、5党建动态、6预约登记、7随手拍活动")
+ private Integer type;
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date showTime;
+ @ApiModelProperty("图片路径")
+ private String cover;
+ @ApiModelProperty("跳转地址")
+ private String jumpUrl;
+ @ApiModelProperty("跳转类型")
+ private String jumpType;
+ @ApiModelProperty("banner图片地址")
+ private String imageUrl;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoActivityUserVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoActivityUserVO.java
new file mode 100644
index 0000000..6ce7e1f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoActivityUserVO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.vos.community.easyPhoto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("随手拍活动居民参与列表返回参数")
+public class ComActEasyPhotoActivityUserVO {
+
+ @ApiModelProperty("随手拍id")
+ private Long id;
+
+ @ApiModelProperty("用户昵称")
+ private String nickName;
+
+ @ApiModelProperty("用户姓名")
+ private String userName;
+
+ @ApiModelProperty("用户手机号")
+ private String phone;
+
+ @ApiModelProperty("随手拍内容")
+ private String detail;
+
+ @ApiModelProperty("随手拍标签（1.优质 2.精良 3.普通）")
+ private Integer activityType;
+
+ @ApiModelProperty("随手拍活动奖励金额")
+ private BigDecimal activityAmount;
+
+ @ApiModelProperty("随手拍状态(1待审核 2进行中 3已驳回 4已完成)")
+ private Integer status;
+
+ @ApiModelProperty("参与时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoActivityVO.java
new file mode 100644
index 0000000..6907ae6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoActivityVO.java
@@ -0,0 +1,55 @@
+package com.panzhihua.common.model.vos.community.easyPhoto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("随手拍活动返回参数")
+public class ComActEasyPhotoActivityVO {
+
+ @ApiModelProperty("活动id")
+ private Long id;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("活动状态（1.待开始 2.进行中 3.已结束 4.已取消）")
+ private Integer status;
+
+ @ApiModelProperty("活动简介")
+ private String content;
+
+ @ApiModelProperty("活动开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date activityStartAt;
+
+ @ApiModelProperty("活动结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date activityEndAt;
+
+ @ApiModelProperty("活动发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date releaseAt;
+
+ @ApiModelProperty("优质奖励金额")
+ private BigDecimal goodReward;
+
+ @ApiModelProperty("精良奖励金额")
+ private BigDecimal excellentReward;
+
+ @ApiModelProperty("普通奖励金额")
+ private BigDecimal ordinaryReward;
+
+ @ApiModelProperty("参与活动随手拍数量")
+ private Integer count;
+
+ @ApiModelProperty("活动图片地址")
+ private String logo;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoClassifyVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoClassifyVO.java
new file mode 100644
index 0000000..3cfbec6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoClassifyVO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.vos.community.easyPhoto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("随手拍分类返回参数")
+public class ComActEasyPhotoClassifyVO {
+
+ @ApiModelProperty("随手拍分类id")
+ private Long id;
+
+ @ApiModelProperty("随手拍分类名称")
+ private String name;
+
+ @ApiModelProperty("权重")
+ private Integer weight;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("1 随手拍 2网格治理")
+ private String addType;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoCountVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoCountVO.java
new file mode 100644
index 0000000..0fae7a6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoCountVO.java
@@ -0,0 +1,9 @@
+package com.panzhihua.common.model.vos.community.easyPhoto;
+
+import lombok.Data;
+
+@Data
+public class ComActEasyPhotoCountVO {
+ private Integer total;
+ private Integer today;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoMemberVO.java
new file mode 100644
index 0000000..35dffd3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoMemberVO.java
@@ -0,0 +1,60 @@
+package com.panzhihua.common.model.vos.community.easyPhoto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 随手拍网格员(ComActEasyPhotoMember)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 随手拍网格员相关功能
+ *
+ * @author zzj
+ * @since 2022-04-12 10:33:24
+ */
+@Data
+@ApiModel("随手拍网格员")
+public class ComActEasyPhotoMemberVO implements Serializable {
+
+ private static final long serialVersionUID = 309168056104824588L;
+
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ /**
+ * 姓名
+ */
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoStatisticsVO.java
new file mode 100644
index 0000000..27736d8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoStatisticsVO.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.model.vos.community.easyPhoto;
+
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("随手拍列表统计返回参数")
+public class ComActEasyPhotoStatisticsVO {
+
+ @ApiModelProperty("待处理数量")
+ private Integer examineNum = 0;
+
+ @ApiModelProperty("进行中数量")
+ private Integer verificationNum = 0;
+
+ @ApiModelProperty("已公示数量")
+ private Integer rejectNum = 0;
+
+ @ApiModelProperty("已完成数量")
+ private Integer completeNum = 0;
+
+ @ApiModelProperty("优质数量")
+ private Integer yzAllTotal = 0;
+
+ @ApiModelProperty("今日优质数量")
+ private Integer yzDayTotal = 0;
+
+ @ApiModelProperty("精良数量")
+ private Integer jlAllTotal = 0;
+
+ @ApiModelProperty("今日精良数量")
+ private Integer jlDayTotal = 0;
+
+ @ApiModelProperty("普通数量")
+ private Integer ptAllTotal = 0;
+
+ @ApiModelProperty("今日普通数量")
+ private Integer ptDayTotal = 0;
+
+ @ApiModelProperty("一般数量")
+ private Integer ybAllTotal = 0;
+
+ @ApiModelProperty("今日一般数量")
+ private Integer ybDayTotal = 0;
+
+ @ApiModelProperty("奖励总数量")
+ private BigDecimal allRewardAmount = BigDecimal.ZERO;
+
+ @ApiModelProperty("今日奖励数量")
+ private BigDecimal dayRewardAmount = BigDecimal.ZERO;
+
+ @ApiModelProperty("待评价数量")
+ private Integer commitAmount;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ExportEasyPhotoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ExportEasyPhotoVO.java
new file mode 100644
index 0000000..196c798
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ExportEasyPhotoVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community.easyPhoto;
+
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+@Data
+public class ExportEasyPhotoVO {
+ @ExcelProperty("所属社区")
+ private String communityName;
+ @ExcelProperty("发起人")
+ private String sponsorName;
+ @ExcelProperty("事件详情")
+ private String detail;
+ @ExcelProperty("发生地点")
+ private String happenAddr;
+ @ExcelProperty("事件类型")
+ private String photoType;
+ @ExcelProperty("联系电话")
+ private String phone;
+ @ExcelProperty("创建时间")
+ private Date createAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/CascadeCommVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/CascadeCommVO.java
new file mode 100644
index 0000000..6d7e12b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/CascadeCommVO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.vos.community.fms;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: CascadeCommVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 级联数据公共类
+ * @author: hans
+ * @date: 2022/02/14 11:13
+ */
+@Data
+@ApiModel("级联数据公共类")
+public class CascadeCommVO {
+
+ @ApiModelProperty("value")
+ private Long value;
+
+ @ApiModelProperty("parentId")
+ private Long parentId;
+
+ @ApiModelProperty("label")
+ private String label;
+
+ @ApiModelProperty("children")
+ private List<CascadeCommVO> children;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsClassroomVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsClassroomVO.java
new file mode 100644
index 0000000..87fdd75
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsClassroomVO.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.vos.community.fms;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComFmsClassroomVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务-微讲堂信息
+ * @author: hans
+ * @date: 2022/02/17 14:16
+ */
+@Data
+@ApiModel("五微服务-微讲堂信息")
+public class ComFmsClassroomVO {
+
+ @ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("标题")
+ private String title;
+
+ @ApiModelProperty("参与学习人数")
+ private Integer scholars;
+
+ @ApiModelProperty("封面")
+ private String cover;
+
+ @ApiModelProperty("内容")
+ private String content;
+
+ @ApiModelProperty("浏览量")
+ private Integer viewNum;
+
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createdAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceEvaluateVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceEvaluateVO.java
new file mode 100644
index 0000000..264168a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceEvaluateVO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.vos.community.fms;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComFmsServiceVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务-评论详情
+ * @author: hans
+ * @date: 2022/02/16 14:13
+ */
+@Data
+@ApiModel("五微服务-评论详情")
+public class ComFmsServiceEvaluateVO {
+
+ @ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("服务关联id")
+ private Long serviceId;
+
+ @ApiModelProperty("评分星级（1.非常差2.差3.一般4.满意5.非常满意）")
+ private Integer starLevel;
+
+ @ApiModelProperty("内")
+ private String evaluateContent;
+
+ @ApiModelProperty("图片")
+ private String image;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createdAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceImportExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceImportExcelVO.java
new file mode 100644
index 0000000..8ca2142
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceImportExcelVO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.vos.community.fms;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @title: ComFmsTeamMemberImportExcelVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务-微服务导入信息
+ * @author: hans
+ * @date: 2022/02/15 10:36
+ */
+@Data
+public class ComFmsServiceImportExcelVO implements Serializable {
+
+ @ExcelProperty(value = "服务用户", index = 0)
+ private String userName;
+
+ @ExcelProperty(value = "联系电话", index = 1)
+ private String phone;
+
+ @ExcelProperty(value = "服务时间", index = 2)
+ private Date serviceAt;
+
+ @ExcelProperty(value = "服务内容", index = 3)
+ private String serviceContent;
+
+ @ExcelProperty(value = "服务过程", index = 4)
+ private String serviceProcess;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceImportMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceImportMistakeExcelVO.java
new file mode 100644
index 0000000..c48f451
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceImportMistakeExcelVO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.vos.community.fms;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @title: ComFmsTeamMemberImportExcelVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务-微服务导入错误反馈信息
+ * @author: hans
+ * @date: 2022/02/15 10:36
+ */
+@Data
+public class ComFmsServiceImportMistakeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "服务用户", index = 0)
+ private String userName;
+
+ @ExcelProperty(value = "联系电话", index = 1)
+ private String phone;
+
+ @ExcelProperty(value = "服务时间", index = 2)
+ private String serviceAt;
+
+ @ExcelProperty(value = "服务内容", index = 3)
+ private String serviceContent;
+
+ @ExcelProperty(value = "服务过程", index = 4)
+ private String serviceProcess;
+
+ @ExcelProperty(value = "错误信息", index = 5)
+ private String mistake;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceRecordVO.java
new file mode 100644
index 0000000..d219927
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceRecordVO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.vos.community.fms;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComFmsServiceVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务-微服务记录
+ * @author: hans
+ * @date: 2022/02/16 14:13
+ */
+@Data
+@ApiModel("五微服务-微服务记录")
+public class ComFmsServiceRecordVO {
+
+ @ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("服务关联id")
+ private Long serviceId;
+
+ @ApiModelProperty("服务阶段")
+ private String stage;
+
+ @ApiModelProperty("内容")
+ private String content;
+
+ @ApiModelProperty("图片")
+ private String image;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createdAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceVO.java
new file mode 100644
index 0000000..c7f7215
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsServiceVO.java
@@ -0,0 +1,104 @@
+package com.panzhihua.common.model.vos.community.fms;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComFmsServiceVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务-微服务信息
+ * @author: hans
+ * @date: 2022/02/16 14:13
+ */
+@Data
+@ApiModel("五微服务-微服务信息")
+public class ComFmsServiceVO {
+
+ @ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("用户姓名")
+ private String userName;
+
+ @ApiModelProperty("真实姓名")
+ private String realName;
+
+ @ApiModelProperty("用户关联id")
+ private Long userId;
+
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ @ApiModelProperty("服务内容")
+ private String serviceContent;
+
+ @ApiModelProperty("服务内容图片")
+ private String serviceImage;
+
+ @ApiModelProperty("反馈内容")
+ private String approvalContent;
+
+ @ApiModelProperty("审核时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date approvalAt;
+
+ @ApiModelProperty("团队服务人员关联id")
+ private Long memberId;
+
+ @ApiModelProperty("服务人员")
+ private String serviceMember;
+
+ @ApiModelProperty("服务评价")
+ private Integer starLevel;
+
+ @ApiModelProperty("服务状态（1.待核实2.进行中3.待评价4.已完成5.未通过）")
+ private Integer serviceStatus;
+
+ @ApiModelProperty("服务时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date serviceAt;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createdAt;
+
+ @ApiModelProperty("创建者")
+ private Long createdBy;
+
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updatedAt;
+
+ @ApiModelProperty("由谁更新")
+ private Long updatedBy;
+
+ @ApiModelProperty("所属社区")
+ private Long communityId;
+
+ @ApiModelProperty("服务进度")
+ private List<ComFmsServiceRecordVO> serviceRecords;
+
+ @ApiModelProperty("小程序用户昵称")
+ private String nickName;
+
+ @ApiModelProperty("小程序用户头像")
+ private String imageUrl;
+
+ @ApiModelProperty("服务评价")
+ private ComFmsServiceEvaluateVO evaluateVO;
+
+ @ApiModelProperty("是否本人")
+ private Boolean isMyself;
+
+ @ApiModelProperty("自动评价倒计时")
+ private Long autoEvaluateAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamMemberExportExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamMemberExportExcelVO.java
new file mode 100644
index 0000000..04a57b8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamMemberExportExcelVO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.vos.community.fms;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @title: ComFmsTeamMemberExportExcleVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务-团队成员导出信息
+ * @author: hans
+ * @date: 2022/02/16 10:34
+ */
+@Data
+@ApiModel("五微服务-团队成员导出信息")
+public class ComFmsTeamMemberExportExcelVO {
+
+ @ExcelProperty(value = "团队类型", index = 0)
+ private String teamType;
+
+ @ExcelProperty(value = "团队名称", index = 1)
+ private String teamName;
+
+ @ExcelProperty(value = "团队成员", index = 2)
+ private String teamMember;
+
+ @ExcelProperty(value = "身份证号", index = 3)
+ private String idCard;
+
+ @ExcelProperty(value = "性别", index = 4)
+ private String gender;
+
+ @ExcelProperty(value = "年龄", index = 5)
+ private String age;
+
+ @ExcelProperty(value = "联系电话", index = 6)
+ private String phone;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamMemberImportExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamMemberImportExcelVO.java
new file mode 100644
index 0000000..ac87b0f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamMemberImportExcelVO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.vos.community.fms;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @title: ComFmsTeamMemberImportExcelVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务-团队成员导入信息
+ * @author: hans
+ * @date: 2022/02/15 10:36
+ */
+@Data
+public class ComFmsTeamMemberImportExcelVO implements Serializable {
+
+ @ExcelProperty(value = "团队类型", index = 0)
+ private String teamType;
+
+ @ExcelProperty(value = "团队名称", index = 1)
+ private String teamName;
+
+ @ExcelProperty(value = "团队成员", index = 2)
+ private String teamMember;
+
+ @ExcelProperty(value = "身份证号（非必填）", index = 3)
+ private String idCard;
+
+ @ExcelProperty(value = "联系电话", index = 4)
+ private String phone;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamMemberImportMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamMemberImportMistakeExcelVO.java
new file mode 100644
index 0000000..fe21488
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamMemberImportMistakeExcelVO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.vos.community.fms;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @title: ComFmsTeamMemberImportExcelVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务-团队成员导入错误反馈信息
+ * @author: hans
+ * @date: 2022/02/15 10:36
+ */
+@Data
+public class ComFmsTeamMemberImportMistakeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "团队类型", index = 0)
+ private String teamType;
+
+ @ExcelProperty(value = "团队名称", index = 1)
+ private String teamName;
+
+ @ExcelProperty(value = "团队成员", index = 2)
+ private String teamMember;
+
+ @ExcelProperty(value = "身份证号（非必填）", index = 3)
+ private String idCard;
+
+ @ExcelProperty(value = "联系电话", index = 4)
+ private String phone;
+
+ @ExcelProperty(value = "错误信息", index = 5)
+ private String mistake;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamMemberVO.java
new file mode 100644
index 0000000..7895c67
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamMemberVO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.vos.community.fms;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComFmsTeamTypeVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务-团队成员信息
+ * @author: hans
+ * @date: 2022/02/11 14:54
+ */
+@Data
+@ApiModel("五微服务-团队成员信息")
+public class ComFmsTeamMemberVO {
+
+ @ApiModelProperty("团队成员id")
+ private Long id;
+
+ @ApiModelProperty("成员姓名")
+ private String name;
+
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ @ApiModelProperty("身份证号")
+ private String idCard;
+
+ @ApiModelProperty("所属团队类型")
+ private Long teamType;
+
+ @ApiModelProperty("所属团队类型名称")
+ private String teamTypeName;
+
+ @ApiModelProperty("所属团队")
+ private Long teamId;
+
+ @ApiModelProperty("所属团队名称")
+ private String teamName;
+
+ @ApiModelProperty("性别（1.男2.女3.未知）")
+ private Integer gender;
+
+ @ApiModelProperty("年龄")
+ private Integer age;
+
+ @ApiModelProperty("团队级联关系")
+ private String cascadeIds;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamTypeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamTypeVO.java
new file mode 100644
index 0000000..cb6545c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamTypeVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.community.fms;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComFmsTeamTypeVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务-团队类型信息
+ * @author: hans
+ * @date: 2022/02/11 14:54
+ */
+@Data
+@ApiModel("五微服务-团队类型信息")
+public class ComFmsTeamTypeVO {
+
+ @ApiModelProperty("团队类型id")
+ private Long id;
+
+ @ApiModelProperty("团队类型名称")
+ private String name;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamVO.java
new file mode 100644
index 0000000..56f2c04
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/ComFmsTeamVO.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.vos.community.fms;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @title: ComFmsTeamTypeVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务-团队信息
+ * @author: hans
+ * @date: 2022/02/11 14:54
+ */
+@Data
+@ApiModel("五微服务-团队信息")
+public class ComFmsTeamVO {
+
+ @ApiModelProperty("团队id")
+ private Long id;
+
+ @ApiModelProperty("团队名称")
+ private String name;
+
+ @ApiModelProperty("服务电话")
+ private String phone;
+
+ @ApiModelProperty("所属团队类型")
+ private Long teamType;
+
+ @ApiModelProperty("所属团队类型名")
+ private String teamTypeName;
+
+ @ApiModelProperty("团队照片")
+ private String image;
+
+ @ApiModelProperty("团队成员总数")
+ private Integer teamMemberTotal;
+
+ @ApiModelProperty("团队成员列表")
+ private List<ComFmsTeamMemberVO> memberList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/FmsClassroomTopStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/FmsClassroomTopStatisticsVO.java
new file mode 100644
index 0000000..03eabda
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/FmsClassroomTopStatisticsVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.community.fms;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: FmsServiceTopStatisticsVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务-微讲堂顶部统计
+ * @author: hans
+ * @date: 2022/02/17 10:11
+ */
+@Data
+@ApiModel("五微服务-微讲堂顶部统计")
+public class FmsClassroomTopStatisticsVO {
+
+ @ApiModelProperty("开课次数")
+ private Integer classroomCount;
+
+ @ApiModelProperty("学习人数")
+ private Integer learnCount;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/FmsEventTopStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/FmsEventTopStatisticsVO.java
new file mode 100644
index 0000000..45fce79
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/FmsEventTopStatisticsVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.community.fms;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: FmsServiceTopStatisticsVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务-微调节/微防控顶部统计
+ * @author: hans
+ * @date: 2022/02/17 10:11
+ */
+@Data
+@ApiModel("五微服务-微调节/微防控顶部统计")
+public class FmsEventTopStatisticsVO {
+
+ @ApiModelProperty("待处理")
+ private Integer unHandledCount;
+
+ @ApiModelProperty("已解决")
+ private Integer handledCount;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/FmsEventVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/FmsEventVO.java
new file mode 100644
index 0000000..08e15bf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/FmsEventVO.java
@@ -0,0 +1,55 @@
+package com.panzhihua.common.model.vos.community.fms;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComFmsClassroomVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务-事件信息
+ * @author: hans
+ * @date: 2022/02/17 14:16
+ */
+@Data
+@ApiModel("五微服务-事件信息")
+public class FmsEventVO {
+
+ @ApiModelProperty("事件id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("事件类型")
+ private String eventClazz;
+
+ @ApiModelProperty("发生区域")
+ private String gridName;
+
+ @ApiModelProperty("发生地经纬度")
+ private String happentLatLng;
+
+ @ApiModelProperty("发生时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date happenTime;
+
+ @ApiModelProperty("事件描述")
+ private String eventDes;
+
+ @ApiModelProperty("危险级别")
+ private Integer dangerLevel;
+
+ @ApiModelProperty("是否紧急")
+ private Boolean urgent;
+
+ @ApiModelProperty("是否重大")
+ private Boolean major;
+
+ @ApiModelProperty("状态")
+ private Integer eventProcessStatus;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/FmsServiceTopStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/FmsServiceTopStatisticsVO.java
new file mode 100644
index 0000000..0748c0f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/FmsServiceTopStatisticsVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.community.fms;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: FmsServiceTopStatisticsVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务-微服务顶部统计
+ * @author: hans
+ * @date: 2022/02/17 10:11
+ */
+@Data
+@ApiModel("五微服务-微服务顶部统计")
+public class FmsServiceTopStatisticsVO {
+
+ @ApiModelProperty("已完成")
+ private Integer completedCount;
+
+ @ApiModelProperty("待核实")
+ private Integer unVerifiedCount;
+
+ @ApiModelProperty("进行中")
+ private Integer inProgressCount;
+
+ @ApiModelProperty("待评价")
+ private Integer unEvaluateCount;
+
+ @ApiModelProperty("未通过")
+ private Integer unPassCount;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/TeamMemberTopStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/TeamMemberTopStatisticsVO.java
new file mode 100644
index 0000000..5789b35
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/fms/TeamMemberTopStatisticsVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.community.fms;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComFmsTeamTypeVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 五微服务-微团队顶部统计
+ * @author: hans
+ * @date: 2022/02/11 14:54
+ */
+@Data
+@ApiModel("五微服务-微团队顶部统计")
+public class TeamMemberTopStatisticsVO {
+
+ @ApiModelProperty("团队数量")
+ private Integer teamCount;
+
+ @ApiModelProperty("团队成员")
+ private Integer memberCount;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralCommunityRankVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralCommunityRankVO.java
new file mode 100644
index 0000000..6db5356
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralCommunityRankVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community.integral;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("小程序-社区积分排行榜返回参数")
+public class ComActIntegralCommunityRankVO {
+
+ @ApiModelProperty("用户昵称")
+ private String nickName;
+
+ @ApiModelProperty("用户头像")
+ private String imageUrl;
+
+ @ApiModelProperty("积分账户金额")
+ private Integer amount;
+
+ @ApiModelProperty("是否党员（0.否 1.是）")
+ private Integer isPartymember;
+
+ @ApiModelProperty("是否志愿者（0.否 1.是）")
+ private Integer isVolunteer;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralCommunityTradeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralCommunityTradeVO.java
new file mode 100644
index 0000000..358d9ae
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralCommunityTradeVO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.vos.community.integral;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("小程序-用户社区积分明细返回参数")
+public class ComActIntegralCommunityTradeVO {
+
+ @ApiModelProperty("积分明细id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("交易业务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.社区活动-居民身份参与 \" +\n" +
+ " \"5.社区活动-党员身份参与 6.社区活动-志愿者身份参与 7.参与调查问卷 8.取消活动 9.参与单位党员活动")
+ private Integer serviceType;
+
+ @ApiModelProperty("交易数量")
+ private Integer amount;
+
+ @ApiModelProperty("交易备注")
+ private String remark;
+
+ @ApiModelProperty("交易时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("变动类型（1.增加 2.减少）")
+ private Integer changeType;
+
+ @ApiModelProperty("交易身份类型（1.居民 2.党员 3.志愿者）")
+ private Integer identityType;
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralUserListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralUserListVO.java
new file mode 100644
index 0000000..a5a01fe
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralUserListVO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.vos.community.integral;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("小程序-用户积分列表返回参数")
+public class ComActIntegralUserListVO {
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+ @ApiModelProperty("积分总额")
+ private Integer amount;
+ @ApiModelProperty("社区积分排名")
+ private Integer rank;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralUserRuleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralUserRuleVO.java
new file mode 100644
index 0000000..61f9fc8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralUserRuleVO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.vos.community.integral;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("小程序-社区领取积分列表")
+public class ComActIntegralUserRuleVO {
+
+ @ApiModelProperty("积分任务规则id")
+ private Long id;
+ @ApiModelProperty("积分任务规则名字")
+ private String name;
+ @ApiModelProperty("积分奖励金额")
+ private Integer amount;
+ @ApiModelProperty("积分任务描述")
+ private String integralDescribe;
+ @ApiModelProperty("是否限制（1.是 2.否）")
+ private Integer isRestrict;
+ @ApiModelProperty("限制类型（1.月 2.日）")
+ private Integer type;
+ @ApiModelProperty("限制次数")
+ private Integer count;
+ @ApiModelProperty("积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.社区活动-居民身份参与 \" +\n" +
+ " \"5.社区活动-党员身份参与 6.社区活动-志愿者身份参与 7.参与调查问卷 8.取消活动 9.参与单位党员活动）")
+ private Integer integralType;
+ @ApiModelProperty("积分任务备注")
+ private String remark;
+ @ApiModelProperty("是否已完成（1.是 2.否）")
+ private Integer isComplete;
+
+ /**
+ * 是否已完成（1.是 2.否）
+ */
+ public interface isComplete {
+ int yes = 1;
+ int no = 2;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralUserVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralUserVO.java
new file mode 100644
index 0000000..3908e1a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralUserVO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.vos.community.integral;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComActIntegralUserVO
+ * @projectName:
+ * @description: 小程序-积分统计返回参数
+ * @author: hans
+ * @date: 2022/08/02 16:01
+ */
+@Data
+@ApiModel("小程序-积分统计返回参数")
+public class ComActIntegralUserVO {
+
+ @ApiModelProperty("用户积分总额")
+ private Integer amount;
+
+ @ApiModelProperty("用户绑定社区")
+ private String communityName;
+
+ @ApiModelProperty("社区活动已获积分")
+ private Integer actAmount;
+
+ @ApiModelProperty("居民积分总额")
+ private Integer residentAmount;
+
+ @ApiModelProperty("志愿者积分总额")
+ private Integer volunteerAmount;
+
+ @ApiModelProperty("党员积分总额")
+ private Integer partyMemberAmount;
+
+ @ApiModelProperty("单位党员活动已获积分")
+ private Integer unitPartyMemberAmount;
+
+ @ApiModelProperty("各社区已获积分统计")
+ private List<ComActIntegralUserListVO> integralUserList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/IntegralTradeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/IntegralTradeVO.java
new file mode 100644
index 0000000..dde55f6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/IntegralTradeVO.java
@@ -0,0 +1,55 @@
+package com.panzhihua.common.model.vos.community.integral;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: IntegralTradeVO
+ * @projectName:
+ * @description: 积分明细信息
+ * @author: hans
+ * @date: 2022/08/03 10:28
+ */
+@Data
+@ApiModel("积分明细信息")
+public class IntegralTradeVO {
+
+ @ApiModelProperty("积分明细id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("交易积分数量")
+ private Integer amount;
+
+ @ApiModelProperty("交易业务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.社区活动-居民身份参与 \" +\n" +
+ " \"5.社区活动-党员身份参与 6.社区活动-志愿者身份参与 7.参与调查问卷 8.取消活动 9.参与单位党员活动）")
+ private Integer serviceType;
+
+ @ApiModelProperty("交易业务id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long serviceId;
+
+ @ApiModelProperty("交易备注")
+ private String remark;
+
+ @ApiModelProperty("交易时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("变动类型（1.增加 2.减少）")
+ private Integer changeType;
+
+ @ApiModelProperty("交易身份类型（1.居民 2.党员 3.志愿者）")
+ private Integer identityType;
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/IntegralUserRankVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/IntegralUserRankVO.java
new file mode 100644
index 0000000..4299ba2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/IntegralUserRankVO.java
@@ -0,0 +1,16 @@
+package com.panzhihua.common.model.vos.community.integral;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("小程序-查询用户积分排名返回参数")
+public class IntegralUserRankVO {
+
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ @ApiModelProperty("排名")
+ private Integer rank;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActActivityPeopleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActActivityPeopleVO.java
new file mode 100644
index 0000000..8433aec
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActActivityPeopleVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.community.integral.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("参加活动人员信息")
+public class ComActActivityPeopleVO {
+
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ @ApiModelProperty("活动id")
+ private Long activityId;
+
+ @ApiModelProperty("以什么身份报名（1.居民 2.党员 3.志愿者）")
+ private Integer signIdentity;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActIntegralUserRuleAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActIntegralUserRuleAdminVO.java
new file mode 100644
index 0000000..b415ac4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActIntegralUserRuleAdminVO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.vos.community.integral.admin;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("管理后台-社区积分规则列表")
+public class ComActIntegralUserRuleAdminVO {
+
+ @ApiModelProperty("积分任务规则id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ @ApiModelProperty("积分任务规则名字")
+ private String name;
+ @ApiModelProperty("积分奖励金额")
+ private Integer amount;
+ @ApiModelProperty("积分任务描述")
+ private String integralDescribe;
+ @ApiModelProperty("是否限制（1.是 2.否）")
+ private Integer isRestrict;
+ @ApiModelProperty("限制类型（1.月 2.日）")
+ private Integer type;
+ @ApiModelProperty("限制次数")
+ private Integer count;
+ @ApiModelProperty("积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.社区活动-居民身份参与 \" +\n" +
+ " \"5.社区活动-党员身份参与 6.社区活动-志愿者身份参与 7.参与调查问卷 8.取消活动 9.参与单位党员活动）")
+ private Integer integralType;
+ @ApiModelProperty("积分任务备注")
+ private String remark;
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+ @ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActIntegralUserTradeAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActIntegralUserTradeAdminVO.java
new file mode 100644
index 0000000..56ff7a6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/ComActIntegralUserTradeAdminVO.java
@@ -0,0 +1,55 @@
+package com.panzhihua.common.model.vos.community.integral.admin;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("管理后台-社区积分明细列表")
+public class ComActIntegralUserTradeAdminVO {
+
+ @ApiModelProperty("积分交易记录id")
+ private Long id;
+ @ApiModelProperty("交易人昵称")
+ private String nickName;
+ @ApiModelProperty("交易人手机号")
+ private String phone;
+ @ApiModelProperty("交易人姓名")
+ private String name;
+ @ApiModelProperty("用户身份")
+ private String identity;
+ @ApiModelProperty("交易积分金额")
+ private Integer amount;
+ @ApiModelProperty("交易积分时身份（1.居民 2.党员 3.志愿者）")
+ private Integer identityType;
+ @ApiModelProperty("交易备注")
+ private String remark;
+ @ApiModelProperty("交易时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+ @ApiModelProperty(value = "是否志愿者（0.否 1.是）", hidden = true)
+ private Integer isVolunteer;
+ @ApiModelProperty(value = "是否党员（0.否 1.是）", hidden = true)
+ private Integer isPartymember;
+
+ /**
+ * 是否志愿者（0.否 1.是）
+ */
+ public interface isVolunteer {
+ int no = 0;
+ int yes = 1;
+ }
+
+ /**
+ * 是否党员（0.否 1.是）
+ */
+ public interface isPartymember {
+ int no = 0;
+ int yes = 1;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/IntegralUserVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/IntegralUserVO.java
new file mode 100644
index 0000000..29fe742
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/admin/IntegralUserVO.java
@@ -0,0 +1,56 @@
+package com.panzhihua.common.model.vos.community.integral.admin;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 小程序用户
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-30 11:22
+ **/
+@Data
+@ApiModel("小程序用户")
+public class IntegralUserVO {
+
+ @ApiModelProperty("主键")
+ private Long userId;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("昵称")
+ private String nickName;
+
+ @ApiModelProperty("身份证号码")
+ private String idCard;
+
+ @ApiModelProperty("真实名字")
+ private String name;
+
+ @ApiModelProperty("社区名字")
+ private String communityName;
+
+ @ApiModelProperty("1 启用 2 禁用")
+ private Integer status;
+
+ @ApiModelProperty("是否志愿者 0 否 1 是")
+ private Integer isVolunteer;
+
+ @ApiModelProperty("是否党员 0 否 1 是")
+ private Integer isPartymember;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("最后登录时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date lastLoginTime;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/GameStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/GameStatisticsVO.java
new file mode 100644
index 0000000..f9add22
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/GameStatisticsVO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.vos.community.microCommercialStreet;
+
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: GameStatisticsVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 游戏统计信息
+ * @author: hans
+ * @date: 2022/01/08 15:12
+ */
+@Data
+@ApiModel("游戏统计信息")
+public class GameStatisticsVO {
+
+ @ApiModelProperty("游戏总数")
+ private Integer gameTotal;
+
+ @ApiModelProperty("发放核销码")
+ private Integer sendCouponTotal;
+
+ @ApiModelProperty("领取数占比")
+ private BigDecimal appliedPercent;
+
+ @ApiModelProperty("未领取数占比")
+ private BigDecimal unAppliedPercent;
+
+ @ApiModelProperty("核销人数占比")
+ private BigDecimal verifiedPercent;
+
+ @ApiModelProperty("未核销数占比")
+ private BigDecimal unVerifiedPercent;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/IndexTopStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/IndexTopStatisticsVO.java
new file mode 100644
index 0000000..a7404e3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/IndexTopStatisticsVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.community.microCommercialStreet;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: IndexTopStatisticsVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 首页顶部数据
+ * @author: hans
+ * @date: 2022/01/07 14:04
+ */
+@Data
+@ApiModel("首页顶部数据")
+public class IndexTopStatisticsVO {
+
+ @ApiModelProperty("戳戳币总额")
+ private Integer coinTotal;
+
+ @ApiModelProperty("今日已领戳戳币")
+ private Integer appliedTotal;
+
+ @ApiModelProperty("游戏总数")
+ private Integer gameTotal;
+
+ @ApiModelProperty("全部资讯")
+ private Integer infoTotal;
+
+ @ApiModelProperty("热门戳戳")
+ private McsGameVO popularGame;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsConfigVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsConfigVO.java
new file mode 100644
index 0000000..f197969
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsConfigVO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.vos.community.microCommercialStreet;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: McsConfigVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 数字商业街配置信息
+ * @author: hans
+ * @date: 2021/12/30 11:15
+ */
+@Data
+@ApiModel("数字商业街配置信息")
+public class McsConfigVO {
+
+ @ApiModelProperty("配置id")
+ private Long id;
+
+ @ApiModelProperty("配置名称")
+ private String name;
+
+ @ApiModelProperty("key")
+ private String key;
+
+ @ApiModelProperty("配置内容")
+ private String value;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsCouponVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsCouponVO.java
new file mode 100644
index 0000000..7554795
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsCouponVO.java
@@ -0,0 +1,64 @@
+package com.panzhihua.common.model.vos.community.microCommercialStreet;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: CouponApplyReturnVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 戳戳卷信息
+ * @author: hans
+ * @date: 2022/01/07 17:27
+ */
+@Data
+@ApiModel("戳戳卷信息")
+public class McsCouponVO {
+
+ @ApiModelProperty("戳戳卷id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("优惠券包含奖励")
+ private String award;
+
+ @ApiModelProperty("戳戳卷二维码")
+ private String qrCode;
+
+ @ApiModelProperty("是否核验")
+ private Boolean isVerified;
+
+ @ApiModelProperty("游戏名称")
+ private String name;
+
+ @ApiModelProperty("游戏类别（1.戳戳币游戏 2.体验游戏）")
+ private Integer type;
+
+ @ApiModelProperty("是否评论（1.是 2.否）")
+ private Integer isEvaluate;
+
+ @ApiModelProperty("评论id")
+ private Long evaluateId;
+
+ @ApiModelProperty("游戏id")
+ private Long gameId;
+
+ @ApiModelProperty("失效时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date expireAt;
+
+ @ApiModelProperty("游戏封面")
+ private String cover;
+
+ @ApiModelProperty("奖励类型（1.免费领 2.产品试用 3.消费赠礼 4.优惠券）")
+ private Integer awardType;
+
+ @ApiModelProperty("戳戳币分配方式（1.随机分配 2.平均分配）")
+ private Integer allocation;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsEvaluateVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsEvaluateVO.java
new file mode 100644
index 0000000..c945ee9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsEvaluateVO.java
@@ -0,0 +1,48 @@
+package com.panzhihua.common.model.vos.community.microCommercialStreet;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: McsEvaluateVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 戳戳评价记录信息
+ * @author: hans
+ * @date: 2021/12/31 13:19
+ */
+@Data
+@ApiModel("戳戳评价记录信息")
+public class McsEvaluateVO {
+
+ @ApiModelProperty("评价记录id")
+ private Long id;
+
+ @ApiModelProperty("评分（1.差 2.一般 3.还不错 4.很满意 5.强烈推荐）")
+ private Integer star;
+
+ @ApiModelProperty("评价内容")
+ private String content;
+
+ @ApiModelProperty("评价图片（多张逗号隔开）")
+ private String photos;
+
+ @ApiModelProperty("评价时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createdAt;
+
+ @ApiModelProperty("用户")
+ private String nickName;
+
+ @ApiModelProperty("用户头像")
+ private String imageUrl;
+
+ @ApiModelProperty("手机号码")
+ private String phone;
+
+ @ApiModelProperty("评价游戏")
+ private String gameName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsGameVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsGameVO.java
new file mode 100644
index 0000000..da8f0de
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsGameVO.java
@@ -0,0 +1,92 @@
+package com.panzhihua.common.model.vos.community.microCommercialStreet;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: McsGameVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 戳戳游戏信息
+ * @author: hans
+ * @date: 2021/12/30 13:50
+ */
+@Data
+@ApiModel("戳戳游戏信息")
+public class McsGameVO {
+
+ @ApiModelProperty("游戏id")
+ private Long id;
+
+ @ApiModelProperty("游戏名称")
+ private String name;
+
+ @ApiModelProperty("戳戳卷数量")
+ private Integer coupons;
+
+ @ApiModelProperty("剩余戳戳卷数量")
+ private Integer surplusCoupons;
+
+ @ApiModelProperty("游戏类别（1.戳戳币游戏 2.体验游戏）")
+ private Integer type;
+
+ @ApiModelProperty("奖励类型（1.免费领 2.产品试用 3.消费赠礼 4.优惠券）")
+ private Integer awardType;
+
+ @ApiModelProperty("戳戳币分配方式（1.随机分配 2.平均分配）")
+ private Integer allocation;
+
+ @ApiModelProperty("戳戳币总额")
+ private Integer coins;
+
+ @ApiModelProperty("戳戳币剩余数量")
+ private Integer surplusCoins;
+
+ @ApiModelProperty("地址")
+ private String address;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ private String lon;
+
+ @ApiModelProperty("失效时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date expireAt;
+
+ @ApiModelProperty("封面")
+ private String cover;
+
+ @ApiModelProperty("其他图片（多张图片以逗号隔开）")
+ private String otherImages;
+
+ @ApiModelProperty("游戏介绍")
+ private String introduction;
+
+ @ApiModelProperty("状态（1.未发布 2.进行中 3.已下架 4.已结束）")
+ private Integer status;
+
+ @ApiModelProperty("是否热门")
+ private Boolean isPopular;
+
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date publishAt;
+
+ @ApiModelProperty("所属商家")
+ private Long merchantId;
+
+ @ApiModelProperty("所属商家名称")
+ private String merchantName;
+
+ @ApiModelProperty("商家logo")
+ private String logo;
+
+ @ApiModelProperty("所属商家下游戏总数")
+ private Integer gameCount;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsInformationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsInformationVO.java
new file mode 100644
index 0000000..a1fa9a0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsInformationVO.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.model.vos.community.microCommercialStreet;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: McsInformationVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 戳戳资讯信息
+ * @author: hans
+ * @date: 2021/12/30 17:43
+ */
+@Data
+@ApiModel("戳戳资讯信息")
+public class McsInformationVO {
+
+ @ApiModelProperty("资讯id")
+ private Long id;
+
+ @ApiModelProperty("资讯标题")
+ private String name;
+
+ @ApiModelProperty("地址")
+ private String address;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ private String lon;
+
+ @ApiModelProperty("封面")
+ private String cover;
+
+ @ApiModelProperty("资讯内容")
+ private String content;
+
+ @ApiModelProperty("状态（1.未发布 2.已发布 3.已下架）")
+ private Integer status;
+
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date publishAt;
+
+ @ApiModelProperty("所属商家")
+ private Long merchantId;
+
+ @ApiModelProperty("资讯内容")
+ private String merchantName;
+
+ @ApiModelProperty("商家信息")
+ private McsMerchantVO merchantInfo;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsLabelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsLabelVO.java
new file mode 100644
index 0000000..f467bfb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsLabelVO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.vos.community.microCommercialStreet;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: McsLabelVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 产品标签信息
+ * @author: hans
+ * @date: 2022/01/05 14:54
+ */
+@Data
+@ApiModel("产品标签信息")
+public class McsLabelVO {
+
+ @ApiModelProperty("标签id")
+ private Long id;
+
+ @ApiModelProperty("标签名称")
+ private String name;
+
+ @ApiModelProperty("说明")
+ private String introduction;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsLoginUserInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsLoginUserInfoVO.java
new file mode 100644
index 0000000..77771bd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsLoginUserInfoVO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.vos.community.microCommercialStreet;
+
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: McsLoginUserInfoVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 微商业街用户登录信息
+ * @author: hans
+ * @date: 2022/01/06 13:12
+ */
+@Data
+@ApiModel(value = "微商业街用户登录信息")
+public class McsLoginUserInfoVO extends LoginUserInfoVO {
+ @ApiModelProperty("商家信息")
+ private McsMerchantVO mcsMerchantVO;
+
+ private String plaintextPassword;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsMerchantVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsMerchantVO.java
new file mode 100644
index 0000000..8a46982
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsMerchantVO.java
@@ -0,0 +1,76 @@
+package com.panzhihua.common.model.vos.community.microCommercialStreet;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: McsMerchantVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 数字商业街商家信息
+ * @author: hans
+ * @date: 2021/12/29 10:37
+ */
+@Data
+@ApiModel("数字商业街商家信息")
+public class McsMerchantVO {
+
+ @ApiModelProperty("商家id")
+ private Long id;
+
+ @ApiModelProperty("商家名称")
+ private String name;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("商家账号")
+ private String account;
+
+ @ApiModelProperty("商家logo")
+ private String logo;
+
+ @ApiModelProperty("商家级别（1.临时商家 2.合作商家）")
+ private Integer level;
+
+ @ApiModelProperty("戳戳点亮上限（发布次数上限）")
+ private Integer publishLimit;
+
+ @ApiModelProperty("到期时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date expireAt;
+
+ @ApiModelProperty("商家地址")
+ private String address;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ private String lon;
+
+ @ApiModelProperty("商家简介")
+ private String introduction;
+
+ @ApiModelProperty("首次点亮时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date firstLitAt;
+
+ @ApiModelProperty("剩余点亮天数")
+ private Integer surplusLitDays;
+
+ @ApiModelProperty("账号状态（1.启用 2.禁用）")
+ private Integer accountStatus;
+
+ @ApiModelProperty("空闲戳戳点")
+ private Integer idleTotal;
+
+ @ApiModelProperty("距离")
+ private Double distance;
+
+ @ApiModelProperty("客服电话")
+ private String customPhone;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsOrderVO.java
new file mode 100644
index 0000000..9ee3897
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsOrderVO.java
@@ -0,0 +1,110 @@
+package com.panzhihua.common.model.vos.community.microCommercialStreet;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+@Data
+@ApiModel("商业街订单表")
+public class McsOrderVO {
+ private Long id;
+
+ /**
+ * 订单编号
+ */
+ @ApiModelProperty(value = "订单编号")
+ private String orderNo;
+
+ /**
+ * 支付配置id
+ */
+ @ApiModelProperty(value = "支付配置id")
+ private Long configId;
+
+ /**
+ * 数量
+ */
+ @ApiModelProperty(value = "数量")
+ private Integer num;
+
+ /**
+ * 支付状态 0 待支付 1已支付 2 已取消 3 已退款
+ */
+ @ApiModelProperty(value = "支付状态 0 待支付 1已支付 2 已取消 3 已退款")
+ private Integer status;
+
+ /**
+ * 支付金额
+ */
+ @ApiModelProperty(value = "支付金额")
+ private BigDecimal money;
+
+ /**
+ * 支付时间
+ */
+ @ApiModelProperty(value = "支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date payTime;
+
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long merchantId;
+
+ /**
+ * 支付流水号
+ */
+ @ApiModelProperty(value = "支付流水号")
+ private String payNo;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 商家名称
+ */
+ @ApiModelProperty("商家名称")
+ private String merchantName;
+ /**
+ * 付费名称
+ */
+ @ApiModelProperty("付费名称")
+ private String payName;
+ /**
+ * 商家账号
+ */
+ @ApiModelProperty("商家账号")
+ private String merchantAccount;
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+ @ApiModelProperty("交易类型 MWEB-->h5支付 NATIVE-->pc端支付 JSAPI-->小程序支付")
+ private String tradeType;
+
+ @ApiModelProperty("openid")
+ private String openId;
+
+ @ApiModelProperty("订单取消剩余倒计时")
+ private Long cancelCountdown;
+
+ @ApiModelProperty("支付方式")
+ private String paymentMethod;
+
+ @ApiModelProperty("商家地址")
+ private String address;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ private String lon;
+
+ @ApiModelProperty(value = "用户真实ip", hidden = true)
+ private String clientIp;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsProductVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsProductVO.java
new file mode 100644
index 0000000..fec9913
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsProductVO.java
@@ -0,0 +1,53 @@
+package com.panzhihua.common.model.vos.community.microCommercialStreet;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @title: McsProductVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description:
+ * @author: hans
+ * @date: 2022/01/05 11:29
+ */
+@Data
+@ApiModel("产品信息")
+public class McsProductVO {
+
+ @ApiModelProperty("产品id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("产品名称")
+ private String name;
+
+ @ApiModelProperty("产品图片")
+ private String image;
+
+ @ApiModelProperty("产品介绍")
+ private String introduction;
+
+ @ApiModelProperty("浏览量")
+ private Integer viewNum;
+
+ @ApiModelProperty("状态（1.上架中 2.已下架）")
+ private Integer status;
+
+ @ApiModelProperty("产品标签")
+ private String productLabel;
+
+ @ApiModelProperty("所属商家")
+ private Long merchantId;
+
+ @ApiModelProperty("所属商家名称")
+ private Long merchantName;
+
+ @ApiModelProperty("产品标签ids")
+ private List<Long> labelIds;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsVerifyRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsVerifyRecordVO.java
new file mode 100644
index 0000000..ad92844
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsVerifyRecordVO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.vos.community.microCommercialStreet;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: McsVerifyRecordVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 戳戳卷核验记录信息
+ * @author: hans
+ * @date: 2022/01/08 14:56
+ */
+@Data
+@ApiModel("戳戳卷核验记录信息")
+public class McsVerifyRecordVO {
+
+ @ApiModelProperty("核验记录id")
+ private Long id;
+
+ @ApiModelProperty("核验码")
+ private Long couponId;
+
+ @ApiModelProperty("游戏名称")
+ private String name;
+
+ @ApiModelProperty("获得奖励")
+ private String award;
+
+ @ApiModelProperty("核验时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date verifiedAt;
+
+ @ApiModelProperty("用户昵称")
+ private String nickName;
+
+ @ApiModelProperty("游戏类别（1.戳戳币游戏 2.体验游戏）")
+ private Integer type;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/MyCouponVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/MyCouponVO.java
new file mode 100644
index 0000000..f4c6e8f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/MyCouponVO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.vos.community.microCommercialStreet;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: MyCouponVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 我的戳戳卷信息
+ * @author: hans
+ * @date: 2022/01/08 12:26
+ */
+@Data
+@ApiModel("我的戳戳卷信息")
+public class MyCouponVO {
+
+ @ApiModelProperty("已获得的戳戳币")
+ private Integer obtainedTotal;
+
+ @ApiModelProperty("免费体验次")
+ private Integer trialTotal;
+
+ @ApiModelProperty("参与游戏数")
+ private Integer joinGameTotal;
+
+ @ApiModelProperty("待核销券码")
+ private Integer unVerifiedTotal;
+
+ @ApiModelProperty("戳戳卷列表")
+ private List<McsCouponVO> couponList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/TopStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/TopStatisticsVO.java
new file mode 100644
index 0000000..7983bc0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/TopStatisticsVO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.vos.community.microCommercialStreet;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: TopStatisticsVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 统计信息
+ * @author: hans
+ * @date: 2022/01/04 17:58
+ */
+@Data
+@ApiModel("统计信息")
+public class TopStatisticsVO {
+
+ @ApiModelProperty("到期时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date expireAt;
+
+ @ApiModelProperty("剩余点亮天数")
+ private Integer surplusLitDays;
+
+ @ApiModelProperty("领取人数")
+ private Integer appliedTotal;
+
+ @ApiModelProperty("核销人数")
+ private Integer verifiedTotal;
+
+ @ApiModelProperty("空闲戳戳点")
+ private Integer idleTotal;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/VerifiedReturnVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/VerifiedReturnVO.java
new file mode 100644
index 0000000..21f9a70
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/VerifiedReturnVO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.vos.community.microCommercialStreet;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: VerifiedReturnVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 戳戳卷核验返回参数
+ * @author: hans
+ * @date: 2022/01/08 14:37
+ */
+@Data
+@ApiModel("戳戳卷核验返回参数")
+public class VerifiedReturnVO {
+
+ @ApiModelProperty("用户")
+ private String nickName;
+
+ @ApiModelProperty("奖励")
+ private String award;
+
+ @ApiModelProperty("券码")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long couponId;
+
+ @ApiModelProperty("核销时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date verifiedAt;
+
+ @ApiModelProperty("游戏名称")
+ private String gameName;
+
+ @ApiModelProperty("游戏封面")
+ private String cover;
+
+ @ApiModelProperty("奖励类型（1.免费领 2.产品试用 3.消费赠礼 4.优惠券）")
+ private Integer awardType;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/EditComActQuestnaireVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/EditComActQuestnaireVo.java
new file mode 100644
index 0000000..575f26c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/EditComActQuestnaireVo.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.vos.community.questnaire;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: llming
+ * @Description:编辑问卷调查DO
+ */
+@Data
+public class EditComActQuestnaireVo {
+ @ApiModelProperty(value = "问卷调查Id")
+ private Long questId;
+ @ApiModelProperty(value = "类型（1.继续调研 2.停止调研 3.发布调研）")
+ private Integer type;
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+ @ApiModelProperty(value = "继续调研选择结束时间")
+ private String endTime;
+
+ /**
+ * 类型（1.继续调研 2.停止调研）
+ */
+ public interface type {
+ int jx = 1;
+ int tz = 2;
+ int fb = 3;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireAnswerStatVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireAnswerStatVO.java
new file mode 100644
index 0000000..be23cdf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireAnswerStatVO.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.vos.community.questnaire;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 用户答卷详细
+ */
+@Data
+@ApiModel("用户问卷回答统计信息")
+public class QuestnaireAnswerStatVO {
+ @ApiModelProperty(value = "问卷信息")
+ private ComActQuestnaireVO questnaire;
+ @ApiModelProperty(value = "用户调查问卷题目统计信息")
+ private List<UsersSubAnswerStatVO> usersSubAnswerStat;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireDetailAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireDetailAdminVO.java
new file mode 100644
index 0000000..33a5028
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireDetailAdminVO.java
@@ -0,0 +1,58 @@
+package com.panzhihua.common.model.vos.community.questnaire;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: llming
+ * @Description:
+ */
+@Data
+public class QuestnaireDetailAdminVO {
+
+ @ApiModelProperty(value = "问卷调查id")
+ private Long id;
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+ @ApiModelProperty(value = "问卷调查主题")
+ private String title;
+ @ApiModelProperty("广告顶部（1.是 2.否）")
+ private Integer adverPositionTop;
+ @ApiModelProperty("广告弹窗（1.是 2.否 ）")
+ private Integer adverPositionPopup;
+ @ApiModelProperty("广告应用（1.是 2.否）")
+ private Integer adverPositionApplication;
+ @ApiModelProperty("调研开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+ @ApiModelProperty("调研结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+ @ApiModelProperty("是否强制调研（1.是 2.否）")
+ private String isForce;
+ @ApiModelProperty("是否封面（1.是 2.否）")
+ private String isCover;
+ @ApiModelProperty("问卷调查备注(应用名称)")
+ private String remark;
+ @ApiModelProperty("组件json数据")
+ private String jsonObject;
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date publishTime;
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("是否居民（1.是 2.否）")
+ private Integer forMasses;
+ @ApiModelProperty("是否党员（1.是 2.否）")
+ private Integer forParty;
+ @ApiModelProperty("是否志愿者（1.是 2.否）")
+ private Integer forVolunteer;
+ @ApiModelProperty("是否已填写（1.是 2.否）")
+ private Integer isOk = 2;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireListAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireListAdminVO.java
new file mode 100644
index 0000000..d64ba1d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireListAdminVO.java
@@ -0,0 +1,77 @@
+package com.panzhihua.common.model.vos.community.questnaire;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class QuestnaireListAdminVO {
+
+ @ApiModelProperty("id")
+ private String id;
+
+ @ApiModelProperty("标题")
+ private String title;
+
+ @ApiModelProperty("状态 1待发布 2调研中 3已停止")
+ private Integer state;
+
+ @ApiModelProperty("是否封面（1.是 2.否）")
+ private Integer isCover;
+
+ @ApiModelProperty("参与人数")
+ private Integer joinCount;
+
+ @ApiModelProperty("浏览量")
+ private Long viewNum;
+
+ @ApiModelProperty("填报项数量")
+ private Integer count;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date publishTime;
+
+ @ApiModelProperty("调查开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ @ApiModelProperty("调查结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+
+ @ApiModelProperty("是否提供居民填写(1.是 2.否)")
+ private Integer forMasses;
+
+ @ApiModelProperty("是否提供党员填写(1.是 2.否)")
+ private Integer forParty;
+
+ @ApiModelProperty("是否提供志愿者填写(1.是 2.否)")
+ private Integer forVolunteer;
+
+ @ApiModelProperty("广告顶部（1.是 2.否）")
+ private Integer adverPositionTop;
+
+ @ApiModelProperty("广告弹窗（1.是 2.否 ）")
+ private Integer adverPositionPopup;
+
+ @ApiModelProperty("广告应用（1.是 2.否）")
+ private Integer adverPositionApplication;
+
+ @ApiModelProperty("组件库唯一key")
+ private String projectKey;
+
+ @ApiModelProperty("调研对象身份")
+ private String identity;
+
+ @ApiModelProperty("广告位置")
+ private String advertPosition;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireListVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireListVo.java
new file mode 100644
index 0000000..a0c9e1b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireListVo.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.vos.community.questnaire;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class QuestnaireListVo {
+
+ @ApiModelProperty("id")
+ private String id;
+
+ @ApiModelProperty("标题")
+ private String title;
+
+ @ApiModelProperty("状态 1待发布 2调研中 3已停止")
+ private Integer state;
+
+ @ApiModelProperty("参与人数")
+ private Integer joinCount;
+
+ @ApiModelProperty("浏览量")
+ private Long viewNum;
+
+ @ApiModelProperty("填报项数量")
+ private Integer count;
+
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("是否已参与(1.是 2.否)")
+ private Integer isAnswer;
+
+ @ApiModelProperty("是否封面（1.是 2.否）")
+ private Integer isCover;
+
+ @ApiModelProperty("提供居民（1.是 2.否）")
+ private Integer forMasses;
+
+ @ApiModelProperty("提供党员（1.是 2.否）")
+ private Integer forParty;
+
+ @ApiModelProperty("提供志愿者（1.是 2.否）")
+ private Integer forVolunteer;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireStatisticsSummaryAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireStatisticsSummaryAdminVO.java
new file mode 100644
index 0000000..882d3cb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireStatisticsSummaryAdminVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community.questnaire;
+
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 统计汇总返回对象
+ */
+@Data
+public class QuestnaireStatisticsSummaryAdminVO {
+
+ @ApiModelProperty(value = "问卷调查题目")
+ private String subject;
+ @ApiModelProperty(value = "问卷调查选项")
+ private String option;
+ @ApiModelProperty("选择该选项人数")
+ private Integer count;
+ @ApiModelProperty("问卷调查题目参与总数")
+ private Integer allCount;
+ @ApiModelProperty("百分比")
+ private BigDecimal tag;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireStatisticsSummaryExcelAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireStatisticsSummaryExcelAdminVO.java
new file mode 100644
index 0000000..f08c764
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireStatisticsSummaryExcelAdminVO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.vos.community.questnaire;
+
+import java.math.BigDecimal;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * 统计汇总返回对象
+ */
+@Data
+public class QuestnaireStatisticsSummaryExcelAdminVO {
+
+ @ExcelProperty(value = "问卷调查题目", index = 0)
+ private String subject;
+ @ExcelProperty(value = "问卷调查选项", index = 1)
+ private String option;
+ @ExcelProperty(value = "参与人数百分比", index = 2)
+ private BigDecimal tag;
+ @ExcelProperty(value = "该选项选择总次数", index = 3)
+ private Integer count;
+ @ExcelProperty(value = "该题目选择总次数", index = 4)
+ private Integer allCount;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireStatisticsSummaryHeaderAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireStatisticsSummaryHeaderAdminVO.java
new file mode 100644
index 0000000..b4c598e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireStatisticsSummaryHeaderAdminVO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.vos.community.questnaire;
+
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 统计汇总表头返回数据
+ */
+@Data
+public class QuestnaireStatisticsSummaryHeaderAdminVO {
+
+ @ApiModelProperty(value = "填报志愿者数量")
+ private Integer volunteerCount = 0;
+ @ApiModelProperty(value = "填报党员")
+ private Integer partymemberCount = 0;
+ @ApiModelProperty("总填报量")
+ private Integer allCount = 0;
+ @ApiModelProperty("总浏览量")
+ private Integer viewNum = 0;
+ @ApiModelProperty("今日新增")
+ private Integer todayCount = 0;
+ @ApiModelProperty("未填报志愿者")
+ private Integer noVolunteerCount = 0;
+ @ApiModelProperty("未填报党员")
+ private Integer noPartymemberCount = 0;
+ @ApiModelProperty("填报率")
+ private BigDecimal tag = BigDecimal.ZERO;
+ @ApiModelProperty("社区小程序用户总人数")
+ private Integer userCount = 0;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java
new file mode 100644
index 0000000..7bd915a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java
@@ -0,0 +1,54 @@
+package com.panzhihua.common.model.vos.community.questnaire;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: llming
+ * @Description:
+ */
+@Data
+public class QuestnaireVO {
+
+ @ApiModelProperty(value = "问卷调查id")
+ private Long id;
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+ @ApiModelProperty(value = "问卷调查主题")
+ private String title;
+ @ApiModelProperty(value = "问卷描述")
+ private String queDescribe;
+ @ApiModelProperty(value = "身份（1.全部居民 2.党员 3.志愿者）")
+ private Integer identity;
+ @ApiModelProperty("广告顶部（1.是 2.否）")
+ private Integer adverPositionTop;
+ @ApiModelProperty("广告弹窗（1.是 2.否 ）")
+ private Integer adverPositionPopup;
+ @ApiModelProperty("广告应用（1.是 2.否）")
+ private Integer adverPositionApplication;
+ @ApiModelProperty("调研开始时间")
+ private String startTime;
+ @ApiModelProperty("调研结束时间")
+ private String endTime;
+ @ApiModelProperty("是否强制调研（1.是 2.否）")
+ private Integer isForce;
+ @ApiModelProperty("是否封面（1.是 2.否）")
+ private Integer isCover;
+ @ApiModelProperty("问卷调查备注(应用名称)")
+ private String remark;
+ @ApiModelProperty("组件json数据")
+ private String jsonObject;
+ @ApiModelProperty("是否发布（1.是 2.否）")
+ private Integer isRelease;
+
+ /**
+ * 身份（1.全部居民 2.党员 3.志愿者）
+ */
+ public interface identity {
+ int jm = 1;
+ int dy = 2;
+ int zyz = 3;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireWriteListAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireWriteListAdminVO.java
new file mode 100644
index 0000000..1bc24e6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireWriteListAdminVO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.vos.community.questnaire;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 调查问卷填报列表返回参数
+ */
+@Data
+public class QuestnaireWriteListAdminVO {
+
+ @ApiModelProperty(value = "问卷调查题目列表")
+ private List<String> subjectList;
+ @ApiModelProperty(value = "问卷调查选项")
+ private String option;
+ @ApiModelProperty("选择该选项人数")
+ private Integer count;
+ @ApiModelProperty("问卷调查题目参与总数")
+ private Integer allCount;
+ @ApiModelProperty("百分比")
+ private BigDecimal tag;
+
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ @ApiModelProperty("用户昵称")
+ private Long nickName;
+
+ @ApiModelProperty("提交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("用户填报数据")
+ private List<QuestnaiteSubVO> list;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaiteSubSelectionVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaiteSubSelectionVO.java
new file mode 100644
index 0000000..2e2577b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaiteSubSelectionVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.community.questnaire;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: llming
+ * @Description: 问卷题目选项
+ */
+@Data
+public class QuestnaiteSubSelectionVO {
+ @ApiModelProperty(value = "问卷题目选项Id")
+ private Long queSubSelectionId;
+
+ @ApiModelProperty(value = "选项排序")
+ private Integer sort;
+
+ @ApiModelProperty(value = "选项名")
+ private String optionName;
+
+ @ApiModelProperty(value = "选项内容")
+ private String label;
+
+ @ApiModelProperty(value = "选项类型 0 固定选项 1 自定义选项")
+ private Integer type = 0;
+
+ @ApiModelProperty(value = "选项key")
+ private String key;
+
+ @ApiModelProperty(value = "图片选择组件url地址")
+ private String url;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaiteSubVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaiteSubVO.java
new file mode 100644
index 0000000..933776a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaiteSubVO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.vos.community.questnaire;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: llming
+ * @Description: 问卷题目
+ */
+@Data
+public class QuestnaiteSubVO {
+ @ApiModelProperty(value = "问卷题目Id")
+ private Long queSubId;
+ @ApiModelProperty(value = "序号")
+ private int sort;
+ @ApiModelProperty(value = "题目内容")
+ private String label;
+ @ApiModelProperty(value = "类型 0 单选 1 多选 2 输入框 3 手机号 4 身份证 5 文字描述 6 日期选择 7 时间选择 8 可换行的输入框 9姓名输入框 10图片选择", example = "0")
+ private Integer type;
+ @ApiModelProperty(value = "问卷题目选项")
+ private List<QuestnaiteSubSelectionVO> options;
+ @ApiModelProperty(value = "问卷题目题目key")
+ private String key;
+ @ApiModelProperty(value = "答题选项内容key")
+ private String values;
+
+ /**
+ * 类型 0 单选 1 多选 2 输入框 3 手机号 4 身份证 5 文字描述 6 日期选择 7 时间选择 8 可换行的输入框 9姓名输入框 10图片选择
+ */
+ public interface type {
+ int danxuan = 0;
+ int duoxuan = 1;
+ int wenda = 2;
+ int phone = 3;
+ int card = 4;
+ int describe = 5;
+ int date = 6;
+ int time = 7;
+ int input = 8;
+ int name = 9;
+ int imgselect = 10;
+ int address=14;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UserAnswerContentVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UserAnswerContentVO.java
new file mode 100644
index 0000000..742b755
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UserAnswerContentVO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.vos.community.questnaire;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: llming
+ * @Description:
+ */
+@ApiModel("用户填写选项情况")
+@Data
+public class UserAnswerContentVO {
+ @ApiModelProperty(value = "问卷题目Id")
+ private Long subId;
+
+ @ApiModelProperty(value = "问卷回答选项", example = "选项")
+ private String choice;
+
+ @ApiModelProperty(value = "问卷回答内容")
+ private String answerContent;
+
+ @ApiModelProperty(value = "选项类型 0 固定选项 1 自定义选项", example = "0")
+ private Integer type;
+
+ @ApiModelProperty(value = "题目选项ID", example = "0")
+ private Long selectionId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UserSubAnswerSelectionStatVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UserSubAnswerSelectionStatVO.java
new file mode 100644
index 0000000..cc99696
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UserSubAnswerSelectionStatVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community.questnaire;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("用户调查问卷题目-选择项统计信息")
+public class UserSubAnswerSelectionStatVO {
+ @ApiModelProperty(value = "调查问卷题目ID", hidden = true)
+ @JsonIgnore
+ private Long subId;
+ @ApiModelProperty("选项")
+ private String optionName;
+ @ApiModelProperty("问卷回答内容")
+ private String answerContent;
+ @ApiModelProperty("小计")
+ private Integer total;
+ @ApiModelProperty("比例")
+ private String proportion;
+ @ApiModelProperty("选项类型 0 固定选项 1 自定义选项")
+ private Integer type;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UsersAnswerQuestnaireVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UsersAnswerQuestnaireVO.java
new file mode 100644
index 0000000..513eb03
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UsersAnswerQuestnaireVO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.vos.community.questnaire;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: llming
+ * @Description:
+ */
+@Data
+@ApiModel("用户填写问卷情况")
+public class UsersAnswerQuestnaireVO {
+
+ @ApiModelProperty(value = "调查问卷Id")
+ private Long questId;
+
+ @ApiModelProperty(value = "答题情况")
+ private String jsonObject;
+
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UsersAnswerVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UsersAnswerVO.java
new file mode 100644
index 0000000..d6370f8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UsersAnswerVO.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.vos.community.questnaire;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 用户答卷详细
+ */
+@Data
+@ApiModel("用户问卷回答信息")
+public class UsersAnswerVO {
+ @ApiModelProperty(value = "问卷信息")
+ private ComActQuestnaireVO questnaire;
+ @ApiModelProperty(value = "用户调查问卷题目信息")
+ private List<UsersSubAnswerVO> usersSubAnswer;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UsersSubAnswerStatVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UsersSubAnswerStatVO.java
new file mode 100644
index 0000000..c28e46a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UsersSubAnswerStatVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community.questnaire;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.ComActQuestnaireSubVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 用户答卷详细
+ */
+@Data
+@ApiModel("用户调查问卷题目统计信息")
+public class UsersSubAnswerStatVO {
+ @ApiModelProperty(value = "调查问卷题目")
+ private ComActQuestnaireSubVO questSubVO;
+
+ @ApiModelProperty(value = "用户回答统计")
+ private List<UserSubAnswerSelectionStatVO> usersAnswer;
+
+ @ApiModelProperty(value = "本题答题人数")
+ private Integer total;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UsersSubAnswerVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UsersSubAnswerVO.java
new file mode 100644
index 0000000..fed2d2b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UsersSubAnswerVO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.vos.community.questnaire;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
+import com.panzhihua.common.model.vos.community.ComActQuestnaireSubSelectionVO;
+import com.panzhihua.common.model.vos.community.ComActQuestnaireSubVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 用户答卷详细
+ */
+@Data
+@ApiModel("用户调查问卷题目信息")
+public class UsersSubAnswerVO {
+ @ApiModelProperty(value = "调查问卷题目")
+ private ComActQuestnaireSubVO questSubVO;
+
+ @ApiModelProperty(value = "调查问卷题目选项")
+ private List<ComActQuestnaireSubSelectionVO> questSelectionList;
+
+ @ApiModelProperty(value = "用户回答")
+ private List<ComActQuestnaireAnswerContentVO> usersAnswer;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRafflePrizeCount.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRafflePrizeCount.java
new file mode 100644
index 0000000..d1431f3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRafflePrizeCount.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.vos.community.raffle;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("礼品统计")
+public class ComActRafflePrizeCount {
+ @ApiModelProperty("总数")
+ private Integer total;
+ @ApiModelProperty("剩下")
+ private Integer surplus;
+ @ApiModelProperty("礼品列表")
+ private List<ComActRafflePrizeVO> comActRafflePrizeVOList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRafflePrizeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRafflePrizeVO.java
new file mode 100644
index 0000000..b5c2d69
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRafflePrizeVO.java
@@ -0,0 +1,59 @@
+package com.panzhihua.common.model.vos.community.raffle;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+
+/**
+ * 抽奖活动奖品表(ComActRafflePrize)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动奖品表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:31:45
+ */
+@Data
+@ApiModel("抽奖活动奖品表")
+public class ComActRafflePrizeVO implements Serializable {
+
+ private static final long serialVersionUID = 706879121724104929L;
+
+ private Long id;
+
+ /**
+ * 奖品名称
+ */
+ @ApiModelProperty(value = "奖品名称")
+ private String name;
+
+ /**
+ * 总数
+ */
+ @ApiModelProperty(value = "总数")
+ private Integer total;
+
+ /**
+ * 剩余
+ */
+ @ApiModelProperty(value = "剩余")
+ private Integer surplus;
+
+ /**
+ * 图片
+ */
+ @ApiModelProperty(value = "图片")
+ private String image;
+
+ /**
+ * 抽奖活动id
+ */
+ @ApiModelProperty(value = "抽奖活动id")
+ private Long raffleId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleRecordExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleRecordExcelVO.java
new file mode 100644
index 0000000..2a5144d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleRecordExcelVO.java
@@ -0,0 +1,63 @@
+package com.panzhihua.common.model.vos.community.raffle;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.net.URL;
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+public class ComActRaffleRecordExcelVO {
+ @ApiModelProperty(value = "昵称")
+ @ExcelProperty(value = "昵称",index = 0)
+ private String nickName;
+
+ @ApiModelProperty(value = "姓名")
+ @ExcelProperty(value = "姓名",index = 1)
+ private String username;
+
+ @ApiModelProperty(value = "联系电话")
+ @ExcelProperty(value = "联系电话",index = 2)
+ private String phone;
+ /**
+ * 创建时间
+ */
+ @ExcelProperty(value = "中奖时间",index = 3)
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ @ApiModelProperty(value = "奖品名称")
+ @ExcelProperty(value = "奖品名称",index = 4)
+ private String prizeName;
+
+ @ApiModelProperty(value = "核销人名称")
+ @ExcelProperty(value = "核销人",index = 5)
+ private String staffName;
+
+ @ApiModelProperty(value = "核销时间")
+ @ExcelProperty(value = "核销时间",index = 6)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date staffTime;
+
+ @ExcelProperty(value = "状态",index = 7)
+ private String status;
+
+ public String getStatus() {
+ if("1".equals(this.status)){
+ return "待兑奖";
+ }
+ if("2".equals(this.status)){
+ return "已兑奖";
+ }
+ if("3".equals(this.status)){
+ return "已失效";
+ }
+ return "";
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleRecordVO.java
new file mode 100644
index 0000000..f8a0912
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleRecordVO.java
@@ -0,0 +1,99 @@
+package com.panzhihua.common.model.vos.community.raffle;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 抽奖活动中奖记录表(ComActRaffleRecord)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动中奖记录表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:32:01
+ */
+@Data
+@ApiModel("抽奖活动中奖记录表")
+public class ComActRaffleRecordVO implements Serializable {
+
+ private static final long serialVersionUID = 201328912468431601L;
+
+ private Long id;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 奖品id
+ */
+ @ApiModelProperty(value = "奖品id")
+ private Long prizeId;
+
+ /**
+ * 核销人
+ */
+ @ApiModelProperty(value = "核销人")
+ private Long staffId;
+
+ /**
+ * 核销时间
+ */
+ @ApiModelProperty(value = "核销时间")
+ private Date staffTime;
+
+ @ApiModelProperty(value = "0 已参加 1待兑奖 2已兑奖 3已失效 4未中奖")
+ private Integer status;
+
+ @ApiModelProperty(value = "抽奖id")
+ private Long raffleId;
+
+ @ApiModelProperty(value = "核销人名称")
+ private String staffName;
+
+ @ApiModelProperty(value = "奖品名称")
+ private String prizeName;
+
+ @ApiModelProperty(value = "奖品图片")
+ private String image;
+
+ @ApiModelProperty(value = "昵称")
+ private String nickName;
+
+ @ApiModelProperty(value = "姓名")
+ private String username;
+
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+
+ /**
+ * 兑奖开始时间
+ */
+ @ApiModelProperty(value = "兑奖开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date raffleStartTime;
+
+ /**
+ * 兑奖结束时间
+ */
+ @ApiModelProperty(value = "兑奖结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date raffleStopTime;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java
new file mode 100644
index 0000000..a744423
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java
@@ -0,0 +1,162 @@
+package com.panzhihua.common.model.vos.community.raffle;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 抽奖活动表(ComActRaffle)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:31:19
+ */
+@Data
+@ApiModel("抽奖活动表")
+public class ComActRaffleVO implements Serializable {
+
+ private static final long serialVersionUID = -19557136291047637L;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ private String name;
+
+ /**
+ * 开始时间
+ */
+ @ApiModelProperty(value = "开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date startTime;
+
+ /**
+ * 结束时间
+ */
+ @ApiModelProperty(value = "结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date stopTime;
+
+ /**
+ * 开奖时间
+ */
+ @ApiModelProperty(value = "开奖时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date lotteryTime;
+
+ /**
+ * 兑奖开始时间
+ */
+ @ApiModelProperty(value = "兑奖开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date raffleStartTime;
+
+ /**
+ * 兑奖结束时间
+ */
+ @ApiModelProperty(value = "兑奖结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date raffleStopTime;
+
+ /**
+ * 工作时间
+ */
+ @ApiModelProperty(value = "工作时间")
+ private String workTime;
+
+ /**
+ * 地址
+ */
+ @ApiModelProperty(value = "地址")
+ private String address;
+
+ /**
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ @ApiModelProperty(value = "纬度")
+ private String latitude;
+
+ /**
+ * 联系方式
+ */
+ @ApiModelProperty(value = "联系方式")
+ private String phone;
+
+ /**
+ * 封面
+ */
+ @ApiModelProperty(value = "封面")
+ private String cover;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * 状态 0未开始 1报名中 2待开奖 3已开奖
+ */
+ @ApiModelProperty(value = "状态 0未开始 1报名中 2待开奖 3已开奖")
+ private Integer status;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "奖品数量")
+ private Integer prizeCount;
+
+ @ApiModelProperty(value = "参与人数")
+ private Integer joinCount;
+
+ @ApiModelProperty(value = "中奖人数")
+ private Integer raffleCount;
+
+ @ApiModelProperty(value = "待兑换奖品数量")
+ private Integer waitRaffleCount;
+
+ @ApiModelProperty(value = "创建人名称")
+ private String createName;
+
+ @ApiModelProperty(value = "奖品集合")
+ private List<ComActRafflePrizeVO> comActRafflePrizeVOList;
+
+ @ApiModelProperty(value = "中奖情况")
+ private ComActRaffleRecordVO comActRaffleRecordVO;
+
+ @ApiModelProperty(value = "参与状态 0 不可参与 1 可参与")
+ private Integer joinStatus;
+
+ @ApiModelProperty("是否参与 0参与 1没参与")
+ private Integer isJoin;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/OrderStatics.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/OrderStatics.java
new file mode 100644
index 0000000..bcf13c6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/OrderStatics.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.vos.community.rentHouse;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class OrderStatics {
+ @ApiModelProperty("总订单金额")
+ private BigDecimal allOrder;
+ @ApiModelProperty("租金总金额")
+ private BigDecimal allRent;
+ @ApiModelProperty("服务费总金额")
+ private BigDecimal allService;
+ @ApiModelProperty("保证金总金额")
+ private BigDecimal allBond;
+ @ApiModelProperty("服务费收益")
+ private BigDecimal serviceProfit;
+ @ApiModelProperty("保证金余额")
+ private BigDecimal bondProfit;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/PayOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/PayOrderVO.java
new file mode 100644
index 0000000..7e5784b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/PayOrderVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community.rentHouse;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class PayOrderVO {
+ @ApiModelProperty("订单支付类型 1.定金订单 2.退款订单 3.普通订单")
+ private Integer type;
+ private String orderNo;
+
+ /**
+ * 订单支付类型 1.定金订单 2.退款订单 3.普通订单
+ */
+ public interface type{
+ int dj=1;
+ int tk=2;
+ int pt=3;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/PreOrderStatics.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/PreOrderStatics.java
new file mode 100644
index 0000000..1d87eda
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/PreOrderStatics.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community.rentHouse;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class PreOrderStatics {
+ @ApiModelProperty("总定金金额")
+ private BigDecimal allOrder;
+ @ApiModelProperty("定金退款总额")
+ private BigDecimal allRefuse;
+ @ApiModelProperty("退款数")
+ private BigDecimal refuseNum;
+ @ApiModelProperty("已结算定金")
+ private BigDecimal settledOrder;
+ @ApiModelProperty("待抵扣定金")
+ private BigDecimal deductOrder;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/RentingHourseOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/RentingHourseOrderVO.java
new file mode 100644
index 0000000..a2a7d75
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/RentingHourseOrderVO.java
@@ -0,0 +1,252 @@
+package com.panzhihua.common.model.vos.community.rentHouse;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class RentingHourseOrderVO {
+ private Long id;
+
+ /**
+ * 街道ID
+ */
+ @ApiModelProperty(value = "街道ID")
+ private Long streetId;
+
+ /**
+ * 小区id
+ */
+ @ApiModelProperty(value = "小区id")
+ private Long villageId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ /**
+ * 小区名称
+ */
+ @ApiModelProperty(value = "小区名称")
+ private String villageName;
+
+ /**
+ * 订单类型（1、新订单2、续租订单）
+ */
+ @ApiModelProperty(value = "订单类型（1、新订单2、续租订单）")
+ private Integer orderType;
+
+ /**
+ * 续租订单的原订单号
+ */
+ @ApiModelProperty(value = "续租订单的原订单号")
+ private String originOrderSn;
+
+ /**
+ * 订单SN号
+ */
+ @ApiModelProperty(value = "订单SN号")
+ private String orderSn;
+
+ /**
+ * 交易流水号
+ */
+ @ApiModelProperty(value = "交易流水号")
+ private String paySn;
+
+ /**
+ * 租赁月数（多少个月）
+ */
+ @ApiModelProperty(value = "租赁月数（多少个月）")
+ private Integer rentingMonth;
+
+ /**
+ * 建筑面积
+ */
+ @ApiModelProperty(value = "建筑面积")
+ private String constructArea;
+
+ /**
+ * 房型
+ */
+ @ApiModelProperty(value = "房型")
+ private String roomType;
+
+ /**
+ * 月租金
+ */
+ @ApiModelProperty(value = "月租金")
+ private BigDecimal monthlyRentMoney;
+
+ /**
+ * 保证金
+ */
+ @ApiModelProperty(value = "保证金")
+ private BigDecimal depositAmount;
+
+ /**
+ * 服务费
+ */
+ @ApiModelProperty(value = "服务费")
+ private BigDecimal serverCharge;
+
+ /**
+ * 定金
+ */
+ @ApiModelProperty(value = "定金")
+ private BigDecimal dingAmount;
+
+ /**
+ * 支付定金的订单号
+ */
+ @ApiModelProperty(value = "支付定金的订单号")
+ private String preOrderSn;
+
+ /**
+ * 支付的定金的订单备注
+ */
+ @ApiModelProperty(value = "支付的定金的订单备注")
+ private String preOrderNote;
+
+ /**
+ * 订单是否已经平台结算
+ */
+ @ApiModelProperty(value = "订单是否已经平台结算")
+ private String settingFlag;
+
+ /**
+ * 结算金额
+ */
+ @ApiModelProperty(value = "结算金额")
+ private BigDecimal settingAmount;
+
+ /**
+ * 计算订单号
+ */
+ @ApiModelProperty(value = "计算订单号")
+ private String settingSn;
+
+ /**
+ * 平台结算时间
+ */
+ @ApiModelProperty(value = "平台结算时间")
+ private Date settingDate;
+
+ /**
+ * 总楼层
+ */
+ @ApiModelProperty(value = "总楼层")
+ private String totalFloor;
+
+ /**
+ * 朝向
+ */
+ @ApiModelProperty(value = "朝向")
+ private String orientation;
+
+ /**
+ * 装饰
+ */
+ @ApiModelProperty(value = "装饰")
+ private String decoration;
+
+ /**
+ * 房内物品
+ */
+ @ApiModelProperty(value = "房内物品")
+ private String hourseItem;
+
+ /**
+ * 房主姓名
+ */
+ @ApiModelProperty(value = "房主姓名")
+ private String hourseOwnerName;
+
+ /**
+ * 房主身份证
+ */
+ @ApiModelProperty(value = "房主身份证")
+ private String hourseIdCard;
+
+ /**
+ * 房主电话
+ */
+ @ApiModelProperty(value = "房主电话")
+ private String hoursePhone;
+
+ /**
+ * 租客的用户ID，微信用户类型
+ */
+ @ApiModelProperty(value = "租客的用户ID，微信用户类型")
+ private Long rentingUserId;
+
+ /**
+ * 租赁开始时间
+ */
+ @ApiModelProperty(value = "租赁开始时间")
+ private Date startDate;
+
+ /**
+ * 租赁结束时间
+ */
+ @ApiModelProperty(value = "租赁结束时间")
+ private Date endDate;
+
+ /**
+ * 合同内容
+ */
+ @ApiModelProperty(value = "合同内容")
+ private String contractText;
+
+ /**
+ * 已支付定金金额（已经下定金的金额）
+ */
+ @ApiModelProperty(value = "已支付定金金额（已经下定金的金额）")
+ private BigDecimal payedDingMoney;
+
+ /**
+ * 订单最终金额
+ */
+ @ApiModelProperty(value = "订单最终金额")
+ private BigDecimal totalAccount;
+
+ /**
+ * 1、订单未支付2、订单已支付3、待房东签约4、房东已签约，合同生效5、已退款
+ */
+ @ApiModelProperty(value = "1、订单未支付2、订单已支付3、待房东签约4、房东已签约，合同生效5、已退款")
+ private Integer status;
+
+ /**
+ * 创建者
+ */
+ @ApiModelProperty(value = "创建者")
+ private Long createUser;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createDate;
+
+ /**
+ * 房屋登记ID
+ */
+ @ApiModelProperty(value = "房屋登记ID")
+ private Long registerId;
+
+ /**
+ * 图片
+ */
+ @ApiModelProperty(value = "图片")
+ private String url;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/RentingHoursePreOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/RentingHoursePreOrderVO.java
new file mode 100644
index 0000000..af9086c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/RentingHoursePreOrderVO.java
@@ -0,0 +1,102 @@
+package com.panzhihua.common.model.vos.community.rentHouse;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class RentingHoursePreOrderVO {
+ private Long id;
+
+ /**
+ * 订单SN号
+ */
+ @ApiModelProperty(value = "订单SN号")
+ private String orderSn;
+
+ /**
+ * 房屋登记ID
+ */
+ @ApiModelProperty(value = "房屋登记ID")
+ private Long registerId;
+
+ /**
+ * 定金
+ */
+ @ApiModelProperty(value = "定金")
+ private BigDecimal dingMoney;
+
+ /**
+ * 合同内容
+ */
+ @ApiModelProperty(value = "合同内容")
+ private String contractText;
+
+ /**
+ * 1 已缴纳定金，待抵扣 2、合同已签订，定金已抵扣 3、房东未按时处理，定金已退款 2、已退还定金 3、未按时去和房东签约订单过期，定金不退，已失效
+ */
+ @ApiModelProperty(value = "1 已缴纳定金，待抵扣 2、合同已签订，定金已抵扣 3、房东未按时处理，定金已退款 2、已退还定金 3、未按时去和房东签约订单过期，定金不退，已失效")
+ private Integer status;
+
+ /**
+ * 定金保留时间
+ */
+ @ApiModelProperty(value = "定金保留时间")
+ private Date expireDate;
+
+ /**
+ * 房东扫描的时候绑定微信APPID
+ */
+ @ApiModelProperty(value = "房东扫描的时候绑定微信APPID")
+ private String hourseOwnerWeixinAppid;
+
+ /**
+ * 房东的用户ID，用户表记录了房东的详细信息
+ */
+ @ApiModelProperty(value = "房东的用户ID，用户表记录了房东的详细信息")
+ private Long hourseOwnerUserId;
+
+ /**
+ * 租客的微信APPID
+ */
+ @ApiModelProperty(value = "租客的微信APPID")
+ private String tenantWeixinAppid;
+
+ /**
+ * 租客的用户ID，房东的用户ID，用户表记录了租客的详细信息
+ */
+ @ApiModelProperty(value = "租客的用户ID，房东的用户ID，用户表记录了租客的详细信息")
+ private Long tenantUserId;
+
+ /**
+ * 创建者
+ */
+ @ApiModelProperty(value = "创建者")
+ private Long createUser;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createDate;
+
+ @ApiModelProperty(value = "流水号")
+ private String paySn;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "房屋名称")
+ private String villageName;
+
+ @ApiModelProperty(value = "图片")
+ private String url;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/WxPayNotifyOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/WxPayNotifyOrderVO.java
new file mode 100644
index 0000000..e00d9f9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/WxPayNotifyOrderVO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.vos.community.rentHouse;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class WxPayNotifyOrderVO {
+ @ApiModelProperty("订单号")
+ private String orderSn;
+
+ /**
+ * 支付类型
+ */
+ @ApiModelProperty(value = "支付类型")
+ private String payType;
+
+ /**
+ * 支付时间
+ */
+ @ApiModelProperty(value = "支付时间")
+ private Date payDate;
+
+ /**
+ * 支付金额
+ */
+ @ApiModelProperty(value = "支付金额")
+ private BigDecimal payAmount;
+
+ /**
+ * 支付返回内容
+ */
+ @ApiModelProperty(value = "支付返回内容")
+ private String payReturnText;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/WxPayOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/WxPayOrderVO.java
new file mode 100644
index 0000000..69fc3e4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentHouse/WxPayOrderVO.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.vos.community.rentHouse;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class WxPayOrderVO {
+ @ApiModelProperty("订单号")
+ private String orderSn;
+ @ApiModelProperty("openId")
+ private String openId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentingHouses/RentingHouseRegisterVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentingHouses/RentingHouseRegisterVO.java
new file mode 100644
index 0000000..afa6764
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentingHouses/RentingHouseRegisterVO.java
@@ -0,0 +1,157 @@
+package com.panzhihua.common.model.vos.community.rentingHouses;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.validated.AddGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Pattern;
+
+/**
+ * @title: RentingHousesConfigVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 房屋租赁配置信息
+ * @author: hans
+ * @date: 2021/11/23 14:13
+ */
+@Data
+@ApiModel("房屋租赁配置信息")
+public class RentingHouseRegisterVO {
+
+ @ApiModelProperty(value = "id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty(value = "楼层号")
+ private String floor;
+
+ @ApiModelProperty(value = "总楼层")
+ private String totalFloor;
+
+ @ApiModelProperty(value = "房屋地址")
+ private String address;
+
+ @ApiModelProperty(value = "认证状态（1、未认证2、已认证）")
+ private Integer authStatus;
+
+ @ApiModelProperty(value = "认证码")
+ private String authCode;
+
+ @ApiModelProperty(value = "房屋状态(1、待发布 2、已发布,待出租2、出租中3、已退租")
+ private Integer status;
+
+ @ApiModelProperty(value = "1、待认证2、待发布3、待出租4、保留中 5出租中6、已超时7、已到期）")
+ private Integer detailStatus;
+
+ @ApiModelProperty(value = "建筑面积")
+ private BigDecimal constructArea;
+
+ @ApiModelProperty(value = "租房标题")
+ private String title;
+
+ @ApiModelProperty(value = "室数量")
+ private Integer brn;
+
+ @ApiModelProperty(value = "厅数量")
+ private Integer lrn;
+
+ @ApiModelProperty(value = "卫数量")
+ private Integer wcn;
+
+ @ApiModelProperty(value = "月租金")
+ private BigDecimal monthlyRentMoney;
+
+ @ApiModelProperty(value = "朝向（1东2南3西4北5东南6东北7西南8西北9南北10东西）")
+ private Integer orientation;
+
+ @ApiModelProperty(value = "装修情况（1.毛坯房 2.简装 3.精装修）")
+ private Integer decoration;
+
+ @ApiModelProperty(value = "房屋标签")
+ private String label;
+
+ @ApiModelProperty(value = "看房时间（1.随时看房 2.提前预约）")
+ private Integer seeHourseDate;
+
+ @ApiModelProperty(value = "房屋介绍")
+ private String hourseDescription;
+
+ @ApiModelProperty(value = "入住要求")
+ private String checkInRequirement;
+
+ @ApiModelProperty(value = "房内物品")
+ private String hourseItem;
+
+ @ApiModelProperty(value = "房主姓名")
+ private String hourseOwnerName;
+
+ @ApiModelProperty(value = "房主身份证")
+ private String hourseIdCard;
+
+ @ApiModelProperty(value = "房主电话")
+ private String hoursePhone;
+
+ @ApiModelProperty(value = "保证金")
+ private BigDecimal depositMoney;
+
+ @ApiModelProperty(value = "服务费")
+ private BigDecimal serverCharge;
+
+ @ApiModelProperty(value = "定金")
+ private BigDecimal dingMoney;
+
+ @ApiModelProperty(value = "看房电话")
+ private String seeHourseTelephone;
+
+ @ApiModelProperty(value = "房源封面展示图片")
+ private String url;
+
+ @ApiModelProperty(value = "房源图片")
+ private List<String> housePictures;
+
+ @ApiModelProperty(value = "产权证明")
+ private List<String> propertyPictures;
+
+ @ApiModelProperty(value = "证件照片")
+ private List<String> credentialsPictures;
+
+ @ApiModelProperty(value = "房屋委托代理合同")
+ private String houseAgencyContract;
+
+ @ApiModelProperty(value = "小区名称")
+ private String villageName;
+
+ @ApiModelProperty(value = "街/路/巷")
+ private String alley;
+
+ @ApiModelProperty(value = "街/路/巷号")
+ private String houseNum;
+
+ @ApiModelProperty(value = "楼栋号")
+ private String buildingNo;
+
+ @ApiModelProperty(value = "单元号")
+ private String unitNo;
+
+ @ApiModelProperty(value = "户室（房间号）")
+ private String houseNo;
+
+ @ApiModelProperty(value = "房屋的经度")
+ private String longitude;
+
+ @ApiModelProperty(value = "房屋的纬度")
+ private String latitude;
+
+ @ApiModelProperty(value = "是否是房东（1.是 2.否）")
+ private Integer isLandlord;
+
+ @ApiModelProperty(value = "租客电话")
+ private String tenantTelephone;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentingHouses/RentingHousesConfigVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentingHouses/RentingHousesConfigVO.java
new file mode 100644
index 0000000..9d28676
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/rentingHouses/RentingHousesConfigVO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.vos.community.rentingHouses;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: RentingHousesConfigVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 房屋租赁配置信息
+ * @author: hans
+ * @date: 2021/11/23 14:13
+ */
+@Data
+@ApiModel("房屋租赁配置信息")
+public class RentingHousesConfigVO {
+
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("配置名称")
+ private String name;
+
+ @ApiModelProperty("配置项目")
+ private String key;
+
+ @ApiModelProperty("配置内容")
+ private String value;
+
+ @ApiModelProperty("上次修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date modifyDate;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveAppletsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveAppletsVO.java
new file mode 100644
index 0000000..c512ced
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveAppletsVO.java
@@ -0,0 +1,147 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * @author lyq
+ * @create 2021-08-23 10:33:11
+ * @describe 预约登记信息
+ */
+
+@Data
+public class ComActReserveAppletsVO{
+
+ /**
+ * 主键id
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 社区id
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ /**
+ * 类型（1.预约 2.登记）
+ */
+ private Integer type;
+
+ /**
+ * 主题
+ */
+ private String title;
+
+ /**
+ * 浏览量
+ */
+ private Integer viewNum;
+
+ /**
+ * 总参加人数
+ */
+ private Integer joinAllCount;
+
+ /**
+ * 参加人数
+ */
+ private Integer joinCount;
+
+ /**
+ * 图标类型（1.预设1 2.预设2 3.预设3 4.预设4 5.用户自定义图片）
+ */
+ private Integer imgType;
+
+ /**
+ * 图标url（当img_type为5时，此字段的值为图标url地址）
+ */
+ private String imgUrl;
+
+ /**
+ * 状态(1.待发布 2.进行中 3.已停止)
+ */
+ private Integer status;
+
+ /**
+ * 发布时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date publishTime;
+
+ /**
+ * 是否可重复提交（1.是 2.否）
+ */
+ private Integer isRepeat;
+
+ /**
+ * 备注
+ */
+ private String remark;
+
+ /**
+ * 组件json数据
+ */
+ private String jsonObject;
+
+ /**
+ * 是否是首页顶部（1.是 2.否）
+ */
+ private Integer adverPositionTop;
+
+ /**
+ * 是否是首页应用（1.是 2.否）
+ */
+ private Integer adverPositionApplication;
+
+ /**
+ * 创建时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ /**
+ * 创建人
+ */
+ private Long createBy;
+
+ /**
+ * 修改时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ /**
+ * 修改人
+ */
+ private Long updateBy;
+
+ /**
+ * 结束时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+
+ /**
+ * 是否已删除（1.是 2.否）
+ */
+ private Integer isDel;
+
+ /**
+ * 操作记录
+ */
+ private List<ComOperationListVO> operationList;
+
+ /**
+ * 预约登记id
+ */
+ private Long reserveId;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveDangerAreaVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveDangerAreaVO.java
new file mode 100644
index 0000000..9f83589
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveDangerAreaVO.java
@@ -0,0 +1,76 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * (ComActReserveDangerArea)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 相关功能
+ *
+ * @author zzj
+ * @since 2022-04-07 14:22:20
+ */
+@Data
+@ApiModel("风险区列表实体")
+public class ComActReserveDangerAreaVO implements Serializable {
+
+ private static final long serialVersionUID = -25840459480337775L;
+
+ private Long id;
+
+ /**
+ * 类型 1中风险 2高风险
+ */
+ @ApiModelProperty(value = "类型 1中风险 2高风险")
+ private Integer type;
+
+ /**
+ * 省市区全称
+ */
+ @ApiModelProperty(value = "省市区全称")
+ private String areaName;
+
+ /**
+ * 市
+ */
+ @ApiModelProperty(value = "市")
+ private String county;
+
+ /**
+ * 省
+ */
+ @ApiModelProperty(value = "省")
+ private String province;
+
+ /**
+ * 区
+ */
+ @ApiModelProperty(value = "区")
+ private String city;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * 筛查时间
+ */
+ @ApiModelProperty(value = "筛查时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date screenTime;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveDetailAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveDetailAdminVO.java
new file mode 100644
index 0000000..87f1ae5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveDetailAdminVO.java
@@ -0,0 +1,67 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("预约登记返回参数")
+public class ComActReserveDetailAdminVO {
+
+ @ApiModelProperty("预约登记id")
+ private Long id;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("类型（1.预约 2.登记）")
+ private Integer type;
+
+ @ApiModelProperty("主题")
+ private String title;
+
+ @ApiModelProperty("浏览量")
+ private Integer viewNum;
+
+ @ApiModelProperty("限定参加人总数")
+ private Integer joinAllCount;
+
+ @ApiModelProperty("参加人数")
+ private Integer joinCount;
+
+ @ApiModelProperty("广告位置")
+ private String advertPosition;
+
+ @ApiModelProperty("状态(1.待发布 2.进行中 3.已停止)")
+ private Integer status;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("发布时间")
+ private Date publishTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("结束时间")
+ private Date endTime;
+
+ @ApiModelProperty("是否是首页顶部（1.是 2.否）")
+ private Integer adverPositionTop;
+
+ @ApiModelProperty("是否是首页应用（1.是 2.否）")
+ private Integer adverPositionApplication;
+
+ @ApiModelProperty("组件json数据")
+ private String jsonObject;
+
+ @ApiModelProperty("是否可重复提交（1.是 2.否）")
+ private Integer isRepeat;
+
+ @ApiModelProperty("图标类型")
+ private Integer imgType;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveDetailVO.java
new file mode 100644
index 0000000..6be6238
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveDetailVO.java
@@ -0,0 +1,134 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ComActReserveDetailVO {
+ private Long id;
+
+ /**
+ * 社区id
+ */
+ private Long communityId;
+
+ /**
+ * 类型（1.预约 2.登记）
+ */
+ private Integer type;
+
+ /**
+ * 主题
+ */
+ private String title;
+
+ /**
+ * 浏览量
+ */
+ private Integer viewNum;
+
+ /**
+ * 总参加人数
+ */
+ private Integer joinAllCount;
+
+ /**
+ * 参加人数
+ */
+ private Integer joinCount;
+
+ /**
+ * 图标类型（1.预设1 2.预设2 3.预设3 4.预设4 5.用户自定义图片）
+ */
+ private Integer imgType;
+
+ /**
+ * 图标url（当img_type为5时，此字段的值为图标url地址）
+ */
+ private String imgUrl;
+
+ /**
+ * 状态(1.待发布 2.进行中 3.已停止)
+ */
+ private Integer status;
+
+ /**
+ * 发布时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date publishTime;
+
+ /**
+ * 是否可重复提交（1.是 2.否）
+ */
+ private Integer isRepeat;
+
+ /**
+ * 备注
+ */
+ private String remark;
+
+ /**
+ * 组件json数据
+ */
+ private String jsonObject;
+
+ /**
+ * 是否是首页顶部（1.是 2.否）
+ */
+ private Integer adverPositionTop;
+
+ /**
+ * 是否是首页应用（1.是 2.否）
+ */
+ private Integer adverPositionApplication;
+
+ /**
+ * 创建时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ /**
+ * 创建人
+ */
+ private Long createBy;
+
+ /**
+ * 修改时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ /**
+ * 修改人
+ */
+ private Long updateBy;
+
+ /**
+ * 结束时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reserveTime;
+
+ private Integer recordStatus;
+
+ /**
+ * 是否已删除（1.是 2.否）
+ */
+ private Integer isDel;
+
+ private Integer isOk;
+ /**
+ * 是否重复（1.是 2.否）
+ */
+ public interface isOk{
+ int y=1;
+ int n=2;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveListAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveListAdminVO.java
new file mode 100644
index 0000000..64226d9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveListAdminVO.java
@@ -0,0 +1,64 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("预约登记返回参数")
+public class ComActReserveListAdminVO {
+
+ @ApiModelProperty("预约登记id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("类型（1.预约 2.登记）")
+ private Integer type;
+
+ @ApiModelProperty("主题")
+ private String title;
+
+ @ApiModelProperty("浏览量")
+ private Integer viewNum;
+
+ @ApiModelProperty("限定参加人总数")
+ private Integer joinAllCount;
+
+ @ApiModelProperty("参加人数")
+ private Integer joinCount;
+
+ @ApiModelProperty("广告位置")
+ private String advertPosition;
+
+ @ApiModelProperty("状态(1.待发布 2.进行中 3.已停止)")
+ private Integer status;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("发布时间")
+ private Date publishTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("结束时间")
+ private Date endTime;
+
+ @ApiModelProperty("是否是首页顶部（1.是 2.否）")
+ private Integer adverPositionTop;
+
+ @ApiModelProperty("是否是首页应用（1.是 2.否）")
+ private Integer adverPositionApplication;
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeDetailAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeDetailAdminVO.java
new file mode 100644
index 0000000..08969a2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeDetailAdminVO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ApiModel("预约明细列表返回参数")
+public class ComActReserveMakeDetailAdminVO {
+
+ @ApiModelProperty("用户昵称")
+ private String nickName;
+
+ @ApiModelProperty("预约人")
+ private String name;
+
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ @ApiModelProperty("预约时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reserveTime;
+
+ @ApiModelProperty("预约内容")
+ private String content;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("社区备注")
+ private String actRemark;
+
+ @ApiModelProperty("提交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("操作记录")
+ private List<ComActReserveMakeOperationAdminVO> operationList;
+
+ @ApiModelProperty("处理人/备注人")
+ private String handleName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeDetailedExcelAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeDetailedExcelAdminVO.java
new file mode 100644
index 0000000..7e7f05f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeDetailedExcelAdminVO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 预约明细导出返回对象
+ */
+@Data
+public class ComActReserveMakeDetailedExcelAdminVO {
+
+ @ExcelProperty(value = "用户昵称" ,index = 0)
+ private String nickName;
+ @ExcelProperty(value = "预约人" ,index = 1)
+ private String name;
+ @ExcelProperty(value = "联系电话" ,index = 2)
+ private String phone;
+ @ExcelProperty(value = "预约时间" ,index = 3)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reserveTime;
+ @ExcelProperty(value = "预约内容" ,index = 4)
+ private String content;
+ @ExcelProperty(value = "备注人" ,index = 5)
+ private String handleName;
+ @ExcelProperty(value = "社区备注" ,index = 6)
+ private String actRemark;
+ @ExcelProperty(value = "提交时间" ,index = 7)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeHandleExcelAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeHandleExcelAdminVO.java
new file mode 100644
index 0000000..0b751ea
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeHandleExcelAdminVO.java
@@ -0,0 +1,49 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("预约明细列表返回参数")
+public class ComActReserveMakeHandleExcelAdminVO {
+
+ @ExcelProperty(value = "用户昵称" ,index = 0)
+ private String nickName;
+
+ @ExcelProperty(value = "预约登记主题" ,index = 1)
+ private String title;
+
+ @ExcelProperty(value = "预约人" ,index = 2)
+ private String name;
+
+ @ExcelProperty(value = "联系电话" ,index = 3)
+ private String phone;
+
+ @ExcelProperty(value = "预约时间" ,index = 4)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reserveTime;
+
+ @ExcelProperty(value = "预约内容" ,index = 5)
+ private String content;
+
+ @ExcelProperty(value = "备注人" ,index = 6)
+ private String handleName;
+
+ @ExcelProperty(value = "社区备注" ,index = 7)
+ private String actRemark;
+
+ @ExcelProperty(value = "提交时间" ,index = 8)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ExcelProperty(value = "状态" ,index = 9)
+ private String status;
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeHandleListAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeHandleListAdminVO.java
new file mode 100644
index 0000000..47923fe
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeHandleListAdminVO.java
@@ -0,0 +1,52 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("预约明细列表返回参数")
+public class ComActReserveMakeHandleListAdminVO {
+
+ @ApiModelProperty("预约记录id")
+ private Long id;
+
+ @ApiModelProperty("用户昵称")
+ private String nickName;
+
+ @ApiModelProperty("预约人")
+ private String name;
+
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ @ApiModelProperty("预约时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reserveTime;
+
+ @ApiModelProperty("预约内容")
+ private String content;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("社区备注")
+ private String actRemark;
+
+ @ApiModelProperty("提交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("状态（1.待处理 2.预约成功 3.预约失败 4.已取消）")
+ private Integer status;
+
+ @ApiModelProperty("预约登记主题")
+ private String title;
+
+ @ApiModelProperty("处理人/备注人")
+ private String handleName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeLeftStatisticsAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeLeftStatisticsAdminVO.java
new file mode 100644
index 0000000..0c32ba2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeLeftStatisticsAdminVO.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("预约统计左边返回参数")
+public class ComActReserveMakeLeftStatisticsAdminVO {
+
+ @ApiModelProperty("预约日期（格式：yyyy-MM-dd）")
+ private String reserveTime;
+
+ @ApiModelProperty("预约数量")
+ private Integer count;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeListAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeListAdminVO.java
new file mode 100644
index 0000000..623bfab
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeListAdminVO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("预约明细列表返回参数")
+public class ComActReserveMakeListAdminVO {
+
+ @ApiModelProperty("预约记录id")
+ private Long id;
+
+ @ApiModelProperty("用户昵称")
+ private String nickName;
+
+ @ApiModelProperty("预约人")
+ private String name;
+
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ @ApiModelProperty("预约时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reserveTime;
+
+ @ApiModelProperty("预约内容")
+ private String content;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("社区备注")
+ private String actRemark;
+
+ @ApiModelProperty("提交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("处理人/备注人")
+ private String handleName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeOperationAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeOperationAdminVO.java
new file mode 100644
index 0000000..216906c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeOperationAdminVO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ApiModel("预约明细操作记录返回参数")
+public class ComActReserveMakeOperationAdminVO {
+
+ @ApiModelProperty("预约登记id")
+ private Long reserveId;
+
+ @ApiModelProperty("预约登记记录id")
+ private Long reserveRecordId;
+
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ @ApiModelProperty("类型（1.本人操作 2.社区操作）")
+ private Integer type;
+
+ @ApiModelProperty("预约人手机号")
+ private String phone;
+
+ @ApiModelProperty("操作内容")
+ private String reserveContent;
+
+ @ApiModelProperty("操作时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reserveTime;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("状态（1.提交 2.预约成功 3.预约失败 4.取消）")
+ private Integer status;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("操作人")
+ private String createByName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeRightExcelAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeRightExcelAdminVO.java
new file mode 100644
index 0000000..a290eda
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeRightExcelAdminVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 预约统计汇总导出返回对象
+ */
+@Data
+public class ComActReserveMakeRightExcelAdminVO {
+
+ @ExcelProperty(value = "日期" ,index = 0)
+ private String reserveTime;
+ @ExcelProperty(value = "预约主题" ,index = 1)
+ private String title;
+ @ExcelProperty(value = "所占百分比" ,index = 2)
+ private BigDecimal tag;
+ @ExcelProperty(value = "预约量" ,index = 3)
+ private Integer count;
+ @ExcelProperty(value = "合计" ,index = 4)
+ private Integer allCount;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeRightStatisticsAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeRightStatisticsAdminVO.java
new file mode 100644
index 0000000..58fc633
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeRightStatisticsAdminVO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("预约统计右边返回参数")
+public class ComActReserveMakeRightStatisticsAdminVO {
+
+ @ApiModelProperty("日期（格式：yyyy-MM-dd）")
+ private String reserveTime;
+
+ @ApiModelProperty("预约主题")
+ private String title;
+
+ @ApiModelProperty("所占百分比")
+ private BigDecimal tag;
+
+ @ApiModelProperty("预约数量")
+ private Integer count;
+
+ @ApiModelProperty("预约量合计")
+ private Integer allCount;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeStatisticsAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeStatisticsAdminVO.java
new file mode 100644
index 0000000..5e28f1a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveMakeStatisticsAdminVO.java
@@ -0,0 +1,18 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("预约登记返回参数")
+public class ComActReserveMakeStatisticsAdminVO {
+
+ @ApiModelProperty("预约日期数量统计数据")
+ private List<ComActReserveMakeLeftStatisticsAdminVO> leftStatisticsList;
+
+ @ApiModelProperty("预约统计汇总-右边统计数据")
+ private List<ComActReserveMakeRightStatisticsAdminVO> rightStatisticsList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRecordListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRecordListVO.java
new file mode 100644
index 0000000..0372d9d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRecordListVO.java
@@ -0,0 +1,98 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ComActReserveRecordListVO {
+ private Long id;
+
+ /**
+ * 用户id
+ */
+ private Long userId;
+
+ /**
+ * 预约登记id
+ */
+ private Long reserveId;
+
+ /**
+ * 社区id
+ */
+ private Long communityId;
+
+ /**
+ * 类型（1.预约 2.登记）
+ */
+ private Integer type;
+
+ /**
+ * 提交人名称
+ */
+ private String name;
+
+ /**
+ * 提交人手机号
+ */
+ private String phone;
+
+ /**
+ * 状态（1.待处理 2.预约成功 3.预约失败 4.已取消）
+ */
+ private Integer status;
+
+ /**
+ * 内容
+ */
+ private String content;
+
+ /**
+ * 备注
+ */
+ private String remark;
+
+ /**
+ * 社区备注
+ */
+ private String actRemark;
+
+ /**
+ * 预约时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reserveTime;
+
+ /**
+ * 用户填报json数据
+ */
+ private String jsonObject;
+
+ /**
+ * 创建时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ /**
+ * 创建人
+ */
+ private Long createBy;
+
+ /**
+ * 修改时间
+ */
+ private Date updateAt;
+
+ /**
+ * 修改人
+ */
+ private Long updateBy;
+
+ /**
+ * 标题
+ */
+ private String title;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRegisterDetailedAnswerVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRegisterDetailedAnswerVO.java
new file mode 100644
index 0000000..a343327
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRegisterDetailedAnswerVO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ApiModel("登记明细用户填写答案返回参数")
+public class ComActReserveRegisterDetailedAnswerVO {
+
+ @ApiModelProperty("题目id")
+ private Long reserveSubId;
+
+ @ApiModelProperty("题目内容")
+ private String reserveSubContent;
+
+ @ApiModelProperty("回答内容")
+ private String answerContent;
+
+ @ApiModelProperty("类型 0 单选 1 多选 2 输入框 3 手机号 4 身份证 5 文字描述 6 日期选择 7 时间选择 8 可换行的输入框 9姓名输入框")
+ private Integer type;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRegisterDetailedVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRegisterDetailedVO.java
new file mode 100644
index 0000000..ef5601e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRegisterDetailedVO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ApiModel("登记明细返回参数")
+public class ComActReserveRegisterDetailedVO {
+
+ @ApiModelProperty("流水号")
+ private Long id;
+
+ @ApiModelProperty("用户昵称")
+ private String nickName;
+
+ @ApiModelProperty("身份")
+ private String identity;
+
+ @ApiModelProperty("提交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("是否是党员（0.否 1.是）")
+ private Integer isPartymember;
+
+ @ApiModelProperty("是否是志愿者（0.否 1.是）")
+ private Integer isVolunteer;
+
+ @ApiModelProperty("答案列表")
+ private List<ComActReserveRegisterDetailedAnswerVO> answerList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRegisterExcelAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRegisterExcelAdminVO.java
new file mode 100644
index 0000000..e0e01b8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRegisterExcelAdminVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 登记统计汇总导出返回对象
+ */
+@Data
+public class ComActReserveRegisterExcelAdminVO {
+
+ @ExcelProperty(value = "登记主题" ,index = 0)
+ private String title;
+ @ExcelProperty(value = "所占百分比" ,index = 1)
+ private BigDecimal tag;
+ @ExcelProperty(value = "登记量" ,index = 2)
+ private Integer count;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRegisterStatisticsAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRegisterStatisticsAdminVO.java
new file mode 100644
index 0000000..aea132c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveRegisterStatisticsAdminVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@ApiModel("登记统计汇总返回参数")
+public class ComActReserveRegisterStatisticsAdminVO {
+
+ @ApiModelProperty("登记主题")
+ private String title;
+
+ @ApiModelProperty("所占百分比")
+ private BigDecimal tag;
+
+ @ApiModelProperty("登记量")
+ private Integer count;
+
+ @ApiModelProperty("登记总量")
+ private Integer allCount;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveSubListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveSubListVO.java
new file mode 100644
index 0000000..eadc4c3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveSubListVO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("登记题目列表返回参数返回参数")
+public class ComActReserveSubListVO {
+
+ @ApiModelProperty("题目id")
+ private String id;
+
+ @ApiModelProperty("题目内容")
+ private String content;
+
+ @ApiModelProperty("类型 0 单选 1 多选 2 输入框 3 手机号 4 身份证 5 文字描述 6 日期选择 7 时间选择 8 可换行的输入框 9姓名输入框")
+ private Integer type;
+
+ public ComActReserveSubListVO() {
+ }
+
+ public ComActReserveSubListVO(String id, String content){
+ this.id = id;
+ this.content = content;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComOperationDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComOperationDetailVO.java
new file mode 100644
index 0000000..9e81c39
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComOperationDetailVO.java
@@ -0,0 +1,15 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel
+public class ComOperationDetailVO {
+ private List<ComOperationListVO> list;
+ @ApiModelProperty("1可以继续 2不能继续")
+ private Integer isContinue =2;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComOperationListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComOperationListVO.java
new file mode 100644
index 0000000..dfd5177
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComOperationListVO.java
@@ -0,0 +1,68 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ComOperationListVO {
+ private Long id;
+
+ /**
+ * 预约登记id
+ */
+ private Long reserveId;
+
+ /**
+ * 预约登记记录id
+ */
+ private Long reserveRecordId;
+
+ /**
+ * 用户id
+ */
+ private Long userId;
+
+ /**
+ * 类型（1.本人操作 2.社区操作）
+ */
+ private Integer type;
+
+ /**
+ * 操作人手机号
+ */
+ private String phone;
+
+ /**
+ * 操作时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reserveTime;
+
+ /**
+ * 操作内容
+ */
+ private String reserveContent;
+
+ /**
+ * 备注
+ */
+ private String remark;
+
+ /**
+ * 状态（1.提交 2.预约成功 3.预约失败 4.取消）
+ */
+ private Integer status;
+
+ /**
+ * 创建时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ /**
+ * 创建人
+ */
+ private Long createBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/DangerAreaStatics.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/DangerAreaStatics.java
new file mode 100644
index 0000000..fa52059
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/DangerAreaStatics.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("风险区数据统计")
+public class DangerAreaStatics {
+ @ApiModelProperty("中风险区")
+ private Integer middleCount;
+ @ApiModelProperty("高风险区")
+ private Integer highCount;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/FiveCount.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/FiveCount.java
new file mode 100644
index 0000000..3a829ad
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/FiveCount.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+public class FiveCount {
+ private Integer allCount;
+ private Integer dangerCount;
+ private Integer redMark;
+ private Integer yellowMark;
+ private Integer greenMark;
+ private Integer travelCount;
+ private Integer outsideCount;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/HomeQuarantineRegisterExportVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/HomeQuarantineRegisterExportVO.java
new file mode 100644
index 0000000..23d6172
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/HomeQuarantineRegisterExportVO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.ComActQuestnaireSubVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: HomeQuarantineRegisterExportVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 居家隔离统计导出信息
+ * @author: hans
+ * @date: 2021/11/18 14:54
+ */
+@Data
+@ApiModel("居家隔离统计导出信息")
+public class HomeQuarantineRegisterExportVO {
+
+ @ApiModelProperty("题目列表")
+ private List<ComActQuestnaireSubVO> subs;
+
+ @ApiModelProperty("数据集")
+ private List<List<Object>> dataList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/HomeQuarantineRegisterStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/HomeQuarantineRegisterStatisticsVO.java
new file mode 100644
index 0000000..5fc9da8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/HomeQuarantineRegisterStatisticsVO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: HomeQuarantineRegisterStatisticsVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 居家隔离统计信息
+ * @author: hans
+ * @date: 2021/11/17 15:25
+ */
+@Data
+@ApiModel("居家隔离统计信息")
+public class HomeQuarantineRegisterStatisticsVO {
+
+ @ApiModelProperty("记录id")
+ private Long id;
+
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ @ApiModelProperty("开始登记时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("用户昵称")
+ private String nickName;
+
+ @ApiModelProperty("题目")
+ private String reserveSubContent;
+
+ @ApiModelProperty("答案")
+ private String answerContent;
+
+ @ApiModelProperty("题目id")
+ private Long reserveSubId;
+
+ @ApiModelProperty("选项类型（0 单选 1 多选 2 输入框 3 手机号 4 身份证 5 文字描述 6 日期选择 7 时间选择 8 可换行的输入框 9姓名输入框 10图片选择 11文件上传 12签名）")
+ private Integer optionType;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ReservePdfExportVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ReservePdfExportVO.java
new file mode 100644
index 0000000..ad1b99f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ReservePdfExportVO.java
@@ -0,0 +1,13 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import lombok.Data;
+
+@Data
+public class ReservePdfExportVO {
+ private String name;
+ private String time;
+ private String phone;
+ private String sign;
+ private String communityPhone;
+ private String address;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilConvenienceStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilConvenienceStatisticsVO.java
new file mode 100644
index 0000000..436bf52
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilConvenienceStatisticsVO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.vos.community.screen.civil;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("民生统计便民服务返回参数")
+public class CivilConvenienceStatisticsVO {
+
+ @ApiModelProperty("办事指南")
+ private Integer guideNum;
+
+ @ApiModelProperty("疫情防控")
+ private Integer situationNum;
+
+ @ApiModelProperty("房屋租赁")
+ private Integer leaseNum;
+
+ @ApiModelProperty("报事报修")
+ private Integer repairNum;
+
+ @ApiModelProperty("养老认证")
+ private Integer pensionNum;
+
+ @ApiModelProperty("高龄认证")
+ private Integer eldersNum;
+
+ @ApiModelProperty("低保认证")
+ private Integer subsistenceNum;
+
+ @ApiModelProperty("高龄补贴")
+ private Integer allowanceNum;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilGovernmentStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilGovernmentStatisticsVO.java
new file mode 100644
index 0000000..be38481
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilGovernmentStatisticsVO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.vos.community.screen.civil;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("民生统计社区治理返回参数")
+public class CivilGovernmentStatisticsVO {
+
+ @ApiModelProperty("通知公告")
+ private Integer noticeNum;
+
+ @ApiModelProperty("议事投票")
+ private Integer discussNum;
+
+ @ApiModelProperty("随手拍")
+ private Integer easyNum;
+
+ @ApiModelProperty("邻里圈")
+ private Integer neighborNum;
+
+ @ApiModelProperty("居民活动")
+ private Integer activityNum;
+
+ @ApiModelProperty("社区动态")
+ private Integer dynNum;
+
+ @ApiModelProperty("爱心义仓")
+ private Integer loveNum;
+
+ @ApiModelProperty("居民留言板")
+ private Integer messageNum;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilGridStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilGridStatisticsVO.java
new file mode 100644
index 0000000..31cdf0a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilGridStatisticsVO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.vos.community.screen.civil;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("民生统计社区治理返回参数")
+public class CivilGridStatisticsVO {
+
+ @ApiModelProperty("今日突发事件")
+ private Integer tfTodayNum;
+
+ @ApiModelProperty("今日治安防控")
+ private Integer zaTodayNum;
+
+ @ApiModelProperty("今日民生服务")
+ private Integer msTodayNum;
+
+ @ApiModelProperty("今日矛盾劝解")
+ private Integer mdTodayNum;
+
+ @ApiModelProperty("今日特殊人群服务")
+ private Integer tsTodayNum;
+
+ @ApiModelProperty("累计事件")
+ private Integer eventNum;
+
+ @ApiModelProperty("电子巡查统计")
+ private Integer xcNum;
+
+ @ApiModelProperty("安全巡查")
+ private Integer securityNum;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilPartyStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilPartyStatisticsVO.java
new file mode 100644
index 0000000..2aad49a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilPartyStatisticsVO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.vos.community.screen.civil;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("民生统计党建返回参数")
+public class CivilPartyStatisticsVO {
+
+ @ApiModelProperty("社区两委")
+ private Integer committeeNum;
+
+ @ApiModelProperty("党建动态")
+ private Integer dynNum;
+
+ @ApiModelProperty("党建活动")
+ private Integer activityNum;
+
+ @ApiModelProperty("微心愿")
+ private Integer wishNum;
+
+ @ApiModelProperty("双报道党员")
+ private Integer partyNum;
+
+ @ApiModelProperty("党组织")
+ private Integer organizationNum;
+
+ @ApiModelProperty("志愿者团队")
+ private Integer volunteerNum;
+
+ @ApiModelProperty("问卷调查")
+ private Integer questionnaireNum;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilPopulationStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilPopulationStatisticsVO.java
new file mode 100644
index 0000000..171bab7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilPopulationStatisticsVO.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.vos.community.screen.civil;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("民生统计返回参数")
+public class CivilPopulationStatisticsVO {
+
+ @ApiModelProperty("本月特殊人群数量")
+ private Integer specialTotal;
+
+ @ApiModelProperty("上月特殊人群数量")
+ private Integer toMonthSpecialTotal;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilStatisticsVO.java
new file mode 100644
index 0000000..e07bbb3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilStatisticsVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.community.screen.civil;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.screen.event.EventGridStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.index.IndexSpecialStatisticsVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("民生统计返回参数")
+public class CivilStatisticsVO {
+
+ @ApiModelProperty("大屏网格数据")
+ private List<EventGridStatisticsVO> gridStatisticsList;
+
+ @ApiModelProperty("特殊人群统计模块数据")
+ private List<IndexSpecialStatisticsVO> specialStatisticsList;
+
+ @ApiModelProperty("小区列表数据")
+ private List<CivilVillageStatisticsVO> villageStatisticsList;
+
+ @ApiModelProperty("特殊人群总数")
+ private Integer specialNum;
+
+ @ApiModelProperty("环比上月增长率")
+ private BigDecimal rate;
+
+ @ApiModelProperty("党建引领数据")
+ private CivilPartyStatisticsVO civilPartyStatisticsVO;
+
+ @ApiModelProperty("社区治理数据")
+ private CivilGovernmentStatisticsVO civilGovernmentStatisticsVO;
+
+ @ApiModelProperty("网格管理数据")
+ private CivilGridStatisticsVO civilGridStatisticsVO;
+
+ @ApiModelProperty("便民服务数据")
+ private CivilConvenienceStatisticsVO civilConvenienceStatisticsVO;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilVillageStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilVillageStatisticsVO.java
new file mode 100644
index 0000000..8c35d36
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilVillageStatisticsVO.java
@@ -0,0 +1,75 @@
+package com.panzhihua.common.model.vos.community.screen.civil;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import com.panzhihua.common.model.vos.community.screen.index.IndexSpecialStatisticsVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("民生统计小区列表返回参数")
+public class CivilVillageStatisticsVO {
+
+ @ApiModelProperty("小区名字")
+ private String name;
+
+ @ApiModelProperty("小区居住人数")
+ private Integer userSum;
+
+ @ApiModelProperty("经度")
+ private String lng;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty("小区图片")
+ private String villageImages;
+
+ @ApiModelProperty("小区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long villageId;
+
+ @ApiModelProperty("总户数")
+ private Integer houseNum;
+
+ @ApiModelProperty("总人数")
+ private Integer peopleNum;
+
+ @ApiModelProperty("户籍人数")
+ private Integer registerNum;
+
+ @ApiModelProperty("流动人数")
+ private Integer flowNum;
+
+ @ApiModelProperty("楼栋长数量")
+ private Integer buildingPeopleNum;
+
+ @ApiModelProperty("居民小组长数量")
+ private Integer smallHeadmanNum;
+
+ @ApiModelProperty("党小组长数量")
+ private Integer partyPeopleNum;
+
+ @ApiModelProperty("妇女小组长数量")
+ private Integer womanPeopleNum;
+
+ @ApiModelProperty("卫生员数量")
+ private Integer hygienePeopleNum;
+
+ @ApiModelProperty("安全员数量")
+ private Integer securityPeopleNum;
+
+ @ApiModelProperty("监督员数量")
+ private Integer supervisePeopleNum;
+
+ @ApiModelProperty("其他人员")
+ private Integer otherPeopleNum;
+
+ @ApiModelProperty("特殊人群统计模块数据")
+ private List<IndexSpecialStatisticsVO> specialStatisticsList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventComprehensiveGovernanceStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventComprehensiveGovernanceStatisticsVO.java
new file mode 100644
index 0000000..5bab7cb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventComprehensiveGovernanceStatisticsVO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.vos.community.screen.event;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: EventComprehensiveGovernanceStatisticsVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 西区大数据分析平台-综合治理信息
+ * @author: hans
+ * @date: 2021/12/14 9:16
+ */
+@Data
+@ApiModel("西区大数据分析平台-综合治理信息")
+public class EventComprehensiveGovernanceStatisticsVO {
+
+ @ApiModelProperty("综合治理总数")
+ private Integer governanceTotal = 0;
+
+ @ApiModelProperty("突发事件报告总数")
+ private Integer eventTFTotal = 0;
+
+ @ApiModelProperty("治安防控总数")
+ private Integer eventZATotal = 0;
+
+ @ApiModelProperty("矛盾劝解总数")
+ private Integer eventMDTotal = 0;
+
+ @ApiModelProperty("特殊人群服务总数")
+ private Integer eventTSTotal = 0;
+
+ @ApiModelProperty("民生服务总数")
+ private Integer eventMSTotal = 0;
+
+ @ApiModelProperty("居民随手拍总数")
+ private Integer eventSSPTotal = 0;
+
+ public void generateGovernanceTotal() {
+ this.governanceTotal = this.eventTFTotal + this.eventZATotal + this.eventMDTotal +
+ this.eventTSTotal + this.eventMSTotal + this.eventSSPTotal;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridIncidentStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridIncidentStatisticsVO.java
new file mode 100644
index 0000000..0205f4e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridIncidentStatisticsVO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.community.screen.event;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("大屏网格下事件统计返回参数")
+public class EventGridIncidentStatisticsVO {
+
+ @ApiModelProperty("事件id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long eventId;
+
+// 旧版参照@ApiModelProperty("事件状态(1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群上报、7随手拍处理)")
+ /**
+ * type不代表网格类型
+ */
+ @ApiModelProperty("事件状态(1治安防控、2民生服务、3矛盾劝解、4不稳定因素、5突发事件报告、6特殊人群服务、9防灾减灾、10其他)")
+ private Integer type;
+
+ @ApiModelProperty("事件类型(1、网格事件 2、随手拍事件)")
+ private Integer eventType;
+
+ @ApiModelProperty("事件发生经纬度")
+ private String latLng;
+
+ @ApiModelProperty("事件内容")
+ private String content;
+
+ @ApiModelProperty("事件封面")
+ private String cover;
+
+ @ApiModelProperty("处理状态（1.已处理 2.待处理）")
+ private Integer status;
+
+ @ApiModelProperty("事件创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridMemberVO.java
new file mode 100644
index 0000000..0d6c6e2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridMemberVO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.vos.community.screen.event;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("网格员列表返回参数")
+public class EventGridMemberVO {
+
+ @ApiModelProperty("网格员id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+
+ @ApiModelProperty("网格员名称")
+ private String nickName;
+
+ @ApiModelProperty("网格员联系方式")
+ private String phone;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridStatisticsVO.java
new file mode 100644
index 0000000..bfc06c1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridStatisticsVO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.vos.community.screen.event;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏事件网格统计返回参数")
+public class EventGridStatisticsVO {
+
+ @ApiModelProperty("网格id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("网格名称")
+ private String gridName;
+
+ @ApiModelProperty("网格围栏数据")
+ private String data;
+
+ @ApiModelProperty("网格线条颜色")
+ private String lineColor;
+
+ @ApiModelProperty("网格线条宽度")
+ private String lineBroadband;
+
+ @ApiModelProperty("网格填充颜色")
+ private String fillColor;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventLeftDownStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventLeftDownStatisticsVO.java
new file mode 100644
index 0000000..8983242
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventLeftDownStatisticsVO.java
@@ -0,0 +1,53 @@
+package com.panzhihua.common.model.vos.community.screen.event;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏事件左下统计返回参数")
+public class EventLeftDownStatisticsVO {
+
+ @ApiModelProperty("治安隐患事件总数")
+ private Integer eventZATotal = 0;
+
+ @ApiModelProperty("治安隐患已完成事件总数")
+ private Integer yesEventZATotal = 0;
+
+ @ApiModelProperty("突发事件总数")
+ private Integer eventTFTotal = 0;
+
+ @ApiModelProperty("突发事件已完成总数")
+ private Integer yesEventTFTotal = 0;
+
+ @ApiModelProperty("特殊人群信息上报总数")
+ private Integer eventTSTotal = 0;
+
+ @ApiModelProperty("特殊人群信息上报已完成事件总数")
+ private Integer yesEventTSTotal = 0;
+
+ @ApiModelProperty("矛盾纠纷事件总数")
+ private Integer eventMDTotal = 0;
+
+ @ApiModelProperty("矛盾纠纷已完成事件总数")
+ private Integer yesEventMDTotal = 0;
+
+ @ApiModelProperty("不稳定因素事件总数")
+ private Integer eventBWDTotal = 0;
+
+ @ApiModelProperty("不稳定因素已完成事件总数")
+ private Integer yesEventBWDTotal = 0;
+
+ @ApiModelProperty("公共服务事件总数")
+ private Integer eventGGTotal = 0;
+
+ @ApiModelProperty("公共服务已完成事件总数")
+ private Integer yesEventGGTotal = 0;
+
+ @ApiModelProperty("随手拍总数")
+ private Integer eventSSPTotal = 0;
+
+ @ApiModelProperty("随手拍已完成总数")
+ private Integer yesEventSSPTotal = 0;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventLeftStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventLeftStatisticsVO.java
new file mode 100644
index 0000000..d8606b5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventLeftStatisticsVO.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.vos.community.screen.event;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏事件左边统计返回参数")
+public class EventLeftStatisticsVO {
+
+ @ApiModelProperty("大屏事件左上统计返回参数")
+ private EventLeftTopStatisticsVO leftTopStatisticsVO;
+
+ @ApiModelProperty("大屏事件左下统计返回参数")
+ private EventLeftDownStatisticsVO leftDownStatisticsVO;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventLeftTopStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventLeftTopStatisticsVO.java
new file mode 100644
index 0000000..9f9c398
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventLeftTopStatisticsVO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.vos.community.screen.event;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏事件左上统计返回参数")
+public class EventLeftTopStatisticsVO {
+
+ @ApiModelProperty("网格数")
+ private Integer gridTotal;
+
+ @ApiModelProperty("网格员数")
+ private Integer gridMemberTotal;
+
+ @ApiModelProperty("事件数")
+ private Integer eventTotal;
+
+ @ApiModelProperty("未解决事件数")
+ private Integer noSolveEventTotal;
+
+ @ApiModelProperty("累计解决事件数")
+ private Integer solveEventTotal;
+
+ @ApiModelProperty("频发月份")
+ private List<Integer> oftenMonth;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventListVO.java
new file mode 100644
index 0000000..e628cab
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventListVO.java
@@ -0,0 +1,84 @@
+package com.panzhihua.common.model.vos.community.screen.event;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.vos.grid.EventResourceVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("事件列表返回参数")
+public class EventListVO {
+
+ @ApiModelProperty("事件id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("发布人昵称")
+ private String userName;
+
+ @ApiModelProperty("发布人id")
+ private Long gridMemberId;
+
+ @ApiModelProperty("发布人头像")
+ private String imageUrl;
+
+ @ApiModelProperty("事件上报时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("事件描述")
+ private String eventDes;
+
+ @ApiModelProperty("危险级别:0 (无) 1（特别重大）、2（重大）、3（较大）、4（一般）")
+ private String dangerLevel;
+
+ @ApiModelProperty("是否紧急")
+ private Boolean urgent;
+
+ @ApiModelProperty("是否重大")
+ private Boolean major;
+
+ @ApiModelProperty("事件发生地点")
+ private String happenAddress;
+
+ @ApiModelProperty("事件发生地点备注")
+ private String happentAddress;
+
+ @ApiModelProperty("事件发生经纬度（长在前短在后）")
+ private String happentLatLng;
+
+ @ApiModelProperty("事件分类1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报")
+ private Integer eventType;
+
+ @ApiModelProperty("事件分类（1、办件事件2、宣传事件3、阅读事件）")
+ private Integer eventCategory;
+
+ @ApiModelProperty("事件处理状态(1待处理、2待验证、3已上报、4已解决、5草稿箱、6已撤销、7已失效 8 已发布)")
+ private Integer eventDealStatus;
+
+ @ApiModelProperty("事件类型")
+ private String eventClazz;
+
+ @ApiModelProperty("发生区域")
+ private String gridName;
+
+ @ApiModelProperty("处理意见")
+ private String processDesc;
+
+ @ApiModelProperty(value = "音频")
+ private List<EventResourceVO> audios;
+
+ @ApiModelProperty(value = "视频")
+ private List<EventResourceVO> videos;
+
+ @ApiModelProperty(value = "图片")
+ private List<EventResourceVO> pics;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventNewStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventNewStatisticsVO.java
new file mode 100644
index 0000000..7f832fe
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventNewStatisticsVO.java
@@ -0,0 +1,84 @@
+package com.panzhihua.common.model.vos.community.screen.event;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.vos.grid.EventResourceVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏事件播报统计返回参数")
+public class EventNewStatisticsVO {
+
+ @ApiModelProperty("事件id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("发布人昵称")
+ private String userName;
+
+ @ApiModelProperty("发布人头像")
+ private String imageUrl;
+
+ @ApiModelProperty("事件上报时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("事件描述")
+ private String eventDes;
+
+ @ApiModelProperty("危险级别:0 (无) 1（特别重大）、2（重大）、3（较大）、4（一般）")
+ private String dangerLevel;
+
+ @ApiModelProperty("是否紧急")
+ private Boolean urgent;
+
+ @ApiModelProperty("是否重大")
+ private Boolean major;
+
+ @ApiModelProperty("事件发生地点")
+ private String happenAddress;
+
+ @ApiModelProperty("事件发生经纬度（长在前短在后）")
+ private String happentLatLng;
+
+ @ApiModelProperty("事件分类1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报")
+ private Integer eventType;
+
+ @ApiModelProperty("事件分类（1、办事事件2、宣传事件3、阅读事件）")
+ private Integer eventCategory;
+
+ @ApiModelProperty("事件处理状态(1待处理、2待验证、3已上报、4已解决、5草稿箱、6已撤销、7已失效 8 已发布)")
+ private Integer eventDealStatus;
+
+ @ApiModelProperty("随手拍图片集合")
+ private String photoPathList;
+
+ @ApiModelProperty("事件类型")
+ private String eventClazz;
+
+ @ApiModelProperty("发生区域")
+ private String gridName;
+
+ @ApiModelProperty("处理意见")
+ private String processDesc;
+
+ @ApiModelProperty(value = "音频")
+ private List<EventResourceVO> audios;
+
+ @ApiModelProperty(value = "视频")
+ private List<EventResourceVO> videos;
+
+ @ApiModelProperty(value = "图片")
+ private List<EventResourceVO> pics;
+
+ @ApiModelProperty(value = "事件处理流转记录")
+ private List<EventTransferRecordVO> transferRecordList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationBasicsStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationBasicsStatisticsVO.java
new file mode 100644
index 0000000..2f1e924
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationBasicsStatisticsVO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.vos.community.screen.event;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: EventComprehensiveGovernanceStatisticsVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 西区大数据分析平台-综合治理信息
+ * @author: lyq
+ * @date: 2021/12/14 10:53
+ */
+@Data
+@ApiModel("西区大数据分析平台-一标三实基础信息")
+public class EventPopulationBasicsStatisticsVO {
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
+
+ @ApiModelProperty("人口数量")
+ private Integer populationNum = 0;
+
+ @ApiModelProperty("小区数量")
+ private Integer villageNum = 0;
+
+ @ApiModelProperty("房屋数量")
+ private Integer houseNum = 0;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationSpecialStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationSpecialStatisticsVO.java
new file mode 100644
index 0000000..7e5101f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationSpecialStatisticsVO.java
@@ -0,0 +1,63 @@
+package com.panzhihua.common.model.vos.community.screen.event;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: EventComprehensiveGovernanceStatisticsVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 西区大数据分析平台-综合治理信息
+ * @author: lyq
+ * @date: 2021/12/14 10:53
+ */
+@Data
+@ApiModel("西区大数据分析平台-一标三实特殊人群信息")
+public class EventPopulationSpecialStatisticsVO {
+
+ @ApiModelProperty("残疾人")
+ private Integer cjTotal = 0;
+
+ @ApiModelProperty("低保户")
+ private Integer dbTotal = 0;
+
+ @ApiModelProperty("高龄老人 》=80")
+ private Integer glTotal = 0;
+
+ @ApiModelProperty("特殊情况")
+ private Integer tsTotal = 0;
+
+ @ApiModelProperty("特扶家庭")
+ private Integer tfTotal = 0;
+
+ @ApiModelProperty("退役军人")
+ private Integer tyTotal = 0;
+
+ @ApiModelProperty("留守儿童")
+ private Integer lsTotal = 0;
+
+ @ApiModelProperty(value = "吸毒人员",hidden = true)
+ private Integer xdTotal = 0;
+
+ @ApiModelProperty(value = "社区矫正人员",hidden = true)
+ private Integer jzTotal = 0;
+
+ @ApiModelProperty(value = "邪教人员",hidden = true)
+ private Integer xjTotal = 0;
+
+ @ApiModelProperty(value = "刑释人员",hidden = true)
+ private Integer xsTotal = 0;
+
+ @ApiModelProperty(value = "上访人员",hidden = true)
+ private Integer sfTotal = 0;
+
+ @ApiModelProperty(value = "重精人员",hidden = true)
+ private Integer zjTotal = 0;
+
+ @ApiModelProperty("老年人（》=60）")
+ private Integer lnTotal = 0;
+
+ @ApiModelProperty("其他")
+ private Integer otherTotal = 0;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationStatisticsVO.java
new file mode 100644
index 0000000..5d0bebe
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationStatisticsVO.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.vos.community.screen.event;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @title: EventComprehensiveGovernanceStatisticsVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 西区大数据分析平台-综合治理信息
+ * @author: lyq
+ * @date: 2021/12/14 10:53
+ */
+@Data
+@ApiModel("西区大数据分析平台-一标三实信息")
+public class EventPopulationStatisticsVO {
+
+ @ApiModelProperty("人口数据")
+ private List<EventPopulationBasicsStatisticsVO> basicsList;
+
+ @ApiModelProperty("特殊人口数据")
+ private EventPopulationSpecialStatisticsVO specialStatisticsVo;
+
+ @ApiModelProperty("人口数量")
+ private Integer populationNum = 0;
+
+ @ApiModelProperty("小区数量")
+ private Integer villageNum = 0;
+
+ @ApiModelProperty("房屋数量")
+ private Integer houseNum = 0;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationStreetVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationStreetVO.java
new file mode 100644
index 0000000..80b6c01
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventPopulationStreetVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community.screen.event;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @title: EventComprehensiveGovernanceStatisticsVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 西区大数据分析平台-综合治理信息
+ * @author: lyq
+ * @date: 2021/12/14 10:53
+ */
+@Data
+@ApiModel("西区大数据分析平台-街道列表信息")
+public class EventPopulationStreetVO {
+
+ @ApiModelProperty("街道id")
+ private Long streetId;
+
+ @ApiModelProperty("街道名称")
+ private String name;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventStatisticsVO.java
new file mode 100644
index 0000000..5ece1dd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventStatisticsVO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.vos.community.screen.event;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.ComMngPopulationTotalVO;
+import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏事件统计返回参数")
+public class EventStatisticsVO {
+
+ @ApiModelProperty("大屏网格数据")
+ private List<EventGridStatisticsVO> gridStatisticsList;
+
+ @ApiModelProperty("大屏左边数据")
+ private EventLeftStatisticsVO leftStatisticsVO;
+
+ @ApiModelProperty("事件播报数据")
+ private EventNewStatisticsVO newStatisticsVO;
+
+ @ApiModelProperty("社区事件数据")
+ private List<EventGridIncidentStatisticsVO> gridIncidentList;
+
+ @ApiModelProperty("小区列表数据")
+ private List<CivilVillageStatisticsVO> villageStatisticsList;
+
+ @ApiModelProperty("人口统计数据")
+ private ComMngPopulationTotalVO populationTotalVO;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordDetailVO.java
new file mode 100644
index 0000000..770a67e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordDetailVO.java
@@ -0,0 +1,18 @@
+package com.panzhihua.common.model.vos.community.screen.event;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏事件播报流转记录详情返回参数")
+public class EventTransferRecordDetailVO {
+
+ @ApiModelProperty("街道名称")
+ private String streetName;
+ @ApiModelProperty("社区名称")
+ private String communityName;
+ @ApiModelProperty("网格名称")
+ private String gridName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordVO.java
new file mode 100644
index 0000000..7c321e9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordVO.java
@@ -0,0 +1,48 @@
+package com.panzhihua.common.model.vos.community.screen.event;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏事件播报流转记录返回参数")
+public class EventTransferRecordVO {
+
+ @ApiModelProperty("事件处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date processDate;
+
+ @ApiModelProperty("事件处理结果")
+ private String processResult;
+
+ @ApiModelProperty("业务处理类型 1 网格员处理 2 派发到社区 3 社区处理 4 社区标为无效 5 标为无效后处理 6 验证 7 撤销 8 重新发布已撤销事件 9 社区重新发布已标为无效的事件")
+ private Integer processType;
+
+ @ApiModelProperty("事件处理人")
+ private String fromName;
+
+ @ApiModelProperty(value = "来源类型（1、网格员2、社区3、是街道）", hidden = true)
+ private Integer fromType;
+
+ @ApiModelProperty(value = "事件来源机构或网格员", hidden = true)
+ private Long fromId;
+
+ @ApiModelProperty("上级关系")
+ private String superiorRelationship;
+
+ @ApiModelProperty(value = "事件id", hidden = true)
+ private Long eventId;
+
+ /**
+ * 来源类型（1、网格员2、社区3、是街道）
+ */
+ public interface fromType {
+ int wgy = 1;
+ int sq = 2;
+ int jd = 3;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexBasicsStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexBasicsStatisticsVO.java
new file mode 100644
index 0000000..75fa4eb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexBasicsStatisticsVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.community.screen.index;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏首页基础数据统计返回参数")
+public class IndexBasicsStatisticsVO {
+
+ @ApiModelProperty("人口数量")
+ private Integer populationTotal;
+
+ @ApiModelProperty("房屋数量")
+ private Integer houseTotal;
+
+ @ApiModelProperty("单位数量")
+ private Integer companyTotal;
+
+ @ApiModelProperty("小区数量")
+ private Integer villageTotal;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexDynamicStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexDynamicStatisticsVO.java
new file mode 100644
index 0000000..29a9796
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexDynamicStatisticsVO.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.vos.community.screen.index;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏首页社区治理动态数据统计返回参数")
+public class IndexDynamicStatisticsVO {
+
+ @ApiModelProperty("微心愿")
+ private Integer microWishTotal;
+
+ @ApiModelProperty("随手拍")
+ private Integer easyPhotoTotal;
+
+ @ApiModelProperty("回复留言数量")
+ private Integer replyTotal;
+
+ @ApiModelProperty("开展文化活动")
+ private Integer cultureActivityTotal;
+
+ @ApiModelProperty(value = "党员活动数量", hidden = true)
+ private Integer pbTotal;
+
+ @ApiModelProperty(value = "社区活动数量", hidden = true)
+ private Integer actTotal;
+
+ @ApiModelProperty("发起民意调查")
+ private Integer investigationTotal;
+
+ @ApiModelProperty("社区宣传")
+ private Integer propagandaTotal;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexEventGridStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexEventGridStatisticsVO.java
new file mode 100644
index 0000000..c643e79
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexEventGridStatisticsVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.community.screen.index;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏首页网格化治理数据统计返回参数")
+public class IndexEventGridStatisticsVO {
+
+ @ApiModelProperty("网格化治理事件数据")
+ private IndexGridEventStatisticsVO gridEventStatisticsList;
+
+ @ApiModelProperty("网格化治理事件总和")
+ private Integer gridEventTotal = 0;
+
+ @ApiModelProperty("网格化治理网格数据")
+ private List<IndexGridStatisticsVO> gridStatisticsList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexEventListStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexEventListStatisticsVO.java
new file mode 100644
index 0000000..089dbff
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexEventListStatisticsVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community.screen.index;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏首页实时治理信息数据统计返回参数")
+public class IndexEventListStatisticsVO {
+
+ @ApiModelProperty("事件上报时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("事件状态(1.待处理 4.已处理)")
+ private Integer eventDealStatus;
+
+ @ApiModelProperty("事件描述")
+ private String eventDes;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexGridEventStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexGridEventStatisticsVO.java
new file mode 100644
index 0000000..2cb2c40
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexGridEventStatisticsVO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.vos.community.screen.index;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("大屏首页网格化治理事件数据统计返回参数")
+public class IndexGridEventStatisticsVO {
+
+ @ApiModelProperty("突发事件数量")
+ private Integer eventTFTotal;
+ @ApiModelProperty("突发事件占比")
+ private BigDecimal tfPercent;
+ @ApiModelProperty("治安隐患事件数量")
+ private Integer eventZATotal;
+ @ApiModelProperty("治安隐患事件占比")
+ private BigDecimal zaPercent;
+
+ @ApiModelProperty("矛盾纠纷事件数量")
+ private Integer eventMDTotal;
+ @ApiModelProperty("矛盾纠纷事件占比")
+ private BigDecimal mdPercent;
+
+ @ApiModelProperty("特殊人员上报数量")
+ private Integer eventTSTotal;
+ @ApiModelProperty("特殊人员上报占比")
+ private BigDecimal tsPercent;
+
+ @ApiModelProperty("不稳定因素事件数量")
+ private Integer eventBWDTotal;
+ @ApiModelProperty("不稳定因素事件占比")
+ private BigDecimal bwdPercent;
+ @ApiModelProperty("公共服务数量")
+ private Integer eventGGTotal;
+ @ApiModelProperty("公共服务占比")
+ private BigDecimal ggPercent;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexGridStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexGridStatisticsVO.java
new file mode 100644
index 0000000..c7ca9cf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexGridStatisticsVO.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.vos.community.screen.index;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏首页网格化治理事件数据统计返回参数")
+public class IndexGridStatisticsVO {
+
+ @ApiModelProperty("网格名称")
+ private String eventData;
+
+ @ApiModelProperty("网格事件数据")
+ private IndexGridEventStatisticsVO gridEventStatisticsList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexPopulationAgeStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexPopulationAgeStatisticsVO.java
new file mode 100644
index 0000000..7eb8a98
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexPopulationAgeStatisticsVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.community.screen.index;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("大屏首页实有人口年龄段数据统计返回参数")
+public class IndexPopulationAgeStatisticsVO {
+
+ @ApiModelProperty("年龄段（1、0-18 2、19-30 3、31-40 4、41-50 5、51-59 7、60-79 8.80-89 6.89以上）")
+ private Integer type;
+
+ @ApiModelProperty("数量")
+ private Integer sum = 0;
+
+ @ApiModelProperty("占比")
+ private BigDecimal percent;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexPopulationSexStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexPopulationSexStatisticsVO.java
new file mode 100644
index 0000000..9d138a4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexPopulationSexStatisticsVO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.vos.community.screen.index;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏首页实有人口性别数据统计返回参数")
+public class IndexPopulationSexStatisticsVO {
+
+ @ApiModelProperty("性别（1.男 2.女）")
+ private Integer type;
+
+ @ApiModelProperty("数量")
+ private Integer sum;
+
+ @ApiModelProperty("占比")
+ private Integer percent;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexPopulationStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexPopulationStatisticsVO.java
new file mode 100644
index 0000000..6f6c9b0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexPopulationStatisticsVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.community.screen.index;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏首页实有人口数据统计返回参数")
+public class IndexPopulationStatisticsVO {
+
+ @ApiModelProperty("人口总数量")
+ private Integer populationTotal = 0;
+
+ @ApiModelProperty("大屏首页实有人口性别数据统计返回参数")
+ private List<IndexPopulationSexStatisticsVO> sexPopulationList;
+
+ @ApiModelProperty("大屏首页实有人口年龄段数据统计返回参数")
+ private List<IndexPopulationAgeStatisticsVO> agePopulationList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexSpecialStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexSpecialStatisticsVO.java
new file mode 100644
index 0000000..4ac7e24
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexSpecialStatisticsVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.community.screen.index;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("大屏首页特殊人群统计数据返回参数")
+public class IndexSpecialStatisticsVO {
+
+ @ApiModelProperty("特殊人群标签")
+ private String title;
+
+ @ApiModelProperty("人口数量")
+ private Integer sum;
+
+ @ApiModelProperty("占比")
+ private BigDecimal percent;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexStatisticsVO.java
new file mode 100644
index 0000000..e14b2df
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexStatisticsVO.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.vos.community.screen.index;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏首页统计返回参数")
+public class IndexStatisticsVO {
+
+ @ApiModelProperty("基础模块数据")
+ private IndexBasicsStatisticsVO basicsStatistics;
+
+ @ApiModelProperty("实有人口统计模块数据")
+ private IndexPopulationStatisticsVO populationStatisticsVO;
+
+ @ApiModelProperty("实时治理信息统计模块数据")
+ private List<IndexEventListStatisticsVO> eventListStatisticsList;
+
+ @ApiModelProperty("社区治理动态模块数据")
+ private IndexDynamicStatisticsVO dynamicStatisticsVO;
+
+ @ApiModelProperty("网格化治理模块数据")
+ private IndexEventGridStatisticsVO eventGridStatisticsVO;
+
+ @ApiModelProperty("特殊人群统计模块数据")
+ private List<IndexSpecialStatisticsVO> specialStatisticsVOList;
+
+ @ApiModelProperty("党建模块数据")
+ private BigScreenStatisticPartyBuild statisticPartyBuild;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/ActActivityListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/ActActivityListVO.java
new file mode 100644
index 0000000..6518010
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/ActActivityListVO.java
@@ -0,0 +1,80 @@
+package com.panzhihua.common.model.vos.community.screen.work;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏社区活动列表返回参数")
+public class ActActivityListVO {
+
+ @ApiModelProperty("主键id")
+ private Long id;
+
+ @ApiModelProperty("负责人姓名")
+ private String userName;
+
+ @ApiModelProperty("负责人id")
+ private Long sponsorId;
+
+ @ApiModelProperty("负责人头像")
+ private String imageUrl;
+
+ @ApiModelProperty("活动状态 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
+ private Integer status;
+
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("活动开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date beginAt;
+
+ @ApiModelProperty("活动结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endAt;
+
+ @ApiModelProperty("报名开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date signUpBegin;
+
+ @ApiModelProperty("报名结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date signUpEnd;
+
+ @ApiModelProperty("志愿者人数下限")
+ private Integer volunteerMin;
+
+ @ApiModelProperty("志愿者人数上限")
+ private Integer volunteerMax;
+
+ @ApiModelProperty("参与者人数下限")
+ private Integer participantMin;
+
+ @ApiModelProperty("参与者人数上限")
+ private Integer participantMax;
+
+ @ApiModelProperty("活动名称")
+ private String activityName;
+
+ @ApiModelProperty("活动内容")
+ private String content;
+
+ @ApiModelProperty("活动封面")
+ private String cover;
+
+ @ApiModelProperty("活动地址")
+ private String activityAddr;
+
+ @ApiModelProperty("居民参加人数")
+ private Integer participantCount;
+
+ @ApiModelProperty("志愿者参加人数")
+ private Integer volunteerCount;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/ActActivityPeopleListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/ActActivityPeopleListVO.java
new file mode 100644
index 0000000..918a538
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/ActActivityPeopleListVO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.vos.community.screen.work;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏社区活动报名详情返回参数")
+public class ActActivityPeopleListVO {
+
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("身份")
+ private String identity;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("报名时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/DiscussListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/DiscussListVO.java
new file mode 100644
index 0000000..067e7d4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/DiscussListVO.java
@@ -0,0 +1,54 @@
+package com.panzhihua.common.model.vos.community.screen.work;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.vos.community.ComActDiscussOptionVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏一起议列表返回参数")
+public class DiscussListVO {
+
+ @ApiModelProperty("主键id")
+ private Long id;
+
+ @ApiModelProperty("发布人昵称")
+ private String userName;
+
+ @ApiModelProperty("发布人id")
+ private Long userId;
+
+ @ApiModelProperty("发布人头像")
+ private String imageUrl;
+
+ @ApiModelProperty("发布类型 1 图文 2 投票")
+ private Integer type;
+
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("发布主题")
+ private String discussSubject;
+
+ @ApiModelProperty("投票标题")
+ private String voteTitle;
+
+ @ApiModelProperty("图片地址 多个用逗号隔开")
+ private String photoPah;
+
+ @ApiModelProperty("评论数量")
+ private Integer commentCount;
+
+ @ApiModelProperty("点赞数量")
+ private Integer fabulousCount;
+
+ @ApiModelProperty("投票选项列表")
+ private List<ComActDiscussOptionVO> discussOptionList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/MicroListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/MicroListVO.java
new file mode 100644
index 0000000..9db23a1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/MicroListVO.java
@@ -0,0 +1,72 @@
+package com.panzhihua.common.model.vos.community.screen.work;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏微心愿列表返回参数")
+public class MicroListVO {
+
+ @ApiModelProperty("主键id")
+ private Long id;
+
+ @ApiModelProperty("发起人姓名")
+ private String userName;
+
+ @ApiModelProperty("发起人id")
+ private Long sponsorId;
+
+ @ApiModelProperty("发起人头像")
+ private String imageUrl;
+
+ @ApiModelProperty("发起人手机号")
+ private String phone;
+
+ @ApiModelProperty("状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成")
+ private Integer status;
+
+ @ApiModelProperty("发起时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("微心愿名称")
+ private String wishName;
+
+ @ApiModelProperty("微心愿内容")
+ private String detail;
+
+ @ApiModelProperty("活动封面")
+ private String photoPathList;
+
+ @ApiModelProperty("集星数")
+ private Integer starNum;
+
+ @ApiModelProperty("评价时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date evaluateAt;
+
+ @ApiModelProperty("评价星数")
+ private Integer score;
+
+ @ApiModelProperty("负责人名字")
+ private String responsibleName;
+
+ @ApiModelProperty("形式 1分配人员 2发起活动")
+ private Integer form;
+
+ @ApiModelProperty("分配时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date distributionAt;
+
+ @ApiModelProperty("完成情况描述")
+ private String finish;
+
+ @ApiModelProperty("完成情况图片列表，逗号分隔")
+ private String finishPhotoPathList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectMemberVO.java
new file mode 100644
index 0000000..b536bda
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectMemberVO.java
@@ -0,0 +1,82 @@
+package com.panzhihua.common.model.vos.community.social;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 项目人员(ComActSocialProjectMember)表实体类
+ *
+ * @author makejava
+ * @since 2021-12-23 15:16:42
+ */
+@Data
+@ApiModel("项目人员")
+public class ComActSocialProjectMemberVO implements Serializable {
+
+ private Long id;
+
+ /**
+ * 姓名
+ */
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ /**
+ * 年龄
+ */
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ /**
+ * 照片
+ */
+ @ApiModelProperty(value = "照片")
+ private String image;
+
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ /**
+ * 类型 1社工 2志愿者
+ */
+ @ApiModelProperty(value = "类型 1社工 2志愿者")
+ private Integer type;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 项目id
+ */
+ @ApiModelProperty(value = "项目id")
+ private Long projectId;
+
+ /**
+ * 所属社区
+ */
+ @ApiModelProperty(value = "社区名称")
+ private String communityName;
+
+ @ApiModelProperty(value = "人员Id")
+ private Long paramId;
+
+ @ApiModelProperty(value = "ids")
+ private List<Long> ids;
+
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectPublicityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectPublicityVO.java
new file mode 100644
index 0000000..1439498
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectPublicityVO.java
@@ -0,0 +1,80 @@
+package com.panzhihua.common.model.vos.community.social;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 项目宣传表(ComActSocialProjectPublicity)表实体类
+ *
+ * @author makejava
+ * @since 2021-12-23 14:30:54
+ */
+@Data
+@ApiModel("项目宣传表")
+public class ComActSocialProjectPublicityVO {
+
+
+ private Long id;
+
+ /**
+ * 标题
+ */
+ @ApiModelProperty(value = "标题")
+ private String title;
+
+ /**
+ * 封面图
+ */
+ @ApiModelProperty(value = "封面图")
+ private String image;
+
+ /**
+ * 内容
+ */
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+ /**
+ * 项目id
+ */
+ @ApiModelProperty(value = "项目id")
+ private Long projectId;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 浏览量
+ */
+ @ApiModelProperty(value = "浏览量")
+ private Integer views;
+
+ /**
+ * 是否置顶 0否 1是
+ */
+ @ApiModelProperty(value = "是否置顶")
+ private Integer isTop;
+
+ @ApiModelProperty(value = "项目名称")
+ private String name;
+
+ @ApiModelProperty(value="责任方")
+ private String responsibility;
+
+ @ApiModelProperty(value = "街道名字")
+ private String streetName;
+
+ @ApiModelProperty("发布人")
+ private String releaseName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectScheduleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectScheduleVO.java
new file mode 100644
index 0000000..fe19606
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectScheduleVO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.vos.community.social;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 项目进度表(ComActSocialProjectSchedule)表实体类
+ *
+ * @author makejava
+ * @since 2021-12-23 14:31:15
+ */
+@Data
+@ApiModel("项目进度表")
+public class ComActSocialProjectScheduleVO{
+
+ private Long id;
+
+ /**
+ * 标题
+ */
+ @ApiModelProperty(value = "标题")
+ private String title;
+
+ /**
+ * 内容
+ */
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 项目id
+ */
+ @ApiModelProperty(value = "项目id")
+ private Long projectId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialWorkerServiceVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialWorkerServiceVO.java
new file mode 100644
index 0000000..5fbdddd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialWorkerServiceVO.java
@@ -0,0 +1,84 @@
+package com.panzhihua.common.model.vos.community.social;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 社工服务表(ComActSocialWorkerService)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 社工服务表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-16 15:59:41
+ */
+@Data
+@ApiModel("社工服务表")
+public class ComActSocialWorkerServiceVO implements Serializable {
+
+ private Long id;
+
+ /**
+ * 社工id
+ */
+ @ApiModelProperty(value = "社工id")
+ private Long workerId;
+
+ /**
+ * 发起人id
+ */
+ @ApiModelProperty(value = "发起人id")
+ private Long senderId;
+
+ /**
+ * 服务状态 0待执行 1已完成
+ */
+ @ApiModelProperty(value = "服务状态 0待执行 1已完成")
+ private Integer status;
+
+ /**
+ * 内容id
+ */
+ @ApiModelProperty(value = "内容id")
+ private Long serviceId;
+
+ /**
+ * 服务类型 1微心愿 2随手拍
+ */
+ @ApiModelProperty(value = "服务类型 1微心愿 2随手拍")
+ private Integer serviceType;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 汇报内容
+ */
+ @ApiModelProperty(value = "汇报内容")
+ private String resultContent;
+
+ /**
+ * 汇报图片
+ */
+ @ApiModelProperty(value = "汇报图片")
+ private String resultUrl;
+
+ /**
+ * 得分
+ */
+ @ApiModelProperty(value = "得分")
+ private Integer score;
+
+ @ApiModelProperty("发起人姓名")
+ private String senderName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialOrgHatchAuditScheduleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialOrgHatchAuditScheduleVO.java
new file mode 100644
index 0000000..3f94b32
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialOrgHatchAuditScheduleVO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.vos.community.social;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: SocialOrgHatchAuditScheduleVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 社会组织孵化审核进度信息
+ * @author: hans
+ * @date: 2022/04/19 10:25
+ */
+@Data
+@ApiModel("社会组织孵化审核进度信息")
+public class SocialOrgHatchAuditScheduleVO {
+
+ @ApiModelProperty("审核进度id")
+ private Long id;
+
+ @ApiModelProperty("社会组织孵化申请关联id")
+ private Long auditId;
+
+ @ApiModelProperty("审核阶段")
+ private String stage;
+
+ @ApiModelProperty("阶段详情")
+ private String detail;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createdAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialOrgHatchAuditVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialOrgHatchAuditVO.java
new file mode 100644
index 0000000..6c9d202
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialOrgHatchAuditVO.java
@@ -0,0 +1,70 @@
+package com.panzhihua.common.model.vos.community.social;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: SocialOrgHatchAuditVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 社会组织孵化申请信息
+ * @author: hans
+ * @date: 2022/04/18 14:33
+ */
+@Data
+@ApiModel("社会组织孵化申请信息")
+public class SocialOrgHatchAuditVO {
+
+ @ApiModelProperty("孵化申请id")
+ private Long id;
+
+ @ApiModelProperty("准社会组织名称")
+ private String name;
+
+ @ApiModelProperty("负责人")
+ private String responsibility;
+
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ @ApiModelProperty("孵化单位")
+ private Long hatchUnit;
+
+ @ApiModelProperty("孵化单位类型（1.街道 2.社区）")
+ private Integer hatchUnitType;
+
+ @ApiModelProperty("孵化单位名称")
+ private String hatchUnitName;
+
+ @ApiModelProperty("申请用户")
+ private Long userId;
+
+ @ApiModelProperty("申请状态（1.待审核 2.审核通过 3.已驳回）")
+ private Integer status;
+
+ @ApiModelProperty("申请时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createdAt;
+
+ @ApiModelProperty("组织介绍")
+ private String introduction;
+
+ @ApiModelProperty("组织标识")
+ private String logo;
+
+ @ApiModelProperty("申请原因")
+ private String applyReason;
+
+ @ApiModelProperty("服务范围")
+ private String serviceScope;
+
+ @ApiModelProperty("服务范围名称")
+ private String serviceScopeName;
+
+ @ApiModelProperty("审核进度")
+ private List<SocialOrgHatchAuditScheduleVO> scheduleVOList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialOrgHatchVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialOrgHatchVO.java
new file mode 100644
index 0000000..fd9ae90
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialOrgHatchVO.java
@@ -0,0 +1,64 @@
+package com.panzhihua.common.model.vos.community.social;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: SocialOrgHatchAuditVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 社会组织孵化申请信息
+ * @author: hans
+ * @date: 2022/04/18 14:33
+ */
+@Data
+@ApiModel("社会组织孵化申请信息")
+public class SocialOrgHatchVO {
+
+ @ApiModelProperty("孵化申请id")
+ private Long id;
+
+ @ApiModelProperty("准社会组织名称")
+ private String name;
+
+ @ApiModelProperty("负责人")
+ private String responsibility;
+
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ @ApiModelProperty("孵化单位")
+ private Long hatchUnit;
+
+ @ApiModelProperty("孵化单位类型（1.街道 2.社区）")
+ private Integer hatchUnitType;
+
+ @ApiModelProperty("孵化单位名称")
+ private String hatchUnitName;
+
+ @ApiModelProperty("孵化状态（1.孵化中 2.孵化成功）")
+ private Integer status;
+
+ @ApiModelProperty("开始孵化日期")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createdAt;
+
+ @ApiModelProperty("组织介绍")
+ private String introduction;
+
+ @ApiModelProperty("组织标识")
+ private String logo;
+
+ @ApiModelProperty("申请原因")
+ private String applyReason;
+
+ @ApiModelProperty("服务范围")
+ private String serviceScope;
+
+ @ApiModelProperty("服务范围名称")
+ private String serviceScopeName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialProjectVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialProjectVO.java
new file mode 100644
index 0000000..d826f6b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialProjectVO.java
@@ -0,0 +1,172 @@
+package com.panzhihua.common.model.vos.community.social;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("项目实体")
+public class SocialProjectVO {
+
+ private Long id;
+
+ /**
+ * 项目名称
+ */
+ @ApiModelProperty(value = "项目名称")
+ private String name;
+
+ /**
+ * 项目类型 1公共文化 2社会组织参与 3 社会企业带动 4其他
+ */
+ @ApiModelProperty(value = "项目类型 1公共文化 2社会组织参与 3 社会企业带动 4其他")
+ private Integer type;
+
+ /**
+ * 项目状态 1初创项目 2公开发布 3运作中 4 已结束
+ */
+ @ApiModelProperty(value = "项目状态 1待发布 2公示中 3实施中 4 已完成")
+ private Integer status;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ /**
+ * 街道id
+ */
+ @ApiModelProperty(value = "街道id")
+ private Long streetId;
+
+ /**
+ * 责任方
+ */
+ @ApiModelProperty(value = "责任方")
+ private String responsibility;
+
+ /**
+ * 父项目id
+ */
+ @ApiModelProperty(value = "父项目id")
+ private Long parentId;
+
+ /**
+ * 附件
+ */
+ @ApiModelProperty(value = "附件")
+ private String url;
+
+ /**
+ * 封面
+ */
+ @ApiModelProperty(value = "封面")
+ private String image;
+
+ /**
+ * 介绍
+ */
+ @ApiModelProperty(value = "介绍")
+ private String content;
+
+ /**
+ * 项目等级
+ */
+ @ApiModelProperty(value = "项目等级")
+ private Integer level;
+
+ /**
+ * 浏览量
+ */
+ @ApiModelProperty(value = "浏览量")
+ private Integer views;
+
+ /**
+ * 社区名字
+ */
+ @ApiModelProperty(value = "社区名字")
+ private String communityName;
+
+ /**
+ * 街道名字
+ */
+ @ApiModelProperty(value = "街道名字")
+ private String streetName;
+
+ /**
+ * 街道电话
+ */
+ @ApiModelProperty(value = "街道电话")
+ private String streetPhone;
+
+ /**
+ * 社区电话
+ */
+ @ApiModelProperty(value = "社区电话")
+ private String communityPhone;
+
+ /**
+ * 分类id
+ */
+ @ApiModelProperty(value = "分类id")
+ private Long columnId;
+
+ /**
+ * 二级分类id
+ */
+ @ApiModelProperty(value = "二级分类id")
+ private Long secondColumnId;
+
+ /**
+ * 分类名称
+ */
+ @ApiModelProperty(value = "分类名称")
+ private String columnName;
+
+ /**
+ * 二级分类
+ */
+ @ApiModelProperty(value = "分类名称")
+ private String secondColumnName;
+
+ @ApiModelProperty(value = "责任方类型 1街道 2社区 3社会组织")
+ private Integer responsibilityType;
+
+ @ApiModelProperty(value = "责任方id")
+ private Long responsibilityId;
+
+ @ApiModelProperty(value = "项目联系电话")
+ private String phone;
+
+ @ApiModelProperty(value = "项目资金")
+ private BigDecimal funds;
+
+ @ApiModelProperty(value = "项目报名截止时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date signUpEnd;
+
+ @ApiModelProperty(value = "公示状态 1报名中 2报名截止 3结果公布")
+ private Integer signUpStatus;
+
+ @ApiModelProperty(value = "是否可以进行报名 1是 2否")
+ private Integer isCouldSign;
+
+ @ApiModelProperty(value = "是否公示（1.是 2.否）")
+ private Integer isPublicity;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/switchs/CommunitySwitchAllAppletsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/switchs/CommunitySwitchAllAppletsVO.java
new file mode 100644
index 0000000..1c681df
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/switchs/CommunitySwitchAllAppletsVO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.vos.community.switchs;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("切换社区模块-所有社区数据")
+public class CommunitySwitchAllAppletsVO {
+
+ @ApiModelProperty("街道id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long streetId;
+
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ @ApiModelProperty("社区名称")
+ private String name;
+
+ @ApiModelProperty("街道名称")
+ private String streetName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/switchs/StreetAllAppletsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/switchs/StreetAllAppletsVO.java
new file mode 100644
index 0000000..cba3fbf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/switchs/StreetAllAppletsVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community.switchs;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("切换社区模块-所有社区数据")
+public class StreetAllAppletsVO {
+
+ @ApiModelProperty("街道id")
+ private Long streetId;
+
+ @ApiModelProperty("街道名称")
+ private String name;
+
+ @ApiModelProperty("街道下社区列表")
+ private List<CommunitySwitchAllAppletsVO> childList;
+
+ @ApiModelProperty("街道下社区数量")
+ private Integer count = 0;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/volunteer/ComMngVolunteerErrorExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/volunteer/ComMngVolunteerErrorExcelVO.java
new file mode 100644
index 0000000..e685ac1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/volunteer/ComMngVolunteerErrorExcelVO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.vos.community.volunteer;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @description: 批量导入志愿者请求参数
+ * @author : lyq
+ */
+@Data
+public class ComMngVolunteerErrorExcelVO implements Serializable {
+
+ @ExcelProperty(value = "志愿者名称", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "志愿者手机号", index = 1)
+ private String phone;
+
+ @ExcelProperty(value = "志愿者身份证", index = 2)
+ private String idCard;
+
+ @ExcelProperty(value = "志愿者组织", index = 3)
+ private String orgName;
+
+ @ExcelProperty(value = "志愿者队伍", index = 4)
+ private String teamName;
+
+ @ExcelProperty(value = "技能", index = 5)
+ private String skillName;
+
+ @ExcelProperty(value = "是否是大学生", index = 6)
+ private Integer isUniversity;
+
+ @ExcelProperty(value = "错误信息", index = 7)
+ private String error;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/volunteer/ComMngVolunteerExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/volunteer/ComMngVolunteerExcelVO.java
new file mode 100644
index 0000000..e2f21d6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/volunteer/ComMngVolunteerExcelVO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.vos.community.volunteer;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @description: 批量导入志愿者请求参数
+ * @author : lyq
+ */
+@Data
+public class ComMngVolunteerExcelVO implements Serializable {
+
+ @ExcelProperty(value = "志愿者名称", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "志愿者手机号", index = 1)
+ private String phone;
+
+ @ExcelProperty(value = "志愿者身份证", index = 2)
+ private String idCard;
+
+ @ExcelProperty(value = "志愿者组织", index = 3)
+ private String orgName;
+
+ @ExcelProperty(value = "志愿者队伍", index = 4)
+ private String teamName;
+
+ @ExcelProperty(value = "技能", index = 5)
+ private String skillName;
+
+ @ExcelProperty(value = "在读大学名称", index = 6)
+ private String universityName;
+
+ @ExcelIgnore
+ private Integer isUniversity;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletAdminVO.java
new file mode 100644
index 0000000..0772c5a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletAdminVO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.vos.community.wallet;
+
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("收益结算列表返回参数")
+public class ComActWalletAdminVO {
+
+ @ApiModelProperty("钱包id")
+ private Long id;
+
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ @ApiModelProperty("收益总金额")
+ private BigDecimal incomeAmount;
+
+ @ApiModelProperty("可用金额(未结算金额)")
+ private BigDecimal availableAmount;
+
+ @ApiModelProperty("结算金额")
+ private BigDecimal settlementAmount;
+
+ @ApiModelProperty("用户昵称")
+ private String nickName;
+
+ @ApiModelProperty("用户姓名")
+ private String userName;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletRankingVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletRankingVO.java
new file mode 100644
index 0000000..c6161c5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletRankingVO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.vos.community.wallet;
+
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("用户收益排行榜返回参数")
+public class ComActWalletRankingVO {
+
+ @ApiModelProperty("钱包id")
+ private Long id;
+
+ @ApiModelProperty("昵称")
+ private String nickName;
+
+ @ApiModelProperty("姓名")
+ private String userName;
+
+ @ApiModelProperty("用户头像")
+ private String imageUrl;
+
+ @ApiModelProperty("收益总金额")
+ private BigDecimal incomeAmount;
+
+ @ApiModelProperty("累计随手拍奖励数量")
+ private BigDecimal easyCount;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletTradeAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletTradeAdminVO.java
new file mode 100644
index 0000000..8f54bf3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletTradeAdminVO.java
@@ -0,0 +1,53 @@
+package com.panzhihua.common.model.vos.community.wallet;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("交易记录列表返回参数")
+public class ComActWalletTradeAdminVO {
+
+ @ApiModelProperty("交易记录id")
+ private Long id;
+
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ @ApiModelProperty("用户昵称")
+ private String nickName;
+
+ @ApiModelProperty("用户姓名")
+ private String userName;
+
+ @ApiModelProperty("用户手机号")
+ private String phone;
+
+ @ApiModelProperty("变动类型（1.增加 2.减少）")
+ private Integer changeType;
+
+ @ApiModelProperty("交易金额")
+ private BigDecimal amount;
+
+ @ApiModelProperty("交易类型（1.发布随手拍 2.结算）")
+ private Integer type;
+
+ @ApiModelProperty("交易时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("操作人")
+ private String operationUserName;
+
+ @ApiModelProperty("交易备注")
+ private String remark;
+
+ @ApiModelProperty("交易业务id")
+ private Long serviceId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletTradeStatisticsAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletTradeStatisticsAdminVO.java
new file mode 100644
index 0000000..be81f7b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletTradeStatisticsAdminVO.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.vos.community.wallet;
+
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("交易记录统计返回参数")
+public class ComActWalletTradeStatisticsAdminVO {
+
+ @ApiModelProperty("今日交易金额")
+ private BigDecimal dayTotal = BigDecimal.ZERO;
+
+ @ApiModelProperty("本月交易金额")
+ private BigDecimal monthTotal = BigDecimal.ZERO;
+
+ @ApiModelProperty("累计交易金额")
+ private BigDecimal total = BigDecimal.ZERO;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletTradeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletTradeVO.java
new file mode 100644
index 0000000..a353cdd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletTradeVO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.vos.community.wallet;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("用户钱包收支记录返回参数")
+public class ComActWalletTradeVO {
+
+ @ApiModelProperty("记录id")
+ private Long id;
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
+
+ @ApiModelProperty("交易金额")
+ private BigDecimal amount;
+
+ @ApiModelProperty("交易类型（1.发布随手拍 2.收益结算）")
+ private Integer type;
+
+ @ApiModelProperty("变动类型（1.增加 2.减少）")
+ private Integer changeType;
+
+ @ApiModelProperty("交易备注")
+ private String remark;
+
+ @ApiModelProperty("交易时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletVO.java
new file mode 100644
index 0000000..d4363ae
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.community.wallet;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("用户钱包返回参数")
+public class ComActWalletVO {
+
+ @ApiModelProperty("钱包id")
+ private Long id;
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
+
+ @ApiModelProperty("收益金额")
+ private BigDecimal incomeAmount;
+
+ @ApiModelProperty("可用金额")
+ private BigDecimal availableAmount;
+
+ @ApiModelProperty("结算金额")
+ private BigDecimal settlementAmount;
+
+ @ApiModelProperty("累计随手拍奖励数量")
+ private Integer easyCount;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("上次金额变动时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty("收益说明")
+ private String agreement;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ApplyStatistics.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ApplyStatistics.java
new file mode 100644
index 0000000..c115aeb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ApplyStatistics.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.vos.community.warehouse;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("申领统计")
+public class ApplyStatistics {
+ /**
+ * 待处理
+ */
+ @ApiModelProperty("待处理")
+ private Integer pending;
+
+ /**
+ * 待领取
+ */
+ @ApiModelProperty("待领取")
+ private Integer unclaimed;
+
+ /**
+ * 已领取
+ */
+ @ApiModelProperty("已领取")
+ private Integer received;
+
+ /**
+ *已取消
+ */
+ @ApiModelProperty("已取消")
+ private Integer cancelled;
+
+ /**
+ * 已驳回
+ */
+ @ApiModelProperty("已驳回")
+ private Integer rejected;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyExcelVO.java
new file mode 100644
index 0000000..bd6b698
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyExcelVO.java
@@ -0,0 +1,123 @@
+package com.panzhihua.common.model.vos.community.warehouse;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.converters.string.StringImageConverter;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.utlis.StringUtils;
+import lombok.Data;
+
+import java.net.URL;
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+public class ComActWarehouseApplyExcelVO {
+
+ @ExcelProperty(value = "申领流水",index = 10)
+ private Integer id;
+
+ /**
+ * 物品数量
+ */
+ @ExcelProperty(value = "物品数量",index = 6)
+ private Integer goodsNum;
+
+ /**
+ * 预约时间
+ */
+ @ExcelProperty(value = "预约领用时间",index = 7)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reserveTime;
+
+ /**
+ * 实际时间
+ */
+ @ExcelProperty(value = "实际领用时间",index = 8)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date actualTime;
+
+ /**
+ * 理由
+ */
+ @ExcelProperty(value = "主要困难",index = 9)
+ private String reason;
+
+ /**
+ * 领取图片
+ */
+ @ExcelIgnore
+ private URL receiveUrl;
+
+ /**
+ * 提交时间
+ */
+ @ExcelProperty(value = "提交时间",index = 13)
+ private Date createTime;
+
+ /**
+ * 状态 0待处理 1 待领取 2已拒绝 3已领取 -1已取消
+ */
+ @ExcelProperty(value = "状态",index =14)
+ private String status;
+ @ExcelProperty(value = "核销人",index = 12)
+ private String writeOffUserName;
+
+ /**
+ * 申请人
+ */
+ @ExcelProperty(value = "申请人",index = 0)
+ private String applyName;
+
+ /**
+ * 申请人联系电话
+ */
+ @ExcelProperty(value = "申请人联系电话",index = 1)
+ private String applyPhone;
+
+ /**
+ * 申请物品
+ */
+ @ExcelProperty(value = "申请物品",index = 2)
+ private String item;
+
+ /**
+ * 捐赠人
+ */
+ @ExcelProperty(value = "捐赠人",index = 3)
+ private String donateName;
+
+ /**
+ * 捐赠人联系方式
+ */
+ @ExcelProperty(value = "捐赠人联系方式",index = 4)
+ private String donatePhone;
+
+ /**
+ * 物品图片
+ */
+ @ExcelIgnore
+ private URL image;
+
+ public void setStatus(String status) {
+ if(StringUtils.isNotEmpty(status)){
+ if("-1".equals(status)){
+ status="已取消";
+ }else if("0".equals(status)){
+ status="待处理";
+ }
+ else if("1".equals(status)){
+ status="待领取";
+ }
+ else if("2".equals(status)){
+ status="已驳回";
+ }
+ else if("3".equals(status)){
+ status="已领取";
+ }
+ this.status=status;
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyVO.java
new file mode 100644
index 0000000..58a0d11
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyVO.java
@@ -0,0 +1,179 @@
+package com.panzhihua.common.model.vos.community.warehouse;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("义仓物品申领记录实体")
+public class ComActWarehouseApplyVO {
+ private Long id;
+
+ /**
+ * 物品id
+ */
+ @ApiModelProperty(value = "物品id")
+ private Long goodsId;
+
+ /**
+ * 物品数量
+ */
+ @ApiModelProperty(value = "物品数量")
+ private Integer goodsNum;
+
+ /**
+ * 预约时间
+ */
+ @ApiModelProperty(value = "预约时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date reserveTime;
+
+ /**
+ * 实际时间
+ */
+ @ApiModelProperty(value = "实际时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date actualTime;
+
+ /**
+ * 理由
+ */
+ @ApiModelProperty(value = "理由")
+ private String reason;
+
+ /**
+ * 领取图片
+ */
+ @ApiModelProperty(value = "领取图片")
+ private String receiveUrl;
+
+ /**
+ * 提交时间
+ */
+ @ApiModelProperty(value = "提交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * 状态 0待处理 1 待领取 2已拒绝 3已领取 -1已取消
+ */
+ @ApiModelProperty(value = "状态 0待处理 1 待领取 2已拒绝 3已领取 -1已取消")
+ private Integer status;
+
+ /**
+ * 申请人id
+ */
+ @ApiModelProperty("申请人id")
+ private Long applyUserId;
+
+ /**
+ * 处理人id
+ */
+ @ApiModelProperty(value = "处理人id")
+ private Long solveUserId;
+
+ /**
+ * 处理人时间
+ */
+ @ApiModelProperty(value = "处理人时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date solveTime;
+
+ /**
+ * 处理人备注
+ */
+ @ApiModelProperty(value = "处理人备注")
+ private String solveContent;
+
+ /**
+ * 处理人
+ */
+ @ApiModelProperty(value = "处理人")
+ private String solveName;
+
+ /**
+ * 核销人id
+ */
+ @ApiModelProperty(value = "核销人id")
+ private Long writeOffUserId;
+
+ /**
+ * 取消时间
+ */
+ @ApiModelProperty(value = "取消时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date cancelTime;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ /**
+ * 申请人
+ */
+ @ApiModelProperty("申请人")
+ private String applyName;
+
+ /**
+ * 申请人联系电话
+ */
+ @ApiModelProperty("申请人联系电话")
+ private String applyPhone;
+
+ /**
+ * 申请物品
+ */
+ @ApiModelProperty("申请物品")
+ private String item;
+
+ /**
+ * 捐赠人
+ */
+ @ApiModelProperty("捐赠人")
+ private String donateName;
+
+ /**
+ * 捐赠人联系方式
+ */
+ @ApiModelProperty("捐赠人联系方式")
+ private String donatePhone;
+
+ /**
+ * 物品图片
+ */
+ @ApiModelProperty("物品图片")
+ private String image;
+
+ /**
+ * 核销人
+ */
+ @ApiModelProperty("核销人")
+ private String writeOffUserName;
+
+ /**
+ *剩下数量
+ */
+ @ApiModelProperty("剩下数量")
+ private Integer surplusQuantity;
+
+ /**
+ * 状态 0待处理 1 待领取 2已拒绝 3已领取 -1已取消
+ */
+ public interface status{
+ int dcl=0;
+ int dlq=1;
+ int ybh=2;
+ int ylq=3;
+ int yqx=-1;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseBaseVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseBaseVO.java
new file mode 100644
index 0000000..acc25a7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseBaseVO.java
@@ -0,0 +1,66 @@
+package com.panzhihua.common.model.vos.community.warehouse;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("义仓基础设置实体")
+public class ComActWarehouseBaseVO {
+ private Integer id;
+
+ /**
+ * 义仓说明
+ */
+ @ApiModelProperty(value = "义仓说明")
+ private String warehouseExplain;
+
+ /**
+ * 工作时间
+ */
+ @ApiModelProperty(value = "工作时间")
+ private String warehouseWorkTime;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty(value = "联系电话")
+ private String warehouseContact;
+
+ /**
+ * 接收地点
+ */
+ @ApiModelProperty(value = "接收地点")
+ private String receivePosition;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ *经度
+ */
+ @ApiModelProperty("经度")
+ private String longitude;
+
+ /**
+ *纬度
+ */
+ @ApiModelProperty("纬度")
+ private String latitude;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseDonatesVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseDonatesVO.java
new file mode 100644
index 0000000..4b42121
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseDonatesVO.java
@@ -0,0 +1,85 @@
+package com.panzhihua.common.model.vos.community.warehouse;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComActWarehouseDonatesVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 爱心义仓/物品捐赠信息
+ * @author: hans
+ * @date: 2021/10/11 14:06
+ */
+@Data
+@ApiModel("爱心义仓/物品捐赠信息")
+public class ComActWarehouseDonatesVO {
+
+ @ApiModelProperty("捐赠物品id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("捐赠人")
+ private String name;
+
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ @ApiModelProperty("捐赠物品")
+ private String item;
+
+ @ApiModelProperty("物品图片")
+ private String image;
+
+ @ApiModelProperty("捐赠数量")
+ private Integer quantity;
+
+ @ApiModelProperty("剩余数量")
+ private Integer surplusQuantity;
+
+ @ApiModelProperty("是否匿名（1.是 2.否）")
+ private Integer isAnonymous;
+
+ @ApiModelProperty("留言信息")
+ private String message;
+
+ @ApiModelProperty("物品登记时间/捐赠时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date registerAt;
+
+ @ApiModelProperty("物品签收时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date signingAt;
+
+ @ApiModelProperty("捐赠状态（1.待签收 2.已签收 3.已取消）")
+ private Integer status;
+
+ @ApiModelProperty("签收人")
+ private String signingBy;
+
+ @ApiModelProperty("物品捐赠操作记录")
+ private List<ComActWarehouseOperationVO> operationList;
+
+ @ApiModelProperty("捐赠用户")
+ @JsonIgnore
+ private Long userId;
+
+ public interface isAnonymous {
+ int yes = 1;
+ int no = 2;
+ }
+
+ public interface status {
+ int dqs = 1;
+ int yqs = 2;
+ int yqx = 3;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseOperationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseOperationVO.java
new file mode 100644
index 0000000..913edf0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseOperationVO.java
@@ -0,0 +1,90 @@
+package com.panzhihua.common.model.vos.community.warehouse;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.utlis.StringUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @title: ComActWarehouseOperationVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 爱心义仓操作记录vo
+ * @author: hans
+ * @date: 2021/10/11 16:32
+ */
+
+@Data
+@ApiModel("爱心义仓操作记录vo")
+public class ComActWarehouseOperationVO {
+
+ @ApiModelProperty(value = "操作记录id")
+ private Long id;
+
+ @ApiModelProperty(value = "物品id")
+ private Long goodsId;
+
+ @ApiModelProperty(value = "操作内容")
+ private String content;
+
+ @ApiModelProperty(value = "操作时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ @ApiModelProperty(value = "操作人")
+ private Long userId;
+
+ @ApiModelProperty("申请人姓名")
+ private String applyName;
+
+ @ApiModelProperty("捐赠人名称")
+ private String donateName;
+
+ @ApiModelProperty("捐赠物品名称")
+ private String item;
+
+ @ApiModelProperty("捐赠物品图片")
+ private String image;
+
+ @ApiModelProperty("捐赠物品数量")
+ private Integer goodsNum;
+
+ /**
+ * 实际时间
+ */
+ @ApiModelProperty(value = "实际时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date actualTime;
+
+ @ApiModelProperty("是否匿名（1.是 2.否）")
+ private Integer isAnonymous;
+
+ /**
+ * 理由
+ */
+ @ApiModelProperty("理由")
+ private String reason;
+
+ /**
+ * 领取图片
+ */
+ @ApiModelProperty("领取图片")
+ private String receiveUrl;
+
+ @ApiModelProperty("类型 1 content 2其他")
+ private Integer type;
+
+ public void setDonateName(String donateName) {
+ if (StringUtils.isNotEmpty(donateName)) {
+ this.donateName = donateName.charAt(0) + "**";
+ }
+ }
+
+ public void setApplyName(String applyName) {
+ if (StringUtils.isNotEmpty(applyName)) {
+ this.applyName = applyName.charAt(0) + "**";
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/DonatesStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/DonatesStatisticsVO.java
new file mode 100644
index 0000000..a86b9d6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/DonatesStatisticsVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.community.warehouse;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: DonatesStatisticsVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 爱心义仓/物品捐赠统计信息
+ * @author: hans
+ * @date: 2021/10/12 15:56
+ */
+@Data
+@ApiModel("爱心义仓/物品捐赠统计信息")
+public class DonatesStatisticsVO {
+
+ @ApiModelProperty("累计物品数量")
+ private Integer totalInc;
+
+ @ApiModelProperty("当前剩余物品")
+ private Integer surplus;
+
+ @ApiModelProperty("今日新增")
+ private Integer dayInc;
+
+ @ApiModelProperty("本月新增")
+ private Integer mothInc;
+
+ @ApiModelProperty("本年新增")
+ private Integer yearInc;
+
+ @ApiModelProperty("累计领用物品")
+ private Integer totalDec;
+
+ @ApiModelProperty("今日领用")
+ private Integer dayDec;
+
+ @ApiModelProperty("本月领用")
+ private Integer mothDec;
+
+ @ApiModelProperty("本年领用")
+ private Integer yearDec;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ExportDonatesVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ExportDonatesVO.java
new file mode 100644
index 0000000..ee6ee4a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ExportDonatesVO.java
@@ -0,0 +1,79 @@
+package com.panzhihua.common.model.vos.community.warehouse;
+
+import static java.util.Objects.nonNull;
+
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.panzhihua.common.utlis.StringUtils;
+
+import lombok.Data;
+
+/**
+ * @title: ExportDonatesVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 爱心义仓捐赠物品导出VO
+ * @author: hans
+ * @date: 2021/10/11 11:20
+ */
+@Data
+public class ExportDonatesVO {
+
+ private Long id;
+
+ @ExcelProperty("捐赠用户")
+ private String name;
+
+ @ExcelProperty("联系电话")
+ private String phone;
+
+ @ExcelProperty("捐赠物品")
+ private String item;
+
+ @ExcelProperty("捐赠数量")
+ private Integer quantity;
+
+ @ExcelProperty("剩余数量")
+ private Integer surplusQuantity;
+
+ @ExcelProperty("匿名捐赠")
+ private String isAnonymous;
+
+ @ExcelProperty("留言信息")
+ private String message;
+
+ @ExcelProperty("物品登记时间")
+ private Date registerAt;
+
+ @ExcelProperty("物品签收时间")
+ private Date signingAt;
+
+ @ExcelProperty("状态")
+ private String status;
+
+ public void setIsAnonymous(String isAnonymous) {
+ if (StringUtils.isNumber(isAnonymous)) {
+ this.isAnonymous = nonNull(isAnonymous) && isAnonymous.equals("1") ? "是" : "否";
+ } else {
+ this.isAnonymous = isAnonymous;
+ }
+ }
+
+ public void setStatus(String status) {
+ if (StringUtils.isNumber(status)) {
+ switch (status) {
+ case "1":
+ this.status = "待签收";
+ break;
+ case "2":
+ this.status = "已签收";
+ break;
+ default:
+ this.status = "已取消";
+ break;
+ }
+ } else {
+ this.status = status;
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/QRCodeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/QRCodeVO.java
new file mode 100644
index 0000000..3e79a2b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/QRCodeVO.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.vos.community.warehouse;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("生成二维码传参")
+public class QRCodeVO {
+ @ApiModelProperty("数据主键id")
+ private Integer id;
+ @ApiModelProperty("二维码类型 1签收 2核销")
+ private Integer type;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/WarehouseDonatesExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/WarehouseDonatesExcelVO.java
new file mode 100644
index 0000000..f28a6a4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/WarehouseDonatesExcelVO.java
@@ -0,0 +1,71 @@
+package com.panzhihua.common.model.vos.community.warehouse;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: WarehouseDonatesExcelVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 捐赠物品ExcelVO
+ * @author: hans
+ * @date: 2021/10/09 17:42
+ */
+@Data
+public class WarehouseDonatesExcelVO implements Serializable {
+
+ private static final long serialVersionUID = -7026869907781559301L;
+
+ @ExcelProperty(value = "捐赠用户", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "联系电话", index = 1)
+ private String phone;
+
+ @ExcelProperty(value = "捐赠物品", index = 2)
+ private String item;
+
+ @ExcelProperty(value = "捐赠数量", index = 3)
+ private Integer quantity;
+
+ @ExcelProperty(value = "匿名捐赠", index = 4)
+ private String isAnonymous;
+
+ @ExcelProperty(value = "留言信息", index = 5)
+ private String message;
+
+ @ExcelProperty(value = "物品签收时间", index = 6)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date signingAt;
+
+ /**
+ * 剩余数量
+ */
+ private Integer surplusQuantity;
+ /**
+ * 捐赠状态
+ */
+ private Integer status;
+ /**
+ * 社区id
+ */
+ private Long communityId;
+ /**
+ * 物品登记时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date registerAt;
+ /**
+ * 登记人
+ */
+ private Long registerBy;
+ /**
+ * 签收人
+ */
+ private Long signingBy;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComElderAuthUserAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComElderAuthUserAppVO.java
new file mode 100644
index 0000000..6531cfc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComElderAuthUserAppVO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.vos.elders;
+
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import com.panzhihua.common.model.helper.sensitive.Sensitive;
+import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("高龄老人用户信息")
+@EncryptDecryptClass
+public class ComElderAuthUserAppVO {
+
+ @ApiModelProperty(value = "老人id")
+ private String elderId;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "身份证")
+ @Sensitive(strategy = SensitiveStrategy.ID_CARD)
+ @EncryptDecryptField
+ private String idCard;
+
+ @ApiModelProperty(value = "与本人关系(1.父母 2.配偶 3.子女 4.兄弟姐妹 5.祖/外祖父母 6.本人 7.其他)")
+ private String relation;
+
+ @ApiModelProperty(value = "是否有反馈（1.是 2.否）")
+ private Integer isFeedback = 2;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "管辖社区")
+ private String communityName;
+
+ @ApiModelProperty(value = "本月是否已认证(1.是 2.否)")
+ private Integer isAuth;
+
+ @ApiModelProperty(value = "是否健在", example = "1是，2否")
+ private Integer isExist;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComElderAuthUserDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComElderAuthUserDetailVO.java
new file mode 100644
index 0000000..09eb517
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComElderAuthUserDetailVO.java
@@ -0,0 +1,16 @@
+package com.panzhihua.common.model.vos.elders;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("高龄认证用户信息")
+public class ComElderAuthUserDetailVO {
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComEldersAuthHistoryVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComEldersAuthHistoryVO.java
new file mode 100644
index 0000000..ed3b6e3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComEldersAuthHistoryVO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.vos.elders;
+
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("高龄老人用户信息")
+@EncryptDecryptClass
+public class ComEldersAuthHistoryVO {
+
+ @ApiModelProperty(value = "认证记录id")
+ private Long id;
+
+ @ApiModelProperty(value = "认证姓名")
+ private String name;
+
+ @ApiModelProperty(value = "认证用户老人关系表id")
+ private Long userId;
+
+ @ApiModelProperty(value = "认证用户身份证")
+ @EncryptDecryptField
+ private String idCard;
+
+ @ApiModelProperty(value = "认证用户生日")
+ private String birthday;
+
+ @ApiModelProperty(value = "认证用户户籍地")
+ private String domicile;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "认证时间")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComEldersAuthStatisticHeaderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComEldersAuthStatisticHeaderVO.java
new file mode 100644
index 0000000..01559da
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComEldersAuthStatisticHeaderVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.elders;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * @deprecated 高龄老人认证统计信息
+ */
+@Data
+@ApiModel("高龄老人认证统计信息")
+public class ComEldersAuthStatisticHeaderVO {
+
+ @ApiModelProperty(value = "本期总人数")
+ private Integer allCount;
+
+ @ApiModelProperty(value = "本期认证成功总人数")
+ private Integer yesCount;
+
+ @ApiModelProperty(value = "本期认证失败总人数")
+ private Integer noCount;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComEldersAuthStatisticVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComEldersAuthStatisticVO.java
new file mode 100644
index 0000000..52bddd7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComEldersAuthStatisticVO.java
@@ -0,0 +1,93 @@
+package com.panzhihua.common.model.vos.elders;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author lyq
+ * @deprecated 高龄老人认证统计信息
+ */
+@Data
+@ApiModel("高龄老人认证统计信息")
+@EncryptDecryptClass
+public class ComEldersAuthStatisticVO {
+
+ @ApiModelProperty(value = "认证记录id")
+ private Long id;
+
+ @ApiModelProperty(value = "认证姓名")
+ private String name;
+
+ @ApiModelProperty(value = "认证用户手机号")
+ private String phone;
+
+ @ApiModelProperty(value = "认证用户身份证")
+ @EncryptDecryptField
+ private String idCard;
+
+ @ApiModelProperty(value = "性别（1.男 2.女 3.其他）")
+ private Integer sex;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "人员类别（1.80-89周岁 2.90-99周岁 3.100周岁（含）以上）")
+ private Integer personnelCategory;
+
+ @ApiModelProperty(value = "是否健在（1.是 0.否）")
+ private Integer isAlive;
+
+ @ApiModelProperty(value = "认证期数")
+ private String authPeriod;
+
+ @ApiModelProperty(value = "认证时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date authDate;
+
+ @ApiModelProperty(value = "认证方式（1.视频认证 2.人脸认证 3.线下认证）")
+ private Integer authMethod;
+
+ @ApiModelProperty(value = "标记")
+ private String mark;
+
+ @ApiModelProperty(value = "是否已认证（1.已认证 2.未认证）")
+ private Integer isAuth;
+
+ @ApiModelProperty(value = "提交用户id")
+ private Long submitUserId;
+
+ @ApiModelProperty(value = "提交用户名称")
+ private String submitUserName;
+
+ @ApiModelProperty(value = "审核人名称")
+ private String approvalName;
+
+ @ApiModelProperty(value = "现居住地址")
+ private String address;
+
+ @ApiModelProperty(value = "认证视频地址")
+ private String authVideo;
+
+ @ApiModelProperty(value = "审核状态（1.待审核 2.驳回 3.通过）")
+ private Integer approvalStatus;
+
+ @ApiModelProperty(value = "审核人id")
+ private Long approverId;
+
+ @ApiModelProperty(value = "审核时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date approvalDate;
+
+ @ApiModelProperty(value = "认证用户生日")
+ private String birthday;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComPensionAuthStatisticVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComPensionAuthStatisticVO.java
new file mode 100644
index 0000000..e6f8c47
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComPensionAuthStatisticVO.java
@@ -0,0 +1,90 @@
+package com.panzhihua.common.model.vos.elders;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author lyq
+ * @deprecated 养老认证统计信息
+ */
+@Data
+@ApiModel("养老认证统计信息")
+@EncryptDecryptClass
+public class ComPensionAuthStatisticVO {
+
+ @ApiModelProperty(value = "认证记录id")
+ private Long id;
+
+ @ApiModelProperty(value = "认证姓名")
+ private String name;
+
+ @ApiModelProperty(value = "认证用户手机号")
+ private String phone;
+
+ @ApiModelProperty(value = "认证用户身份证")
+ @EncryptDecryptField
+ private String idCard;
+
+ @ApiModelProperty(value = "性别（1.男 2.女 3.其他）")
+ private Integer sex;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "是否健在（1.是 0.否）")
+ private Integer isAlive;
+
+ @ApiModelProperty(value = "认证期数")
+ private String authPeriod;
+
+ @ApiModelProperty(value = "认证时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date authDate;
+
+ @ApiModelProperty(value = "认证方式（1.视频认证 2.人脸认证 3.线下认证）")
+ private Integer authMethod;
+
+ @ApiModelProperty(value = "标记")
+ private String mark;
+
+ @ApiModelProperty(value = "是否已认证（1.已认证 2.未认证）")
+ private Integer isAuth;
+
+ @ApiModelProperty(value = "提交用户id")
+ private Long submitUserId;
+
+ @ApiModelProperty(value = "提交用户名称")
+ private String submitUserName;
+
+ @ApiModelProperty(value = "审核人名称")
+ private String approvalName;
+
+ @ApiModelProperty(value = "现居住地址")
+ private String address;
+
+ @ApiModelProperty(value = "认证视频地址")
+ private String authVideo;
+
+ @ApiModelProperty(value = "审核状态（1.待审核 2.驳回 3.通过）")
+ private Integer approvalStatus;
+
+ @ApiModelProperty(value = "审核人id")
+ private Long approverId;
+
+ @ApiModelProperty(value = "审核时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date approvalDate;
+
+ @ApiModelProperty(value = "认证用户生日")
+ private String birthday;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoAdminVO.java
new file mode 100644
index 0000000..1a2c533
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoAdminVO.java
@@ -0,0 +1,80 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 随手拍列表
+ */
+@Data
+@ApiModel("社区活动 》随手拍")
+public class ComActEasyPhotoAdminVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("随手拍内容")
+ private String detail;
+
+ @ApiModelProperty("发布人昵称")
+ private String userNickName;
+
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)")
+ private Integer isReport;
+
+ @ApiModelProperty(value = "是否公示(0.否 1.是)")
+ private Integer isPublicity;
+
+ @ApiModelProperty(value = "处理状态（1.待处理 2.已处理）")
+ private Integer handleStatus;
+
+ @ApiModelProperty("发起人头像")
+ private String imageUrl;
+
+ @ApiModelProperty("图片路径列表，逗号分隔")
+ private String photoPathList;
+
+ @ApiModelProperty("发生地址")
+ private String happenAddr;
+
+ @ApiModelProperty(value = "地址备注")
+ private String addrRemark;
+
+ @ApiModelProperty(value = "发生地址经纬度信息，逗号分割")
+ private String lngLat;
+
+ @ApiModelProperty(value = "随手拍类型集合")
+ private List<String> photoTypeList;
+
+ @ApiModelProperty(value = "随手拍处理意见")
+ private String handleResult;
+
+ @ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔")
+ private String handlePhotoList;
+
+ @ApiModelProperty("处理人名字")
+ private String handlerName;
+
+ @ApiModelProperty("处理人id")
+ private Long handlerId;
+
+ @ApiModelProperty("处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date feedbackAt;
+
+ @ApiModelProperty("随手拍类型id")
+ private Long classifyId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoDetailsVO.java
new file mode 100644
index 0000000..912aa6e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoDetailsVO.java
@@ -0,0 +1,88 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("社区活动 》随手拍详细返回参数")
+public class ComActEasyPhotoDetailsVO {
+
+ @ApiModelProperty(value = "自增id")
+ private Long id;
+
+ @ApiModelProperty(value = "发起人id")
+ private Long sponsorId;
+
+ @ApiModelProperty(value = "发生地址")
+ private String happenAddr;
+
+ @ApiModelProperty(value = "地址备注")
+ private String addrRemark;
+
+ @ApiModelProperty(value = "状态 1待处理 2已处理")
+ private Integer status;
+
+ @ApiModelProperty(value = "处理人id")
+ private Long handlerId;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "审核时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date examineAt;
+
+ @ApiModelProperty(value = "详情")
+ private String detail;
+
+ @ApiModelProperty(value = "图片路径列表，逗号分隔")
+ private String photoPathList;
+
+ @ApiModelProperty(value = "处理结果")
+ private String handleResult;
+
+ @ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔")
+ private String handlePhotoList;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "是否匿名发布 0 否 1 是")
+ private Integer isHide;
+
+ @ApiModelProperty(value = "是否需要反馈 0 不需要 1 需要")
+ private Integer isNeedFeedBack;
+
+ @ApiModelProperty(value = "反馈时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date feedbackAt;
+
+ @ApiModelProperty(value = "驳回原因")
+ private String rejectReason;
+
+ @ApiModelProperty(value = "封面图片")
+ private String cover;
+
+ @ApiModelProperty(value = "是否删除 0 否 1 是")
+ private Integer delTag;
+
+ @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)")
+ private Integer isReport;
+
+ @ApiModelProperty(value = "是否公示(0.否 1.是)")
+ private Integer isPublicity;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoTypeDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoTypeDetailsVO.java
new file mode 100644
index 0000000..a09f845
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoTypeDetailsVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("随手拍类型详细返回参数")
+public class ComActEasyPhotoTypeDetailsVO {
+
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "随手拍类型名称")
+ private String name;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoTypeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoTypeVO.java
new file mode 100644
index 0000000..2fbdc31
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoTypeVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("随手拍类型返回参数")
+public class ComActEasyPhotoTypeVO {
+
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "随手拍类型名称")
+ private String name;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoVO.java
new file mode 100644
index 0000000..51616bf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoVO.java
@@ -0,0 +1,94 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("社区活动 》随手拍返回参数")
+public class ComActEasyPhotoVO {
+
+ @ApiModelProperty(value = "自增id")
+ private Long id;
+
+ @ApiModelProperty(value = "发起人id")
+ private Long sponsorId;
+
+ @ApiModelProperty(value = "发生地址")
+ private String happenAddr;
+
+ @ApiModelProperty(value = "地址备注")
+ private String addrRemark;
+
+ @ApiModelProperty(value = "状态 1待处理 2已处理")
+ private Integer handleStatus;
+
+ @ApiModelProperty(value = "处理人id")
+ private Long handlerId;
+
+ @ApiModelProperty(value = "处理人名字")
+ private String handlerName;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "详情")
+ private String detail;
+
+ @ApiModelProperty(value = "图片路径列表，逗号分隔")
+ private String photoPathList;
+
+ @ApiModelProperty(value = "处理结果")
+ private String handleResult;
+
+ @ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔")
+ private String handlePhotoList;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "是否匿名发布 0 否 1 是")
+ private Integer isHide;
+
+ @ApiModelProperty(value = "处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date feedbackAt;
+
+ // @ApiModelProperty(value = "封面图片")
+ // private String cover;
+
+ @ApiModelProperty(value = "是否删除 0 否 1 是")
+ private Integer delTag;
+
+ @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)")
+ private Integer isReport;
+
+ @ApiModelProperty(value = "是否公示(0.否 1.是)")
+ private Integer isPublicity;
+
+ @ApiModelProperty(value = "发布人名称")
+ private String nickName;
+
+ @ApiModelProperty(value = "发布人头像")
+ private String imageUrl;
+
+ @ApiModelProperty(value = "发生地址经纬度信息，逗号分割(长的在前面，短的在后面)")
+ private String lngLat;
+
+ @ApiModelProperty(value = "随手拍类型列表")
+ private List<String> easyPhotoList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComGridActVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComGridActVO.java
new file mode 100644
index 0000000..b710c82
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComGridActVO.java
@@ -0,0 +1,92 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 社区
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-15 10:06
+ **/
+@Data
+@ApiModel("网格社区表")
+public class ComGridActVO {
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("社区名字")
+ @NotBlank(groups = {AddGroup.class}, message = "社区名字不能为空")
+ private String name;
+
+ @ApiModelProperty("社区地址")
+ @NotBlank(groups = {AddGroup.class}, message = "社区地址不能为空")
+ private String address;
+
+ @ApiModelProperty("经度")
+ @NotBlank(groups = {AddGroup.class}, message = "经度不能为空")
+ private String lng;
+
+ @ApiModelProperty("维度")
+ @NotBlank(groups = {AddGroup.class}, message = "纬度不能为空")
+ private String lat;
+
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ @ApiModelProperty("省份地址编码")
+ @NotBlank(groups = {AddGroup.class}, message = "省份地址编码不能为空")
+ private String provinceCode;
+
+ @ApiModelProperty("市级地址编码")
+ @NotBlank(groups = {AddGroup.class}, message = "市级地址编码不能为空")
+ private String cityCode;
+
+ @ApiModelProperty("区级地址编码")
+ @NotBlank(groups = {AddGroup.class}, message = "区级地址编码不能为空")
+ private String areaCode;
+
+ @ApiModelProperty("区级地址编码-名字")
+ private String areaName;
+
+ @ApiModelProperty("社区面积")
+ @Min(value = 1, groups = {AddGroup.class}, message = "社区面积不能为空")
+ private Double square;
+
+ @ApiModelProperty("联系人")
+ @NotBlank(groups = {AddGroup.class}, message = "联系人不能为空")
+ private String contacts;
+
+ @ApiModelProperty("联系人电话")
+ @NotBlank(groups = {AddGroup.class}, message = "联系人电话不能为空")
+ private String contactsPhone;
+
+ @ApiModelProperty("超管账号")
+ @NotBlank(groups = {AddGroup.class}, message = "超管账号不能为空")
+ private String account;
+
+ @ApiModelProperty("账号密码")
+ @NotBlank(groups = {AddGroup.class}, message = "账号密码不能为空")
+ private String password;
+
+ @ApiModelProperty(value = "状态 0 启用 1 禁用", example = "0")
+ private Integer state;
+
+ @ApiModelProperty("距离-单位米")
+ private String distance;
+
+ @ApiModelProperty("街道Id")
+ private Long streetId;
+
+ @ApiModelProperty("是否默认")
+ private Boolean isGridUserDefault = false;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMapGridDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMapGridDetailVO.java
new file mode 100644
index 0000000..52555b1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMapGridDetailVO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 地图模块-网格详细信息
+ */
+@Data
+@ApiModel("地图模块-网格详细信息")
+public class ComMapGridDetailVO {
+
+ @ApiModelProperty("网格id")
+ private Long id;
+
+ @ApiModelProperty("网格名称")
+ private String gridName;
+
+ @ApiModelProperty("网格面积")
+ private String area;
+
+ @ApiModelProperty("线条颜色")
+ private String lineColor;
+
+ @ApiModelProperty("线条宽度")
+ private String lineBroadband;
+
+ @ApiModelProperty("填充颜色")
+ private String fillColor;
+
+ @ApiModelProperty("备注")
+ private String remarks;
+
+ @ApiModelProperty("围栏数据")
+ private String data;
+
+ @ApiModelProperty("网格员待处理事件列表")
+ private List<ComMapGridEventVO> gridEventList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMapGridEventVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMapGridEventVO.java
new file mode 100644
index 0000000..77a1006
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMapGridEventVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 地图模块-事件信息
+ */
+@Data
+@ApiModel("地图模块-事件信息")
+public class ComMapGridEventVO {
+
+ @ApiModelProperty("事件id")
+ private Long id;
+
+ @ApiModelProperty("事件类型(1.治安隐患 2.公共服务 3.矛盾纠纷 4.不稳定因素 5.突发事件 6.特殊人员上报 7.走访任务)")
+ private String type;
+
+ @ApiModelProperty("事件标题")
+ private String eventTitle;
+
+ @ApiModelProperty("发生地点备注")
+ private String happentAddress;
+
+ @ApiModelProperty("发生地点位置")
+ private String happenAddress;
+
+ @ApiModelProperty("发生的精度纬度信息（逗号隔开）")
+ private String happentLatLng;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseDetailVO.java
new file mode 100644
index 0000000..49d1713
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseDetailVO.java
@@ -0,0 +1,56 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 小区下楼栋单元房间详情返回参数
+ */
+@Data
+@ApiModel("小区下楼栋单元房间详情返回参数")
+public class ComMngVillageBuildingHouseDetailVO {
+
+ @ApiModelProperty("房屋id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("小区名称")
+ private String villageName;
+
+ @ApiModelProperty("楼栋号")
+ private String floor;
+
+ @ApiModelProperty("单元号")
+ private String unitNo;
+
+ @ApiModelProperty("楼层数")
+ private String buildingNum;
+
+ @ApiModelProperty("户室号")
+ private String houseNo;
+
+ @ApiModelProperty("房屋地址")
+ private String address;
+
+ @ApiModelProperty("房屋状态(1.自住 2.租住 3.其他)")
+ private Integer status;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ private String lng;
+
+ @ApiModelProperty("户主列表")
+ private List<PopulationListVO> householderList;
+
+ @ApiModelProperty("居民列表")
+ private List<PopulationListVO> populationList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseVO.java
new file mode 100644
index 0000000..65b7882
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingHouseVO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.vos.grid;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 小区下楼栋单元列表返回参数
+ */
+@Data
+@ApiModel("小区下楼栋单元房间列表返回参数")
+public class ComMngVillageBuildingHouseVO {
+
+ @ApiModelProperty("房屋id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("户室号")
+ private String houseNo;
+
+ @ApiModelProperty("房屋状态(1.自住 2.租住 3.空置 4.其他)")
+ private Integer status;
+
+ @ApiModelProperty("在住居民数")
+ private Integer userNum;
+
+ @ApiModelProperty("楼层数")
+ private String buildingNum;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingVO.java
new file mode 100644
index 0000000..7117dd7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMngVillageBuildingVO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.vos.grid;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 小区下楼栋单元列表返回参数
+ */
+@Data
+@ApiModel("小区下楼栋单元列表返回参数")
+public class ComMngVillageBuildingVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long villageId;
+
+ @ApiModelProperty("楼栋号")
+ private String floor;
+
+ @ApiModelProperty("单元号")
+ private String unitNo;
+
+ @ApiModelProperty("拼接好楼栋号")
+ private String floorString;
+
+ @ApiModelProperty("拼接好单元号")
+ private String unitNoString;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationAppReleaseDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationAppReleaseDetailsVO.java
new file mode 100644
index 0000000..18ff976
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationAppReleaseDetailsVO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("APP应用版本信息详细返回参数")
+public class EventApplicationAppReleaseDetailsVO {
+
+ @ApiModelProperty(value = "id")
+ private Long id;
+
+ @ApiModelProperty(value = "应用ID")
+ private Integer productId;
+
+ @ApiModelProperty(value = "应用名称")
+ private String productName;
+
+ @ApiModelProperty(value = "版本编号")
+ private String releaseNumber;
+
+ @ApiModelProperty(value = "通知行为(1、强制更新2、提示更新)")
+ private Integer action;
+
+ @ApiModelProperty(value = "版本地址")
+ private String url;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationAppReleaseVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationAppReleaseVO.java
new file mode 100644
index 0000000..be1e433
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationAppReleaseVO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("APP应用版本信息返回参数")
+public class EventApplicationAppReleaseVO {
+
+ @ApiModelProperty(value = "id")
+ private Long id;
+
+ @ApiModelProperty(value = "应用ID")
+ private Integer productId;
+
+ @ApiModelProperty(value = "应用名称")
+ private String productName;
+
+ @ApiModelProperty(value = "版本编号")
+ private String releaseNumber;
+
+ @ApiModelProperty(value = "通知行为(1、强制更新2、提示更新)")
+ private Integer action;
+
+ @ApiModelProperty(value = "版本地址")
+ private String url;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationUserNoticeDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationUserNoticeDetailsVO.java
new file mode 100644
index 0000000..637a387
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationUserNoticeDetailsVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("用户协议和隐私政策信息详细返回参数")
+public class EventApplicationUserNoticeDetailsVO {
+
+ @ApiModelProperty(value = "id")
+ private Long id;
+
+ @ApiModelProperty(value = "应用ID")
+ private Integer productId;
+
+ @ApiModelProperty(value = "应用名称")
+ private String productName;
+
+ @ApiModelProperty(value = "通知行为(1、强制通知必须手段确定2、提示更新，自动消退)")
+ private Integer action;
+
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationUserNoticeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationUserNoticeVO.java
new file mode 100644
index 0000000..f8a7a0d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventApplicationUserNoticeVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("用户协议和隐私政策信息返回参数")
+public class EventApplicationUserNoticeVO {
+
+ @ApiModelProperty(value = "id")
+ private Long id;
+
+ @ApiModelProperty(value = "应用ID")
+ private Integer productId;
+
+ @ApiModelProperty(value = "应用名称")
+ private String productName;
+
+ @ApiModelProperty(value = "通知行为(1、强制通知必须手段确定2、提示更新，自动消退)")
+ private Integer action;
+
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java
new file mode 100644
index 0000000..c85c0d2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java
@@ -0,0 +1,206 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("事件详细返回参数")
+public class EventDetailsVO {
+
+ @ApiModelProperty(value = "id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty(value = "事件处理状态")
+ private Integer eventDealStatus;
+
+ @ApiModelProperty(value = "服务单号")
+ private String orderSn;
+
+ @ApiModelProperty(value = "事件类型")
+ private String EventClazz;
+
+ @ApiModelProperty(value = "1、办件事件2是宣传事件3是阅读事件")
+ private Long eventCategory;
+
+ @ApiModelProperty(value = "网格员所处的街道")
+ private Long gridMemberStreet;
+
+ @ApiModelProperty(value = "网格员所处社区")
+ private Long gridMemberCommunity;
+
+ @ApiModelProperty(value = "网格ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long gridId;
+
+ @ApiModelProperty(value = "网格名称")
+ private String gridName;
+
+ @ApiModelProperty(value = "网格员")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long gridMemberId;
+
+ @ApiModelProperty(value = "网格员名字")
+ private String gridMemberName;
+
+ @ApiModelProperty(value = "网格员头像")
+ private String gridMemberImageUrl;
+
+ @ApiModelProperty(value = "网格员联系方式")
+ private String gridMemberTelephone;
+
+ @ApiModelProperty(value = "事件标题")
+ private String eventTitle;
+
+ @ApiModelProperty(value = "宣传类型")
+ private String propagandaType;
+
+ @ApiModelProperty(value = "宣传时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date propagandaTime;
+
+ @ApiModelProperty(value = "当event_type_category是1填写事件类型1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报")
+ private Integer eventType;
+
+ @ApiModelProperty(value = "事件描述")
+ private String eventDes;
+
+ @ApiModelProperty(value = "宣传对象")
+ private String propagandaObject;
+
+ @ApiModelProperty(value = "宣传人数")
+ private String propagandaNum;
+
+ @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)")
+ private Integer communityProcess;
+
+ @ApiModelProperty(value = "发生时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date happenTime;
+
+ @ApiModelProperty(value = "事件发生地点备注")
+ private String happentAddress;
+
+ @ApiModelProperty(value = "事件发生地点")
+ private String happenAddress;
+
+ @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）")
+ private String happentLatLng;
+
+ @ApiModelProperty(value = "事件状态（1草稿箱2发布3逻辑删除4、撤销）")
+ private Integer eventStatus;
+
+ @ApiModelProperty(value = "1待处理2已解决3待验证")
+ private Integer eventProcessStatus;
+
+ @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）")
+ private Integer processType;
+
+ @ApiModelProperty(value = "处理人ID")
+ private Long processUserId;
+
+ @ApiModelProperty(value = "处理流程记录ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long processRecordId;
+
+ @ApiModelProperty(value = "处理人名称")
+ private String processUserName;
+
+ @ApiModelProperty(value = "处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date processDate;
+
+ @ApiModelProperty(value = "解决人针对解决事件的处理描述")
+ private String processDesc;
+
+ @ApiModelProperty(value = "事件来源")
+ private String eventResource;
+
+ @ApiModelProperty(value = "危险级别")
+ private Integer dangerLevel;
+
+ @ApiModelProperty(value = "红牌")
+ private Boolean redCard;
+
+ @ApiModelProperty(value = "黄牌")
+ private Boolean yellowCard;
+
+ @ApiModelProperty(value = "是否有效")
+ private Boolean invalid;
+
+ @ApiModelProperty(value = "是否重大")
+ private Boolean major;
+
+ @ApiModelProperty(value = "死亡人数")
+ private Integer deathsNumber;
+
+ @ApiModelProperty(value = "受伤人数")
+ private Integer injuriesNumber;
+
+ @ApiModelProperty(value = "是否疑难事件")
+ private Boolean difficult;
+
+ @ApiModelProperty(value = "是否紧急")
+ private Boolean urgent;
+
+ @ApiModelProperty(value = "是否催办")
+ private Boolean urgentDell;
+
+ @ApiModelProperty(value = "上报提交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date submitDate;
+
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建人姓名")
+ private String creator;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "修改人")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty(value = "音频")
+ private List<EventResourceVO> audios;
+
+ @ApiModelProperty(value = "视频")
+ private List<EventResourceVO> videos;
+
+ @ApiModelProperty(value = "图片")
+ private List<EventResourceVO> pics;
+
+ @ApiModelProperty(value = "事件处理数据")
+ private List<EventTransferRecordVO> trans;
+
+ @ApiModelProperty(value = "特殊人群列表")
+ private List<EventSpecialPopulationDetailsVO> populationList;
+
+ @ApiModelProperty(value = "网格绑定社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "撤销人")
+ private String revoke;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridAdminVO.java
new file mode 100644
index 0000000..f13f274
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridAdminVO.java
@@ -0,0 +1,51 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("管理后台-网格返回参数")
+public class EventGridAdminVO {
+
+ @ApiModelProperty(value = "网格id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ @ApiModelProperty(value = "网格名称")
+ private String gridName;
+ @ApiModelProperty(value = "网格员")
+ private List<GridMemberAdminVO> gridMembers;
+ @ApiModelProperty(value = "网格描述")
+ private String remarks;
+ @ApiModelProperty(value = "网格面积")
+ private BigDecimal area;
+ @ApiModelProperty(value = "居住人口")
+ private Integer populationTotal = 0;
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+ @ApiModelProperty(value = "线条颜色")
+ private String lineColor;
+ @ApiModelProperty(value = "线条宽度")
+ private String lineBroadband;
+ @ApiModelProperty(value = "填充颜色")
+ private String fillColor;
+ @ApiModelProperty(value = "围栏数据")
+ private String data;
+ @ApiModelProperty(value = "所在社区")
+ private String communityName;
+ @ApiModelProperty(value = "关联市平台id")
+ private String lcGirdId;
+ @ApiModelProperty(value = "关联市平台网格")
+ private String lcGirdName;
+ @ApiModelProperty(value = "网格所属社区id")
+ private Long gridCommunityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridCommunityAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridCommunityAdminVO.java
new file mode 100644
index 0000000..d662fbe
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridCommunityAdminVO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.vos.grid;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("管理后台-社区返回参数")
+public class EventGridCommunityAdminVO {
+
+ @ApiModelProperty(value = "社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ @ApiModelProperty(value = "社区名称")
+ private String name;
+
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ @ApiModelProperty(value = "维度")
+ private String lat;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataAreaVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataAreaVO.java
new file mode 100644
index 0000000..9eff6a3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataAreaVO.java
@@ -0,0 +1,87 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("网格数据")
+public class EventGridDataAreaVO {
+
+ @ApiModelProperty(value = "主键ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty(value = "类型，1、区县网格2街道网格3社区网格")
+ private Long type;
+
+ @ApiModelProperty(value = "区/县ID")
+ private Long zoneId;
+
+ @ApiModelProperty(value = "区/县名称")
+ private String zoneName;
+
+ @ApiModelProperty(value = "网格所属街道")
+ private Long gridStreetId;
+
+ @ApiModelProperty(value = "网格所属街道名称")
+ private String gridStreetName;
+
+ @ApiModelProperty(value = "网格所属社区ID")
+ private Long gridCommunityId;
+
+ @ApiModelProperty(value = "网格所属社区名称")
+ private String gridCommunityName;
+
+ @ApiModelProperty(value = "网格名称")
+ private String gridName;
+
+ @ApiModelProperty(value = "所属图层")
+ private Integer mapLevel;
+
+ @ApiModelProperty(value = "面积")
+ private String area;
+
+ @ApiModelProperty(value = "线条颜色")
+ private String lineColor;
+
+ @ApiModelProperty(value = "线条宽度")
+ private String lineBroadband;
+
+ @ApiModelProperty(value = "填充颜色")
+ private String fillColor;
+
+ @ApiModelProperty(value = "备注")
+ private String remarks;
+
+ @ApiModelProperty(value = "围栏数据")
+ private String data;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "修改人")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataDetailsVO.java
new file mode 100644
index 0000000..c5242bf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataDetailsVO.java
@@ -0,0 +1,75 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("区县/街道/社区/网格员网格数据管理详细返回参数")
+public class EventGridDataDetailsVO {
+
+ @ApiModelProperty(value = "主键ID")
+ private Long id;
+
+ @ApiModelProperty(value = "类型，1、区县网格2街道网格3社区网格")
+ private Long type;
+
+ @ApiModelProperty(value = "区/县ID")
+ private Long zoneId;
+
+ @ApiModelProperty(value = "网格所属街道")
+ private Long gridStreetId;
+
+ @ApiModelProperty(value = "网格所属社区ID")
+ private Long gridCommunityId;
+
+ @ApiModelProperty(value = "网格名称")
+ private String gridName;
+
+ @ApiModelProperty(value = "所属图层")
+ private Integer mapLevel;
+
+ @ApiModelProperty(value = "面积")
+ private String area;
+
+ @ApiModelProperty(value = "线条颜色")
+ private String lineColor;
+
+ @ApiModelProperty(value = "线条宽度")
+ private String lineBroadband;
+
+ @ApiModelProperty(value = "填充颜色")
+ private String fillColor;
+
+ @ApiModelProperty(value = "备注")
+ private String remarks;
+
+ @ApiModelProperty(value = "围栏数据")
+ private String data;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "修改人")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataVO.java
new file mode 100644
index 0000000..42f6baa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataVO.java
@@ -0,0 +1,78 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("区县/街道/社区/网格员网格数据管理返回参数")
+public class EventGridDataVO {
+
+ @ApiModelProperty(value = "主键ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty(value = "类型，1、区县网格2街道网格3社区网格")
+ private Long type;
+
+ @ApiModelProperty(value = "区/县ID")
+ private Long zoneId;
+
+ @ApiModelProperty(value = "网格所属街道")
+ private Long gridStreetId;
+
+ @ApiModelProperty(value = "网格所属社区ID")
+ private Long gridCommunityId;
+
+ @ApiModelProperty(value = "网格名称")
+ private String gridName;
+
+ @ApiModelProperty(value = "所属图层")
+ private Integer mapLevel;
+
+ @ApiModelProperty(value = "面积")
+ private String area;
+
+ @ApiModelProperty(value = "线条颜色")
+ private String lineColor;
+
+ @ApiModelProperty(value = "线条宽度")
+ private String lineBroadband;
+
+ @ApiModelProperty(value = "填充颜色")
+ private String fillColor;
+
+ @ApiModelProperty(value = "备注")
+ private String remarks;
+
+ @ApiModelProperty(value = "围栏数据")
+ private String data;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "修改人")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberAdminVO.java
new file mode 100644
index 0000000..32e3ec6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberAdminVO.java
@@ -0,0 +1,15 @@
+package com.panzhihua.common.model.vos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("管理后台-网格员返回参数")
+public class EventGridMemberAdminVO {
+
+ @ApiModelProperty(value = "网格id")
+ private Long userId;
+ @ApiModelProperty(value = "网格名称")
+ private String nickName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberGpsLogDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberGpsLogDetailsVO.java
new file mode 100644
index 0000000..7073969
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberGpsLogDetailsVO.java
@@ -0,0 +1,53 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("网格员定时上报地理信息详细返回参数")
+public class EventGridMemberGpsLogDetailsVO {
+
+ @ApiModelProperty(value = "主键ID")
+ private Long id;
+
+ @ApiModelProperty(value = "网格所属街道")
+ private Long gridStreetId;
+
+ @ApiModelProperty(value = "网格所属社区ID")
+ private Long gridCommunityId;
+
+ @ApiModelProperty(value = "网格ID")
+ private Long gridId;
+
+ @ApiModelProperty(value = "网格名称")
+ private String gridName;
+
+ @ApiModelProperty(value = "网格员ID")
+ private Long gridMemberId;
+
+ @ApiModelProperty(value = "精度维度信息，逗号分割")
+ private String lngLat;
+
+ @ApiModelProperty(value = "位置信息状态（1、为判定2、正常3、是不正常）")
+ private Integer positionStation;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberGpsLogVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberGpsLogVO.java
new file mode 100644
index 0000000..90e7bb4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberGpsLogVO.java
@@ -0,0 +1,53 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("网格员定时上报地理信息返回参数")
+public class EventGridMemberGpsLogVO {
+
+ @ApiModelProperty(value = "主键ID")
+ private Long id;
+
+ @ApiModelProperty(value = "网格所属街道")
+ private Long gridStreetId;
+
+ @ApiModelProperty(value = "网格所属社区ID")
+ private Long gridCommunityId;
+
+ @ApiModelProperty(value = "网格ID")
+ private Long gridId;
+
+ @ApiModelProperty(value = "网格名称")
+ private String gridName;
+
+ @ApiModelProperty(value = "网格员ID")
+ private Long gridMemberId;
+
+ @ApiModelProperty(value = "精度维度信息，逗号分割")
+ private String lngLat;
+
+ @ApiModelProperty(value = "位置信息状态（1、为判定2、正常3、是不正常）")
+ private Integer positionStation;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberRelationDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberRelationDetailsVO.java
new file mode 100644
index 0000000..04a2b5e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberRelationDetailsVO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("网格和网格员的关联关系详细返回参数")
+public class EventGridMemberRelationDetailsVO {
+
+ @ApiModelProperty(value = "主键ID")
+ private Long id;
+
+ @ApiModelProperty(value = "网格所属街道")
+ private Long gridStreetId;
+
+ @ApiModelProperty(value = "网格所属社区ID")
+ private Long gridCommunityId;
+
+ @ApiModelProperty(value = "网格ID")
+ private Long gridId;
+
+ @ApiModelProperty(value = "网格名称")
+ private String gridName;
+
+ @ApiModelProperty(value = "网格员ID")
+ private Long gridMemberId;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberRelationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberRelationVO.java
new file mode 100644
index 0000000..526330a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberRelationVO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("网格和网格员的关联关系返回参数")
+public class EventGridMemberRelationVO {
+
+ @ApiModelProperty(value = "主键ID")
+ private Long id;
+
+ @ApiModelProperty(value = "网格所属街道")
+ private Long gridStreetId;
+
+ @ApiModelProperty(value = "网格所属社区ID")
+ private Long gridCommunityId;
+
+ @ApiModelProperty(value = "网格ID")
+ private Long gridId;
+
+ @ApiModelProperty(value = "网格名称")
+ private String gridName;
+
+ @ApiModelProperty(value = "网格员ID")
+ private Long gridMemberId;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberWarnLogAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberWarnLogAdminVO.java
new file mode 100644
index 0000000..b955f42
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberWarnLogAdminVO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.vos.grid;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("网格员预警记录返回参数")
+public class EventGridMemberWarnLogAdminVO {
+
+ @ApiModelProperty(value = "主键ID")
+ private Long id;
+
+ @ApiModelProperty(value = "地点")
+ private String positionAddress;
+
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+ @ApiModelProperty(value = "预警发生时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String happenAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberWarnLogDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberWarnLogDetailsVO.java
new file mode 100644
index 0000000..561799d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberWarnLogDetailsVO.java
@@ -0,0 +1,53 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("网格员定时上报地理预警记录详细返回参数")
+public class EventGridMemberWarnLogDetailsVO {
+
+ @ApiModelProperty(value = "主键ID")
+ private Long id;
+
+ @ApiModelProperty(value = "网格所属街道")
+ private Long gridStreetId;
+
+ @ApiModelProperty(value = "网格所属社区ID")
+ private Long gridCommunityId;
+
+ @ApiModelProperty(value = "网格ID")
+ private Long gridId;
+
+ @ApiModelProperty(value = "网格名称")
+ private String gridName;
+
+ @ApiModelProperty(value = "网格员ID")
+ private Long gridMemberId;
+
+ @ApiModelProperty(value = "精度维度信息，逗号分割")
+ private String lngLat;
+
+ @ApiModelProperty(value = "预警信息内容")
+ private String content;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberWarnLogVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberWarnLogVO.java
new file mode 100644
index 0000000..ba47e8c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberWarnLogVO.java
@@ -0,0 +1,53 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("网格员定时上报地理预警记录返回参数")
+public class EventGridMemberWarnLogVO {
+
+ @ApiModelProperty(value = "主键ID")
+ private Long id;
+
+ @ApiModelProperty(value = "网格所属街道")
+ private Long gridStreetId;
+
+ @ApiModelProperty(value = "网格所属社区ID")
+ private Long gridCommunityId;
+
+ @ApiModelProperty(value = "网格ID")
+ private Long gridId;
+
+ @ApiModelProperty(value = "网格名称")
+ private String gridName;
+
+ @ApiModelProperty(value = "网格员ID")
+ private Long gridMemberId;
+
+ @ApiModelProperty(value = "精度维度信息，逗号分割")
+ private String lngLat;
+
+ @ApiModelProperty(value = "预警信息内容")
+ private String content;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventLcGridAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventLcGridAdminVO.java
new file mode 100644
index 0000000..dcbb2de
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventLcGridAdminVO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.vos.grid;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("管理后台-市平台网格返回参数")
+public class EventLcGridAdminVO {
+
+ @ApiModelProperty(value = "市平台网格关联id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty(value = "浪潮市平台网格名称")
+ private String lcGridName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMainMemberDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMainMemberDetailsVO.java
new file mode 100644
index 0000000..709626c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMainMemberDetailsVO.java
@@ -0,0 +1,116 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("重点人群记录详细返回参数")
+public class EventMainMemberDetailsVO {
+
+ @ApiModelProperty(value = "id")
+ private Long id;
+
+ @ApiModelProperty(value = "网格员所处的街道")
+ private Long gridMemberStreet;
+
+ @ApiModelProperty(value = "网格员所处社区")
+ private Long gridMemberCommunity;
+
+ @ApiModelProperty(value = "网格员")
+ private Long gridMember;
+
+ @ApiModelProperty(value = "网格员名字")
+ private String gridMemberName;
+
+ @ApiModelProperty(value = "网格员联系方式")
+ private String gridMemberTele;
+
+ @ApiModelProperty(value = "需走访人ID")
+ private Long visiterId;
+
+ @ApiModelProperty(value = "需走访人名字")
+ private String visiterName;
+
+ @ApiModelProperty(value = "需走访人员性别")
+ private Integer visiterSex;
+
+ @ApiModelProperty(value = "需走访人电话")
+ private String visiterTele;
+
+ @ApiModelProperty(value = "需走访人居住地址")
+ private String visiterAddress;
+
+ @ApiModelProperty(value = "需走访人地址精度纬度信息（逗号隔开）")
+ private String visiterAddressLatLng;
+
+ @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员")
+ private Integer visiterType;
+
+ @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)")
+ private Integer actOpara;
+
+ @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）")
+ private Integer eventStatus;
+
+ @ApiModelProperty(value = "上报状态")
+ private Integer reporting;
+
+ @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）")
+ private Integer dellType;
+
+ @ApiModelProperty(value = "处理人ID")
+ private Long dellUserId;
+
+ @ApiModelProperty(value = "处理人名称")
+ private String dellUserName;
+
+ @ApiModelProperty(value = "处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date dellDate;
+
+ @ApiModelProperty(value = "解决人针对解决事件的处理描述")
+ private String dellDesc;
+
+ @ApiModelProperty(value = "是否有效")
+ private Boolean invalid;
+
+ @ApiModelProperty(value = "是否紧急")
+ private Boolean urgent;
+
+ @ApiModelProperty(value = "是否催办")
+ private Boolean urgentDell;
+
+ @ApiModelProperty(value = "上报提交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date submitDate;
+
+ @ApiModelProperty(value = "走访频率配置，一个月几次")
+ private String visiterConfig;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建事件")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "修改人")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMainMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMainMemberVO.java
new file mode 100644
index 0000000..6e06206
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMainMemberVO.java
@@ -0,0 +1,116 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("重点人群记录返回参数")
+public class EventMainMemberVO {
+
+ @ApiModelProperty(value = "id")
+ private Long id;
+
+ @ApiModelProperty(value = "网格员所处的街道")
+ private Long gridMemberStreet;
+
+ @ApiModelProperty(value = "网格员所处社区")
+ private Long gridMemberCommunity;
+
+ @ApiModelProperty(value = "网格员")
+ private Long gridMember;
+
+ @ApiModelProperty(value = "网格员名字")
+ private String gridMemberName;
+
+ @ApiModelProperty(value = "网格员联系方式")
+ private String gridMemberTele;
+
+ @ApiModelProperty(value = "需走访人ID")
+ private Long visiterId;
+
+ @ApiModelProperty(value = "需走访人名字")
+ private String visiterName;
+
+ @ApiModelProperty(value = "需走访人员性别")
+ private Integer visiterSex;
+
+ @ApiModelProperty(value = "需走访人电话")
+ private String visiterTele;
+
+ @ApiModelProperty(value = "需走访人居住地址")
+ private String visiterAddress;
+
+ @ApiModelProperty(value = "需走访人地址精度纬度信息（逗号隔开）")
+ private String visiterAddressLatLng;
+
+ @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员")
+ private Integer visiterType;
+
+ @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)")
+ private Integer actOpara;
+
+ @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）")
+ private Integer eventStatus;
+
+ @ApiModelProperty(value = "上报状态")
+ private Integer reporting;
+
+ @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）")
+ private Integer dellType;
+
+ @ApiModelProperty(value = "处理人ID")
+ private Long dellUserId;
+
+ @ApiModelProperty(value = "处理人名称")
+ private String dellUserName;
+
+ @ApiModelProperty(value = "处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date dellDate;
+
+ @ApiModelProperty(value = "解决人针对解决事件的处理描述")
+ private String dellDesc;
+
+ @ApiModelProperty(value = "是否有效")
+ private Boolean invalid;
+
+ @ApiModelProperty(value = "是否紧急")
+ private Boolean urgent;
+
+ @ApiModelProperty(value = "是否催办")
+ private Boolean urgentDell;
+
+ @ApiModelProperty(value = "上报提交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date submitDate;
+
+ @ApiModelProperty(value = "走访频率配置，一个月几次")
+ private String visiterConfig;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建事件")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "修改人")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapGridCascadeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapGridCascadeVO.java
new file mode 100644
index 0000000..f95de6f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapGridCascadeVO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 地图模块-网格员绑定的网格信息
+ */
+@Data
+@ApiModel("地图模块-网格员绑定的网格信息")
+public class EventMapGridCascadeVO {
+
+ @ApiModelProperty("网格id")
+ private Long gridId;
+
+ @ApiModelProperty("网格名字")
+ private String gridName;
+
+ @ApiModelProperty("网格所属社区id")
+ private Long gridCommunityId;
+
+ @ApiModelProperty("社区下网格列表")
+ private List<EventMapGridCascadeVO> childList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapGridVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapGridVO.java
new file mode 100644
index 0000000..57d0071
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapGridVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 地图模块-网格员绑定的网格信息
+ */
+@Data
+@ApiModel("地图模块-网格员绑定的网格信息")
+public class EventMapGridVO {
+
+ @ApiModelProperty("网格id")
+ private Long gridId;
+
+ @ApiModelProperty("网格名字")
+ private String gridName;
+
+ @ApiModelProperty("网格社区id")
+ private Long gridCommunityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapTrajectoryVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapTrajectoryVO.java
new file mode 100644
index 0000000..a04e62b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapTrajectoryVO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.vos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 地图模块-网格员运动轨迹返回参数
+ */
+@Data
+@ApiModel("地图模块-网格员运动轨迹返回参数")
+public class EventMapTrajectoryVO {
+
+ @ApiModelProperty("运动轨迹id")
+ private Long id;
+
+ @ApiModelProperty("运动轨迹经纬度")
+ private String lngLat;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceDetailsVO.java
new file mode 100644
index 0000000..6715e97
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceDetailsVO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("事件或者走访中关联的图片音频和视频文件详细返回参数")
+public class EventResourceDetailsVO {
+
+ @ApiModelProperty(value = "分类（1、事件 2、走访）")
+ private Integer classification;
+
+ @ApiModelProperty(value = "事件或者走访任务关联ID")
+ private Long id;
+
+ @ApiModelProperty(value = "事件上传的资源类型(1是图片2是音频3是是视频)")
+ private Integer type;
+
+ @ApiModelProperty(value = "资源名称")
+ private String resourceName;
+
+ @ApiModelProperty(value = "资源大小")
+ private String resourceSize;
+
+ @ApiModelProperty(value = "事件上传的资源URL地址")
+ private String url;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java
new file mode 100644
index 0000000..960be3f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java
@@ -0,0 +1,53 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("事件或者走访中关联的图片音频和视频文件返回参数")
+public class EventResourceVO {
+
+ @ApiModelProperty(value = "分类（1、事件 2、走访 3、事件流转））")
+ private Integer classification;
+
+ @ApiModelProperty(value = "事件或者走访任务关联ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty(value = "事件上传的资源类型(1是图片2是音频3是是视频)")
+ private Integer type;
+
+ @ApiModelProperty(value = "资源名称")
+ private String resourceName;
+
+ @ApiModelProperty(value = "资源大小")
+ private String resourceSize;
+
+ @ApiModelProperty(value = "资源时长")
+ private Integer resourceTime;
+
+ @ApiModelProperty(value = "事件上传的资源URL地址")
+ private String url;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventSpecialPopulationDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventSpecialPopulationDetailsVO.java
new file mode 100644
index 0000000..bcec63f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventSpecialPopulationDetailsVO.java
@@ -0,0 +1,52 @@
+package com.panzhihua.common.model.vos.grid;
+
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@EncryptDecryptClass
+@ApiModel("特殊人群信息返回参数")
+public class EventSpecialPopulationDetailsVO {
+
+ @ApiModelProperty(value = "id")
+ private Long id;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "手机号")
+ @EncryptDecryptField
+ private String phone;
+
+ @ApiModelProperty(value = "身份证号码")
+ @EncryptDecryptField
+ private String idCard;
+
+ @ApiModelProperty(value = "标签")
+ private String label;
+
+ @ApiModelProperty(value = "居住地址")
+ private String address;
+
+ @ApiModelProperty(value = "民族")
+ private String nation;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(
+ value = "政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
+ private Integer politicalOutlook;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventSpecialPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventSpecialPopulationVO.java
new file mode 100644
index 0000000..68e97b0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventSpecialPopulationVO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.grid;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("特殊人群上报-人口数据返回参数")
+@EncryptDecryptClass
+public class EventSpecialPopulationVO {
+
+ @ApiModelProperty("实有人口id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("身份证号")
+ @EncryptDecryptField
+ private String idCard;
+
+ @ApiModelProperty("人员标签")
+ private String label;
+
+ @ApiModelProperty("居住地址")
+ private String address;
+
+ @ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
+ private Integer politicalOutlook;
+
+ @ApiModelProperty("年龄")
+ private Integer age;
+
+ @ApiModelProperty("手机号")
+ @EncryptDecryptField
+ private String phone;
+
+ @ApiModelProperty("性别（1.男 2.女 3.保密）")
+ private Integer sex;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventStatisticsAllAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventStatisticsAllAdminVO.java
new file mode 100644
index 0000000..5f63d0b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventStatisticsAllAdminVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("管理后台统计网格所有事件返回参数")
+public class EventStatisticsAllAdminVO {
+
+ @ApiModelProperty(value = "发布事件总数")
+ private Integer eventTotal;
+
+ @ApiModelProperty(value = "处理事件总数")
+ private Integer handleEventTotal;
+
+ @ApiModelProperty(value = "发布宣传教育总数")
+ private Integer propagandaEducationTotal;
+
+ @ApiModelProperty(value = "随手拍处理总数")
+ private Integer easyPhotoTotal;
+
+ @ApiModelProperty(value = "新增居民数")
+ private Integer addResidentTotal = 0;
+
+ @ApiModelProperty(value = "新增实有房屋数")
+ private Integer addHouseTotal = 0;
+
+ @ApiModelProperty(value = "完成走访数")
+ private Integer finishVisitTotal = 0;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventStatisticsMemberAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventStatisticsMemberAdminVO.java
new file mode 100644
index 0000000..c28032c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventStatisticsMemberAdminVO.java
@@ -0,0 +1,65 @@
+package com.panzhihua.common.model.vos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("管理后台统计网格员返回参数")
+public class EventStatisticsMemberAdminVO {
+
+ @ApiModelProperty(value = "网格员名称")
+ private String nickName;
+
+ @ApiModelProperty(value = "发布突发事件")
+ private Integer addTFTotal;
+
+ @ApiModelProperty(value = "处理突发事件")
+ private Integer handleTFTotal;
+
+ @ApiModelProperty(value = "发布矛盾纠纷")
+ private Integer addMDTotal;
+
+ @ApiModelProperty(value = "处理矛盾纠纷")
+ private Integer handleMDTotal;
+
+ @ApiModelProperty(value = "发布治安隐患")
+ private Integer addZATotal;
+
+ @ApiModelProperty(value = "处理治安隐患")
+ private Integer handleZATotal;
+
+ @ApiModelProperty(value = "发布不稳定因素")
+ private Integer addBWDTotal;
+
+ @ApiModelProperty(value = "处理不稳定因素")
+ private Integer handleBWDTotal;
+
+ @ApiModelProperty(value = "发布公共服务")
+ private Integer addGGTotal;
+
+ @ApiModelProperty(value = "处理公共服务")
+ private Integer handleGGTotal;
+
+ @ApiModelProperty(value = "发布特殊人群")
+ private Integer addTSTotal;
+
+ @ApiModelProperty(value = "处理特殊人群")
+ private Integer handleTSTotal;
+
+ @ApiModelProperty(value = "完成走访任务")
+ private Integer handleZFTotal;
+
+ @ApiModelProperty(value = "处理随手拍")
+ private Integer easyPhotoTotal;
+
+ @ApiModelProperty(value = "发布宣传教育")
+ private Integer propagandaEducationTotal;
+
+ @ApiModelProperty(value = "新增居民数")
+ private Integer addResidentTotal = 0;
+
+ @ApiModelProperty(value = "新增实有房屋数")
+ private Integer addHouseTotal = 0;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventTransferRecordDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventTransferRecordDetailsVO.java
new file mode 100644
index 0000000..54dccc0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventTransferRecordDetailsVO.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("事件处理流转记录详细返回参数")
+public class EventTransferRecordDetailsVO {
+
+ @ApiModelProperty(value = "id")
+ private Long id;
+
+ @ApiModelProperty(value = "事件ID")
+ private Long eventId;
+
+ @ApiModelProperty(value = "来源类型（1、网格员2、社区3、是街道）")
+ private Integer fromType;
+
+ @ApiModelProperty(value = "事件来源机构或网格员")
+ private Long from;
+
+ @ApiModelProperty(value = "转交办理人路径名称")
+ private String fromName;
+
+ @ApiModelProperty(value = "转交类型（1、网格员2、社区3、是街道）")
+ private Integer toType;
+
+ @ApiModelProperty(value = "事件下游机构或网格员")
+ private Long to;
+
+ @ApiModelProperty(value = "需要办理人路径名称")
+ private String toName;
+
+ @ApiModelProperty(value = "处理结果")
+ private String processResult;
+
+ @ApiModelProperty(value = "处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date processDate;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventTransferRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventTransferRecordVO.java
new file mode 100644
index 0000000..287a921
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventTransferRecordVO.java
@@ -0,0 +1,80 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("事件处理流转记录返回参数")
+public class EventTransferRecordVO {
+
+ @ApiModelProperty(value = "id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty(value = "事件ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long eventId;
+
+ @ApiModelProperty(value = "来源类型（1、网格员2、社区3、是街道）")
+ private Integer fromType;
+
+ @ApiModelProperty(value = "事件来源机构或网格员")
+ private Long from;
+
+ @ApiModelProperty(value = "转交办理人路径名称")
+ private String fromName;
+
+ @ApiModelProperty(value = "转交类型（1、网格员2、社区3、是街道）")
+ private Integer toType;
+
+ @ApiModelProperty(value = "事件下游机构或网格员")
+ private Long toId;
+
+ @ApiModelProperty(value = "需要办理人路径名称")
+ private String toName;
+
+ @ApiModelProperty(value = "处理结果")
+ private String processResult;
+
+ @ApiModelProperty(value = "处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date processDate;
+
+ @ApiModelProperty(value = "处理人或社区")
+ private Long processBy;
+
+ @ApiModelProperty(value = "处理人名或社区名")
+ private String processByName;
+
+ @ApiModelProperty(value = "业务处理类型")
+ private Integer processType;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "音频")
+ private List<EventResourceVO> audios;
+
+ @ApiModelProperty(value = "视频")
+ private List<EventResourceVO> videos;
+
+ @ApiModelProperty(value = "图片")
+ private List<EventResourceVO> pics;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java
new file mode 100644
index 0000000..293b68e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java
@@ -0,0 +1,187 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("事件返回参数")
+public class EventVO {
+
+ @ApiModelProperty(value = "id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty(value = "事件处理状态")
+ private Integer eventDealStatus;
+
+ @ApiModelProperty(value = "服务单号")
+ private String orderSn;
+
+ @ApiModelProperty(value = "1、办件事件2是宣传事件3是阅读事件")
+ private Long eventCategory;
+
+ @ApiModelProperty(value = "网格员所处的街道")
+ private Long gridMemberStreet;
+
+ @ApiModelProperty(value = "网格员所处社区")
+ private Long gridMemberCommunity;
+
+ @ApiModelProperty(value = "网格ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long gridId;
+
+ @ApiModelProperty(value = "网格名称")
+ private String gridName;
+
+ @ApiModelProperty(value = "网格员")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long gridMemberId;
+
+ @ApiModelProperty(value = "网格员名字")
+ private String gridMemberName;
+
+ @ApiModelProperty(value = "网格员头像url")
+ private String gridMemberImageUrl;
+
+ @ApiModelProperty(value = "网格员联系方式")
+ private String gridMemberTelephone;
+
+ @ApiModelProperty(value = "事件标题")
+ private String eventTitle;
+
+ @ApiModelProperty(value = "宣传类型")
+ private String propagandaType;
+
+ @ApiModelProperty(value = "宣传时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date propagandaTime;
+
+ @ApiModelProperty(value = "当event_type_category是1填写事件类型1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报")
+ private Integer eventType;
+
+ @ApiModelProperty(value = "事件描述")
+ private String eventDes;
+
+ @ApiModelProperty(value = "宣传对象")
+ private String propagandaObject;
+
+ @ApiModelProperty(value = "宣传人数")
+ private String propagandaNum;
+
+ @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)")
+ private Integer communityProcess;
+
+ @ApiModelProperty(value = "发生时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date happenTime;
+
+ @ApiModelProperty(value = "事件发生地点备注")
+ private String happentAddress;
+
+ @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）")
+ private String happentLatLng;
+
+ @ApiModelProperty(value = "事件状态（1草稿箱2发布3逻辑删除4、撤销）")
+ private Integer eventStatus;
+
+ @ApiModelProperty(value = "事件类型")
+ private String eventClazz;
+
+ @ApiModelProperty(value = "1待处理2已解决3待验证")
+ private Integer eventProcessStatus;
+
+ @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）")
+ private Integer processType;
+
+ @ApiModelProperty(value = "处理人ID")
+ private Long processUserId;
+
+ @ApiModelProperty(value = "处理人名称")
+ private String processUserName;
+
+ @ApiModelProperty(value = "处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date processDate;
+
+ @ApiModelProperty(value = "解决人针对解决事件的处理描述")
+ private String processDesc;
+
+ @ApiModelProperty(value = "事件来源")
+ private String eventResource;
+
+ @ApiModelProperty(value = "事件发生地点")
+ private String happenAddress;
+
+ @ApiModelProperty(value = "危险级别")
+ private Integer dangerLevel;
+
+ @ApiModelProperty(value = "红牌")
+ private Boolean redCard;
+
+ @ApiModelProperty(value = "黄牌")
+ private Boolean yellowCard;
+
+ @ApiModelProperty(value = "是否有效")
+ private Boolean invalid;
+
+ @ApiModelProperty(value = "是否重大")
+ private Boolean major;
+
+ @ApiModelProperty(value = "死亡人数")
+ private Integer deathsNumber;
+
+ @ApiModelProperty(value = "受伤人数")
+ private Integer injuriesNumber;
+
+ @ApiModelProperty(value = "是否疑难事件")
+ private Boolean difficult;
+
+ @ApiModelProperty(value = "是否紧急")
+ private Boolean urgent;
+
+ @ApiModelProperty(value = "是否催办")
+ private Boolean urgentDell;
+
+ @ApiModelProperty(value = "上报提交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date submitDate;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "修改人")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty(value = "音频")
+ private List<EventResourceVO> audios;
+
+ @ApiModelProperty(value = "视频")
+ private List<EventResourceVO> videos;
+
+ @ApiModelProperty(value = "图片")
+ private List<EventResourceVO> pics;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVisitingTasksDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVisitingTasksDetailsVO.java
new file mode 100644
index 0000000..f8a2497
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVisitingTasksDetailsVO.java
@@ -0,0 +1,135 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("重点人群走访记录详细返回参数")
+public class EventVisitingTasksDetailsVO {
+
+ @ApiModelProperty(value = "id")
+ private Long id;
+
+ @ApiModelProperty(value = "网格员所处的街道")
+ private Long gridMemberStreet;
+
+ @ApiModelProperty(value = "网格员所处社区")
+ private Long gridMemberCommunity;
+
+ @ApiModelProperty(value = "网格员")
+ private Long gridMember;
+
+ @ApiModelProperty(value = "网格员名字")
+ private String gridMemberName;
+
+ @ApiModelProperty(value = "网格员联系方式")
+ private String gridMenberTele;
+
+ @ApiModelProperty(value = "需走访人ID")
+ private Long visiterId;
+
+ @ApiModelProperty(value = "需走访人名字")
+ private String visiterName;
+
+ @ApiModelProperty(value = "需走访人员性别")
+ private Integer visiterSex;
+
+ @ApiModelProperty(value = "需走访人电话")
+ private String visiterTele;
+
+ @ApiModelProperty(value = "需走访人居住地址")
+ private String visiterAddress;
+
+ @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员")
+ private Integer visiterType;
+
+ @ApiModelProperty(value = "事件标题")
+ private String eventTitle;
+
+ @ApiModelProperty(value = "事件类型")
+ private Integer eventType;
+
+ @ApiModelProperty(value = "事件描述")
+ private String eventDes;
+
+ @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)")
+ private Integer actOpara;
+
+ @ApiModelProperty(value = "发生时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date happenTime;
+
+ @ApiModelProperty(value = "发生地点")
+ private String happentAddress;
+
+ @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）")
+ private String happentLatLng;
+
+ @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）")
+ private Integer eventStatus;
+
+ @ApiModelProperty(value = "上报状态")
+ private Integer reporting;
+
+ @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）")
+ private Integer dellType;
+
+ @ApiModelProperty(value = "处理人ID")
+ private Long dellUserId;
+
+ @ApiModelProperty(value = "处理人名称")
+ private String dellUserName;
+
+ @ApiModelProperty(value = "处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date dellDate;
+
+ @ApiModelProperty(value = "解决人针对解决事件的处理描述")
+ private String dellDesc;
+
+ @ApiModelProperty(value = "是否有效")
+ private Boolean invalid;
+
+ @ApiModelProperty(value = "是否紧急")
+ private Boolean urgent;
+
+ @ApiModelProperty(value = "是否催办")
+ private Boolean urgentDell;
+
+ @ApiModelProperty(value = "上报提交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date submitDate;
+
+ @ApiModelProperty(value = "是否异常行为")
+ private Boolean exception;
+
+ @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据")
+ private String tableContentJson;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建事件")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "修改人")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVisitingTasksVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVisitingTasksVO.java
new file mode 100644
index 0000000..5060c29
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVisitingTasksVO.java
@@ -0,0 +1,135 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("重点人群走访记录返回参数")
+public class EventVisitingTasksVO {
+
+ @ApiModelProperty(value = "id")
+ private Long id;
+
+ @ApiModelProperty(value = "网格员所处的街道")
+ private Long gridMemberStreet;
+
+ @ApiModelProperty(value = "网格员所处社区")
+ private Long gridMemberCommunity;
+
+ @ApiModelProperty(value = "网格员")
+ private Long gridMember;
+
+ @ApiModelProperty(value = "网格员名字")
+ private String gridMemberName;
+
+ @ApiModelProperty(value = "网格员联系方式")
+ private String gridMenberTele;
+
+ @ApiModelProperty(value = "需走访人ID")
+ private Long visiterId;
+
+ @ApiModelProperty(value = "需走访人名字")
+ private String visiterName;
+
+ @ApiModelProperty(value = "需走访人员性别")
+ private Integer visiterSex;
+
+ @ApiModelProperty(value = "需走访人电话")
+ private String visiterTele;
+
+ @ApiModelProperty(value = "需走访人居住地址")
+ private String visiterAddress;
+
+ @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员")
+ private Integer visiterType;
+
+ @ApiModelProperty(value = "事件标题")
+ private String eventTitle;
+
+ @ApiModelProperty(value = "事件类型")
+ private Integer eventType;
+
+ @ApiModelProperty(value = "事件描述")
+ private String eventDes;
+
+ @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)")
+ private Integer actOpara;
+
+ @ApiModelProperty(value = "发生时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date happenTime;
+
+ @ApiModelProperty(value = "发生地点")
+ private String happentAddress;
+
+ @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）")
+ private String happentLatLng;
+
+ @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）")
+ private Integer eventStatus;
+
+ @ApiModelProperty(value = "上报状态")
+ private Integer reporting;
+
+ @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）")
+ private Integer dellType;
+
+ @ApiModelProperty(value = "处理人ID")
+ private Long dellUserId;
+
+ @ApiModelProperty(value = "处理人名称")
+ private String dellUserName;
+
+ @ApiModelProperty(value = "处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date dellDate;
+
+ @ApiModelProperty(value = "解决人针对解决事件的处理描述")
+ private String dellDesc;
+
+ @ApiModelProperty(value = "是否有效")
+ private Boolean invalid;
+
+ @ApiModelProperty(value = "是否紧急")
+ private Boolean urgent;
+
+ @ApiModelProperty(value = "是否催办")
+ private Boolean urgentDell;
+
+ @ApiModelProperty(value = "上报提交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date submitDate;
+
+ @ApiModelProperty(value = "是否异常行为")
+ private Boolean exception;
+
+ @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据")
+ private String tableContentJson;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建事件")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "修改人")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridEventStatisticsDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridEventStatisticsDetailVO.java
new file mode 100644
index 0000000..48d4d5b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridEventStatisticsDetailVO.java
@@ -0,0 +1,71 @@
+package com.panzhihua.common.model.vos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 地图模块-网格事件统计数据
+ */
+@Data
+@ApiModel("统计模块-网格事件统计数据")
+public class GridEventStatisticsDetailVO {
+
+ @ApiModelProperty("总完成数量")
+ private Integer sum = 0;
+
+ @ApiModelProperty("总未完成数量")
+ private Integer noSum = 0;
+
+ @ApiModelProperty("突发事件完成数量")
+ private Integer eventTFTotal = 0;
+
+ @ApiModelProperty("突发事件未完成数量")
+ private Integer noEventTFTotal = 0;
+
+ @ApiModelProperty("矛盾纠纷完成数量")
+ private Integer eventMDTotal = 0;
+
+ @ApiModelProperty("矛盾纠纷未完成数量")
+ private Integer noEventMDTotal = 0;
+
+ @ApiModelProperty("治安隐患完成数量")
+ private Integer eventZATotal = 0;
+
+ @ApiModelProperty("治安隐患未完成数量")
+ private Integer noEventZATotal = 0;
+
+ @ApiModelProperty("不稳定因素完成数量")
+ private Integer eventBWDTotal = 0;
+
+ @ApiModelProperty("不稳定因素未完成数量")
+ private Integer noEventBWDTotal = 0;
+
+ @ApiModelProperty("特殊人员上报完成数量")
+ private Integer eventTSTotal = 0;
+
+ @ApiModelProperty("特殊人员上报未完成数量")
+ private Integer noEventTSTotal = 0;
+
+ @ApiModelProperty("公共服务完成数量")
+ private Integer eventGGTotal = 0;
+
+ @ApiModelProperty("公共服务未完成数量")
+ private Integer noEventGGTotal = 0;
+
+ @ApiModelProperty("走访任务完成数量")
+ private Integer eventZFTotal = 0;
+
+ @ApiModelProperty("走访任务未完成数量")
+ private Integer noEventZFTotal = 0;
+
+ @ApiModelProperty("随手拍完成数量")
+ private Integer eventSSPTotal = 0;
+
+ @ApiModelProperty("随手拍未完成数量")
+ private Integer noEventSSPTotal = 0;
+
+ @ApiModelProperty("宣传教育发布数量")
+ private Integer eventXCTotal = 0;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridEventStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridEventStatisticsVO.java
new file mode 100644
index 0000000..65de503
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridEventStatisticsVO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 地图模块-网格详细信息
+ */
+@Data
+@ApiModel("统计模块-网格统计数据")
+public class GridEventStatisticsVO {
+
+ @ApiModelProperty("今日完成")
+ private Integer todayNum = 0;
+
+ @ApiModelProperty("本月完成")
+ private Integer monthNum = 0;
+
+ @ApiModelProperty("今日发布宣传教育")
+ private Integer todayEducationNum = 0;
+
+ @ApiModelProperty("总发布宣传教育")
+ private Integer educationNum = 0;
+
+ @ApiModelProperty("今日特殊人群上报")
+ private Integer todaySpecialTotal = 0;
+
+ @ApiModelProperty("总特殊人群上报")
+ private Integer specialTotal = 0;
+
+ @ApiModelProperty("实有房屋总数")
+ private Integer houseTotal = 0;
+
+ @ApiModelProperty("走访任务当日完成数量")
+ private Integer zfTodayNum = 0;
+
+ @ApiModelProperty("走访任务当月完成数量")
+ private Integer zfMonthNum = 0;
+
+ @ApiModelProperty("随手拍当日完成数量")
+ private Integer sspTodayNum = 0;
+
+ @ApiModelProperty("随手拍当月完成数量")
+ private Integer sspMonthNum = 0;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberAdminVO.java
new file mode 100644
index 0000000..046d66c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberAdminVO.java
@@ -0,0 +1,16 @@
+package com.panzhihua.common.model.vos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("管理后台-网格员返回参数")
+public class GridMemberAdminVO {
+
+ @ApiModelProperty(value = "网格员id")
+ private Long userId;
+ @ApiModelProperty(value = "账号昵称")
+ private String nickName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberPositionDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberPositionDTO.java
new file mode 100644
index 0000000..77738d0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberPositionDTO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.vos.grid;
+
+import javax.validation.constraints.NotBlank;
+
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "网格员定时上报请求参数")
+public class GridMemberPositionDTO {
+
+ @ApiModelProperty("经纬度，以,隔开")
+ @NotBlank(groups = {AddGroup.class}, message = "经纬度不能为空")
+ private String lngLat;
+
+ @ApiModelProperty("经纬度定位地址")
+ @NotBlank(groups = {AddGroup.class}, message = "经纬度定位地址不能为空")
+ private String positionAddress;
+
+ @ApiModelProperty(value = "网格员id", hidden = true)
+ private Long gridMemberId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberVO.java
new file mode 100644
index 0000000..a495352
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.grid.admin.GridMemberBuildingVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("管理后台-网格员返回参数")
+public class GridMemberVO {
+
+ @ApiModelProperty(value = "网格员id")
+ private Long userId;
+ @ApiModelProperty(value = "网格员头像")
+ private String imageUrl;
+ @ApiModelProperty(value = "账号昵称")
+ private String nickName;
+ @ApiModelProperty(value = "登录账号")
+ private String account;
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+ @ApiModelProperty(value = "网格员工作状态(1.在岗 2.脱岗 3.已下班)")
+ private String workStatus;
+ @ApiModelProperty(value = "账号状态(1 启用 2 禁用)")
+ private String status;
+ @ApiModelProperty(value = "所属社区")
+ private String communityName;
+ @ApiModelProperty(value = "网格员上班开始时间")
+ private Integer workStartTime;
+ @ApiModelProperty(value = "网格员上班结束时间")
+ private Integer workEndTime;
+ @ApiModelProperty(value = "市平台网格员关联id")
+ private String lcMemberId;
+ @ApiModelProperty(value = "市平台网格员关联名称")
+ private String lcMemberName;
+ @ApiModelProperty(value = "浪潮网格员绑定的用户ID")
+ private String lcBindUserId;
+ @ApiModelProperty(value = "网格员关联楼栋信息")
+ private List<GridMemberBuildingVO> memberBuildingList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/LatLngVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/LatLngVO.java
new file mode 100644
index 0000000..5c5f171
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/LatLngVO.java
@@ -0,0 +1,13 @@
+package com.panzhihua.common.model.vos.grid;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class LatLngVO {
+
+ private Double lng;
+
+ private Double lat;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PageComMngVillageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PageComMngVillageVO.java
new file mode 100644
index 0000000..94d67cd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PageComMngVillageVO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.vos.grid;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 居民管理-列表返回参数
+ */
+@Data
+@ApiModel("居民管理列表返回参数")
+@EncryptDecryptClass
+public class PageComMngVillageVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long villageId;
+
+ @ApiModelProperty("姓名")
+ private String userName;
+
+ @ApiModelProperty("楼栋数")
+ private Integer buildSum;
+
+ @ApiModelProperty("地址")
+ private String address;
+
+ @ApiModelProperty("用户数")
+ private Integer userSum;
+
+ @ApiModelProperty("房屋数")
+ private Integer houseNum;
+
+ @ApiModelProperty("户籍人口数")
+ private Integer registerNum;
+
+ @ApiModelProperty("租户数量")
+ private Integer rentNum;
+
+ @ApiModelProperty("纬度")
+ private String lat;
+
+ @ApiModelProperty("经度")
+ private String lng;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationDetailVO.java
new file mode 100644
index 0000000..e3f726f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationDetailVO.java
@@ -0,0 +1,103 @@
+package com.panzhihua.common.model.vos.grid;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("居民详情返回参数")
+@EncryptDecryptClass
+public class PopulationDetailVO {
+
+ @ApiModelProperty(value = "主键ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "手机号")
+ @EncryptDecryptField
+ private String phone;
+
+ @ApiModelProperty(value = "身份证号码")
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ApiModelProperty(value = "标签")
+ private String label;
+
+ @ApiModelProperty(value = "居住地址")
+ private String address;
+
+ @ApiModelProperty(value = "民族")
+ private String nation;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(
+ value = "政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
+ private Integer politicalOutlook;
+
+ @ApiModelProperty(value = "性别（1.男 2.女）")
+ private String sex;
+
+ @ApiModelProperty(value = "出生年月")
+ private String birthday;
+
+ @ApiModelProperty(value = "籍贯")
+ private String nativePlace;
+
+ @ApiModelProperty(value = "婚姻状况")
+ private String marriage;
+
+ @ApiModelProperty(value = "文化程度")
+ private String cultureLevel;
+
+ @ApiModelProperty(value = "健康状况")
+ private String healthy;
+
+ @ApiModelProperty(value = "是否租住(0.否 1.是)")
+ private Integer isRent;
+
+ @ApiModelProperty("街路巷")
+ private String road;
+
+ @ApiModelProperty("门牌号")
+ private String doorNo;
+
+ @ApiModelProperty("楼排号")
+ private String floor;
+
+ @ApiModelProperty("单元号")
+ private String unitNo;
+
+ @ApiModelProperty("户室（房间号）")
+ private String houseNo;
+
+ @ApiModelProperty("工作单位")
+ private String workCompany;
+
+ @ApiModelProperty("户口所在地")
+ private String censusRegister;
+
+ @ApiModelProperty("外地or本地（1.本地 2.外地）")
+ private Integer outOrLocal;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java
new file mode 100644
index 0000000..a9ce1c8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java
@@ -0,0 +1,80 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("居民列表返回参数")
+@EncryptDecryptClass
+public class PopulationListVO {
+
+ @ApiModelProperty(value = "主键ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "手机号")
+ @EncryptDecryptField
+ private String phone;
+
+ @ApiModelProperty(value = "身份证号码")
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ApiModelProperty(value = "标签")
+ private String label;
+
+ @ApiModelProperty(value = "居住地址")
+ private String address;
+
+ @ApiModelProperty(value = "民族")
+ private String nation;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(
+ value = "政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
+ private Integer politicalOutlook;
+
+ @ApiModelProperty(value = "性别（1.男 2.女）")
+ private String sex;
+
+ @ApiModelProperty(value = "时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "房屋人口关联id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long housePopulationId;
+
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "政治面貌文字描述")
+ private String outlook;
+
+ @ApiModelProperty(value = "人和房屋关系（1.业主 2.业主家属 3.租户）")
+ private Integer relationId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/UserEventGridDataVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/UserEventGridDataVO.java
new file mode 100644
index 0000000..c05e00d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/UserEventGridDataVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("用户网格待处理数据统计信息")
+public class UserEventGridDataVO {
+
+ @ApiModelProperty(value = "事件分类 1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报、7宣传教育")
+ private Integer eventType;
+ @ApiModelProperty(value = "待处理事件数")
+ private Integer todoNums;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngPopulationListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngPopulationListVO.java
new file mode 100644
index 0000000..9b9a89b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngPopulationListVO.java
@@ -0,0 +1,72 @@
+package com.panzhihua.common.model.vos.grid.admin;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 居民管理-列表返回参数
+ */
+@Data
+@ApiModel("居民管理列表返回参数")
+@EncryptDecryptClass
+public class ComMngPopulationListVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("姓名")
+ private String userName;
+
+ @ApiModelProperty("标签")
+ private String label;
+
+ @ApiModelProperty("走访时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "身份证号码")
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ApiModelProperty(value = "性别（1.男 2.女）")
+ private Integer sex;
+
+ @ApiModelProperty(value = "现居住地址")
+ private String address;
+
+ @ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
+ private Integer politicalOutlook;
+
+ @ApiModelProperty("联系方式")
+ @EncryptDecryptField
+ private String phone;
+
+ @ApiModelProperty("关联实有房屋(0.否 1.是)")
+ private Long isHouse;
+
+ @ApiModelProperty(value = "走访状态（1待走访2已走访3待验证5已撤销）")
+ private Integer eventStatus;
+
+ @ApiModelProperty(value = "户口所在地")
+ private String censusRegister;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "是否是户主（1.是 2.否）")
+ private Integer isRelation;
+
+ @ApiModelProperty(value = "居住地房屋id")
+ private Long houseId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngPopulationVillageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngPopulationVillageVO.java
new file mode 100644
index 0000000..0effdb9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngPopulationVillageVO.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.vos.grid.admin;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("居民管理关联房屋小区列表返回参数")
+public class ComMngPopulationVillageVO {
+
+ @ApiModelProperty("小区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long villageId;
+
+ @ApiModelProperty("小区名字")
+ private String name;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngSubordinateVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngSubordinateVO.java
new file mode 100644
index 0000000..2afdc6b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngSubordinateVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.grid.admin;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("级联菜单返回参数")
+public class ComMngSubordinateVO {
+
+ /**
+ * 房屋id
+ */
+ @ApiModelProperty("房屋id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long houseId;
+
+ /**
+ * 楼排号
+ */
+ @ApiModelProperty("楼排号")
+ private String floor;
+
+ /**
+ * 单元号
+ */
+ @ApiModelProperty("单元号")
+ private String unitNo;
+
+ /**
+ * 户室（房间号）
+ */
+ @ApiModelProperty("户室（房间号）")
+ private String houseNo;
+
+ /**
+ * 公共显示字段
+ */
+ @ApiModelProperty("公共显示字段")
+ private String name;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngVillagePopulationHouseListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngVillagePopulationHouseListVO.java
new file mode 100644
index 0000000..0b4da01
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngVillagePopulationHouseListVO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.vos.grid.admin;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("小区管理-居民房屋返回参数")
+public class ComMngVillagePopulationHouseListVO {
+
+ @ApiModelProperty("房屋id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("小区名称")
+ private String villageName;
+
+ @ApiModelProperty("小区地址")
+ private String address;
+
+ @ApiModelProperty("楼栋号")
+ private String floor;
+
+ @ApiModelProperty("单元号")
+ private String unitNo;
+
+ @ApiModelProperty("户室号")
+ private String houseNo;
+
+ @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
+ private Integer relation;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngVillagePopulationListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngVillagePopulationListVO.java
new file mode 100644
index 0000000..ddf2483
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngVillagePopulationListVO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.vos.grid.admin;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("小区管理-居民列表返回参数")
+@EncryptDecryptClass
+public class ComMngVillagePopulationListVO {
+
+ @ApiModelProperty("居民id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("身份证号")
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ApiModelProperty("人员标签")
+ private String label;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngVillageStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngVillageStatisticsVO.java
new file mode 100644
index 0000000..84f7b7a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/ComMngVillageStatisticsVO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.vos.grid.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("小区列表统计返回参数")
+public class ComMngVillageStatisticsVO {
+
+ /**
+ * 小区数量
+ */
+ @ApiModelProperty("小区数量")
+ private Integer villageNum = 0;
+
+ /**
+ * 楼栋数量
+ */
+ @ApiModelProperty("楼栋数量")
+ private Integer floorNum = 0;
+
+ /**
+ * 总户数
+ */
+ @ApiModelProperty("总户数")
+ private Integer houseNum = 0;
+
+ /**
+ * 居住人数
+ */
+ @ApiModelProperty("居住人数")
+ private Integer userNum = 0;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/GridMemberBuildingVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/GridMemberBuildingVO.java
new file mode 100644
index 0000000..f5e598d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/GridMemberBuildingVO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.vos.grid.admin;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("管理后台-网格员与楼栋关联关系返回参数")
+public class GridMemberBuildingVO {
+
+ @ApiModelProperty(value = "社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+ @ApiModelProperty(value = "社区名字")
+ private String communityName;
+ @ApiModelProperty(value = "小区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long villageId;
+ @ApiModelProperty(value = "小区名字")
+ private String villageName;
+ @ApiModelProperty(value = "楼栋id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long buildingId;
+ @ApiModelProperty(value = "楼栋名字")
+ private String buildingName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/GridMemberCascadeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/GridMemberCascadeVO.java
new file mode 100644
index 0000000..d7d81c7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/GridMemberCascadeVO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.vos.grid.admin;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("管理后台-添加网格员级联返回参数")
+public class GridMemberCascadeVO {
+
+ @ApiModelProperty(value = "主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ @ApiModelProperty(value = "名称")
+ private String name;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/GridMemberLcListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/GridMemberLcListVO.java
new file mode 100644
index 0000000..6f0cb37
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/GridMemberLcListVO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.vos.grid.admin;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("管理后台-市平台网格员列表返回参数")
+public class GridMemberLcListVO {
+
+ @ApiModelProperty(value = "主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ @ApiModelProperty(value = "市平台网格员id")
+ private String lcGridMemberId;
+ @ApiModelProperty(value = "市平台网格员名称")
+ private String lcGridMemberName;
+ @ApiModelProperty(value = "浪潮网格员绑定的用户ID")
+ private String lcBindUserId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/PopulationStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/PopulationStatisticsVO.java
new file mode 100644
index 0000000..9acf6d9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/PopulationStatisticsVO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.vos.grid.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author lyq
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("居民统计返回参数")
+public class PopulationStatisticsVO {
+
+ @ApiModelProperty(value = "本地人口")
+ private Integer localNum = 0;
+
+ @ApiModelProperty(value = "流动人口")
+ private Integer flowNum = 0;
+
+ @ApiModelProperty(value = "特殊人口")
+ private Integer specialNum = 0;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/ComMngPopulationExportExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/ComMngPopulationExportExcelVO.java
new file mode 100644
index 0000000..987c829
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/ComMngPopulationExportExcelVO.java
@@ -0,0 +1,84 @@
+package com.panzhihua.common.model.vos.grid.admin.excel;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
+
+/**
+ * @description: 综治后台-居民导出
+ * @author: lyq
+ * @date: 2021/7/1 13:56
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationExportExcelVO implements Serializable {
+ /**
+ * 姓名
+ */
+ @ExcelProperty(value = "姓名", index = 0)
+ private String userName;
+ /**
+ * 身份证号
+ */
+ @ExcelProperty(value = "身份证号", index = 1)
+ @EncryptDecryptField
+ private String cardNo;
+ /**
+ * 年龄
+ */
+ @ExcelProperty(value = "年龄", index = 2)
+ private Integer age;
+ /**
+ * 性别
+ */
+ @ExcelProperty(value = "性别", index = 3)
+ private String sex = "暂无";
+ /**
+ * 现居住地址
+ */
+ @ExcelProperty(value = "现居住地址", index = 4)
+ private String address;
+ /**
+ * 政治面貌
+ */
+ @ExcelProperty(value = "政治面貌", index = 5)
+ private String politicalOutlook = "暂无";
+ /**
+ * 联系方式
+ */
+ @ExcelProperty(value = "联系方式", index = 6)
+ @EncryptDecryptField
+ private String phone;
+ /**
+ * 户籍地址
+ */
+ @ExcelProperty(value = "户籍地址", index = 7)
+ private String censusRegister;
+ /**
+ * 是否关联实有房屋
+ */
+ @ExcelProperty(value = "关联实有房屋", index = 8)
+ private String isHouse = "暂无";
+ /**
+ * 人员标签
+ */
+ @ExcelProperty(value = "人员标签", index = 9)
+ private String label;
+ /**
+ * 最后一次走访时间
+ */
+ @ExcelProperty(value = "最后一次走访时间", index = 10)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+ /**
+ * 最近一次走访状态
+ */
+ @ExcelProperty(value = "最近一次走访状态", index = 11)
+ private String eventStatus = "暂无";
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/ComMngVillageExportExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/ComMngVillageExportExcelVO.java
new file mode 100644
index 0000000..43defaa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/ComMngVillageExportExcelVO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.vos.grid.admin.excel;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * 小区列表Excel导出
+ */
+@Data
+@ApiModel("小区列表Excel导出")
+@EncryptDecryptClass
+public class ComMngVillageExportExcelVO implements Serializable {
+
+ @ExcelProperty(value = "小区名字", index = 0)
+ private String userName;
+
+ @ExcelProperty(value = "街路巷", index = 1)
+ private String alley;
+
+ @ExcelProperty(value = "门牌号", index = 2)
+ private String doorNum;
+
+ @ExcelProperty(value = "小区地址", index = 3)
+ private String address;
+
+ @ExcelProperty(value = "小区楼栋数", index = 4)
+ private Integer buildSum;
+
+ @ExcelProperty(value = "小区户数", index = 5)
+ private Integer houseNum;
+
+ @ExcelProperty(value = "小区居民人数", index = 6)
+ private Integer userSum;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/GridMemberWorkExportExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/GridMemberWorkExportExcelVO.java
new file mode 100644
index 0000000..daf8877
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/GridMemberWorkExportExcelVO.java
@@ -0,0 +1,70 @@
+package com.panzhihua.common.model.vos.grid.admin.excel;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * 网格员工作汇总Excel导出
+ */
+@Data
+@ApiModel("网格员工作汇总Excel导出")
+public class GridMemberWorkExportExcelVO implements Serializable {
+
+ @ExcelProperty(value = "网格员名称", index = 0)
+ private String nickName;
+
+ @ExcelProperty(value = "发布突发事件", index = 1)
+ private Integer addTFTotal;
+
+ @ExcelProperty(value = "处理突发事件", index = 2)
+ private Integer handleTFTotal;
+
+ @ExcelProperty(value = "发布矛盾纠纷", index = 3)
+ private Integer addMDTotal;
+
+ @ExcelProperty(value = "处理矛盾纠纷", index = 4)
+ private Integer handleMDTotal;
+
+ @ExcelProperty(value = "发布治安隐患", index = 5)
+ private Integer addZATotal;
+
+ @ExcelProperty(value = "小区名字", index = 6)
+ private Integer handleZATotal;
+
+ @ExcelProperty(value = "发布不稳定因素", index = 7)
+ private Integer addBWDTotal;
+
+ @ExcelProperty(value = "处理不稳定因素", index = 8)
+ private Integer handleBWDTotal;
+
+ @ExcelProperty(value = "发布公共服务", index = 9)
+ private Integer addGGTotal;
+
+ @ExcelProperty(value = "处理公共服务", index = 10)
+ private Integer handleGGTotal;
+
+ @ExcelProperty(value = "发布特殊人群", index = 11)
+ private Integer addTSTotal;
+
+ @ExcelProperty(value = "处理特殊人群", index = 12)
+ private Integer handleTSTotal;
+
+ @ExcelProperty(value = "完成走访任务", index = 13)
+ private Integer handleZFTotal;
+
+ @ExcelProperty(value = "处理随手拍", index = 14)
+ private Integer easyPhotoTotal;
+
+ @ExcelProperty(value = "发布宣传教育", index = 15)
+ private Integer propagandaEducationTotal;
+
+ @ExcelProperty(value = "新增居民数", index = 16)
+ private Integer addResidentTotal = 0;
+
+ @ExcelProperty(value = "新增实有房屋数", index = 17)
+ private Integer addHouseTotal = 0;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccRuleFuncVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccRuleFuncVO.java
new file mode 100644
index 0000000..0856454
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccRuleFuncVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.integral;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 积分功能
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-28 16:08
+ **/
+@Data
+@ApiModel("》运营 》积分 》积分功能")
+public class ComOpsAccRuleFuncVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("积分功能描述")
+ private String desc;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccRuleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccRuleVO.java
new file mode 100644
index 0000000..26c710b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccRuleVO.java
@@ -0,0 +1,37 @@
+package com.panzhihua.common.model.vos.integral;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 积分规则
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-28 16:00
+ **/
+@Data
+@ApiModel("》运营 》积分 》规则")
+public class ComOpsAccRuleVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("积分功能id")
+ private Integer funcId;
+
+ @ApiModelProperty("积分项目")
+ private String accItem;
+
+ @ApiModelProperty("获得积分")
+ private Integer score;
+
+ @ApiModelProperty("每日上限")
+ private Integer max;
+
+ @ApiModelProperty("备注")
+ private String appendix;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccUserVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccUserVO.java
new file mode 100644
index 0000000..1b44f3c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/integral/ComOpsAccUserVO.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.vos.integral;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 积分用户关系
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-28 16:14
+ **/
+@Data
+@ApiModel("》运营 》积分 》用户关系")
+public class ComOpsAccUserVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("用户id，可以关联出名称、手机、社区等信息")
+ private Integer userId;
+
+ @ApiModelProperty("积分规则id，可以关联积分功能，积分项目")
+ private Integer ruleId;
+
+ @ApiModelProperty("积分变化，可正可负")
+ private Integer scoreChange;
+
+ @ApiModelProperty("积分变化时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date changeAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinghuiMerchantEvaluateVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinghuiMerchantEvaluateVO.java
new file mode 100644
index 0000000..103bd7d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinghuiMerchantEvaluateVO.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇商家评价表")
+public class JinghuiMerchantEvaluateVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+
+ @ApiModelProperty(value = "主键id")
+ private String id;
+
+ @ApiModelProperty(value = "用户id")
+ private String userId;
+
+ @ApiModelProperty(value = "商家id")
+ private String merchantId;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+ @ApiModelProperty(value = "图片url")
+ private String imgUrl;
+
+ @ApiModelProperty(value = "评论人姓名")
+ private String userName;
+
+ @ApiModelProperty(value = "评论人头像")
+ private String userUrl;
+
+
+
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiAllOldManVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiAllOldManVO.java
new file mode 100644
index 0000000..b00b4d8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiAllOldManVO.java
@@ -0,0 +1,52 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇老人手环大屏")
+public class JinhuiAllOldManVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "已处理数量")
+ private String processedNum="0";
+
+ @ApiModelProperty(value = "未处理数量")
+ private String untreatedNum="0";
+
+ @ApiModelProperty(value = "已处理列表")
+ private List<JinhuiOldManVO> processedList;
+
+ @ApiModelProperty(value = "未处理列表")
+ private List<JinhuiOldManVO> untreatedList;
+
+ //总数
+ @ApiModelProperty(value = "总数")
+ private String braceletUserNum="0";
+ //男
+ @ApiModelProperty(value = "男人数量")
+ private String braceletUserManNum="0";
+ //女
+ @ApiModelProperty(value = "女人数量")
+ private String braceletUserWomanNum="0";
+
+
+ @ApiModelProperty(value = "折线统计")
+ private List<JinhuiOldManBrokenLineVO> lsit;
+
+ @ApiModelProperty(value = "用户位置以及状态信息")
+ private List<JinhuiOldManUserDateVO> oldManUserDates;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiApplyExperienceVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiApplyExperienceVO.java
new file mode 100644
index 0000000..853fc8d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiApplyExperienceVO.java
@@ -0,0 +1,60 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇报名体验表")
+public class JinhuiApplyExperienceVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "参加人id")
+ private String userId;
+
+ @ApiModelProperty(value = "体验内容")
+ private String experienceContent;
+
+ @ApiModelProperty(value = "活动id")
+ private String activityId;
+
+ @ApiModelProperty(value = "体验提交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date uploadingTime;
+
+
+ @ApiModelProperty(value = "是否反馈（0没有 1有）")
+ private String isFeedback;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "活动标题")
+ private String title;
+
+ @ApiModelProperty(value = "活动封面")
+ private String coverImgUrl;
+
+ @ApiModelProperty(value = "活动状态（1待开始 2报名中 3已开始 4已结束 5已取消）")
+ private String activityType;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiArticleManagementVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiArticleManagementVO.java
new file mode 100644
index 0000000..781685c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiArticleManagementVO.java
@@ -0,0 +1,49 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇文章管理")
+public class JinhuiArticleManagementVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "标题")
+ private String title;
+
+ @ApiModelProperty(value = "封面")
+ private String coverUrl;
+
+ @ApiModelProperty(value = "状态 0下架 1上架")
+ private String articleType;
+
+ @ApiModelProperty(value = "详情内容")
+ private String content;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+
+ @ApiModelProperty(value = "状态（1 金汇文章 2 金汇家园）")
+ private String conditionType;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiCharityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiCharityVO.java
new file mode 100644
index 0000000..8f09f92
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiCharityVO.java
@@ -0,0 +1,53 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇慈善公益")
+public class JinhuiCharityVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "标题")
+ private String title;
+
+ @ApiModelProperty(value = "封面")
+ private String coverImgUrl;
+
+ @ApiModelProperty(value = "简语")
+ private String simpleStatement;
+
+ @ApiModelProperty(value = "标签")
+ private String label;
+
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+ @ApiModelProperty(value = "二维码")
+ private String qrCodeUrl;
+
+ @ApiModelProperty(value = "状态（1 进心中 2已结束）")
+ private String state;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiCoinGeneralTableVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiCoinGeneralTableVO.java
new file mode 100644
index 0000000..437b8a3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiCoinGeneralTableVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇社区用户金汇币总表")
+public class JinhuiCoinGeneralTableVO
+{
+ private static final long serialVersionUID = -70884515430727555L;
+
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "用户id")
+ private String userId;
+
+ @ApiModelProperty(value = "金币总额")
+ private String goldCoin="0";
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiComConvenientServiceCategoriesVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiComConvenientServiceCategoriesVO.java
new file mode 100644
index 0000000..57bb75e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiComConvenientServiceCategoriesVO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 商家分类表
+ */
+
+@Data
+public class JinhuiComConvenientServiceCategoriesVO implements Serializable
+{
+
+ private static final long serialVersionUID = 1L;
+
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "分类名称")
+ private String name;
+
+ @ApiModelProperty(value = "分类图标")
+ private String icon;
+
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ @ApiModelProperty(value = "排序 默认1")
+ private String weight;
+
+ @ApiModelProperty(value = "是否删除(0未删除 1已删除 )")
+ private String isDel;
+
+ @ApiModelProperty(value = "创建时间")
+ private String createdAt;
+
+ @ApiModelProperty(value = "创建人")
+ private String createdBy;
+
+ @ApiModelProperty(value = "更新时间")
+ private String updatedAt;
+
+ @ApiModelProperty(value = "父级id")
+ private String parentId;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiCommunityServicesVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiCommunityServicesVO.java
new file mode 100644
index 0000000..7cc0e9d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiCommunityServicesVO.java
@@ -0,0 +1,70 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇大屏社区服务")
+public class JinhuiCommunityServicesVO
+{
+ @ApiModelProperty("党员数")
+ private String partyMember;
+ @ApiModelProperty("志愿者")
+ private String volunteer;
+
+
+ /**
+ * 便民服务商家 审核状态 （1待审核 2已通过 3未通过 ）
+ * @return
+ */
+ @ApiModelProperty("便民服务商家")
+ private String convenientMerchantsNum="0";
+
+ /**
+ * 办事直指南
+ * @return
+ */
+ @ApiModelProperty("办事指南")
+ private String workGuideNum="0";
+
+ /**
+ * 空间预约 `state` 状态（1待处理 2未通过 3已通过）',
+ * @return
+ */
+ @ApiModelProperty("空间预约")
+ private String interspaceApplyNum="0";
+
+
+ /**
+ * 商城订单
+ * @param cancelType `cancel_type` '核销状态（0待核销 1已核销 2订单已取消）
+ * @return
+ */
+ @ApiModelProperty("商城订单")
+ private String shoppingOrderNum="0";
+
+ /**
+ * 获取社区工作者
+ * @param communityId `type` '1社区工作人员2物业',
+ * @return
+ */
+ @ApiModelProperty("获取社区工作者")
+ private String serviceTeam="0";
+
+ @ApiModelProperty("通知公告")
+ private String announcement="0";
+
+
+
+ @ApiModelProperty("商家分类")
+ List<JinhuiMerchantTypeVO> list;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiConfigVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiConfigVO.java
new file mode 100644
index 0000000..2c9a4ff
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiConfigVO.java
@@ -0,0 +1,58 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇社区商家配置")
+public class JinhuiConfigVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ @ApiModelProperty(value = "兑换地址")
+ private String address;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ @ApiModelProperty(value = "兑换状态（1每天 2周一到周五 3周末）")
+ private String businessType;
+
+ @ApiModelProperty(value = "兑换开始时间")
+ private String businessStartTime;
+
+ @ApiModelProperty(value = "兑换结束时间")
+ private String businessEndTime;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiExperienceActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiExperienceActivityVO.java
new file mode 100644
index 0000000..2cba436
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiExperienceActivityVO.java
@@ -0,0 +1,89 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇商城商品表")
+public class JinhuiExperienceActivityVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "活动标题")
+ private String title;
+
+ @ApiModelProperty(value = "活动地址")
+ private String address;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "经度")
+ private String lon;
+
+ @ApiModelProperty(value = "报名开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date applyStartTime;
+
+ @ApiModelProperty(value = "报名结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date applyEndTime;
+
+ @ApiModelProperty(value = "活动开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date activityStartTime;
+
+ @ApiModelProperty(value = "活动结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date activityEndTime;
+
+ @ApiModelProperty(value = "参加人数 （不限传-1）")
+ private String peopleNumber;
+
+ @ApiModelProperty(value = "负责人电话")
+ private String phone;
+
+ @ApiModelProperty(value = "奖励")
+ private String award;
+
+ @ApiModelProperty(value = "活动状态")
+ private String activityType;
+
+ @ApiModelProperty(value = "封面")
+ private String coverImgUrl;
+
+
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+ @ApiModelProperty(value = "是否反馈（0没有 1有）")
+ private String isFeedback;
+
+ @ApiModelProperty(value = "是否参加（0 未参加 1已参加）")
+ private String isJoin;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiGoldCoinRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiGoldCoinRecordVO.java
new file mode 100644
index 0000000..c60cae7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiGoldCoinRecordVO.java
@@ -0,0 +1,53 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇币明细")
+public class JinhuiGoldCoinRecordVO
+{
+ private static final long serialVersionUID = -70884515430727555L;
+
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "用户id")
+ private String userId;
+
+ @ApiModelProperty(value = "金币总额")
+ private String goldCoin="0";
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ @ApiModelProperty(value = "标题")
+ private String title;
+
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ @ApiModelProperty(value = "状态")
+ private String type;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiIndexInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiIndexInfoVO.java
new file mode 100644
index 0000000..17d38bf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiIndexInfoVO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇大屏")
+public class JinhuiIndexInfoVO
+{
+ /**
+ * 获取金汇风采数量
+ * @param
+ * @return
+ */
+ @ApiModelProperty(value = "金汇风采数量")
+ private String mienNum="0";
+
+ /**
+ * 获取志愿者服务
+ * @return
+ */
+ @ApiModelProperty(value = "志愿者服务")
+ private String volunteerServeNum="0";
+
+ /**
+ * 获取微心愿数量
+ * @param
+ * @return
+ */
+ @ApiModelProperty(value = "微心愿数量")
+ private String microVolunteeringNum="0";
+
+
+ /**
+ * 便民服务商家
+ * @return
+ */
+ @ApiModelProperty(value = "便民服务商家数量")
+ private String convenientMerchantsNum="0";
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiInterspaceApplyForVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiInterspaceApplyForVO.java
new file mode 100644
index 0000000..e46589e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiInterspaceApplyForVO.java
@@ -0,0 +1,76 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("空间预约申请")
+public class JinhuiInterspaceApplyForVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+
+ @ApiModelProperty(value = "空间场地id")
+ private String interspaceId;
+
+ @ApiModelProperty(value = "空间场地名称")
+ private String interspaceName;
+
+ @ApiModelProperty(value = "预约时间（哪一天）")
+ private String interspaceTime;
+
+ @ApiModelProperty(value = "预约时段")
+ private String subscribeTimeFrame;
+
+ @ApiModelProperty(value = "预约人姓名")
+ private String userName;
+
+ @ApiModelProperty(value = "预约人id")
+ private String userId;
+
+ @ApiModelProperty(value = "预约人电话")
+ private String userPhone;
+
+ @ApiModelProperty(value = "状态（1待处理 2未通过 3已通过）")
+ private String state;
+
+ @ApiModelProperty(value = "用处")
+ private String content;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "回复")
+ private String reply;
+
+ @ApiModelProperty(value = "图片")
+ private String imgUrl;
+
+ @ApiModelProperty(value = "空间地址")
+ private String address;
+
+ @ApiModelProperty(value = "经度")
+ private String lon;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiInterspaceTypeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiInterspaceTypeVO.java
new file mode 100644
index 0000000..82a0230
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiInterspaceTypeVO.java
@@ -0,0 +1,49 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇空间管理")
+public class JinhuiInterspaceTypeVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "空间名称")
+ private String title;
+
+
+
+ @ApiModelProperty(value = "空间分类")
+ private String intendantName;
+
+
+ @ApiModelProperty(value = "创建人id")
+ private String userId;
+
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiInterspaceVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiInterspaceVO.java
new file mode 100644
index 0000000..301e3e6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiInterspaceVO.java
@@ -0,0 +1,71 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇空间管理")
+public class JinhuiInterspaceVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "空间名称")
+ private String title;
+
+ @ApiModelProperty(value = "管理员")
+ private String intendant;
+
+ @ApiModelProperty(value = "管理员电话")
+ private String intendantPhone;
+
+ @ApiModelProperty(value = "空间分类")
+ private String intendantType;
+
+
+ @ApiModelProperty(value = "空间分类名称")
+ private String intendantName;
+
+ @ApiModelProperty(value = "空间介绍")
+ private String content;
+
+ @ApiModelProperty(value = "空间地址")
+ private String address;
+
+ @ApiModelProperty(value = "经度")
+ private String lon;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "空间图片")
+ private String imgUrl;
+
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "费用")
+ private String price;
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiMerchantTypeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiMerchantTypeVO.java
new file mode 100644
index 0000000..ad302c4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiMerchantTypeVO.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇商家分类")
+public class JinhuiMerchantTypeVO
+{
+ /**
+ * 获取金汇风采数量
+ * @param
+ * @return
+ */
+ @ApiModelProperty(value = "分类名称")
+ private String name="0";
+
+ /**
+ * 获取志愿者服务
+ * @return
+ */
+ @ApiModelProperty(value = "分类商家数量")
+ private String number="0";
+
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiMicroVolunteeringTypeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiMicroVolunteeringTypeVO.java
new file mode 100644
index 0000000..151f81c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiMicroVolunteeringTypeVO.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇微心愿分类")
+public class JinhuiMicroVolunteeringTypeVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "名字")
+ private String title;
+
+
+ @ApiModelProperty(value = "创建人id")
+ private String userId;
+
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiMicroVolunteeringVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiMicroVolunteeringVO.java
new file mode 100644
index 0000000..95c628f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiMicroVolunteeringVO.java
@@ -0,0 +1,67 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇微心愿")
+public class JinhuiMicroVolunteeringVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+ @ApiModelProperty(value = "提交人id")
+ private String userId;
+
+ @ApiModelProperty(value = "心愿类型id")
+ private String wishTypeId;
+
+ @ApiModelProperty(value = "心愿类型名字")
+ private String wishTypeName;
+
+ @ApiModelProperty(value = "姓名")
+ private String userName;
+
+ @ApiModelProperty(value = "电话")
+ private String userPhone;
+
+ @ApiModelProperty(value = "图片")
+ private String imgUrl;
+
+ @ApiModelProperty(value = "回复")
+ private String reply;
+
+ @ApiModelProperty(value = "回复图片")
+ private String replyImgUrl;
+
+ @ApiModelProperty(value = "状态（1待处理 2已处理）")
+ private String state;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiOldManBrokenLineVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiOldManBrokenLineVO.java
new file mode 100644
index 0000000..ed3d9e1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiOldManBrokenLineVO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇老人手环大屏折线统计图")
+public class JinhuiOldManBrokenLineVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "月份")
+ private String filed;
+
+ @ApiModelProperty(value = "新增数量")
+ private String num;
+
+ @ApiModelProperty(value = "累计数量")
+ private String totalNum;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiOldManUserDateVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiOldManUserDateVO.java
new file mode 100644
index 0000000..09a9826
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiOldManUserDateVO.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇老人手环定位详情大屏")
+public class JinhuiOldManUserDateVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "设备id")
+ private String deviceId;
+
+ @ApiModelProperty(value = "用户姓名")
+ private String userName;
+
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "是否正常 （0 正常 1异常 2 待服务）")
+ private String isAbnormal;
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiOldManVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiOldManVO.java
new file mode 100644
index 0000000..ed3ffce
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiOldManVO.java
@@ -0,0 +1,52 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇老人手环大屏")
+public class JinhuiOldManVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+
+ @ApiModelProperty(value = "处理状态（1 未处理 2 已处理 3处理中 4 忽略）")
+ private String disposeType;
+
+
+ @ApiModelProperty(value = "地址")
+ private String address;
+
+ @ApiModelProperty(value = "详细地址")
+ private String detailAddress;
+
+ @ApiModelProperty(value = "用户名")
+ private String userName;
+
+ @ApiModelProperty(value = "设备手机号码")
+ private String mobile;
+
+ @ApiModelProperty(value = "设备绑定手机号")
+ private String binPhone;
+
+ @ApiModelProperty(value = "紧急联系人")
+ private String emergencyContact;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date disposeTime;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiQuestnaireUserAnswerVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiQuestnaireUserAnswerVO.java
new file mode 100644
index 0000000..4f30b7d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiQuestnaireUserAnswerVO.java
@@ -0,0 +1,68 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇办事记录用户答题记录")
+public class JinhuiQuestnaireUserAnswerVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "办事指南id")
+ private String questnaireId;
+
+ @ApiModelProperty(value = "办事指南标题")
+ private String questnaireName;
+
+ @ApiModelProperty(value = "用户id")
+ private String userId;
+
+ @ApiModelProperty(value = "用户答题json数据")
+ private String jsonObject;
+
+
+ @ApiModelProperty(value = "办理状态（0待处理 1已通过 2未通过 ）")
+ private String transactType;
+
+ @ApiModelProperty(value = "回复")
+ private String reply;
+
+ @ApiModelProperty(value = "用户名")
+ private String userName;
+
+ @ApiModelProperty(value = "电话")
+ private String phone;
+
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ @ApiModelProperty(value = "处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date processingTime;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiReseauPeopleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiReseauPeopleVO.java
new file mode 100644
index 0000000..fd169a4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiReseauPeopleVO.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇网格员")
+public class JinhuiReseauPeopleVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+
+ @ApiModelProperty(value = "绑定用户id")
+ private String userId;
+
+ @ApiModelProperty(value = "网格员名称")
+ private String reseauName;
+
+ @ApiModelProperty(value = "负责网格")
+ private String reseauIds;
+
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiReseauVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiReseauVO.java
new file mode 100644
index 0000000..942fd8d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiReseauVO.java
@@ -0,0 +1,60 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇网格")
+public class JinhuiReseauVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+
+ @ApiModelProperty(value = "网格名称")
+ private String reseauName;
+
+ @ApiModelProperty(value = "图层")
+ private String coverage;
+
+ @ApiModelProperty(value = "面积")
+ private String acreage;
+
+ @ApiModelProperty(value = "名称")
+ private String designation;
+
+ @ApiModelProperty(value = "线条颜色")
+ private String linellae;
+
+ @ApiModelProperty(value = "线条宽度")
+ private String broad;
+
+ @ApiModelProperty(value = "填充颜色")
+ private String fill;
+
+ @ApiModelProperty(value = "围栏坐标")
+ private String rail;
+
+ @ApiModelProperty(value = "网格员id")
+ private String reseauId;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingOrderVO.java
new file mode 100644
index 0000000..58286a3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingOrderVO.java
@@ -0,0 +1,93 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇商城订单表")
+public class JinhuiShoppingOrderVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNumber;
+
+ @ApiModelProperty(value = "商品id")
+ private String goodsId;
+
+ @ApiModelProperty(value = "下单人id")
+ private String userId;
+
+ @ApiModelProperty(value = "核销状态（0待核销 1已核销 2订单已取消）")
+ private String cancelType;
+
+ @ApiModelProperty(value = "核销时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date cancelTime;
+
+ @ApiModelProperty(value = "支付金额")
+ private String palyMoney;
+
+ @ApiModelProperty(value = "创建时间（兑换时间）")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "取消时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date abolishTime;
+
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodName;
+
+ @ApiModelProperty(value = "商品价格")
+ private String goodPrice;
+
+ @ApiModelProperty(value = "商品图片")
+ private String coverImgUrl;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "电话")
+ private String phone;
+
+
+ @ApiModelProperty(value = "兑换地址")
+ private String address;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ @ApiModelProperty(value = "兑换状态（1每天 2周一到周五 3周末）")
+ private String businessType;
+
+ @ApiModelProperty(value = "兑换开始时间")
+ private String businessStartTime;
+
+ @ApiModelProperty(value = "兑换结束时间")
+ private String businessEndTime;
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingVO.java
new file mode 100644
index 0000000..01a3afd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingVO.java
@@ -0,0 +1,67 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇商城商品表")
+public class JinhuiShoppingVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodName;
+
+ @ApiModelProperty(value = "商品价格")
+ private String goodPrice;
+
+ @ApiModelProperty(value = "商品状态（0下架 1上架）")
+ private String goodType;
+
+ @ApiModelProperty(value = "商品封面")
+ private String coverImgUrl;
+
+ @ApiModelProperty(value = "商品详情内容")
+ private String content;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "兑换地址")
+ private String address;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ @ApiModelProperty(value = "兑换状态（1每天 2周一到周五 3周末）")
+ private String businessType;
+
+ @ApiModelProperty(value = "兑换开始时间")
+ private String businessStartTime;
+
+ @ApiModelProperty(value = "兑换结束时间")
+ private String businessEndTime;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiSnapshotClassifyVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiSnapshotClassifyVO.java
new file mode 100644
index 0000000..6831394
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiSnapshotClassifyVO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇随手拍分类")
+public class JinhuiSnapshotClassifyVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "分类名称")
+ private String classifyName;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiSnapshotVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiSnapshotVO.java
new file mode 100644
index 0000000..832a739
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiSnapshotVO.java
@@ -0,0 +1,67 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇随手拍分类")
+public class JinhuiSnapshotVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "分类名称")
+ private String classifyName;
+
+ @ApiModelProperty(value = "提交人员id")
+ private String userId;
+
+ @ApiModelProperty(value = "网格员id")
+ private String reseauId;
+
+
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+
+ @ApiModelProperty(value = "图片或视频url")
+ private String imgUrl;
+
+ @ApiModelProperty(value = "地址")
+ private String address;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "经度")
+ private String lon;
+
+ @ApiModelProperty(value = "地址备注")
+ private String addressRemark;
+
+ @ApiModelProperty(value = "分类id")
+ private String classifyId;
+
+ @ApiModelProperty(value = "是否上报（0 否 1是）")
+ private String isApply;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java
new file mode 100644
index 0000000..4cd15e0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import com.panzhihua.common.model.vos.PageVO;
+import com.panzhihua.common.model.vos.common.PbCheckUnitStatisticsVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ActivityAnalysisVO {
+ @ApiModelProperty("机关单位总数")
+ private Integer unitCount;
+
+ @ApiModelProperty("党员总数")
+ private Integer partyMemberCount;
+
+ @ApiModelProperty("单位统计数据列表（时长倒序）")
+ private PageVO<List<UnitActivityAnalysisVO>> unitList;
+
+ @ApiModelProperty("党员统计数据列表（时长倒序）")
+ private PageVO<List<PartyMemberAnalysisVO>> partyMemberList;
+
+ @ApiModelProperty("机关单位服务总次数")
+ private Integer unitServiceTotalCount;
+
+ @ApiModelProperty("机关单位服务总时长")
+ private Double unitServiceTotalTime;
+
+ @ApiModelProperty("党员服务总次数")
+ private Integer partyMemberServiceTotalCount;
+
+ @ApiModelProperty("党员服务总时长")
+ private Double partyMemberServiceTotalTime;
+
+ @ApiModelProperty("报道单位累计总积分")
+ private Long awardSumCount;
+
+ @ApiModelProperty("报道党员累计总积分")
+ private Long partySumCount;
+
+ @ApiModelProperty("党员数据--聚合")
+ private List<PbCheckUnitStatisticsVo> groupPartyCount;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/AddNeighborCircleAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/AddNeighborCircleAdminVO.java
new file mode 100644
index 0000000..7bb7aad
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/AddNeighborCircleAdminVO.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("新增邻里圈")
+public class AddNeighborCircleAdminVO {
+
+ @ApiModelProperty("发布内容")
+ private String releaseContent;
+
+ @ApiModelProperty("发布图片")
+ private String releaseImages;
+
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+
+ /**
+ * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
+ */
+ public interface BelongType{
+ int LLQ = 1;
+ int WTQD = 2;
+ int XQQD = 3;
+ }
+
+ @ApiModelProperty(value = "当前登陆人id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentReplyStatusByAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentReplyStatusByAdminVO.java
new file mode 100644
index 0000000..ed7c159
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentReplyStatusByAdminVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("修改评论回复状态")
+public class ChangeCommentReplyStatusByAdminVO {
+ @ApiModelProperty("回复id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("状态（1.显示 2.隐藏）")
+ private Integer status;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentStatusByAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentStatusByAdminVO.java
new file mode 100644
index 0000000..f41cd9d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ChangeCommentStatusByAdminVO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("修改评论状态")
+public class ChangeCommentStatusByAdminVO {
+
+ @ApiModelProperty("评论id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("状态（1.显示 2.隐藏）")
+ private Integer status;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java
new file mode 100644
index 0000000..b7102b0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java
@@ -0,0 +1,87 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe 邻里圈VO
+ */
+@Data
+@ApiModel("邻里圈")
+public class ComActNeighborCircleAdminVO {
+
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("发布人id")
+ private Long releaseId;
+
+ @ApiModelProperty("发布人头像url")
+ private String imageUrl;
+
+ @ApiModelProperty("发布人")
+ private String releaseName;
+
+ @ApiModelProperty("话题名称")
+ private String topicName;
+
+ @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台", hidden = true)
+ private Integer userType;
+
+ @ApiModelProperty("发布人电话")
+ private String releasePhone;
+
+ @ApiModelProperty("社区")
+ private String communityName;
+
+ @ApiModelProperty("详情")
+ private String releaseContent;
+
+ @ApiModelProperty("发布图片")
+ private String releaseImages;
+
+ @ApiModelProperty("发布状态(1.待审核 2.显示 3.隐藏 4.驳回)")
+ private Integer status;
+
+ @ApiModelProperty("驳回原因")
+ private String refuseReason;
+
+ @ApiModelProperty("评论数")
+ private Integer commentNum;
+
+ @ApiModelProperty("点赞数")
+ private Integer fabulousNum;
+
+ @ApiModelProperty("转发数")
+ private Integer forwardNum;
+
+ @ApiModelProperty("浏览量")
+ private Integer viewsNum;
+
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("评论数")
+ private Integer lastCommentNum;
+
+ @ApiModelProperty("点赞数")
+ private Integer lastFabulousNum;
+
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+ @ApiModelProperty("处理状态 0待接收 1正在求助 2待处理 3待评价 4已评价")
+ private Integer solveStatus;
+
+ @ApiModelProperty("预计服务时长")
+ private String targetServiceTime;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAnalysisVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAnalysisVO.java
new file mode 100644
index 0000000..99cd501
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAnalysisVO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+ * @author zts
+ * @decribe
+ * */
+@Data
+@ApiModel("机关单位服务统计返回类")
+public class ComActNeighborCircleAnalysisVO {
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ @ApiModelProperty("机关单位报道社区")
+ private String communityName;
+
+ @ApiModelProperty("机关单位名称")
+ private String unitName;
+
+ @ApiModelProperty("服务时间统计")
+ private String serviceTime;
+
+ @ApiModelProperty("服务次数统计")
+ private Integer serviceTimes;
+
+ @ApiModelProperty("机关单位总数")
+ private Integer unitCount;
+
+ @ApiModelProperty("机关单位id")
+ private Long unitId;
+
+
+// @ApiModelProperty("活动id")
+// private Long neighborCircleId;
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
new file mode 100644
index 0000000..f7c0a14
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
@@ -0,0 +1,150 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 邻里圈VO
+ */
+@Data
+@ApiModel("邻里圈")
+public class ComActNeighborCircleAppVO {
+
+ @ApiModelProperty("邻里圈id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("邻里圈发布人名字")
+ private String name;
+
+ @ApiModelProperty("邻里圈发布人头像url地址")
+ private String headUrl;
+
+ @ApiModelProperty("发布内容")
+ private String releaseContent;
+
+ @ApiModelProperty("发布图片")
+ private String releaseImages;
+
+ @ApiModelProperty("评论数")
+ private Integer commentNum;
+
+ @ApiModelProperty("点赞数")
+ private Integer fabulousNum;
+
+ @ApiModelProperty("转发数")
+ private Integer forwardNum;
+
+ @ApiModelProperty("浏览量")
+ private Integer viewsNum;
+
+ @ApiModelProperty("是否为精品帖(1.是 2.否)")
+ private Integer isBoutique;
+
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("最后回复时间")
+ private Date replyAt;
+
+ /**
+ * 近3天评论数
+ */
+ @ApiModelProperty("近3天评论数")
+ private Integer lastCommentNum;
+
+ /**
+ * 近3天点赞数
+ */
+ @ApiModelProperty("近3天点赞数")
+ private Integer lastFabulousNum;
+
+ /**
+ * 近3天浏览量
+ */
+ @ApiModelProperty("近3天浏览量")
+ private Integer lastViewsNum;
+
+ /**
+ * 驳回原因
+ */
+ @ApiModelProperty("驳回原因")
+ private String refuseReason;
+
+ /**
+ * 是否已经点赞 1 是 2 否
+ */
+ @ApiModelProperty("是否已经点赞 1 是 2 否")
+ private Integer haveSign = 2;
+
+ /**
+ * 发布类型（1.小程序发布 2.后台发布）
+ */
+ @ApiModelProperty("发布类型（1.小程序发布 2.后台发布）")
+ private Integer type;
+
+ /**
+ * 发布状态(1.待审核 2.显示 3.隐藏 4.驳回)
+ */
+ @ApiModelProperty("发布状态(1.待审核 2.显示 3.隐藏 4.驳回)")
+ private Integer status;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("话题名称")
+ private String topicName;
+
+ @ApiModelProperty("话题id")
+ private String topicId;
+
+ @ApiModelProperty("热度")
+ private Long hotNum;
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
+ @ApiModelProperty("处理状态 0待接收 1正在求助 2待处理 3待评价 4已评价")
+ private Integer solveStatus;
+ @ApiModelProperty("接单类型 1单位 2个人")
+ private Integer orderType;
+ @ApiModelProperty("接单状态 0 否 1是")
+ private Integer orderStatus;
+ @ApiModelProperty("接单人id")
+ private Long solveId;
+ @ApiModelProperty("反馈内容")
+ private String solveContent;
+ @ApiModelProperty("反馈图片")
+ private String solveUrl;
+ @ApiModelProperty("预计服务时长")
+ private String targetServiceTime;
+ @ApiModelProperty("实际服务时长")
+ private String realServiceTime;
+ @ApiModelProperty("评价内容")
+ private String comment;
+ @ApiModelProperty("评价时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date commentTime;
+ @ApiModelProperty("说明")
+ private String instruction;
+ @ApiModelProperty("求助党员类型 1全部 2指定")
+ private Integer helpMemberType;
+ @ApiModelProperty("求助指定党员数组")
+ private String helpMemberContent;
+ @ApiModelProperty("求助党组织类型 1全部 2指定")
+ private Integer helpOrgType;
+ @ApiModelProperty("求助指定党组织数组")
+ private String helpOrgContent;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentAppVO.java
new file mode 100644
index 0000000..e217e1c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentAppVO.java
@@ -0,0 +1,66 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 邻里圈评论返回参数
+ */
+@Data
+@ApiModel("邻里圈评论返回参数")
+public class ComActNeighborCircleCommentAppVO {
+
+ @ApiModelProperty("邻里圈评论id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("邻里圈id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long circleId;
+
+ @ApiModelProperty("用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+
+ @ApiModelProperty("评论用户名字")
+ private String userName;
+
+ @ApiModelProperty("评论用户头像")
+ private String userHeadUrl;
+
+ @ApiModelProperty("评论内容")
+ private String content;
+
+ @ApiModelProperty("点赞数")
+ private Integer fabulousNum;
+
+ @ApiModelProperty("评论时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("是否是作者评论（1.是 2.否）")
+ private Integer isRelease;
+
+ @ApiModelProperty("邻里圈评论回复列表（默认展示2条）")
+ private List<ComActNeighborCircleCommentReplyAppVO> circleCommentReplyAppList;
+
+ @ApiModelProperty("邻里圈评论回复数量")
+ private Integer commentReplyNum;
+
+ /**
+ * 是否已经点赞 1 是 2 否
+ */
+ @ApiModelProperty("是否已经点赞 1 是 2 否")
+ private Integer haveSign = 2;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentReplyAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentReplyAppVO.java
new file mode 100644
index 0000000..7577dba
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentReplyAppVO.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 邻里圈评论返回参数
+ */
+@Data
+@ApiModel("邻里圈评论回复返回参数")
+public class ComActNeighborCircleCommentReplyAppVO {
+
+ @ApiModelProperty("邻里圈评论回复id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("评论id")
+ private Long commentId;
+
+ @ApiModelProperty("上级回复用户名称")
+ private String parentUserName;
+
+ @ApiModelProperty("回复用户名称")
+ private String userName;
+
+ @ApiModelProperty("回复用户头像url")
+ private String userHeadUrl;
+
+ @ApiModelProperty("回复内容")
+ private String replyContent;
+
+ @ApiModelProperty("点赞数")
+ private Integer fabulousNum;
+
+ @ApiModelProperty("评论时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("是否是作者回复（1.是 2.否）")
+ private Integer isRelease;
+
+ /**
+ * 是否已经点赞 1 是 2 否
+ */
+ @ApiModelProperty("是否已经点赞 1 是 2 否")
+ private Integer haveSign = 2;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
new file mode 100644
index 0000000..d27df45
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
@@ -0,0 +1,143 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 邻里圈详情返回参数
+ */
+@Data
+@ApiModel("邻里圈详情返回参数")
+public class ComActNeighborCircleDetailAppVO {
+
+ @ApiModelProperty("邻里圈id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("邻里圈发布人名字")
+ private String name;
+
+ @ApiModelProperty("邻里圈发布人头像url地址")
+ private String headUrl;
+
+ @ApiModelProperty("发布内容")
+ private String releaseContent;
+
+ @ApiModelProperty("发布图片")
+ private String releaseImages;
+
+ @ApiModelProperty("评论数")
+ private Integer commentNum;
+
+ @ApiModelProperty("点赞数")
+ private Integer fabulousNum;
+
+ @ApiModelProperty("转发数")
+ private Integer forwardNum;
+
+ @ApiModelProperty("浏览量")
+ private Integer viewsNum;
+
+ @ApiModelProperty("是否为精品帖(1.是 2.否)")
+ private Integer isBoutique;
+
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("最后回复时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date replyAt;
+
+ @ApiModelProperty("邻里圈评论列表")
+ private List<ComActNeighborCircleCommentAppVO> circleCommentAppList;
+
+ /**
+ * 是否已经点赞 1 是 2 否
+ */
+ @ApiModelProperty("是否已经点赞 1 是 2 否")
+ private Integer haveSign = 2;
+
+ /**
+ * 发布类型（1.小程序发布 2.后台发布）
+ */
+ @ApiModelProperty("发布类型（1.小程序发布 2.后台发布）")
+ private Integer type;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("邻里圈话题名字")
+ private String topicName;
+
+ @ApiModelProperty("驳回原因")
+ private String refuseReason;
+
+ @ApiModelProperty("处理状态 0 否 1是")
+ private Integer solveStatus;
+ @ApiModelProperty("接单状态 0 否 1是")
+ private Integer orderStatus;
+ @ApiModelProperty("接单人id")
+ private Long solveId;
+ @ApiModelProperty("反馈内容")
+ private String solveContent;
+ @ApiModelProperty("反馈图片")
+ private String solveUrl;
+ @ApiModelProperty("接单人名称")
+ private String solveName;
+ @ApiModelProperty("接单时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date orderTime;
+ @ApiModelProperty("处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date solveTime;
+
+ private Long topicId;
+
+ private Long releaseId;
+
+ private Integer status;
+ @ApiModelProperty("接单类型 1单位 2个人")
+ private Integer orderType;
+ @ApiModelProperty("预计服务时长")
+ private String targetServiceTime;
+ @ApiModelProperty("实际服务时长")
+ private String realServiceTime;
+ @ApiModelProperty("评价内容")
+ private String comment;
+ @ApiModelProperty("评价时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date commentTime;
+ @ApiModelProperty("说明")
+ private String instruction;
+ @ApiModelProperty("求助党员类型 1全部 2指定")
+ private Integer helpMemberType;
+ @ApiModelProperty("求助指定党员数组")
+ private String helpMemberContent;
+ @ApiModelProperty("求助党组织类型 1全部 2指定")
+ private Integer helpOrgType;
+ @ApiModelProperty("求助指定党组织数组")
+ private String helpOrgContent;
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+ private Long solveUnitId;
+
+ private String activityName;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long activityId;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date activityDate;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAdminVO.java
new file mode 100644
index 0000000..c2be8a2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAdminVO.java
@@ -0,0 +1,40 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @describe 邻里圈话题返回参数
+ */
+@Data
+@ApiModel("邻里圈话题返回参数")
+public class ComActNeighborCircleTopicAdminVO {
+
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("话题名字")
+ private String name;
+
+ @ApiModelProperty(value = "状态（1.启用 2.禁用）")
+ private Integer status;
+
+ @ApiModelProperty("发布人")
+ private String createBy;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("排序")
+ private Integer sort;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAppVO.java
new file mode 100644
index 0000000..0979342
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAppVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @describe 邻里圈话题返回参数
+ */
+@Data
+@ApiModel("邻里圈话题返回参数")
+public class ComActNeighborCircleTopicAppVO {
+
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("话题名字")
+ private String name;
+
+ @ApiModelProperty("热度")
+ private Long hotNum;
+
+ @ApiModelProperty("邻里圈数量")
+ private Integer count;
+
+ @ApiModelProperty("话题logo")
+ private String logo;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentByAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentByAdminVO.java
new file mode 100644
index 0000000..edc8845
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentByAdminVO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("邻里圈评论")
+public class ComActNeighborCommentByAdminVO {
+
+ @ApiModelProperty("评论id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("评论内容")
+ private String content;
+
+ @ApiModelProperty("点赞数")
+ private Integer fabulousNum;
+
+ @ApiModelProperty("评论用户")
+ private String userName;
+
+ @ApiModelProperty("评论用户手机号")
+ private String userPhone;
+
+ @ApiModelProperty("评论时间")
+ private Date createAt;
+
+ @ApiModelProperty("状态（1.显示 2.隐藏）")
+ private Integer status;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyAppVO.java
new file mode 100644
index 0000000..f5504af
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyAppVO.java
@@ -0,0 +1,57 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 邻里圈评论回复
+ */
+@Data
+@ApiModel("邻里圈评论回复")
+public class ComActNeighborCommentReplyAppVO {
+
+ @ApiModelProperty("邻里圈回复id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("评论id")
+ private String commentId;
+
+ @ApiModelProperty("回复人名称")
+ private String userName;
+
+ @ApiModelProperty("回复人头像")
+ private String userHeadUrl;
+
+ @ApiModelProperty("被回复人名称")
+ private String oldUserName;
+
+ @ApiModelProperty("回复内容")
+ private String replyContent;
+
+ @ApiModelProperty("点赞数")
+ private Integer fabulousNum;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("回复时间")
+ private Date createAt;
+
+ @ApiModelProperty("是否是作者回复（1.是 2.否）")
+ private Integer isRelease;
+
+ /**
+ * 是否已经点赞 1 是 2 否
+ */
+ @ApiModelProperty("是否已经点赞 1 是 2 否")
+ private Integer haveSign = 2;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyByAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyByAdminVO.java
new file mode 100644
index 0000000..4b2fee8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCommentReplyByAdminVO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("邻里圈评论的回复")
+public class ComActNeighborCommentReplyByAdminVO {
+
+ @ApiModelProperty("评论id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("邻里圈id")
+ private Long circleId;
+
+ @ApiModelProperty("评论用户")
+ private String userName;
+
+ @ApiModelProperty("用户昵称")
+ private String userNickName;
+
+ @ApiModelProperty("评论用户手机号")
+ private String userPhone;
+
+ @ApiModelProperty("内容")
+ private String replyContent;
+
+ @ApiModelProperty("点赞数")
+ private Integer fabulousNum;
+
+ @ApiModelProperty("状态（1.显示 2.隐藏）")
+ private Integer status;
+ @ApiModelProperty("评论时间")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java
new file mode 100644
index 0000000..b0b5968
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java
@@ -0,0 +1,85 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("邻里圈详情")
+public class DetailNeighborCircleAdminVO {
+
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("发布人")
+ private String releaseName;
+
+ @ApiModelProperty("发布人电话")
+ private String releasePhone;
+
+ @ApiModelProperty("发布内容")
+ private String releaseContent;
+
+ @ApiModelProperty("发布图片")
+ private String releaseImages;
+
+ @ApiModelProperty("发布状态(1.待审核 2.显示 3.隐藏 4.驳回)")
+ private Integer status;
+
+ @ApiModelProperty("驳回原因")
+ private String refuseReason;
+
+ @ApiModelProperty("评论数")
+ private Integer commentNum;
+
+ @ApiModelProperty("点赞数")
+ private Integer fabulousNum;
+
+ @ApiModelProperty("转发数")
+ private Integer forwardNum;
+
+ @ApiModelProperty("浏览量")
+ private Integer viewsNum;
+
+ @ApiModelProperty("是否为精品帖(1.是 2.否)")
+ private Integer isBoutique;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("话题名称")
+ private String topicName;
+
+ @ApiModelProperty("头像")
+ private String imageUrl;
+
+ @ApiModelProperty("处理状态 0 否 1是")
+ private Integer solveStatus;
+ @ApiModelProperty("接单状态 0 否 1是")
+ private Integer orderStatus;
+ @ApiModelProperty("接单人id")
+ private Long solveId;
+ @ApiModelProperty("反馈内容")
+ private String solveContent;
+ @ApiModelProperty("反馈图片")
+ private String solveUrl;
+ @ApiModelProperty("接单人名称")
+ private String solveName;
+ @ApiModelProperty("接单时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date orderTime;
+ @ApiModelProperty("处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date solveTime;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java
new file mode 100644
index 0000000..a3b294b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/EditNeighborCircleAdminVO.java
@@ -0,0 +1,82 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("修改邻里圈状态")
+public class EditNeighborCircleAdminVO {
+
+ @ApiModelProperty("邻里圈Id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("发布状态(1.待审核 2.显示 3.隐藏 4.驳回)")
+ private Integer status;
+
+ @ApiModelProperty(value = "当前用户Id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty("驳回原因")
+ private String refuseReason;
+
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+
+ @ApiModelProperty("接单状态 0 否 1是")
+ private Integer orderStatus;
+ @ApiModelProperty("接单类型 1单位 2个人")
+ private Integer orderType;
+ @ApiModelProperty("处理状态 0待接收 1正在求助 2待处理 3待评价 4已评价")
+ private Integer solveStatus;
+ @ApiModelProperty("接单人id")
+ private Long solveId;
+ @ApiModelProperty("接单单位id")
+ private Long solveUnitId;
+ @ApiModelProperty("反馈内容")
+ private String solveContent;
+ @ApiModelProperty("反馈图片")
+ private String solveUrl;
+ @ApiModelProperty("预计服务时长")
+ private String targetServiceTime;
+ @ApiModelProperty("实际服务时长")
+ private String realServiceTime;
+ @ApiModelProperty("评价内容")
+ private String comment;
+ @ApiModelProperty("说明")
+ private String instruction;
+ @ApiModelProperty("求助党员类型 1全部 2指定")
+ private Integer helpMemberType;
+ @ApiModelProperty("求助指定党员数组")
+ private String helpMemberContent;
+ @ApiModelProperty("求助党组织类型 1全部 2指定")
+ private Integer helpOrgType;
+ @ApiModelProperty("求助指定党组织数组")
+ private String helpOrgContent;
+
+ /**
+ * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
+ */
+ public interface BelongType{
+ int LLQ = 1;
+ int WTQD = 2;
+ int XQQD = 3;
+ }
+
+ /**
+ * 发布状态(1.待审核 2.显示 3.隐藏 4.驳回)
+ */
+ public interface status {
+ int dsh = 1;
+ int xs = 2;
+ int yc = 3;
+ int bh = 4;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/PartyMemberAnalysisVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/PartyMemberAnalysisVO.java
new file mode 100644
index 0000000..026f44e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/PartyMemberAnalysisVO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class PartyMemberAnalysisVO {
+
+ @ApiModelProperty("党员姓名")
+ private String memberName;
+
+ @ApiModelProperty("所属单位")
+ private String belongUnit;
+
+ @ApiModelProperty("所属社区")
+ private String belongCommunity;
+
+ @ApiModelProperty("单位归属")
+ private String belongTo;
+
+ @ApiModelProperty("所属党组织")
+ private String orgName;
+
+ @ApiModelProperty("单位名称")
+ private String unitName;
+
+ @ApiModelProperty("服务次数")
+ private Integer serviceTimes;
+
+ @ApiModelProperty("服务时长")
+ private Double serviceTime;
+
+ @ApiModelProperty("党员id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long memberId;
+
+ @ApiModelProperty("党员积分")
+ private Long partyCount=0l;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ServiceDetailStaticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ServiceDetailStaticsVO.java
new file mode 100644
index 0000000..ae4358d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ServiceDetailStaticsVO.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ServiceDetailStaticsVO
+ * @projectName:
+ * @description: 服务明细
+ * @author: hans
+ * @date: 2022/08/15 9:53
+ */
+@Data
+@ApiModel("服务明细")
+public class ServiceDetailStaticsVO {
+ @ApiModelProperty("关联id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long serviceId;
+ @ApiModelProperty("服务时长")
+ private double serviceTime;
+ @ApiModelProperty("服务时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date serviceAt;
+ @ApiModelProperty("服务方式（1.承接清单 2.单位参与社区活动 3.报到服务活动 4.党员参与社区活动）")
+ private Integer serviceType;
+
+ @ApiModelProperty("是否是问题清单（1.不是 2是）")
+ private String isNew="1";
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ServiceStaticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ServiceStaticsVO.java
new file mode 100644
index 0000000..9d17e4f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ServiceStaticsVO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import com.panzhihua.common.model.vos.community.ComActActivityVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("服务统计返回")
+public class ServiceStaticsVO {
+ @ApiModelProperty("次数")
+ private Integer times;
+ @ApiModelProperty("时长")
+ private double hours;
+ @ApiModelProperty("服务项目列表")
+ private List<ComActNeighborCircleAppVO> serviceProjecList;
+ @ApiModelProperty("服务活动列表")
+ private List<ComActActivityVO> serviceActivityList;
+ @ApiModelProperty("单位活动列表")
+ private List<ComActActivityVO> workActivityList;
+ @ApiModelProperty("服务明细列表")
+ private List<ServiceDetailStaticsVO> serviceDetailStaticsList;
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/UnitActivityAnalysisVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/UnitActivityAnalysisVO.java
new file mode 100644
index 0000000..0ed5e5f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/UnitActivityAnalysisVO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.vos.neighbor;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel
+public class UnitActivityAnalysisVO implements Serializable {
+
+ @ApiModelProperty("单位归属")
+ private String belongTo;
+
+ @ApiModelProperty("所属党组织")
+ private String orgName;
+
+ @ApiModelProperty("单位名称")
+ private String unitName;
+
+ @ApiModelProperty("报道社区名称")
+ private String communityName;
+
+ @ApiModelProperty("服务次数")
+ private Integer serviceTimes;
+
+ @ApiModelProperty("服务时长")
+ private Double serviceTime;
+
+ @ApiModelProperty("单位id'")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long unitId;
+
+ @ApiModelProperty("报道社区id")
+ private String communityId;
+
+ @ApiModelProperty("累计积分")
+ private Long awardSum=0l;
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ActivityManagerVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ActivityManagerVO.java
new file mode 100644
index 0000000..8415ebb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ActivityManagerVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 负责人
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-07 14:45
+ **/
+@Data
+@ApiModel("负责人")
+public class ActivityManagerVO {
+
+ @ApiModelProperty("负责人id")
+ private Long managerId;
+
+ @ApiModelProperty("负责人名字")
+ private String name;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsHeaderOrgVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsHeaderOrgVo.java
new file mode 100644
index 0000000..260d359
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsHeaderOrgVo.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author lyq
+ * 查询党建数据统计党组织返回参数
+ */
+@Data
+@ApiModel("查询党建数据统计党组织返回参数")
+public class ComDataStatisticsHeaderOrgVo {
+
+ @ApiModelProperty(value = "党组织数量")
+ private Integer orgNum = 0;
+
+ @ApiModelProperty(value = "党组织绑定小区数量")
+ private Integer areaNum = 0;
+
+ @ApiModelProperty(value = "社区下小区数量")
+ private Integer villageNum = 0;
+
+ @ApiModelProperty(value = "小区覆盖率")
+ private BigDecimal villageRate = BigDecimal.ZERO;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsMemberVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsMemberVo.java
new file mode 100644
index 0000000..958e7bd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsMemberVo.java
@@ -0,0 +1,108 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询党建数据统计返回参数
+ */
+@Data
+@ApiModel("分页查询党建数据统计返回参数")
+public class ComDataStatisticsMemberVo {
+
+ @ApiModelProperty(value = "党员id")
+ private Long id;
+
+ @ApiModelProperty(value = "党员姓名")
+ private String name;
+
+ @ApiModelProperty(value = "党员头像url")
+ private String photoPath;
+
+ @ApiModelProperty(value = "是否是党委（1.是 2.否）")
+ private Integer isRole;
+
+ @ApiModelProperty(value = "党员类型（1.预备党员 2.正式党员）")
+ private Integer type;
+
+ @ApiModelProperty(value = "性别（1.是 2.否）")
+ private Integer sex;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "党龄")
+ private Integer partyAge;
+
+ @ApiModelProperty(value = "职能")
+ private String function;
+
+ @ApiModelProperty(value = "特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）")
+ private Integer specialtyCategory;
+
+ @ApiModelProperty(value = "特长描述")
+ private String specialtyName;
+
+ @ApiModelProperty(value = "职位")
+ private String position;
+
+ @ApiModelProperty(value = "职位2")
+ private String positionTwo;
+
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ @ApiModelProperty(value = "报道单位id")
+ private Long checkUnitId;
+
+ @ApiModelProperty(value = "报道单位名称")
+ private String checkUnitName;
+
+ @ApiModelProperty(value = "所属党组织id")
+ private Long orgId;
+
+ @ApiModelProperty(value = "所属党组织名称")
+ private String orgName;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "总活动次数")
+ private Integer activityCount;
+
+ @ApiModelProperty(value = "总活动时长（小时）")
+ private Integer activityDuration;
+
+ @ApiModelProperty(value = "党员活动次数")
+ private Integer partyActivityCount;
+
+ @ApiModelProperty(value = "党员活动时长（小时）")
+ private Integer partyActivityDuration = 0;
+
+ @ApiModelProperty(value = "党员活动积分数量")
+ private Integer partyActivityIntegral;
+
+ @ApiModelProperty(value = "志愿者活动次数")
+ private Integer volunteerActivityCount;
+
+ @ApiModelProperty(value = "志愿者活动时长（小时）")
+ private Integer volunteerActivityDuration;
+
+ @ApiModelProperty(value = "志愿者活动积分数量")
+ private Integer volunteerActivityIntegral;
+
+ @ApiModelProperty(value = "完成微心愿数量")
+ private Integer wishCount;
+
+ @ApiModelProperty(value = "完成随手拍数量")
+ private Integer easyCount;
+
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsOrgVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsOrgVo.java
new file mode 100644
index 0000000..a7288a4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsOrgVo.java
@@ -0,0 +1,122 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author lyq
+ * 查询党建数据统计党组织返回参数
+ */
+@Data
+@ApiModel("查询党建数据统计党组织返回参数")
+public class ComDataStatisticsOrgVo {
+
+ @ApiModelProperty(value = "党员人数")
+ private Integer partyMemberNum;
+
+ @ApiModelProperty(value = "正式党员人数")
+ private Integer formalPartyMemberNum;
+
+ @ApiModelProperty(value = "正式党员人数百分比")
+ private BigDecimal formalPartyMemberNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "预备党员人数")
+ private Integer preparePartyMemberNum;
+
+ @ApiModelProperty(value = "预备党员人数百分比")
+ private BigDecimal preparePartyMemberNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "体育类党员人数")
+ private Integer tyNum;
+
+ @ApiModelProperty(value = "体育类党员人数百分比")
+ private BigDecimal tyNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "美术类党员人数")
+ private Integer msNum;
+
+ @ApiModelProperty(value = "美术类党员人数百分比")
+ private BigDecimal msNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "音乐类党员人数")
+ private Integer yyNum;
+
+ @ApiModelProperty(value = "音乐类党员人数百分比")
+ private BigDecimal yyNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "舞蹈类党员人数")
+ private Integer wdNum;
+
+ @ApiModelProperty(value = "舞蹈类党员人数百分比")
+ private BigDecimal wdNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "其他类党员人数")
+ private Integer qtNum;
+
+ @ApiModelProperty(value = "其他类党员人数百分比")
+ private BigDecimal qtNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "无类型党员人数")
+ private Integer wuNum;
+
+ @ApiModelProperty(value = "无类型党员人数百分比")
+ private BigDecimal wuNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "党员列表")
+ private List<PartyBuildingMemberVO> partyMemberList;
+
+ @ApiModelProperty(value = "参与活动次数")
+ private Integer participateActivityNum;
+
+ @ApiModelProperty(value = "参与活动时长")
+ private Integer participateActivityDuration;
+
+ @ApiModelProperty(value = "参与志愿者活动次数")
+ private Integer participateVolunteerActivityNum;
+
+ @ApiModelProperty(value = "参与志愿者活动次数百分比")
+ private BigDecimal participateVolunteerActivityNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "参与志愿者活动时长")
+ private Integer participateVolunteerActivityDuration;
+
+ @ApiModelProperty(value = "参与志愿者活动时长百分比")
+ private BigDecimal participateVolunteerActivityDurationPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "参与党员活动次数")
+ private Integer participatePartyActivityNum;
+
+ @ApiModelProperty(value = "参与党员活动次数百分比")
+ private BigDecimal participatePartyActivityNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "参与党员活动时长")
+ private Integer participatePartyActivityDuration;
+
+ @ApiModelProperty(value = "参与党员活动时长百分比")
+ private BigDecimal participatePartyActivityDurationPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "月份统计list")
+ private List<String> monthList;
+
+ @ApiModelProperty(value = "完成微心愿折线统计数据")
+ private List<String> completeWishList;
+
+ @ApiModelProperty(value = "累计微心愿折线统计数据")
+ private List<String> cumulativeWishList;
+
+ @ApiModelProperty(value = "完成随手拍折线统计数据")
+ private List<String> completeEasyList;
+
+ @ApiModelProperty(value = "累计随手拍折线统计数据")
+ private List<String> cumulativeEasyList;
+
+ @ApiModelProperty(value = "完成微心愿数量")
+ private String wishNum = "0";
+
+ @ApiModelProperty(value = "完成随手拍数量")
+ private String easyNum = "0";
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComEldersAuthHistoryExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComEldersAuthHistoryExcelVO.java
new file mode 100644
index 0000000..b2b54e4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComEldersAuthHistoryExcelVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @description: 党员信息导出
+ * @author: lyq
+ * @date: 2021/5/6 17:48
+ */
+@Data
+public class ComEldersAuthHistoryExcelVO {
+
+ @ExcelProperty(value = "姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "身份证号", index = 1)
+ private String idCard;
+
+ @ExcelProperty(value = "出生年月", index = 2)
+ private String brithday;
+
+ @ExcelProperty(value = "年龄", index = 3)
+ private Date age;
+
+ @ExcelProperty(value = "户籍地", index = 4)
+ private Date domicile;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbDynUserVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbDynUserVO.java
new file mode 100644
index 0000000..3ec1d64
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbDynUserVO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 动态、政策文件、阅读记录
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-02 17:17
+ **/
+@Data
+@ApiModel("党员动态阅读记录表")
+public class ComPbDynUserVO {
+
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("党员动态、政策文件id")
+ private Long dynId;
+
+ @ApiModelProperty("小程序用户id")
+ private Long userId;
+
+ @ApiModelProperty("阅读时间")
+ private Date createAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java
new file mode 100644
index 0000000..7f92136
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+/**
+ * @description: 党员信息导出
+ * @author: lyq
+ * @date: 2021/5/6 17:48
+ */
+@Data
+public class ComPbMemberExcelVO {
+
+ @ExcelProperty(value = "姓名",index = 0)
+ private String name;
+ @ExcelProperty(value = "常住社区",index = 1)
+ private String communityName;
+ @ExcelProperty(value = "小区院落",index = 2)
+ private String villageName;
+ @ExcelProperty(value = "工作单位",index = 4)
+ private String checkUnitName;
+ @ExcelProperty(value = "职能特长及服务意愿",index = 3)
+ private String specialtyName;
+ @ExcelProperty(value = "工作单位归属",index = 5)
+ private String belongTo;
+ @ExcelProperty(value = "服务社区",index = 6)
+ private String helpCommunityName;
+
+ @ExcelProperty(value = "电话号码",index = 7)
+ private String phone;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberTypeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberTypeVO.java
new file mode 100644
index 0000000..9d491d2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberTypeVO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther yh
+ * @create 2022-11-08 17:25:45
+ * @describe 统计党员类型VO
+ */
+@Data
+@ApiModel("统计党员类型VO")
+public class ComPbMemberTypeVO {
+
+ /**
+ * 人数
+ */
+ @ApiModelProperty("人数")
+ private Integer countNum;
+
+ /**
+ * 类型
+ */
+ @ApiModelProperty("类型")
+ private String countName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberVO.java
new file mode 100644
index 0000000..30e48dc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberVO.java
@@ -0,0 +1,103 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class ComPbMemberVO {
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 所属党组织id
+ */
+ @ApiModelProperty("所属党组织id")
+ private Long orgId;
+
+ /**
+ * 身份证号
+ */
+ @ApiModelProperty("身份证号")
+ private String idCard;
+
+ /**
+ * 姓名
+ */
+ @ApiModelProperty("姓名")
+ private String name;
+
+ /**
+ * 头像图片路径
+ */
+ @ApiModelProperty("头像图片路径")
+ private String photoPath;
+
+ /**
+ * 入党时间
+ */
+ @ApiModelProperty("入党时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date joinTime;
+
+ /**
+ * 转正时间
+ */
+ @ApiModelProperty("转正时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date employmentTime;
+
+ /**
+ * 党员审查结果
+ */
+ private Integer auditResult;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date createAt;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date updateAt;
+ /**
+ * 社区id
+ */
+ private Long communityId;
+
+ /**
+ * 用户id
+ */
+ private Long userId;
+
+ /**
+ * 驳回原因
+ */
+ private String refuseReason;
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("党组织")
+ private String orgName;
+
+ @ApiModelProperty("时长")
+ private Long duration;
+
+ @ApiModelProperty("积分")
+ private Long partyInterval;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamVO.java
new file mode 100644
index 0000000..52fa7c0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamVO.java
@@ -0,0 +1,55 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 服务团队人员
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-21 18:11
+ **/
+@Data
+@ApiModel("服务团队人员")
+public class ComPbServiceTeamVO {
+
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("职位")
+ private String job;
+
+ @ApiModelProperty("职位2")
+ private String jobTwo;
+
+ @ApiModelProperty("岗位职责")
+ private String jobResponsibilities;
+
+ @ApiModelProperty("照片")
+ private String url;
+
+ @ApiModelProperty("create_at")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+ @ApiModelProperty("电话")
+ private String phone;
+ @ApiModelProperty("是否注册")
+ private Integer isReg;
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamWishVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamWishVO.java
new file mode 100644
index 0000000..8a4362b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamWishVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 微心愿服务团队人员
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-21 18:11
+ **/
+@Data
+@ApiModel("微心愿服务团队人员")
+public class ComPbServiceTeamWishVO {
+
+ @ApiModelProperty("managerId")
+ private Long managerId;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PageActivityMembersVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PageActivityMembersVO.java
new file mode 100644
index 0000000..a3427fa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PageActivityMembersVO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 分页活动人员
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-01 09:50
+ **/
+@Data
+@ApiModel(value = "分页活动人员")
+public class PageActivityMembersVO {
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+ @ApiModelProperty(value = "姓名")
+ private String name;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "报名时间")
+ private String registrationTime;
+ @ApiModelProperty(value = "人员主键")
+ private Long id;
+ @ApiModelProperty(value = "当前页数")
+ private Long pageNum;
+ @ApiModelProperty(value = "每页记录数")
+ private Long pageSize;
+ @ApiModelProperty(value = "活动id", required = true)
+ private Long activityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PagePartyBuildingMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PagePartyBuildingMemberVO.java
new file mode 100644
index 0000000..354fac8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PagePartyBuildingMemberVO.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 分页党员认证
+ * @author: cedoo
+ * @create: 2021-4-7
+ **/
+@Data
+@ApiModel(value = "分页党员认证")
+public class PagePartyBuildingMemberVO {
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+ @ApiModelProperty(value = "姓名")
+ private String name;
+ @ApiModelProperty(value = "状态")
+ private Integer auditStatus;
+
+ @ApiModelProperty(value = "当前页数")
+ private Long pageNum;
+ @ApiModelProperty(value = "每页记录数")
+ private Long pageSize;
+ @ApiModelProperty(value = "社区id", hidden = true)
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+ @ApiModelProperty(value = "区域编码", hidden = true)
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PagePartyOrganizationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PagePartyOrganizationVO.java
new file mode 100644
index 0000000..9c9851c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PagePartyOrganizationVO.java
@@ -0,0 +1,84 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 分页党员
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-30 16:10
+ **/
+@Data
+@ApiModel(value = "分页查询党员")
+public class PagePartyOrganizationVO {
+
+ @ApiModelProperty(value = "组织名字")
+ private String orgName;
+
+ @ApiModelProperty(value = "组织ID")
+ private Long orgId;
+
+ @ApiModelProperty(value = "账户")
+ private String account;
+
+ @ApiModelProperty(value = "党员姓名")
+ private String name;
+
+ @ApiModelProperty(value = "当前页数")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "每页记录数")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private List<Long> communityIds;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "党员类型（1.预备党员 2.正式党员）")
+ private Integer type;
+
+ @ApiModelProperty(value = "报道单位id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long checkUnitId;
+
+ @ApiModelProperty(value = "特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）")
+ private Long specialtyCategory;
+
+ @ApiModelProperty("开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ @ApiModelProperty("结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+ @ApiModelProperty(value = "特长类别")
+ private String specialtyName;
+
+ @ApiModelProperty("归属区")
+ private String belongTo;
+
+ private String areaCode;
+
+ @ApiModelProperty("单位性质")
+ private String natureName;
+
+ @ApiModelProperty("是否注册小程序（1.是 0.否）")
+ private Integer isRegister;
+
+ @ApiModelProperty(value = "农行单位id集合")
+ private Long[] ids;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java
new file mode 100644
index 0000000..c9072be
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java
@@ -0,0 +1,113 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 活动
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-01 09:08
+ **/
+@Data
+@ApiModel("党员活动")
+public class PartyBuildingActivityVO {
+ @ApiModelProperty("党员活动id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("活动名称")
+ private String name;
+
+ @ApiModelProperty("活动地点")
+ private String address;
+
+ @ApiModelProperty("1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
+ private Integer status;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("发布时间")
+ private Date releaseTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("发布开始时间")
+ private Date releaseTimeBegin;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("发布结束时间")
+ private Date releaseTimeEnd;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("活动开始时间")
+ private Date activityTimeBegin;
+ @ApiModelProperty("活动开始时间-格式化后的")
+ private String activityTimeBeginFormat;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("活动结束时间")
+ private Date activityTimeEnd;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("报名开始时间")
+ private Date enrollTimeBegin;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("报名结束时间")
+ private Date enrollTimeEnd;
+
+ @ApiModelProperty("当前页数")
+ private Long pageNum;
+
+ @ApiModelProperty("每页记录数")
+ private Long pageSize;
+
+ @ApiModelProperty("活动最多参入人数")
+ private Integer participationNum;
+
+ @ApiModelProperty("活动最低参入人数-未达到到时间自动取消")
+ private Integer participationLowestNum;
+
+ @ApiModelProperty("活动已经参与人数")
+ private Integer participationActualNum;
+
+ @ApiModelProperty("活动封面")
+ private String cover;
+
+ @ApiModelProperty("活动内容-富文本")
+ private String richText;
+
+ @ApiModelProperty("取消原因")
+ private String cancelReason;
+
+ @ApiModelProperty("发布人id")
+ private Long createBy;
+
+ @ApiModelProperty("发布人名字")
+ private String createByName;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
+
+ @ApiModelProperty("活动党员列表")
+ private List<PartyBuildingMemberVO> partyBuildingMemberVOS;
+
+ @ApiModelProperty("是否已经报名")
+ private Integer isSign;
+
+ @ApiModelProperty(value = "活动报名人员id集合", hidden = true)
+ private List<Long> userIds;
+
+ @ApiModelProperty("是否是小程序请求")
+ private Integer isAppliets;
+
+ @ApiModelProperty("是否是个人发起 1 是 0 否")
+ private Integer isPerson;
+
+ @ApiModelProperty("二维码类型 1居民，志愿者 2党员")
+ private Integer codeType;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java
new file mode 100644
index 0000000..c9b2c35
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java
@@ -0,0 +1,106 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 党建动态
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-01 15:53
+ **/
+@Data
+@ApiModel("社区管理》党建》党员动态/政策文件")
+public class PartyBuildingComPbDynVO {
+
+ @ApiModelProperty("党建动态/政策文件id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("标题")
+ private String title;
+
+ @ApiModelProperty("状态 1 待发布 2 已发布")
+ private Integer status;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("发布时间")
+ private Date publishAt;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("发布开始时间")
+ private Date publishAtBegin;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("发布结束时间")
+ private Date publishAtEnd;
+
+ @ApiModelProperty("封面url")
+ private String cover;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("内容")
+ private String content;
+
+ @ApiModelProperty("发布人id")
+ private Long createBy;
+
+ @ApiModelProperty("发布人名字")
+ private String createByName;
+
+ @ApiModelProperty("阅读量")
+ private Integer readingVolume;
+
+ @ApiModelProperty("当前页数")
+ private Long pageNum;
+
+ @ApiModelProperty("每页记录数")
+ private Long pageSize;
+
+ @ApiModelProperty("1动态 2政策文件")
+ private Integer type;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("社区id集合")
+ private List<Long> communityIds;
+
+ @ApiModelProperty("动态内容富文本--纯文本")
+ private String contentText;
+
+ @ApiModelProperty(value = "是否增加 1 增加 0 不增加")
+ private Integer isAdd;
+
+ @ApiModelProperty("动态分类：1-党建动态 2-党员帮扶 3-党员示范")
+ private Integer dynType;
+
+ @ApiModelProperty("封面模式：1-小图展示 2-大图展示")
+ private Integer coverMode;
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
+
+ @ApiModelProperty("跳转链接")
+ private String jumpUrl;
+
+ @ApiModelProperty("跳转状态")
+ private Integer jumpType;
+
+ @ApiModelProperty("政策分类: 1-社工人才政策 2-社会组织培育政策 3-其他政策")
+ private Integer policyType;
+ @ApiModelProperty(value = "查询筛选：0-本小区 1-全部")
+ private Integer choice;
+ @ApiModelProperty("排序方式 正序 ASC")
+ private String sort;
+
+ private String appId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberExcelVO.java
new file mode 100644
index 0000000..222adf4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberExcelVO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 批量党员
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-30 14:57
+ **/
+@Data
+public class PartyBuildingMemberExcelVO implements Serializable {
+ /**
+ * 党员姓名
+ */
+ @ExcelProperty(value = "党员姓名", index = 0)
+ private String name;
+ /**
+ * 所属党组织
+ */
+ @ExcelProperty(value = "所属党组织", index = 2)
+ private String orgName;
+
+ @ExcelProperty(value = "联系电话",index = 1)
+ private String phone;
+
+ @ExcelIgnore
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java
new file mode 100644
index 0000000..7d1faa6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java
@@ -0,0 +1,142 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 党建
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-30 10:03
+ **/
+@Data
+@ApiModel("社区管理》党建》党员信息")
+public class PartyBuildingMemberVO {
+ @ApiModelProperty(value = "姓名")
+ private String name;
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty(value = "入党时间")
+ private Date joinTime;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty(value = "转正时间")
+ private Date employmentTime;
+ @ApiModelProperty(value = "所属党组织id")
+ private Long orgId;
+ @ApiModelProperty(value = "头像图片路径")
+ private String photoPath;
+ @ApiModelProperty(value = "社区ID", hidden = true)
+ private Long communityId;
+ @ApiModelProperty(value = "社区名字")
+ private String communityName;
+ @ApiModelProperty(value = "党组织名字")
+ private String orgName;
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+ @ApiModelProperty(value = "党龄")
+ private Integer partyAge;
+ @ApiModelProperty(value = "状态")
+ private String status;
+ @ApiModelProperty(value = "党员唯一标识id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ @ApiModelProperty(value = "报名时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+ @ApiModelProperty(value = "用户ID")
+ private Long userId;
+ @ApiModelProperty(value = "党员审查结果: 0 待审核 1 已审核 2 自动认证 3 已驳回")
+ private Integer auditResult;
+ @ApiModelProperty(value = "驳回原因")
+ private String refuseReason;
+ @ApiModelProperty(value = "是否党员 1是 2否")
+ private Integer isPb;
+
+ @ApiModelProperty(value = "党员报道类型（1.在职干部 2.机关单位）")
+ private Integer type;
+
+ @ApiModelProperty(value = "职位")
+ private String position;
+
+ @ApiModelProperty(value = "报道单位id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long checkUnitId;
+
+ @ApiModelProperty(value = "报道单位名称")
+ private String checkUnitName;
+
+ @ApiModelProperty(value = "报道单位管理员电话")
+ private String adminPhone;
+
+ @ApiModelProperty(value = "职能")
+ private String function;
+
+ @ApiModelProperty(value = "特长类别（1.统计调查 2.法律援助 3.志愿活动 4.尊老爱幼 5.宣讲宣教 6.心理关爱 7.设施维修 8.其他）")
+ private Integer specialtyCategory;
+
+ @ApiModelProperty(value = "特长描述")
+ private String specialtyName;
+
+ @ApiModelProperty(value = "职位2")
+ private String positionTwo;
+
+ @ApiModelProperty(value = "活动时长")
+ private Integer partyTime;
+
+ @ApiModelProperty(value = "活动积分")
+ private Integer partyInterval;
+
+ @ApiModelProperty(value = "帮扶社区id")
+ private Long helpCommunityId;
+ @ApiModelProperty(value = "帮扶社区名字")
+ private String helpCommunityName;
+ @ApiModelProperty(value = "帮扶社区手机号")
+ private String helpCommunityContacts;
+ @ApiModelProperty(value = "帮扶社区联系人")
+ private String helpCommunityContactsName;
+ @ApiModelProperty(value = "小区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long villageId;
+ @ApiModelProperty(value = "小区名字")
+ private String villageName;
+ @ApiModelProperty(value = "报道单位联系人手机号")
+ private String contacts;
+ @ApiModelProperty(value = "报道单位联系人")
+ private String contactsName;
+
+ private String natureName;
+
+ private Integer natureId;
+
+ private String address;
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "其他备注")
+ private String otherRemark;
+ @ApiModelProperty(value = "报道单位下沉小区")
+ private String unitVillageName;
+ @ApiModelProperty(value = "报道单位服务社区")
+ private String unitHelpCommunityName;
+ @ApiModelProperty(value = "报道单位社区电话")
+ private String unitHelpCommunityContacts;
+ @ApiModelProperty(value = "帮扶社区联系人")
+ private String unitHelpCommunityContactsName;
+ @ApiModelProperty("区级")
+ private String belongTo;
+ @ApiModelProperty("微信昵称")
+ private String nickName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java
new file mode 100644
index 0000000..b49c4e8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java
@@ -0,0 +1,114 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 党委
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-01 14:15
+ **/
+@Data
+@ApiModel("党委")
+public class PartyCommitteeVO {
+
+ @ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("电话")
+ @NotBlank(groups = {AddGroup.class}, message = "电话不能为空")
+ private String phone;
+
+ @ApiModelProperty("是否注册")
+ private Integer isReg;
+
+ @ApiModelProperty("姓名")
+ @NotBlank(groups = {AddGroup.class}, message = "姓名不能为空")
+ private String name;
+
+ @ApiModelProperty("性别")
+ private Integer sex;
+
+ @ApiModelProperty("出生日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date birthTime;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty("职位")
+ @NotBlank(groups = {AddGroup.class}, message = "职位不能为空")
+ private String position;
+
+ @ApiModelProperty("职位2")
+ private String positionTwo;
+
+ @ApiModelProperty("岗位职责")
+ @NotBlank(groups = {AddGroup.class}, message = "岗位职责不能为空")
+ private String jobResponsibilities;
+
+ @ApiModelProperty("头像图片路径")
+ @NotBlank(groups = {AddGroup.class}, message = "头像不能为空")
+ private String photoPath;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "当前页数")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "每页记录数")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "党委标签（1.社区党委 2.区域党委委员）")
+ private Integer type;
+
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty(value = "入党时间")
+ private Date joinTime;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty(value = "转正时间")
+ private Date employmentTime;
+
+ @ApiModelProperty(value = "职能")
+ private String function;
+
+ @ApiModelProperty(value = "特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）")
+ private Integer specialtyCategory;
+
+ @ApiModelProperty(value = "特长描述")
+ private String specialtyName;
+
+ @ApiModelProperty(value = "报道单位id")
+ private Long checkUnitId;
+
+ @ApiModelProperty(value = "报道单位名称")
+ private String checkUnitName;
+
+ @ApiModelProperty(value = "负责党组织id")
+ private Long orgId;
+
+ @ApiModelProperty(value = "负责党组织名字")
+ private String orgName;
+
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ @ApiModelProperty(value = "区域编码", hidden = true)
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyOrganizationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyOrganizationVO.java
new file mode 100644
index 0000000..0ade530
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyOrganizationVO.java
@@ -0,0 +1,78 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 党组织
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-30 11:15
+ **/
+@Data
+@ApiModel("党组织")
+public class PartyOrganizationVO {
+ @ApiModelProperty(value = "党组织id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ @ApiModelProperty(value = "党组织名字")
+ private String name;
+ @ApiModelProperty(value = "状态")
+ private Integer status;
+ @ApiModelProperty(value = "党员人数")
+ private Integer countPerson;
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "上级id")
+ private Long parentId;
+ @ApiModelProperty(value = "组织类别（1.基层党委 2.二级基层党委 3.党总支 4.党支部 5.党小组）")
+ private Integer type;
+ @ApiModelProperty(value = "组织隶属（1.乡镇 2.机关 3.域市街道 3.域市社区（居委会） 4.农村社区居委会 5.建制村 6.国有经济控制 7.集体经济控制 8.非公有经济控制 9.事业单位 10.社会组织 11.其他）")
+ private Integer subjection;
+ @ApiModelProperty(value = "小区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long areaId;
+ @ApiModelProperty(value = "楼栋id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long buildId;
+ @ApiModelProperty(value = "楼栋名称")
+ private String buildName;
+ @ApiModelProperty(value = "所属小区名字")
+ private String areaName;
+ @ApiModelProperty(value = "组织地址")
+ private String address;
+ @ApiModelProperty(value = "经度")
+ private String longitude;
+ @ApiModelProperty(value = "纬度")
+ private String latitude;
+ @ApiModelProperty(value = "一级id")
+ private Long oneId;
+ @ApiModelProperty(value = "二级id")
+ private Long twoId;
+ @ApiModelProperty(value = "三级id")
+ private Long thirdId;
+ @ApiModelProperty(value = "四级id")
+ private Long fourId;
+ @ApiModelProperty(value = "五级id")
+ private Long fiveId;
+
+ @ApiModelProperty(value = "党组织负责人名称")
+ private String userName;
+ @ApiModelProperty(value = "党组织负责人联系电话")
+ private String phone;
+
+ @ApiModelProperty(value = "党组织下子组织")
+ private List<PartyOrganizationVO> childList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PhotoMicroWishData.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PhotoMicroWishData.java
new file mode 100644
index 0000000..317430e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PhotoMicroWishData.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel("街道大屏子类")
+@Data
+public class PhotoMicroWishData
+{
+ @ApiModelProperty(value = "数量")
+ Integer num=0;
+
+
+ @ApiModelProperty(value = "时间")
+ String tiems;
+
+ @ApiModelProperty(value = "排序时间")
+ Date createAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ProjectVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ProjectVO.java
new file mode 100644
index 0000000..787f3f9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ProjectVO.java
@@ -0,0 +1,51 @@
+package com.panzhihua.common.model.vos.partybuilding;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ProjectVO {
+ /**
+ * 项目id
+ */
+ private Long id;
+
+ /**
+ * 单位id
+ */
+ private Long unitId;
+
+ /**
+ * 单位名称
+ */
+ private String unitName;
+
+ /**
+ * 特长
+ */
+ private String speciality;
+
+ /**
+ * 项目名称
+ */
+ private String project;
+
+ /**
+ * 电话号码
+ */
+ private String phone;
+
+ /**
+ * 图片地址
+ */
+ private String image;
+
+ private List<Long> ids;
+
+ /**
+ * 社区id
+ */
+ private String communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComDataStatisticsMemberExcelVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComDataStatisticsMemberExcelVo.java
new file mode 100644
index 0000000..4c4d40b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComDataStatisticsMemberExcelVo.java
@@ -0,0 +1,77 @@
+package com.panzhihua.common.model.vos.partybuilding.excel;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询党建数据统计返回参数
+ */
+@Data
+@ApiModel("分页查询党建数据统计返回参数")
+public class ComDataStatisticsMemberExcelVo {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private Long id;
+
+ @ExcelProperty(value = "党员姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "党龄", index = 2)
+ private Integer partyAge;
+
+ @ExcelProperty(value = "联系电话", index = 3)
+ private String phone;
+
+ @ExcelProperty(value = "身份证号", index = 4)
+ private String idCard;
+
+ @ExcelProperty(value = "职能", index = 5)
+ private String function;
+
+ @ExcelProperty(value = "特长", index = 6)
+ private String specialtyName;
+
+ @ExcelProperty(value = "双报到单位", index = 7)
+ private String checkUnitName;
+
+ @ExcelProperty(value = "总参与活动次数", index = 8)
+ private Integer activityCount;
+
+ @ExcelProperty(value = "总参与活动时长（小时）", index = 9)
+ private Integer activityDuration;
+
+ @ExcelProperty(value = "参与党员活动次数", index = 10)
+ private Integer partyActivityCount;
+
+ @ExcelProperty(value = "参与党员活动时长（小时）", index = 11)
+ private Integer partyActivityDuration;
+
+ @ExcelProperty(value = "参与党员活动积分", index = 12)
+ private Integer partyActivityIntegral;
+
+ @ExcelProperty(value = "参与志愿者活动次数", index = 13)
+ private Integer volunteerActivityCount;
+
+ @ExcelProperty(value = "参与志愿者活动时长（小时）", index = 14)
+ private Integer volunteerActivityDuration;
+
+ @ExcelProperty(value = "参与志愿者活动积分", index = 15)
+ private Integer volunteerActivityIntegral;
+
+ @ExcelProperty(value = "完成微心愿数量", index = 16)
+ private Integer wishCount;
+
+ @ExcelProperty(value = "完成随手拍数量", index = 17)
+ private Integer easyCount;
+
+ @ExcelIgnore
+ private Long communityId;
+
+ @ExcelIgnore
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComPbCheckUnitErrorExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComPbCheckUnitErrorExcelVO.java
new file mode 100644
index 0000000..b6858c4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComPbCheckUnitErrorExcelVO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.vos.partybuilding.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @description: 批量导入党员双报道单位
+ * @author : lyq
+ */
+@Data
+public class ComPbCheckUnitErrorExcelVO implements Serializable {
+
+ @ExcelProperty(value = "单位名称", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "单位类别", index = 1)
+ private String type;
+
+ @ExcelProperty(value = "单位负责人", index = 2)
+ private String contacts;
+
+ @ExcelProperty(value = "负责人联系电话", index = 3)
+ private String phone;
+
+ @ExcelProperty(value = "错误信息", index = 4)
+ private String error;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComPbCheckUnitExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComPbCheckUnitExcelVO.java
new file mode 100644
index 0000000..7b772cd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComPbCheckUnitExcelVO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.vos.partybuilding.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @description: 批量导入党员双报道单位
+ * @author : lyq
+ */
+@Data
+public class ComPbCheckUnitExcelVO implements Serializable {
+
+ @ExcelProperty(value = "单位名称", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "单位类别", index = 1)
+ private String type;
+
+ @ExcelProperty(value = "单位负责人", index = 2)
+ private String contacts;
+
+ @ExcelProperty(value = "负责人联系电话", index = 3)
+ private String phone;
+
+ @ExcelProperty(value = "党组织名称",index = 4)
+ private String orgName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComPbMemberRoleErrorExcelVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComPbMemberRoleErrorExcelVo.java
new file mode 100644
index 0000000..294e59e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComPbMemberRoleErrorExcelVo.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.vos.partybuilding.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询党建数据统计返回参数
+ */
+@Data
+@ApiModel("分页查询党建数据统计返回参数")
+public class ComPbMemberRoleErrorExcelVo {
+
+
+ @ExcelProperty(value = "*党员姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "*身份证号", index = 1)
+ private String idCard;
+
+ @ExcelProperty(value = "*手机号", index = 2)
+ private String phone;
+
+ @ExcelProperty(value = "党委标签(社区党委/区域党委委员)", index = 3)
+ private String typeName;
+
+ @ExcelProperty(value = "*入党日期(格式：年-月-日)", index = 4)
+ private String joinTime;
+
+ @ExcelProperty(value = "转正日期(格式：年-月-日)", index = 5)
+ private String employmentTime;
+
+ @ExcelProperty(value = "职位", index = 6)
+ private String position;
+
+ @ExcelProperty(value = "岗位职责", index = 7)
+ private String jobResponsibilities;
+
+ @ExcelProperty(value = "错误信息", index = 8)
+ private String error;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComPbMemberRoleExcelVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComPbMemberRoleExcelVo.java
new file mode 100644
index 0000000..f35aba6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComPbMemberRoleExcelVo.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.vos.partybuilding.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询党建数据统计返回参数
+ */
+@Data
+@ApiModel("分页查询党建数据统计返回参数")
+public class ComPbMemberRoleExcelVo {
+
+
+ @ExcelProperty(value = "党员姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "身份证号", index = 1)
+ private String idCard;
+
+ @ExcelProperty(value = "手机号", index = 2)
+ private String phone;
+
+ @ExcelProperty(value = "党委标签(社区党委/区域党委委员)", index = 3)
+ private String typeName;
+
+ @ExcelProperty(value = "入党日期", index = 4)
+ private String joinTime;
+
+ @ExcelProperty(value = "转正日期", index = 5)
+ private String employmentTime;
+
+ @ExcelProperty(value = "职位", index = 6)
+ private String position;
+
+ @ExcelProperty(value = "岗位职责", index = 7)
+ private String jobResponsibilities;
+
+ @ExcelProperty(value = "负责党组织", index = 8)
+ private String org;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ActivityManagerVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ActivityManagerVO.java
new file mode 100644
index 0000000..b1e574f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ActivityManagerVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.partybuilding.west;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 负责人
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-07 14:45
+ **/
+@Data
+@ApiModel("负责人")
+public class ActivityManagerVO {
+
+ @ApiModelProperty("负责人id")
+ private Long managerId;
+
+ @ApiModelProperty("负责人名字")
+ private String name;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComDataStatisticsHeaderOrgVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComDataStatisticsHeaderOrgVo.java
new file mode 100644
index 0000000..8cb05a0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComDataStatisticsHeaderOrgVo.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.vos.partybuilding.west;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author lyq
+ * 查询党建数据统计党组织返回参数
+ */
+@Data
+@ApiModel("查询党建数据统计党组织返回参数")
+public class ComDataStatisticsHeaderOrgVo {
+
+ @ApiModelProperty(value = "党组织数量")
+ private Integer orgNum = 0;
+
+ @ApiModelProperty(value = "党组织绑定小区数量")
+ private Integer areaNum = 0;
+
+ @ApiModelProperty(value = "社区下小区数量")
+ private Integer villageNum = 0;
+
+ @ApiModelProperty(value = "小区覆盖率")
+ private BigDecimal villageRate = BigDecimal.ZERO;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComDataStatisticsMemberVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComDataStatisticsMemberVo.java
new file mode 100644
index 0000000..176514e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComDataStatisticsMemberVo.java
@@ -0,0 +1,108 @@
+package com.panzhihua.common.model.vos.partybuilding.west;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * 分页查询党建数据统计返回参数
+ */
+@Data
+@ApiModel("分页查询党建数据统计返回参数")
+public class ComDataStatisticsMemberVo {
+
+ @ApiModelProperty(value = "党员id")
+ private Long id;
+
+ @ApiModelProperty(value = "党员姓名")
+ private String name;
+
+ @ApiModelProperty(value = "党员头像url")
+ private String photoPath;
+
+ @ApiModelProperty(value = "是否是党委（1.是 2.否）")
+ private Integer isRole;
+
+ @ApiModelProperty(value = "党员类型（1.预备党员 2.正式党员）")
+ private Integer type;
+
+ @ApiModelProperty(value = "性别（1.是 2.否）")
+ private Integer sex;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "党龄")
+ private Integer partyAge;
+
+ @ApiModelProperty(value = "职能")
+ private String function;
+
+ @ApiModelProperty(value = "特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）")
+ private Integer specialtyCategory;
+
+ @ApiModelProperty(value = "特长描述")
+ private String specialtyName;
+
+ @ApiModelProperty(value = "职位")
+ private String position;
+
+ @ApiModelProperty(value = "职位2")
+ private String positionTwo;
+
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ @ApiModelProperty(value = "报道单位id")
+ private Long checkUnitId;
+
+ @ApiModelProperty(value = "报道单位名称")
+ private String checkUnitName;
+
+ @ApiModelProperty(value = "所属党组织id")
+ private Long orgId;
+
+ @ApiModelProperty(value = "所属党组织名称")
+ private String orgName;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "总活动次数")
+ private Integer activityCount;
+
+ @ApiModelProperty(value = "总活动时长（小时）")
+ private Integer activityDuration;
+
+ @ApiModelProperty(value = "党员活动次数")
+ private Integer partyActivityCount;
+
+ @ApiModelProperty(value = "党员活动时长（小时）")
+ private Integer partyActivityDuration = 0;
+
+ @ApiModelProperty(value = "党员活动积分数量")
+ private Integer partyActivityIntegral;
+
+ @ApiModelProperty(value = "志愿者活动次数")
+ private Integer volunteerActivityCount;
+
+ @ApiModelProperty(value = "志愿者活动时长（小时）")
+ private Integer volunteerActivityDuration;
+
+ @ApiModelProperty(value = "志愿者活动积分数量")
+ private Integer volunteerActivityIntegral;
+
+ @ApiModelProperty(value = "完成微心愿数量")
+ private Integer wishCount;
+
+ @ApiModelProperty(value = "完成随手拍数量")
+ private Integer easyCount;
+
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComDataStatisticsOrgVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComDataStatisticsOrgVo.java
new file mode 100644
index 0000000..dafe506
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComDataStatisticsOrgVo.java
@@ -0,0 +1,122 @@
+package com.panzhihua.common.model.vos.partybuilding.west;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author lyq
+ * 查询党建数据统计党组织返回参数
+ */
+@Data
+@ApiModel("查询党建数据统计党组织返回参数")
+public class ComDataStatisticsOrgVo {
+
+ @ApiModelProperty(value = "党员人数")
+ private Integer partyMemberNum;
+
+ @ApiModelProperty(value = "正式党员人数")
+ private Integer formalPartyMemberNum;
+
+ @ApiModelProperty(value = "正式党员人数百分比")
+ private BigDecimal formalPartyMemberNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "预备党员人数")
+ private Integer preparePartyMemberNum;
+
+ @ApiModelProperty(value = "预备党员人数百分比")
+ private BigDecimal preparePartyMemberNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "体育类党员人数")
+ private Integer tyNum;
+
+ @ApiModelProperty(value = "体育类党员人数百分比")
+ private BigDecimal tyNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "美术类党员人数")
+ private Integer msNum;
+
+ @ApiModelProperty(value = "美术类党员人数百分比")
+ private BigDecimal msNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "音乐类党员人数")
+ private Integer yyNum;
+
+ @ApiModelProperty(value = "音乐类党员人数百分比")
+ private BigDecimal yyNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "舞蹈类党员人数")
+ private Integer wdNum;
+
+ @ApiModelProperty(value = "舞蹈类党员人数百分比")
+ private BigDecimal wdNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "其他类党员人数")
+ private Integer qtNum;
+
+ @ApiModelProperty(value = "其他类党员人数百分比")
+ private BigDecimal qtNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "无类型党员人数")
+ private Integer wuNum;
+
+ @ApiModelProperty(value = "无类型党员人数百分比")
+ private BigDecimal wuNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "党员列表")
+ private List<PartyBuildingMemberVO> partyMemberList;
+
+ @ApiModelProperty(value = "参与活动次数")
+ private Integer participateActivityNum;
+
+ @ApiModelProperty(value = "参与活动时长")
+ private Integer participateActivityDuration;
+
+ @ApiModelProperty(value = "参与志愿者活动次数")
+ private Integer participateVolunteerActivityNum;
+
+ @ApiModelProperty(value = "参与志愿者活动次数百分比")
+ private BigDecimal participateVolunteerActivityNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "参与志愿者活动时长")
+ private Integer participateVolunteerActivityDuration;
+
+ @ApiModelProperty(value = "参与志愿者活动时长百分比")
+ private BigDecimal participateVolunteerActivityDurationPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "参与党员活动次数")
+ private Integer participatePartyActivityNum;
+
+ @ApiModelProperty(value = "参与党员活动次数百分比")
+ private BigDecimal participatePartyActivityNumPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "参与党员活动时长")
+ private Integer participatePartyActivityDuration;
+
+ @ApiModelProperty(value = "参与党员活动时长百分比")
+ private BigDecimal participatePartyActivityDurationPercent = new BigDecimal(0);
+
+ @ApiModelProperty(value = "月份统计list")
+ private List<String> monthList;
+
+ @ApiModelProperty(value = "完成微心愿折线统计数据")
+ private List<String> completeWishList;
+
+ @ApiModelProperty(value = "累计微心愿折线统计数据")
+ private List<String> cumulativeWishList;
+
+ @ApiModelProperty(value = "完成随手拍折线统计数据")
+ private List<String> completeEasyList;
+
+ @ApiModelProperty(value = "累计随手拍折线统计数据")
+ private List<String> cumulativeEasyList;
+
+ @ApiModelProperty(value = "完成微心愿数量")
+ private String wishNum = "0";
+
+ @ApiModelProperty(value = "完成随手拍数量")
+ private String easyNum = "0";
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComEldersAuthHistoryExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComEldersAuthHistoryExcelVO.java
new file mode 100644
index 0000000..39722f5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComEldersAuthHistoryExcelVO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.vos.partybuilding.west;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @description: 党员信息导出
+ * @author: lyq
+ * @date: 2021/5/6 17:48
+ */
+@Data
+public class ComEldersAuthHistoryExcelVO {
+
+ @ExcelProperty(value = "姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "身份证号", index = 1)
+ private String idCard;
+
+ @ExcelProperty(value = "出生年月", index = 2)
+ private String brithday;
+
+ @ExcelProperty(value = "年龄", index = 3)
+ private Date age;
+
+ @ExcelProperty(value = "户籍地", index = 4)
+ private Date domicile;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbDynUserVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbDynUserVO.java
new file mode 100644
index 0000000..1fea7fc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbDynUserVO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.vos.partybuilding.west;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 动态、政策文件、阅读记录
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-02 17:17
+ **/
+@Data
+@ApiModel("党员动态阅读记录表")
+public class ComPbDynUserVO {
+
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("党员动态、政策文件id")
+ private Long dynId;
+
+ @ApiModelProperty("小程序用户id")
+ private Long userId;
+
+ @ApiModelProperty("阅读时间")
+ private Date createAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbMemberExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbMemberExcelVO.java
new file mode 100644
index 0000000..a100202
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbMemberExcelVO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.vos.partybuilding.west;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @description: 党员信息导出
+ * @author: lyq
+ * @date: 2021/5/6 17:48
+ */
+@Data
+public class ComPbMemberExcelVO {
+
+ @ExcelProperty(value = "账号", index = 0)
+ private String phone;
+
+ @ExcelProperty(value = "党员姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "所属党组织", index = 2)
+ private String orgName;
+
+ @ExcelProperty(value = "入党日期", index = 3)
+ private Date joinTime;
+
+ @ExcelProperty(value = "转正日期", index = 4)
+ private Date employmentTime;
+
+ @ExcelProperty(value = "报道单位", index = 5)
+ private String checkUnitName;
+
+ @ExcelProperty(value = "党龄", index = 6)
+ private Integer partyAge;
+
+ @ExcelProperty(value = "状态",index = 7)
+ private String status;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbMemberVO.java
new file mode 100644
index 0000000..5bfb2a1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbMemberVO.java
@@ -0,0 +1,97 @@
+package com.panzhihua.common.model.vos.partybuilding.west;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class ComPbMemberVO {
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 所属党组织id
+ */
+ @ApiModelProperty("所属党组织id")
+ private Long orgId;
+
+ /**
+ * 身份证号
+ */
+ @ApiModelProperty("身份证号")
+ private String idCard;
+
+ /**
+ * 姓名
+ */
+ @ApiModelProperty("姓名")
+ private String name;
+
+ /**
+ * 头像图片路径
+ */
+ @ApiModelProperty("头像图片路径")
+ private String photoPath;
+
+ /**
+ * 入党时间
+ */
+ @ApiModelProperty("入党时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date joinTime;
+
+ /**
+ * 转正时间
+ */
+ @ApiModelProperty("转正时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date employmentTime;
+
+ /**
+ * 党员审查结果
+ */
+ private Integer auditResult;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date createAt;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date updateAt;
+ /**
+ * 社区id
+ */
+ private Long communityId;
+
+ /**
+ * 用户id
+ */
+ private Long userId;
+
+ /**
+ * 驳回原因
+ */
+ private String refuseReason;
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("党组织")
+ private String orgName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbServiceTeamVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbServiceTeamVO.java
new file mode 100644
index 0000000..7d3e0fa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbServiceTeamVO.java
@@ -0,0 +1,54 @@
+package com.panzhihua.common.model.vos.partybuilding.west;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 服务团队人员
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-21 18:11
+ **/
+@Data
+@ApiModel("服务团队人员")
+public class ComPbServiceTeamVO {
+
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("职位")
+ private String job;
+
+ @ApiModelProperty("职位2")
+ private String jobTwo;
+
+ @ApiModelProperty("岗位职责")
+ private String jobResponsibilities;
+
+ @ApiModelProperty("照片")
+ private String url;
+
+ @ApiModelProperty("create_at")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+ @ApiModelProperty("电话")
+ private String phone;
+ @ApiModelProperty("是否注册")
+ private Integer isReg;
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbServiceTeamWishVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbServiceTeamWishVO.java
new file mode 100644
index 0000000..2187f86
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/ComPbServiceTeamWishVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.partybuilding.west;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 微心愿服务团队人员
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-21 18:11
+ **/
+@Data
+@ApiModel("微心愿服务团队人员")
+public class ComPbServiceTeamWishVO {
+
+ @ApiModelProperty("managerId")
+ private Long managerId;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PageActivityMembersVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PageActivityMembersVO.java
new file mode 100644
index 0000000..b97a89b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PageActivityMembersVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.partybuilding.west;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 分页活动人员
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-01 09:50
+ **/
+@Data
+@ApiModel(value = "分页活动人员")
+public class PageActivityMembersVO {
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+ @ApiModelProperty(value = "姓名")
+ private String name;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "报名时间")
+ private String registrationTime;
+ @ApiModelProperty(value = "人员主键")
+ private Long id;
+ @ApiModelProperty(value = "当前页数")
+ private Long pageNum;
+ @ApiModelProperty(value = "每页记录数")
+ private Long pageSize;
+ @ApiModelProperty(value = "活动id", required = true)
+ private Long activityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PagePartyBuildingMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PagePartyBuildingMemberVO.java
new file mode 100644
index 0000000..e6054ce
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PagePartyBuildingMemberVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.partybuilding.west;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 分页党员认证
+ * @author: cedoo
+ * @create: 2021-4-7
+ **/
+@Data
+@ApiModel(value = "分页党员认证")
+public class PagePartyBuildingMemberVO {
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+ @ApiModelProperty(value = "姓名")
+ private String name;
+ @ApiModelProperty(value = "状态")
+ private Integer auditStatus;
+
+ @ApiModelProperty(value = "当前页数")
+ private Long pageNum;
+ @ApiModelProperty(value = "每页记录数")
+ private Long pageSize;
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "区域编码", hidden = true)
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PagePartyOrganizationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PagePartyOrganizationVO.java
new file mode 100644
index 0000000..4e0a360
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PagePartyOrganizationVO.java
@@ -0,0 +1,69 @@
+package com.panzhihua.common.model.vos.partybuilding.west;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 分页党员
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-30 16:10
+ **/
+@Data
+@ApiModel(value = "分页查询党员")
+public class PagePartyOrganizationVO {
+
+ @ApiModelProperty(value = "组织名字")
+ private String orgName;
+
+ @ApiModelProperty(value = "组织ID")
+ private Long orgId;
+
+ @ApiModelProperty(value = "账户")
+ private String account;
+
+ @ApiModelProperty(value = "党员姓名")
+ private String name;
+
+ @ApiModelProperty(value = "当前页数")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "每页记录数")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "社区id集合", hidden = true)
+ private List<Long> communityIds;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "党员类型（1.预备党员 2.正式党员）")
+ private Integer type;
+
+ @ApiModelProperty(value = "报道单位id")
+ private Long checkUnitId;
+
+ @ApiModelProperty(value = "特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）")
+ private Long specialtyCategory;
+
+ @ApiModelProperty("开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ @ApiModelProperty("结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+
+ @ApiModelProperty(value = "区域编码", hidden = true)
+ private String areaCode;
+
+ private String specialtyName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingActivityVO.java
new file mode 100644
index 0000000..068ff47
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingActivityVO.java
@@ -0,0 +1,109 @@
+package com.panzhihua.common.model.vos.partybuilding.west;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 活动
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-01 09:08
+ **/
+@Data
+@ApiModel("党员活动")
+public class PartyBuildingActivityVO {
+ @ApiModelProperty("党员活动id")
+ private Long id;
+
+ @ApiModelProperty("活动名称")
+ private String name;
+
+ @ApiModelProperty("活动地点")
+ private String address;
+
+ @ApiModelProperty("1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
+ private Integer status;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("发布时间")
+ private Date releaseTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("发布开始时间")
+ private Date releaseTimeBegin;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("发布结束时间")
+ private Date releaseTimeEnd;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("活动开始时间")
+ private Date activityTimeBegin;
+ @ApiModelProperty("活动开始时间-格式化后的")
+ private String activityTimeBeginFormat;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("活动结束时间")
+ private Date activityTimeEnd;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("报名开始时间")
+ private Date enrollTimeBegin;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("报名结束时间")
+ private Date enrollTimeEnd;
+
+ @ApiModelProperty("当前页数")
+ private Long pageNum;
+
+ @ApiModelProperty("每页记录数")
+ private Long pageSize;
+
+ @ApiModelProperty("活动最多参入人数")
+ private Integer participationNum;
+
+ @ApiModelProperty("活动最低参入人数-未达到到时间自动取消")
+ private Integer participationLowestNum;
+
+ @ApiModelProperty("活动已经参与人数")
+ private Integer participationActualNum;
+
+ @ApiModelProperty("活动封面")
+ private String cover;
+
+ @ApiModelProperty("活动内容-富文本")
+ private String richText;
+
+ @ApiModelProperty("取消原因")
+ private String cancelReason;
+
+ @ApiModelProperty("发布人id")
+ private Long createBy;
+
+ @ApiModelProperty("发布人名字")
+ private String createByName;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
+
+ @ApiModelProperty("活动党员列表")
+ private List<PartyBuildingMemberVO> partyBuildingMemberVOS;
+
+ @ApiModelProperty("是否已经报名")
+ private Integer isSign;
+
+ @ApiModelProperty(value = "活动报名人员id集合", hidden = true)
+ private List<Long> userIds;
+
+ @ApiModelProperty("是否是小程序请求")
+ private Integer isAppliets;
+
+ @ApiModelProperty("是否是个人发起 1 是 0 否")
+ private Integer isPerson;
+
+ @ApiModelProperty("二维码类型 1居民，志愿者 2党员")
+ private Integer codeType;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingComPbDynVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingComPbDynVO.java
new file mode 100644
index 0000000..bf16d5a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingComPbDynVO.java
@@ -0,0 +1,107 @@
+package com.panzhihua.common.model.vos.partybuilding.west;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 党建动态
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-01 15:53
+ **/
+@Data
+@ApiModel("社区管理》党建》党员动态/政策文件")
+public class PartyBuildingComPbDynVO {
+
+ @ApiModelProperty("党建动态/政策文件id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("标题")
+ private String title;
+
+ @ApiModelProperty("状态 1 待发布 2 已发布")
+ private Integer status;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("发布时间")
+ private Date publishAt;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("发布开始时间")
+ private Date publishAtBegin;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("发布结束时间")
+ private Date publishAtEnd;
+
+ @ApiModelProperty("封面url")
+ private String cover;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("内容")
+ private String content;
+
+ @ApiModelProperty("发布人id")
+ private Long createBy;
+
+ @ApiModelProperty("发布人名字")
+ private String createByName;
+
+ @ApiModelProperty("阅读量")
+ private Integer readingVolume;
+
+ @ApiModelProperty("当前页数")
+ private Long pageNum;
+
+ @ApiModelProperty("每页记录数")
+ private Long pageSize;
+
+ @ApiModelProperty("1动态 2政策文件")
+ private Integer type;
+
+ @ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+
+
+ @ApiModelProperty("社区id集合")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private List<Long> communityIds;
+
+ @ApiModelProperty("动态内容富文本--纯文本")
+ private String contentText;
+
+ @ApiModelProperty(value = "是否增加 1 增加 0 不增加")
+ private Integer isAdd;
+
+ @ApiModelProperty("动态分类：1-党建动态 2-党员帮扶 3-党员示范")
+ private Integer dynType;
+
+ @ApiModelProperty("封面模式：1-小图展示 2-大图展示")
+ private Integer coverMode;
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
+
+ @ApiModelProperty("跳转链接")
+ private String jumpUrl;
+
+ @ApiModelProperty("跳转状态")
+ private Integer jumpType;
+
+ @ApiModelProperty("政策分类: 1-社工人才政策 2-社会组织培育政策 3-其他政策")
+ private Integer policyType;
+
+ @ApiModelProperty("排序方式 正序 ASC")
+ private String sort;
+
+ private String appId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingMemberExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingMemberExcelVO.java
new file mode 100644
index 0000000..653afea
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingMemberExcelVO.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.model.vos.partybuilding.west;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 批量党员
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-30 14:57
+ **/
+@Data
+public class PartyBuildingMemberExcelVO implements Serializable {
+ /**
+ * 党员姓名
+ */
+ @ExcelProperty(value = "党员姓名", index = 0)
+ private String name;
+ /**
+ * 身份证号
+ */
+ @ExcelProperty(value = "身份证号", index = 1)
+ private String idCard;
+ /**
+ * 所属党组织
+ */
+ @ExcelProperty(value = "所属党组织", index = 2)
+ private String orgName;
+ /**
+ * 入党日期
+ */
+ @ExcelProperty(value = "入党日期", index = 3)
+ private String joinTime;
+ /**
+ * 转正日期
+ */
+ @ExcelProperty(value = "转正日期", index = 4)
+ private String employmentTime;
+ /**
+ * 所属社区
+ */
+ @ExcelProperty(value = "所属社区", index = 5)
+ private String communityName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingMemberVO.java
new file mode 100644
index 0000000..722e70c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingMemberVO.java
@@ -0,0 +1,94 @@
+package com.panzhihua.common.model.vos.partybuilding.west;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 党建
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-30 10:03
+ **/
+@Data
+@ApiModel("社区管理》党建》党员信息")
+public class PartyBuildingMemberVO {
+ @ApiModelProperty(value = "姓名")
+ private String name;
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty(value = "入党时间")
+ private Date joinTime;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty(value = "转正时间")
+ private Date employmentTime;
+ @ApiModelProperty(value = "所属党组织id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long orgId;
+ @ApiModelProperty(value = "头像图片路径")
+ private String photoPath;
+ @ApiModelProperty(value = "社区ID", hidden = true)
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long communityId;
+ @ApiModelProperty(value = "社区名字")
+ private String communityName;
+ @ApiModelProperty(value = "党组织名字")
+ private String orgName;
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+ @ApiModelProperty(value = "党龄")
+ private Integer partyAge;
+ @ApiModelProperty(value = "状态")
+ private String status;
+ @ApiModelProperty(value = "党员唯一标识id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ @ApiModelProperty(value = "报名时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+ @ApiModelProperty(value = "用户ID", hidden = true)
+ private Long userId;
+ @ApiModelProperty(value = "党员审查结果: 0 待审核 1 已审核 2 自动认证 3 已驳回")
+ private Integer auditResult;
+ @ApiModelProperty(value = "驳回原因")
+ private String refuseReason;
+ @ApiModelProperty(value = "是否党员 1是 2否")
+ private Integer isPb;
+
+ @ApiModelProperty(value = "党员类型（1.预备党员 2.正式党员）")
+ private Integer type;
+
+ @ApiModelProperty(value = "职位")
+ private String position;
+
+ @ApiModelProperty(value = "报道单位id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long checkUnitId;
+
+ @ApiModelProperty(value = "报道单位名称")
+ private String checkUnitName;
+
+ @ApiModelProperty(value = "职能")
+ private String function;
+
+ @ApiModelProperty(value = "特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）")
+ private Integer specialtyCategory;
+
+ @ApiModelProperty(value = "特长描述")
+ private String specialtyName;
+
+ @ApiModelProperty(value = "职位2")
+ private String positionTwo;
+
+ @ApiModelProperty(value = "活动时长")
+ private Integer partyTime;
+
+ @ApiModelProperty(value = "活动积分")
+ private Integer partyInterval;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyCommitteeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyCommitteeVO.java
new file mode 100644
index 0000000..e842685
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyCommitteeVO.java
@@ -0,0 +1,112 @@
+package com.panzhihua.common.model.vos.partybuilding.west;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.validated.AddGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 党委
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-01 14:15
+ **/
+@Data
+@ApiModel("党委")
+public class PartyCommitteeVO {
+
+ @ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("电话")
+ @NotBlank(groups = {AddGroup.class}, message = "电话不能为空")
+ private String phone;
+
+ @ApiModelProperty("是否注册")
+ private Integer isReg;
+
+ @ApiModelProperty("姓名")
+ @NotBlank(groups = {AddGroup.class}, message = "姓名不能为空")
+ private String name;
+
+ @ApiModelProperty("性别")
+ private Integer sex;
+
+ @ApiModelProperty("出生日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date birthTime;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty("职位")
+ @NotBlank(groups = {AddGroup.class}, message = "职位不能为空")
+ private String position;
+
+ @ApiModelProperty("职位2")
+ private String positionTwo;
+
+ @ApiModelProperty("岗位职责")
+ @NotBlank(groups = {AddGroup.class}, message = "岗位职责不能为空")
+ private String jobResponsibilities;
+
+ @ApiModelProperty("头像图片路径")
+ @NotBlank(groups = {AddGroup.class}, message = "头像不能为空")
+ private String photoPath;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "当前页数")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "每页记录数")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "党委标签（1.社区党委 2.区域党委委员）")
+ private Integer type;
+
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty(value = "入党时间")
+ private Date joinTime;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty(value = "转正时间")
+ private Date employmentTime;
+
+ @ApiModelProperty(value = "职能")
+ private String function;
+
+ @ApiModelProperty(value = "特长类别（1.体育类 2.舞蹈类 3.音乐类 4.美术类 5.其他）")
+ private Integer specialtyCategory;
+
+ @ApiModelProperty(value = "特长描述")
+ private String specialtyName;
+
+ @ApiModelProperty(value = "报道单位id")
+ private Long checkUnitId;
+
+ @ApiModelProperty(value = "报道单位名称")
+ private String checkUnitName;
+
+ @ApiModelProperty(value = "负责党组织id")
+ private Long orgId;
+
+ @ApiModelProperty(value = "负责党组织名字")
+ private String orgName;
+
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ @ApiModelProperty(value = "区域编码", hidden = true)
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyOrganizationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyOrganizationVO.java
new file mode 100644
index 0000000..3f45390
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyOrganizationVO.java
@@ -0,0 +1,78 @@
+package com.panzhihua.common.model.vos.partybuilding.west;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 党组织
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-30 11:15
+ **/
+@Data
+@ApiModel("党组织")
+public class PartyOrganizationVO {
+ @ApiModelProperty(value = "党组织id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ @ApiModelProperty(value = "党组织名字")
+ private String name;
+ @ApiModelProperty(value = "状态")
+ private Integer status;
+ @ApiModelProperty(value = "党员人数")
+ private Integer countPerson;
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "上级id")
+ private Long parentId;
+ @ApiModelProperty(value = "组织类别（1.基层党委 2.二级基层党委 3.党总支 4.党支部 5.党小组）")
+ private Integer type;
+ @ApiModelProperty(value = "组织隶属（1.乡镇 2.机关 3.域市街道 3.域市社区（居委会） 4.农村社区居委会 5.建制村 6.国有经济控制 7.集体经济控制 8.非公有经济控制 9.事业单位 10.社会组织 11.其他）")
+ private Integer subjection;
+ @ApiModelProperty(value = "小区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long areaId;
+ @ApiModelProperty(value = "楼栋id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long buildId;
+ @ApiModelProperty(value = "楼栋名称")
+ private String buildName;
+ @ApiModelProperty(value = "所属小区名字")
+ private String areaName;
+ @ApiModelProperty(value = "组织地址")
+ private String address;
+ @ApiModelProperty(value = "经度")
+ private String longitude;
+ @ApiModelProperty(value = "纬度")
+ private String latitude;
+ @ApiModelProperty(value = "一级id")
+ private Long oneId;
+ @ApiModelProperty(value = "二级id")
+ private Long twoId;
+ @ApiModelProperty(value = "三级id")
+ private Long thirdId;
+ @ApiModelProperty(value = "四级id")
+ private Long fourId;
+ @ApiModelProperty(value = "五级id")
+ private Long fiveId;
+
+ @ApiModelProperty(value = "党组织负责人名称")
+ private String userName;
+ @ApiModelProperty(value = "党组织负责人联系电话")
+ private String phone;
+
+ @ApiModelProperty(value = "党组织下子组织")
+ private List<PartyOrganizationVO> childList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmDetailVO.java
new file mode 100644
index 0000000..21c5c47
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmDetailVO.java
@@ -0,0 +1,10 @@
+package com.panzhihua.common.model.vos.property;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel("详情")
+public class ComPropertyAlarmDetailVO {
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmSettingVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmSettingVO.java
new file mode 100644
index 0000000..78f58cb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmSettingVO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.vos.property;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel
+public class ComPropertyAlarmSettingVO {
+ private Integer id;
+
+ /**
+ * 触发间隔
+ */
+ @ApiModelProperty(value = "触发间隔")
+ private Integer triggerTime;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java
new file mode 100644
index 0000000..c297102
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java
@@ -0,0 +1,111 @@
+package com.panzhihua.common.model.vos.property;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("")
+public class ComPropertyAlarmVO {
+ private String id;
+
+ /**
+ * 设备号
+ */
+ @ApiModelProperty(value = "设备号")
+ private String serialNo;
+
+ /**
+ * 报警类型 1一键报警 2长时间无应答报警
+ */
+ @ApiModelProperty(value = "报警类型 1一键报警 2长时间无应答报警")
+ private Integer type;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+ /**
+ * 位置信息
+ */
+ @ApiModelProperty(value = "位置信息")
+ private String position;
+
+ /**
+ * 手机号
+ */
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ /**
+ *居民姓名
+ */
+ @ApiModelProperty("居民姓名")
+ private String name;
+
+ /**
+ * 报警处理状态 0待处理 1已办结
+ */
+ @ApiModelProperty("处理状态")
+ private Integer status;
+
+ /**
+ * 处理人
+ */
+ @ApiModelProperty("处理人")
+ private String solveName;
+
+ /**
+ * 处理时间
+ */
+ @ApiModelProperty(value = "处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date solveTime;
+
+ /**
+ * 处理内容
+ */
+ @ApiModelProperty(value = "处理内容")
+ private String solveContent;
+
+ /**
+ * 处理人id
+ */
+ @ApiModelProperty("处理人id")
+ private Long solveId;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ /**
+ * 处理图片
+ */
+ @ApiModelProperty("处理图片")
+ private String solveUrl;
+
+ /**
+ * 经度
+ */
+ @ApiModelProperty("经度")
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ @ApiModelProperty("纬度")
+ private String latitude;
+
+ /**
+ * 接收人
+ */
+ @ApiModelProperty("接收人")
+ private String receiveName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyEquipmentVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyEquipmentVO.java
new file mode 100644
index 0000000..17c76c6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyEquipmentVO.java
@@ -0,0 +1,79 @@
+package com.panzhihua.common.model.vos.property;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("设备实体")
+public class ComPropertyEquipmentVO {
+ private String id;
+
+ /**
+ * 设备编号
+ */
+ @ApiModelProperty(value = "设备编号")
+ private String serialNo;
+
+ /**
+ * 报警位置
+ */
+ @ApiModelProperty(value = "报警位置")
+ private String position;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ /**
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ @ApiModelProperty(value = "纬度")
+ private String latitude;
+
+ /**
+ * 设备名称
+ */
+ @ApiModelProperty(value = "设备名称")
+ private String name;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 居民名称
+ */
+ @ApiModelProperty(value = "居民名称")
+ private String username;
+
+ /**
+ * 设备类型
+ */
+ @ApiModelProperty(value = "设备类型 1一键报警 2异常报警 ")
+ private Integer type;
+
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ @ApiModelProperty(value = "街路巷id")
+ private Long villageId;
+
+ @ApiModelProperty(value = "回显路径")
+ private String path;
+
+ @ApiModelProperty(value = "设备状态（1.待服务 2.有异常报警 3.正常）")
+ private Integer equipmentStatus;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyHelpVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyHelpVO.java
new file mode 100644
index 0000000..f2c9046
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyHelpVO.java
@@ -0,0 +1,53 @@
+package com.panzhihua.common.model.vos.property;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("一件求助人员实体")
+public class ComPropertyHelpVO {
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private Integer id;
+
+ /**
+ * 姓名
+ */
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ /**
+ * 照片
+ */
+ @ApiModelProperty(value = "照片")
+ private String imgUrl;
+
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ /**
+ * 状态 0 禁用 1启用
+ */
+ @ApiModelProperty(value = "状态 0 禁用 1启用")
+ private Integer status;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyRepairVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyRepairVO.java
new file mode 100644
index 0000000..9759400
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyRepairVO.java
@@ -0,0 +1,134 @@
+package com.panzhihua.common.model.vos.property;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel
+public class ComPropertyRepairVO {
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 报修内容
+ */
+ @ApiModelProperty(value = "报修内容")
+ private String repairContent;
+
+ /**
+ * 报修人
+ */
+ @ApiModelProperty(value = "报修人")
+ private String repairName;
+
+ /**
+ * 报修手机
+ */
+ @ApiModelProperty(value = "报修手机")
+ private String repairPhone;
+
+ /**
+ * 报修位置
+ */
+ @ApiModelProperty(value = "报修位置")
+ private String repairPosition;
+
+ /**
+ * 状态 0 待处理 1待评价 2已结束
+ */
+ @ApiModelProperty(value = "状态 0 待处理 1待评价 2已结束")
+ private Integer repairStatus;
+
+ /**
+ * 报修时间
+ */
+ @ApiModelProperty(value = "报修时间")
+ private Date createTime;
+
+ /**
+ * 报修图片url
+ */
+ @ApiModelProperty(value = "报修图片url")
+ private String repairUrl;
+
+ /**
+ * 评价内容
+ */
+ @ApiModelProperty(value = "评价内容")
+ private String replyContent;
+
+ /**
+ * 评价图片url
+ */
+ @ApiModelProperty(value = "评价图片url")
+ private String replyUrl;
+
+ /**
+ * 评价时间
+ */
+ @ApiModelProperty(value = "评价时间")
+ private Date replyTime;
+
+ /**
+ * 报修人id
+ */
+ @ApiModelProperty(value = "报修人id")
+ private Long createBy;
+
+ /**
+ * 反馈人id
+ */
+ @ApiModelProperty(value = "反馈人id")
+ private Long feedbackBy;
+
+ /**
+ * 反馈内容
+ */
+ @ApiModelProperty(value = "反馈内容")
+ private String feedbackContent;
+
+ /**
+ * 反馈图片
+ */
+ @ApiModelProperty(value = "反馈图片")
+ private String feedbackUrl;
+
+ /**
+ * 反馈时间
+ */
+ @ApiModelProperty(value = "反馈时间")
+ private Date feedbackTime;
+
+ /**
+ * 评价星级
+ */
+ @ApiModelProperty(value = "评价星级")
+ private Integer replyScore;
+
+ /**
+ * 物业id
+ */
+ @ApiModelProperty(value = "物业id")
+ private Long propertyId;
+ /**
+ * 反馈人
+ */
+ @ApiModelProperty(value = "反馈人名称")
+ private String feedback;
+ @ApiModelProperty(value = "小区名称")
+ private String areaName;
+
+ /**
+ * 状态 0 待处理 1待评价 2已结束
+ */
+ public interface status{
+ int dcl=0;
+ int dpj=1;
+ int yjs=2;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyWorkerVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyWorkerVO.java
new file mode 100644
index 0000000..92b3ee2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyWorkerVO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.vos.property;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: ComPropertyWorkerVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 物业工作人员信息
+ * @author: hans
+ * @date: 2022/04/26 10:35
+ */
+@Data
+@ApiModel("物业工作人员信息")
+public class ComPropertyWorkerVO {
+
+ @ApiModelProperty(value = "物业工作人员id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty(value = "工作人员姓名")
+ private String name;
+
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ @ApiModelProperty(value = "职务")
+ private String position;
+
+ @ApiModelProperty(value = "照片")
+ private String image;
+
+ @ApiModelProperty(value = "物业公司关联id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long refId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/BasicDataVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/BasicDataVO.java
new file mode 100644
index 0000000..39302a5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/BasicDataVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.puda;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Tuzi
+ * @date 2023年02月03日 14:11
+ */
+@Data
+@ApiModel("基础数据")
+public class BasicDataVO {
+ @ApiModelProperty("小区建筑")
+ private Integer village;
+ @ApiModelProperty("居民人数")
+ private Integer people;
+ @ApiModelProperty("房屋总数")
+ private Integer buildings;
+ @ApiModelProperty("单位总数")
+ private Integer unit;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/CitizenInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/CitizenInfoVO.java
new file mode 100644
index 0000000..276c61b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/CitizenInfoVO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.vos.puda;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Tuzi
+ * @date 2023年02月03日 13:52
+ */
+@ApiModel("居民信息")
+@Data
+public class CitizenInfoVO {
+ @ApiModelProperty("男性数量")
+ private Integer maleNum;
+ @ApiModelProperty("女性数量")
+ private Integer femaleNum;
+ @ApiModelProperty("0-16数量")
+ private Integer count1;
+ @ApiModelProperty("16-27")
+ private Integer count2;
+ @ApiModelProperty("27-35")
+ private Integer count3;
+ @ApiModelProperty("35-45")
+ private Integer count4;
+ @ApiModelProperty("45-55")
+ private Integer count5;
+ @ApiModelProperty("55以上")
+ private Integer count6;
+ @ApiModelProperty("男性占比")
+ private BigDecimal maleRate;
+ @ApiModelProperty("女性占比")
+ private BigDecimal femaleRate;
+ @ApiModelProperty("总人口")
+ private Integer total;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/DynamicVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/DynamicVO.java
new file mode 100644
index 0000000..017e1ea
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/DynamicVO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.vos.puda;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Tuzi
+ * @date 2023年02月03日 13:44
+ */
+@ApiModel("自治动态")
+@Data
+public class DynamicVO {
+ @ApiModelProperty("微心愿")
+ private Integer microWish;
+ @ApiModelProperty("随手拍")
+ private Integer easyPhoto;
+ @ApiModelProperty("通知公告")
+ private Integer announcement;
+ @ApiModelProperty("社区咨询")
+ private Integer communityInfo;
+ @ApiModelProperty("问题清单")
+ private Integer questions;
+ @ApiModelProperty("需求清单")
+ private Integer demands;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/PartyDataVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/PartyDataVO.java
new file mode 100644
index 0000000..db07e72
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/PartyDataVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.puda;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Tuzi
+ * @date 2023年02月03日 13:48
+ */
+@ApiModel("党建数据")
+@Data
+public class PartyDataVO {
+ @ApiModelProperty("社区两委")
+ private Integer committee;
+ @ApiModelProperty("报到单位")
+ private Integer unit;
+ @ApiModelProperty("报到党员")
+ private Integer partyMembers;
+ @ApiModelProperty("党建活动")
+ private Integer partyActivity;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/PropertyVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/PropertyVO.java
new file mode 100644
index 0000000..470826f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/PropertyVO.java
@@ -0,0 +1,18 @@
+package com.panzhihua.common.model.vos.puda;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Tuzi
+ * @date 2023年02月03日 13:47
+ */
+@ApiModel("红色物业")
+@Data
+public class PropertyVO {
+ @ApiModelProperty("物业公司名称")
+ private String propertyName;
+ @ApiModelProperty("党员数量")
+ private Integer partyMembers;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/SpecialPeopleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/SpecialPeopleVO.java
new file mode 100644
index 0000000..57c8ffd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/SpecialPeopleVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.puda;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author Tuzi
+ * @date 2023年02月03日 14:13
+ */
+@Data
+@ApiModel("特殊人口统计")
+public class SpecialPeopleVO {
+ @ApiModelProperty("标签")
+ private String label;
+ @ApiModelProperty("人数")
+ private Integer count;
+ @ApiModelProperty("特殊人群占比")
+ private BigDecimal rate;
+ private Integer total;
+ private List<SpecialPeopleVO> childList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/YardVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/YardVO.java
new file mode 100644
index 0000000..d7c74b4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/puda/YardVO.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.model.vos.puda;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Tuzi
+ * @date 2023年02月03日 14:03
+ */
+@Data
+@ApiModel("小区院落'")
+public class YardVO {
+ @ApiModelProperty("院落总数")
+ private Integer count;
+ @ApiModelProperty("城镇院落")
+ private Integer cityYard;
+ @ApiModelProperty("农村院落")
+ private Integer countryYard;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventArchiveVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventArchiveVO.java
new file mode 100644
index 0000000..1f8bfc8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventArchiveVO.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.vos.sanshuo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Description 三说会堂事件归档对象
+ * ClassName ComEventArchiveVO
+ *
+ * @author manailin
+ * @date 2022-09-07 11:23:52
+ */
+@Data
+@ApiModel(value = "三说会堂事件归档对象")
+public class ComEventArchiveVO {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 主键
+ */
+ @ApiModelProperty(name = "id", value = "主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ /**
+ * 归档结论
+ */
+ @ApiModelProperty(name = "result", value = "归档结论")
+ private String result;
+ /**
+ * 调解上传图片地址列表，逗号进行分割
+ */
+ @ApiModelProperty(name = "images", value = "调解上传图片地址列表，逗号进行分割")
+ private List<ComEventRequestImageVO> images;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventCalculateVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventCalculateVO.java
new file mode 100644
index 0000000..7f91c0c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventCalculateVO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.vos.sanshuo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Description 三说会堂事件表
+ * ClassName ComEventVO
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+@Data
+@ApiModel(value = "三说会堂事件表")
+public class ComEventCalculateVO {
+ private static final long serialVersionUID = 1L;
+
+ private String status;
+
+ private String sum;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventConciliationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventConciliationVO.java
new file mode 100644
index 0000000..9b4d3c2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventConciliationVO.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.vos.sanshuo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Description 三说会堂事件调解对象
+ * ClassName ComEventResourceVO
+ * @author manailin
+ * @date 2022-09-07 11:23:52
+ */
+@Data
+@ApiModel(value = "三说会堂事件调解对象")
+public class ComEventConciliationVO {
+ private static final long serialVersionUID = 1L;
+ /**主键*/
+ @ApiModelProperty(name = "id", value = "主键")
+ private Long id;
+ /**工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消*/
+ @ApiModelProperty(name = "eventProcessStatus", value = "工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案7已归档8调解取消9已删除")
+ private Integer eventProcessStatus;
+ /**事件结果（1、调解失败2、调解成功）*/
+ @ApiModelProperty(name = "eventResult", value = "事件结果（1、调解失败2、调解成功）")
+ private Integer eventResult;
+ /**当前处理人是否上报上级单位处理*/
+ @ApiModelProperty(name = "reportSuperior", value = "当前处理人是否上报上级单位处理")
+ private Boolean reportSuperior;
+ /**当前调解处理结果*/
+ @ApiModelProperty(name = "currentEventProcessResult", value = "当前调解处理结果")
+ private String currentEventProcessResult;
+ /**调解是否成果1未成功2已成功*/
+ @ApiModelProperty(name = "eventSucceed", value = "调解是否成果1未成果2已成果")
+ private Integer eventSucceed;
+ /**调解上传图片地址列表，逗号进行分割*/
+ @ApiModelProperty(name = "images", value = "调解上传图片地址列表，逗号进行分割")
+ private List<ComEventRequestImageVO> images;
+ @ApiModelProperty("处理人")
+ private String solver;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventDetailVO.java
new file mode 100644
index 0000000..5c9d8c1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventDetailVO.java
@@ -0,0 +1,140 @@
+package com.panzhihua.common.model.vos.sanshuo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Description 三说会堂事件调解对象
+ * ClassName ComEventResourceVO
+ * @author manailin
+ * @date 2022-09-07 11:23:52
+ */
+@Data
+@ApiModel(value = "三说会堂事件调解对象")
+public class ComEventDetailVO {
+ private static final long serialVersionUID = 1L;
+ /**主键*/
+ @ApiModelProperty(name = "id", value = "主键")
+ private Long id;
+ /**服务单号（流水号）按照日期时间+数字*/
+ @ApiModelProperty(name = "orderSn", value = "服务单号（流水号）按照日期时间+数字")
+ private String orderSn;
+ /**调解发起人ID*/
+ @ApiModelProperty(name = "requestUserId", value = "调解发起人ID")
+ private Long requestUserId;
+ /**调解发起人操作事件状态（1草稿箱2发布3逻辑删除4、撤销）*/
+ @ApiModelProperty(name = "userEventStatus", value = "调解发起人操作事件状态（1草稿箱2发布3逻辑删除4、撤销）")
+ private Integer userEventStatus;
+ /**调解发起人诉求事件描述*/
+ @ApiModelProperty(name = "requestUserEventDes", value = "调解发起人诉求事件描述")
+ private String requestUserEventDes;
+ /**调解发起人姓名*/
+ @ApiModelProperty(name = "requestUserName", value = "调解发起人姓名")
+ private String requestUserName;
+ /**调解发起人电话*/
+ @ApiModelProperty(name = "requestUserTel", value = "调解发起人电话")
+ private String requestUserTel;
+ /**调解事件类型*/
+ @ApiModelProperty(name = "eventCategory", value = "调解事件类型")
+ private Long eventCategory;
+ /**调解类型（1、行业分中心调解2、村社区调解3、是街道调解4、区）*/
+ @ApiModelProperty(name = "type", value = "调解类型（1、行业分中心调解2、村社区调解3、是街道调解4、区）")
+ private String type;
+ /**上报提交时间*/
+ @ApiModelProperty(name = "submitDate", value = "上报提交时间")
+ private Date submitDate;
+ /**选择预约调解时间*/
+ @ApiModelProperty(name = "appointmentTime", value = "选择预约调解时间")
+ private Date appointmentTime;
+ /**申请人选择的社区ID*/
+ @ApiModelProperty(name = "requestUserCommunity", value = "申请人选择的社区ID")
+ private Long requestUserCommunity;
+ /**行业分中心ID*/
+ @ApiModelProperty(name = "centerId", value = "行业分中心ID")
+ private String centerId;
+ /**行业分中心调解室电话*/
+ @ApiModelProperty(name = "centerTel", value = "行业分中心调解室电话")
+ private String centerTel;
+ /**调解专家所属单位*/
+ @ApiModelProperty(name = "specialistOrg", value = "调解专家所属单位")
+ private String specialistOrg;
+ /**调解专家级别*/
+ @ApiModelProperty(name = "specialistLevel", value = "调解专家级别")
+ private String specialistLevel;
+ /**选择调解专家ID*/
+ @ApiModelProperty(name = "specialistId", value = "选择调解专家ID")
+ private Long specialistId;
+ /**调解专家名字*/
+ @ApiModelProperty(name = "specialistName", value = "调解专家名字")
+ private String specialistName;
+ /**调解专家联系方式*/
+ @ApiModelProperty(name = "specialistTel", value = "调解专家联系方式")
+ private String specialistTel;
+ /**专家受理时间*/
+ @ApiModelProperty(name = "specialistAcceptTime", value = "专家受理时间")
+ @JsonFormat(pattern = "yyy-MM-dd HH:mm:ss")
+ private Date specialistAcceptTime;
+ /**撤销类型 1 用户 2 社区3、街道4、行业分中心*/
+ @ApiModelProperty(name = "revokeType", value = "撤销类型 1 用户 2 社区3、街道4、行业分中心")
+ private Integer revokeType;
+ /**工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消*/
+ @ApiModelProperty(name = "eventProcessStatus", value = "工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消")
+ private Integer eventProcessStatus;
+ /**当前处理对象类型（1、行业分中心2、社区3、是街道4、区）*/
+ @ApiModelProperty(name = "currentProcessType", value = "当前处理对象类型（1、行业分中心2、社区3、是街道4、区）")
+ private Integer currentProcessType;
+ /**当前处理机构ID*/
+ @ApiModelProperty(name = "currentOrgId", value = "当前处理机构ID")
+ private String currentOrgId;
+ /**当前机构下处理人ID*/
+ @ApiModelProperty(name = "currentProcessUserId", value = "当前机构下处理人ID")
+ private Long currentProcessUserId;
+ /**当前机构下处理人名称*/
+ @ApiModelProperty(name = "currentProcessUserName", value = "当前机构下处理人名称")
+ private String currentProcessUserName;
+ /**当前调解处理结果*/
+ @ApiModelProperty(name = "currentEventProcessResult", value = "当前调解处理结果")
+ private String currentEventProcessResult;
+ /**调解是否成果1未成果2已成果*/
+ @ApiModelProperty(name = "eventSucceed", value = "调解是否成果1未成果2已成果")
+ private Integer eventSucceed;
+ /**撤销描述*/
+ @ApiModelProperty(name = "revokeDes", value = "撤销描述")
+ private String revokeDes;
+ /**事件结果（1、调解失败2、调解成功）*/
+ @ApiModelProperty(name = "eventResult", value = "事件结果（1、调解失败2、调解成功）")
+ private Integer eventResult;
+ /**当前处理人是否上报上级单位处理*/
+ @ApiModelProperty(name = "reportSuperior", value = "当前处理人是否上报上级单位处理")
+ private Boolean reportSuperior;
+ /**归档结案报告*/
+ @ApiModelProperty(name = "result", value = "归档结案报告")
+ private String result;
+ /**已归档处理完毕时间*/
+ @JsonFormat(pattern = "yyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(name = "resultDate", value = "已归档处理完毕时间")
+ private Date resultDate;
+ /**创建时间*/
+ @JsonFormat(pattern = "yyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(name = "createAt", value = "创建时间")
+ private Date createAt;
+
+ /**调解上传图片地址列表，逗号进行分割*/
+ @ApiModelProperty(name = "images", value = "调解上传图片地址列表，逗号进行分割")
+ private List<ComEventRequestImageVO> images;
+
+ @ApiModelProperty("时间类型名称")
+ private String categoryName;
+ @ApiModelProperty("当前调解部门")
+ private String currentOrgName;
+ @ApiModelProperty("用户取消时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date revokeDate;
+ @ApiModelProperty("调解站电话")
+ private String contact;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventPageRequestVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventPageRequestVO.java
new file mode 100644
index 0000000..2c958af
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventPageRequestVO.java
@@ -0,0 +1,64 @@
+package com.panzhihua.common.model.vos.sanshuo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Description 三说会堂事件表
+ * ClassName ComEventPageRequestVO
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+@Data
+@ApiModel(value = "三说会堂事件表分页列表数据")
+public class ComEventPageRequestVO {
+
+ /**主键*/
+ @ApiModelProperty(name = "id", value = "主键")
+ private Long id;
+ /**服务单号（流水号）按照日期时间+数字*/
+ @ApiModelProperty(name = "orderSn", value = "服务单号（流水号）按照日期时间+数字")
+ private String orderSn;
+ /**调解发起人ID*/
+ @ApiModelProperty(name = "requestUserId", value = "调解发起人ID")
+ private Long requestUserId;
+ /**调解事件类型*/
+ @ApiModelProperty(name = "eventCategory", value = "调解事件类型")
+ private Long eventCategory;
+ /**调解类型（1、行业分中心调解2、村社区调解3、是街道调解4、区）*/
+ @ApiModelProperty(name = "type", value = "调解类型（1、行业分中心调解2、村社区调解3、是街道调解4、区）")
+ private String type;
+ /**选择调解专家ID*/
+ @ApiModelProperty(name = "specialistId", value = "选择调解专家ID")
+ private Long specialistId;
+ /**工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消*/
+ @ApiModelProperty(name = "eventProcessStatus", value = "工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案7已归档8调解取消9已删除")
+ private Integer eventProcessStatus;
+ /**当前处理对象类型（1、行业分中心2、社区3、是街道4、区）*/
+ @ApiModelProperty(name = "currentProcessType", value = "当前处理对象类型（1、行业分中心2、社区3、是街道4、区）")
+ private Integer currentProcessType;
+ /**当前处理机构ID*/
+ @ApiModelProperty(name = "currentOrgId", value = "当前处理机构ID")
+ private String currentOrgId;
+ /**当前机构下处理人ID*/
+ @ApiModelProperty(name = "currentProcessUserId", value = "当前机构下处理人ID")
+ private Long currentProcessUserId;
+ private Long createBy;
+ private Long pageNo;
+ private Long pageSize;
+ @ApiModelProperty("搜索关键字")
+ private String keyword;
+ @ApiModelProperty(value = "查看类型1用户查看自己的调解事件申请2专家查看自己受理的调解事件")
+ private Integer userType;
+ @ApiModelProperty("appId")
+ private String appId;
+ @ApiModelProperty("开始时间")
+ private String startTime;
+ @ApiModelProperty("结束时间")
+ private String endTime;
+ private Integer level;
+ private Long searchId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventRequestImageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventRequestImageVO.java
new file mode 100644
index 0000000..6ffacc6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventRequestImageVO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.vos.sanshuo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Description 三说会堂事件表
+ * ClassName ComEventVO
+ *
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+@Data
+@ApiModel(value = "三说会堂事件图片对象")
+public class ComEventRequestImageVO {
+ /**
+ * name
+ */
+ @ApiModelProperty(name = "name", value = "图片name")
+ private String name;
+ /**
+ * 图片大小
+ */
+ @ApiModelProperty(name = "size", value = "图片大小")
+ private String size;
+ @ApiModelProperty(name = "url", value = "图片地址")
+ private String url;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventResourceVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventResourceVO.java
new file mode 100644
index 0000000..1257f1c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventResourceVO.java
@@ -0,0 +1,55 @@
+package com.panzhihua.common.model.vos.sanshuo;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+/**
+ * Description 三说会堂事件关联图片资源表
+ * ClassName ComEventResourceVO
+ * @author manailin
+ * @date 2022-09-07 11:23:52
+ */
+@Data
+@ApiModel(value = "三说会堂事件关联图片资源表")
+public class ComEventResourceVO{
+ private static final long serialVersionUID = 1L;
+ /**主键*/
+ @ApiModelProperty(name = "id", value = "主键")
+ private Long id;
+ /**事件关联ID*/
+ @ApiModelProperty(name = "refId", value = "事件关联ID")
+ private Long refId;
+ /**事件流转ID*/
+ @ApiModelProperty(name = "transferId", value = "事件流转ID")
+ private Long transferId;
+ /**1待处理2已受理3专家未受理4调解中5已归档6调解取消*/
+ @ApiModelProperty(name = "status", value = "1待处理2已受理3专家未受理4调解中5已归档6调解取消")
+ private Integer status;
+ /**事件上传的资源类型(1是图片2是音频3是是视频)*/
+ @ApiModelProperty(name = "type", value = "事件上传的资源类型(1是图片2是音频3是是视频)")
+ private Integer type;
+ /**资源名称*/
+ @ApiModelProperty(name = "resourceName", value = "资源名称")
+ private String resourceName;
+ /**资源大小*/
+ @ApiModelProperty(name = "resourceSize", value = "资源大小")
+ private String resourceSize;
+ /**视频或音频时长*/
+ @ApiModelProperty(name = "resourceTime", value = "视频或音频时长")
+ private Integer resourceTime;
+ /**事件上传的资源URL地址*/
+ @ApiModelProperty(name = "url", value = "事件上传的资源URL地址")
+ private String url;
+ /**上传人*/
+ @ApiModelProperty(name = "createBy", value = "上传人")
+ private Long createBy;
+ /**创建时间*/
+ @ApiModelProperty(name = "createAt", value = "创建时间")
+ private Date createAt;
+ /**删除标识(0:未删除,1:已删除)*/
+ @ApiModelProperty(name = "deleteFlag", value = "删除标识(0:未删除,1:已删除)")
+ private Boolean deleteFlag;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventTransferRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventTransferRecordVO.java
new file mode 100644
index 0000000..7fac7c5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventTransferRecordVO.java
@@ -0,0 +1,94 @@
+package com.panzhihua.common.model.vos.sanshuo;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+/**
+ * Description 三说会堂事件流转表
+ * ClassName ComEventTransferRecordVO
+ * @author manailin
+ * @date 2022-09-07 11:23:52
+ */
+@Data
+@ApiModel(value = "三说会堂事件流转表")
+public class ComEventTransferRecordVO{
+ private static final long serialVersionUID = 1L;
+ /**主键*/
+ @ApiModelProperty(name = "id", value = "主键")
+ private Long id;
+ /**事件ID*/
+ @ApiModelProperty(name = "eventId", value = "事件ID")
+ private Long eventId;
+ /**父级流转事件ID*/
+ @ApiModelProperty(name = "parentsTransferEventId", value = "父级流转事件ID")
+ private Long parentsTransferEventId;
+ /**来源类型（1、行业分中心2、社区3、是街道4、区）*/
+ @ApiModelProperty(name = "fromType", value = "来源类型（1、行业分中心2、社区3、是街道4、区）")
+ private Integer fromType;
+ /**（1、行业分中心2、社区3、是街道4、区）ID*/
+ @ApiModelProperty(name = "fromId", value = "（1、行业分中心2、社区3、是街道4、区）ID")
+ private Long fromId;
+ /**（1、行业分中心2、社区3、是街道4、区）名称*/
+ @ApiModelProperty(name = "fromName", value = "（1、行业分中心2、社区3、是街道4、区）名称")
+ private String fromName;
+ /**来源类型操作人ID*/
+ @ApiModelProperty(name = "fromUserId", value = "来源类型操作人ID")
+ private Long fromUserId;
+ /**转交类型（1、行业分中心2、社区3、是街道4、区）*/
+ @ApiModelProperty(name = "toType", value = "转交类型（1、行业分中心2、社区3、是街道4、区）")
+ private Integer toType;
+ /**接收（1、行业分中心2、社区3、是街道4、区）ID*/
+ @ApiModelProperty(name = "toId", value = "接收（1、行业分中心2、社区3、是街道4、区）ID")
+ private Long toId;
+ /**接收（1、行业分中心2、社区3、是街道4、区）名称*/
+ @ApiModelProperty(name = "toName", value = "接收（1、行业分中心2、社区3、是街道4、区）名称")
+ private String toName;
+ /**接收类型操作人ID(直接指派专家)*/
+ @ApiModelProperty(name = "toUserId", value = "接收类型操作人ID(直接指派专家)")
+ private Long toUserId;
+ /**是否已归档*/
+ @ApiModelProperty(name = "save", value = "是否已归档")
+ private Boolean save;
+ /**处理结果内容*/
+ @ApiModelProperty(name = "processResult", value = "处理结果内容")
+ private String processResult;
+ /**处理结果时间*/
+ @ApiModelProperty(name = "processResultData", value = "处理结果时间")
+ private String processResultData;
+ /**处理时间*/
+ @ApiModelProperty(name = "processDate", value = "处理时间")
+ private Date processDate;
+ /**（1、行业分中心2、社区3、是街道4、区）下的处理人ID*/
+ @ApiModelProperty(name = "processBy", value = "（1、行业分中心2、社区3、是街道4、区）下的处理人ID")
+ private Long processBy;
+ /**（1、行业分中心2、社区3、是街道4、区）下的处理人名称*/
+ @ApiModelProperty(name = "processByName", value = "（1、行业分中心2、社区3、是街道4、区）下的处理人名称")
+ private String processByName;
+ /**业务处理类型 1 自处理 2 上报 3 社区标为无效4 撤销 5 重新发布已撤销事件6 重新发布已标为无效的事件*/
+ @ApiModelProperty(name = "processType", value = "业务处理类型 1 自处理 2 上报 3 社区标为无效4 撤销 5 重新发布已撤销事件6 重新发布已标为无效的事件")
+ private Integer processType;
+ /**创建时间*/
+ @ApiModelProperty(name = "createAt", value = "创建时间")
+ private Date createAt;
+ /**选择调解专家ID*/
+ @ApiModelProperty(name = "specialistId", value = "选择调解专家ID")
+ private Long specialistId;
+ /**调解专家所属单位*/
+ @ApiModelProperty(name = "specialistOrg", value = "调解专家所属单位")
+ private String specialistOrg;
+ /**调解专家级别*/
+ @ApiModelProperty(name = "specialistLevel", value = "调解专家级别")
+ private String specialistLevel;
+ /**调解专家名字*/
+ @ApiModelProperty(name = "specialistName", value = "调解专家名字")
+ private String specialistName;
+ /**调解结果（1、调解失败2、调解成功）*/
+ @ApiModelProperty(name = "eventResult", value = "调解结果（1、调解失败2、调解成功）")
+ private Integer eventResult;
+ /**调解状态（1、调解未完成2、调解完成）*/
+ @ApiModelProperty(name = "eventStatus", value = "调解状态（1、调解未完成2、调解完成）")
+ private Integer eventStatus;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java
new file mode 100644
index 0000000..475e3ee
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java
@@ -0,0 +1,592 @@
+package com.panzhihua.common.model.vos.sanshuo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+/**
+ * Description 三说会堂事件表
+ * ClassName ComEventVO
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+@Data
+@ApiModel(value = "三说会堂事件表")
+public class ComEventVO{
+ private static final long serialVersionUID = 1L;
+ /**主键*/
+ @ApiModelProperty(name = "id", value = "主键")
+ private Long id;
+ /**服务单号（流水号）按照日期时间+数字*/
+ @ApiModelProperty(name = "orderSn", value = "服务单号（流水号）按照日期时间+数字")
+ private String orderSn;
+ /**调解发起人ID*/
+ @ApiModelProperty(name = "requestUserId", value = "调解发起人ID")
+ private Long requestUserId;
+ /**调解发起人操作事件状态（1草稿箱2发布3逻辑删除4、撤销）*/
+ @ApiModelProperty(name = "userEventStatus", value = "调解发起人操作事件状态（1草稿箱2发布3逻辑删除4、撤销）")
+ private Integer userEventStatus;
+ /**调解发起人诉求事件描述*/
+ @ApiModelProperty(name = "requestUserEventDes", value = "调解发起人诉求事件描述")
+ private String requestUserEventDes;
+ /**调解发起人姓名*/
+ @ApiModelProperty(name = "requestUserName", value = "调解发起人姓名")
+ private String requestUserName;
+ /**调解发起人电话*/
+ @ApiModelProperty(name = "requestUserTel", value = "调解发起人电话")
+ private String requestUserTel;
+ /**调解事件类型*/
+ @ApiModelProperty(name = "eventCategory", value = "调解事件类型")
+ private Long eventCategory;
+ /**调解类型（1、行业分中心调解2、村社区调解3、是街道调解4、区）*/
+ @ApiModelProperty(name = "type", value = "调解类型（1、行业分中心调解2、村社区调解3、是街道调解4、区）")
+ private String type;
+ /**上报提交时间*/
+ @ApiModelProperty(name = "submitDate", value = "上报提交时间")
+ private Date submitDate;
+ /**选择预约调解时间*/
+ @ApiModelProperty(name = "appointmentTime", value = "选择预约调解时间")
+ private Date appointmentTime;
+ /**申请人选择的社区ID*/
+ @ApiModelProperty(name = "requestUserCommunity", value = "申请人选择的社区ID")
+ private Long requestUserCommunity;
+ /**行业分中心ID*/
+ @ApiModelProperty(name = "centerId", value = "行业分中心ID")
+ private String centerId;
+ /**行业分中心调解室电话*/
+ @ApiModelProperty(name = "centerTel", value = "行业分中心调解室电话")
+ private String centerTel;
+ /**调解专家所属单位*/
+ @ApiModelProperty(name = "specialistOrg", value = "调解专家所属单位")
+ private String specialistOrg;
+ /**调解专家级别*/
+ @ApiModelProperty(name = "specialistLevel", value = "调解专家级别")
+ private String specialistLevel;
+ /**选择调解专家ID*/
+ @ApiModelProperty(name = "specialistId", value = "选择调解专家ID")
+ private Long specialistId;
+ /**调解专家名字*/
+ @ApiModelProperty(name = "specialistName", value = "调解专家名字")
+ private String specialistName;
+ /**调解专家联系方式*/
+ @ApiModelProperty(name = "specialistTel", value = "调解专家联系方式")
+ private String specialistTel;
+ /**专家受理时间*/
+ @ApiModelProperty(name = "specialistAcceptTime", value = "专家受理时间")
+ private Date specialistAcceptTime;
+ /**撤销类型 1 用户 2 社区3、街道4、行业分中心*/
+ @ApiModelProperty(name = "revokeType", value = "撤销类型 1 用户 2 社区3、街道4、行业分中心")
+ private Integer revokeType;
+ /**工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消*/
+ @ApiModelProperty(name = "eventProcessStatus", value = "工作人员的事件处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案7已归档8调解取消9已删除")
+ private Integer eventProcessStatus;
+ /**当前处理对象类型（1、行业分中心2、社区3、是街道4、区）*/
+ @ApiModelProperty(name = "currentProcessType", value = "当前处理对象类型（1、行业分中心2、社区3、是街道4、区）")
+ private Integer currentProcessType;
+ /**当前处理机构ID*/
+ @ApiModelProperty(name = "currentOrgId", value = "当前处理机构ID")
+ private String currentOrgId;
+ /**当前机构下处理人ID*/
+ @ApiModelProperty(name = "currentProcessUserId", value = "当前机构下处理人ID")
+ private Long currentProcessUserId;
+ /**当前机构下处理人名称*/
+ @ApiModelProperty(name = "currentProcessUserName", value = "当前机构下处理人名称")
+ private String currentProcessUserName;
+ /**当前调解处理结果*/
+ @ApiModelProperty(name = "currentEventProcessResult", value = "当前调解处理结果")
+ private String currentEventProcessResult;
+ /**调解是否成果1未成果2已成果*/
+ @ApiModelProperty(name = "eventSucceed", value = "调解是否成果1未成果2已成果")
+ private Integer eventSucceed;
+
+ /**撤销描述*/
+ @ApiModelProperty(name = "revokeDes", value = "撤销描述")
+ private String revokeDes;
+ /**事件结果（1、调解失败2、调解成功）*/
+ @ApiModelProperty(name = "eventResult", value = "事件结果（1、调解失败2、调解成功）")
+ private Integer eventResult;
+ /**当前处理人是否上报上级单位处理*/
+ @ApiModelProperty(name = "reportSuperior", value = "当前处理人是否上报上级单位处理")
+ private Boolean reportSuperior;
+ /**归档结案报告*/
+ @ApiModelProperty(name = "result", value = "归档结案报告")
+ private String result;
+ /**已归档处理完毕时间*/
+ @ApiModelProperty(name = "resultDate", value = "已归档处理完毕时间")
+ private Date resultDate;
+ /**是否紧急*/
+ @ApiModelProperty(name = "urgent", value = "是否紧急")
+ private Boolean urgent;
+ /**是否疑难事件*/
+ @ApiModelProperty(name = "difficult", value = "是否疑难事件")
+ private Boolean difficult;
+ /**是否催办*/
+ @ApiModelProperty(name = "urgentDell", value = "是否催办")
+ private Boolean urgentDell;
+ /**是否有效*/
+ @ApiModelProperty(name = "invalid", value = "是否有效")
+ private Boolean invalid;
+ /**是否重大*/
+ @ApiModelProperty(name = "major", value = "是否重大")
+ private Boolean major;
+ /**解决人针对解决事件的处理反馈描述*/
+ @ApiModelProperty(name = "requestUserResponse", value = "解决人针对解决事件的处理反馈描述")
+ private String requestUserResponse;
+ /**创建人*/
+ @ApiModelProperty(name = "createBy", value = "创建人")
+ private Long createBy;
+ /**创建时间*/
+ @ApiModelProperty(name = "createAt", value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createAt;
+ /**修改人*/
+ @ApiModelProperty(name = "updateBy", value = "修改人")
+ private Long updateBy;
+ /**修改时间*/
+ @ApiModelProperty(name = "updateAt", value = "修改时间")
+ private Date updateAt;
+
+ private Long pageNo;
+ private Long pageSize;
+ private String keyword;
+ @ApiModelProperty(value = "查看类型1用户查看自己的调解事件申请2专家查看自己受理的调解事件,3后台查看")
+ private Integer userType;
+ private Integer usertype;
+ private String appId;
+ @ApiModelProperty("开始时间")
+ private String startTime;
+ @ApiModelProperty("结束时间")
+ private String endTime;
+ private Integer level;
+ private Long searchId;
+
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
+ public Integer getLevel() {
+ return level;
+ }
+
+ public void setLevel(Integer level) {
+ this.level = level;
+ }
+
+ public Long getSearchId() {
+ return searchId;
+ }
+
+ public void setSearchId(Long searchId) {
+ this.searchId = searchId;
+ }
+
+ public String getAppId() {
+ return appId;
+ }
+
+ public void setAppId(String appId) {
+ this.appId = appId;
+ }
+
+ public static long getSerialVersionUID() {
+ return serialVersionUID;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getOrderSn() {
+ return orderSn;
+ }
+
+ public void setOrderSn(String orderSn) {
+ this.orderSn = orderSn;
+ }
+
+ public Long getRequestUserId() {
+ return requestUserId;
+ }
+
+ public void setRequestUserId(Long requestUserId) {
+ this.requestUserId = requestUserId;
+ }
+
+ public Integer getUserEventStatus() {
+ return userEventStatus;
+ }
+
+ public void setUserEventStatus(Integer userEventStatus) {
+ this.userEventStatus = userEventStatus;
+ }
+
+ public String getRequestUserEventDes() {
+ return requestUserEventDes;
+ }
+
+ public void setRequestUserEventDes(String requestUserEventDes) {
+ this.requestUserEventDes = requestUserEventDes;
+ }
+
+ public String getRequestUserName() {
+ return requestUserName;
+ }
+
+ public void setRequestUserName(String requestUserName) {
+ this.requestUserName = requestUserName;
+ }
+
+ public String getRequestUserTel() {
+ return requestUserTel;
+ }
+
+ public void setRequestUserTel(String requestUserTel) {
+ this.requestUserTel = requestUserTel;
+ }
+
+ public Long getEventCategory() {
+ return eventCategory;
+ }
+
+ public void setEventCategory(Long eventCategory) {
+ this.eventCategory = eventCategory;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public Date getSubmitDate() {
+ return submitDate;
+ }
+
+ public void setSubmitDate(Date submitDate) {
+ this.submitDate = submitDate;
+ }
+
+ public Date getAppointmentTime() {
+ return appointmentTime;
+ }
+
+ public void setAppointmentTime(Date appointmentTime) {
+ this.appointmentTime = appointmentTime;
+ }
+
+ public Long getRequestUserCommunity() {
+ return requestUserCommunity;
+ }
+
+ public void setRequestUserCommunity(Long requestUserCommunity) {
+ this.requestUserCommunity = requestUserCommunity;
+ }
+
+ public String getCenterId() {
+ return centerId;
+ }
+
+ public void setCenterId(String centerId) {
+ this.centerId = centerId;
+ }
+
+ public String getCenterTel() {
+ return centerTel;
+ }
+
+ public void setCenterTel(String centerTel) {
+ this.centerTel = centerTel;
+ }
+
+ public String getSpecialistOrg() {
+ return specialistOrg;
+ }
+
+ public void setSpecialistOrg(String specialistOrg) {
+ this.specialistOrg = specialistOrg;
+ }
+
+ public String getSpecialistLevel() {
+ return specialistLevel;
+ }
+
+ public void setSpecialistLevel(String specialistLevel) {
+ this.specialistLevel = specialistLevel;
+ }
+
+ public Long getSpecialistId() {
+ return specialistId;
+ }
+
+ public void setSpecialistId(Long specialistId) {
+ this.specialistId = specialistId;
+ }
+
+ public String getSpecialistName() {
+ return specialistName;
+ }
+
+ public void setSpecialistName(String specialistName) {
+ this.specialistName = specialistName;
+ }
+
+ public String getSpecialistTel() {
+ return specialistTel;
+ }
+
+ public void setSpecialistTel(String specialistTel) {
+ this.specialistTel = specialistTel;
+ }
+
+ public Date getSpecialistAcceptTime() {
+ return specialistAcceptTime;
+ }
+
+ public void setSpecialistAcceptTime(Date specialistAcceptTime) {
+ this.specialistAcceptTime = specialistAcceptTime;
+ }
+
+ public Integer getRevokeType() {
+ return revokeType;
+ }
+
+ public void setRevokeType(Integer revokeType) {
+ this.revokeType = revokeType;
+ }
+
+ public Integer getEventProcessStatus() {
+ return eventProcessStatus;
+ }
+
+ public void setEventProcessStatus(Integer eventProcessStatus) {
+ this.eventProcessStatus = eventProcessStatus;
+ }
+
+ public Integer getCurrentProcessType() {
+ return currentProcessType;
+ }
+
+ public void setCurrentProcessType(Integer currentProcessType) {
+ this.currentProcessType = currentProcessType;
+ }
+
+ public String getCurrentOrgId() {
+ return currentOrgId;
+ }
+
+ public void setCurrentOrgId(String currentOrgId) {
+ this.currentOrgId = currentOrgId;
+ }
+
+ public Long getCurrentProcessUserId() {
+ return currentProcessUserId;
+ }
+
+ public void setCurrentProcessUserId(Long currentProcessUserId) {
+ this.currentProcessUserId = currentProcessUserId;
+ }
+
+ public String getCurrentProcessUserName() {
+ return currentProcessUserName;
+ }
+
+ public void setCurrentProcessUserName(String currentProcessUserName) {
+ this.currentProcessUserName = currentProcessUserName;
+ }
+
+ public String getCurrentEventProcessResult() {
+ return currentEventProcessResult;
+ }
+
+ public void setCurrentEventProcessResult(String currentEventProcessResult) {
+ this.currentEventProcessResult = currentEventProcessResult;
+ }
+
+ public Integer getEventSucceed() {
+ return eventSucceed;
+ }
+
+ public void setEventSucceed(Integer eventSucceed) {
+ this.eventSucceed = eventSucceed;
+ }
+
+ public String getRevokeDes() {
+ return revokeDes;
+ }
+
+ public void setRevokeDes(String revokeDes) {
+ this.revokeDes = revokeDes;
+ }
+
+ public Integer getEventResult() {
+ return eventResult;
+ }
+
+ public void setEventResult(Integer eventResult) {
+ this.eventResult = eventResult;
+ }
+
+ public Boolean getReportSuperior() {
+ return reportSuperior;
+ }
+
+ public void setReportSuperior(Boolean reportSuperior) {
+ this.reportSuperior = reportSuperior;
+ }
+
+ public String getResult() {
+ return result;
+ }
+
+ public void setResult(String result) {
+ this.result = result;
+ }
+
+ public Date getResultDate() {
+ return resultDate;
+ }
+
+ public void setResultDate(Date resultDate) {
+ this.resultDate = resultDate;
+ }
+
+ public Boolean getUrgent() {
+ return urgent;
+ }
+
+ public void setUrgent(Boolean urgent) {
+ this.urgent = urgent;
+ }
+
+ public Boolean getDifficult() {
+ return difficult;
+ }
+
+ public void setDifficult(Boolean difficult) {
+ this.difficult = difficult;
+ }
+
+ public Boolean getUrgentDell() {
+ return urgentDell;
+ }
+
+ public void setUrgentDell(Boolean urgentDell) {
+ this.urgentDell = urgentDell;
+ }
+
+ public Boolean getInvalid() {
+ return invalid;
+ }
+
+ public void setInvalid(Boolean invalid) {
+ this.invalid = invalid;
+ }
+
+ public Boolean getMajor() {
+ return major;
+ }
+
+ public void setMajor(Boolean major) {
+ this.major = major;
+ }
+
+ public String getRequestUserResponse() {
+ return requestUserResponse;
+ }
+
+ public void setRequestUserResponse(String requestUserResponse) {
+ this.requestUserResponse = requestUserResponse;
+ }
+
+ public Long getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(Long createBy) {
+ this.createBy = createBy;
+ }
+
+ public Date getCreateAt() {
+ return createAt;
+ }
+
+ public void setCreateAt(Date createAt) {
+ this.createAt = createAt;
+ }
+
+ public Long getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(Long updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public Date getUpdateAt() {
+ return updateAt;
+ }
+
+ public void setUpdateAt(Date updateAt) {
+ this.updateAt = updateAt;
+ }
+
+ public Long getPageNo() {
+ return pageNo;
+ }
+
+ public void setPageNo(Long pageNo) {
+ this.pageNo = pageNo;
+ }
+
+ public Long getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(Long pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public String getKeyword() {
+ return keyword;
+ }
+
+ public void setKeyword(String keyword) {
+ this.keyword = keyword;
+ }
+
+ public Integer getUserType() {
+ return userType;
+ }
+
+ public void setUserType(Integer userType) {
+ this.userType = userType;
+ }
+
+ public Integer getUsertype() {
+ return usertype;
+ }
+
+ public void setUsertype(Integer usertype) {
+ this.usertype = usertype;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComMediaTypeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComMediaTypeVO.java
new file mode 100644
index 0000000..8d1e356
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComMediaTypeVO.java
@@ -0,0 +1,97 @@
+package com.panzhihua.common.model.vos.sanshuo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+@Data
+@ApiModel("创建事件类型")
+public class ComMediaTypeVO {
+ /**
+ * 主键
+ */
+ @ApiModelProperty("id,修改时传")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 类型名称
+ */
+ @ApiModelProperty("类型名称")
+ private String name;
+
+ /**
+ * code码
+ */
+ @ApiModelProperty("code码")
+ private String key;
+
+ /**
+ * 父id((根节点为0))
+ */
+ @ApiModelProperty("父id((根节点为0))")
+ private Long parentId;
+
+ /**
+ * 路径(格式 : `pid1`pid2`id` )
+ */
+ @ApiModelProperty("路径(格式 : `pid1`pid2`id` )")
+ private String pathId;
+
+ /**
+ * 所在层级
+ */
+ @ApiModelProperty("所在层级")
+ private Integer levelIndex;
+
+ /**
+ * 排序
+ */
+ @ApiModelProperty("排序")
+ private Integer sort;
+
+ /**
+ * 启用状态(0:停用,1:启用)
+ */
+ @ApiModelProperty("启用状态(0:停用,1:启用)")
+ private Boolean enabled;
+
+ /**
+ * 备注说明
+ */
+ @ApiModelProperty("备注说明")
+ private String remarks;
+
+ /**
+ * 创建者
+ */
+ @ApiModelProperty("创建者")
+ private Long createUser;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ private Date createDate;
+
+ /**
+ * 修改者
+ */
+ @ApiModelProperty("修改者")
+ private Long modifyUser;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ private Date modifyDate;
+
+ /**
+ * 删除标识(0:未删除,1:已删除)
+ */
+ @ApiModelProperty("0:未删除,1:已删除")
+ private Boolean deleteFlag;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanRequestVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanRequestVO.java
new file mode 100644
index 0000000..b756df6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanRequestVO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.sanshuo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Description 三说会堂事件表
+ * ClassName ComEventRequestVO
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+@Data
+@ApiModel(value = "新增三说会堂事件表")
+public class ComSanRequestVO {
+
+ /**调解发起人诉求事件描述*/
+ @ApiModelProperty(name = "requestUserEventDes", value = "调解发起人诉求事件描述")
+ @Length(max = 1000)
+ private String requestUserEventDes;
+ /**调解事件类型*/
+ @ApiModelProperty(name = "eventCategory", value = "调解事件类型")
+ private Long eventCategory;
+ /**调解类型（1、行业分中心调解2、村社区调解3、是街道调解4、区）*/
+ @ApiModelProperty(name = "type", value = "调解类型（1、行业分中心调解2、村社区调解3、是街道调解4、区）")
+ private String type;
+ /**选择预约调解时间*/
+ @ApiModelProperty(name = "appointmentTime", value = "选择预约调解时间")
+ private Date appointmentTime;
+ /**申请人选择的社区ID*/
+ @ApiModelProperty(name = "requestUserCommunity", value = "申请人选择的社区ID")
+ private Long requestUserCommunity;
+ /**行业分中心ID*/
+ @ApiModelProperty(name = "centerId", value = "行业分中心ID")
+ private String centerId;
+ /**选择调解专家ID*/
+ @ApiModelProperty(name = "specialistId", value = "选择调解专家ID")
+ private Long specialistId;
+ /**调解上传图片地址列表，逗号进行分割*/
+ @ApiModelProperty(name = "images", value = "调解上传图片地址列表，逗号进行分割")
+ private List<ComEventRequestImageVO> images;
+ private String appId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanShuoEventVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanShuoEventVO.java
new file mode 100644
index 0000000..3ac2fc4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanShuoEventVO.java
@@ -0,0 +1,56 @@
+package com.panzhihua.common.model.vos.sanshuo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+@Data
+@ApiModel("事件类型")
+public class ComSanShuoEventVO {
+ /**
+ * id
+ */
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Integer id;
+
+ /**
+ * 事件类型名称
+ */
+ @ApiModelProperty("事件类型名称")
+ private String name;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ private Date updateTime;
+
+ /**
+ * 0禁用1启用
+ */
+ @ApiModelProperty("0禁用1启用")
+ private Integer status;
+
+ /**
+ * 0删除1正常
+ */
+ @ApiModelProperty("0删除1正常")
+ private Integer delFlag;
+
+ @ApiModelProperty("调解成功次数")
+ private Integer success;
+
+ @ApiModelProperty("调解成功率")
+ private BigDecimal rate;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanShuoIndustryCenterVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanShuoIndustryCenterVO.java
new file mode 100644
index 0000000..802af79
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanShuoIndustryCenterVO.java
@@ -0,0 +1,80 @@
+package com.panzhihua.common.model.vos.sanshuo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("业务中心")
+public class ComSanShuoIndustryCenterVO {
+ /**
+ * id
+ */
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Integer id;
+
+ /**
+ * 行业分中心名称
+ */
+ @ApiModelProperty("行业分中心名称")
+ private String name;
+
+ /**
+ * 调解室电话
+ */
+ @ApiModelProperty("调解室电话")
+ private String phone;
+
+ /**
+ * 登录账号
+ */
+ @ApiModelProperty("登录账号")
+ private String account;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty("创建人")
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ private Date updateTime;
+
+ /**
+ * 状态0禁用1启用
+ */
+ @ApiModelProperty("状态0禁用1启用")
+ private Integer status;
+
+ /**
+ * 0删除1正常
+ */
+ @ApiModelProperty("0删除1正常")
+ private Integer delFlag;
+
+ /**
+ * 所属街道id
+ */
+ @ApiModelProperty("所属街道id")
+ private Long streetId;
+
+ /**
+ * 所属社区id
+ */
+ @ApiModelProperty("所属社区id")
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanshuoExpertVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanshuoExpertVO.java
new file mode 100644
index 0000000..809786a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanshuoExpertVO.java
@@ -0,0 +1,149 @@
+package com.panzhihua.common.model.vos.sanshuo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel("专家列表返回列")
+public class ComSanshuoExpertVO {
+ /**
+ * id
+ */
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 专家级别(1三说会堂2行业分中心3街道4社区)
+ */
+ @ApiModelProperty("专家级别(1三说会堂2行业分中心3街道4社区)")
+ private Integer level;
+
+ /**
+ * 所属社区id
+ */
+ @ApiModelProperty("所属社区id")
+ private Long communityId;
+
+ /**
+ * 工作时间
+ */
+ @ApiModelProperty("工作时间")
+ private String workTime;
+
+ /**
+ * 擅长解决时间类型
+ */
+ @ApiModelProperty("擅长解决时间类型,多类型已,隔开")
+ private String goodAt;
+
+ /**
+ * 姓名
+ */
+ @ApiModelProperty("姓名")
+ private String name;
+
+ /**
+ * 头像
+ */
+ @ApiModelProperty("头像")
+ private String avatar;
+
+ /**
+ * 手机号
+ */
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ /**
+ * 登陆账号
+ */
+ @ApiModelProperty("登陆账号")
+ private String account;
+
+ /**
+ * 登陆密码
+ */
+ @ApiModelProperty("登陆密码")
+ private String password;
+
+ /**
+ * 0禁用1启用
+ */
+ @ApiModelProperty("0禁用1启用默认1")
+ private Integer status;
+
+ /**
+ * 删除状态0已删除1正常
+ */
+ @ApiModelProperty("删除状态0已删除1正常默认1")
+ private Integer delFlag;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty("创建人")
+ private String createBy;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ private Date updateTime;
+
+ /**
+ * 介绍信息
+ */
+ @ApiModelProperty("介绍信息")
+ private String introduction;
+
+ /**
+ * 所属街道id
+ */
+ @ApiModelProperty("所属街道id")
+ private Long streetId;
+
+ /**
+ * 行业分中心id
+ */
+ @ApiModelProperty("行业分中心id")
+ private String industryCenterId;
+
+ /**
+ * 备用字段1
+ */
+ private String param1;
+
+ /**
+ * 所属单位
+ */
+ @ApiModelProperty("所属单位")
+ private String unit;
+
+ @ApiModelProperty("办结事项")
+ private String solveEvents;
+
+ @ApiModelProperty("调解次数")
+ private Integer count;
+
+ @ApiModelProperty("调解成功率")
+ private BigDecimal rate;
+ @ApiModelProperty("调解成功次数")
+ private Integer successCount;
+
+
+}
+
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/EventRateVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/EventRateVO.java
new file mode 100644
index 0000000..4fd2a00
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/EventRateVO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.vos.sanshuo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("事件级别占比统计")
+public class EventRateVO {
+ @ApiModelProperty("级别")
+ private String name;
+ @ApiModelProperty("占比")
+ private BigDecimal rate;
+ @ApiModelProperty("数量")
+ private Integer count;
+ private Integer currentProcessType;
+ private Integer type;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ExpertRangeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ExpertRangeVO.java
new file mode 100644
index 0000000..a5cbb5e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ExpertRangeVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.sanshuo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.poi.ss.formula.functions.T;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+@ApiModel("当前账号可选择添加专家范围")
+public class ExpertRangeVO {
+ @ApiModelProperty("级别")
+ private Integer level;
+ @ApiModelProperty("单位id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ @ApiModelProperty("单位名称")
+ private String name;
+ @ApiModelProperty("单位列表")
+ private List<ExpertRangeVO> childList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ExpertShowVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ExpertShowVO.java
new file mode 100644
index 0000000..cafdcf6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ExpertShowVO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.vos.sanshuo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@ApiModel("专家风采列表")
+public class ExpertShowVO {
+
+ @ApiModelProperty("级别1三说会堂2行业分中心3街道4社区")
+ private Integer level;
+
+ @ApiModelProperty("名称")
+ private String name;
+
+ @ApiModelProperty("专家数量")
+ private Integer count;
+
+ @ApiModelProperty("对应的行业分中心或街道/社区id")
+ private Long id;
+
+ @ApiModelProperty("子列表")
+ List<ExpertShowVO> childList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/IndexDateVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/IndexDateVO.java
new file mode 100644
index 0000000..c9ac3f5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/IndexDateVO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.vos.sanshuo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@ApiModel("大屏事件数据统计（三说会堂，行业分中心，街道，社区）")
+public class IndexDateVO {
+ @ApiModelProperty("受理案件")
+ private Integer accept;
+ @ApiModelProperty("正在调解")
+ private Integer accepting;
+ @ApiModelProperty("经验积累")
+ private Integer expirences;
+ @ApiModelProperty("已完成调解")
+ private Integer accepted;
+ @ApiModelProperty("经验累计")
+ private Integer total;
+ @ApiModelProperty("调解专家")
+ private Integer expert;
+ @ApiModelProperty("调解成功")
+ private Integer success;
+ @ApiModelProperty("调解失败")
+ private Integer fail;
+ @ApiModelProperty("成功率")
+ private BigDecimal successRate;
+ @ApiModelProperty("本月新增")
+ private Integer monthIncrease;
+ @ApiModelProperty("本月办结")
+ private Integer monthFinish;
+ @ApiModelProperty("X轴")
+ private List<String> X;
+ @ApiModelProperty("Y轴:新增案件")
+ private List<Integer> Y1;
+ @ApiModelProperty("Y轴:办结案件")
+ private List<Integer> Y2;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/MediateTypeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/MediateTypeVO.java
new file mode 100644
index 0000000..6e6887c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/MediateTypeVO.java
@@ -0,0 +1,18 @@
+package com.panzhihua.common.model.vos.sanshuo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("事件类型统计")
+public class MediateTypeVO {
+ @ApiModelProperty("事件类型")
+ private String name;
+ @ApiModelProperty("数量")
+ private Integer count;
+ @ApiModelProperty("占比")
+ private BigDecimal rate;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ActWorkCountVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ActWorkCountVO.java
new file mode 100644
index 0000000..1cd968e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ActWorkCountVO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.vos.screen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/16 18:03
+ */
+@ApiModel("工作情况汇报详细")
+@Data
+public class ActWorkCountVO {
+
+ @ApiModelProperty("名称")
+ private String name;
+
+ @ApiModelProperty("数量")
+ private Integer num;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/CarouselInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/CarouselInfoVO.java
new file mode 100644
index 0000000..1da2fa9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/CarouselInfoVO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/16 10:17
+ */
+@ApiModel("轮播信息")
+@Data
+public class CarouselInfoVO implements Serializable {
+
+ private static final long serialVersionUID = -2716493758092750696L;
+
+ @ApiModelProperty(value = "id")
+ private Long id;
+ @ApiModelProperty(value = "类型名称")
+ private String typeName;
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActActivityScreenVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActActivityScreenVO.java
new file mode 100644
index 0000000..8a527a5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActActivityScreenVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/16 11:01
+ */
+@ApiModel("大屏-人口-社区活动")
+@Data
+public class ComActActivityScreenVO implements Serializable {
+
+ private static final long serialVersionUID = 8892577774827785315L;
+
+ @ApiModelProperty("微心愿轮播图")
+ private List<String> imgs;
+
+ @ApiModelProperty("总共发起")
+ private Long totalNum;
+
+ @ApiModelProperty(value = "本月新增")
+ private Long currentNum;
+
+ @ApiModelProperty(value = "居民活动")
+ private Long commonNum;
+
+ @ApiModelProperty(value = "居民活动参与人数")
+ private Long commonPeopleNum;
+
+ @ApiModelProperty(value = "志愿者活动")
+ private Long volunteerNum;
+
+ @ApiModelProperty(value = "志愿者活动参与人数")
+ private Long volunteerPeopleNum;
+
+ @ApiModelProperty("活动轮播列表")
+ private List<CarouselInfoVO> list;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActDiscussScreenVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActDiscussScreenVO.java
new file mode 100644
index 0000000..026dd39
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActDiscussScreenVO.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/16 13:16
+ */
+@ApiModel("大屏-人口-一起议")
+@Data
+public class ComActDiscussScreenVO implements Serializable {
+
+ @ApiModelProperty("总共发起")
+ private Long totalNum;
+
+ @ApiModelProperty("本月新增")
+ private Long currentNum;
+
+ @ApiModelProperty("图文")
+ private Long imgNum;
+
+ @ApiModelProperty("图文参与人数")
+ private Long imgPeopleNum;
+
+ @ApiModelProperty("投票")
+ private Long voteNum;
+
+ @ApiModelProperty("投票参与人数")
+ private Long votePeopleNum;
+
+ @ApiModelProperty("一起议轮播列表")
+ private List<CarouselInfoVO> list;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActEasyPhotoScreenVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActEasyPhotoScreenVO.java
new file mode 100644
index 0000000..07b9397
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActEasyPhotoScreenVO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/16 16:05
+ */
+@ApiModel("大屏-人口-随手拍")
+@Data
+public class ComActEasyPhotoScreenVO implements Serializable {
+
+ @ApiModelProperty("本月新增")
+ private Long currentNum;
+
+ @ApiModelProperty("已处理随手拍")
+ private List<EastPhotoTypeVO> deal;
+
+ @ApiModelProperty("已公示随手拍")
+ private List<EastPhotoTypeVO> pub;
+
+ @ApiModelProperty("已审核随手拍")
+ private List<EastPhotoTypeVO> approved;
+
+ @ApiModelProperty("未处理")
+ private Long noneDeal;
+
+ @ApiModelProperty("公示比例")
+ private Integer pubPoint;
+
+ @ApiModelProperty("平均耗时")
+ private Integer dealTime;
+
+ @ApiModelProperty("随手拍线形列表")
+ private List<EastPhotoVO> list;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActMicroWishScreenVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActMicroWishScreenVO.java
new file mode 100644
index 0000000..e0fa034
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActMicroWishScreenVO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/16 10:14
+ */
+@ApiModel("大屏-工作-心愿单")
+@Data
+public class ComActMicroWishScreenVO implements Serializable {
+
+ @ApiModelProperty("微心愿轮播图")
+ private List<String> imgs;
+
+ @ApiModelProperty(value = "本月新增")
+ private Long currentNum;
+
+ @ApiModelProperty(value = "等待实现")
+ private Long willNum;
+
+ @ApiModelProperty(value = "累计实现")
+ private Long completedNum;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActNeighborCircleScreenVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActNeighborCircleScreenVO.java
new file mode 100644
index 0000000..6352025
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActNeighborCircleScreenVO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/15 14:36
+ */
+@Data
+@ApiModel("大屏-工作-邻里圈")
+public class ComActNeighborCircleScreenVO implements Serializable {
+
+ private static final long serialVersionUID = 8407169650740659312L;
+
+ @ApiModelProperty(value = "邻里圈图片轮播")
+ private List<String> imgs;
+
+ @ApiModelProperty(value = "邻里圈轮播列表")
+ private List<CarouselInfoVO> list;
+
+ @ApiModelProperty(value = "本月新增")
+ private Long currentNum;
+
+ @ApiModelProperty(value = "总发表")
+ private Long totalNum;
+
+ @ApiModelProperty(value = "点赞量")
+ private Long fabulousNum;
+
+ @ApiModelProperty(value = "评论量")
+ private Long commentNum;
+
+ @ApiModelProperty(value = "分享量")
+ private Long sharedNum;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActPopulationCultureVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActPopulationCultureVO.java
new file mode 100644
index 0000000..3611559
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActPopulationCultureVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/15 14:36
+ */
+@Data
+@ApiModel("实有人口文化程度统计")
+public class ComActPopulationCultureVO implements Serializable {
+
+ @ApiModelProperty(value = "文化程度")
+ private String level;
+
+ @ApiModelProperty(value = "人口数")
+ private Long num;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActPopulationScreenVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActPopulationScreenVO.java
new file mode 100644
index 0000000..299ba89
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActPopulationScreenVO.java
@@ -0,0 +1,58 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.event.EventGridStatisticsVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/15 14:36
+ */
+@Data
+@ApiModel("大屏-人口")
+public class ComActPopulationScreenVO implements Serializable {
+
+ @ApiModelProperty(value = "总人口数")
+ private Long totalNum;
+
+ @ApiModelProperty(value = "户籍人口数")
+ private Long localNum;
+
+ @ApiModelProperty(value = "流动人口数")
+ private Long outNum;
+
+ @ApiModelProperty(value = "特殊人口数")
+ private Long specialNum;
+
+ @ApiModelProperty(value = "已使用社区同人口数")
+ private Long usedCommunityNum;
+
+ @ApiModelProperty(value = "男性数量")
+ private Long manNum;
+ @ApiModelProperty(value = "男性占比")
+ private Integer manPoint;
+
+ @ApiModelProperty(value = "女性数量")
+ private Long woman;
+ @ApiModelProperty(value = "女性占比")
+ private Integer womanPoint;
+
+ @ApiModelProperty("实有人口年龄结构")
+ private List<ComMngPopulationAgeVO> ageGroup;
+
+ @ApiModelProperty("实有人口文化程度统计")
+ private List<ComActPopulationCultureVO> cultureGroup;
+
+ @ApiModelProperty("大屏网格数据")
+ private List<EventGridStatisticsVO> gridStatisticsList;
+
+ @ApiModelProperty("小区列表数据")
+ private List<CivilVillageStatisticsVO> villageStatisticsList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActWorkScreenVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActWorkScreenVO.java
new file mode 100644
index 0000000..e42a128
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActWorkScreenVO.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/16 18:00
+ */
+@ApiModel("大屏-工作-工作情况汇报")
+@Data
+public class ComActWorkScreenVO implements Serializable {
+
+ private static final long serialVersionUID = 5969567628890256231L;
+
+ @ApiModelProperty("平均耗时")
+ private String avgTime;
+
+ @ApiModelProperty("每天完成")
+ private String everyDayNum;
+
+ @ApiModelProperty("完成总数")
+ private Integer totalCompleted;
+
+ @ApiModelProperty("未完成总数")
+ private Integer totalNoneCompleted;
+
+ @ApiModelProperty("已完成")
+ private List<PieElementVO> completetList;
+
+ @ApiModelProperty("未完成")
+ private List<PieElementVO> noneList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComDynamicWorkScreenVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComDynamicWorkScreenVO.java
new file mode 100644
index 0000000..6f7bf75
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComDynamicWorkScreenVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * @date 2021/6/16 14:38
+ */
+@ApiModel("大屏-工作-社区动态")
+@Data
+public class ComDynamicWorkScreenVO implements Serializable {
+
+ @ApiModelProperty("全部动态")
+ private Long totalNum;
+
+ @ApiModelProperty("本月新增")
+ private Long currentNum;
+
+ @ApiModelProperty("平均每天动态")
+ private Integer currentAvgNum = 0;
+
+ @ApiModelProperty("最新动态列表")
+ private List<String> dynList;
+
+ @ApiModelProperty("动态柱状图列表数据")
+ private List<DynamicWorkVO> list;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComMngPopulationAgeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComMngPopulationAgeVO.java
new file mode 100644
index 0000000..f5d8bc6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComMngPopulationAgeVO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/15 16:42
+ */
+@Data
+@ApiModel("年龄段结构统计")
+public class ComMngPopulationAgeVO implements Serializable {
+
+ private static final long serialVersionUID = 1562369303787355841L;
+
+ @ApiModelProperty("年龄段")
+ private String group;
+
+ @ApiModelProperty("数量")
+ private Long num;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComPbWorkScreenVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComPbWorkScreenVO.java
new file mode 100644
index 0000000..b43d5ff
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComPbWorkScreenVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/16 14:38
+ */
+@ApiModel("大屏-人口-党建工作")
+@Data
+public class ComPbWorkScreenVO implements Serializable {
+
+ @ApiModelProperty("总共发起")
+ private Long totalNum;
+
+ @ApiModelProperty("本月新增")
+ private Long currentNum;
+
+ @ApiModelProperty("党建宣传")
+ private Long dynNum;
+
+ @ApiModelProperty("党员活动")
+ private Long activityNum;
+
+ @ApiModelProperty("党建工作柱状图列表数据")
+ private List<PbWorkVO> list;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/DateScreenVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/DateScreenVO.java
new file mode 100644
index 0000000..8fb9fcc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/DateScreenVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel("事件格式化类")
+public class DateScreenVO {
+
+ /**
+ * 开始时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ /**
+ * 结束时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/DynamicWorkVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/DynamicWorkVO.java
new file mode 100644
index 0000000..7eefd7e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/DynamicWorkVO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * @date 2021/6/16 14:45
+ */
+@Data
+@ApiModel("累计动态、新增动态")
+public class DynamicWorkVO implements Serializable {
+
+ @ApiModelProperty("月份")
+ private String month;
+
+ @ApiModelProperty("累计动态")
+ private Long dynTotal;
+
+ @ApiModelProperty("新增动态")
+ private Long dynAdd;
+
+ @ApiModelProperty(hidden = true)
+ private String start;
+ @ApiModelProperty(hidden = true)
+ private String end;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EastPhotoTypeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EastPhotoTypeVO.java
new file mode 100644
index 0000000..71186c9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EastPhotoTypeVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/16 14:45
+ */
+@Data
+@ApiModel("随手拍类型饼图")
+public class EastPhotoTypeVO implements Serializable {
+
+ @ApiModelProperty("类型名称")
+ private String name;
+
+ @ApiModelProperty("数量")
+ private Long num;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EastPhotoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EastPhotoVO.java
new file mode 100644
index 0000000..21c382b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EastPhotoVO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/16 14:45
+ */
+@Data
+@ApiModel("随手拍线型数据")
+public class EastPhotoVO implements Serializable {
+
+ @ApiModelProperty("月份")
+ private String month;
+
+ @ApiModelProperty("随手拍数量")
+ private Long total;
+
+ @ApiModelProperty("新增随手拍数量")
+ private Long adds;
+
+ @ApiModelProperty("处理手拍数量")
+ private Long deal;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EasyPhotoDataVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EasyPhotoDataVO.java
new file mode 100644
index 0000000..b3ad908
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EasyPhotoDataVO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.vos.screen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/16 16:27
+ */
+@ApiModel("随手拍线形图")
+@Data
+public class EasyPhotoDataVO {
+
+ @ApiModelProperty("月份")
+ private String month;
+
+ @ApiModelProperty("随手拍数量")
+ private Long total;
+
+ @ApiModelProperty("新增随手拍")
+ private Long adds;
+
+ @ApiModelProperty("处理随手拍")
+ private Long deal;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EasyPhotoPointVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EasyPhotoPointVO.java
new file mode 100644
index 0000000..9f4cbd0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EasyPhotoPointVO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.vos.screen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/16 16:21
+ */
+@ApiModel("随手拍饼状图")
+@Data
+public class EasyPhotoPointVO {
+
+ @ApiModelProperty("类型名")
+ private String typeName;
+
+ @ApiModelProperty("占比")
+ private Integer point;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EventDetailWorkVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EventDetailWorkVO.java
new file mode 100644
index 0000000..552319e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EventDetailWorkVO.java
@@ -0,0 +1,68 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * @date 2021/6/16 14:45
+ */
+@Data
+@ApiModel("工作-事件管理-事件播报数据")
+public class EventDetailWorkVO implements Serializable {
+
+ @ApiModelProperty("事件id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("发布人昵称")
+ private String userName;
+
+ @ApiModelProperty("发布人头像")
+ private String imageUrl;
+
+ @ApiModelProperty("事件上报时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("事件描述")
+ private String eventDes;
+
+ @ApiModelProperty("危险级别:0 (无) 1（特别重大）、2（重大）、3（较大）、4（一般）")
+ private String dangerLevel;
+
+ @ApiModelProperty("是否紧急")
+ private Boolean urgent;
+
+ @ApiModelProperty("是否重大")
+ private Boolean major;
+
+ @ApiModelProperty("事件发生地点")
+ private String happenAddress;
+
+ @ApiModelProperty("事件发生地点备注")
+ private String happentAddress;
+
+ @ApiModelProperty("事件发生经纬度（长在前短在后）")
+ private String happentLatLng;
+
+ @ApiModelProperty("事件分类1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报")
+ private Integer eventType;
+
+ @ApiModelProperty("事件处理状态(1待处理、2待验证、3已上报、4已解决、5草稿箱、6已撤销、7已失效 8 已发布)")
+ private Integer eventDealStatus;
+
+ @ApiModelProperty(value = "是否红牌")
+ private Boolean redCard;
+
+ @ApiModelProperty(value = "是否黄牌")
+ private Boolean yellowCard;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EventTypeWorkVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EventTypeWorkVO.java
new file mode 100644
index 0000000..975200e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EventTypeWorkVO.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * @date 2021/6/16 14:45
+ */
+@Data
+@ApiModel("解决事件、新增事件、事件数量")
+public class EventTypeWorkVO implements Serializable {
+
+ @ApiModelProperty("治安隐患")
+ private Integer zaTotal;
+
+ @ApiModelProperty("公共服务")
+ private Integer ggTotal;
+
+ @ApiModelProperty("矛盾纠纷")
+ private Integer mdTotal;
+
+ @ApiModelProperty("不稳定因素")
+ private Integer bwdTotal;
+
+ @ApiModelProperty("突发事件")
+ private Integer tfTotal;
+
+ @ApiModelProperty("特殊人群上报")
+ private Integer tsTotal;
+
+ @ApiModelProperty("随手拍")
+ private Integer sspTotal;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EventWorkScreenVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EventWorkScreenVO.java
new file mode 100644
index 0000000..b4c31b2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EventWorkScreenVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * @date 2021/6/16 14:38
+ */
+@ApiModel("大屏-工作-事件管理")
+@Data
+public class EventWorkScreenVO implements Serializable {
+
+ @ApiModelProperty("已解决事件")
+ private Long resolvedNum = 0L;
+
+ @ApiModelProperty("待处理事件")
+ private Long pendingNum = 0L;
+
+ @ApiModelProperty("本月新增")
+ private Long currentNum = 0L;
+
+ @ApiModelProperty("平均耗时")
+ private Integer avgCost = 0;
+
+ @ApiModelProperty("宣传教育")
+ private Long propagandaNum = 0L;
+
+ @ApiModelProperty("事件最新动态列表")
+ private List<EventDetailWorkVO> eventList;
+
+ @ApiModelProperty("动态柱状图列表数据")
+ private List<EventWorkVO> list;
+
+ @ApiModelProperty("已完成事件数据")
+ private EventTypeWorkVO complete;
+
+ @ApiModelProperty("未完成事件数据")
+ private EventTypeWorkVO noComplete;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EventWorkVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EventWorkVO.java
new file mode 100644
index 0000000..06990f4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/EventWorkVO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author lyq
+ * @date 2021/6/16 14:45
+ */
+@Data
+@ApiModel("解决事件、新增事件、事件数量")
+public class EventWorkVO implements Serializable {
+
+ @ApiModelProperty("月份")
+ private String month;
+
+ @ApiModelProperty("事件数量")
+ private Long eventTotal;
+
+ @ApiModelProperty("新增事件")
+ private Long eventAdd;
+
+ @ApiModelProperty("解决事件")
+ private Long eventSolve;
+
+ @ApiModelProperty("随手拍数量")
+ private Long sspTotal = 0L;
+
+ @ApiModelProperty("新增随手拍数量")
+ private Long sspAdd = 0L;
+
+ @ApiModelProperty("解决随手拍数量")
+ private Long sspSolve = 0L;
+
+ @ApiModelProperty(hidden = true)
+ private String start;
+ @ApiModelProperty(hidden = true)
+ private String end;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/GridMemberTrajectoryVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/GridMemberTrajectoryVo.java
new file mode 100644
index 0000000..ae294e8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/GridMemberTrajectoryVo.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.vos.screen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author lyq
+ * @date 2021/6/16 14:45
+ */
+@Data
+@ApiModel("网格员运动轨迹返回参数")
+public class GridMemberTrajectoryVo {
+
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ @ApiModelProperty("网格员名字")
+ private String name;
+
+ @ApiModelProperty("网格员手机号")
+ private String phone;
+
+ @ApiModelProperty("网格员运动轨迹经纬度列表")
+ private List<String> lngLatList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/PbWorkVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/PbWorkVO.java
new file mode 100644
index 0000000..098bc5e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/PbWorkVO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/16 14:45
+ */
+@Data
+@ApiModel("党建宣传、党员活动")
+public class PbWorkVO implements Serializable {
+
+ @ApiModelProperty("月份")
+ private String month;
+
+ @ApiModelProperty("党建宣传")
+ private Long dyn;
+
+ @ApiModelProperty("党员活动")
+ private Long activity;
+
+ @ApiModelProperty(hidden = true)
+ private String start;
+ @ApiModelProperty(hidden = true)
+ private String end;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/PieElementVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/PieElementVO.java
new file mode 100644
index 0000000..17fbb4c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/PieElementVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/17 15:30
+ */
+@ApiModel("饼图元素")
+@Data
+public class PieElementVO implements Serializable {
+
+ @ApiModelProperty("名称")
+ private String name;
+
+ @ApiModelProperty("数量")
+ private Integer num;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ScreenDrawEventPopulationTotalVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ScreenDrawEventPopulationTotalVO.java
new file mode 100644
index 0000000..df3b6b8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ScreenDrawEventPopulationTotalVO.java
@@ -0,0 +1,98 @@
+package com.panzhihua.common.model.vos.screen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 实有人口统计返回参数
+ */
+@Data
+@ApiModel("实有人口统计返回参数")
+public class ScreenDrawEventPopulationTotalVO {
+
+ @ApiModelProperty("居民总数")
+ private Integer populationTotal = 0;
+
+ @ApiModelProperty("户籍人口")
+ private Integer localTotal = 0;
+
+ @ApiModelProperty("流动人口")
+ private Integer outTotal = 0;
+
+ @ApiModelProperty("其他人员")
+ private Integer specialTotal = 0;
+
+ @ApiModelProperty("小区数")
+ private Integer villageTotal = 0;
+
+ @ApiModelProperty("楼栋数")
+ private Integer buildTotal = 0;
+
+ @ApiModelProperty("居民小组长")
+ private Integer JMXZZTotal = 8;
+
+ @ApiModelProperty("楼栋长")
+ private Integer LDZTotal = 28;
+
+ @ApiModelProperty("党小组长")
+ private Integer DXZZTotal = 10;
+
+ @ApiModelProperty("妇女小组长")
+ private Integer FNXZZTotal = 7;
+
+ @ApiModelProperty("卫生员")
+ private Integer WSYTotal = 7;
+
+ @ApiModelProperty("监督员")
+ private Integer JDYTotal = 7;
+
+ @ApiModelProperty("安全员")
+ private Integer AQYTotal = 7;
+
+ @ApiModelProperty("网格员")
+ private Integer WGYTotal = 6;
+
+ @ApiModelProperty("总户数")
+ private Integer houseTotal = 0;
+
+ @ApiModelProperty("残疾人")
+ private Integer disabilityTotal = 0;
+
+ @ApiModelProperty("低保户")
+ private Integer lowSecurityTotal = 0;
+
+ @ApiModelProperty("高龄老人")
+ private Integer elderTotal = 0;
+
+ @ApiModelProperty("特殊情况")
+ private Integer specialSituationTotal = 0;
+
+ @ApiModelProperty("其他")
+ private Integer otherTotal = 0;
+
+ @ApiModelProperty("特扶家庭")
+ private Integer specialHelpTotal = 0;
+
+ @ApiModelProperty("退役军人")
+ private Integer veteransTotal = 0;
+
+ @ApiModelProperty("老年人")
+ private Integer oldTotal = 0;
+
+ @ApiModelProperty("养老人员")
+ private Integer pensionTotal = 0;
+
+ @ApiModelProperty("出租房源")
+ private Integer rentingHouseTotal = 0;
+
+ @ApiModelProperty("社会工作者")
+ private Integer socialWorkerTotal = 0;
+
+ @ApiModelProperty("志愿者")
+ private Integer volunteerTotal = 0;
+
+ @ApiModelProperty("平均年龄")
+ private Integer averageAge = 0;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ScreenDrawEventVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ScreenDrawEventVO.java
new file mode 100644
index 0000000..c2c92aa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ScreenDrawEventVO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.vos.screen;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.event.EventGridIncidentStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.event.EventLeftDownStatisticsVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("大屏绘制多边形返回参数")
+public class ScreenDrawEventVO {
+
+ @ApiModelProperty("社区事件数据")
+ private List<EventGridIncidentStatisticsVO> gridIncidentList;
+
+ @ApiModelProperty("小区列表数据")
+ private List<CivilVillageStatisticsVO> villageStatisticsList;
+
+ @ApiModelProperty("人数统计数据")
+ private ScreenDrawEventPopulationTotalVO drawEventPopulationTotalVO;
+
+ @ApiModelProperty("事件数量统计数据")
+ private EventLeftDownStatisticsVO leftDownStatisticsVO;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsAttrVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsAttrVO.java
new file mode 100644
index 0000000..afbb722
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsAttrVO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.shop;
+
+import com.panzhihua.common.validated.AddGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Digits;
+import javax.validation.constraints.Min;
+import java.math.BigDecimal;
+
+/**
+ * @auther yh
+ * @describe
+ */
+@Data
+@ApiModel("商品规格")
+public class AddShopFlowerGoodsAttrVO {
+
+ @ApiModelProperty("商品规格Id:编辑必传")
+ private Long id;
+
+ @ApiModelProperty("商品规格")
+ private String goodsAttrName;
+
+ @ApiModelProperty("原价")
+ @Min(groups = {AddGroup.class}, value = 0, message = "原价最小值为0")
+ @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
+ private BigDecimal price;
+
+ @ApiModelProperty("包邮价")
+// @Min(groups = {AddGroup.class}, value = 0, message = "包邮价最小值为0")
+// @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
+ private BigDecimal freeShippingPrice;
+
+ @ApiModelProperty("拼单价")
+// @Min(groups = {AddGroup.class}, value = 0, message = "拼单价最小值为0")
+// @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
+ private BigDecimal collatePrice;
+
+ @ApiModelProperty("商品规格图")
+ private String attrPic;
+
+ @ApiModelProperty("库存")
+ private Integer stock;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java
new file mode 100644
index 0000000..ecbbc53
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java
@@ -0,0 +1,65 @@
+package com.panzhihua.common.model.vos.shop;
+
+import com.panzhihua.common.validated.AddGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.Valid;
+import javax.validation.constraints.Digits;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @auther yh
+ * @describe 商品
+ */
+@Data
+@ApiModel("添加商品")
+public class AddShopFlowerGoodsVO {
+
+ @ApiModelProperty("店铺id")
+ private Long storeId;
+
+ @ApiModelProperty("商品名称")
+ private String name;
+
+ @ApiModelProperty("商品现价")
+ @Min(groups = {AddGroup.class}, value = 0, message = "价格最小值为0")
+ @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
+ private BigDecimal price;
+
+ @ApiModelProperty("商品单位")
+ private String unit;
+
+ @ApiModelProperty("商品状态(1.出售中 2.已下架 3.回收站)")
+ private Integer status;
+
+ @ApiModelProperty("商品主图")
+ private String goodsPic;
+
+ @ApiModelProperty("商品图片")
+ private String images;
+
+ @ApiModelProperty("商品详情")
+ private String details;
+
+ @ApiModelProperty("商品详情()富文本")
+ private String goodsDescribe;
+
+ /**
+ * 配送方式（1.商家配送 2.快递物流）
+ */
+ @ApiModelProperty(value = "配送方式（1.自提 2.快递）")
+ private String deliveryType;
+
+ @ApiModelProperty("商品规格")
+ @Valid
+ private List<AddShopFlowerGoodsAttrVO> goodsAttrVOList;
+
+ @ApiModelProperty("商品分类")
+ @NotEmpty(groups = {AddGroup.class}, message = "商品分类不能为空")
+ private List<Long> categoryIds;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsAttrVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsAttrVO.java
new file mode 100644
index 0000000..ea98ac5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsAttrVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.math.BigDecimal;
+
+import javax.validation.constraints.Digits;
+import javax.validation.constraints.Min;
+
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("商品规格")
+public class AddShopGoodsAttrVO {
+
+ @ApiModelProperty("商品规格Id:编辑必传")
+ private Long goodsAttrId;
+
+ @ApiModelProperty("商品规格")
+ private String goodsAttr;
+
+ @ApiModelProperty("规格价格")
+ @Min(groups = {AddGroup.class}, value = 0, message = "价格最小值为0")
+ @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
+ private BigDecimal attrPrice;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java
new file mode 100644
index 0000000..7513455
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java
@@ -0,0 +1,59 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import javax.validation.Valid;
+import javax.validation.constraints.Digits;
+import javax.validation.constraints.Min;
+
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe 商品
+ */
+@Data
+@ApiModel("添加商品")
+public class AddShopGoodsVO {
+
+ @ApiModelProperty("店铺id")
+ private Long storeId;
+
+ @ApiModelProperty("商品名称")
+ private String name;
+
+ @ApiModelProperty("商品现价")
+ @Min(groups = {AddGroup.class}, value = 0, message = "价格最小值为0")
+ @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
+ private BigDecimal price;
+
+ @ApiModelProperty("商品单位")
+ private String unit;
+
+ @ApiModelProperty("商品状态(1.出售中 2.已下架 3.回收站)")
+ private Integer status;
+
+ @ApiModelProperty("商品主图")
+ private String goodsPic;
+
+ @ApiModelProperty("商品图片")
+ private String images;
+
+ @ApiModelProperty("商品详情")
+ private String details;
+
+ /**
+ * 配送方式（1.商家配送 2.快递物流）
+ */
+ @ApiModelProperty(value = "配送方式（1.商家配送 2.快递物流）", hidden = true)
+ private Integer deliveryType;
+
+ @ApiModelProperty("商品规格")
+ @Valid
+ private List<AddShopGoodsAttrVO> goodsAttrVOList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/CapitalDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/CapitalDetailVO.java
new file mode 100644
index 0000000..ffcbb74
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/CapitalDetailVO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe 商家订单资金详情
+ */
+@Data
+public class CapitalDetailVO {
+ @ApiModelProperty(value = "商家账号")
+ private String storeAccount;
+ @ApiModelProperty(value = "商家姓名")
+ private String contacts;
+ @ApiModelProperty(value = "店铺名称")
+ private String storeName;
+ @ApiModelProperty(value = "金额（元）")
+ private BigDecimal totalAmount;
+ @ApiModelProperty("支付方式（1.微信支付）")
+ private Integer payType;
+ @ApiModelProperty("类型")
+ private String type;
+ @ApiModelProperty("支付时间")
+ private Date payTime;
+ @ApiModelProperty("下单时间")
+ private Date createAt;
+ @ApiModelProperty("订单号")
+ private String orderNo;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/CapitalPageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/CapitalPageVO.java
new file mode 100644
index 0000000..ae064d7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/CapitalPageVO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe 商家订单资金列表
+ */
+@Data
+public class CapitalPageVO {
+ @ApiModelProperty(value = "商家账号")
+ private String storeAccount;
+ @ApiModelProperty(value = "商家姓名")
+ private String contacts;
+ @ApiModelProperty(value = "店铺名称")
+ private String storeName;
+ @ApiModelProperty(value = "金额（元）")
+ private BigDecimal payAmount;
+ @ApiModelProperty(value = "订单Id")
+ private Long orderId;
+ @ApiModelProperty("支付方式（1.微信支付）")
+ private Integer payType;
+ @ApiModelProperty("类型")
+ private String type = "订单收入";
+ @ApiModelProperty("支付时间")
+ private Date payTime;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopCartListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopCartListVO.java
new file mode 100644
index 0000000..392c8e4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopCartListVO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 购物车列表信息
+ */
+@Data
+@ApiModel("购物车列表信息")
+public class ComShopCartListVO {
+
+ /**
+ * 有效宝贝购物车信息
+ */
+ @ApiModelProperty("有效宝贝购物车信息")
+ private List<ComShopCartStoreVO> cartList;
+
+ /**
+ * 失效宝贝购物车信息
+ */
+ @ApiModelProperty("失效宝贝购物车信息")
+ private List<ComShopCartVO> invalidCartList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopCartStoreVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopCartStoreVO.java
new file mode 100644
index 0000000..75f9fd0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopCartStoreVO.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 有效购物车信息
+ */
+@Data
+@ApiModel("有效购物车信息")
+public class ComShopCartStoreVO {
+
+ /**
+ * 店铺id
+ */
+ @ApiModelProperty("店铺id")
+ private Long storeId;
+
+ /**
+ * 店铺名称
+ */
+ @ApiModelProperty("店铺名称")
+ private String storeName;
+
+ /**
+ * 店铺logo
+ */
+ @ApiModelProperty("店铺logo")
+ private String storeLogo;
+
+ /**
+ * 店铺下购物车信息
+ */
+ @ApiModelProperty("店铺下购物车信息")
+ private List<ComShopCartVO> cartList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopCartVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopCartVO.java
new file mode 100644
index 0000000..0aee8c9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopCartVO.java
@@ -0,0 +1,71 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 购物车信息
+ */
+@Data
+@ApiModel("购物车信息")
+public class ComShopCartVO {
+
+ /**
+ * 购物车id
+ */
+ @ApiModelProperty("购物车id")
+ private Long id;
+
+ /**
+ * 商品id
+ */
+ @ApiModelProperty("商品id")
+ private Long goodsId;
+
+ /**
+ * 商品名字
+ */
+ @ApiModelProperty("商品名字")
+ private String goodsName;
+
+ /**
+ * 店铺id
+ */
+ @ApiModelProperty("店铺id")
+ private Long storeId;
+
+ /**
+ * 商品规格id
+ */
+ @ApiModelProperty("商品规格id")
+ private Long goodsAttrId;
+
+ /**
+ * 商品规格信息
+ */
+ @ApiModelProperty("商品规格信息")
+ private String goodsAttr;
+
+ /**
+ * 商品规格图
+ */
+ @ApiModelProperty("商品规格图")
+ private String goodsAttrPic;
+
+ /**
+ * 商品数量
+ */
+ @ApiModelProperty("商品数量")
+ private Integer amount;
+
+ /**
+ * 商品价格
+ */
+ @ApiModelProperty("商品价格")
+ private BigDecimal price;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerEvaluateVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerEvaluateVO.java
new file mode 100644
index 0000000..b8a9d9c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerEvaluateVO.java
@@ -0,0 +1,82 @@
+package com.panzhihua.common.model.vos.shop;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName: ComShopFlowerEvaluate
+ * @Author: yh
+ * @Date: 2022/11/9 16:46
+ * @Description: 评价表
+ */
+
+@Data
+@ApiModel("评价信息")
+public class ComShopFlowerEvaluateVO{
+ private static final long serialVersionUID = 1L;
+ /**
+ * ,主键
+ */
+ @ApiModelProperty("评价id")
+ private Long id;
+
+ /**
+ * 订单号
+ */
+ @ApiModelProperty("订单号")
+ private String orderNo;
+
+ /**
+ * 商品id
+ */
+ @ApiModelProperty("商品id")
+ private String goodsId;
+
+ /**
+ * 评价人id
+ */
+ @ApiModelProperty("评价人id")
+ private Long userId;
+
+ /**
+ * 评价时间
+ */
+ @ApiModelProperty("评价时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date evaluateTime;
+
+ /**
+ * 评价类型(5.非常满意 4.满意 3.一般 3.不满意 1.糟糕透了)
+ */
+ @ApiModelProperty("评价类型(5.非常满意 4.满意 3.一般 3.不满意 1.糟糕透了)")
+ private Integer evaluateType;
+
+ /**
+ * 评价内容
+ */
+ @ApiModelProperty("评价内容")
+ private String evaluateContent;
+
+ /**
+ * 评价图片
+ */
+ @ApiModelProperty("评价图片")
+ private String evaluatePic;
+
+ /**
+ * 用户昵称
+ */
+ @ApiModelProperty("用户昵称")
+ private String nickName;
+ /**
+ * 用户头像
+ */
+ @ApiModelProperty("用户头像")
+ private String imageUrl;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsAttrVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsAttrVO.java
new file mode 100644
index 0000000..1f0d6f3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsAttrVO.java
@@ -0,0 +1,89 @@
+package com.panzhihua.common.model.vos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @auther yh
+ * @create 2022-10-21 09:36:09
+ * @describe 商品规格信息
+ */
+@Data
+@ApiModel("商品规格信息")
+public class ComShopFlowerGoodsAttrVO {
+
+ /**
+ * 商品规格id
+ */
+ @ApiModelProperty("商品规格id")
+ private Long id;
+
+ /**
+ * 商品id
+ */
+ @ApiModelProperty("商品id")
+ private Long goodsId;
+
+ /**
+ * 店铺id
+ */
+ @ApiModelProperty("店铺id")
+ private Long storeId;
+
+ /**
+ * 商品名称
+ */
+ @ApiModelProperty("商品名称")
+ private String goodsName;
+
+ /**
+ * 商品规格
+ */
+ @ApiModelProperty("商品规格")
+ private String goodsAttrName;
+
+ /**
+ * 商品规格库存
+ */
+ @ApiModelProperty("商品规格库存")
+ private Integer stock;
+
+ /**
+ * 商品规格销量
+ */
+ @ApiModelProperty("商品规格销量")
+ private Integer sale;
+
+ /**
+ * 商品规格图
+ */
+ @ApiModelProperty("商品规格图")
+ private String attrPic;
+
+ /**
+ * 是否是默认规格（1.是 2.否）
+ */
+ @ApiModelProperty("是否是默认规格（1.是 2.否）")
+ private Integer isDefault;
+
+ /**
+ * 规格价格
+ */
+ @ApiModelProperty("规格价格")
+ private BigDecimal price;
+
+
+ /**
+ * 包邮价
+ */
+ @ApiModelProperty("包邮价")
+ private BigDecimal freeShippingPrice;
+ /**
+ * 拼单价
+ */
+ @ApiModelProperty("拼单价")
+ private BigDecimal collatePrice;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java
new file mode 100644
index 0000000..98b34a9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java
@@ -0,0 +1,163 @@
+package com.panzhihua.common.model.vos.shop;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import com.panzhihua.common.validated.AddGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @auther yh
+ * @create 2022-10-21 09:36:09
+ * @describe 商品信息
+ */
+@Data
+@ApiModel("商品信息")
+public class ComShopFlowerGoodsVO {
+
+ /**
+ * 商品id
+ */
+ @ApiModelProperty("商品id")
+ private Long id;
+
+ /**
+ * 商品名称
+ */
+ @ApiModelProperty("商品名称")
+ private String name;
+
+ /**
+ * 店铺id
+ */
+ @ApiModelProperty("店铺id")
+ private Long storeId;
+
+ /**
+ * 商品主图
+ */
+ @ApiModelProperty("商品主图")
+ private String goodsPic;
+
+ /**
+ * 商品展示图
+ */
+ @ApiModelProperty("商品展示图")
+ private String images;
+
+ /**
+ * 商品状态(1.出售中 2.已下架 3.回收站)
+ */
+ @ApiModelProperty("商品状态(1.出售中 2.已下架 3.回收站)")
+ private Integer status;
+
+ /**
+ * 商品销量
+ */
+ @ApiModelProperty("商品销量")
+ private Integer sale;
+
+ /**
+ * 商品原价
+ */
+ @ApiModelProperty("商品原价")
+ private BigDecimal originalPrice;
+
+ /**
+ * 包邮价
+ */
+ @ApiModelProperty("包邮价")
+ private BigDecimal freeShippingPrice;
+ /**
+ * 拼单价
+ */
+ @ApiModelProperty("拼单价")
+ private BigDecimal collatePrice;
+
+ /**
+ * 商品单位
+ */
+ @ApiModelProperty("商品单位")
+ private String unit;
+
+ /**
+ * 商品排序
+ */
+ @ApiModelProperty("商品排序")
+ private Integer order;
+
+ /**
+ * 商品总库存
+ */
+ @ApiModelProperty("商品总库存")
+ private Integer stock;
+
+ /**
+ * 商品详情
+ */
+ @ApiModelProperty("商品详情")
+ private String details;
+
+ /**
+ * 配送方式（1.商家配送 2.快递物流）
+ */
+ @ApiModelProperty("配送方式（1.商家配送 2.快递物流）")
+ private String deliveryType;
+
+ /**
+ * 商品规格列表
+ */
+ @ApiModelProperty("商品规格列表")
+ private List<ComShopFlowerGoodsAttrVO> goodsAttrList;
+
+ /**
+ * 店铺信息
+ */
+ @ApiModelProperty("商品店铺信息")
+ private ConvenientMerchantVO convenientMerchantVO;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ /**
+ * 配送方式（1.商家配送 2.快递物流）
+ */
+ @ApiModelProperty("订单数量（拼单数量、买过数量）")
+ private Integer orderNum;
+
+ /**
+ * 浏览量
+ */
+ @ApiModelProperty("浏览量")
+ private Integer viewNum;
+
+
+ /**
+ * 评价数量
+ */
+ @ApiModelProperty("评价数量")
+ private Integer evaluateNum;
+
+ /**
+ * 商品规格列表
+ */
+ @ApiModelProperty("评价列表，最新三条")
+ private List<ComShopFlowerEvaluateVO> shopFlowerEvaluateVOList;
+
+ @ApiModelProperty("商品分类")
+ @NotEmpty(groups = {AddGroup.class}, message = "商品分类不能为空")
+ private List<Long> categoryIds;
+
+
+ @ApiModelProperty("商品描述")
+ private String goodsDescribe;
+}
+
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderDeliveryNoListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderDeliveryNoListVO.java
new file mode 100644
index 0000000..ba1c66b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderDeliveryNoListVO.java
@@ -0,0 +1,16 @@
+package com.panzhihua.common.model.vos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("商家配送单订单VO")
+public class ComShopFlowerOrderDeliveryNoListVO {
+
+ @ApiModelProperty(value = "配送单VO")
+ private ComShopFlowerOrderDeliveryVO comShopFlowerOrderDeliveryVO;
+
+ @ApiModelProperty(value = "分页数据")
+ private Object page;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderDeliveryVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderDeliveryVO.java
new file mode 100644
index 0000000..e2b4e44
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderDeliveryVO.java
@@ -0,0 +1,121 @@
+package com.panzhihua.common.model.vos.shop;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @ClassName: ComShopFlowerOrderDelivery
+ * @Author: yh
+ * @Date: 2022/11/15 14:36
+ * @Description: 花城订单配送表
+ */
+@Data
+@ApiModel("订单配送表")
+public class ComShopFlowerOrderDeliveryVO {
+
+ /**
+ * 配送单id
+ */
+ @ApiModelProperty(value = "配送单id")
+ private Long id;
+
+ /**
+ * 店铺id
+ */
+ @ApiModelProperty(value = "店铺id")
+ private Long storeId;
+
+ /**
+ * 配送单号
+ */
+ @ApiModelProperty(value = "配送单号")
+ private String deliveryNo;
+
+ /**
+ * 配送单状态(1.配送中 2.已送达)
+ */
+ @ApiModelProperty(value = "配送单状态(1.配送中 2.已送达)")
+ private Integer deliveryStatus;
+
+ /**
+ * 删除状态(1.未删除 2.已删除)
+ */
+ @ApiModelProperty(value = "删除状态(1.未删除 2.已删除)")
+ private Integer deleteStatus;
+
+ /**
+ * 配送时间
+ */
+ @ApiModelProperty(value = "配送时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date deliveryTime;
+
+ /**
+ * 送达时间
+ */
+ @ApiModelProperty(value = "送达时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date serviceTime;
+
+ /**
+ * 配送方式（1.自提 2.快递）
+ */
+ @ApiModelProperty(value = " 配送方式（1.自提 2.快递）")
+ private Integer deliveryType;
+
+ /**
+ * 自提点id
+ */
+ @ApiModelProperty(value = "自提点id")
+ private Long pointId;
+
+ /**
+ * 自提点名称
+ */
+ @ApiModelProperty(value = "自提点名称")
+ private String pointName;
+
+ /**
+ * 配送订单数量
+ */
+ @ApiModelProperty(value = "配送订单数量")
+ private Integer deliveryOrderNum;
+
+ /**
+ * 配送商品数量
+ */
+ @ApiModelProperty(value = "配送商品数量")
+ private Integer deliveryGoodsNum;
+
+ /**
+ * 价值
+ */
+ @ApiModelProperty(value = "价值")
+ private BigDecimal deliveryAmount;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty(value = "修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty(value = "自提点信息")
+ private ConvenientElevatingPointVO convenientElevatingPointVO;
+
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderGoodsVO.java
new file mode 100644
index 0000000..c9b263d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderGoodsVO.java
@@ -0,0 +1,75 @@
+package com.panzhihua.common.model.vos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 订单预览商品参数
+ */
+@Data
+@ApiModel("订单预览商品参数")
+public class ComShopFlowerOrderGoodsVO {
+
+ /**
+ * 商品名称
+ */
+ @ApiModelProperty(value = "商品名称")
+ private String goodsName;
+
+ /**
+ * 商品图片
+ */
+ @ApiModelProperty(value = "商品图片")
+ private String goodsPic;
+
+ /**
+ * 商品价格
+ */
+ @ApiModelProperty(value = "商品价格")
+ private BigDecimal price;
+
+ /**
+ * 商品数量
+ */
+ @ApiModelProperty(value = "商品数量")
+ private Integer num;
+
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long goodsId;
+
+ /**
+ * 商品规格id
+ */
+ @ApiModelProperty(value = "商品规格id")
+ private Long goodsAttrId;
+
+ /**
+ * 商品规格
+ */
+ @ApiModelProperty(value = "商品规格")
+ private String goodsAttr;
+
+ /**
+ * 商品状态(1.出售中 2.已下架 3.已删除)
+ */
+ @ApiModelProperty(value = "商品状态(1.出售中 2.已下架 3.已删除)")
+ private Integer goodsStatus = 1;
+
+ /**
+ * 商品状态(1.出售中 2.已下架 3.已删除)
+ */
+ public interface goodsStatus {
+ int csz = 1;
+ int yxj = 2;
+ int ysc = 3;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderOperateVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderOperateVO.java
new file mode 100644
index 0000000..2afec20
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderOperateVO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.vos.shop;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel("订单操作日志")
+public class ComShopFlowerOrderOperateVO {
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+
+ @ApiModelProperty(value = "操作人")
+ private String operationBy;
+
+ @ApiModelProperty(value = "操作时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date operationTime;
+
+ @ApiModelProperty(value = "操作类型(1.创建订单 2.取消订单 3.订单支付 4.订单发货 5.订单完成)")
+ private Integer operationType;
+
+ @ApiModelProperty(value = "操作内容")
+ private String operationContent;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPageVO.java
new file mode 100644
index 0000000..6d1f54b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPageVO.java
@@ -0,0 +1,138 @@
+package com.panzhihua.common.model.vos.shop;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ApiModel("订单信息")
+public class ComShopFlowerOrderPageVO {
+
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+
+ @ApiModelProperty(value = "订单金额")
+ private BigDecimal orderTotal;
+
+ @ApiModelProperty(value = "店铺id")
+ private Long storeId;
+
+ @ApiModelProperty(value = "订单状态(1.等待配送 2.配送中 3.待收货 4.待评价 5.已完成 6.已取消 7.已退款)")
+ private Integer status;
+
+ @ApiModelProperty(value = "支付状态(1.未支付 2.已支付)")
+ private Integer payStatus;
+
+ @ApiModelProperty(value = "用户收货地址id")
+ private Long receiverId;
+
+ @ApiModelProperty(value = "支付金额")
+ private BigDecimal payAmount;
+
+ @ApiModelProperty(value = "配送方式")
+ private Integer deliveryType;
+
+ @ApiModelProperty(value = "订单备注")
+ private String remark;
+
+ @ApiModelProperty(value = "支付方式（1.微信支付）")
+ private Integer payType;
+
+ @ApiModelProperty(value = "支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date payTime;
+
+ @ApiModelProperty(value = "订单发货状态（1.未发货 2.已发货）")
+ private Integer deliveryStatus;
+
+ @ApiModelProperty(value = "物流公司")
+ private String logisticsCompany;
+
+ @ApiModelProperty(value = "物流单号")
+ private String logisticsNo;
+
+ @ApiModelProperty(value = "下单时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "支付单号")
+ private String payNo;
+
+ @ApiModelProperty(value = "收货时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date receivingTime;
+
+ @ApiModelProperty(value = "订单下商品信息")
+ private List<ComShopFlowerOrderGoodsVO> orderGoodsVOList;
+
+ @ApiModelProperty(value = "订单下店铺信息")
+ private ConvenientMerchantVO convenientMerchantVO;
+
+ @ApiModelProperty(value = "用户收货地址id")
+ private ComShopUserAddressVO userAddressVO;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodsName;
+
+ @ApiModelProperty(value = "订单日志")
+ private List<ComShopFlowerOrderOperateVO> logs;
+
+ @ApiModelProperty(value = "自提点信息")
+ private ConvenientElevatingPointVO convenientElevatingPointVO;
+
+ @ApiModelProperty(value = "评价")
+ private ComShopFlowerEvaluateVO comShopFlowerEvaluateVO;
+
+ @ApiModelProperty(value = "配送单id")
+ private Long deliveryId;
+
+ @ApiModelProperty(value = "配送单号")
+ private String deliveryNo;
+
+ @ApiModelProperty(value = "退款时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date refundTime;
+
+ @ApiModelProperty(value = "退款金额")
+ private BigDecimal refundAmount;
+
+ @ApiModelProperty(value = "规格名称")
+ private String goodsAttrName;
+
+ @ApiModelProperty(value = "购买数量")
+ private Integer amount;
+
+ @ApiModelProperty(value = "商品规格价格")
+ private BigDecimal goodsAttrPrice;
+
+ @ApiModelProperty(value = "商品规格图")
+ private String goodsAttrPic;
+
+ @ApiModelProperty(value = "取消时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date cancelTime;
+
+ @ApiModelProperty(value = "配送时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date deliveryTime;
+
+ @ApiModelProperty(value = "送达时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date serviceTime;
+
+ @ApiModelProperty(value = "是否可退款按钮显示 1.可退款 2.不可退款")
+ private Integer refundable = 1;
+
+ @ApiModelProperty(value = "微信交易单号")
+ private String wxTardeNo;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPayVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPayVO.java
new file mode 100644
index 0000000..c909fa4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPayVO.java
@@ -0,0 +1,101 @@
+package com.panzhihua.common.model.vos.shop;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @ClassName: ComShopFlowerOrderPay
+ * @Author: yh
+ * @Date: 2022/11/9 16:46
+ * @Description: 花城订单支付记录表
+ */
+@Data
+@ApiModel("花城订单支付记录")
+public class ComShopFlowerOrderPayVO {
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+
+ /**
+ * 支付单号
+ */
+ @ApiModelProperty(value = "支付单号")
+ private String payNo;
+
+ /**
+ * 微信交易号
+ */
+ @ApiModelProperty(value = "微信交易号")
+ private String wxTradeNo;
+
+ /**
+ * 支付状态（1.未支付 2.已支付）
+ */
+ @ApiModelProperty(value = "支付状态（1.未支付 2.已支付）")
+ private Integer payStatus;
+
+ /**
+ * 订单金额
+ */
+ @ApiModelProperty(value = "订单金额")
+ private BigDecimal orderAmount;
+
+ /**
+ * 支付金额
+ */
+ @ApiModelProperty(value = "支付金额")
+ private BigDecimal payAmount;
+
+ /**
+ * 支付时间
+ */
+ @ApiModelProperty(value = "支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date payTime;
+
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+ /**
+ * 配送方式（1.自提 2.快递）
+ */
+ @ApiModelProperty(value = "配送方式（1.自提 2.快递）")
+ private Integer deliveryType;
+ /**
+ * 原始订单id
+ */
+ @ApiModelProperty(value = "原始订单id")
+ private Long orderId;
+ /**
+ * 退款订单号
+ */
+ @ApiModelProperty(value = "退款订单号")
+ private String refundOrderNo;
+ /**
+ * 退款状态(1.处理中 2.退款成功 3.退款失败 4.已取消 5.退款中)
+ */
+ @ApiModelProperty(value = "退款状态(1.处理中 2.退款成功 3.退款失败 4.已取消 5.退款中)")
+ private Integer refundStatus;
+ /**
+ * 类型（1.支付 2.退款 3.取消）
+ */
+ @ApiModelProperty(value = "类型（1.支付 2.退款 3.取消）")
+ private Integer payType;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPreviewVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPreviewVO.java
new file mode 100644
index 0000000..04f235b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderPreviewVO.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.model.vos.shop;
+
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 订单预览返回参数
+ */
+@Data
+@ApiModel("订单预览返回参数")
+public class ComShopFlowerOrderPreviewVO {
+
+ /**
+ * 用户默认收货地址
+ */
+ @ApiModelProperty(value = "用户默认收货地址")
+ private ComShopUserAddressVO userAddressVO;
+
+ /**
+ * 店铺信息
+ */
+ @ApiModelProperty(value = "店铺信息")
+ private ConvenientMerchantVO convenientMerchantVO;
+
+
+ /**
+ * 订单总金额
+ */
+ @ApiModelProperty(value = "订单总金额")
+ private BigDecimal orderTotal;
+
+ /**
+ * 订单商品总数量
+ */
+ @ApiModelProperty(value = "订单商品总数量")
+ private Integer orderGoodsTotal;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderStoreListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderStoreListVO.java
new file mode 100644
index 0000000..9e871d6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderStoreListVO.java
@@ -0,0 +1,73 @@
+package com.panzhihua.common.model.vos.shop;
+
+import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("商家订单列表VO")
+public class ComShopFlowerOrderStoreListVO {
+
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+
+ @ApiModelProperty(value = "订单状态(1.等待配送 2.配送中 3.待收货 4.待评价 5.已完成 6.已取消 7.已退款)")
+ private Integer status;
+
+ @ApiModelProperty(value = "配送方式")
+ private Integer deliveryType;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodsName;
+
+ @ApiModelProperty(value = "规格名称")
+ private String goodsAttrName;
+
+ @ApiModelProperty(value = "购买数量")
+ private Integer amount;
+
+ @ApiModelProperty(value = "商品规格价格")
+ private BigDecimal goodsAttrPrice;
+
+ @ApiModelProperty(value = "商品规格图")
+ private String goodsAttrPic;
+
+ @ApiModelProperty(value = "订单金额")
+ private BigDecimal totalAmount;
+
+
+ @ApiModelProperty(value = "收货人名称")
+ private String name;
+
+ @ApiModelProperty(value = "发货时间")
+ private String phone;
+
+ @ApiModelProperty(value = "收货人省份名称")
+ private String provinceName;
+
+ @ApiModelProperty(value = "收货人城市名称")
+ private String cityName;
+
+ @ApiModelProperty(value = "收货人区县名称")
+ private String districtName;
+
+ @ApiModelProperty(value = "收货人详细地址")
+ private String detailAddress;
+ @ApiModelProperty(value = "自提点id")
+ private Long pointId;
+ @ApiModelProperty(value = "自提点信息")
+ private ConvenientElevatingPointVO convenientElevatingPointVO;
+
+ @ApiModelProperty(value = "物流单号")
+ private String logisticsNo;
+
+ @ApiModelProperty(value = "物流公司")
+ private String logisticsCompany;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderVO.java
new file mode 100644
index 0000000..310b649
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("订单创建返回参数")
+public class ComShopFlowerOrderVO {
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+
+ @ApiModelProperty(value = "订单ID")
+ private Long orderId;
+
+ @ApiModelProperty(value = "订单金额")
+ private BigDecimal orderTotal;
+
+ @ApiModelProperty(value = "请求支付返回参数")
+ private String payResult;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerRefundOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerRefundOrderVO.java
new file mode 100644
index 0000000..b0ab080
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerRefundOrderVO.java
@@ -0,0 +1,166 @@
+package com.panzhihua.common.model.vos.shop;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName: ComShopFlowerRefundOrderVO
+ * @Author: yh
+ * @Date: 2022/11/16 15:05
+ * @Description: TODO
+ */
+@Data
+public class ComShopFlowerRefundOrderVO {
+
+ /**
+ * 订单id
+ */
+ @ApiModelProperty("退款订单id")
+ private Long id;
+
+ /**
+ * 店铺id
+ */
+ @ApiModelProperty("店铺id")
+ private Long storeId;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ /**
+ * 原始订单号
+ */
+ @ApiModelProperty("原始订单号")
+ private String orderNo;
+
+ /**
+ * 原始订单id
+ */
+ @ApiModelProperty("原始订单id")
+ private String orderId;
+
+ /**
+ * 退款订单号
+ */
+ @ApiModelProperty("退款订单号")
+ private String refundOrderNo;
+
+ /**
+ * 订单状态(9.处理中 10.退款成功 11.退款失败 12.已取消 13.退款中)
+ */
+ @ApiModelProperty("订单状态(9.处理中 10.退款成功 11.退款失败 12.已取消 13.退款中)")
+ private Integer status;
+
+ /**
+ * 删除状态(1.未删除 2.已删除)
+ */
+ @ApiModelProperty("删除状态(1.未删除 2.已删除)")
+ private Integer deleteStatus;
+
+ /**
+ * 支付总金额
+ */
+ @ApiModelProperty("支付总金额")
+ private BigDecimal payAmount;
+
+ /**
+ * 申请退款金额
+ */
+ @ApiModelProperty("申请退款金额")
+ private BigDecimal refundAmount;
+
+ /**
+ * 退款原因
+ */
+ @ApiModelProperty("退款原因")
+ private String refundReason;
+
+ /**
+ * 退款照片
+ */
+ @ApiModelProperty("退款照片")
+ private String refundPic;
+
+ /**
+ * 申请时间
+ */
+ @ApiModelProperty("申请时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ /**
+ * 处理时间
+ */
+ @ApiModelProperty("处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date handleTime;
+
+ /**
+ * 退款时间
+ */
+ @ApiModelProperty("退款时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date refundTime;
+
+ /**
+ * 取消时间
+ */
+ @ApiModelProperty("取消时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date cancelTime;
+
+ /**
+ * 处理结果
+ */
+ @ApiModelProperty("处理结果(1.同意 2.拒绝)")
+ private String handleResult;
+
+ /**
+ * 商家备注
+ */
+ @ApiModelProperty("商家备注")
+ private String remark;
+
+ @ApiModelProperty(value = "订单下店铺信息")
+ private ConvenientMerchantVO convenientMerchantVO;
+
+ @ApiModelProperty(value = "订单下商品信息")
+ private List<ComShopFlowerOrderGoodsVO> orderGoodsVOList;
+
+ /**
+ * 商品名称
+ */
+ @ApiModelProperty("商品名称")
+ private String goodsName;
+
+ /**
+ * 商品规格名称
+ */
+ @ApiModelProperty("商品规格名称")
+ private String goodsAttrName;
+
+ @ApiModelProperty(value = "店铺名称")
+ private String storeName;
+
+ @ApiModelProperty(value = "订单金额")
+ private BigDecimal totalAmount;
+
+ @ApiModelProperty(value = "自提点名称")
+ private String pointName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFundsOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFundsOrderVO.java
new file mode 100644
index 0000000..84c0a67
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFundsOrderVO.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("商户资金订单信息")
+public class ComShopFundsOrderVO {
+
+ @ApiModelProperty("金额")
+ // @JsonFormat(pattern = "0.00", shape = JsonFormat.Shape.STRING)
+ // @JsonSerialize(using = SerializerBigDecimal.class)
+ private BigDecimal totalAmount;
+
+ @ApiModelProperty("支付时间")
+ private String payTime;
+
+ @ApiModelProperty("订单编号")
+ private String orderNo;
+
+ @ApiModelProperty("支付方式")
+ private String payType;
+
+ @ApiModelProperty("收支类型")
+ private String type;
+
+ @ApiModelProperty("订单ID")
+ private long id;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFundsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFundsVO.java
new file mode 100644
index 0000000..75edfde
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFundsVO.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.math.BigDecimal;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("商户资金统计信息")
+public class ComShopFundsVO {
+
+ @ApiModelProperty(value = "当日收入")
+ private BigDecimal todayTotal;
+
+ @ApiModelProperty(value = "本周收入")
+ private BigDecimal weekTotal;
+
+ @ApiModelProperty(value = "本月收入")
+ private BigDecimal monthTotal;
+
+ @JsonIgnore
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopGoodsAttrVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopGoodsAttrVO.java
new file mode 100644
index 0000000..af5f793
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopGoodsAttrVO.java
@@ -0,0 +1,77 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 商品规格信息
+ */
+@Data
+@ApiModel("商品规格信息")
+public class ComShopGoodsAttrVO {
+
+ /**
+ * 商品规格id
+ */
+ @ApiModelProperty("商品规格id")
+ private Long id;
+
+ /**
+ * 商品id
+ */
+ @ApiModelProperty("商品id")
+ private Long goodsId;
+
+ /**
+ * 店铺id
+ */
+ @ApiModelProperty("店铺id")
+ private Long storeId;
+
+ /**
+ * 商品名称
+ */
+ @ApiModelProperty("商品名称")
+ private String goodsName;
+
+ /**
+ * 商品规格
+ */
+ @ApiModelProperty("商品规格")
+ private String goodsAttr;
+
+ /**
+ * 商品规格库存
+ */
+ @ApiModelProperty("商品规格库存")
+ private Integer stock;
+
+ /**
+ * 商品规格销量
+ */
+ @ApiModelProperty("商品规格销量")
+ private Integer sale;
+
+ /**
+ * 商品规格图
+ */
+ @ApiModelProperty("商品规格图")
+ private String attrPic;
+
+ /**
+ * 是否是默认规格（1.是 2.否）
+ */
+ @ApiModelProperty("是否是默认规格（1.是 2.否）")
+ private Integer isDefault;
+
+ /**
+ * 规格价格
+ */
+ @ApiModelProperty("规格价格")
+ private BigDecimal price;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopGoodsVO.java
new file mode 100644
index 0000000..19a862f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopGoodsVO.java
@@ -0,0 +1,121 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 商品信息
+ */
+@Data
+@ApiModel("商品信息")
+public class ComShopGoodsVO {
+
+ /**
+ * 商品id
+ */
+ @ApiModelProperty("商品id")
+ private Long id;
+
+ /**
+ * 商品名称
+ */
+ @ApiModelProperty("商品名称")
+ private String name;
+
+ /**
+ * 店铺id
+ */
+ @ApiModelProperty("店铺id")
+ private Long storeId;
+
+ /**
+ * 商品主图
+ */
+ @ApiModelProperty("商品主图")
+ private String goodsPic;
+
+ /**
+ * 商品展示图
+ */
+ @ApiModelProperty("商品展示图")
+ private String images;
+
+ /**
+ * 商品状态(1.出售中 2.已下架 3.回收站)
+ */
+ @ApiModelProperty("商品状态(1.出售中 2.已下架 3.回收站)")
+ private Integer status;
+
+ /**
+ * 商品销量
+ */
+ @ApiModelProperty("商品销量")
+ private Integer sale;
+
+ /**
+ * 商品原价
+ */
+ @ApiModelProperty("商品原价")
+ private BigDecimal originalPrice;
+
+ /**
+ * 商品现价
+ */
+ @ApiModelProperty("商品现价")
+ private BigDecimal price;
+
+ /**
+ * 商品单位
+ */
+ @ApiModelProperty("商品单位")
+ private String unit;
+
+ /**
+ * 商品排序
+ */
+ @ApiModelProperty("商品排序")
+ private Integer order;
+
+ /**
+ * 商品总库存
+ */
+ @ApiModelProperty("商品总库存")
+ private Integer stock;
+
+ /**
+ * 商品详情
+ */
+ @ApiModelProperty("商品详情")
+ private String details;
+
+ /**
+ * 配送方式（1.商家配送 2.快递物流）
+ */
+ @ApiModelProperty("配送方式（1.商家配送 2.快递物流）")
+ private Integer deliveryType;
+
+ /**
+ * 商品规格列表
+ */
+ @ApiModelProperty("商品规格列表")
+ private List<ComShopGoodsAttrVO> goodsAttrList;
+
+ /**
+ * 店铺信息
+ */
+ @ApiModelProperty("商品店铺信息")
+ private PageShopStoreVO shopStoreVO;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopHiddenConfVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopHiddenConfVO.java
new file mode 100644
index 0000000..780443c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopHiddenConfVO.java
@@ -0,0 +1,16 @@
+package com.panzhihua.common.model.vos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("订单创建返回参数")
+public class ComShopHiddenConfVO {
+
+ @ApiModelProperty(value = "id")
+ private Long id;
+ @ApiModelProperty(value = "是否隐藏所有商家 0 否 1是")
+ private String hidden;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderCountVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderCountVO.java
new file mode 100644
index 0000000..815ea72
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderCountVO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.vos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @auther yh
+ * @create 2022-11-08 17:25:45
+ * @describe 统计订单数VO
+ */
+@Data
+@ApiModel("统计订单数VO")
+public class ComShopOrderCountVO {
+
+
+
+ /**
+ * 订单状态(1.等待配送 2.配送中 3.待收货 4.待评价 5.已完成 6.已取消 7.已退款)
+ */
+ @ApiModelProperty("订单状态(1.等待配送 2.配送中 3.待收货 4.待评价 5.已完成 6.已取消 7.已退款 8.总订单)")
+ private Integer status;
+
+ /**
+ * 订单数量
+ */
+ @ApiModelProperty("订单数量")
+ private Integer amount;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderGoodsVO.java
new file mode 100644
index 0000000..a154e36
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderGoodsVO.java
@@ -0,0 +1,75 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 订单预览商品参数
+ */
+@Data
+@ApiModel("订单预览商品参数")
+public class ComShopOrderGoodsVO {
+
+ /**
+ * 商品名称
+ */
+ @ApiModelProperty(value = "商品名称")
+ private String goodsName;
+
+ /**
+ * 商品图片
+ */
+ @ApiModelProperty(value = "商品图片")
+ private String goodsPic;
+
+ /**
+ * 商品价格
+ */
+ @ApiModelProperty(value = "商品价格")
+ private BigDecimal price;
+
+ /**
+ * 商品数量
+ */
+ @ApiModelProperty(value = "商品数量")
+ private Integer num;
+
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long goodsId;
+
+ /**
+ * 商品规格id
+ */
+ @ApiModelProperty(value = "商品规格id")
+ private Long goodsAttrId;
+
+ /**
+ * 商品规格
+ */
+ @ApiModelProperty(value = "商品规格")
+ private String goodsAttr;
+
+ /**
+ * 商品状态(1.出售中 2.已下架 3.已删除)
+ */
+ @ApiModelProperty(value = "商品状态(1.出售中 2.已下架 3.已删除)")
+ private Integer goodsStatus = 1;
+
+ /**
+ * 商品状态(1.出售中 2.已下架 3.已删除)
+ */
+ public interface goodsStatus {
+ int csz = 1;
+ int yxj = 2;
+ int ysc = 3;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderOperateVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderOperateVO.java
new file mode 100644
index 0000000..70328f6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderOperateVO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("订单操作日志")
+public class ComShopOrderOperateVO {
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+
+ @ApiModelProperty(value = "操作人")
+ private String operationBy;
+
+ @ApiModelProperty(value = "操作时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date operationTime;
+
+ @ApiModelProperty(value = "操作类型(1.创建订单 2.取消订单 3.订单支付 4.订单发货 5.订单完成)")
+ private Integer operationType;
+
+ @ApiModelProperty(value = "操作内容")
+ private String operationContent;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderPageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderPageVO.java
new file mode 100644
index 0000000..0d831c9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderPageVO.java
@@ -0,0 +1,93 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("订单信息")
+public class ComShopOrderPageVO {
+
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+
+ @ApiModelProperty(value = "订单金额")
+ private BigDecimal orderTotal;
+
+ @ApiModelProperty(value = "店铺id")
+ private Long storeId;
+
+ @ApiModelProperty(value = "订单状态(1.待付款 2.代发货 3.待收货 4.待评价 5.已完成 6.已取消)")
+ private Integer status;
+
+ @ApiModelProperty(value = "支付状态(1.未支付 2.已支付)")
+ private Integer payStatus;
+
+ @ApiModelProperty(value = "用户收货地址id")
+ private Long receiverId;
+
+ @ApiModelProperty(value = "支付金额")
+ private BigDecimal payAmount;
+
+ @ApiModelProperty(value = "配送方式")
+ private Integer deliveryType;
+
+ @ApiModelProperty(value = "订单备注")
+ private String remark;
+
+ @ApiModelProperty(value = "支付方式（1.微信支付）")
+ private Integer payType;
+
+ @ApiModelProperty(value = "支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date payTime;
+
+ @ApiModelProperty(value = "订单发货状态（1.未发货 2.已发货）")
+ private Integer deliveryStatus;
+
+ @ApiModelProperty(value = "物流公司")
+ private String logisticsCompany;
+
+ @ApiModelProperty(value = "物流单号")
+ private String logisticsNo;
+
+ @ApiModelProperty(value = "下单时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "支付单号")
+ private String payNo;
+
+ @ApiModelProperty(value = "发货时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date deliveryTime;
+
+ @ApiModelProperty(value = "收货时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date receivingTime;
+
+ @ApiModelProperty(value = "订单下商品信息")
+ private List<ComShopOrderGoodsVO> orderGoodsVOList;
+
+ @ApiModelProperty(value = "订单下店铺信息")
+ private PageShopStoreVO shopStoreVO;
+
+ @ApiModelProperty(value = "用户收货地址id")
+ private ComShopUserAddressVO userAddressVO;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodsName;
+
+ @ApiModelProperty(value = "订单日志")
+ private List<ComShopOrderOperateVO> logs;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderPreviewVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderPreviewVO.java
new file mode 100644
index 0000000..5938545
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderPreviewVO.java
@@ -0,0 +1,48 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 订单预览返回参数
+ */
+@Data
+@ApiModel("订单预览返回参数")
+public class ComShopOrderPreviewVO {
+
+ /**
+ * 用户默认收货地址
+ */
+ @ApiModelProperty(value = "用户默认收货地址")
+ private ComShopUserAddressVO userAddressVO;
+
+ /**
+ * 店铺信息
+ */
+ @ApiModelProperty(value = "店铺信息")
+ private PageShopStoreVO shopStoreVO;
+
+ /**
+ * 待购买商品列表
+ */
+ @ApiModelProperty(value = "待购买商品列表")
+ private List<ComShopOrderGoodsVO> orderGoodsList;
+
+ /**
+ * 订单总金额
+ */
+ @ApiModelProperty(value = "订单总金额")
+ private BigDecimal orderTotal;
+
+ /**
+ * 订单商品总数量
+ */
+ @ApiModelProperty(value = "订单商品总数量")
+ private Integer orderGoodsTotal;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderSearchVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderSearchVO.java
new file mode 100644
index 0000000..a1ac37f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderSearchVO.java
@@ -0,0 +1,103 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther cedoo
+ * @create 2021-4-17 17:54:27
+ * @describe 订单表搜索结果类
+ */
+
+@Data
+@ApiModel("商品订单")
+public class ComShopOrderSearchVO implements Serializable {
+
+ @ApiModelProperty("订单id")
+ private Long id;
+
+ @ApiModelProperty("店铺id")
+ private Long storeId;
+
+ @ApiModelProperty("店铺名称")
+ private String storeName;
+
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ @ApiModelProperty("用户账号")
+ private Long userName;
+
+ @ApiModelProperty("订单号")
+ private String orderNo;
+
+ @ApiModelProperty("支付单号")
+ private String payNo;
+
+ @ApiModelProperty("微信交易单号")
+ private String wxTardeNo;
+
+ @ApiModelProperty(value = "订单状态(1.等待配送 2.配送中 3.待收货 4.待评价 5.已完成 6.已取消 7.已退款)")
+ private Integer status;
+
+ @ApiModelProperty("支付状态(1.未支付 2.已支付)")
+ private Integer payStatus;
+
+ @ApiModelProperty("订单收货人id")
+ private Long receiverId;
+
+ @ApiModelProperty("收货人")
+ private String receiverName;
+
+ @ApiModelProperty("电话")
+ private String receiverPhone;
+
+ @ApiModelProperty("商品")
+ private String goodsName;
+
+ @ApiModelProperty("订单总金额")
+ private BigDecimal totalAmount;
+
+ @ApiModelProperty("优惠总金额")
+ private BigDecimal discountAmount;
+
+ @ApiModelProperty("支付总金额")
+ private BigDecimal payAmount;
+
+ @ApiModelProperty("支付方式（1.微信支付）")
+ private Integer payType;
+
+ @ApiModelProperty("支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date payTime;
+
+ @ApiModelProperty("配送方式（1.商家配送 2.快递物流）")
+ private Integer deliveryType;
+
+ @ApiModelProperty("订单发货状态（1.未发货 2.已发货）")
+ private Integer deliveryStatus;
+
+ @ApiModelProperty("物流公司")
+ private String logisticsCompany;
+
+ @ApiModelProperty("物流单号")
+ private String logisticsNo;
+
+ @ApiModelProperty("下单时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("自提点地址")
+ private String address;
+
+ @ApiModelProperty("自提点名称")
+ private String pointName;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderStoreIdCountVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderStoreIdCountVO.java
new file mode 100644
index 0000000..39b0725
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderStoreIdCountVO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.vos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther yh
+ * @create 2022-11-08 17:25:45
+ * @describe 统计订单数VO
+ */
+@Data
+@ApiModel("根据商品统计日、月、年、累计订单量")
+public class ComShopOrderStoreIdCountVO {
+
+
+
+ /**
+ * 订
+ */
+ @ApiModelProperty("订单数量")
+ private Integer countNum;
+
+ /**
+ * 统计名称
+ */
+ @ApiModelProperty("统计名称")
+ private String countName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderStoreIdNumVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderStoreIdNumVO.java
new file mode 100644
index 0000000..f18f40a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderStoreIdNumVO.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.vos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @auther yh
+ * @create 2022-11-08 17:25:45
+ * @describe 商家后台经营数据统计
+ */
+@Data
+@ApiModel("商家后台经营数据统计")
+public class ComShopOrderStoreIdNumVO {
+
+
+
+ /**
+ * 订
+ */
+ @ApiModelProperty("订单数量")
+ private BigDecimal countNum;
+
+ /**
+ * 统计名称
+ */
+ @ApiModelProperty("统计名称")
+ private String countName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderVO.java
new file mode 100644
index 0000000..5dc03cf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("订单创建返回参数")
+public class ComShopOrderVO {
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+
+ @ApiModelProperty(value = "订单ID")
+ private Long orderId;
+
+ @ApiModelProperty(value = "订单金额")
+ private BigDecimal orderTotal;
+
+ @ApiModelProperty(value = "请求支付返回参数")
+ private String payResult;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopSysConfVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopSysConfVO.java
new file mode 100644
index 0000000..489f19f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopSysConfVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("订单创建返回参数")
+public class ComShopSysConfVO {
+
+ @ApiModelProperty(value = "id")
+ private Long id;
+ @ApiModelProperty(value = "配置名称")
+ private String name;
+ @ApiModelProperty(value = "配置备注")
+ private String note;
+ @ApiModelProperty(value = "配置值")
+ private String val;
+ @ApiModelProperty(value = "是否生效(0 否 1 是)")
+ private String enabled;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopUserAddressVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopUserAddressVO.java
new file mode 100644
index 0000000..6f4806b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopUserAddressVO.java
@@ -0,0 +1,88 @@
+package com.panzhihua.common.model.vos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 用户收获地址信息
+ */
+@Data
+@ApiModel("用户收获地址信息")
+public class ComShopUserAddressVO {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty("用户收获地址id")
+ private Long id;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ /**
+ * 收货人名称
+ */
+ @ApiModelProperty("收货人名称")
+ private String name;
+
+ /**
+ * 收货人手机号
+ */
+ @ApiModelProperty("收货人手机号")
+ private String phone;
+
+ /**
+ * 收货人省份编码
+ */
+ @ApiModelProperty("收货人省份编码")
+ private String provinceCode;
+
+ /**
+ * 收货人省份名称
+ */
+ @ApiModelProperty("收货人省份名称")
+ private String provinceName;
+
+ /**
+ * 收货人城市编码
+ */
+ @ApiModelProperty("收货人城市编码")
+ private String cityCode;
+
+ /**
+ * 收货人城市名称
+ */
+ @ApiModelProperty("收货人城市名称")
+ private String cityName;
+
+ /**
+ * 收货人区县编码
+ */
+ @ApiModelProperty("收货人区县编码")
+ private String districtCode;
+
+ /**
+ * 收货人区县名称
+ */
+ @ApiModelProperty("收货人区县名称")
+ private String districtName;
+
+ /**
+ * 收货人详细地址
+ */
+ @ApiModelProperty("收货人详细地址")
+ private String detailAddress;
+
+ /**
+ * 是否是默认地址(1.是 2.否)
+ */
+ @ApiModelProperty("是否是默认地址(1.是 2.否)")
+ private Integer isDefault;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/LoginMerchantUserInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/LoginMerchantUserInfoVO.java
new file mode 100644
index 0000000..be9798f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/LoginMerchantUserInfoVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.shop;
+
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: LoginMerchantUserInfoVO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 便民服务商家登录信息
+ * @author: hans
+ * @date: 2021/09/17 18:46
+ */
+@Data
+@ApiModel(value = "便民服务商家登录信息")
+public class LoginMerchantUserInfoVO extends LoginUserInfoVO {
+ @ApiModelProperty("用户商铺信息")
+ private ConvenientMerchantVO merchantInfo;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/LoginStoreUserInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/LoginStoreUserInfoVO.java
new file mode 100644
index 0000000..5f5a5fb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/LoginStoreUserInfoVO.java
@@ -0,0 +1,169 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
+import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
+import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 登录用户信息
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 09:35
+ **/
+@Data
+@ApiModel(value = "用户信息")
+public class LoginStoreUserInfoVO {
+
+ @ApiModelProperty("user_id")
+ private Long userId;
+
+ @ApiModelProperty("微信会话密钥")
+ private String sessionKey;
+
+ @ApiModelProperty("用户在开放平台的唯一标识符")
+ private String unionid;
+
+ @ApiModelProperty("登录账户")
+ private String account;
+
+ @ApiModelProperty("登录密码")
+ private String password;
+
+ @ApiModelProperty("微信小程序唯一标识")
+ private String openid;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("昵称")
+ private String nickName;
+
+ @ApiModelProperty("真实名字")
+ @NotBlank(groups = {AddGroup.class}, message = "真实名字不能为空")
+ private String name;
+
+ @ApiModelProperty("社区id")
+ @Min(value = 1, groups = {PutGroup.class}, message = "社区id不能为空")
+ @NotNull(groups = {PutGroup.class}, message = "社区id不能为空")
+ private Long communityId;
+
+ @ApiModelProperty("社区名字")
+ private String communityName;
+
+ @ApiModelProperty("性别 1 男 2 女")
+ private Integer sex;
+
+ @ApiModelProperty("是否社区团队或者党委或系统管理人员 1 是 2 否")
+ private Integer ismemberrole;
+
+ @ApiModelProperty("生日")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date birthday;
+
+ @ApiModelProperty("头像")
+ private String imageUrl;
+
+ @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台")
+ private Integer type;
+
+ @ApiModelProperty("职业")
+ private String job;
+
+ @ApiModelProperty("是否志愿者 0否 1 是")
+ private Integer isVolunteer;
+
+ @ApiModelProperty("是否党员 0 否 1 是")
+ private Integer isPartymember;
+
+ @ApiModelProperty("1 启用 2 禁用")
+ private Integer status;
+
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ @ApiModelProperty("最后登录时间")
+ private Date lastLoginTime;
+
+ @ApiModelProperty("角色集合")
+ private Set<String> roles;
+
+ @ApiModelProperty("权限集合")
+ private Set<String> permissions;
+
+ @ApiModelProperty("人脸采集照片url")
+ private String faceUrl;
+
+ @ApiModelProperty("驳回原因")
+ private String rejectReson;
+
+ @ApiModelProperty("身份证号")
+ @NotBlank(groups = {AddGroup.class}, message = "身份证号不能为空")
+ private String idCard;
+
+ @ApiModelProperty("标签 多个用,隔开")
+ private String tags;
+
+ @ApiModelProperty("家庭id")
+ private Long familyId;
+
+ @ApiModelProperty(value = "分页每页数量", example = "10")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "分页当前记录数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty("人脸采集审核状态 0 待审核 1 审核通过 2驳回")
+ private Integer faceState;
+
+ @ApiModelProperty("操作类型 1通过 2驳回 3删除")
+ private Integer operationType;
+
+ @ApiModelProperty("家庭成员")
+ private List<ComMngFamilyInfoVO> comMngFamilyInfoVOS;
+
+ @ApiModelProperty("房屋信息")
+ private List<ComMngStructHouseVO> comMngStructHouseVOS;
+
+ @ApiModelProperty("用户小区id")
+ @Min(value = 1, groups = {PutGroup.class}, message = "用户小区id不能为空")
+ @NotNull(groups = {PutGroup.class}, message = "用户小区id不能为空")
+ private Long areaId;
+
+ @ApiModelProperty("用户所在社区信息")
+ private ComActVO comActVO;
+
+ @ApiModelProperty("小区信息")
+ private ComMngStructAreaVO comMngStructAreaVO;
+
+ @ApiModelProperty("0 未申请 1 申请中 2 通过 3 驳回")
+ private Integer volunteerStatus;
+
+ @ApiModelProperty("是否注册 0 否 1 是")
+ private Integer isRegister;
+
+ @ApiModelProperty("年龄")
+ private Integer age;
+
+ @ApiModelProperty("政治面貌：1 - 党员；2 - 团员；3 - 群众")
+ private Integer politicalOutlook;
+
+ @ApiModelProperty("用户商铺信息")
+ private ShopStoreVO storeInfo;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/OrderStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/OrderStatisticsVO.java
new file mode 100644
index 0000000..5926d6a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/OrderStatisticsVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 订单统计结果
+ */
+@Data
+@ApiModel("订单统计结果")
+public class OrderStatisticsVO {
+
+ @ApiModelProperty(value = "待付款订单数")
+ private Integer paymentNum = 0;
+
+ @ApiModelProperty(value = "待发货订单数")
+ private Integer deliverNum = 0;
+
+ @ApiModelProperty(value = "待收货订单数")
+ private Integer receivingNum = 0;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopFlowerGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopFlowerGoodsVO.java
new file mode 100644
index 0000000..23c6958
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopFlowerGoodsVO.java
@@ -0,0 +1,98 @@
+package com.panzhihua.common.model.vos.shop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @auther yh
+ * @describe * @describe 商品VO
+ */
+@Data
+@ApiModel("商品")
+public class PageShopFlowerGoodsVO {
+
+ @ApiModelProperty("商品id")
+ private Long id;
+
+ @ApiModelProperty("商品分类id")
+ private Long typeId;
+
+ @ApiModelProperty("商品名称")
+ private String name;
+
+ @ApiModelProperty("商铺名称")
+ private String storeName;
+
+ @ApiModelProperty("店铺id")
+ private Long storeId;
+
+ @ApiModelProperty("商品主图")
+ private String goodsPic;
+
+ @ApiModelProperty("商品展示图")
+ private String images;
+
+ @ApiModelProperty("商品状态(1.上架 2.已下架 3.回收站)")
+ private Integer status;
+
+ @ApiModelProperty("商品销量")
+ private Integer sale;
+
+ @ApiModelProperty("商品原价")
+ private BigDecimal originalPrice;
+
+ @ApiModelProperty("商品现价")
+ private BigDecimal price;
+
+ @ApiModelProperty("商品单位")
+ private String unit;
+
+ @ApiModelProperty("商品排序")
+ private Integer order;
+
+ @ApiModelProperty("商品总库存")
+ private Integer stock;
+
+ @ApiModelProperty("商品详情")
+ private String details;
+
+ @ApiModelProperty("商品备注")
+ private String remark;
+
+ @ApiModelProperty("商品描述")
+ private String goodsDescribe;
+
+ @ApiModelProperty("配送方式（1.自提 2.快递）")
+ private String deliveryType;
+
+ @ApiModelProperty("删除状态（1.未删除 2.已删除）")
+ private Integer deleteStatus;
+
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ @ApiModelProperty("修改时间")
+ private Date updateAt;
+
+ @ApiModelProperty("规格")
+ private List<AddShopFlowerGoodsAttrVO> goodsAttrs;
+
+ @ApiModelProperty("所属分类")
+ private String categoryName;
+ /**
+ * 浏览量
+ */
+ @ApiModelProperty("浏览量")
+ private Integer viewNum;
+
+ /**
+ * 规格名称
+ */
+ @ApiModelProperty("规格名称")
+ private String goodsAttrName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopGoodsVO.java
new file mode 100644
index 0000000..1744571
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopGoodsVO.java
@@ -0,0 +1,84 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe * @describe 商品VO
+ */
+@Data
+@ApiModel("商品")
+public class PageShopGoodsVO {
+
+ @ApiModelProperty("商品id")
+ private Long id;
+
+ @ApiModelProperty("商品分类id")
+ private Long typeId;
+
+ @ApiModelProperty("商品名称")
+ private String name;
+
+ @ApiModelProperty("商铺名称")
+ private String storeName;
+
+ @ApiModelProperty("店铺id")
+ private Long storeId;
+
+ @ApiModelProperty("商品主图")
+ private String goodsPic;
+
+ @ApiModelProperty("商品展示图")
+ private String images;
+
+ @ApiModelProperty("商品状态(1.出售中 2.已下架 3.回收站)")
+ private Integer status;
+
+ @ApiModelProperty("商品销量")
+ private Integer sale;
+
+ @ApiModelProperty("商品原价")
+ private BigDecimal originalPrice;
+
+ @ApiModelProperty("商品现价")
+ private BigDecimal price;
+
+ @ApiModelProperty("商品单位")
+ private String unit;
+
+ @ApiModelProperty("商品排序")
+ private Integer order;
+
+ @ApiModelProperty("商品总库存")
+ private Integer stock;
+
+ @ApiModelProperty("商品详情")
+ private String details;
+
+ @ApiModelProperty("商品备注")
+ private String remark;
+
+ @ApiModelProperty("商品描述")
+ private String goodsDescribe;
+
+ @ApiModelProperty("配送方式（1.商家配送 2.快递物流）")
+ private Integer deliveryType;
+
+ @ApiModelProperty("删除状态（1.未删除 2.已删除）")
+ private Integer deleteStatus;
+
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ @ApiModelProperty("修改时间")
+ private Date updateAt;
+
+ @ApiModelProperty("规格")
+ private List<AddShopGoodsAttrVO> goodsAttts;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopStoreVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopStoreVO.java
new file mode 100644
index 0000000..e652994
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopStoreVO.java
@@ -0,0 +1,73 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:02:14
+ * @describe 店铺VO
+ */
+@Data
+@ApiModel("商城店铺")
+public class PageShopStoreVO {
+
+ @ApiModelProperty("商家、联系人")
+ private String contacts;
+
+ @ApiModelProperty("店铺登陆账号")
+ private String storeAccount;
+
+ @ApiModelProperty("联系方式")
+ private String phone;
+
+ @ApiModelProperty("店铺状态（1.启用 2.禁用）")
+ private Integer status;
+
+ @ApiModelProperty("店铺id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("店铺名称")
+ private String name;
+
+ @ApiModelProperty("店铺logo")
+ private String logo;
+
+ @ApiModelProperty("配送方式（1.商家配送 2.快递物流）")
+ private Integer deliveryType;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("店铺详情")
+ private String storeDetail;
+
+ @ApiModelProperty("店铺描述")
+ private String storeDescribe;
+
+ @ApiModelProperty("店铺销量")
+ private Integer sale;
+
+ @ApiModelProperty("店铺登陆密码")
+ private String storePassword;
+
+ @ApiModelProperty("店内商品列表")
+ private List<ComShopGoodsVO> goodsList;
+
+ @ApiModelProperty("该商家是否订单完成")
+ private Boolean orderDone;
+
+ @ApiModelProperty("删除状态（1.未删除 2.已删除）")
+ private Integer deleteStatus;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopOperLogVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopOperLogVO.java
new file mode 100644
index 0000000..d0e18b1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopOperLogVO.java
@@ -0,0 +1,85 @@
+package com.panzhihua.common.model.vos.shop;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 商城后台操作日志
+ * @author: cedoo
+ * @create: 2021-4-17 10:11:45
+ **/
+@Data
+@ApiModel("操作日志")
+public class ShopOperLogVO {
+
+ @ApiModelProperty("日志主键")
+ private Long operId;
+
+ @ApiModelProperty("模块标题")
+ private String title;
+
+ @ApiModelProperty("业务类型")
+ private Integer businessType;
+
+ @ApiModelProperty("业务类型名称")
+ private String businessName;
+
+ @ApiModelProperty("方法名称")
+ private String method;
+
+ @ApiModelProperty("请求方式")
+ private String requestMethod;
+
+ @ApiModelProperty("操作类别（0其它 1后台用户 2手机端用户）")
+ private Integer operatorType;
+
+ @ApiModelProperty("操作人员")
+ private String operName;
+
+ @ApiModelProperty("部门名称")
+ private String deptName;
+
+ @ApiModelProperty("请求url")
+ private String operUrl;
+
+ @ApiModelProperty("主机地址")
+ private String operIp;
+
+ @ApiModelProperty("操作地点")
+ private String operLocation;
+
+ @ApiModelProperty("请求参数")
+ private String operParam;
+
+ @ApiModelProperty("返回参数")
+ private String jsonResult;
+
+ @ApiModelProperty("操作状态（0正常 1异常）")
+ private Integer status;
+
+ @ApiModelProperty("错误消息")
+ private String errorMsg;
+
+ @ApiModelProperty("操作时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date operTime;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("操作账户")
+ private String account;
+
+ @ApiModelProperty("用户ID")
+ private Long userId;
+
+ @ApiModelProperty("用户名")
+ private String userName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopStoreVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopStoreVO.java
new file mode 100644
index 0000000..2af296c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopStoreVO.java
@@ -0,0 +1,80 @@
+package com.panzhihua.common.model.vos.shop;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@Data
+@ApiModel("商家")
+public class ShopStoreVO {
+
+ @ApiModelProperty("商家姓名")
+ private String contacts;
+
+ @ApiModelProperty("店铺名称")
+ @NotBlank(message = "店铺名称不能为空")
+ @Size(max = 15, min = 1, message = "限制15字")
+ private String name;
+
+ @ApiModelProperty("联系方式")
+ @NotBlank(message = "手机号码不能为空")
+ @NotNull(message = "手机号不能为空")
+ @Length(min = 11, max = 11, message = "手机号只能为11位")
+ @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "手机号格式有误")
+ private String phone;
+
+ @ApiModelProperty("店铺登陆账号")
+ // @Pattern(message="【密码】格式为6-16个字符，英文，数字，且必须包含英文和数字",regexp="^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$")
+ @NotBlank(message = "店铺登陆账号不能为空")
+ private String storeAccount;
+
+ @ApiModelProperty("店铺登陆密码")
+ @NotBlank(message = "店铺登陆密码不能为空")
+ @Pattern(message = "【密码】格式为6-16个字符，英文，数字，且必须包含英文和数字", regexp = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$")
+ private String storePassword;
+
+ @ApiModelProperty("配送方式（1.商家配送 2.快递物流）")
+ @NotNull(message = "配送方式（1.商家配送 2.快递物流）不能为空")
+ private Integer deliveryType;
+
+ @ApiModelProperty("店铺logo")
+ private String logo;
+ /**
+ * 保存时添加sys_user所需
+ */
+ @ApiModelProperty("sysUserId")
+ private Long sysUserId;
+
+ @ApiModelProperty(" 店铺状态（1.启用 2.禁用）")
+ private Integer status;
+
+ /**
+ * 当前登陆用户Id
+ */
+ @JsonIgnore
+ private Long loginUserId;
+
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("商家简介")
+ @Size(max = 25, min = 0, message = "简介长度不符合！")
+ private String storeDescribe;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/union/StructuredVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/union/StructuredVO.java
new file mode 100644
index 0000000..70aec17
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/union/StructuredVO.java
@@ -0,0 +1,89 @@
+package com.panzhihua.common.model.vos.union;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("结构化数据类")
+@Data
+public class StructuredVO {
+
+ @ApiModelProperty("跟踪 ID")
+ private String traceId;
+
+ @ApiModelProperty("结构化 ID")
+ private String structuredId;
+
+ @ApiModelProperty("外部设备 ID")
+ private String extDeviceId;
+
+ @ApiModelProperty("设备编码")
+ private String deviceCode;
+
+ @ApiModelProperty("平台编码")
+ private String platformCode;
+
+ @ApiModelProperty("应用密钥")
+ private String appKey;
+
+ @ApiModelProperty("能力编码")
+ private String abilityCode;
+
+ @ApiModelProperty("能力版本")
+ private String abilityVersion;
+
+ @ApiModelProperty("API ID")
+ private Long apiId;
+
+ @ApiModelProperty("创建时间")
+ private Long gmtCreate;
+
+ @ApiModelProperty("设备名称")
+ private String deviceName;
+
+ @ApiModelProperty("设备 ID")
+ private Long deviceId;
+
+ @ApiModelProperty("组织 ID")
+ private Long orgId;
+
+ @ApiModelProperty("结构化数据")
+ private String structuredData;
+
+ @ApiModelProperty("图片路径")
+ private String picPath;
+
+ @ApiModelProperty("图片 Base64")
+ private String imageBase64;
+
+ @ApiModelProperty("视频 Base64")
+ private String videoBase64;
+
+ @ApiModelProperty("视频路径")
+ private String videoPath;
+
+ @ApiModelProperty("能力名称")
+ private String abilityName;
+
+ @ApiModelProperty("能力 ID")
+ private Long abilityId;
+
+ @ApiModelProperty("识别结果")
+ private String recognitionResult;
+
+ @ApiModelProperty("帧时间")
+ private String frameTime;
+
+ @ApiModelProperty("API 参数")
+ private String apiParams;
+
+ @ApiModelProperty("平台代码")
+ private String plaformCode;
+
+ @ApiModelProperty("预设图像路径")
+ private String presetImagePath;
+
+ @ApiModelProperty("事件临时名称")
+ private String eventTempName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java
new file mode 100644
index 0000000..ddebd08
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java
@@ -0,0 +1,116 @@
+package com.panzhihua.common.model.vos.user;
+
+import java.util.Date;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Pattern;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 管理员账户
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-24 09:31
+ **/
+@Data
+@ApiModel("管理员账户")
+public class AdministratorsUserVO {
+
+ @ApiModelProperty("账户")
+ @Pattern(groups = {AddGroup.class}, message = "【账户】2-20个字符，英文，数字", regexp = "^[0-9A-Za-z]{2,20}$")
+ private String account;
+
+ @ApiModelProperty("密码")
+ @Pattern(groups = {AddGroup.class}, message = "密码强度过低，请将密码长度设置为8-16位，且包含字母、数字、字符。",
+ regexp = "^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\\W_!@#$%^&*.`~()-+=]+$)(?![a-z0-9]+$)(?![a-z\\W_!@#$%^&.*`~()-+=]+$)(?![0-9\\W_!@#$%^.&*`~()-+=]+$)[a-zA-Z0-9\\W_!@#$%^&.*`~()-+=]{8,16}$")
+ private String password;
+
+ @ApiModelProperty("用户名称")
+ @Pattern(groups = {AddGroup.class}, message = "【用户名称】2-16个字符，英文，中文，数字", regexp = "^[0-9A-Za-z\u4e00-\u9fa5]{2,16}$")
+ private String name;
+
+ @ApiModelProperty("角色")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @Min(value = 1, groups = {AddGroup.class}, message = "角色不能为空")
+ private Long roleId;
+
+ @ApiModelProperty("手机号")
+ @Pattern(groups = {AddGroup.class}, message = "【手机号】格式错误", regexp = "1[3|4|5|7|8][0-9]\\d{8}")
+ private String phone;
+
+ @ApiModelProperty("状态 1 启用 2 禁用")
+ @Min(groups = {AddGroup.class}, value = 1, message = "账户状态不能为空")
+ private Integer status;
+
+ @ApiModelProperty(value = "人员所在平台 用户类型 1 小程序 2 运营平台 3 社区平台 4 街道平台 5 商家", hidden = true)
+ private Integer type;
+
+ @ApiModelProperty(value = "小区id", hidden = true)
+ private Long areaId;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "用户主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+
+ @ApiModelProperty(value = "当前页数")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "每页记录数")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "最后登录时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date lastLoginTime;
+
+ @ApiModelProperty(value = "角色名字")
+ private String roleName;
+
+ @ApiModelProperty(value = "商铺名称")
+ private String shopStoreName;
+
+ @ApiModelProperty(value = "商铺Id")
+ private String shopStorePhone;
+
+ @ApiModelProperty(value = "用户昵称")
+ private String nickName;
+
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ @ApiModelProperty("头像")
+ private String imageUrl;
+
+ private String areaCode;
+
+ @ApiModelProperty(value = "街道id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long streetId;
+
+ @ApiModelProperty(value = "三社账户类型 1街道 2社会组织 3社会组织成员")
+ private Integer socialType;
+
+ @ApiModelProperty("社会组织id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long orgId;
+
+ @ApiModelProperty("绑定单位")
+ private String relationName;
+
+ private String appid;
+ private String loveIntegral;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AreaVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AreaVO.java
new file mode 100644
index 0000000..88ed712
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AreaVO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@ApiModel
+public class AreaVO implements Serializable {
+
+ @ApiModelProperty("区县名")
+ private String name;
+
+ @ApiModelProperty("区县code")
+ private Integer id;
+
+ @ApiModelProperty("下属街道列表")
+ private List<StreetVO> streetList;
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AreaVOS.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AreaVOS.java
new file mode 100644
index 0000000..ffc9c4e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AreaVOS.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+@Data
+@ApiModel
+public class AreaVOS implements Serializable {
+ @ApiModelProperty("区县名")
+ private String name;
+
+ @ApiModelProperty("区县code")
+ private Integer id;
+
+ @ApiModelProperty("下属街道列表")
+ private List<StreetVOS> childList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AreaVOStr.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AreaVOStr.java
new file mode 100644
index 0000000..dab06ba
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AreaVOStr.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@ApiModel
+public class AreaVOStr implements Serializable {
+ @ApiModelProperty("区县名")
+ private String name;
+
+ @ApiModelProperty("区县code")
+ private String id;
+
+ @ApiModelProperty("下属街道列表")
+ private List<StreetVOStr> childList;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ChangePasswordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ChangePasswordVO.java
new file mode 100644
index 0000000..3c08b43
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ChangePasswordVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.user;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Pattern;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 修改密码
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-07 10:23
+ **/
+@Data
+@ApiModel("修改密码")
+public class ChangePasswordVO {
+
+ @ApiModelProperty("旧密码")
+ @NotEmpty(message = "旧密码不能为空")
+ private String oldPassword;
+
+ @ApiModelProperty("新密码")
+ @NotBlank(message = "新密码不能为空")
+ @Pattern(message = "密码强度过低，请将密码长度设置为12-16位，且包含字母、数字、字符。", regexp = "^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\\W_!@#$%^&*.`~()-+=]+$)(?![a-z0-9]+$)(?![a-z\\W_!@#$%^&.*`~()-+=]+$)(?![0-9\\W_!@#$%^.&*`~()-+=]+$)[a-zA-Z0-9\\W_!@#$%^&.*`~()-+=]{12,16}$")
+ private String newPassword;
+
+ @ApiModelProperty(hidden = true, value = "当前登录用户id")
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComHouseMemberVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComHouseMemberVo.java
new file mode 100644
index 0000000..8a00d59
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComHouseMemberVo.java
@@ -0,0 +1,48 @@
+package com.panzhihua.common.model.vos.user;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("户主关系对象")
+@EncryptDecryptClass
+public class ComHouseMemberVo {
+
+ @ApiModelProperty("房屋成员用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long populId;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("手机号")
+ @EncryptDecryptField
+ // @Sensitive(strategy = SensitiveStrategy.PHONE)
+ private String phone;
+
+ @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
+ private String relation;
+
+ @ApiModelProperty("年龄")
+ private Integer age;
+
+ @ApiModelProperty("出生年月")
+ private String birthDay;
+
+ @ApiModelProperty("健康状况")
+ private String healthy;
+
+ @ApiModelProperty("身份证号")
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ApiModelProperty("工作单位")
+ private String workCompany;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java
new file mode 100644
index 0000000..95e8791
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java
@@ -0,0 +1,76 @@
+package com.panzhihua.common.model.vos.user;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 家庭
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-14 16:53
+ **/
+@Data
+@ApiModel("社区》社区管理》家庭信息")
+public class ComMngFamilyInfoVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("本人id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+
+ @ApiModelProperty("与本人关系")
+ @NotBlank(groups = {AddGroup.class}, message = "与本人关系不能为空")
+ private String relationship;
+
+ @ApiModelProperty("名字")
+ @NotBlank(groups = {AddGroup.class}, message = "名字不能为空")
+ private String name;
+
+ @ApiModelProperty("身份证号")
+ @NotBlank(groups = {AddGroup.class}, message = "身份证号不能为空")
+ private String idCard;
+
+ @ApiModelProperty("手机号")
+ @NotBlank(groups = {AddGroup.class}, message = "手机号不能为空")
+ private String phone;
+
+ @ApiModelProperty(value = "年龄", hidden = true)
+ private Integer age;
+
+ @ApiModelProperty("健康状况")
+ private String health;
+
+ @ApiModelProperty("工作")
+ private String job;
+
+ @ApiModelProperty("证件照（人像面）照片")
+ private String cardPhotoFront;
+
+ @ApiModelProperty("证件照（国徽面）照片")
+ private String cardPhotoBack;
+
+ @ApiModelProperty("户口本照片 逗号隔开")
+ private String familyBook;
+
+ @ApiModelProperty(value = "create_at", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "update_at", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java
new file mode 100644
index 0000000..0339f91
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java
@@ -0,0 +1,48 @@
+package com.panzhihua.common.model.vos.user;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("实有人口详情房屋信息")
+@EncryptDecryptClass
+public class ComMngHouseVo {
+
+ @ApiModelProperty("房屋id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long houseId;
+
+ @ApiModelProperty("人口id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long populId;
+
+ @ApiModelProperty("人和房屋关系’ (1.自住2、租住)(取字典表国家标准编码)")
+ private Integer relationId;
+
+ @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)(取字典表国家标准编码)")
+ private Integer relation;
+
+ @ApiModelProperty("房屋地址")
+ private String address;
+
+ @ApiModelProperty("房屋状态(1.自住 2.租住 3.其他)(取字典表国家标准编码)")
+ private Integer status;
+
+ @ApiModelProperty("是否居住地 1.是 0.否")
+ private Integer residence;
+
+ @ApiModelProperty("房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)(取字典表国家标准编码)")
+ private Integer purpose;
+
+ @ApiModelProperty("管控状态(1.常规 2.关注 3.管控)(取字典表国家标准编码)")
+ private Integer controlStatus;
+
+ @ApiModelProperty("关系主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngJobSetVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngJobSetVO.java
new file mode 100644
index 0000000..94f1748
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngJobSetVO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 工作类型
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-14 16:55
+ **/
+@Data
+@ApiModel("社区》社区管理》工作类型")
+public class ComMngJobSetVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("工作名称")
+ private String jobName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngTagVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngTagVO.java
new file mode 100644
index 0000000..53d35ca
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngTagVO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.vos.user;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 小程序用户
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-30 11:22
+ **/
+@Data
+@ApiModel("特殊群体标签管理")
+public class ComMngTagVO implements Serializable {
+
+ @ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("标签名称")
+ private String tagName;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("系统预置：1-是(不可编辑删除) 0-否")
+ private Integer sysFlag;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngUserTagVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngUserTagVO.java
new file mode 100644
index 0000000..d78591c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngUserTagVO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 用户标签
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-14 17:27
+ **/
+@Data
+@ApiModel("社区》社区管理》用户标签")
+public class ComMngUserTagVO {
+
+ @ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("标签名称")
+ private String tagName;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty("系统预置：1-是(不可编辑删除) 0-否")
+ private Integer sysFlag;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/CommunityUserInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/CommunityUserInfoVO.java
new file mode 100644
index 0000000..c94bc05
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/CommunityUserInfoVO.java
@@ -0,0 +1,110 @@
+package com.panzhihua.common.model.vos.user;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 社区人员详情
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-02-18 09:43
+ **/
+@Data
+@ApiModel("社区人员详情")
+public class CommunityUserInfoVO {
+
+ @ApiModelProperty("真实名字")
+ private String name;
+
+ @ApiModelProperty("性别 1 男 2 女")
+ private Integer sex;
+
+ @ApiModelProperty("民族")
+ private String nation;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("0 未婚 1 已婚")
+ private Integer maritalStatus;
+
+ @ApiModelProperty("身份证号")
+ private String idCard;
+
+ @ApiModelProperty("工作单位（学校）")
+ private String company;
+
+ @ApiModelProperty("user_id")
+ private Long userId;
+
+ @ApiModelProperty("年龄")
+ private Integer age;
+
+ @ApiModelProperty("生日")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date birthday;
+
+ @ApiModelProperty("户口所在地")
+ private String residence;
+
+ @ApiModelProperty("政治面貌：1 - 党员；2 - 团员；3 - 群众")
+ private Integer politicalOutlook;
+
+ @ApiModelProperty("文化程度")
+ private String education;
+
+ @ApiModelProperty("专享政策")
+ private String tags;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("是否志愿者 0否 1 是")
+ private Integer isVolunteer;
+
+ @ApiModelProperty("志愿者申请时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date volunteerCreateAt;
+
+ @ApiModelProperty("家庭成员")
+ private List<ComMngFamilyInfoVO> comMngFamilyInfoVOS;
+
+ @ApiModelProperty("房屋信息")
+ private List<ComMngStructHouseVO> comMngStructHouseVOS;
+
+ @ApiModelProperty("目前是否在攀枝花 0 否 1 是")
+ private Integer isPanzhiHua;
+
+ @ApiModelProperty("是否有与疑似或确诊病例密切接触史 0 否 1 是")
+ private Integer isContact;
+
+ @ApiModelProperty("近一个月离（返）攀情况")
+ private String situation;
+
+ /**
+ * 证件照（人面像）照片
+ */
+ @ApiModelProperty("证件照（人面像）照片")
+ private String cardPhotoFront;
+
+ /**
+ * 证件照（国徽面）照片
+ */
+ @ApiModelProperty("证件照（国徽面）照片")
+ private String cardPhotoBack;
+
+ /**
+ * 户口本照片(多张以,号隔开)
+ */
+ @ApiModelProperty("户口本照片(多张以,号隔开)")
+ private String familyBook;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/CommunityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/CommunityVO.java
new file mode 100644
index 0000000..8d9a380
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/CommunityVO.java
@@ -0,0 +1,18 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel
+public class CommunityVO implements Serializable {
+
+ @ApiModelProperty("社区/村落名")
+ private String name;
+
+ @ApiModelProperty("社区/村落id")
+ private String id;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/IndexDataAnalysisVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/IndexDataAnalysisVO.java
new file mode 100644
index 0000000..573bc2c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/IndexDataAnalysisVO.java
@@ -0,0 +1,70 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ApiModel("首页统计结果")
+public class IndexDataAnalysisVO implements Serializable {
+
+ @ApiModelProperty("用户总数")
+ private Integer allUser;
+
+ @ApiModelProperty("新增用户")
+ private Integer addUser;
+
+ @ApiModelProperty("日活跃用户")
+ private Integer activeDayUser;
+
+ @ApiModelProperty("周活跃用户")
+ private Integer activeWeekUser;
+
+// @ApiModelProperty("其他用户数(按街道，社区划分时使用)")
+// private Integer otherUser;
+//
+// @ApiModelProperty("其他用户占比(按街道，社区划分时使用)")
+// private Double otherUserRate;
+//
+// @ApiModelProperty("用户占比（累计）")
+// private List<UserProportion> userProportionTotal;
+//
+// @ApiModelProperty("用户占比（本月）")
+// private List<UserProportion> userProportionMonth;
+//
+// @ApiModelProperty("实名用户（累计）")
+// private List<RealUser> realUsersTotal;
+//
+// @ApiModelProperty("实名用户（本月）")
+// private List<RealUser> realUsersMonth;
+//
+// @ApiModelProperty("用户行为X轴(累计过去20天)")
+// private List<String> userActivityXAll;
+//
+// @ApiModelProperty("用户行为X轴（本月）")
+// private List<String> userActivityXMonth;
+//
+// @ApiModelProperty("新增用户Y轴(累计过去20天)")
+// private List<String> addUserYAll;
+//
+// @ApiModelProperty("新增用户Y轴（本月）")
+// private List<String> addUserYWeek;
+//
+// @ApiModelProperty("日活用户Y轴（累计过去20天）")
+// private List<String> activeUserYAll;
+//
+// @ApiModelProperty("日活用户Y轴（本月）")
+// private List<String> activeUserYMonth;
+// @ApiModelProperty("实名用户总数")
+// private Integer realUser;
+//
+// @ApiModelProperty("实名用户占比")
+// private Double realUserRate;
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/InputUserInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/InputUserInfoVO.java
new file mode 100644
index 0000000..0ffc9ce
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/InputUserInfoVO.java
@@ -0,0 +1,146 @@
+package com.panzhihua.common.model.vos.user;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import com.panzhihua.common.model.helper.sensitive.Sensitive;
+import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
+import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 居民数据信息
+ * @author: Null
+ * @date: 2021/3/11 10:36
+ */
+@Data
+@ApiModel(value = "居民数据信息")
+@EncryptDecryptClass
+public class InputUserInfoVO implements Serializable {
+
+ @ApiModelProperty("用户编号")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("生日")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date birthday;
+
+ @ApiModelProperty("门牌号")
+ private String doorNumber;
+
+ @ApiModelProperty("是否租住 0 不是 1 是")
+ private Integer isRent;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("民族")
+ private String nation;
+
+ @ApiModelProperty("政治面貌：1 - 党员；2 - 团员；3 - 群众")
+ private Integer politicalOutlook;
+
+ @ApiModelProperty("0 未婚 1 已婚")
+ private Integer maritalStatus;
+
+ @ApiModelProperty("联系方式")
+ @EncryptDecryptField
+ @Sensitive(strategy = SensitiveStrategy.PHONE)
+ private String phone;
+
+ @ApiModelProperty("文化程度")
+ private String education;
+
+ @ApiModelProperty("身份证")
+ private String idCard;
+
+ @ApiModelProperty("工作单位（学校）")
+ private String company;
+
+ @ApiModelProperty("户口所在地")
+ private String residence;
+
+ @ApiModelProperty("目前是否在攀枝花 0 否 1 是")
+ private Integer isPanzhihua;
+
+ @ApiModelProperty("近一个月离（返）攀情况")
+ private String situation;
+
+ @ApiModelProperty("是否有与疑似或确诊病例密切接触史 0 否 1 是")
+ private Integer isContact;
+
+ @ApiModelProperty("是否特殊情况（重大过往病史或者孕妇） 0 否 1是")
+ private Integer major;
+
+ @ApiModelProperty("是否退伍军人 0 否 1是")
+ private Integer soldier;
+
+ @ApiModelProperty("是否低保户 0 否 1是")
+ private Integer lowincomeHouseholds;
+
+ @ApiModelProperty("是否低收入人员 0否 1是")
+ private Integer lowincomePeople;
+
+ @ApiModelProperty("是否高龄老人 0否 1是")
+ private Integer oldPeople;
+
+ @ApiModelProperty("是否特服家庭 0 否 1是")
+ private Integer specialServiceFamily;
+
+ @ApiModelProperty("是否重点人员 0 否 1是")
+ private Integer keyPersonnel;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("小区id")
+ private Long areaId;
+
+ @ApiModelProperty("小区名称")
+ private String areaName;
+
+ @ApiModelProperty("详细地址")
+ private String address;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty("是否残疾人 0 否 1是")
+ private Integer disability;
+
+ @ApiModelProperty("专享政策")
+ private String tags;
+
+ @ApiModelProperty("年龄")
+ private Integer age;
+
+ @ApiModelProperty("性别")
+ private Integer sex;
+
+ @ApiModelProperty("家庭成员")
+ private List<ComMngFamilyInfoVO> comMngFamilyInfoVOS;
+
+ @ApiModelProperty("房屋信息")
+ private List<ComMngStructHouseVO> comMngStructHouseVOS;
+
+ @ApiModelProperty("街路巷")
+ private String alley;
+
+ @ApiModelProperty("地区号")
+ private String houseNum;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java
new file mode 100644
index 0000000..8373950
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.user;
+
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 设置角色权限
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-25 09:29
+ **/
+@Data
+@ApiModel("新增角色-设置角色权限")
+public class MenuRoleVO {
+ @ApiModelProperty("是否全选 1 是 0 否 ")
+ @NotNull(message = "是否全选不能为空")
+ private Integer isAll;
+ @ApiModelProperty("所有菜单id集合")
+ private List<Long> menuIds;
+ @ApiModelProperty(value = "被操作的角色id-编辑时使用")
+ private Long roleId;
+ @ApiModelProperty(value = "角色名字")
+ private String roleName;
+ @ApiModelProperty(value = "所在社区", hidden = true)
+ private Long communityId;
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/NoticeUnReadVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/NoticeUnReadVO.java
new file mode 100644
index 0000000..f892f45
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/NoticeUnReadVO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.vos.user;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 通知未读汇总
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-05 11:20
+ **/
+@Data
+@ApiModel("通知未读汇总")
+public class NoticeUnReadVO {
+ // {
+ // activityUnread:3,
+ // serviceUnread:4,
+ // systemUnread:5,
+ // scoreUnread:6
+ // }
+ @ApiModelProperty("活动通知未读数量")
+ private Long activityUnread;
+ @ApiModelProperty("服务变动未读数量")
+ private Long serviceUnread;
+ @ApiModelProperty("系统审核未读数量")
+ private Long systemUnread;
+ @ApiModelProperty("积分通知未读数量")
+ private Long scoreUnread;
+ @ApiModelProperty("四种通知最新四条数据")
+ private List<SysUserNoticeVO> sysUserNoticeVOList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/RealUser.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/RealUser.java
new file mode 100644
index 0000000..e6d58f1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/RealUser.java
@@ -0,0 +1,27 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "实名用户统计")
+public class RealUser {
+
+ @ApiModelProperty("名称")
+ private String name;
+
+ @ApiModelProperty("人数")
+ private Integer count;
+
+ @ApiModelProperty("社区名")
+ private String communityName;
+
+ @ApiModelProperty("街道名")
+ private String streetName;
+
+ @ApiModelProperty("区域code")
+ private String areaCode;
+
+ private String communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/RealUserAnalysisVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/RealUserAnalysisVO.java
new file mode 100644
index 0000000..eedc1e4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/RealUserAnalysisVO.java
@@ -0,0 +1,17 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("真实用户统计")
+public class RealUserAnalysisVO {
+
+ @ApiModelProperty("区域，街道，社区名")
+ private String name;
+
+ @ApiModelProperty("实名人数")
+ private Integer count;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/RealUserVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/RealUserVO.java
new file mode 100644
index 0000000..f99981e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/RealUserVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@ApiModel("真实用户统计")
+public class RealUserVO implements Serializable {
+
+ @ApiModelProperty("实名用户数")
+ private Integer realUserCount;
+
+ @ApiModelProperty("实名用户占比")
+ private Double realUserRate;
+
+ @ApiModelProperty("真实用户统计")
+ private List<RealUserAnalysisVO> realUserList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/RoleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/RoleVO.java
new file mode 100644
index 0000000..48b3993
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/RoleVO.java
@@ -0,0 +1,66 @@
+package com.panzhihua.common.model.vos.user;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 角色
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-01 13:55
+ **/
+@Data
+@ApiModel("角色信息")
+public class RoleVO {
+
+ @ApiModelProperty("角色id")
+ private Long roleId;
+
+ @ApiModelProperty("角色名称")
+ private String roleName;
+
+ @ApiModelProperty("角色权限字符串")
+ private String roleKey;
+
+ @ApiModelProperty("显示顺序")
+ private Integer roleSort;
+
+ @ApiModelProperty("数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限 ）")
+ private String dataScope;
+
+ @ApiModelProperty("菜单树选择项是否关联显示")
+ private boolean menuCheckStrictly;
+
+ @ApiModelProperty("部门树选择项是否关联显示")
+ private boolean deptCheckStrictly;
+
+ @ApiModelProperty("角色状态（0正常 1停用）")
+ private Integer status;
+
+ @ApiModelProperty("创建者")
+ private Long createBy;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("更新者")
+ private Long updateBy;
+
+ @ApiModelProperty("更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ private String areaCode;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVO.java
new file mode 100644
index 0000000..be63eb2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVO.java
@@ -0,0 +1,22 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@ApiModel
+public class StreetVO implements Serializable {
+
+ @ApiModelProperty("街道id")
+ private Long id;
+
+ @ApiModelProperty("街道名")
+ private String name;
+
+ @ApiModelProperty("下属社区列表")
+ private List<CommunityVO> communityList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVOS.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVOS.java
new file mode 100644
index 0000000..0b13fb7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVOS.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel
+public class StreetVOS {
+ @ApiModelProperty("街道id")
+ private Long id;
+
+ @ApiModelProperty("街道名")
+ private String name;
+
+ @ApiModelProperty("下属社区列表")
+ private List<CommunityVO> childList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVOStr.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVOStr.java
new file mode 100644
index 0000000..8f33d0e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVOStr.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel
+public class StreetVOStr {
+ @ApiModelProperty("街道id")
+ private String id;
+
+ @ApiModelProperty("街道名")
+ private String name;
+
+ @ApiModelProperty("下属社区列表")
+ private List<CommunityVO> childList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysAppConfigVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysAppConfigVO.java
new file mode 100644
index 0000000..f8c7ffe
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysAppConfigVO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+
+/**
+ * (SysAppConfig)表实体类
+ *
+ * @author makejava
+ * @since 2022-01-13 10:10:15
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("")
+public class SysAppConfigVO implements Serializable {
+
+ private static final long serialVersionUID = -90981038076389842L;
+
+ private Long id;
+
+ /**
+ * appid
+ */
+ @ApiModelProperty(value = "appid")
+ private String appId;
+
+ /**
+ * secret
+ */
+ @ApiModelProperty(value = "secret")
+ private String secret;
+
+ /**
+ * 小程序名字
+ */
+ @ApiModelProperty(value = "小程序名字")
+ private String name;
+
+ private String areaCode;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysMenuVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysMenuVO.java
new file mode 100644
index 0000000..8b7f580
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysMenuVO.java
@@ -0,0 +1,76 @@
+package com.panzhihua.common.model.vos.user;
+
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 菜单权限
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-24 16:50
+ **/
+@Data
+@ApiModel("菜单")
+public class SysMenuVO {
+
+ @ApiModelProperty("菜单id")
+ private Long menuId;
+
+ @ApiModelProperty("菜单名称")
+ private String menuName;
+
+ @ApiModelProperty("父菜单id")
+ private Long parentId;
+
+ @ApiModelProperty("显示顺序")
+ private Integer orderNum;
+
+ @ApiModelProperty("路由地址")
+ private String path;
+
+ @ApiModelProperty("组件路径")
+ private String component;
+
+ @ApiModelProperty("是否为外链（0是 1否）")
+ private Integer isFrame;
+
+ @ApiModelProperty("是否缓存（0缓存 1不缓存）")
+ private Integer isCache;
+
+ @ApiModelProperty("菜单类型（m目录 c菜单 f按钮）")
+ private String menuType;
+
+ @ApiModelProperty("菜单状态（0显示 1隐藏）")
+ private Integer visible;
+
+ @ApiModelProperty("菜单状态（0正常 1停用）")
+ private Integer status;
+
+ @ApiModelProperty("权限标识")
+ private String perms;
+
+ @ApiModelProperty("菜单图标")
+ private String icon;
+
+ @ApiModelProperty("创建者")
+ private String createBy;
+
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ @ApiModelProperty("更新者")
+ private String updateBy;
+
+ @ApiModelProperty("更新时间")
+ private Date updateAt;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("子菜单")
+ private List<SysMenuVO> sysMenuVOList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysOperLogVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysOperLogVO.java
new file mode 100644
index 0000000..3114ddc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysOperLogVO.java
@@ -0,0 +1,93 @@
+package com.panzhihua.common.model.vos.user;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 操作日志
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-25 10:52
+ **/
+@Data
+@ApiModel("操作日志")
+public class SysOperLogVO {
+
+ @ApiModelProperty("日志主键")
+ private Long operId;
+
+ @ApiModelProperty("模块标题")
+ private String title;
+
+ @ApiModelProperty("业务类型（0其它 1新增 2修改 3删除）")
+ private Integer businessType;
+
+ @ApiModelProperty("方法名称")
+ private String method;
+
+ @ApiModelProperty("请求方式")
+ private String requestMethod;
+
+ @ApiModelProperty("操作类别（0其它 1后台用户 2手机端用户）")
+ private Integer operatorType;
+
+ @ApiModelProperty("操作人员")
+ private String operName;
+
+ @ApiModelProperty("部门名称")
+ private String deptName;
+
+ @ApiModelProperty("请求url")
+ private String operUrl;
+
+ @ApiModelProperty("主机地址")
+ private String operIp;
+
+ @ApiModelProperty("操作地点")
+ private String operLocation;
+
+ @ApiModelProperty("请求参数")
+ private String operParam;
+
+ @ApiModelProperty("返回参数")
+ private String jsonResult;
+
+ @ApiModelProperty("操作状态（0正常 1异常）")
+ private Integer status;
+
+ @ApiModelProperty("错误消息")
+ private String errorMsg;
+
+ @ApiModelProperty("操作时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date operTime;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("操作账户")
+ private String account;
+
+ @ApiModelProperty("当前页数")
+ private Long pageNum;
+
+ @ApiModelProperty("每页记录数")
+ private Long pageSize;
+
+ private String areaCode;
+
+ @ApiModelProperty("如果是修改操作，记录修改前的记录")
+ private String beforeUpdateData;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("开始时间")
+ private String startTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("截止时间")
+ private String endTime;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysTemplateConfigVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysTemplateConfigVO.java
new file mode 100644
index 0000000..97dc6cf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysTemplateConfigVO.java
@@ -0,0 +1,48 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+
+/**
+ * (SysTemplateConfig)表实体类
+ *
+ * @author makejava
+ * @since 2022-01-13 14:29:55
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("")
+public class SysTemplateConfigVO implements Serializable {
+
+ private static final long serialVersionUID = -29178409799302189L;
+
+ private Long id;
+
+ /**
+ * 模板id
+ */
+ @ApiModelProperty(value = "模板id")
+ private String templateId;
+
+ /**
+ * 模板类型 1活动变更 2留言回复 3活动取消 4审核状态 5认证审核 6调研问卷 7奖励发放 8报名成功 9活动即将开始 10预约提醒
+ */
+ @ApiModelProperty(value = "模板类型 1活动变更 2留言回复 3活动取消 4审核状态 5认证审核 6调研问卷 7奖励发放 8报名成功 9活动即将开始 10预约提醒 ")
+ private Integer type;
+
+ /**
+ * 区域编码
+ */
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserAgreementVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserAgreementVO.java
new file mode 100644
index 0000000..fcd0126
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserAgreementVO.java
@@ -0,0 +1,43 @@
+package com.panzhihua.common.model.vos.user;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 用户协议
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-25 15:49
+ **/
+@Data
+@ApiModel("用户协议")
+public class SysUserAgreementVO {
+
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("所属app 1居民端app 2网格员端app 3商家端app 4隐私政策 5随手拍说明")
+ private Integer type;
+
+ @ApiModelProperty("协议内容")
+ private String content;
+
+ @ApiModelProperty("create_at")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("update_at")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty("协议名字")
+ private String name;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserFeedbackVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserFeedbackVO.java
new file mode 100644
index 0000000..9916756
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserFeedbackVO.java
@@ -0,0 +1,70 @@
+package com.panzhihua.common.model.vos.user;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 用户意见反馈
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-05 14:32
+ **/
+@Data
+@ApiModel("用户意见反馈")
+public class SysUserFeedbackVO {
+
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("反馈内容")
+ private String content;
+
+ @ApiModelProperty("反馈图片，多个用逗号隔开")
+ private String photoPath;
+
+ @ApiModelProperty("反馈时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("update_at")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty("用户的id")
+ private Long userId;
+
+ @ApiModelProperty("小区id")
+ private Long areaId;
+
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("社区名字")
+ private String communityName;
+
+ @ApiModelProperty("状态 0")
+ private Integer status;
+
+ @ApiModelProperty("昵称")
+ private String nickName;
+
+ @ApiModelProperty("用户名称")
+ private String name;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("回复内容")
+ private String reply;
+
+ private Long propertyId;
+ private Integer type;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserNoticeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserNoticeVO.java
new file mode 100644
index 0000000..85d01b1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserNoticeVO.java
@@ -0,0 +1,69 @@
+package com.panzhihua.common.model.vos.user;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 系统通知
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-04 17:07
+ **/
+@Data
+@ApiModel("系统通知")
+public class SysUserNoticeVO {
+
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ @ApiModelProperty("类型 1活动 2 服务 3系统 4积分消息")
+ private Integer type;
+
+ @ApiModelProperty("消息标题")
+ private String title;
+
+ @ApiModelProperty("具体业务类型 1 社区活动 2党建活动 3微心愿通知 4随手拍服务通知 5支援者申请 6实名制审核 7人脸识别审核 8积分获取和消耗 9积分点击直接跳转积分列表 10 房屋审核通知 11 党员认证审核通知 12邻里圈审核通知 13 高龄认证社区反馈通知 14线下商家订单")
+ private Integer businessType;
+
+ @ApiModelProperty("业务标题")
+ private String businessTitle;
+
+ @ApiModelProperty("业务内容")
+ private String businessContent;
+
+ @ApiModelProperty("业务发生时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date businessTime;
+
+ @ApiModelProperty("业务状态 1未通过、取消 2 成功")
+ private Integer businessStatus;
+
+ @ApiModelProperty("消息发出时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("消息读取时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ @ApiModelProperty("消息状态 0 未读 1 已读")
+ private Integer status;
+
+ @ApiModelProperty("业务主键 用于跳转")
+ private Long businessId;
+
+ @ApiModelProperty("社区活动类型 1志愿者活动 2居民活动 3党建活动 4 商家线下积分兑换")
+ private Integer activityType;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java
new file mode 100644
index 0000000..e5f7d54
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java
@@ -0,0 +1,87 @@
+package com.panzhihua.common.model.vos.user;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 小程序用户
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-30 11:22
+ **/
+@Data
+@ApiModel("小程序用户")
+public class SysUserVO {
+
+ @ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("昵称")
+ private String nickName;
+
+ @ApiModelProperty("身份证号码")
+ private String idCard;
+
+ @ApiModelProperty("真实名字")
+ private String name;
+
+ @ApiModelProperty("社区名字")
+ private String communityName;
+
+ @ApiModelProperty("1 启用 2 禁用")
+ private Integer status;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("最后登录时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date lastLoginTime;
+
+ @ApiModelProperty("用户类型（用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10一键报警app）")
+ private Integer type;
+
+ @ApiModelProperty("是否是志愿者（0.否 1.是）")
+ private Integer isVolunteer;
+
+ @ApiModelProperty("是否是党员（0.否 1.是）")
+ private Integer isPartymember;
+
+ private String imageUrl;
+ @ApiModelProperty(value = "微信小程序唯一标识")
+ private String openid;
+
+
+ private String loveIntegral;
+
+
+ /**
+ * 用户类型（用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10一键报警app）
+ */
+ public interface type{
+ int xcx = 1;
+ int yyht = 2;
+ int sqht = 3;
+ }
+
+ /**
+ * 是否枚举（0.否 1.是）
+ */
+ public interface isOk{
+ int yes = 1;
+ int no = 0;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UpdateUserArchivesVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UpdateUserArchivesVO.java
new file mode 100644
index 0000000..a19104c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UpdateUserArchivesVO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe
+ */
+@ApiModel("修改用户电子档案")
+@Data
+public class UpdateUserArchivesVO {
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+
+ @ApiModelProperty("证件照（人像面）照片")
+ private String cardPhotoFront;
+
+ @ApiModelProperty("证件照（国徽面）照片")
+ private String cardPhotoBack;
+
+ @ApiModelProperty("户口本照片 逗号隔开")
+ private String familyBook;
+
+ @ApiModelProperty("职业")
+ private String job;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserActivityAnalysisVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserActivityAnalysisVO.java
new file mode 100644
index 0000000..7a43769
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserActivityAnalysisVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.common.model.vos.user;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@ApiModel("用户行为分析")
+public class UserActivityAnalysisVO implements Serializable {
+
+ @ApiModelProperty("X轴")
+ private List<String> userX;
+
+ @ApiModelProperty("活跃用户y轴")
+ private List<String> activeUserY;
+
+ @ApiModelProperty("新增用户y轴")
+ private List<String> addUserY;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserArchivesVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserArchivesVO.java
new file mode 100644
index 0000000..9f2e5c2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserArchivesVO.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.model.vos.user;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther llming
+ * @describe 用户电子档案
+ */
+@ApiModel("用户电子档案")
+@Data
+public class UserArchivesVO {
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ @ApiModelProperty("真实名字")
+ private String name;
+
+ @ApiModelProperty("身份证号")
+ private String idCard;
+
+ @ApiModelProperty("性别 1 男 2 女")
+ private Integer sex;
+
+ @ApiModelProperty("出生年月")
+ @JsonFormat(timezone = "GMT+8")
+ private Date birthday;
+
+ @ApiModelProperty("职业")
+ private String job;
+
+ @ApiModelProperty("证件照（人像面）照片")
+ private String cardPhotoFront;
+
+ @ApiModelProperty("证件照（国徽面）照片")
+ private String cardPhotoBack;
+
+ @ApiModelProperty("户口本照片 逗号隔开")
+ private String familyBook;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserElectronicFileVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserElectronicFileVO.java
new file mode 100644
index 0000000..0d3a028
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserElectronicFileVO.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("电子档用户信息")
+public class UserElectronicFileVO {
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+ /**
+ * 证件照（人面像）照片
+ */
+ @ApiModelProperty("证件照（人面像）照片")
+ private String cardPhotoFront;
+
+ /**
+ * 证件照（国徽面）照片
+ */
+ @ApiModelProperty("证件照（国徽面）照片")
+ private String cardPhotoBack;
+
+ /**
+ * 户口本照片(多张以,号隔开)
+ */
+ @ApiModelProperty("户口本照片(多张以,号隔开)")
+ private String familyBook;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserPhoneVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserPhoneVO.java
new file mode 100644
index 0000000..fe96fe6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserPhoneVO.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 修改手机号
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-17 15:25
+ **/
+@Data
+@ApiModel("修改手机号")
+public class UserPhoneVO {
+
+ @ApiModelProperty("老手机号")
+ private String oldPhone;
+ @ApiModelProperty("新手机号")
+ private String newPhone;
+ @ApiModelProperty("短信验证码")
+ private String smsCode;
+ @ApiModelProperty(value = "当前登录用户id", hidden = true)
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserProportion.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserProportion.java
new file mode 100644
index 0000000..db5bbac
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserProportion.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "用户占比统计")
+public class UserProportion {
+
+ @ApiModelProperty("区县code(所有区县时使用)")
+ private Long areaCode;
+
+ @ApiModelProperty("用户数")
+ private Integer user;
+
+ @ApiModelProperty("用户占比")
+ private Double rate;
+
+ @ApiModelProperty("街道名(按街道分组时使用)")
+ private String streetName;
+
+ @ApiModelProperty("社区名(按社区分组或指定街道时使用)")
+ private String communityName;
+
+ private String communityId;
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserRateAnalysisVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserRateAnalysisVO.java
new file mode 100644
index 0000000..f464567
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserRateAnalysisVO.java
@@ -0,0 +1,20 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("用户占比详情")
+public class UserRateAnalysisVO {
+
+ @ApiModelProperty("社区，街道，区县名称")
+ private String name;
+
+ @ApiModelProperty("占比")
+ private Integer rate;
+
+ @ApiModelProperty("人数")
+ private Integer count;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserRateVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserRateVO.java
new file mode 100644
index 0000000..e7f1b30
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserRateVO.java
@@ -0,0 +1,16 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@ApiModel("用户占比")
+public class UserRateVO implements Serializable {
+
+ @ApiModelProperty("用户来源，用户数及占比")
+ private List<UserRateAnalysisVO> userList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UuLoginVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UuLoginVO.java
new file mode 100644
index 0000000..976868a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UuLoginVO.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.model.vos.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class UuLoginVO {
+ @ApiModelProperty("省")
+ private String province;
+ @ApiModelProperty("市")
+ private String city;
+ @ApiModelProperty("区")
+ private String area;
+ private String appid;
+ private String timestamp;
+ private String sign;
+ private String mobile;
+ private String couponId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/ComMngVaccinesEnrollExcelVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/ComMngVaccinesEnrollExcelVo.java
new file mode 100644
index 0000000..b85790a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/ComMngVaccinesEnrollExcelVo.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.model.vos.vaccines;
+
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
+@Data
+public class ComMngVaccinesEnrollExcelVo {
+
+ @ExcelProperty(value = "姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "性别", index = 1)
+ private String sex;
+
+ @ExcelProperty(value = "年龄", index = 2)
+ private Integer age;
+
+ @ExcelProperty(value = "手机号", index = 3)
+ private String phone;
+
+ @ExcelProperty(value = "身份证号", index = 4)
+ private String idCard;
+
+ @ExcelProperty(value = "登记时间", index = 5)
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createAt;
+
+ @ExcelProperty(value = "疫苗分类", index = 6)
+ private String vaccines;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/ComMngVaccinesInoculationExcelVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/ComMngVaccinesInoculationExcelVo.java
new file mode 100644
index 0000000..487137a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/ComMngVaccinesInoculationExcelVo.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.vaccines;
+
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
+@Data
+public class ComMngVaccinesInoculationExcelVo {
+
+ @ExcelProperty(value = "姓名", index = 0)
+ private String name;
+
+ @ExcelProperty(value = "性别", index = 1)
+ private String sex;
+
+ @ExcelProperty(value = "年龄", index = 2)
+ private Integer age;
+
+ @ExcelProperty(value = "手机号", index = 3)
+ private String phone;
+
+ @ExcelProperty(value = "身份证号", index = 4)
+ private String idCard;
+
+ @ExcelProperty(value = "接种时间", index = 5)
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date inoculationAt;
+
+ @ExcelProperty(value = "接种剂次", index = 6)
+ private String dosage;
+
+ @ExcelProperty(value = "医疗机构", index = 7)
+ private String medicalInstitution;
+
+ @ExcelProperty(value = "疫苗批号", index = 8)
+ private String vaccinesCode;
+
+ @ExcelProperty(value = "疫苗名称", index = 9)
+ private String vaccines;
+
+ @ExcelProperty(value = "备注", index = 10)
+ private String remark;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesByAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesByAppVO.java
new file mode 100644
index 0000000..b04ca86
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesByAppVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.vaccines;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @describe 疫苗分类信息
+ */
+@Data
+@ApiModel("疫苗分类信息")
+public class VaccinesByAppVO {
+
+ @ApiModelProperty("疫苗id")
+ private Long id;
+
+ @ApiModelProperty("疫苗名称")
+ private String name;
+
+ @ApiModelProperty("疫苗描述")
+ private String describe;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesEnrollByAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesEnrollByAdminVO.java
new file mode 100644
index 0000000..210951d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesEnrollByAdminVO.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.model.vos.vaccines;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @describe 疫苗登记记录
+ */
+@Data
+@ApiModel("疫苗登记记录")
+public class VaccinesEnrollByAdminVO {
+
+ @ApiModelProperty("疫苗登记记录id")
+ private Long id;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("年龄")
+ private Integer age;
+
+ @ApiModelProperty("职业")
+ private String job;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("身份证号码")
+ private String idCard;
+
+ @ApiModelProperty("登记时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("性别(1.男 2.女 3.未知)")
+ private Integer sex;
+
+ @ApiModelProperty("疫苗分类")
+ private String vaccines;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesEnrollUserByAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesEnrollUserByAppVO.java
new file mode 100644
index 0000000..d525ad7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesEnrollUserByAppVO.java
@@ -0,0 +1,55 @@
+package com.panzhihua.common.model.vos.vaccines;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @describe 疫苗分类信息
+ */
+@Data
+@ApiModel("家庭成员接种信息")
+public class VaccinesEnrollUserByAppVO {
+
+ @ApiModelProperty("用户id")
+ private Long userId;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("年龄")
+ private Integer age;
+
+ @ApiModelProperty("职业")
+ private String job;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("身份证号码")
+ private String idCard;
+
+ @ApiModelProperty("性别(1.男 2.女)")
+ private Integer sex;
+
+ @ApiModelProperty("是否已报名(1.是 2.否)")
+ private Integer isEnroll;
+
+ @ApiModelProperty("是否是自己（1.是 2.否）")
+ private Integer isUser;
+
+ @ApiModelProperty("创建时间")
+ private Date createAt;
+
+ /**
+ * 是否已报名(1.是 2.否)
+ */
+ public interface isEnroll {
+ int yes = 1;
+ int no = 2;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesInoculationByAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesInoculationByAdminVO.java
new file mode 100644
index 0000000..6f87d32
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesInoculationByAdminVO.java
@@ -0,0 +1,56 @@
+package com.panzhihua.common.model.vos.vaccines;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @describe 疫苗接种记录
+ */
+@Data
+@ApiModel("疫苗接种记录")
+public class VaccinesInoculationByAdminVO {
+
+ @ApiModelProperty("疫苗接种记录id")
+ private Long id;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("性别(1.男 2.女)")
+ private Integer sex;
+
+ @ApiModelProperty("年龄")
+ private Integer age;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ @ApiModelProperty("身份证号码")
+ private String idCard;
+
+ @ApiModelProperty("接种时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date inoculationAt;
+
+ @ApiModelProperty("接种剂次")
+ private String dosage;
+
+ @ApiModelProperty("医疗机构")
+ private String medicalInstitution;
+
+ @ApiModelProperty("疫苗批号")
+ private String vaccinesCode;
+
+ @ApiModelProperty("疫苗名称")
+ private String vaccines;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesUserInoculationByAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesUserInoculationByAppVO.java
new file mode 100644
index 0000000..69817bb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/vaccines/VaccinesUserInoculationByAppVO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.common.model.vos.vaccines;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther lyq
+ * @describe 疫苗接种记录信息
+ */
+@Data
+@ApiModel("疫苗接种记录信息")
+public class VaccinesUserInoculationByAppVO {
+
+ @ApiModelProperty("接种记录id")
+ private Long id;
+
+ @ApiModelProperty("接种疫苗类型")
+ private String vaccines;
+
+ @ApiModelProperty("受种人")
+ private String name;
+
+ @ApiModelProperty("接种日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date inoculationAt;
+
+ @ApiModelProperty("疫苗批号")
+ private String vaccinesCode;
+
+ @ApiModelProperty("医疗机构")
+ private String medicalInstitution;
+
+ @ApiModelProperty("剂次")
+ private String dosage;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java
new file mode 100644
index 0000000..f90945f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java
@@ -0,0 +1,87 @@
+package com.panzhihua.common.model.vos.visit;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.enums.EventTasksStatusEnum;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xyh
+ * @date 2021/6/23 9:03
+ */
+@ApiModel("app走访任务VO")
+@Data
+@EncryptDecryptClass
+public class AppVisitTasksVO implements Serializable {
+ private static final long serialVersionUID = -5758072851661612412L;
+
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("需走访人id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long visiterId;
+
+ @ApiModelProperty("需走访人姓名")
+ private String visiterName;
+
+ @ApiModelProperty("网格员id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long gridMember;
+
+ @ApiModelProperty("网格员")
+ private String gridMemberName;
+
+ @ApiModelProperty("网格员联系方式")
+ private String gridMenberTele;
+
+ @ApiModelProperty("处理人id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long dellUserId;
+
+ @ApiModelProperty("处理人")
+ private String dellUserName;
+
+ @ApiModelProperty("需走访人电话")
+ @EncryptDecryptField
+ private String visiterTele;
+
+ @ApiModelProperty("完成时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date submitDate;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty("创建人")
+ private String creator;
+
+ @ApiModelProperty("撤销时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date cancelTime;
+
+ private Integer eventStatus;
+
+ @ApiModelProperty("状态")
+ private String eventStatusName;
+
+ @ApiModelProperty("正常状态（0.正常 1.异常）")
+ private Integer exception;
+
+ public String getEventStatusName() {
+
+ return EventTasksStatusEnum.getName(eventStatus);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitCountVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitCountVO.java
new file mode 100644
index 0000000..7c61462
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitCountVO.java
@@ -0,0 +1,26 @@
+package com.panzhihua.common.model.vos.visit;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 后台走访统计
+ *
+ * @author xyh
+ * @date 2021/6/21 14:34
+ */
+@ApiModel("走访统计VO")
+@Data
+public class EventVisitCountVO {
+
+ @ApiModelProperty("待走访")
+ private Long visit;
+
+ @ApiModelProperty("已走访")
+ private Long visited;
+
+ @ApiModelProperty("已撤销")
+ private Long canceled;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitListVO.java
new file mode 100644
index 0000000..30b1bc0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitListVO.java
@@ -0,0 +1,82 @@
+package com.panzhihua.common.model.vos.visit;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.enums.EventTasksStatusEnum;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 后台需走访人员VO
+ *
+ * @author xyh
+ * @date 2021/6/21 14:34
+ */
+@ApiModel("需走访人员VO")
+@Data
+public class EventVisitListVO {
+
+ @ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ @ApiModelProperty("真实姓名")
+ private String name;
+
+ @ApiModelProperty("身份证号码")
+ private String cardNoStr;
+
+ @ApiModelProperty(value = "人员标签")
+ private String label;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "性别")
+ private String sex;
+
+ @ApiModelProperty(value = "性别名称")
+ private String sexName;
+
+ @ApiModelProperty(value = "现居地址")
+ private String address;
+
+ private String politicalOutlook;
+
+ @ApiModelProperty(value = "政治面貌")
+ private String politicalOutlookName;
+
+ @ApiModelProperty("联系方式")
+ private String phone;
+
+ @ApiModelProperty("户籍地址")
+ private String censusRegister;
+
+ @ApiModelProperty("户主")
+ private String houseHolder;
+
+ @ApiModelProperty("关联实有房屋")
+ private String relationHouse;
+
+ @ApiModelProperty("最近一次走访任务时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ private Integer eventStatus;
+
+ @ApiModelProperty("最近一次走访任务状态")
+ private String eventStatusName;
+
+ public String getEventStatusName() {
+ if (eventStatus != null) {
+ return EventTasksStatusEnum.getName(eventStatus);
+ }
+ return null;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java
new file mode 100644
index 0000000..70291c6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java
@@ -0,0 +1,144 @@
+package com.panzhihua.common.model.vos.visit;
+
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.model.dtos.EventResourceDTO;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("重点人群走访记录详细返回参数")
+@EncryptDecryptClass
+public class EventVisitingTasksDetailsVO {
+
+ @ApiModelProperty(value = "音频列表")
+ List<EventResourceDTO> vosList;
+ @ApiModelProperty(value = "图片列表")
+ List<EventResourceDTO> imgList;
+ @ApiModelProperty(value = "视频列表")
+ List<EventResourceDTO> videoList;
+ @ApiModelProperty(value = "id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ @ApiModelProperty(value = "网格员所处的街道")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long gridMemberStreet;
+ @ApiModelProperty(value = "网格员所处社区")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long gridMemberCommunity;
+ @ApiModelProperty(value = "网格员")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long gridMember;
+ @ApiModelProperty(value = "网格员名字")
+ private String gridMemberName;
+ @ApiModelProperty(value = "网格员联系方式")
+ private String gridMenberTele;
+ @ApiModelProperty(value = "需走访人ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long visiterId;
+ @ApiModelProperty(value = "需走访人名字")
+ private String visiterName;
+ @ApiModelProperty(value = "需走访人员性别")
+ private Integer visiterSex;
+ @ApiModelProperty(value = "需走访人电话")
+ @EncryptDecryptField
+ private String visiterTele;
+ @ApiModelProperty(value = "需走访人电话")
+ private String visiterPhone;
+ @ApiModelProperty(value = "需走访人居住地址")
+ private String visiterAddress;
+ @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员")
+ private Integer visiterType;
+ @ApiModelProperty(value = "事件标题")
+ private String eventTitle;
+ @ApiModelProperty(value = "事件类型")
+ private Integer eventType;
+ @ApiModelProperty(value = "事件描述")
+ private String eventDes;
+ @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)")
+ private Integer actOpara;
+ @ApiModelProperty(value = "发生时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date happenTime;
+ @ApiModelProperty(value = "发生地点")
+ private String happentAddress;
+ @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）")
+ private String happentLatLng;
+ @ApiModelProperty(value = "事件状态（1待处理2自己已解决3待验证4草稿箱5已撤销6异常）")
+ private Integer eventStatus;
+ @ApiModelProperty(value = "上报状态")
+ private Integer reporting;
+ @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）")
+ private Integer dellType;
+ @ApiModelProperty(value = "处理人ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long dellUserId;
+ @ApiModelProperty(value = "处理人名称")
+ private String dellUserName;
+ @ApiModelProperty(value = "处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date dellDate;
+ @ApiModelProperty(value = "异常描述")
+ private String dellDesc;
+ @ApiModelProperty(value = "是否有效")
+ private Boolean invalid;
+ @ApiModelProperty(value = "是否紧急")
+ private Boolean urgent;
+ @ApiModelProperty(value = "是否催办")
+ private Boolean urgentDell;
+ @ApiModelProperty(value = "上报提交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date submitDate;
+ @ApiModelProperty(value = "是否异常行为:0否，1是")
+ private Integer exception;
+ @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据")
+ private JSONObject tableContentJson;
+ @ApiModelProperty(value = "创建人")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long createBy;
+ @ApiModelProperty(value = "创建事件")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+ @ApiModelProperty(value = "修改人")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long updateBy;
+ @ApiModelProperty(value = "修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+ @ApiModelProperty(value = "异常选项")
+ private List<String> optionList;
+ @ApiModelProperty(value = "家庭联系方式")
+ private String familyPhone;
+
+ @ApiModelProperty(value = "生活来源")
+ private String familySource;
+
+ @ApiModelProperty(value = "地址备注")
+ private String addressRemark;
+
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ @ApiModelProperty("异常选择")
+ private String option;
+
+ @ApiModelProperty("走访后的经纬度（,隔开）")
+ private String latLng;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java
new file mode 100644
index 0000000..8ee2240
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java
@@ -0,0 +1,197 @@
+package com.panzhihua.common.model.vos.visit;
+
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.panzhihua.common.enums.EventTasksStatusEnum;
+import com.panzhihua.common.enums.EventTasksVisitorTypeEnum;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ */
+@Data
+@ApiModel("重点人群走访记录返回参数")
+@ExcelIgnoreUnannotated
+@EncryptDecryptClass
+public class EventVisitingTasksVO {
+
+ @ApiModelProperty(value = "id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ // @ExcelProperty(value = "序号",index = 0)
+ // private Integer rowNum;
+
+ @ExcelProperty(value = "创建时间", index = 0)
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ExcelProperty(value = "创建人", index = 1)
+ @ApiModelProperty(value = "创建人")
+ private String creator;
+
+ @ExcelProperty(value = "走访对象", index = 2)
+ @ApiModelProperty(value = "需走访人名字")
+ private String visiterName;
+
+ @ExcelProperty(value = "身份证号码", index = 3)
+ @ApiModelProperty(value = "身份证号码")
+ @EncryptDecryptField
+ private String cardNoStr;
+
+ @ExcelProperty(value = "走访地址", index = 4)
+ @ApiModelProperty(value = "走访地址")
+ private String visiterAddress;
+
+ @ExcelProperty(value = "人员标签", index = 5)
+ @ApiModelProperty(value = "人员标签")
+ private String visiterTypeName;
+
+ @ExcelProperty(value = "走访人", index = 6)
+ @ApiModelProperty(value = "走访人")
+ private String dellUserName;
+
+ @ExcelProperty(value = "完成走访时间", index = 7)
+ @ApiModelProperty(value = "完成走访时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date submitDate;
+
+ @ExcelProperty(value = "撤销时间", index = 8)
+ @ApiModelProperty(value = "撤销时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date cancelTime;
+
+ @ExcelProperty(value = "状态", index = 9)
+ @ApiModelProperty(value = "状态")
+ private String eventStatusName;
+
+ @ApiModelProperty(value = "需走访人ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long visiterId;
+
+ @ApiModelProperty(value = "网格员所处的街道")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long gridMemberStreet;
+
+ @ApiModelProperty(value = "网格员所处社区")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long gridMemberCommunity;
+
+ @ApiModelProperty(value = "网格员")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long gridMember;
+
+ @ApiModelProperty(value = "网格员名字")
+ private String gridMemberName;
+
+ @ApiModelProperty(value = "网格员联系方式")
+ private String gridMenberTele;
+
+ @ApiModelProperty(value = "所属网格")
+ private String gridName;
+
+ @ApiModelProperty(value = "需走访人员性别")
+ private Integer visiterSex;
+
+ @ApiModelProperty(value = "需走访人电话")
+ @EncryptDecryptField
+ private String visiterTele;
+
+ private Integer visiterType;
+
+ @ApiModelProperty(value = "事件标题")
+ private String eventTitle;
+
+ @ApiModelProperty(value = "事件类型")
+ private Integer eventType;
+
+ @ApiModelProperty(value = "事件描述")
+ private String eventDes;
+
+ @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)")
+ private Integer actOpara;
+
+ @ApiModelProperty(value = "发生时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date happenTime;
+
+ @ApiModelProperty(value = "发生地点")
+ private String happentAddress;
+
+ @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）")
+ private String happentLatLng;
+ private Integer eventStatus;
+ @ApiModelProperty(value = "上报状态")
+ private Integer reporting;
+ @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）")
+ private Integer dellType;
+ @ApiModelProperty(value = "处理人ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long dellUserId;
+ @ApiModelProperty(value = "处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date dellDate;
+ @ApiModelProperty(value = "解决人针对解决事件的处理描述")
+ private String dellDesc;
+ @ApiModelProperty(value = "是否有效")
+ private Boolean invalid;
+ @ApiModelProperty(value = "是否紧急")
+ private Boolean urgent;
+ @ApiModelProperty(value = "是否催办")
+ private Boolean urgentDell;
+ @ApiModelProperty(value = "是否异常行为(1.是 0.否)")
+ private Integer exception;
+ @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据")
+ private String tableContentJson;
+ @ApiModelProperty(value = "创建人id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long createBy;
+ @ApiModelProperty(value = "修改人")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long updateBy;
+ @ApiModelProperty(value = "修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+ @ApiModelProperty(value = "标签")
+ private String label;
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+ @ApiModelProperty(value = "电话")
+ private String phone;
+ private Integer nationCode;
+ @ApiModelProperty(value = "民族")
+ private String nation;
+ @ApiModelProperty(
+ value = "政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
+ private Integer politicalOutlook;
+
+ public String getEventStatusName() {
+ if (eventStatus == null) {
+ return null;
+ }
+ return EventTasksStatusEnum.getName(eventStatus);
+ }
+
+ public String getVisiterTypeName() {
+ if (visiterType == null) {
+ return null;
+ }
+ return EventTasksVisitorTypeEnum.getName(visiterType);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/redis/CacheConfig.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/redis/CacheConfig.java
new file mode 100644
index 0000000..e449b75
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/redis/CacheConfig.java
@@ -0,0 +1,79 @@
+package com.panzhihua.common.redis;
+
+import java.time.Duration;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.springframework.cache.CacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * program 攀枝花智慧社区项目 缓存配置类
+ *
+ * @author manailin Date 2021-08-27 15:30
+ **/
+@Configuration
+public class CacheConfig {
+
+ private Duration timeToLive = Duration.ofHours(1);
+
+ @Bean
+ public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
+ RedisTemplate<Object, Object> redisTemplate = new RedisTemplate<>();
+ redisTemplate.setConnectionFactory(redisConnectionFactory);
+
+ // 使用Jackson2JsonRedisSerialize 替换默认序列化
+ Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
+
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+// objectMapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+
+ objectMapper.activateDefaultTyping(
+ objectMapper.getPolymorphicTypeValidator(),
+ ObjectMapper.DefaultTyping.NON_FINAL,
+ JsonTypeInfo.As.PROPERTY);
+
+ jackson2JsonRedisSerializer.setObjectMapper(objectMapper);
+
+ // 设置value的序列化规则和 key的序列化规则
+ redisTemplate.setValueSerializer(jackson2JsonRedisSerializer);
+ redisTemplate.setKeySerializer(new StringRedisSerializer());
+ redisTemplate.afterPropertiesSet();
+ return redisTemplate;
+ }
+
+ @Bean
+ public CacheManager cacheManager(RedisConnectionFactory factory) {
+ RedisSerializer<String> redisSerializer = new StringRedisSerializer();
+ Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
+
+ // 解决查询缓存转换异常的问题
+ ObjectMapper om = new ObjectMapper();
+ om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+ om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+ jackson2JsonRedisSerializer.setObjectMapper(om);
+
+ // 配置序列化（解决乱码的问题）
+ RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig().entryTtl(timeToLive)
+ .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(redisSerializer))
+ .serializeValuesWith(
+ RedisSerializationContext.SerializationPair.fromSerializer(jackson2JsonRedisSerializer))
+ .disableCachingNullValues();
+ RedisCacheManager cacheManager = RedisCacheManager.builder(factory).cacheDefaults(config).build();
+
+ return cacheManager;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/redis/RedisTokenManager.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/redis/RedisTokenManager.java
new file mode 100644
index 0000000..28739f9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/redis/RedisTokenManager.java
@@ -0,0 +1,170 @@
+package com.panzhihua.common.redis;
+
+import com.panzhihua.common.utlis.JWTTokenUtil;
+import com.panzhihua.common.redis.TokenManager;
+import com.panzhihua.common.utlis.Constant;
+import io.jsonwebtoken.Claims;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.script.DigestUtils;
+import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 通过Redis存储和验证token的实现类
+ */
+@Component
+public class RedisTokenManager implements TokenManager
+{
+// @Resource
+ private RedisTemplate<String,String> redis;
+
+// @Resource
+// private RedisTemplate<String,Object> redis1;
+
+ @Resource
+ RedisTemplate<String, Object> redisTemplate;
+
+ @Resource
+ private RedisUtils redisUtils;
+
+ @Qualifier("redisTemplate")
+ @Autowired
+ public void setRedis(RedisTemplate redis) {
+ this.redis = redis;
+ //泛型设置成Long后必须更改对应的序列化方案
+ redis.setKeySerializer(new JdkSerializationRedisSerializer());
+ }
+
+ @Override
+ public String createToken(String userId, String userRole) {
+ //使用uuid作为源token
+ String uuid = UUID.randomUUID().toString().replace("-", "");
+ String token = DigestUtils.sha1DigestAsHex(uuid + userId + "e23ktjsdf") + "-" + userRole;
+ //存储到redis并设置过期时间
+ redis.boundValueOps(token).set(String.valueOf(userId), Constant.TOKEN_EXPIRES_HOUR, TimeUnit.HOURS);
+ redis.boundValueOps(String.valueOf(userId)).set(token, Constant.TOKEN_EXPIRES_HOUR, TimeUnit.HOURS);
+ return token;
+ }
+
+
+ public boolean checkToken(String token) {
+// redis.multi(); // 开启事务
+//
+// if (StringUtils.isEmpty(token)) {
+// return false;
+// }
+// // 获取Redis服务器的地址
+//
+// System.out.println("Redis服务器地址: " + redisTemplate.getConnectionFactory().getConnection());
+//
+// // 获取Redis服务器的端口
+// System.out.println("Redis服务器端口: " + redisTemplate.getConnectionFactory().getConnection());
+// Set<String> keys = redisTemplate.keys("*");
+//
+// // 打印所有的键（key）
+// for (String key : keys) {
+// System.out.println(key);
+// }
+// Object login_user_info = redisUtils.get("login_user_info");
+// Object userId2 = redisUtils.get("08839375c14aebe729fb0fb25defdea123782abc-2");
+//// String userId = redisTemplate.boundValueOps("2").get().toString();
+// Object o = redisTemplate.opsForValue().get("08839375c14aebe729fb0fb25defdea123782abc-2");
+// String s = redis.boundValueOps("2").get();
+//// String s = o;
+//// Object auxiliaryPoints =redisTemplate.opsForValue().get("auxiliaryPoints");
+//
+// if (userId2 == null) {
+// return false;
+// }
+// redis.exec();
+// //如果验证成功，说明此用户进行了一次有效操作，延长token的过期时间
+// redis.boundValueOps(token).expire(Constant.TOKEN_EXPIRES_HOUR, TimeUnit.HOURS);
+// return true;
+ if (StringUtils.isEmpty(token)) {
+ return false;
+ }
+ String userId = redis.boundValueOps(token).get();
+ if (userId == null) {
+ return false;
+ }
+ //如果验证成功，说明此用户进行了一次有效操作，延长token的过期时间
+ redis.boundValueOps(token).expire(Constant.TOKEN_EXPIRES_HOUR, TimeUnit.HOURS);
+ return true;
+ }
+
+
+ /**
+ * 验证花城token
+ * @param token
+ * @return
+ */
+ @Override
+ public boolean checkHCToken(String token) {
+ if (StringUtils.isEmpty(token)) {
+ return false;
+ }
+ // token解析
+ Claims claims = JWTTokenUtil.getClaimsFromToken(token);
+ if (ObjectUtils.isEmpty(claims)) {
+ return false;
+ }
+ String userId = claims.getSubject();
+ if (ObjectUtils.isEmpty(userId))
+ {
+ return false;
+ }
+ return true;
+ }
+
+
+ @Override
+ public long getUserId(String token) {
+ if (token == null) {
+ return -1;
+ }
+ String userId = redis.boundValueOps(token).get();
+ return Long.parseLong(userId);
+ }
+
+ /**
+ * 获取花城e+的 UserId
+ * @param token
+ * @return
+ */
+ @Override
+ public long getHCUserId(String token) {
+ if (token == null) {
+ return -1;
+ }
+ // token解析
+ Claims claims = JWTTokenUtil.getClaimsFromToken(token);
+ if (ObjectUtils.isEmpty(claims)) {
+ return -1;
+ }
+ String userId = claims.getSubject();
+ if (ObjectUtils.isEmpty(userId))
+ {
+ return -1;
+ }
+ return Long.parseLong(userId);
+ }
+
+ public void deleteToken(String token) {
+ redis.delete(token);
+ }
+
+ @Override
+ public String getTokenByUserId(String userId) {
+ return redis.boundValueOps(userId).get();
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/redis/RedisUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/redis/RedisUtils.java
new file mode 100644
index 0000000..c4d8932
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/redis/RedisUtils.java
@@ -0,0 +1,247 @@
+package com.panzhihua.common.redis;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.*;
+import org.springframework.stereotype.Component;
+
+/**
+ * 攀枝花智慧社区项目
+ * <p>
+ * redis 操作工具类
+ * <p>
+ * Copyright: Copyright (C) 2021 XXX, Inc. All rights reserved.
+ * <p>
+ * Company: 成都呐喊信息技术有限公司
+ * <p>
+ *
+ * @author manailin
+ * @since 2021/8/27 8:58
+ */
+@Component
+public class RedisUtils {
+
+ @Autowired
+ private RedisTemplate redisTemplate;
+
+ /**
+ * 写入缓存
+ *
+ * @param key
+ * @param value
+ * @return
+ */
+ public boolean set(final String key, Object value) {
+ boolean result = false;
+ try {
+ ValueOperations<Serializable, Object> operations = redisTemplate.opsForValue();
+ operations.set(key, value);
+ result = true;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return result;
+ }
+
+ /**
+ * 写入缓存设置时效时间
+ *
+ * @param key
+ * @param value
+ * @return
+ */
+ public boolean set(final String key, Object value, Long expireTime) {
+ boolean result = false;
+ try {
+ ValueOperations<Serializable, Object> operations = redisTemplate.opsForValue();
+ operations.set(key, value);
+ redisTemplate.expire(key, expireTime, TimeUnit.SECONDS);
+ result = true;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return result;
+ }
+
+ /**
+ * 批量删除对应的value
+ *
+ * @param keys
+ */
+ public void remove(final String... keys) {
+ for (String key : keys) {
+ remove(key);
+ }
+ }
+
+ /**
+ * 批量删除对应的value (带事务,业务代码中用到事务，则需用此方法)
+ *
+ * @param keys
+ */
+ public void removeTransactional(final String... keys) {
+ for (String key : keys) {
+ removeTransactional(key);
+ }
+ }
+
+ /**
+ * 批量删除key
+ *
+ * @param pattern
+ */
+ public void removePattern(final String pattern) {
+ Set<Serializable> keys = redisTemplate.keys(pattern);
+ if (keys.size() > 0) {
+ redisTemplate.delete(keys);
+ }
+ }
+
+ /**
+ * 删除对应的value
+ *
+ * @param key
+ */
+ public void remove(final String key) {
+ if (exists(key)) {
+ redisTemplate.delete(key);
+ }
+ }
+
+ /**
+ * 判断缓存中是否有对应的value
+ *
+ * @param key
+ * @return
+ */
+ public boolean exists(final String key) {
+ return redisTemplate.hasKey(key);
+ }
+
+ /**
+ * 读取缓存
+ *
+ * @param key
+ * @return
+ */
+ public Object get(final String key) {
+ ValueOperations<Serializable, Object> operations = redisTemplate.opsForValue();
+ return operations.get(key);
+ }
+
+ /**
+ * 哈希 添加
+ *
+ * @param key
+ * @param hashKey
+ * @param value
+ */
+ public void hmSet(String key, Object hashKey, Object value) {
+ HashOperations<String, Object, Object> hash = redisTemplate.opsForHash();
+ hash.put(key, hashKey, value);
+ }
+
+ /**
+ * 哈希获取数据
+ *
+ * @param key
+ * @param hashKey
+ * @return
+ */
+ public Object hmGet(String key, Object hashKey) {
+ HashOperations<String, Object, Object> hash = redisTemplate.opsForHash();
+ return hash.get(key, hashKey);
+ }
+
+ /**
+ * 列表添加
+ *
+ * @param k
+ * @param v
+ */
+ public void lPush(String k, Object v) {
+ ListOperations<String, Object> list = redisTemplate.opsForList();
+ list.rightPush(k, v);
+ }
+
+ /**
+ * 列表获取
+ *
+ * @param k
+ * @param l
+ * @param l1
+ * @return
+ */
+ public List<Object> lRange(String k, long l, long l1) {
+ ListOperations<String, Object> list = redisTemplate.opsForList();
+ return list.range(k, l, l1);
+ }
+
+ /**
+ * 集合添加
+ *
+ * @param key
+ * @param value
+ */
+ public void add(String key, Object value) {
+ SetOperations<String, Object> set = redisTemplate.opsForSet();
+ set.add(key, value);
+ }
+
+ /**
+ * 集合获取
+ *
+ * @param key
+ * @return
+ */
+ public Set<Object> setMembers(String key) {
+ SetOperations<String, Object> set = redisTemplate.opsForSet();
+ return set.members(key);
+ }
+
+ /**
+ * 有序集合添加
+ *
+ * @param key
+ * @param value
+ * @param scoure
+ */
+ public void zAdd(String key, Object value, double scoure) {
+ ZSetOperations<String, Object> zset = redisTemplate.opsForZSet();
+ zset.add(key, value, scoure);
+ }
+
+ /**
+ * 有序集合获取
+ *
+ * @param key
+ * @param scoure
+ * @param scoure1
+ * @return
+ */
+ public Set<Object> rangeByScore(String key, double scoure, double scoure1) {
+ ZSetOperations<String, Object> zset = redisTemplate.opsForZSet();
+ return zset.rangeByScore(key, scoure, scoure1);
+ }
+
+ /**
+ * 加锁
+ *
+ * @param key
+ * @return
+ */
+ public boolean tryLock(String key) {
+ try {
+ long currTime = System.currentTimeMillis();
+ // 加锁成功
+ return redisTemplate.opsForValue().setIfAbsent(key, currTime);
+ } finally {
+ redisTemplate.expire(key, 5, TimeUnit.SECONDS);
+ }
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/redis/TokenManager.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/redis/TokenManager.java
new file mode 100644
index 0000000..e102be3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/redis/TokenManager.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.redis;
+
+import org.springframework.stereotype.Component;
+
+//@Component
+public interface TokenManager {
+ /**
+ * 创建一个token关联上指定用户
+ *
+ * @param userId 指定用户的id
+ * @return 生成的token
+ */
+ public String createToken(String userId, String role);
+
+ /**
+ * 检查token是否有效
+ *
+ * @param token
+ * @return 是否有效
+ */
+ public boolean checkToken(String token);
+
+ /**
+ * 检查花城token是否有效
+ * @param token
+ * @return
+ */
+ public boolean checkHCToken(String token);
+
+ public long getUserId(String token);
+ public long getHCUserId(String token);
+
+ public void deleteToken(String token);
+
+ public String getTokenByUserId(String userId);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/HanyuPinyinHelper.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/HanyuPinyinHelper.java
new file mode 100644
index 0000000..f1a422c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/HanyuPinyinHelper.java
@@ -0,0 +1,128 @@
+package com.panzhihua.common.service;
+
+import net.sourceforge.pinyin4j.PinyinHelper;
+import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
+import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
+import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
+import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType;
+import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
+
+public class HanyuPinyinHelper {
+
+ public static String getFirstLettersUp(String ChineseLanguage) {
+ return getFirstLetters(ChineseLanguage, HanyuPinyinCaseType.UPPERCASE);
+ }
+
+ public static String getFirstLettersLo(String ChineseLanguage) {
+ return getFirstLetters(ChineseLanguage, HanyuPinyinCaseType.LOWERCASE);
+ }
+
+ public static String getFirstLetters(String ChineseLanguage, HanyuPinyinCaseType caseType) {
+ char[] cl_chars = ChineseLanguage.trim().toCharArray();
+ String hanyupinyin = "";
+ HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat();
+ defaultFormat.setCaseType(caseType);// 输出拼音全部大写
+ defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);// 不带声调
+ try {
+ for (int i = 0; i < cl_chars.length; i++) {
+ String str = String.valueOf(cl_chars[i]);
+ if (str.matches("[\u4e00-\u9fa5]+")) {// 如果字符是中文,则将中文转为汉语拼音,并取第一个字母
+ hanyupinyin += PinyinHelper.toHanyuPinyinStringArray(cl_chars[i], defaultFormat)[0].substring(0, 1);
+ } else if (str.matches("[0-9]+")) {// 如果字符是数字,取数字
+ hanyupinyin += cl_chars[i];
+ } else if (str.matches("[a-zA-Z]+")) {// 如果字符是字母,取字母
+ hanyupinyin += cl_chars[i];
+ } else {// 否则不转换
+ hanyupinyin += cl_chars[i];// 如果是标点符号的话，带着
+ }
+ }
+ } catch (BadHanyuPinyinOutputFormatCombination e) {
+ System.out.println("字符不能转成汉语拼音");
+ }
+ return hanyupinyin;
+ }
+
+ public static String getPinyinString(String ChineseLanguage) {
+ char[] cl_chars = ChineseLanguage.trim().toCharArray();
+ String hanyupinyin = "";
+ HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat();
+ defaultFormat.setCaseType(HanyuPinyinCaseType.LOWERCASE);// 输出拼音全部大写
+ defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);// 不带声调
+ try {
+ for (int i = 0; i < cl_chars.length; i++) {
+ String str = String.valueOf(cl_chars[i]);
+ if (str.matches("[\u4e00-\u9fa5]+")) {// 如果字符是中文,则将中文转为汉语拼音,并取第一个字母
+ hanyupinyin += PinyinHelper.toHanyuPinyinStringArray(cl_chars[i], defaultFormat)[0];
+ } else if (str.matches("[0-9]+")) {// 如果字符是数字,取数字
+ hanyupinyin += cl_chars[i];
+ } else if (str.matches("[a-zA-Z]+")) {// 如果字符是字母,取字母
+
+ hanyupinyin += cl_chars[i];
+ } else {// 否则不转换
+ }
+ }
+ } catch (BadHanyuPinyinOutputFormatCombination e) {
+ System.out.println("字符不能转成汉语拼音");
+ }
+ return hanyupinyin;
+ }
+
+ /**
+ * 取第一个汉字的第一个字符 @Title: getFirstLetter @Description: @return String @throws
+ */
+ public static String getFirstLetter(String ChineseLanguage) {
+ char[] cl_chars = ChineseLanguage.trim().toCharArray();
+ String hanyupinyin = "";
+ HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat();
+ defaultFormat.setCaseType(HanyuPinyinCaseType.UPPERCASE);// 输出拼音全部大写
+ defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);// 不带声调
+ try {
+ String str = String.valueOf(cl_chars[0]);
+ if (str.matches("[\u4e00-\u9fa5]+")) {// 如果字符是中文,则将中文转为汉语拼音,并取第一个字母
+ hanyupinyin = PinyinHelper.toHanyuPinyinStringArray(cl_chars[0], defaultFormat)[0].substring(0, 1);
+ } else if (str.matches("[0-9]+")) {// 如果字符是数字,取数字
+ hanyupinyin += cl_chars[0];
+ } else if (str.matches("[a-zA-Z]+")) {// 如果字符是字母,取字母
+
+ hanyupinyin += cl_chars[0];
+ } else {// 否则不转换
+
+ }
+ } catch (BadHanyuPinyinOutputFormatCombination e) {
+ System.out.println("字符不能转成汉语拼音");
+ }
+ return hanyupinyin;
+ }
+
+ public static void main(String[] args) {
+ HanyuPinyinHelper hanyuPinyinHelper = new HanyuPinyinHelper();
+ System.out.println(hanyuPinyinHelper.toHanyuPinyin("多发的发独守空房阿道夫打发第三方"));
+ }
+
+ /**
+ * 将文字转为汉语拼音
+ *
+ * @param chineselanguage
+ * 要转成拼音的中文
+ */
+ public String toHanyuPinyin(String ChineseLanguage) {
+ char[] cl_chars = ChineseLanguage.trim().toCharArray();
+ String hanyupinyin = "";
+ HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat();
+ defaultFormat.setCaseType(HanyuPinyinCaseType.LOWERCASE);// 输出拼音全部小写
+ defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);// 不带声调
+ defaultFormat.setVCharType(HanyuPinyinVCharType.WITH_V);
+ try {
+ for (int i = 0; i < cl_chars.length; i++) {
+ if (String.valueOf(cl_chars[i]).matches("[\u4e00-\u9fa5]+")) {// 如果字符是中文,则将中文转为汉语拼音
+ hanyupinyin += PinyinHelper.toHanyuPinyinStringArray(cl_chars[i], defaultFormat)[0];
+ } else {// 如果字符不是中文,则不转换
+ hanyupinyin += cl_chars[i];
+ }
+ }
+ } catch (BadHanyuPinyinOutputFormatCombination e) {
+ System.out.println("字符不能转成汉语拼音");
+ }
+ return hanyupinyin;
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java
new file mode 100644
index 0000000..2278cbd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/api/ApiServiceFeign.java
@@ -0,0 +1,92 @@
+package com.panzhihua.common.service.api;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.panzhihua.common.model.dtos.api.EventFile;
+import com.panzhihua.common.model.dtos.api.EventInfo;
+import com.panzhihua.common.model.vos.R;
+
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @author manailin desc 主要是提供给浪潮服务器上传事件
+ * @version 1.0
+ * @date 2021-05-26
+ * @since 1.0
+ */
+@FeignClient(name = "serviceApi")
+public interface ApiServiceFeign {
+
+ /**
+ * description 生成或更新redis里面的对接浪潮所需的token信息
+ *
+ * @param name
+ * 账号
+ * @param password
+ * 密码
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @GetMapping("get/token")
+ void getToken(@RequestParam("name") String name, @RequestParam("password") String password);
+
+ /**
+ * description 向浪潮服务器提交网格事件登记 *
+ *
+ * @param eventInfo
+ * 事件信息对象
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("lc/event/upload")
+ void automationUpload(@RequestBody EventInfo eventInfo);
+
+ /**
+ * description 提交事件登记关联的文件或者图片信息
+ *
+ * @param eventFile
+ * 文件对象
+ * @return R 上传结果
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("lc/event/upload/file")
+ R automationUploadFile(@RequestBody EventFile eventFile);
+
+ /**
+ * description 提交事件登记关联的文件或者图片信息
+ *
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @ApiOperation(value = "提交事件登记关联的文件或者图片信息")
+ @PostMapping("lc/event/upload/event_and_file")
+ void automationUploadEventAndFile();
+
+ /**
+ * description 自动上传重点人员和流动人员走访记录
+ *
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @ApiOperation(value = "自动上传重点人员和流动人员走访记录")
+ @GetMapping("lc/auto/upload/visit_record")
+ void automationUploadVisitRecord();
+
+ @ApiOperation(value = "获取所有或者根据姓名和工号查询,分页")
+ @GetMapping("lc/event/getGridMemberListByAreaIdOrName")
+ R getGridMemberListByAreaIdOrName(@RequestParam("areaId") String areaId, @RequestParam("param") String param,
+ @RequestParam("pageNum") Long pageNum, @RequestParam("pageSize") Long pageSize);
+
+ @ApiOperation(value = "获取指定区域网格树形列表，不包括具体的网格数据")
+ @GetMapping("lc/grid/tree")
+ R getGridTreeByAreaId(@RequestParam("areaId") String areaId);
+
+ @ApiOperation(value = "获取指定区域网格列表")
+ @GetMapping("lc/grid/list")
+ R getGridDataListByAreaId(@RequestParam("areaId") String areaId);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
new file mode 100644
index 0000000..559d4a0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
@@ -0,0 +1,186 @@
+package com.panzhihua.common.service.auth;
+
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.panzhihua.common.model.vos.R;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 认证授权
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 09:18
+ **/
+@FeignClient(name = "huacheng-auth")
+public interface TokenService {
+ /**
+ * 小程序用户登录
+ *
+ * @param openId
+ * 小程序唯一标识
+ * @return 登录结果
+ */
+ @PostMapping("/loginApplets")
+ R loginApplets(@RequestParam("openId") String openId,@RequestParam("appid")String appid);
+
+ /**
+ * 用户登出
+ *
+ * @param token
+ * 登录用户token
+ * @return 登出结果
+ */
+ @PostMapping("/logout")
+ R logout(@RequestParam("token") String token);
+
+ /**
+ * 社区后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginCommunityBackage")
+ R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
+
+ /**
+ * 小程序后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginAppletsBackStage")
+ R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
+
+ /**
+ * 认证中心刷新token
+ *
+ * @param refreshToken
+ * 用户端保存的刷新token
+ * @return 新的token 和刷新token
+ */
+ @PostMapping("/refreshToken")
+ R refreshToken(@RequestParam("refreshToken") String refreshToken);
+
+
+
+ @PostMapping("/getNewToken")
+ public R getNewToken(@RequestBody LoginUserInfoVO loginUserInfoVO);
+
+ /**
+ * 商家后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginShopBackStage")
+ R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
+
+ /**
+ * 网格综治APP登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginGridApp")
+ R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
+
+ /**
+ * 网格综治后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginGridBackstage")
+ R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
+
+ /**
+ * 城管后台登录
+ * @param account 账号
+ * @param password 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginCgBackage")
+ R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
+
+ /**
+ * 一键报警APP登录
+ * @param account 账号
+ * @param password 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginAlarmApp")
+ R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
+
+ /**
+ * 便民服务商家后台登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginMerchantBackStage")
+ R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
+
+ /**
+ * 西区大屏登录
+ * @param account 账号
+ * @param password 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginXQDP")
+ R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
+
+ /**
+ * 微商业街用户登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginMcsUser")
+ R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
+
+ /**
+ * 天府通办登录
+ * @param account
+ * @param password
+ * @param appid
+ * @return
+ */
+ @GetMapping("/tfLogin")
+ R tfLogin(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("appid")String appid);
+ /**
+ * 电动车商城后台用户登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginBatteryUser")
+ R loginBatteryUser(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/bracelet/CommunityBraceletService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/bracelet/CommunityBraceletService.java
new file mode 100644
index 0000000..5a15a91
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/bracelet/CommunityBraceletService.java
@@ -0,0 +1,133 @@
+package com.panzhihua.common.service.bracelet;
+
+import com.panzhihua.common.model.dtos.bracelet.BraceletEarlyWarningDO;
+import com.panzhihua.common.model.dtos.bracelet.BraceletUserDataDO;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+@FeignClient(name = "bracelet")
+public interface CommunityBraceletService
+{
+ @PostMapping("/braceletApi/addBracelet")
+ R addBracelet(@RequestBody BraceletUserDataDO braceletUserDataDO);
+
+
+ @PostMapping("/braceletApi/upBracelet")
+ R upBracelet(@RequestBody BraceletUserDataDO braceletUserDataDO);
+
+
+ @DeleteMapping("/braceletApi/delectData")
+ R delectData(@RequestParam("id") String id);
+
+ @GetMapping("/braceletApi/getData")
+ R getData(@RequestParam("pageNum") Integer pageNum,
+ @RequestParam("pageSize") Integer pageSize,
+ @RequestParam(value = "communityId",required = false) String communityId,
+ @RequestParam(value = "userName",required = false) String userName,
+ @RequestParam(value = "phone",required = false) String phone);
+
+ /**
+ * 设备用户详情数据
+ * @return
+ */
+ @GetMapping("/braceletApi/getDetails")
+ R getDetails(@RequestParam("deviceID") String deviceID);
+
+
+
+
+ /**
+ * 编辑手环预警数据
+ * @param braceletEarlyWarningDO
+ * @return
+ */
+ @PostMapping("/braceletApi/upEarlyWarning")
+ R upEarlyWarning(@RequestBody BraceletEarlyWarningDO braceletEarlyWarningDO) ;
+
+ /**
+ * 删除预警数据
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/braceletApi/delectEarlyWarning")
+ R delectEarlyWarning(@RequestParam("id") String id);
+
+ /**
+ * 获取预警数据
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/braceletApi/getEarlyWarningList")
+ R getList(@RequestParam("pageNum") Integer pageNum,
+ @RequestParam("pageSize") Integer pageSize,
+ @RequestParam(value = "communityId",required = false) String communityId,
+ @RequestParam(value = "equipmentNumber",required = false) String equipmentNumber,
+ @RequestParam(value = "disposeUserId",required = false) String disposeUserId,
+ @RequestParam(value = "type",required = false) String type,
+ @RequestParam(value = "userName",required = false) String userName,
+ @RequestParam(value = "phone",required = false) String phone);
+
+ /**
+ * 获取单个预警信息详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/braceletApi/getEarlyWarningDetails")
+ R getEarlyWarningDetails(@RequestParam("id") String id);
+
+ /**
+ * 后台处理接口
+ * @return
+ */
+ @PostMapping("/braceletApi/dispose")
+ R dispose(@RequestBody BraceletEarlyWarningDO braceletEarlyWarningDO);
+
+
+ /**
+ * 微信处理接口
+ * @param braceletEarlyWarningDO
+ * @return
+ */
+ @PostMapping("/braceletApi/WXdispose")
+ R WXdispose(@RequestBody BraceletEarlyWarningDO braceletEarlyWarningDO);
+
+
+
+ /**
+ * 处理人
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/braceletApi/conductorList")
+ R conductorList(@RequestParam("communityId") String communityId);
+
+
+ /******************************************************************************************************************************
+ *
+ * 大屏居家养老
+ *
+ *****************************************************************************************************************************/
+ /**
+ * 手环人数
+ * @return
+ */
+ @GetMapping("/braceletApi/getUserNum")
+ public R getUserNum(@RequestParam("communityId") String communityId);
+
+ /**
+ * 手环定位数据
+ */
+ @GetMapping("/braceletApi/getUserList")
+ public R getUserList(@RequestParam("communityId") String communityId);
+
+ /**
+ * 获取手环预警次数
+ * @return
+ */
+ @GetMapping("/braceletApi/getWarningNum")
+ public R getWarningNum(@RequestParam("communityId") String communityId,
+ @RequestParam(value = "disposeType",required = false) String disposeType);
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoEvaluateFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoEvaluateFeign.java
new file mode 100644
index 0000000..c86b569
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoEvaluateFeign.java
@@ -0,0 +1,85 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * title: 随手拍、微心愿评价表业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 随手拍、微心愿评价表业务层接口
+ *
+ * @author lyq
+ * @date 2022-03-01 13:44:43
+ */
+@FeignClient(name = "huacheng-community", contextId = "comActEasyPhotoEvaluate", path = "comActEasyPhotoEvaluate")
+public interface ComActEasyPhotoEvaluateFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comActEasyPhotoEvaluate 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-03-01 13:44:43
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate);
+
+ /**
+ * description insert 新增数据
+ *
+ * @param comActEasyPhotoEvaluate 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-03-01 13:44:43
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comActEasyPhotoEvaluate 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-03-01 13:44:43
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-03-01 13:44:43
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-01 13:44:43
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id);
+
+ /**
+ * 随手拍评价
+ * @param whistleDto 请求参数
+ * @return 评价结果
+ */
+ @PostMapping("/easy/evaluate")
+ R evaluateEasyApplets(@RequestBody EvaluateEasyDto whistleDto);
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoHandlerFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoHandlerFeign.java
new file mode 100644
index 0000000..744a2f1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoHandlerFeign.java
@@ -0,0 +1,77 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * title: 随手拍、微心愿处理人绑定表业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 随手拍、微心愿处理人绑定表业务层接口
+ *
+ * @author lyq
+ * @date 2022-03-01 13:45:12
+ */
+@FeignClient(name = "huacheng-community", contextId = "comActEasyPhotoHandler", path = "comActEasyPhotoHandler")
+public interface ComActEasyPhotoHandlerFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comActEasyPhotoHandler 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-03-01 13:45:12
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler);
+
+ /**
+ * description insert 新增数据
+ *
+ * @param comActEasyPhotoHandler 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-03-01 13:45:12
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComActEasyPhotoHandlerDto comActEasyPhotoHandler);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comActEasyPhotoHandler 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-03-01 13:45:12
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-03-01 13:45:12
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-01 13:45:12
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id);
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityActivityFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityActivityFeign.java
new file mode 100644
index 0000000..8e48190
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityActivityFeign.java
@@ -0,0 +1,136 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * title: 电动车商城-商家活动表业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-商家活动表业务层接口
+ *
+ * @author lyq
+ * @date 2022-03-29 13:17:41
+ */
+@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comBatteryCommodityActivity", path = "comBatteryCommodityActivity")
+public interface ComBatteryCommodityActivityFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryCommodityActivity 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-03-29 13:17:41
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComBatteryCommodityActivityDto comBatteryCommodityActivity);
+
+ /**
+ * description insert 新增数据
+ *
+ * @param comBatteryCommodityActivity 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-03-29 13:17:41
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComBatteryCommodityActivityDto comBatteryCommodityActivity);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comBatteryCommodityActivity 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-03-29 13:17:41
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComBatteryCommodityActivityDto comBatteryCommodityActivity);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-03-29 13:17:41
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-29 13:17:41
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id,@RequestParam("userId") Long userId);
+
+ /**
+ * description queryByList 查询列表
+ *
+ * @param comBatteryCommodityActivity 请求参数
+ * @return 查询列表数据
+ * @author lyq
+ * @date 2022-03-29 13:17:41
+ */
+ @PostMapping("/list")
+ R queryByList(@RequestBody PageComBatteryCommodityActivityDto comBatteryCommodityActivity);
+
+ /**
+ * 修改活动状态
+ * @param id 活动id
+ * @param status 状态
+ * @return 修改结果
+ */
+ @GetMapping("/updateStatus")
+ R updateStatus(@RequestParam("id") Long id,@RequestParam("status") Integer status);
+
+ /**
+ * 创建拼团订单
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @PostMapping("/start/fight")
+ R startFight(@RequestBody StartFightOrderDto orderDto);
+
+ /**
+ * 创建砍价订单
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @PostMapping("/start/bargain")
+ R startBargain(@RequestBody StartBargainOrderDto orderDto);
+
+ /**
+ * 帮好友砍价
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @PostMapping("/start/user/bargain")
+ R startUserBargain(@RequestBody StartUserBargainOrderDto orderDto);
+
+ /**
+ * 查询砍价记录详情
+ * @param id 砍价记录id
+ * @return 创建订单结果
+ */
+ @GetMapping("/user/bargain")
+ R getUserBargain(@RequestParam("id") Long id);
+
+ /**
+ * 创建秒杀订单
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @PostMapping("/start/seckill")
+ R startSeckill(@RequestBody StartSeckillOrderDto orderDto);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityFeign.java
new file mode 100644
index 0000000..f1ad19a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityFeign.java
@@ -0,0 +1,104 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * title: 电动车商城-商品表业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-商品表业务层接口
+ *
+ * @author lyq
+ * @date 2022-03-28 15:00:00
+ */
+@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comBatteryCommodity", path = "comBatteryCommodity")
+public interface ComBatteryCommodityFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryCommodity 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-03-28 15:00:00
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComBatteryCommodityDto comBatteryCommodity);
+
+ /**
+ * description insert 新增数据
+ *
+ * @param comBatteryCommodity 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-03-28 15:00:00
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComBatteryCommodityDto comBatteryCommodity);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comBatteryCommodity 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-03-28 15:00:00
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComBatteryCommodityDto comBatteryCommodity);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-03-28 15:00:00
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-28 15:00:00
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id);
+
+ /**
+ * description queryByList 查询列表
+ *
+ * @param comBatteryCommodity 请求参数
+ * @return 查询列表数据
+ * @author lyq
+ * @date 2022-03-28 15:00:00
+ */
+ @PostMapping("/list")
+ R queryByList(@RequestBody PageComBatteryCommodityDto comBatteryCommodity);
+
+ /**
+ * 修改商品状态
+ * @param id 商品id
+ * @param status 商品状态
+ * @return 修改结果
+ */
+ @GetMapping("/updateStatus")
+ R updateStatus(@RequestParam("id") Long id,@RequestParam("status") Integer status);
+
+ /**
+ * 小程序查询商品列表
+ * @param comBatteryCommodity 请求参数
+ * @return 商品列表
+ */
+ @PostMapping("/applets/page")
+ R queryByAppletsPage(@RequestBody PageComBatteryCommodityDto comBatteryCommodity);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderBargainFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderBargainFeign.java
new file mode 100644
index 0000000..9461e61
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderBargainFeign.java
@@ -0,0 +1,87 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * title: 电动车商城-砍价订单记录表业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-砍价订单记录表业务层接口
+ *
+ * @author lyq
+ * @date 2022-03-29 16:06:38
+ */
+@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comBatteryCommodityOrderBargain", path = "comBatteryCommodityOrderBargain")
+public interface ComBatteryCommodityOrderBargainFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryCommodityOrderBargain 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-03-29 16:06:38
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComBatteryCommodityOrderBargainDto comBatteryCommodityOrderBargain);
+
+ /**
+ * description insert 新增数据
+ *
+ * @param comBatteryCommodityOrderBargain 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-03-29 16:06:38
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComBatteryCommodityOrderBargainDto comBatteryCommodityOrderBargain);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comBatteryCommodityOrderBargain 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-03-29 16:06:38
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComBatteryCommodityOrderBargainDto comBatteryCommodityOrderBargain);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-03-29 16:06:38
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-29 16:06:38
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id);
+
+ /**
+ * description queryByList 查询列表
+ *
+ * @param comBatteryCommodityOrderBargain 请求参数
+ * @return 查询列表数据
+ * @author lyq
+ * @date 2022-03-29 16:06:38
+ */
+ @PostMapping("/list")
+ R queryByList(@RequestBody PageComBatteryCommodityOrderBargainDto comBatteryCommodityOrderBargain);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderBargainRecordFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderBargainRecordFeign.java
new file mode 100644
index 0000000..7cf2710
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderBargainRecordFeign.java
@@ -0,0 +1,87 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * title: 电动车商城-订单砍价记录表业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-订单砍价记录表业务层接口
+ *
+ * @author lyq
+ * @date 2022-03-29 16:06:49
+ */
+@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comBatteryCommodityOrderBargainRecord", path = "comBatteryCommodityOrderBargainRecord")
+public interface ComBatteryCommodityOrderBargainRecordFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryCommodityOrderBargainRecord 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-03-29 16:06:49
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComBatteryCommodityOrderBargainRecordDto comBatteryCommodityOrderBargainRecord);
+
+ /**
+ * description insert 新增数据
+ *
+ * @param comBatteryCommodityOrderBargainRecord 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-03-29 16:06:49
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComBatteryCommodityOrderBargainRecordDto comBatteryCommodityOrderBargainRecord);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comBatteryCommodityOrderBargainRecord 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-03-29 16:06:49
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComBatteryCommodityOrderBargainRecordDto comBatteryCommodityOrderBargainRecord);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-03-29 16:06:49
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-29 16:06:49
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id);
+
+ /**
+ * description queryByList 查询列表
+ *
+ * @param comBatteryCommodityOrderBargainRecord 请求参数
+ * @return 查询列表数据
+ * @author lyq
+ * @date 2022-03-29 16:06:49
+ */
+ @PostMapping("/list")
+ R queryByList(@RequestBody PageComBatteryCommodityOrderBargainRecordDto comBatteryCommodityOrderBargainRecord);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderCollageTeamFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderCollageTeamFeign.java
new file mode 100644
index 0000000..df41692
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderCollageTeamFeign.java
@@ -0,0 +1,87 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * title: 电动车商城-拼团订单团队表业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-拼团订单团队表业务层接口
+ *
+ * @author lyq
+ * @date 2022-03-29 16:07:00
+ */
+@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comBatteryCommodityOrderCollageTeam", path = "comBatteryCommodityOrderCollageTeam")
+public interface ComBatteryCommodityOrderCollageTeamFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryCommodityOrderCollageTeam 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-03-29 16:07:00
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComBatteryCommodityOrderCollageTeamDto comBatteryCommodityOrderCollageTeam);
+
+ /**
+ * description insert 新增数据
+ *
+ * @param comBatteryCommodityOrderCollageTeam 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-03-29 16:07:00
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComBatteryCommodityOrderCollageTeamDto comBatteryCommodityOrderCollageTeam);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comBatteryCommodityOrderCollageTeam 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-03-29 16:07:00
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComBatteryCommodityOrderCollageTeamDto comBatteryCommodityOrderCollageTeam);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-03-29 16:07:00
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-29 16:07:00
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id,@RequestParam("userId") Long userId);
+
+ /**
+ * description queryByList 查询列表
+ *
+ * @param comBatteryCommodityOrderCollageTeam 请求参数
+ * @return 查询列表数据
+ * @author lyq
+ * @date 2022-03-29 16:07:00
+ */
+ @PostMapping("/list")
+ R queryByList(@RequestBody PageComBatteryCommodityOrderCollageTeamDto comBatteryCommodityOrderCollageTeam);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderCollageTeamPeopleFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderCollageTeamPeopleFeign.java
new file mode 100644
index 0000000..ad990b0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderCollageTeamPeopleFeign.java
@@ -0,0 +1,87 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * title: 电动车商城-拼团活动团队人员表业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-拼团活动团队人员表业务层接口
+ *
+ * @author lyq
+ * @date 2022-03-29 16:07:12
+ */
+@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comBatteryCommodityOrderCollageTeamPeople", path = "comBatteryCommodityOrderCollageTeamPeople")
+public interface ComBatteryCommodityOrderCollageTeamPeopleFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryCommodityOrderCollageTeamPeople 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-03-29 16:07:12
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComBatteryCommodityOrderCollageTeamPeopleDto comBatteryCommodityOrderCollageTeamPeople);
+
+ /**
+ * description insert 新增数据
+ *
+ * @param comBatteryCommodityOrderCollageTeamPeople 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-03-29 16:07:12
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComBatteryCommodityOrderCollageTeamPeopleDto comBatteryCommodityOrderCollageTeamPeople);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comBatteryCommodityOrderCollageTeamPeople 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-03-29 16:07:12
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComBatteryCommodityOrderCollageTeamPeopleDto comBatteryCommodityOrderCollageTeamPeople);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-03-29 16:07:12
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-29 16:07:12
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id);
+
+ /**
+ * description queryByList 查询列表
+ *
+ * @param comBatteryCommodityOrderCollageTeamPeople 请求参数
+ * @return 查询列表数据
+ * @author lyq
+ * @date 2022-03-29 16:07:12
+ */
+ @PostMapping("/list")
+ R queryByList(@RequestBody PageComBatteryCommodityOrderCollageTeamPeopleDto comBatteryCommodityOrderCollageTeamPeople);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderFeign.java
new file mode 100644
index 0000000..206bbef
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityOrderFeign.java
@@ -0,0 +1,152 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.dtos.shop.WxPayNotifyOrderDTO;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * title: 电动车商城-订单表业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-订单表业务层接口
+ *
+ * @author lyq
+ * @date 2022-03-29 13:18:46
+ */
+@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comBatteryCommodityOrder", path = "comBatteryCommodityOrder")
+public interface ComBatteryCommodityOrderFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryCommodityOrder 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-03-29 13:18:46
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComBatteryCommodityOrderDto comBatteryCommodityOrder);
+
+ /**
+ * description insert 新增数据
+ *
+ * @param comBatteryCommodityOrder 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-03-29 13:18:46
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComBatteryCommodityOrderDto comBatteryCommodityOrder);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comBatteryCommodityOrder 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-03-29 13:18:46
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComBatteryCommodityOrderDto comBatteryCommodityOrder);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-03-29 13:18:46
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-29 13:18:46
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id);
+
+ /**
+ * description queryByList 查询列表
+ *
+ * @param comBatteryCommodityOrder 请求参数
+ * @return 查询列表数据
+ * @author lyq
+ * @date 2022-03-29 13:18:46
+ */
+ @PostMapping("/list")
+ R queryByList(@RequestBody PageComBatteryCommodityOrderDto comBatteryCommodityOrder);
+
+ /**
+ * 修改订单收货地址
+ * @param editOrderAddressDto 请求参数
+ * @return 修改结果
+ */
+ @PutMapping("/update/address")
+ R updateOrderAddress(@RequestBody EditOrderAddressDto editOrderAddressDto);
+
+ /**
+ * 修改订单物流信息
+ * @param editOrderLogisticsDto 请求参数
+ * @return 修改结果
+ */
+ @PutMapping("/update/logistics")
+ R updateOrderLogistics(@RequestBody EditOrderLogisticsDto editOrderLogisticsDto);
+
+ /**
+ * 小程序用户创建订单
+ * @param createOrderDto 请求参数
+ * @return 创建结果
+ */
+ @PostMapping("/applets/create")
+ R appletsOrderCreate(@RequestBody UserCreateOrderDto createOrderDto);
+
+ /**
+ * 电动车商城购买商品支付回调
+ * @param notifyOrderDTO 请求参数
+ * @return 购买商品支付回调
+ */
+ @PostMapping("/batteryPayNotify")
+ R batteryPayNotify(@RequestBody WxPayNotifyOrderDTO notifyOrderDTO);
+
+ /**
+ * 定时关闭5分钟未支付订单
+ * @return 操作结果
+ */
+ @GetMapping("/sync/close/order")
+ R syncCloseOrder();
+
+ /**
+ * 用户确认收货
+ * @param id 订单id
+ * @param userId 用户id
+ * @return 确认结果
+ */
+ @GetMapping("/applets/receiving")
+ R appletsOrderReceiving(@RequestParam("id") Long id,@RequestParam("userId") Long userId);
+
+ /**
+ * 后台订单发货
+ * @param deliverAdminDto 请求参数
+ * @return 发货结果
+ */
+ @PostMapping("/deliver")
+ R orderDeliver(@RequestBody OrderDeliverAdminDto deliverAdminDto);
+
+ /**
+ * 电动车商城购买活动商品支付回调
+ * @param notifyOrderDTO 请求参数
+ * @return 购买商品支付回调
+ */
+ @PostMapping("/batteryActivityPayNotify")
+ R batteryActivityPayNotify(@RequestBody WxPayNotifyOrderDTO notifyOrderDTO);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommoditySpecsFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommoditySpecsFeign.java
new file mode 100644
index 0000000..8205357
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommoditySpecsFeign.java
@@ -0,0 +1,87 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * title: 电动车商城-商品规格表业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-商品规格表业务层接口
+ *
+ * @author lyq
+ * @date 2022-03-28 15:16:22
+ */
+@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comBatteryCommoditySpecs", path = "comBatteryCommoditySpecs")
+public interface ComBatteryCommoditySpecsFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryCommoditySpecs 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-03-28 15:16:22
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComBatteryCommoditySpecsDto comBatteryCommoditySpecs);
+
+ /**
+ * description insert 新增数据
+ *
+ * @param comBatteryCommoditySpecs 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-03-28 15:16:22
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComBatteryCommoditySpecsDto comBatteryCommoditySpecs);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comBatteryCommoditySpecs 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-03-28 15:16:22
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComBatteryCommoditySpecsDto comBatteryCommoditySpecs);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-03-28 15:16:22
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-28 15:16:22
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id);
+
+ /**
+ * description queryByList 查询列表
+ *
+ * @param comBatteryCommoditySpecs 请求参数
+ * @return 查询列表数据
+ * @author lyq
+ * @date 2022-03-28 15:16:22
+ */
+ @PostMapping("/list")
+ R queryByList(@RequestBody PageComBatteryCommoditySpecsDto comBatteryCommoditySpecs);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryStoreClassFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryStoreClassFeign.java
new file mode 100644
index 0000000..9462a74
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryStoreClassFeign.java
@@ -0,0 +1,104 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * title: 电动车商城-商家分类表业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-商家分类表业务层接口
+ *
+ * @author lyq
+ * @date 2022-03-29 11:01:57
+ */
+@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comBatteryStoreClass", path = "comBatteryStoreClass")
+public interface ComBatteryStoreClassFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryStoreClass 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-03-29 11:01:57
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComBatteryStoreClassDto comBatteryStoreClass);
+
+ /**
+ * description insert 新增数据
+ *
+ * @param comBatteryStoreClass 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-03-29 11:01:57
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComBatteryStoreClassDto comBatteryStoreClass);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comBatteryStoreClass 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-03-29 11:01:57
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComBatteryStoreClassDto comBatteryStoreClass);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-03-29 11:01:57
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-29 11:01:57
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id);
+
+ /**
+ * description queryByList 查询列表
+ *
+ * @param comBatteryStoreClass 请求参数
+ * @return 查询列表数据
+ * @author lyq
+ * @date 2022-03-29 11:01:57
+ */
+ @PostMapping("/list")
+ R queryByList(@RequestBody PageComBatteryStoreClassDto comBatteryStoreClass);
+
+ /**
+ * 修改分类状态
+ * @param id 分类id
+ * @param status 状态
+ * @return 修改结果
+ */
+ @GetMapping("/updateStatus")
+ R updateStatus(@RequestParam("id") Long id,@RequestParam("status") Integer status);
+
+ /**
+ * 小程序查询商家分类列表以及分类下商品列表
+ * @param comBatteryStoreClass 请求参数
+ * @return 商家分类列表以及分类下商品列表
+ */
+ @PostMapping("/applets/list")
+ R queryByAppletsList(@RequestBody PageComBatteryStoreClassDto comBatteryStoreClass);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryStoreFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryStoreFeign.java
new file mode 100644
index 0000000..771a6e9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryStoreFeign.java
@@ -0,0 +1,96 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * title: 电动车商城-商家表业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-商家表业务层接口
+ *
+ * @author lyq
+ * @date 2022-03-28 13:45:06
+ */
+@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comBatteryStore", path = "comBatteryStore")
+public interface ComBatteryStoreFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryStore 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-03-28 13:45:06
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComBatteryStoreDto comBatteryStore);
+
+ /**
+ * description insert 新增数据
+ *
+ * @param comBatteryStore 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-03-28 13:45:06
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComBatteryStoreDto comBatteryStore);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comBatteryStore 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-03-28 13:45:06
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComBatteryStoreDto comBatteryStore);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-03-28 13:45:06
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-28 13:45:06
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id);
+
+ /**
+ * description queryByList 查询列表
+ *
+ * @param comBatteryStore 请求参数
+ * @return 查询列表数据
+ * @author lyq
+ * @date 2022-03-28 13:45:06
+ */
+ @PostMapping("/list")
+ R queryByList(@RequestBody PageComBatteryStoreDto comBatteryStore);
+
+ /**
+ * 修改电动车商家后台用户密码
+ * @param storeId 商家后台用户id
+ * @param passWord 用户需要修改的密码
+ * @return 重置密码结果
+ */
+ @GetMapping("/resetPassword")
+ R resetPassword(@RequestParam("storeId") Long storeId,@RequestParam("passWord") String passWord);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryUserAddressFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryUserAddressFeign.java
new file mode 100644
index 0000000..3652f86
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryUserAddressFeign.java
@@ -0,0 +1,95 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * title: 电动车商城-用户收货地址表业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-用户收货地址表业务层接口
+ *
+ * @author lyq
+ * @date 2022-03-29 13:18:21
+ */
+@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comBatteryUserAddress", path = "comBatteryUserAddress")
+public interface ComBatteryUserAddressFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comBatteryUserAddress 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-03-29 13:18:21
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComBatteryUserAddressDto comBatteryUserAddress);
+
+ /**
+ * description insert 新增数据
+ *
+ * @param comBatteryUserAddress 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-03-29 13:18:21
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComBatteryUserAddressDto comBatteryUserAddress);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comBatteryUserAddress 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-03-29 13:18:21
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComBatteryUserAddressDto comBatteryUserAddress);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-03-29 13:18:21
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-03-29 13:18:21
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id);
+
+ /**
+ * description queryByList 查询列表
+ *
+ * @param comBatteryUserAddress 请求参数
+ * @return 查询列表数据
+ * @author lyq
+ * @date 2022-03-29 13:18:21
+ */
+ @PostMapping("/list")
+ R queryByList(@RequestBody PageComBatteryUserAddressDto comBatteryUserAddress);
+
+ /**
+ * 查询用户默认收货地址
+ * @param userId 用户id
+ * @return 用户默认收货地址
+ */
+ @PostMapping("/default/address")
+ R getDefaultAddress(@RequestParam("userId") Long userId);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarBrandFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarBrandFeign.java
new file mode 100644
index 0000000..e9b5b1a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarBrandFeign.java
@@ -0,0 +1,87 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * title: 换新车-品牌表业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-品牌表业务层接口
+ *
+ * @author lyq
+ * @date 2022-04-07 13:37:25
+ */
+@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comChangeCarBrand", path = "comChangeCarBrand")
+public interface ComChangeCarBrandFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comChangeCarBrand 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-04-07 13:37:25
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComChangeCarBrandDto comChangeCarBrand);
+
+ /**
+ * description insert 新增数据
+ *
+ * @param comChangeCarBrand 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-04-07 13:37:25
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComChangeCarBrandDto comChangeCarBrand);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comChangeCarBrand 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-04-07 13:37:25
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComChangeCarBrandDto comChangeCarBrand);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-04-07 13:37:25
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-04-07 13:37:25
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id);
+
+ /**
+ * description queryByList 查询列表
+ *
+ * @param comChangeCarBrand 请求参数
+ * @return 查询列表数据
+ * @author lyq
+ * @date 2022-04-07 13:37:25
+ */
+ @PostMapping("/list")
+ R queryByList(@RequestBody PageComChangeCarBrandDto comChangeCarBrand);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarInquiryFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarInquiryFeign.java
new file mode 100644
index 0000000..f830209
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarInquiryFeign.java
@@ -0,0 +1,87 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * title: 换新车-分期询价表业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-分期询价表业务层接口
+ *
+ * @author lyq
+ * @date 2022-04-07 13:39:07
+ */
+@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comChangeCarInquiry", path = "comChangeCarInquiry")
+public interface ComChangeCarInquiryFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comChangeCarInquiry 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-04-07 13:39:07
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComChangeCarInquiryDto comChangeCarInquiry);
+
+ /**
+ * description insert 新增数据
+ *
+ * @param comChangeCarInquiry 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-04-07 13:39:07
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComChangeCarInquiryDto comChangeCarInquiry);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comChangeCarInquiry 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-04-07 13:39:07
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComChangeCarInquiryDto comChangeCarInquiry);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-04-07 13:39:07
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-04-07 13:39:07
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id);
+
+ /**
+ * description queryByList 查询列表
+ *
+ * @param comChangeCarInquiry 请求参数
+ * @return 查询列表数据
+ * @author lyq
+ * @date 2022-04-07 13:39:07
+ */
+ @PostMapping("/list")
+ R queryByList(@RequestBody PageComChangeCarInquiryDto comChangeCarInquiry);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarModelFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarModelFeign.java
new file mode 100644
index 0000000..a10465b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarModelFeign.java
@@ -0,0 +1,96 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * title: 换新车-车型管理表业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-车型管理表业务层接口
+ *
+ * @author lyq
+ * @date 2022-04-07 13:41:57
+ */
+@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comChangeCarModel", path = "comChangeCarModel")
+public interface ComChangeCarModelFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comChangeCarModel 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-04-07 13:41:57
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComChangeCarModelDto comChangeCarModel);
+
+ /**
+ * description insert 新增数据
+ *
+ * @param comChangeCarModel 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-04-07 13:41:57
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComChangeCarModelDto comChangeCarModel);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comChangeCarModel 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-04-07 13:41:57
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComChangeCarModelDto comChangeCarModel);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-04-07 13:41:57
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-04-07 13:41:57
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id);
+
+ /**
+ * description queryByList 查询列表
+ *
+ * @param comChangeCarModel 请求参数
+ * @return 查询列表数据
+ * @author lyq
+ * @date 2022-04-07 13:41:57
+ */
+ @PostMapping("/list")
+ R queryByList(@RequestBody PageComChangeCarModelDto comChangeCarModel);
+
+ /**
+ * 修改车型状态
+ * @param id 车型id
+ * @param status 车型状态
+ * @return 修改结果
+ */
+ @GetMapping("/updateStatus")
+ R updateStatus(@RequestParam("id") Long id,@RequestParam("status") Integer status);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarModelRelationFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarModelRelationFeign.java
new file mode 100644
index 0000000..b0d9a74
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarModelRelationFeign.java
@@ -0,0 +1,98 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * title: 换新车-车型与规格关联表业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-车型与规格关联表业务层接口
+ *
+ * @author lyq
+ * @date 2022-04-07 13:55:31
+ */
+@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comChangeCarModelRelation", path = "comChangeCarModelRelation")
+public interface ComChangeCarModelRelationFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comChangeCarModelRelation 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-04-07 13:55:31
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComChangeCarModelRelationDto comChangeCarModelRelation);
+
+ /**
+ * description insert 新增数据
+ *
+ * @param comChangeCarModelRelation 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-04-07 13:55:31
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComChangeCarModelRelationDto comChangeCarModelRelation);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comChangeCarModelRelation 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-04-07 13:55:31
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComChangeCarModelRelationDto comChangeCarModelRelation);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-04-07 13:55:31
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-04-07 13:55:31
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id);
+
+ /**
+ * description queryByList 查询列表
+ *
+ * @param comChangeCarModelRelation 请求参数
+ * @return 查询列表数据
+ * @author lyq
+ * @date 2022-04-07 13:55:31
+ */
+ @PostMapping("/list")
+ R queryByList(@RequestBody PageComChangeCarModelRelationDto comChangeCarModelRelation);
+
+ /**
+ * description queryByPage 小程序分页查询
+ *
+ * @param comChangeCarModelRelation 请求参数
+ * @return 小程序分页查询列表数据
+ * @author lyq
+ * @date 2022-04-07 13:41:57
+ */
+ @PostMapping("/applets/page")
+ R queryByAppletsPage(@RequestBody PageComChangeCarModelRelationDto comChangeCarModelRelation);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarModelSpecsChildrenFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarModelSpecsChildrenFeign.java
new file mode 100644
index 0000000..65b8b4f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarModelSpecsChildrenFeign.java
@@ -0,0 +1,87 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * title: 换新车-车型子规格表业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-车型子规格表业务层接口
+ *
+ * @author lyq
+ * @date 2022-04-07 13:55:35
+ */
+@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comChangeCarModelSpecsChildren", path = "comChangeCarModelSpecsChildren")
+public interface ComChangeCarModelSpecsChildrenFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comChangeCarModelSpecsChildren 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-04-07 13:55:35
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComChangeCarModelSpecsChildrenDto comChangeCarModelSpecsChildren);
+
+ /**
+ * description insert 新增数据
+ *
+ * @param comChangeCarModelSpecsChildren 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-04-07 13:55:35
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComChangeCarModelSpecsChildrenDto comChangeCarModelSpecsChildren);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comChangeCarModelSpecsChildren 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-04-07 13:55:35
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComChangeCarModelSpecsChildrenDto comChangeCarModelSpecsChildren);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-04-07 13:55:35
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-04-07 13:55:35
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id);
+
+ /**
+ * description queryByList 查询列表
+ *
+ * @param comChangeCarModelSpecsChildren 请求参数
+ * @return 查询列表数据
+ * @author lyq
+ * @date 2022-04-07 13:55:35
+ */
+ @PostMapping("/list")
+ R queryByList(@RequestBody PageComChangeCarModelSpecsChildrenDto comChangeCarModelSpecsChildren);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarModelSpecsFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarModelSpecsFeign.java
new file mode 100644
index 0000000..d158562
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComChangeCarModelSpecsFeign.java
@@ -0,0 +1,87 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * title: 换新车-车型规格表业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 换新车-车型规格表业务层接口
+ *
+ * @author lyq
+ * @date 2022-04-07 13:55:33
+ */
+@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comChangeCarModelSpecs", path = "comChangeCarModelSpecs")
+public interface ComChangeCarModelSpecsFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comChangeCarModelSpecs 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-04-07 13:55:33
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComChangeCarModelSpecsDto comChangeCarModelSpecs);
+
+ /**
+ * description insert 新增数据
+ *
+ * @param comChangeCarModelSpecs 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-04-07 13:55:33
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComChangeCarModelSpecsDto comChangeCarModelSpecs);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comChangeCarModelSpecs 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-04-07 13:55:33
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComChangeCarModelSpecsDto comChangeCarModelSpecs);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-04-07 13:55:33
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-04-07 13:55:33
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id);
+
+ /**
+ * description queryByList 查询列表
+ *
+ * @param comChangeCarModelSpecs 请求参数
+ * @return 查询列表数据
+ * @author lyq
+ * @date 2022-04-07 13:55:33
+ */
+ @PostMapping("/list")
+ R queryByList(@RequestBody PageComChangeCarModelSpecsDto comChangeCarModelSpecs);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionInspectionFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionInspectionFeign.java
new file mode 100644
index 0000000..032ace6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionInspectionFeign.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.model.dtos.equipment.UnionInspectionDto;
+import com.panzhihua.common.model.dtos.equipment.UnionReportDto;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+@FeignClient(name = Constants.SERVICE_EQUIPMENT, contextId = "unionInspection", path = "unionInspection")
+public interface ComEquipmentUnionInspectionFeign {
+
+
+ /**
+ * 新增户外劳工站巡查
+ *
+ * @param unionInspectionDto
+ * @return 新增结果
+ */
+ @PostMapping("/add")
+ R add(UnionInspectionDto unionInspectionDto);
+
+
+ /**
+ * 分页户外劳工站巡查
+ *
+ * @param unionInspectionDto
+ * @return 动态结果
+ */
+ @PostMapping("/query")
+ R query(UnionInspectionDto unionInspectionDto);
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionOutdoorLaborDynamicFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionOutdoorLaborDynamicFeign.java
new file mode 100644
index 0000000..90735b4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionOutdoorLaborDynamicFeign.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.model.dtos.equipment.UnionOutdoorLaborDynamicDto;
+import com.panzhihua.common.model.vos.R;
+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;
+
+@FeignClient(name = Constants.SERVICE_EQUIPMENT, contextId = "unionOutdoorLaborDynamic", path = "unionOutdoorLaborDynamic")
+public interface ComEquipmentUnionOutdoorLaborDynamicFeign {
+
+ /**
+ * 分页总工会-户外劳工站-动态
+ *
+ * @param unionOutdoorLaborDynamicDto
+ * @return 动态结果
+ */
+ @PostMapping("/page")
+ R query(UnionOutdoorLaborDynamicDto unionOutdoorLaborDynamicDto);
+
+
+ /**
+ * 查询总工会-户外劳工站-动态
+ *
+ * @param id
+ * 动态 id
+ * @return 查找结果
+ */
+ @GetMapping("{id}")
+ R unionOutdoorLaborDynamicDetail(@PathVariable("id") Long id);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionOutdoorSiteFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionOutdoorSiteFeign.java
new file mode 100644
index 0000000..6c84c1d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionOutdoorSiteFeign.java
@@ -0,0 +1,34 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.model.dtos.equipment.UnionOutdoorLaborDynamicDto;
+import com.panzhihua.common.model.dtos.equipment.UnionOutdoorSiteDto;
+import com.panzhihua.common.model.vos.R;
+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;
+
+@FeignClient(name = Constants.SERVICE_EQUIPMENT, contextId = "unionOutdoorSite", path = "unionOutdoorSite")
+public interface ComEquipmentUnionOutdoorSiteFeign {
+
+ /**
+ * 分页总工会户外劳工站
+ *
+ * @param unionOutdoorSiteDto
+ * @return 动态结果
+ */
+ @PostMapping("/page")
+ R query(UnionOutdoorSiteDto unionOutdoorSiteDto);
+
+ /**
+ * 查询总工会户外劳工站
+ *
+ * @param id
+ * 户外劳工站 id
+ * @return 查找结果
+ */
+ @GetMapping("{id}")
+ R unionOutdoorSiteDetail(@PathVariable("id") Long id);
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionRePortFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionRePortFeign.java
new file mode 100644
index 0000000..19fa7a7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionRePortFeign.java
@@ -0,0 +1,33 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.model.dtos.equipment.UnionReportDto;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+@FeignClient(name = Constants.SERVICE_EQUIPMENT, contextId = "unionReport", path = "unionReport")
+public interface ComEquipmentUnionRePortFeign {
+
+ /**
+ * 总工会户外劳登录
+ *
+ * @param unionReportDto
+ * @return 总工会户外劳工上报
+ */
+ @PostMapping("/add")
+ R add(UnionReportDto unionReportDto);
+
+
+ /**
+ * 分页户外劳工站上报表
+ *
+ * @param unionReportDto
+ * @return 动态结果
+ */
+ @PostMapping("/query")
+ R query(UnionReportDto unionReportDto);
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionStoreLDD.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionStoreLDD.java
new file mode 100644
index 0000000..9dd45e0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionStoreLDD.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.model.dtos.equipment.UnionStoreDto;
+import com.panzhihua.common.model.dtos.equipment.UnionUserDto;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+@FeignClient(name = Constants.SERVICE_EQUIPMENT, contextId = "UnionStore", path = "UnionStore")
+public interface ComEquipmentUnionStoreLDD {
+
+ @GetMapping("/getList")
+ public R getList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "communityId",required = false) String communityId,
+ @RequestParam(value = "goodsType",required = false) String goodsType,
+ @RequestParam(value = "nameOrNum",required = false) String nameOrNum);
+
+
+ @GetMapping("/getData")
+ public R getData(@RequestParam("id")String id);
+
+ @PostMapping("/insert")
+ public R insert(@RequestBody UnionStoreDto item);
+
+ @PostMapping("/update")
+ public R update(@RequestBody UnionStoreDto item);
+
+ /**
+ * 删除接口
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/delete")
+ public R delete(@RequestParam("id") String id);
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionUserFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionUserFeign.java
new file mode 100644
index 0000000..6941739
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComEquipmentUnionUserFeign.java
@@ -0,0 +1,46 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.model.dtos.equipment.UnionOutdoorSiteDto;
+import com.panzhihua.common.model.dtos.equipment.UnionUserDto;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+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 org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = Constants.SERVICE_EQUIPMENT, contextId = "unionUser", path = "unionUser")
+public interface ComEquipmentUnionUserFeign {
+
+ /**
+ * 总工会户外劳登录
+ *
+ * @param loginUserInfoVO
+ * @return 总工会户外劳共用户
+ */
+ @PostMapping("/login")
+ R login(LoginUserInfoVO loginUserInfoVO);
+
+ /**
+ * 总工会户外劳工站用户认证
+ *
+ * @param unionUserDto
+ * @return 总工会户外劳共用户
+ */
+ @PostMapping("/authentication")
+ R authentication(UnionUserDto unionUserDto);
+
+
+ /**
+ * 使用id查找用户
+ *
+ * @param id
+ * @return 总工会户外劳共用户
+ */
+ @PostMapping("/selectById")
+ UnionUserDto selectById(@RequestParam(value = "id") Long id);
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunitySanShuoService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunitySanShuoService.java
new file mode 100644
index 0000000..9917858
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunitySanShuoService.java
@@ -0,0 +1,191 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.sanshuo.ComEventArchiveVO;
+import com.panzhihua.common.model.vos.sanshuo.ComEventConciliationVO;
+import com.panzhihua.common.model.vos.sanshuo.ComEventVO;
+import com.panzhihua.common.model.vos.sanshuo.ComSanRequestVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+
+@FeignClient(name = "huacheng-community", contextId = "CommunitySanShuoService", path = "/sanshuo/comEvent")
+public interface CommunitySanShuoService {
+
+ /**
+ * description 新增三说会堂事件表
+ *
+ * @param comEventVO 对象
+ * @return R 新增结果对象
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @PostMapping("/add")
+ R insertComEvent(@RequestBody ComSanRequestVO comEventVO);
+
+ /**
+ * description 更新三说会堂事件表
+ *
+ * @param comEventVO 对象
+ * @return R 修改结果对象
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @PostMapping("/update")
+ R updateComEvent(@RequestBody ComEventVO comEventVO);
+
+ /**
+ * description 根据ID获取三说会堂事件表信息
+ *
+ * @param id 主键id
+ * @return R<ComEvent> comEvent 对象
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @GetMapping("/get/{id}")
+ R<ComEventVO> get(@PathVariable(value = "id") String id);
+
+ /**
+ * description 根据ID获取三说会堂事件表信息
+ *
+ * @param id 主键id
+ * @return R<ComEvent> comEvent 对象
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @GetMapping("/detail/{id}")
+ R<HashMap> detail(@PathVariable(value = "id") String id);
+
+ /**
+ * description 查询返回列表数据
+ *
+ * @param comEventVO 三说会堂事件表对象
+ * @return R<List < ComEventVO>> comEventVO对象列表
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @PostMapping("/list")
+ R<List<ComEventVO>> listByComEvent(@RequestBody ComEventVO comEventVO);
+
+ /**
+ * description page 三说会堂事件表分页列表数据
+ * params [pageNo, pageSize]
+ *
+ * @param comEventVO 对象
+ * @param pageNo 当前页码
+ * @param pageSize 每页显示数量
+ * @return PageResult<List < ComEvent>> 三说会堂事件表分页列表数据
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @PostMapping("/page")
+ R page(@RequestBody ComEventVO comEventVO, @RequestParam("pageNo") Long pageNo, @RequestParam("pageSize") Long pageSize);
+
+
+ /**
+ * description 根据ID删除三说会堂事件表
+ *
+ * @param id 主键id
+ * @return R 删除结果
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @DeleteMapping("/remove/{id}")
+ R remove(@PathVariable(value = "id") Long id);
+
+ /**
+ * description 修改三说会堂事件表状态
+ *
+ * @param id 主键id
+ * @return Result 修改成功和失败
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @PutMapping("/updateEnabled")
+ R updateEnabled(@RequestParam("id") Long id, @RequestParam("enabled") Boolean enabled);
+
+ /**
+ * description 修改三说会堂事件表状态
+ *
+ * @param id 主键id
+ * @return Result 修改成功和失败
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @PutMapping("/cancelRequest")
+ R cancelRequest(@RequestParam("id") Long id);
+
+
+ /**
+ * description 修改三说会堂事件表状态
+ *
+ * @param id 主键id
+ * @return Result 修改成功和失败
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @PutMapping("/accept/Request")
+ R acceptRequest(@RequestParam("id") Long id, @RequestParam("specterId") Long specterId);
+
+ /**
+ * description 修改三说会堂事件表状态
+ *
+ * @param id 主键id
+ * @return Result 修改成功和失败
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @PutMapping("/reject/Request")
+ R rejectRequest(@RequestParam("id") Long id);
+
+ /**
+ * description 修改三说会堂事件表状态
+ *
+ * @param id 主键id
+ * @return Result 修改成功和失败
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @PutMapping("/reappoint/Request")
+ R reappoint(@RequestParam("id") Long id, @RequestParam("specialistId") Long specialistId);
+
+ /**
+ * description 专家调解处理
+ *
+ * @param comEventConciliationVO 主键id
+ * @return Result 修改成功和失败
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @PutMapping("/conciliation/Request")
+ R conciliationRequest(@RequestBody ComEventConciliationVO comEventConciliationVO);
+
+ /**
+ * description 专家归档
+ *
+ * @param comEventArchiveVO 归档对象
+ * @return Result 修改成功和失败
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @PutMapping("/archive/Request")
+ R archiveRequest(@RequestBody ComEventArchiveVO comEventArchiveVO);
+
+ /**
+ * description 事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消8 已删除)数据统计
+ *
+ * @return Result 修改成功和失败
+ * @author manailin
+ * @date 2022-09-07 11:23:51
+ */
+ @GetMapping("/status/calculate")
+ R calculate(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "id",required = false)Long id);
+
+ /**
+ * 事件范围筛选列表
+ * */
+ @GetMapping("/rangeList")
+ R eventRangeList();
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
new file mode 100644
index 0000000..60a2e85
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -0,0 +1,11951 @@
+package com.panzhihua.common.service.community;
+
+import java.util.Date;
+import java.util.List;
+
+import com.panzhihua.common.model.dtos.*;
+import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.acid.*;
+import com.panzhihua.common.model.dtos.community.building.BuildingDto;
+import com.panzhihua.common.model.dtos.community.convenient.*;
+import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
+import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
+import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
+import com.panzhihua.common.model.dtos.community.enterprise.*;
+import com.panzhihua.common.model.dtos.community.large.AreaStreetDetail;
+import com.panzhihua.common.model.dtos.community.large.SumAreaStreetResp;
+import com.panzhihua.common.model.dtos.community.reserve.*;
+import com.panzhihua.common.model.dtos.community.sanshuo.*;
+import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
+import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
+import com.panzhihua.common.model.dtos.partybuilding.QryReportResp;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
+import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
+import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.neighbor.*;
+import com.panzhihua.common.model.dtos.property.PagePropertyWorkerDTO;
+import com.panzhihua.common.model.dtos.property.PropertyWorkerDTO;
+import com.panzhihua.common.model.dtos.shop.*;
+import com.panzhihua.common.model.vos.*;
+import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
+import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
+import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoMemberVO;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
+import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
+import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO;
+import com.panzhihua.common.utlis.StringUtils;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
+import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
+import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerAddDTO;
+import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerDeleteDTO;
+import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerEditDTO;
+import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerExcelVO;
+import com.panzhihua.common.model.dtos.civil.PageComActSocialWorkerDTO;
+import com.panzhihua.common.model.dtos.common.AddComMngVolunteerOrgTeamDto;
+import com.panzhihua.common.model.dtos.common.AddComMngVolunteerServiceTypeDto;
+import com.panzhihua.common.model.dtos.common.AddComMngVolunteerSkillDto;
+import com.panzhihua.common.model.dtos.common.EditComActEasyPhotoHandlerDto;
+import com.panzhihua.common.model.dtos.common.EditComMngVolunteerOrgTeamDto;
+import com.panzhihua.common.model.dtos.common.EditComMngVolunteerServiceTypeDto;
+import com.panzhihua.common.model.dtos.common.EditComMngVolunteerSkillDto;
+import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoHandlerDto;
+import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
+import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
+import com.panzhihua.common.model.dtos.common.PageComMngVolunteerSkillDto;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
+import com.panzhihua.common.model.dtos.community.building.admin.AddBuildingHouseDto;
+import com.panzhihua.common.model.dtos.community.building.admin.AddBuildingUnitDto;
+import com.panzhihua.common.model.dtos.community.building.admin.DeleteBuildingHousePopulationDto;
+import com.panzhihua.common.model.dtos.community.building.admin.EditBuildingHouseDto;
+import com.panzhihua.common.model.dtos.community.building.admin.EditBuildingUnitDto;
+import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingListDto;
+import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingUnitHouseListDto;
+import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterAdminDto;
+import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterMemberAdminDto;
+import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterAdminDto;
+import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterMemberAdminDto;
+import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterAdminDto;
+import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterMemberAdminDto;
+import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoActivityDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO;
+import com.panzhihua.common.model.dtos.community.fms.AddFmsClassroomAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.AddFmsServiceAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.AddTeamDTO;
+import com.panzhihua.common.model.dtos.community.fms.AddTeamMemberDTO;
+import com.panzhihua.common.model.dtos.community.fms.AddTeamTypeDTO;
+import com.panzhihua.common.model.dtos.community.fms.ApplyFmsServiceDTO;
+import com.panzhihua.common.model.dtos.community.fms.ApprovalFmsServiceAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.DeleteTeamMemberDTO;
+import com.panzhihua.common.model.dtos.community.fms.EditFmsClassroomAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.EditTeamDTO;
+import com.panzhihua.common.model.dtos.community.fms.EditTeamMemberDTO;
+import com.panzhihua.common.model.dtos.community.fms.EditTeamTypeDTO;
+import com.panzhihua.common.model.dtos.community.fms.EvaluationFmsServiceDTO;
+import com.panzhihua.common.model.dtos.community.fms.FeedbackFmsServiceDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsClassroomAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsEventAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAppletsDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsTeamDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageTeamMemberDTO;
+import com.panzhihua.common.model.dtos.community.integral.ComActIntegralCommunityRankDTO;
+import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
+import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO;
+import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO;
+import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.DeleteProductDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.DisableOrEnableMcsMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsEvaluateDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsInfoDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsProductDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageJoinGameListDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsEvaluateDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsInformationDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsProductDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageVerifyRecordDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PutUserInfoDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetPopularForGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForInfoDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForProductDTO;
+import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.NearbyDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHouseRegisterDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHousesConfigDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.ReleaseOrCancelHouseDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHouseRegisterDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHousesConfigDTO;
+import com.panzhihua.common.model.dtos.community.reserve.AddReserveAdminDTO;
+import com.panzhihua.common.model.dtos.community.reserve.CancelReserveRecordDTO;
+import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO;
+import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO;
+import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveInfoDTO;
+import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveStatusDTO;
+import com.panzhihua.common.model.dtos.community.reserve.EditReserveAdminDTO;
+import com.panzhihua.common.model.dtos.community.reserve.MakeHandleAdminDTO;
+import com.panzhihua.common.model.dtos.community.reserve.PageReserveAdminDTO;
+import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO;
+import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO;
+import com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO;
+import com.panzhihua.common.model.dtos.community.social.HatchAuditProcessDTO;
+import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
+import com.panzhihua.common.model.dtos.community.social.PageProjectSignListDTO;
+import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchAuditDTO;
+import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchDTO;
+import com.panzhihua.common.model.dtos.community.social.SocialOrgHatchAuditDTO;
+import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
+import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
+import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO;
+import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO;
+import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
+import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
+import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseDonatesDTO;
+import com.panzhihua.common.model.dtos.community.warehouse.ExportDonatesDTO;
+import com.panzhihua.common.model.dtos.community.warehouse.PageDonatesDTO;
+import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
+import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
+import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
+import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
+import com.panzhihua.common.model.dtos.grid.ComMngVillageListAppDTO;
+import com.panzhihua.common.model.dtos.grid.DelComMngHousePopulationDTO;
+import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
+import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO;
+import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationRelationHouseDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngVillageListExportAdminDTO;
+import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
+import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationHouseDTO;
+import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAdminDTO;
+import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborAddBrowseAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentReplyAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborFabulousAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborForwardAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborReplyAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
+import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
+import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesInoculationByAdminDTO;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
+import com.panzhihua.common.model.vos.community.bigscreen.PartyBuildingMemberVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import com.panzhihua.common.model.vos.community.fms.ComFmsServiceImportExcelVO;
+import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportExcelVO;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsConfigVO;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsOrderVO;
+import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
+import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
+import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
+import com.panzhihua.common.model.vos.community.rentHouse.RentingHourseOrderVO;
+import com.panzhihua.common.model.vos.community.rentHouse.RentingHoursePreOrderVO;
+import com.panzhihua.common.model.vos.community.rentHouse.WxPayNotifyOrderVO;
+import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
+import com.panzhihua.common.model.vos.community.reserve.ComActReserveDetailAdminVO;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectScheduleVO;
+import com.panzhihua.common.model.vos.community.social.ComActSocialWorkerServiceVO;
+import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
+import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerExcelVO;
+import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyVO;
+import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseBaseVO;
+import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
+import com.panzhihua.common.model.vos.community.warehouse.WarehouseDonatesExcelVO;
+import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
+import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
+import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
+import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
+import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
+import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
+import com.panzhihua.common.model.vos.shop.ShopStoreVO;
+import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
+import com.panzhihua.common.model.vos.user.UserPhoneVO;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 社区
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-07 15:59
+ **/
+@FeignClient(name = "huacheng-community")
+public interface CommunityService {
+ /**
+ * 新增社区活动
+ *
+ * @param comActActivityVO
+ * 新增信息
+ * @return 新增结果
+ */
+ @PostMapping("/addactivity")
+ R addActivity(@RequestBody ComActActivityVO comActActivityVO);
+
+ /**
+ * 编辑社区活动
+ *
+ * @param comActActivityVO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("/putactivity")
+ R putActivity(@RequestBody ComActActivityVO comActActivityVO);
+
+ /**
+ * 删除社区活动
+ *
+ * @param comActActivityVO
+ * 活动主键
+ * @return 删除结果
+ */
+ @PostMapping("deleteactivity")
+ R deleteActivity(@RequestBody ComActActivityVO comActActivityVO);
+
+ /**
+ * 分页查询社区活动
+ *
+ * @param comActActivityVO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("pageactivity")
+ R pageActivity(@RequestBody ComActActivityVO comActActivityVO);
+
+ /**
+ * 发布活动
+ *
+ * @param comActActivityVO
+ * 主键id 发布时间
+ * @return 发布结果
+ */
+ @PostMapping("releaseactivity")
+ R releaseActivity(@RequestBody ComActActivityVO comActActivityVO);
+
+ /**
+ * 取消活动
+ *
+ * @param comActActivityVO
+ * 取消原因
+ * @return 取消结果
+ */
+ @PostMapping("cancelactivity")
+ R cancelActivity(@RequestBody ComActActivityVO comActActivityVO);
+
+ /**
+ * 活动详情
+ *
+ * @param id
+ * 活动id
+ * @param userId
+ * 当前登录者id
+ * @return 详情
+ */
+ @PostMapping("detailactivity")
+ R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId,@RequestParam(value = "pageNum", required = false) Long pageNum,@RequestParam(value = "pageSize", required = false) Long pageSize);
+
+ /**
+ * 分页活动报名名单
+ *
+ * @param activitySignVO
+ * 查询参数
+ * @return 报名人员集合
+ */
+ @PostMapping("listactivitysign")
+ R listActivitySign(@RequestBody ActivitySignVO activitySignVO);
+
+ /**
+ * description getSignLists 查询活动报名名单
+ * @param activitySignVO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/8/24 14:03
+ */
+ @PostMapping("/activity/sign/getList")
+ R getSignLists(@RequestBody ActivitySignVO activitySignVO);
+
+ /**
+ * description listActivityRegists 分页查询活动评价
+ * @param comActActEvaluateVO 活动评价vo
+ * @return R 分页查询结果
+ * @author txb
+ * @date 2021/8/24 14:03
+ */
+ @PostMapping("/activity/evaluate/page")
+ R pageActivityEvaluates(@RequestBody ComActActEvaluateVO comActActEvaluateVO);
+
+ /**
+ * description getEvaluateLists 查询活动评价
+ * @param comActActEvaluateVO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/8/24 14:03
+ */
+ @PostMapping("/activity/evaluate/getList")
+ R getEvaluateLists(@RequestBody ComActActEvaluateVO comActActEvaluateVO);
+
+ /**
+ * description pageActivityRegists 分页查询活动签到
+ * @param comActActRegistVO 活动签到vo
+ * @return R 分页查询结果
+ * @author txb
+ * @date 2021/8/24 14:03
+ */
+ @PostMapping("/activity/regist/page")
+ R pageActivityRegists(@RequestBody ComActActRegistVO comActActRegistVO);
+
+ /**
+ * description getRegistLists 查询活动签到
+ * @param comActActRegistVO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/8/25 9:33
+ */
+ @PostMapping("/activity/regist/getList")
+ R getRegistLists(@RequestBody ComActActRegistVO comActActRegistVO);
+
+ /**
+ * description getRegistLists 查询活动未签到
+ * @param comActActRegistVO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/8/25 9:33
+ */
+ @PostMapping("/activity/noRegist/getList")
+ R getNoRegistLists(@RequestBody ComActActRegistVO comActActRegistVO);
+
+ /**
+ * description activityStagistics 活动数据统计
+ * @param activityId 活动id
+ * @return R 统计结果
+ * @author txb
+ * @date 2021/8/25 13:33
+ */
+ @GetMapping("/activity/statistics")
+ R activityStatistics(@RequestParam("activityId") Long activityId);
+
+ /**
+ * 获取活动历史封面 getPictureList
+ * @param userId 用户id
+ * @return R 统计结果
+ * @author txb
+ * @date 2021/8/27 13:33
+ */
+ @GetMapping("/activity/picture/getList")
+ R getPictureList(@RequestParam("userId") Long userId);
+
+ /**
+ * 获取系统预置图库 getSysPictureList
+ * @return R 系统图库集
+ * @author txb
+ * @date 2021/8/27 13:33
+ */
+ @GetMapping("/activity/sysPicture/getList")
+ R getSysPictureList(@RequestParam("type")Integer type);
+
+ /**
+ * 活动报名名单
+ *
+ * @param activitySignVO
+ * 查询参数
+ * @return 报名人员集合
+ */
+ @PostMapping("listactivitysigns")
+ R listActivitySigns(@RequestBody ActivitySignVO activitySignVO);
+
+ /**
+ * 新增社区动态
+ *
+ * @param comActDynVO
+ * 新增信息
+ * @return 新增结果
+ */
+ @PostMapping("adddynamic")
+ R addDynamic(@RequestBody ComActDynVO comActDynVO);
+
+ /**
+ * 编辑社区动态
+ *
+ * @param comActDynVO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("putdynamic")
+ R putDynamic(@RequestBody ComActDynVO comActDynVO);
+
+ /**
+ * 删除社区动态
+ *
+ * @param comActDynVO
+ * 动态id
+ * @return 删除结果
+ */
+ @PostMapping("deletedynamic")
+ R deleteDynamic(@RequestBody ComActDynVO comActDynVO);
+
+ /**
+ * 分页查询社区动态
+ *
+ * @param comActDynVO
+ * 查询参数
+ * @return 动态集合
+ */
+ @PostMapping("pagedynamic")
+ R pageDynamic(@RequestBody ComActDynVO comActDynVO);
+
+ /**
+ * 管理后台分页查询社区动态
+ *
+ * @param comActDynVO
+ * 查询参数
+ * @return 动态集合
+ */
+ @PostMapping("pagedynamicByAdmin")
+ R pageDynamicByAdmin(@RequestBody ComActDynVO comActDynVO);
+
+ /**
+ * 社区动态详情
+ *
+ * @param id
+ * 动态id
+ * @return 详情
+ */
+ @PostMapping("detaildynamic")
+ R detailDynamic(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询随手拍
+ *
+ * @param comActEasyPhotoVO
+ * 查询参数
+ * @return 心愿列表
+ */
+ @PostMapping("pageeasyphoto")
+ R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ * 分页查询随手拍 浪潮专用
+ *
+ * @param comActEasyPhotoVO
+ * 查询参数
+ * @return 心愿列表
+ */
+ @GetMapping("pageEasyPhotoAdminLC")
+ R pageEasyPhotoAdminLC(@RequestParam("pageNum") Long pageNum,@RequestParam("pageSize") Long pageSize);
+
+ /**
+ * 随手拍详情
+ *
+ * @param id
+ * 随手拍主键
+ * @param userId
+ * 登录用户id
+ * @return 详情内容
+ */
+ @PostMapping("detaileasyphoto")
+ R detailEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+ /**
+ * 随手拍详情
+ *
+ * @param id
+ * 随手拍主键
+ * @param userId
+ * 登录用户id
+ * @return 详情内容
+ */
+ @PostMapping("detaileasyphotodesensitize")
+ R detailEasyPhotoDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+
+ /**
+ * 随手拍删除
+ *
+ * @param id
+ * 随手拍主键
+ * @param userId
+ * 登录用户id
+ * @return 详情内容
+ */
+ @PostMapping("deleteEasyPhoto")
+ R deleteEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询微心愿
+ *
+ * @param comActMicroWishVO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("pagemicrowish")
+ R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO);
+
+ /**
+ * 小程序分页查询微心愿
+ *
+ * @param comActMicroWishVO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("pagemicrowish/applets")
+ R pageMicroWishApplets(@RequestBody ComActMicroWishVO comActMicroWishVO);
+ /**
+ * 小程序分页查询微心愿
+ *
+ * @param comActMicroWishVO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("pagemicrowish/appletsDesensitize")
+ R pageMicroWishAppletsDesensitize(@RequestBody ComActMicroWishVO comActMicroWishVO);
+
+ /**
+ * 心愿详情
+ *
+ * @param id
+ * 查询主键
+ * @param userId
+ * 登录用户id
+ * @return 心愿内容
+ */
+ @PostMapping("detailmicrowish")
+ R detailMicroWish(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+ /**
+ * 心愿详情
+ *
+ * @param id
+ * 查询主键
+ * @param userId
+ * 登录用户id
+ * @return 心愿内容
+ */
+ @PostMapping("detailmicrowishdesensitize")
+ R detailMicroWishDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+ /**
+ * 审核、分配、反馈心愿
+ *
+ * @param comActMicroWishVO
+ * 具体操作
+ * @return 操作结果
+ */
+ @PostMapping("putlmicrowish")
+ R putlMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO);
+
+ /**
+ * 分页展示我的所有活动 时间倒序排列
+ *
+ * @param comActActivityVO
+ * 分页参数
+ * @return 分页集合
+ */
+ @PostMapping("pagemyactivity")
+ R pageMyActivity(@RequestBody ComActActivityVO comActActivityVO);
+
+ /**
+ * 报名/取消报名社区活动
+ *
+ * @param signactivityVO
+ * 报名参数
+ * @return 报名 取消报名 结果
+ */
+ @PostMapping("signactivity")
+ R signActivity(@RequestBody SignactivityVO signactivityVO);
+
+ /**
+ * 上传随手拍
+ *
+ * @param comActEasyPhotoVO
+ * 上传数据
+ * @return 上传结果
+ */
+ @PostMapping("addeasyphoto")
+ R addEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ * 查询随手拍是否有活动
+ *
+ * @return 活动详情
+ */
+ @PostMapping("getEasyPhotoActivity")
+ R getEasyPhotoActivity(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 发布微心愿
+ *
+ * @param comActMicroWishVO
+ * 发布内容
+ * @return 发布结果
+ */
+ @PostMapping("addmicrowish")
+ R addMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO);
+
+ /**
+ * 点赞/取消点赞随手拍
+ *
+ * @param comActEasyPhotoVO
+ * 操作参数
+ * @return 操作结果
+ */
+ @PostMapping("puteasyphoto")
+ R putEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ * 点赞/取消点赞微心愿
+ *
+ * @param comActMicroWishVO
+ * 操作参数
+ * @return 操作结果
+ */
+ @PostMapping("putmicrowish")
+ R putMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO);
+
+ /**
+ * 新增社区动态浏览记录
+ *
+ * @param id
+ * 动态主键
+ * @param userId
+ * 登录用户id
+ * @return 新增结果
+ */
+ @PostMapping("adddynamicuser")
+ R addDynamicUser(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+ /**
+ * 审核、反馈随手拍
+ *
+ * @param comActEasyPhotoVO
+ * 操作参数
+ * @return 操作结果
+ */
+ @PostMapping("puteasyphotostatus")
+ R putEasypHotoStatus(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ * 城管随手拍统计
+ */
+ @PostMapping("/esayPhotoCount")
+ R esayphotoCount(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ *
+ * 城管安排
+ */
+ @PostMapping("updatePageeasyphoto")
+ R updatePageeasyphoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ *
+ * 随手拍城管导出
+ */
+ @PostMapping("exportEasyPhoto")
+ R exportEasyPhoto(@RequestBody ExportEasyPhotoDTO exportEasyPhotoDTO);
+
+ /**
+ * 新增社区
+ *
+ * @param comActVO
+ * 社区信息
+ * @return 新增结果
+ */
+ @PostMapping("addcommunity")
+ R addCommunity(@RequestBody ComActVO comActVO);
+
+ /**
+ * 编辑社区
+ *
+ * @param comActVO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("putCommunity")
+ R putCommunity(@RequestBody ComActVO comActVO);
+
+ /**
+ * 房屋信息
+ *
+ * @param userId
+ * 用户id
+ * @return 房屋信息
+ */
+ @PostMapping("detailhouse")
+ R detailHouse(@RequestParam("userId") Long userId);
+
+ /**
+ * 新增小区
+ *
+ * @param comMngStructAreaVO
+ * 小区信息
+ * @return 新增结果
+ */
+ @PostMapping("addarea")
+ R addArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO);
+
+ /**
+ * 分页查询小区
+ *
+ * @param comMngStructAreaVO
+ * 查询参数
+ * @return 分页结果
+ */
+ @PostMapping("pagearea")
+ R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO);
+
+ /**
+ * 编辑小区
+ *
+ * @param comMngStructAreaVO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("putarea")
+ R putArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO);
+
+ /**
+ * 删除小区
+ *
+ * @param comMngStructAreaVO
+ * 地址编码
+ * @return 删除结果
+ */
+ @PostMapping("deletearea")
+ R deleteArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO);
+
+ /**
+ * 小区批量建房
+ *
+ * @param batchhouseVO
+ * 建房参数
+ * @return 建房结果
+ */
+ @PostMapping("batchhouse")
+ R batchHouse(@RequestBody BatchhouseVO batchhouseVO);
+
+ /**
+ * 展示下级建筑
+ *
+ * @param houseCode
+ * 房屋编号
+ * @return 下级建筑列表
+ */
+ @PostMapping("listsubordinatebuilding")
+ R listSubordinatebuilding(@RequestParam("houseCode") String houseCode);
+
+ /**
+ * 实有单位归属地
+ *
+ * @param comMngRealCompanyBelongsDTO
+ * @return
+ */
+ @PostMapping("/common/data/company/belongs")
+ R belongsComMngRealCompany(@RequestBody ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO);
+
+ /**
+ * 添加同级地址
+ *
+ * @param comMngStructHouseVO
+ * 同级参数
+ * @return 添加结果
+ */
+ @PostMapping("addhouse")
+ R addHouse(@RequestBody BatchhouseVO comMngStructHouseVO);
+
+ /**
+ * 编辑地址
+ *
+ * @param comMngStructHouseVO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("addhouse")
+ R putHouse(@RequestBody ComMngStructHouseVO comMngStructHouseVO);
+
+ /**
+ * 删除地址
+ *
+ * @param comMngStructHouseVO
+ * 删除指定地址和所有下级
+ * @return 删除结果
+ */
+ @PostMapping("deletehouse")
+ R deleteHouse(@RequestBody ComMngStructHouseVO comMngStructHouseVO);
+
+ /**
+ * 新增其他建筑
+ *
+ * @param comMngStructOtherBuildVO
+ * 建筑参数
+ * @return 新增结果
+ */
+ @PostMapping("addotherbuild")
+ R addOtherbuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO);
+
+ /**
+ * 查询所有建筑类型
+ *
+ * @return 类型列表
+ */
+ @PostMapping("listbuildtype")
+ R listBuildType(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 分页查询 其他建筑
+ *
+ * @param comMngStructOtherBuildVO
+ * 分页查询参数
+ * @return 查询结果
+ */
+ @PostMapping("pageotherbuild")
+ R pageOtherBuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO);
+
+ /**
+ * 获取志愿者详情
+ *
+ * @param id
+ * 志愿者信息
+ * @return 增加结果
+ */
+ @GetMapping("getVolunteerById")
+ R getVolunteerById(@RequestParam("id") Long id);
+
+ /**
+ * 增加志愿者
+ *
+ * @param comMngVolunteerMngVO
+ * 志愿者信息
+ * @return 增加结果
+ */
+ @PostMapping("addvolunteer")
+ R addVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);
+
+ /**
+ * 删除志愿者
+ *
+ * @param comMngVolunteerMngVO
+ * 手机号
+ * @return 删除结果
+ */
+ @PostMapping("deletevolunteer")
+ R deleteVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);
+
+ /**
+ * 编辑志愿者
+ *
+ * @param comMngVolunteerMngVO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("putvolunteer")
+ R putVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);
+
+ /**
+ * 分页展示志愿者
+ *
+ * @param comMngVolunteerMngVO
+ * 查询参数
+ * @return 分页集合返回
+ */
+ @PostMapping("pagevolunteer")
+ R pageVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);
+
+ /**
+ * 分页展示志愿者审核
+ *
+ * @param comMngVolunteerMngVO
+ * 查询参数
+ * @return 查询结果
+ */
+ @PostMapping("pagevolunteerexamine")
+ R pageVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);
+
+ /**
+ * 志愿者审核详情
+ *
+ * @param id
+ * 主键
+ * @return 详情
+ */
+ @PostMapping("detailvolunteerexamine")
+ R detailVolunteerExamine(@RequestParam("id") Long id);
+
+ /**
+ * 志愿者审核
+ *
+ * @param comMngVolunteerMngVO
+ * 审核操作
+ * @return 审核结果
+ */
+ @PostMapping("putvolunteerexamine")
+ R putVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);
+
+ /**
+ * 删除志愿者审核
+ *
+ * @param comMngVolunteerMngVO
+ * 主键
+ * @return 删除结果
+ */
+ @PostMapping("deletevolunteerexamine")
+ R deleteVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);
+
+ /**
+ * 查询区域
+ *
+ * @param comActVO
+ * 登录人的经纬度、或者指定区域的社区
+ * @return 10个社区
+ */
+ @PostMapping("listcommunity")
+ R listCommunity(@RequestBody ComActVO comActVO);
+
+ /**
+ * 用户修改手机号对应的志愿者手机号也要修改
+ *
+ * @param userPhoneVO
+ * 新旧手机号
+ * @return 修改结果
+ */
+ @PostMapping("putvolunteerphone")
+ R putVolunteerPhone(@RequestBody UserPhoneVO userPhoneVO);
+
+ /**
+ * 房屋地址下拉列表
+ *
+ * @param parentCode
+ * 父级编码
+ * @param areaId
+ * 小区id
+ * @return 下级列表
+ */
+ @PostMapping("listhouses")
+ R listHouses(@RequestParam("parentCode") String parentCode, @RequestParam("areaId") Long areaId);
+
+ /**
+ * 新增房屋
+ *
+ * @param comMngStructHouseVO
+ * 房屋信息
+ * @return 新增结果
+ */
+ @PostMapping("addhouses")
+ R addHouses(@RequestBody ComMngStructHouseVO comMngStructHouseVO);
+
+ /**
+ * 查询小区
+ *
+ * @param communityId
+ * 社区id
+ * @return 小区集合
+ */
+ @PostMapping("listarea")
+ R listArea(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 用户参加的所有社区活动
+ *
+ * @param userId
+ * 用户id
+ * @param status
+ * @return 活动列表
+ */
+ @PostMapping("listactivity")
+ R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type",required = false)Integer type);
+
+ /**
+ * 用户确认心愿
+ *
+ * @param comActMicroWishVO
+ * 用户评价
+ * @return 确认结果
+ */
+ @PostMapping("putmicrowishconfirm")
+ R putMicroWishConfirm(@RequestBody ComActMicroWishVO comActMicroWishVO);
+
+ /**
+ * 建筑类型
+ *
+ * @param communityId
+ * 社区id
+ * @return 建筑集合
+ */
+ @PostMapping("listcommngstructbuildtype")
+ R listComMngStructBuildType(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 增加删除建筑类型
+ *
+ * @param systemmanagementConfigVO
+ * 操作内容
+ * @return 操作结果
+ */
+ @PostMapping("putcommngstructbuildtype")
+ R putComMngStructBuildType(@RequestBody SystemmanagementConfigVO systemmanagementConfigVO);
+
+ /**
+ * 获取广告跳转内容配置
+ *
+ * @return 跳转内容集合
+ */
+ @PostMapping("getjumpcontent")
+ R getJumpContent();
+
+ /**
+ * 编辑运营后台系统配置
+ *
+ * @param appletesBackstageConfigDTO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("putjumpcontent")
+ R putJumpContent(@RequestBody AppletesBackstageConfigDTO appletesBackstageConfigDTO);
+
+ /**
+ * 社区详情
+ *
+ * @param communityId
+ * 社区id
+ * @return 社区详情
+ */
+ @PostMapping("detailcommunity")
+ R detailCommunity(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 小区详情
+ *
+ * @param areaId
+ * 小区id
+ * @return 小区信息
+ */
+ @PostMapping("detailarea")
+ R detailArea(@RequestParam("areaId") Long areaId);
+
+ /**
+ * 分页查询社区
+ *
+ * @param pageComActDTO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("pagecommunity")
+ R pageCommunity(@RequestBody PageComActDTO pageComActDTO);
+
+ /**
+ * 志愿者详情
+ *
+ * @param id
+ * 主键
+ * @return
+ */
+ @PostMapping("detailvolunteer")
+ R detailVolunteer(@RequestParam("id") Long id);
+
+ /**
+ * 查询平台所有的社区
+ *
+ * @return 社区集合 按照创建顺序倒序排列
+ */
+ @PostMapping("listcommunityall")
+ R listCommunityAll(@RequestParam("areaCode")String areaCode);
+
+ /**
+ * 首页广告banner
+ *
+ * @return
+ */
+ @PostMapping("listadvertisement")
+ R listAdvertisement(@RequestParam("type") Integer type);
+
+ /**
+ * 新增广告
+ *
+ * @param comOpsAdvDTO
+ * @return
+ */
+ @PostMapping("addadvertisement")
+ R addAdvertisement(@RequestBody ComOpsAdvDTO comOpsAdvDTO);
+
+ /**
+ * 编辑广告
+ *
+ * @param comOpsAdvDTO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("putadvertisement")
+ R putAdvertisement(@RequestBody ComOpsAdvDTO comOpsAdvDTO);
+
+ /**
+ * 广告位置下拉列表
+ *
+ * @return 位置集合
+ */
+ @PostMapping("listadvpos")
+ R listAdvpos();
+
+ /**
+ * 跳转内容下拉列表
+ *
+ * @return 跳转内容集合
+ */
+ @PostMapping("listadvjump")
+ R listAdvjump();
+
+ /**
+ * 社区管理后台数据看板 代办事件
+ *
+ * @param communityId
+ * 社区id
+ * @param userId
+ * @return 代办事件列表
+ */
+ @PostMapping("indexdatacommunitybackstage")
+ R indexDataCommunityBackstage(@RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
+
+ /**
+ * 删除社区
+ *
+ * @param communityId
+ * 社区id
+ * @return 删除结果
+ */
+ @PostMapping("delectcommunity")
+ R delectCommunity(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 定时任务刷新社区动态置顶状态
+ *
+ * @return
+ */
+ @PostMapping("timedtaskdynistopping")
+ R timedTaskDynIstopping();
+
+ /**
+ * 定时任务刷新社区动态发布状态
+ *
+ * @return
+ */
+ @PostMapping("timedtaskdynstatus")
+ R timedTaskDynStatus();
+
+ /**
+ * 定时任务查询所有要取消的社区活动
+ *
+ * @return 社区活动集合
+ */
+ @PostMapping("timedtaskactactivity")
+ R timedTaskActActivity();
+
+ /**
+ * 定时任务刷新社区活动的各个状态 除取消外
+ *
+ * @return
+ */
+ @PostMapping("timedtaskactactivityall")
+ R timedTaskActActivityAll();
+
+ /**
+ * 定时任务刷新社区活动的各个状态 除取消外
+ *
+ * @return
+ */
+ @PostMapping("timedtaskactmicrowish")
+ R timedTaskActMicroWishAll();
+
+ /**
+ * 其他建筑详情
+ *
+ * @param id
+ * 主键id
+ * @return 建筑内容
+ */
+ @PostMapping("detailotherbuild")
+ R detailOtherbuild(@RequestParam("id") Long id);
+
+ /**
+ * 编辑其他建筑
+ *
+ * @param comMngStructOtherBuildVO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("putotherbuild")
+ R putOtherbuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO);
+
+ /**
+ * 删除其他建筑
+ *
+ * @param id
+ * 主键
+ * @return 删除结果
+ */
+ @PostMapping("deleteotherbuild")
+ R deleteOtherbuild(@RequestParam("id") Long id);
+
+ /**
+ * 社区后台分页查询社区活动
+ *
+ * @param comActActivityVO
+ * 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("pageactivitycommunityback")
+ R pageActivityCommunityBack(@RequestBody ComActActivityVO comActActivityVO);
+
+ /**
+ * 小程序分页查询随手拍
+ *
+ * @param comActEasyPhotoVO
+ * 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("pageeasyphotoapplets")
+ R pageEasyPhotoApplets(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ * 小程序分页查询随手拍
+ *
+ * @param comActEasyPhotoVO
+ * 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("pageeasyphotoappletsdesensitize")
+ R pageEasyPhotoAppletsDesensitize(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+
+ /**
+ * 随手拍评论分页查询
+ *
+ * @param pageComActEasyPhotoCommentDTO
+ * 查询参数
+ * @return 查询结果
+ */
+ @PostMapping("pagecomacteasyphotocomment")
+ R pageComActEasyPhotoComment(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO);
+
+ /**
+ * 随手拍评论分页查询 - 脱敏
+ *
+ * @param pageComActEasyPhotoCommentDTO
+ * 查询参数
+ * @return 查询结果
+ */
+ @PostMapping("pagecomacteasyphotocommentdesensitize")
+ R pageComActEasyPhotoCommentDesensitize(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO);
+
+ /**
+ * 评论点赞/取消点赞
+ *
+ * @param comActEasyPhotoCommentUserDTO
+ * 操作
+ * @return 操作结果
+ */
+ @PostMapping("commentsign")
+ R commentSign(@RequestBody ComActEasyPhotoCommentUserDTO comActEasyPhotoCommentUserDTO);
+
+ /**
+ * 随手拍--评论--新增评论
+ *
+ * @param comActEasyPhotoCommentDTO
+ * 新增内容
+ * @return 新增结果
+ */
+ @PostMapping("addcomacteasyphotocomment")
+ R addComActEasyPhotoComment(@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO);
+
+ /**
+ * 议事投票-新增
+ *
+ * @param comActDiscussDTO
+ * 新增参数
+ * @return 新增结果
+ */
+ @PostMapping("adddiscuss")
+ R addDiscuss(@RequestBody ComActDiscussDTO comActDiscussDTO);
+
+ /**
+ * 议事投票-新增
+ *
+ * @param comActDiscussDTO
+ * 新增参数
+ * @return 新增结果
+ */
+ @PostMapping("editdiscuss")
+ R editDiscuss(@RequestBody ComActDiscussDTO comActDiscussDTO);
+
+ /**
+ * 议事投票-详情
+ *
+ * @param discussDetailDTO
+ * 请求参数
+ * @return ComActDiscussVO
+ */
+ @PostMapping("detaildiscuss")
+ R detailDiscuss(@RequestBody ComActDiscussDetailDTO discussDetailDTO);
+
+ /**
+ * 分页查询评论下回复列表
+ * @param discussDetailDTO 请求参数
+ * @return 回复列表
+ */
+ @PostMapping("discussCommentReplyAdmin")
+ R discussCommentReplyAdmin(@RequestBody ComActDiscussDetailDTO discussDetailDTO);
+
+ /**
+ * 议事投票-删除
+ *
+ * @param id
+ * 主键
+ * @return 删除结果
+ */
+ @PostMapping("deletediscuss")
+ R deleteDiscuss(@RequestParam("id") Long id);
+
+ /**
+ * 议事投票-回复
+ *
+ * @param comActDiscussCommentDTO
+ * 评论内容
+ * @return 回复结果
+ */
+ @PostMapping("adddiscusscomment")
+ R addDiscussComment(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO);
+
+ /**
+ * 议事投票-分页查询
+ *
+ * @param pageComActDiscussDTO
+ * 查询参数
+ * @return ComActDiscussVO
+ */
+ @PostMapping("pagediscuss")
+ R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
+
+ /**
+ * 议事投票-后台分页查询
+ *
+ * @param pageComActDiscussDTO
+ * 查询参数
+ * @return ComActDiscussVO
+ */
+ @PostMapping("pagediscussAdmin")
+ R pageDiscussAdmin(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
+
+ /**
+ * 议事投票-评论-查看
+ *
+ * @param id
+ * 主键
+ * @return 详情
+ */
+ @PostMapping("detaildiscusscomment")
+ R detailDiscussComment(@RequestParam("id") Long id);
+
+ /**
+ * 议事投票评论详情
+ * @param pageComActDiscussCommentDTO 请求参数
+ * @return 议事投票详情
+ */
+ @PostMapping("detaildiscusscommentAdmin")
+ R detailDiscussCommentAdmin(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
+
+ /**
+ * 议事投票-评论-置顶
+ *
+ * @param id
+ * 主键
+ * @return 置顶结果
+ */
+ @PostMapping("putdiscusscommenttop")
+ R putDiscussCommentTop(@RequestParam("id") Long id);
+
+ /**
+ * 议事投票-评论-回复
+ *
+ * @param comActDiscussCommentDTO
+ * 回复内容
+ * @return 回复结果
+ */
+ @PostMapping("adddiscusscommentback")
+ R addDiscussCommentBack(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO);
+
+ /**
+ * 议事投票-评论-分页查询
+ *
+ * @param pageComActDiscussCommentDTO
+ * 分页查询参数
+ * @return ComActDiscussCommentVO
+ */
+ @PostMapping("pagediscusscomment")
+ R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
+
+ /**
+ * 议事投票-评论-后台分页查询
+ *
+ * @param pageComActDiscussCommentDTO
+ * 分页查询参数
+ * @return ComActDiscussCommentVO
+ */
+ @PostMapping("pagediscusscommentAdmin")
+ R pageDiscussCommentAdmin(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
+
+ /**
+ * 议事投票-分页查询 小程序
+ *
+ * @param pageComActDiscussDTO
+ * 查询参数
+ * @return ComActDiscussVO 分页
+ */
+ @PostMapping("pagediscussapplets")
+ R pageDiscussApplets(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
+ /**
+ * 议事投票-分页查询 小程序 -脱敏
+ *
+ * @param pageComActDiscussDTO
+ * 查询参数
+ * @return ComActDiscussVO 分页
+ */
+ @PostMapping("pagediscussappletsdesensitize")
+ R pageDiscussAppletsDesensitize(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
+
+ /**
+ * 议事投票-点赞、取消点赞
+ *
+ * @param comActDiscussUserDTO
+ * 操作类型
+ * @return 操作结果
+ */
+ @PostMapping("putdiscussuser")
+ R putDiscussUser(@RequestBody ComActDiscussUserDTO comActDiscussUserDTO);
+
+ /**
+ * 议事投票-评论-分页查询 小程序
+ *
+ * @param pageComActDiscussCommentDTO
+ * 分页参数
+ * @return ComActDiscussCommentVO
+ */
+ @PostMapping("pagediscusscommentapplets")
+ R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
+
+
+ /**
+ * 议事投票-评论-删除 小程序
+ *
+ * 分页参数
+ * @return ComActDiscussCommentVO
+ */
+ @GetMapping("deleteCommentApplets")
+ R deleteCommentApplets(@RequestParam("id") String id);
+
+ /**
+ * 议事投票-评论-分页查询 小程序 脱敏
+ *
+ * @param pageComActDiscussCommentDTO
+ * 分页参数
+ * @return ComActDiscussCommentVO
+ */
+ @PostMapping("pagediscusscommentappletsdesensitize")
+ R pageDiscussCommentAppletsDesensitize(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
+
+ /**
+ * 议事投票-详情 小程序
+ *
+ * @param id
+ * 主键
+ * @param userId
+ * 登录用户主键
+ * @return ComActDiscussVO
+ */
+ @PostMapping("detaildiscussapplets")
+ R detailDiscussApplets(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+ /**
+ * 议事投票-详情 小程序
+ *
+ * @param id
+ * 主键
+ * @param userId
+ * 登录用户主键
+ * @return ComActDiscussVO
+ */
+ @PostMapping("detaildiscussappletsdesensitize")
+ R detailDiscussAppletsDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+ /**
+ * 议事投票-投票
+ *
+ * @param discussVoteOptionDTO
+ * 投票信息
+ * @return 投票结果
+ */
+ @PostMapping("adddiscussoptionuser")
+ R addDiscussOptionUser(@RequestBody DiscussVoteOptionDTO discussVoteOptionDTO);
+
+ /**
+ * 议事投票-评论-点赞、取消点赞
+ *
+ * @param comActDiscussUserDTO
+ * 评论点赞
+ * @return 点赞结果
+ */
+ @PostMapping("putdiscusscommentuser")
+ R putDiscussCommentUser(@RequestBody ComActDiscussCommentUserDTO comActDiscussUserDTO);
+
+ /**
+ * 分页查询广告
+ *
+ * @param pageComOpsAdvDTO
+ * 查询内容
+ * @return 查询结果 ComOpsAdvVO
+ */
+ @PostMapping("pageadvertisement")
+ R pageAdvertisement(@RequestBody PageComOpsAdvDTO pageComOpsAdvDTO);
+
+ /**
+ * 广告详情
+ *
+ * @param id
+ * 主键
+ * @return 广告内容
+ */
+ @PostMapping("detailadvertisement")
+ R detailAdvertisement(@RequestParam("id") Long id);
+
+ /**
+ * 删除广告
+ *
+ * @param id
+ * 主键
+ * @return 删除结果
+ */
+ @PostMapping("deleteadvertisement")
+ R deleteAdvertisement(@RequestParam("id") Long id);
+
+ /**
+ * 查询城市下属所有地区列表
+ *
+ * @param cityAdcode
+ * 城市地址编码
+ * @return 地区列表
+ */
+ @PostMapping("listareadistrict")
+ R listAreaDistrict(@RequestParam("cityAdcode") Long cityAdcode);
+
+ /**
+ * 首页图表数据汇总
+ *
+ * @param communityId
+ * 社区id
+ * @return 图表数据
+ */
+ @PostMapping("indexdatacommunitybackstageechart")
+ R indexDataCommunityBackstageEchart(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 选择导入的小区
+ *
+ * @param param
+ * 小区名字 模糊查询
+ * @param communityId
+ * 社区id
+ * @return 小区集合 ComMngStructAreaVO
+ */
+ @PostMapping("listareas")
+ R listAreas(@RequestParam("param") String param, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 检查小区是否已经批量设置过房屋并且返回小区房屋门号规则
+ *
+ * @param id
+ * 小区id
+ * @return ComMngStructAreaVO
+ */
+ @PostMapping("checkAreaHouse")
+ R checkAreaHouse(@RequestParam("id") Long id);
+
+ /**
+ * 新增留言
+ *
+ * @param comActMessageVO
+ * 新增留言信息
+ * @return 发布结果
+ */
+ @PostMapping("addmessage")
+ R addMessage(@RequestBody ComActMessageVO comActMessageVO);
+
+ /**
+ * 我的留言
+ *
+ * @param comActMessageVO
+ * 留言信息
+ * @return 发布结果
+ */
+ @PostMapping("pagemymessage")
+ R pageMyMessageApplets(@RequestBody ComActMessageVO comActMessageVO);
+
+ /**
+ * 给我的留言
+ *
+ * @param comActMessageVO
+ * 留言信息
+ * @return 发布结果
+ */
+ @PostMapping("pagesendtomemessage")
+ R pageSendToMessageApplets(@RequestBody ComActMessageVO comActMessageVO);
+
+ /**
+ * 新增留言回复
+ *
+ * @param comActMessageBackVO
+ * 保存留言回复信息
+ * @return 发布结果
+ */
+ @PostMapping("addmessageback")
+ R addMessageBack(@RequestBody ComActMessageBackVO comActMessageBackVO);
+
+ /**
+ * 根据id查询留言列表
+ *
+ * @return 发布结果
+ */
+ @PostMapping("pagemessagebyuser")
+ R pageMessageByUser(@RequestBody ComActMessageVO comActMessageVO);
+
+ /**
+ * 根据id删除留言
+ *
+ * @return 删除结果
+ */
+ @PostMapping("deletemessage")
+ R deleteMessage(@RequestBody ComActMessageVO comActMessageVO);
+
+ /**
+ * 根据id集合批量设置是否公开
+ *
+ * @return 删除结果
+ */
+ @PostMapping("resetmessagepublic")
+ R resetMessagePublic(@RequestBody ResetComActMessageVO resetComActMessageVO);
+
+ /**
+ * 分页显示社区所有留言
+ *
+ * @param comActMessageVO
+ * 留言信息
+ * @return 结果集合
+ */
+ @PostMapping("pagemycommunitymessage")
+ R pageMyCommunityMessage(@RequestBody ComActMessageVO comActMessageVO);
+
+ /**
+ * 根据id查找留言详情
+ *
+ * @param id
+ * @return
+ */
+ @PostMapping("detailmessage")
+ R detailMessage(@RequestParam("id") Long id);
+
+ /**
+ * 小程序通过便民服务区域分页查询便民服务商家
+ *
+ * @param comCvtBusinessAppletsDTO
+ * 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/business/area/page")
+ R pageComCvtBusinessByServiceArea(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO);
+
+ /**
+ * 议事投票-新增
+ *
+ * @param comOpsHouseDTO
+ * 新增参数
+ * @return 新增结果
+ */
+ @PostMapping("addOpsHouse")
+ R addOpsHouse(@RequestBody ComOpsHouseDTO comOpsHouseDTO);
+
+ /**
+ * 议事投票-详情
+ *
+ * @param id
+ * 主键
+ * @return ComOpsHouseVO
+ */
+ @PostMapping("detailOpsHouse")
+ R detailOpsHouse(@RequestParam("id") Long id);
+
+ /**
+ * 房屋租售-修改
+ *
+ * @param comOpsHouseVO
+ * 修改参数
+ * @return 修改结果
+ */
+ @PostMapping("/putOpsHouse")
+ R putOpsHouse(@RequestBody ComOpsHouseVO comOpsHouseVO);
+
+ /**
+ * 房屋租售-小程序修改
+ *
+ * @param comOpsHouseVO
+ * 修改参数
+ * @return 修改结果
+ */
+ @PostMapping("/putOpsHouseByApplets")
+ R putOpsHouseByApplets(@RequestBody ComOpsHouseVO comOpsHouseVO);
+
+ /**
+ * 房屋租售-上下架
+ *
+ * @param comOpsHouseVO
+ * 上下架参数
+ * @return 上下架结果
+ */
+ @PostMapping("/undercarriageHouse")
+ R undercarriageHouse(@RequestBody ComOpsHouseUndercarriageVO comOpsHouseVO);
+
+ /**
+ * 议事投票-删除
+ *
+ * @param id
+ * 主键
+ * @return 删除结果
+ */
+ @PostMapping("deleteOpsHouse")
+ R deleteOpsHouse(@RequestParam("id") Long id);
+
+ /**
+ * 房屋租售-分页查询
+ *
+ * @param pageComOpsHouseDTO
+ * 查询参数
+ * @return ComOpsHouseVO
+ */
+ @PostMapping("pageOpsHouse")
+ R pageOpsHouse(@RequestBody PageComOpsHouseDTO pageComOpsHouseDTO);
+
+ /**
+ * 社区后台分页查询便民服务商家
+ *
+ * @param pageComCvtBusinessDTO
+ * 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/business/page")
+ R pageComCvtBusiness(@RequestBody PageComCvtBusinessDTO pageComCvtBusinessDTO);
+
+ /**
+ * 添加便民服务商家信息
+ *
+ * @param comCvtBusinessDTO
+ * @return
+ */
+ @PostMapping("/convenient/business/add")
+ R addComCvtBusiness(ComCvtBusinessDTO comCvtBusinessDTO);
+
+ /**
+ * 编辑便民服务商家
+ *
+ * @param comCvtBusinessDTO
+ * 商家参数
+ * @return 返回结果
+ */
+ @PutMapping("/convenient/business/put")
+ R putComCvtBusiness(@RequestBody ComCvtBusinessDTO comCvtBusinessDTO);
+
+ /**
+ * 查询便民服务商家详情
+ *
+ * @param id
+ * 商家主键
+ * @return 返回结果
+ */
+ @GetMapping("/convenient/business/get")
+ R getComCvtBusiness(@RequestParam("id") Long id);
+
+ /**
+ * 删除便民服务商家信息
+ *
+ * @param id
+ * 商家主键
+ * @return 返回结果
+ */
+ @DeleteMapping("/convenient/business/delete")
+ R deleteComCvtBusiness(@RequestParam("id") Long id);
+
+ /**
+ * 社区后台分页查询便民服务分类
+ *
+ * @param pageComCvtCategoryDTO
+ * 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/category/page")
+ R pageComCvtCategory(@RequestBody PageComCvtCategoryDTO pageComCvtCategoryDTO);
+
+ /**
+ * 社区后台分页查询便民服务分类
+ *
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/category/all")
+ R allComCvtCategory();
+
+ /**
+ * 新增便民服务分类
+ *
+ * @param comCvtCategoryDTO
+ * 分类参数
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/category/add")
+ R addComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO);
+
+ /**
+ * 编辑便民服务分类
+ *
+ * @param comCvtCategoryDTO
+ * 分类参数
+ * @return 返回结果
+ */
+ @PutMapping("/convenient/category/put")
+ R putComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO);
+
+ /**
+ * 查询便民服务分类详情
+ *
+ * @param id
+ * 分类主键
+ * @return 返回结果
+ */
+ @GetMapping("/convenient/category/get")
+ R getComCvtCategory(@RequestParam("id") Long id);
+
+ /**
+ * 删除便民服务分类信息
+ *
+ * @param id
+ * 分类主键
+ * @return 返回结果
+ */
+ @DeleteMapping("/convenient/category/delete")
+ R deleteComCvtCategory(@RequestParam("id") Long id);
+
+ /**
+ * 社区后台分页查询便民服务
+ *
+ * @param pageComCvtServeDTO
+ * 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/serve/page")
+ R pageComCvtServe(@RequestBody PageComCvtServeDTO pageComCvtServeDTO);
+
+ /**
+ * 新增便民服务
+ *
+ * @param comCvtServeDTO
+ * 参数
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/serve/add")
+ R addComCvtServe(@RequestBody ComCvtServeDTO comCvtServeDTO);
+
+ /**
+ * 编辑便民服务
+ *
+ * @param comCvtServeDTO
+ * 分类参数
+ * @return 返回结果
+ */
+ @PutMapping("/convenient/serve/put")
+ R putComCvtServe(@RequestBody ComCvtServeDTO comCvtServeDTO);
+
+ /**
+ * 查询便民服务详情
+ *
+ * @param id
+ * 服务主键
+ * @return 返回结果
+ */
+ @GetMapping("/convenient/serve/get")
+ R getComCvtServe(@RequestParam("id") Long id);
+
+ /**
+ * 删除便民服务信息
+ *
+ * @param id
+ * 服务主键
+ * @return 返回结果
+ */
+ @DeleteMapping("/convenient/serve/delete")
+ R deleteComCvtServe(@RequestParam("id") Long id);
+
+ /**
+ * 小程序便民服务商家详情
+ *
+ * @param id
+ * 商家ID
+ * @return
+ */
+ @GetMapping("/convenient/business/serve/get")
+ R getComCvtBusinessServeDetail(@RequestParam("id") Long id);
+
+ /**
+ * 批量导入便民服务
+ *
+ * @param list
+ * 便民服务集合
+ */
+ @PostMapping("/convenient/serve/import")
+ R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list,
+ @RequestParam(value = "communityId", required = false) Long communityId);
+
+ /**
+ * 导出房屋信息
+ *
+ * @param areaId
+ * @return
+ */
+ @PostMapping("/house/export")
+ R houseExport(@RequestParam("areaId") Long areaId);
+
+ /**
+ * 小程序添加车辆信息
+ *
+ * @param comCvtBusinessDTO
+ * @return
+ */
+ @PostMapping("/common/data/car/user/register")
+ R addComMngCarApplet(@RequestBody ComMngCarAppletDTO comCvtBusinessDTO);
+
+ /**
+ * 小程序用户登记车辆列表
+ *
+ * @param userId
+ * @return
+ */
+ @GetMapping("/common/data/car/user/list")
+ R userComMngCarList(@RequestParam("userId") Long userId);
+
+ @PostMapping("/common/data/car/page")
+ R pageQueryComMngCar(@RequestBody PageComMngCarDTO pageComMngCarDTO);
+
+ @PostMapping("/common/data/car/save")
+ R saveComMngCar(@RequestBody ComMngCarSaveDTO comMngCarSaveDTO);
+
+ /**
+ * 删除车辆信息
+ *
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/common/data/car/delete")
+ R deleteComMngCar(@RequestParam(value = "id") Long id);
+
+ /**
+ * 批量导入便民服务
+ *
+ * @param list
+ * 便民服务集合
+ */
+ @PostMapping("/common/data/car/import")
+ R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 车辆导出
+ *
+ * @param exportComMngCarExcelDTO
+ * @return
+ */
+ @PostMapping("/common/data/car/export")
+ R exportRealCar(@RequestBody ExportComMngCarExcelDTO exportComMngCarExcelDTO);
+
+ /**
+ * 社区后台实有单位管理列表
+ *
+ * @param pageComMngRealCompanyDTO
+ * @return
+ */
+ @PostMapping("/common/data/company/page")
+ R pageQueryComMngRealCompany(@RequestBody PageComMngRealCompanyDTO pageComMngRealCompanyDTO);
+
+ /**
+ * 社区后台实有单位统计
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计结果
+ */
+ @PostMapping("/common/data/company/statistics")
+ R getComMngRealCompanyTotalByAdmin(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 社区后台添加修改实有单位
+ *
+ * @param comMngRealCompanyVO
+ * @return
+ */
+ @PostMapping("/common/data/company/save")
+ R saveComMngRealCompany(@RequestBody ComMngRealCompanyVO comMngRealCompanyVO);
+
+ /**
+ * 社区后台删除实有单位
+ *
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/common/data/company/delete")
+ R deleteComMngRealCompany(@RequestParam(value = "id") Long id);
+
+ /**
+ * 实有单位详情
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("/common/data/company/detail")
+ R detailComMngRealCompany(@RequestParam(value = "id") Long id);
+
+ /**
+ * 批量导入实有单位
+ *
+ * @param list
+ * 实有单位集合
+ */
+ @PostMapping("/common/data/company/import")
+ R listSaveMngRealCompanyExcelVO(@RequestBody List<ComMngRealCompanyExcelVO> list,
+ @RequestParam("communityId") Long communityId);
+
+ /**
+ * 实有单位导出
+ *
+ * @param exportRealCompanyExcelDTO
+ * @return
+ */
+ @PostMapping("/common/data/company/export")
+ R exportRealCompany(ExportRealCompanyExcelDTO exportRealCompanyExcelDTO);
+
+ /**
+ * 社区后台实有单位管理列表
+ *
+ * @param pageComMngRealAssetsDTO
+ * @return
+ */
+ @PostMapping("/common/data/assets/page")
+ R pageQueryComMngRealAssets(@RequestBody PageComMngRealAssetsDTO pageComMngRealAssetsDTO);
+
+ /**
+ * 社区后台添加修改实有单位
+ *
+ * @param comMngRealAssetsVO
+ * @return
+ */
+ @PostMapping("/common/data/assets/save")
+ R saveComMngRealAssets(@RequestBody ComMngRealAssetsVO comMngRealAssetsVO);
+
+ /**
+ * 社区后台删除实有单位
+ *
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/common/data/assets/delete")
+ R deleteComMngRealAssets(@RequestParam(value = "id") Long id);
+
+ /**
+ * 实有单位详情
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("/common/data/assets/detail")
+ R detailComMngRealAssets(@RequestParam(value = "id") Long id);
+
+ /**
+ * 批量导入实有单位
+ *
+ * @param list
+ * 实有单位集合
+ */
+ @PostMapping("/common/data/assets/import")
+ R listSaveMngRealAssetsExcelVO(@RequestBody List<ComMngRealAssetsExcelVO> list,
+ @RequestParam("communityId") Long communityId);
+
+ /**
+ * 实有单位导出
+ *
+ * @param exportRealAssetsExcelDTO
+ * @return
+ */
+ @PostMapping("/common/data/assets/export")
+ R exportRealAssets(ExportRealAssetsExcelDTO exportRealAssetsExcelDTO);
+
+ /**
+ * 查询所有省份
+ *
+ * @return
+ */
+ @GetMapping("/common/data/province")
+ R getProvince();
+
+ /**
+ * 查询省份下所有的城市
+ *
+ * @param provinceAdcode
+ * @return
+ */
+ @GetMapping("/common/data/city")
+ R getCityByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode);
+
+ /**
+ * 查询城市下所有的区县
+ *
+ * @param cityAdcode
+ * @return
+ */
+ @GetMapping("/common/data/district")
+ R getDistrictByCityCode(@RequestParam(value = "cityAdcode") Integer cityAdcode);
+
+ /**
+ * 查询省下所有区域 tree结构
+ *
+ * @param provinceAdcode
+ * 省份code
+ * @param areaCode
+ * @return 查询结果
+ */
+ @GetMapping("/common/data/area/all")
+ R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode, @RequestParam(value = "areaCode", required = false) String areaCode);
+
+ /**
+ * 查询省下所有区域 tree结构
+ *
+ * @param provinceAdcode
+ * 省份code
+ * @param areaCode
+ * @return 查询结果
+ */
+ @GetMapping("/common/data/area/basiclevel")
+ R getCityTreeByCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode,
+ @RequestParam(value = "areaCode", required = false) String areaCode,
+ @RequestParam(value = "appId", required = false) String appId);
+
+ /**
+ * 分页查询街道
+ *
+ * @param pageComStreetDTO
+ * 查询条件
+ * @return 查询结果
+ */
+ @PostMapping("/pagestreet")
+ R pageStreet(@RequestBody PageComStreetDTO pageComStreetDTO);
+
+ /**
+ * 新增街道
+ *
+ * @param comStreetVOO
+ * 需要新增的街道数据
+ * @return 新增结果
+ */
+ @PostMapping("/addstreet")
+ R addStreet(@RequestBody ComStreetVO comStreetVOO);
+
+ /**
+ * 删除街道
+ *
+ * @param Ids
+ * 需要删除街道id集合
+ * @return 删除结果
+ */
+ @PostMapping("/deletestreet")
+ R delectStreat(@RequestBody List<Long> Ids);
+
+ /**
+ * 查询街道
+ *
+ * @param comStreetVO
+ * 查询条件
+ * @return 返回结果
+ */
+ @PostMapping("/liststreet")
+ R listStreet(ComStreetVO comStreetVO);
+
+ /**
+ * 分页查询实有房屋
+ *
+ * @param pageComMngVillageDTO
+ * 查询条件
+ * @return 返回结果
+ */
+ @PostMapping("/pagevillage")
+ R pageVillage(@RequestBody PageComMngVillageDTO pageComMngVillageDTO);
+
+ /**
+ * 新增实有房屋
+ *
+ * @param comMngVillageVO
+ * 新增的实有房屋数据
+ * @return 新增结果
+ */
+ @PostMapping("/addvillage")
+ R addVillage(@RequestBody ComMngVillageVO comMngVillageVO);
+
+ /**
+ * 删除实有房屋
+ *
+ * @param Ids
+ * 需要删除的id集合
+ * @return 删除结果
+ */
+ @PostMapping("/deletevillage")
+ R delectVillage(@RequestBody List<Long> Ids);
+
+ /**
+ * 查询实有房屋
+ *
+ * @param comMngVillageVO
+ * 查询条件
+ * @return 查询结果
+ */
+ @PostMapping("/listvillage")
+ R listVillage(ComMngVillageVO comMngVillageVO);
+
+ /**
+ * 根据房屋id查询实有房屋
+ *
+ * @param villageId
+ * 查询条件
+ * @return 查询结果
+ */
+ @PostMapping("/getVillageById")
+ R getVillageById(@RequestParam(value = "villageId") Long villageId);
+
+ /**
+ * 批量导入实有房屋
+ *
+ * @param list
+ * 实有房屋数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/village/import")
+ R listSaveVillageServeExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 批量导入实有人口
+ *
+ * @param list
+ * 实有人口数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/import")
+ R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入吸毒人员
+ *
+ * @param list
+ * 吸毒人员数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importDrug")
+ R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入社区矫正人员
+ *
+ * @param list
+ * 社区矫正人员数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importCorrect")
+ R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入重精人员
+ *
+ * @param list
+ * 重精人员数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importMajor")
+ R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入邪教人员
+ *
+ * @param list
+ * 邪教人员数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importCult")
+ R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入刑释人员
+ *
+ * @param list
+ * 刑释人员数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importRehabilitation")
+ R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入重点上访人员
+ *
+ * @param list
+ * 重点上访人员数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importKey")
+ R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入服刑人员
+ *
+ * @param list
+ * 服刑人员数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importSentence")
+ R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入退役军人
+ *
+ * @param list
+ * 退役军人数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importVeterans")
+ R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入残疾人
+ *
+ * @param list
+ * 残疾人数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importDisability")
+ R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入低保户
+ *
+ * @param list
+ * 低保户数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importLowSecurity")
+ R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入高龄老人 listSavePopulationElderExcelVO 批量导入高龄老人
+ * @param list 高龄老人数据
+ * @param communityId 社区id
+ * @return R 导入结果
+ * @author txb
+ * @date 2021/9/01 15:03
+ */
+ @PostMapping("/common/data/population/importElder")
+ R listSavePopulationElderExcelVO(@RequestBody List<ComMngPopulationElderExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入养老金人员 listSavePopulationPensionExcelVO 批量导入养老金人员
+ * @param list 养老金人员数据
+ * @param communityId 社区id
+ * @return R 导入结果
+ * @author txb
+ * @date 2021/9/01 15:03
+ */
+ @PostMapping("/common/data/population/importPension")
+ R listSavePopulationPensionExcelVO(@RequestBody List<ComMngPopulationPensionExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入高龄老人线下认证记录 listSaveElderAuthRecordExcelVO 批量导入高龄老人线下认证记录
+ * @param list 高龄老人线下认证记录数据
+ * @param communityId 社区id
+ * @param userId 登录人id
+ * @return R 导入结果
+ * @author txb
+ * @date 2021/9/01 15:03
+ */
+ @PostMapping("/elders/authRecords/underLine/import")
+ R listSaveElderAuthRecordExcelVO(@RequestBody List<ComElderAuthRecordImportExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入养老线下认证记录 listSavePensionAuthRecordExcelVO 批量导入养老线下认证记录
+ * @param list 养老线下认证记录数据
+ * @param communityId 社区id
+ * @param userId 登录人id
+ * @return R 导入结果
+ * @author txb
+ * @date 2021/9/01 15:03
+ */
+ @PostMapping("/elders/pensionAuthRecords/underLine/import")
+ R listSavePensionAuthRecordExcelVO(@RequestBody List<ComPensionAuthRecordImportExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 确认导入实有人口（有则更新，无则新建）
+ *
+ * @param list
+ * 用户信息
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/import/confirm")
+ R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 分页查询实有人口
+ *
+ * @param comMngPopulationVO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/common/data/population/page")
+ R pagePopulation(ComMngPopulationDTO comMngPopulationVO);
+
+ /**
+ * 导出老人
+ *
+ * @param comMngPopulationVO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/common/data/population/exportOld")
+ R exportOld(ComMngPopulationDTO comMngPopulationVO);
+
+
+ /**
+ * 根据身份证查询实有人口信息
+ */
+ @GetMapping("/common/data/population/selectByIdCard")
+ R selectByIdCard(@RequestParam("idCard") String idCard);
+
+ /**
+ * 根据id实有人口详细信息
+ *
+ * @param populationId
+ * 实有人口id
+ * @return 实有人口详细信息
+ */
+ @PostMapping("/common/data/population/detail")
+ R<ComMngPopulationVO> detailPopulation(@RequestParam(value = "populationId") Long populationId, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 根据id查询实有人口电子档案信息
+ *
+ * @param populationId
+ * 实有人口id
+ * @return 实有人口电子档信息
+ */
+ @PostMapping("/common/data/population/electronicArchives")
+ R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId);
+
+ /**
+ * 根据id修改实有人口标签列表
+ *
+ * @param populationTagDTO
+ * 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/common/data/population/editTag")
+ R editTagPopulation(ComMngPopulationTagDTO populationTagDTO);
+
+ /**
+ * 批量删除实有人口
+ *
+ * @param ids
+ * 实有人口id集合
+ * @return 删除结果
+ */
+ @PostMapping("/common/data/population/delete")
+ R deletePopulations(@RequestBody List<Long> ids,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 根据社区id查询所有实有人口
+ *
+ * @param communityId
+ * 社区id
+ * @return 查询结果
+ */
+ @PostMapping("/common/data/population/getAll")
+ R getPopulationListByCommunityId(@RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 根据id集合查询实有人口
+ *
+ * @param Ids
+ * 实有人口id集合
+ * @return 查询结果
+ */
+ @PostMapping("/common/data/population/getList")
+ R getPopulationLists(@RequestBody List<Long> Ids);
+
+ /**
+ * 根据小区id查询实有人口
+ *
+ * @param villageId
+ * 小区id
+ * @return 查询结果
+ */
+ @PostMapping("/common/data/population/getListByVillageId")
+ R getPopulationListByVillageId(@RequestParam("villageId") Long villageId);
+
+ /**
+ * 创建调查问卷
+ *
+ * @param questnaireVO
+ * @return
+ */
+ @PostMapping("/questnaire/addquestnaire")
+ R addQuestnaire(@RequestBody QuestnaireVO questnaireVO);
+
+ /**
+ * 小程序-社区问卷列表
+ *
+ * @param pageQuestnaireDTO
+ * 请求参数
+ * @return 社区问卷列表
+ */
+ @PostMapping("/questnaire/pagequestnaire")
+ R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO);
+
+ /**
+ * 社区后台-社区问卷列表
+ *
+ * @param pageQuestnaireDTO
+ * 请求参数
+ * @return 社区问卷列表
+ */
+ @PostMapping("/questnaire/admin/pagequestnaire")
+ R pageQuestnaireAdmin(@RequestBody PageQuestnaireDTO pageQuestnaireDTO);
+
+ /**
+ * 编辑问卷——问卷、题目、选项
+ *
+ * @param questnaireVO
+ * @return
+ */
+ @PostMapping("/questnaire/editquestnaire")
+ R editQuestnaire(@RequestBody QuestnaireVO questnaireVO);
+
+ /**
+ * 修改问卷状态
+ *
+ * @param editComActQuestnaireVo
+ * @return
+ */
+ @PostMapping("/questnaire/editquestnairedo")
+ R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo);
+
+ /**
+ * 删除问卷 ——隐藏
+ *
+ * @param questId
+ * 调查问卷Id
+ * @return
+ */
+ @PostMapping("/questnaire/deletequestnaire")
+ R editQuestnaireDO(@RequestParam("questId") Long questId, @RequestParam("userId") Long userId);
+
+ /**
+ * 问卷答题结果
+ *
+ * @param questId
+ * 问卷ID
+ */
+ @PostMapping("/questnaire/answerslist")
+ R answerResultList(@RequestParam("questId") Long questId);
+
+ /**
+ * 问卷调查详细
+ *
+ * @param questId
+ * 问卷ID
+ * @return 用户问卷调查详细
+ */
+ @GetMapping("/questnaire/view")
+ R view(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);
+
+ /**
+ * 小程序-问卷调查详情
+ *
+ * @param userId
+ * 用户id
+ * @param questId
+ * 问卷id
+ * @return 问卷调查详情
+ */
+ @GetMapping("/questnaire/view/detail")
+ R viewDetail( @RequestParam("questId") Long questId,@RequestParam("userId") Long userId);
+
+ /**
+ * 小程序-新增问卷调查浏览数量
+ *
+ * @param questId
+ * 问卷调查id
+ * @return 增加结果
+ */
+ @GetMapping("/questnaire/add/view")
+ R addView(@RequestParam("questId") Long questId);
+
+ /**
+ * 小程序-用户弹窗添加不在提醒接口
+ *
+ * @param questId
+ * 问卷id
+ * @param userId
+ * 用户id
+ * @return 添加结果
+ */
+ @GetMapping("/questnaire/add/noNotice")
+ R addNoNotice(@RequestParam("questId") Long questId, @RequestParam("userId") Long userId);
+
+ /**
+ * 社区后台-查询问卷调查详情
+ *
+ * @param questId
+ * 问卷id
+ * @return 问卷调查详情
+ */
+ @GetMapping("/questnaire/admin/detail")
+ R QuesDetail(@RequestParam("questId") Long questId);
+
+ /**
+ * 用户问卷调查详细
+ *
+ * @param userId
+ * 用户ID
+ * @param questId
+ * 问卷ID
+ * @return 用户问卷调查详细
+ */
+ @GetMapping("/questnaire/usersanswer")
+ R answerInfoQuestnaire(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);
+
+ /**
+ * 查看用户问卷调查统计信息
+ *
+ * @param questId
+ * 问卷ID
+ * @return 用户问卷调查统计信息
+ */
+ @GetMapping("/questnaire/stat")
+ R statistics(@RequestParam("questId") Long questId);
+
+ /**
+ * 问卷题目 答卷信息
+ *
+ * @param pageQuestnaireSubDetailsDTO
+ * 问卷ID
+ */
+ @PostMapping("/questnaire/qaqeustanswerdetails")
+ R qaQeustAnswerDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO);
+
+ /**
+ * 社区问卷分页
+ *
+ * @param pageQuestnaireAnswerDTO
+ * 社区问卷分页参数
+ * @return 分页数据
+ */
+ @PostMapping("/questnaire/pagequestnaireanswer")
+ R pageQuestnaireAnswer(@RequestBody PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO);
+
+ /**
+ * 居民填写问卷调查问卷
+ *
+ * @param usersAnswerQuestnaireVO
+ * 填写情况
+ */
+ @PostMapping("/questnaire/usersanswequestnaire")
+ R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO);
+
+ /**
+ * 店铺列表-分页查询
+ *
+ * @param pageComShopStoreDTO
+ * 分页条件
+ */
+ @PostMapping("/shop/pageShopStore")
+ R pageStoreList(@RequestBody PageComShopStoreDTO pageComShopStoreDTO);
+
+ /**
+ * 保存店铺
+ *
+ * @param storeVO
+ * 数据
+ */
+ @PostMapping("/shop/saveStore")
+ R saveStore(@RequestBody ShopStoreVO storeVO);
+
+ /**
+ * 新增店铺
+ *
+ * @param storeVO
+ * 店铺信息
+ * @return 新增结果
+ */
+ @PostMapping("/shop/addStore")
+ R addStore(@RequestBody ShopStoreVO storeVO);
+
+ /**
+ * 编辑店铺、启用、禁用
+ *
+ * @param storeVO
+ * 数据
+ * @param id
+ * 商铺id
+ */
+ @PostMapping("/shop/editStore/{id}")
+ R editStore(@RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id);
+
+ /**
+ * 删除店铺
+ *
+ * @param id
+ * 商铺id
+ */
+ @PostMapping("/shop/deleteStore")
+ R deleteStore(@RequestBody Long[] id);
+
+ /**
+ * 获取详情
+ *
+ * @param id
+ * 商铺id
+ */
+ @GetMapping("/shop/getStoreInfo")
+ R getStoreInfo(@RequestParam("id") Long id);
+
+ /**
+ * 商品列表-分页查询
+ *
+ * @param pageComShopGoodsDTO
+ * 添加数据
+ */
+ @PostMapping("/shop/pageGoods")
+ R pageGoodsList(@RequestBody PageComShopGoodsDTO pageComShopGoodsDTO);
+
+ /**
+ * 新增商品
+ *
+ * @param addShopGoodsVO
+ * @return
+ */
+ @PostMapping("/shop/saveShopGoods")
+ R saveShopGoods(@RequestBody AddShopGoodsVO addShopGoodsVO);
+
+ /**
+ * 编辑商品
+ *
+ * @param id
+ * @param addShopGoodsVO
+ * @return
+ */
+ @PostMapping("/shop/editShopGoods/{id}")
+ R editShopGoods(@PathVariable("id") Long id, @RequestBody AddShopGoodsVO addShopGoodsVO);
+
+ /**
+ * 删除商品
+ *
+ * @param id
+ * @return
+ */
+ @PostMapping("/shop/deleteShopGoods")
+ R deleteShopGoods(@RequestBody Long[] id);
+
+ /**
+ * 修改商品状态
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("/shop/changeShopGoodsStatus")
+ R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);
+
+ /**
+ * 商品列表-分页查询
+ *
+ * @param pageComShopGoodsDTO
+ * 添加数据
+ */
+ @PostMapping("/shopFlower/pageGoods")
+ R pageFlowerGoodsList(@RequestBody PageComShopFlowerGoodsDTO pageComShopGoodsDTO);
+
+ /**
+ * 商品列表-分页查询
+ *
+ * @param comShopFlowerGoodsDTO
+ * 添加数据
+ */
+ @PostMapping("/shopFlower/pageShopFlowerGoodsByApp")
+ R pageShopFlowerGoodsByApp(@RequestBody ComShopFlowerGoodsDTO comShopFlowerGoodsDTO);
+
+
+ /**
+ * 新增商品
+ *
+ * @param addShopGoodsVO
+ * @return
+ */
+ @PostMapping("/shopFlower/saveShopGoods")
+ R saveFlowerShopGoods(@RequestBody AddShopFlowerGoodsVO addShopGoodsVO);
+
+ /**
+ * 编辑商品
+ *
+ * @param id
+ * @param addShopGoodsVO
+ * @return
+ */
+ @PostMapping("/shopFlower/editShopGoods/{id}")
+ R editFlowerShopGoods(@PathVariable("id") Long id, @RequestBody AddShopFlowerGoodsVO addShopGoodsVO);
+
+ /**
+ * 删除商品
+ *
+ * @param goodsId
+ * @return
+ */
+ @DeleteMapping("/shopFlower/deleteShopGoods")
+ R deleteFlowerShopGoods(@RequestParam("goodsId") Long goodsId);
+
+ /**
+ * 修改商品状态
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("/shopFlower/changeShopGoodsStatus")
+ R changeFlowerStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);
+
+ /**
+ * 商品详情
+ *
+ * @param goodsId
+ * @return
+ */
+ @GetMapping("/shopFlower/shopGoodsDetail")
+ R shopFlowerGoodsDetail(@RequestParam("goodsId") Long goodsId);
+
+
+
+ /**
+ * 结果
+ *
+ * @param shopOperlog
+ * 商城后台操作日志
+ */
+ @PostMapping("/shop/addShopOperLog")
+ R addShopOperLog(@RequestBody ShopOperLogVO shopOperlog);
+
+ /**
+ * 分页查询 商家后台操作日志
+ *
+ * @param pageDTO
+ * 分页数据
+ * @return 分页日志
+ */
+ @PostMapping("/shop/pageShopOperLog")
+ R pageShopOperLog(@RequestBody PageDTO pageDTO);
+
+ /**
+ * 订单分页查询
+ *
+ * @param pageComShopOrderSearchDTO
+ * 分页数据
+ * @return 订单分页查询
+ */
+ @PostMapping("/shop/order/page")
+ R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
+
+ /**
+ * 分页查询店铺列表
+ *
+ * @param comShopStoreDTO
+ * 请求参数
+ * @return 店铺列表
+ */
+ @PostMapping("/shop/pageShopStore")
+ R pageShopStore(@RequestBody PageComShopStoreDTO comShopStoreDTO);
+
+ /**
+ * 根据id查询店铺详情
+ *
+ * @param comShopStoreDTO
+ * 请求参数
+ * @return 店铺详情
+ */
+ @PostMapping("/shop/shopStoreDetail")
+ R shopStoreDetail(@RequestBody PageComShopStoreDTO comShopStoreDTO);
+
+ /**
+ * 分页查询商品列表
+ *
+ * @param comShopGoodsDTO
+ * 请求参数
+ * @return 商品列表
+ */
+ @PostMapping("/shop/pageShopGoods")
+ R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO);
+
+ /**
+ * 根据商品id查询商品信息
+ *
+ * @param goodsId
+ * 商品id
+ * @return 商品信息
+ */
+ @PostMapping("/shop/shopGoodsDetail")
+ R shopGoodsDetail(@RequestParam("goodsId") Long goodsId);
+
+ /**
+ * 查询用户购物车列表
+ *
+ * @param userId
+ * 用户id
+ * @return 购物车列表
+ */
+ @PostMapping("/shop/shopCartList")
+ R shopCartList(@RequestParam("userId") Long userId);
+
+ /**
+ * 查询用户购物车数量
+ *
+ * @param userId
+ * 用户id
+ * @return 用户购物车商品数量
+ */
+ @PostMapping("/shop/shopCartUserTotal")
+ R shopCartUserTotal(@RequestParam("userId") Long userId);
+
+ /**
+ * 购物车添加
+ *
+ * @param comShopCartDTO
+ * 请求参数
+ * @return 购物车列表
+ */
+ @PostMapping("/shop/shopAddCart")
+ R shopAddCart(@RequestBody ComShopCartDTO comShopCartDTO);
+
+ /**
+ * 购物车内商品数量修改
+ *
+ * @param shopEditNubCartDTO
+ * 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/shop/shopEditNubCart")
+ R shopEditNubCart(@RequestBody ComShopEditNubCartDTO shopEditNubCartDTO);
+
+ /**
+ * 删除购物车记录
+ *
+ * @param Ids
+ * 购物车id集合
+ * @return 删除结果
+ */
+ @PostMapping("/shop/shopDelCart")
+ R shopDelCart(@RequestBody List<Long> Ids);
+
+ /**
+ * 分页查询用户收货地址列表
+ *
+ * @param comShopAddressDTO
+ * 请求参数
+ * @return 用户收货地址列表
+ */
+ @PostMapping("/shop/shopUserAddressList")
+ R shopUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO);
+
+ /**
+ * 用户添加收货地址
+ *
+ * @param comShopAddressDTO
+ * 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/shop/shopAddUserAddress")
+ R shopAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);
+
+ /**
+ * 用户修改收货地址
+ *
+ * @param comShopAddressDTO
+ * 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/shop/shopEditUserAddress")
+ R shopEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);
+
+ /**
+ * 用户删除收货地址
+ *
+ * @param addressId
+ * 收货地址id
+ * @return 删除结果
+ */
+ @PostMapping("/shop/shopDelUserAddress")
+ R shopDelUserAddress(@RequestParam("addressId") Long addressId);
+
+ /**
+ * 订单预览
+ *
+ * @param orderPreviewDTO
+ * 请求参数
+ * @return 订单预览数据
+ */
+ @PostMapping("/shop/orderPreview")
+ R orderPreview(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO);
+
+ /**
+ * 创建订单
+ *
+ * @param orderCreateDTO
+ * 创建订单请求参数
+ * @return 创建结果
+ */
+ @PostMapping("/shop/orderCreate")
+ R orderCreate(@RequestBody ComShopOrderCreateDTO orderCreateDTO);
+
+ /**
+ * 分页查询用户订单列表
+ *
+ * @param comOrderListDTO
+ * 请求参数
+ * @return 查询结果
+ */
+ @PostMapping("/shop/pageOrderList")
+ R pageOrderList(@RequestBody PageComOrderListDTO comOrderListDTO);
+
+ /**
+ * 根据订单id查询订单详情
+ *
+ * @param orderId
+ * 订单id
+ * @return 订单详情
+ */
+ @PostMapping("/shop/orderDetail")
+ R orderDetail(@RequestParam("orderId") Long orderId);
+
+ /**
+ * 根据订单id取消订单
+ *
+ * @param comShopOrderQueryDTO
+ * 请求参数
+ * @return 取消结果
+ */
+ @PostMapping("/shop/orderCancel")
+ R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);
+
+ /**
+ * 根据订单id删除订单
+ *
+ * @param orderId
+ * 订单id
+ * @return 删除结果
+ */
+ @PostMapping("/shop/orderDelete")
+ R orderDelete(@RequestParam("orderId") Long orderId);
+
+ /**
+ * 根据订单id确认收货
+ *
+ * @param comShopOrderQueryDTO
+ * 请求参数
+ * @return 确认结果
+ */
+ @PostMapping("/shop/orderConfirm")
+ R orderConfirm(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);
+
+ /**
+ * 统计用户订单数量
+ *
+ * @param userId
+ * 用户id
+ * @return 统计结果
+ */
+ @PostMapping("/shop/orderStatistics")
+ R orderStatistics(@RequestParam("userId") Long userId);
+
+ /**
+ * 商家资金的订单详情
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("/shop/capitalDetailByStore")
+ R capitalDetailByStore(@RequestParam("id") Long id);
+
+ /**
+ * 订单发货
+ *
+ * @param orderShipDTO
+ * 商城订单发货信息
+ * @return 发货结果
+ */
+ @PostMapping("/shop/shipOrder")
+ R shipOrder(@RequestBody ComShopOrderShipDTO orderShipDTO);
+
+ /**
+ * 订单配送
+ *
+ * @param deliverDTO
+ * 订单信息
+ * @return 配送结果
+ */
+ @PostMapping("/shop/deliverOrder")
+ R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO);
+
+ /**
+ * 订单完成配送
+ *
+ * @param deliverDTO
+ * 订单信息
+ * @return 配送完成结果
+ */
+ @PostMapping("/shop/finishDeliverOrder")
+ R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO);
+
+ /**
+ * 获取用户商户详情
+ *
+ * @param userId
+ * 用户ID
+ */
+ @GetMapping("/shop/getUserStoreInfo")
+ R getUserStoreInfo(@RequestParam("userId") Long userId);
+
+ /**
+ * 获取用户商户详情
+ *
+ * @param account
+ * 用户账号
+ */
+ @GetMapping("/shop/getUserStoreInfoByAccount")
+ R<ShopStoreVO> getUserStoreInfoByAccount(@RequestParam("account") String account);
+
+ /**
+ * 订单导出信息
+ *
+ * @param comShopOrderExportDTO
+ * 订单导出信息
+ * @return 订单导出信息
+ */
+ @PostMapping("/shop/shopOrderExportData")
+ R shopOrderExportData(@RequestBody ComShopOrderExportDTO comShopOrderExportDTO);
+
+ /**
+ * 资金管理导出信息
+ *
+ * @param comShopFundsExportDTO
+ * 资金管理导出信息
+ * @return 资金管理导出信息
+ */
+ @PostMapping("/shop/shopOrderFundsExportData")
+ R shopOrderFundsExportData(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO);
+
+ /**
+ * 店铺资金统计信息
+ *
+ * @param userId
+ * 用户ID
+ * @return 店铺资金统计信息
+ */
+ @GetMapping("/shop/getFundsStat")
+ R getFundsStat(@RequestParam("userId") Long userId);
+
+ /**
+ * 店铺资金统计信息
+ *
+ * @param pageComShopFundsSearchDTO
+ * 店铺资金
+ * @return 店铺资金统计信息
+ */
+ @PostMapping("/shop/pageShopFunds")
+ R pageShopFunds(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO);
+
+ /**
+ * 微信支付订单回调
+ *
+ * @param wxPayNotifyOrderDTO
+ * 订单支付回调参数
+ */
+ @PostMapping("/shop/wxOrderPayNotify")
+ void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO);
+
+ /**
+ * 点击去支付订单
+ *
+ * @param orderPayDTO
+ * 请求参数
+ * @return 支付对象
+ */
+ @PostMapping("/shop/wxPay")
+ R wxPay(@RequestBody OrderPayDTO orderPayDTO);
+
+ /**
+ * 编辑实有人口
+ *
+ * @param populationEditDTO
+ * @return
+ */
+ @PostMapping("/common/data/population/edit")
+ R editPopulation(@RequestBody ComMngPopulationEditDTO populationEditDTO,
+ @RequestParam("communityId") Long communityId);
+
+ /**
+ * 微心愿删除
+ *
+ * @param id
+ * 微心愿id
+ */
+ @PostMapping("deletemicrowish")
+ R deletemicrowish(@RequestParam("id") Long id);
+
+ /**
+ * 基础数据》特殊群体》分页查询
+ *
+ * @param pageInputUserDTO
+ * @return
+ */
+ @PostMapping("common/data/special/page")
+ R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO);
+
+ /**
+ * 删除特殊群体人员
+ *
+ * @param id
+ * 特殊群体id
+ * @return 删除结果
+ */
+ @PostMapping("common/data/special/delete")
+ R deleteSpecialInputUser(@RequestParam(value = "id") Long id,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 办事指南_新增
+ *
+ * @param workGuideVO
+ * 新增信息
+ * @return 新增结果
+ */
+ @PostMapping("/addworkguide")
+ R addWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId") Long userId);
+
+ /**
+ * 办事指南_编辑
+ *
+ * @param workGuideVO
+ * @return 编辑结果
+ */
+ @PostMapping("/editworkguide")
+ R editWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId") Long userId);
+
+ /**
+ * 办事指南_详情
+ *
+ * @param workGuideId
+ * @return 详情
+ */
+ @GetMapping("/detailworkguide")
+ R detailWorkGuide(@RequestParam("workGuideId") String workGuideId, @RequestParam("communityId") String communityId);
+
+ /**
+ * 办事指南_分页
+ *
+ * @param pageActWorkGuideDTO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/pageworkguide")
+ R pageWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO);
+
+ /**
+ * 办事指南_删除
+ *
+ * @param workGuideId
+ * 办事指南id
+ * @return 删除结果
+ */
+ @PostMapping("/delectworkguide")
+ R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId);
+
+ /**
+ * 分页查询办事指南-分类管理 pageWorkGuideClassify 分页查询办事指南-分类管理
+ * @param comActWorkGuideClassifyVO 查询参数
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @PostMapping("/workGuide/classify/apage")
+ R pageWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO);
+
+ /**
+ * 办事指南-分类管理新增或修改 addWorkGuideClassify 办事指南-分类管理新增或修改
+ * @param comActWorkGuideClassifyVO 新增或修改参数
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @PostMapping("/workGuide/classify/add")
+ R addWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO);
+
+ /**
+ * 办事指南-分类管理删除 deleteWorkGuideClassify 办事指南-分类管理删除
+ * @param workGuideClassifyId 办事指南-分类管理id
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @GetMapping("/workGuide/classify/delete")
+ R deleteWorkGuideClassify(@RequestParam("workGuideClassifyId") Long workGuideClassifyId);
+
+ /**
+ * 办事指南-分类管理列表查询 getWorkGuideClassifyList 办事指南-分类管理列表查询
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @GetMapping("/workGuide/classify/getList")
+ R getWorkGuideClassifyList(@RequestParam("areaCode")String areaCode);
+
+ /**
+ * 分页查询邻里圈
+ *
+ * @param neighborCircleAppDTO
+ * 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighbor/pageNeighborByApp")
+ R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);
+
+ /**
+ * 用户发布邻里圈审核
+ *
+ * @param addNeighborCircleAppDTO
+ * 邻里圈请求参数
+ * @return 发布结果
+ */
+ @PostMapping("/neighbor/addNeighborByApp")
+ R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO);
+
+ /**
+ * 用户查看邻里圈详情
+ *
+ * @param neighborCircleAppDTO
+ * 请求参数
+ * @return 邻里圈详情
+ */
+ @PostMapping("/neighbor/neighborDetailByApp")
+ R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO);
+
+ /**
+ * 管理后台查询邻里圈列表
+ *
+ * @param comActNeighborCircleAdminDTO
+ * 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighbor/pageNeighborByAdmin")
+ R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
+
+ /**
+ * 统计大屏查询清单列表
+ *
+ * @param comActNeighborCircleAdminDTO
+ * 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighbor/pageNeighborByBigScreen")
+ R pageNeighborByBigScreen(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
+ /**
+ * 后台修改邻里圈
+ *
+ * @param editNeighborCircleAdminVO
+ * 请求参数
+ */
+ @PostMapping("/neighbor/changeStatusByAdmin")
+ R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);
+
+ /**
+ * 邻里圈_后台删除
+ *
+ * @param id
+ * 邻里圈id
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighbor/deleteByAdmin")
+ R deleteByAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 查看邻里圈基础_详情
+ *
+ * @param id
+ * 邻里圈id
+ * @return 邻里圈列表
+ */
+ @GetMapping("/neighbor/detailNeighborByAdmin")
+ R detailNeighborByAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 邻里圈的所有评论_分页
+ *
+ * @param dto
+ * 请求参数
+ * @return 评论列表
+ */
+ @PostMapping("/neighbor/detailNeighborAllCommentByAdmin")
+ R detailNeighborAllCommentByAdmin(@RequestBody DetailNeighborAllCommentByAdminDTO dto);
+
+ /**
+ * 评论的状态_修改
+ *
+ * @param vo
+ * 请求参数
+ */
+ @PostMapping("/neighbor/changeCommentStatusByAdmin")
+ R changeCommentStatusByAdmin(@RequestBody ChangeCommentStatusByAdminVO vo);
+
+ /**
+ * 邻里圈评论_详情
+ *
+ * @param id
+ * 评论id
+ */
+ @GetMapping("/neighbor/detailNeighborCommentByAdmin")
+ R detailNeighborCommentByAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 用户查询邻里圈列表
+ *
+ * @param neighborCircleAppDTO
+ * 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighbor/neighborExamineByApp")
+ R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);
+
+ /**
+ * 邻里圈点赞
+ *
+ * @param fabulousAppDTO
+ * 请求参数
+ * @return 点赞结果
+ */
+ @PostMapping("/neighbor/neighborFabulousByApp")
+ R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO);
+
+ /**
+ * 邻里圈转发
+ *
+ * @param forwardAppDTO
+ * 请求参数
+ * @return 转发结果
+ */
+ @PostMapping("/neighbor/neighborForwardByApp")
+ R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO);
+
+ /**
+ * 邻里圈评论
+ *
+ * @param commentAppDTO
+ * 请求参数
+ * @return 评论结果
+ */
+ @PostMapping("/neighbor/neighborCommentByApp")
+ R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO);
+
+ /**
+ * 邻里圈回复
+ *
+ * @param replyAppDTO
+ * 请求参数
+ * @return 回复结果
+ */
+ @PostMapping("/neighbor/neighborReplyByApp")
+ R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO);
+
+ /**
+ * 定时任务更新邻里圈近3天评论数/点赞数/浏览量
+ *
+ * @return 执行结果
+ */
+ @PostMapping("/neighbor/timeTaskCircleFlow")
+ R timedTaskNeighborCircleRecord();
+
+ /**
+ * 邻里圈评论回复_分页
+ *
+ * @param dto
+ * 参数
+ */
+ @PostMapping("/neighbor/detailNeighborCommentAllReply")
+ R detailNeighborCommentAllReply(@RequestBody DetailNeighborCommentReplyByAdminDTO dto);
+
+ /**
+ * 邻里圈评论回复_基本详情
+ *
+ * @param id
+ * 参数
+ */
+ @GetMapping("/neighbor/detailNeighborCommentReply")
+ R detailNeighborCommentReply(@RequestParam("id") Long id);
+
+ /**
+ * 评论回复状态_修改
+ *
+ * @param changeStatusReplyVO
+ * 参数
+ */
+ @PostMapping("/neighbor/changeCommentReplyStatusByAdmin")
+ R changeCommentReplyStatusByAdmin(@RequestBody ChangeCommentReplyStatusByAdminVO changeStatusReplyVO);
+
+ /**
+ * 邻里圈取消点赞
+ *
+ * @param fabulousAppDTO
+ * 请求参数
+ * @return 取消点赞结果
+ */
+ @PostMapping("/neighbor/neighborFabulousCancelByApp")
+ R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO);
+
+ /**
+ * 添加邻里圈浏览记录
+ *
+ * @param addBrowseAppDTO
+ * 请求参数
+ * @return 返回参数
+ */
+ @PostMapping("/neighbor/neighborAddBrowseByApp")
+ R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO);
+
+ /**
+ * 邻里圈_添加
+ *
+ * @param addNeighborCircleAdminVO
+ * 参数
+ */
+ @PostMapping("/neighbor/addNeighborByAdmin")
+ R addNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO);
+
+ /**
+ * 分页查询评论下所有回复
+ *
+ * @param commentReplyAppDTO
+ * 请求参数
+ * @return 回复列表
+ */
+ @PostMapping("/neighbor/neighborCommentReplyByApp")
+ R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO);
+
+ /**
+ * 实有房屋_编辑
+ *
+ * @param villageId
+ * 实有房屋id
+ * @param comMngVillageVO
+ * 请求参数
+ * @return
+ */
+ @PostMapping("/editvillage/{villageId}")
+ R editvillage(@PathVariable("villageId") Long villageId, @RequestBody ComMngVillageVO comMngVillageVO);
+
+ /**
+ * 商城系统配置
+ *
+ * @param comShopSysConfDTO
+ * @return
+ */
+ @PostMapping("/shop/conf/edit")
+ R editShopSysConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO);
+
+ /**
+ * 商城系统配置查询
+ *
+ * @param pageComShopSysConfDTO
+ * @return
+ */
+ @PostMapping("/shop/conf/get")
+ R pageShopSysConf(@RequestBody PageComShopSysConfDTO pageComShopSysConfDTO);
+
+ /**
+ * 编辑实有人口_电子档案
+ *
+ * @param userElectronicFileVO
+ * @return
+ */
+ @PostMapping("/common/data/population/edit/electronicArchives")
+ R editUserElectronicFile(@RequestBody UserElectronicFileVO userElectronicFileVO);
+
+ /**
+ * 实有人口统计
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计结果
+ */
+ @PostMapping("/common/data/population/statistics")
+ R getPopulationTotalByAdmin(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 查询房屋级联菜单
+ *
+ * @param cascadeHouseDTO
+ * 请求参数
+ * @return 菜单列表
+ */
+ @PostMapping("/common/data/population/cascade/list")
+ R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO);
+
+ /**
+ * 分页查询房屋列表
+ *
+ * @param populationHouseAdminDTO
+ * 请求参数
+ * @return 房屋列表
+ */
+ @PostMapping("/common/data/population/page/house")
+ R pageHouse(@RequestBody ComMngPopulationHouseAdminDTO populationHouseAdminDTO);
+
+ /**
+ * 根据id查询实有房屋信息
+ *
+ * @param houseId
+ * 房屋id
+ * @return 房屋信息
+ */
+ @PostMapping("/common/data/population/house/detail")
+ R getHouseDetail(@RequestParam(value = "houseId") Long houseId);
+
+ /**
+ * 编辑实有房屋信息
+ *
+ * @param houseEditAdminDTO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/common/data/population/house/edit")
+ R editHouse(@RequestBody ComMngPopulationHouseEditAdminDTO houseEditAdminDTO);
+
+ /**
+ * 根据房屋id列表删除房屋信息
+ *
+ * @param Ids
+ * 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/common/data/population/house/delete")
+ R deleteHouses(@RequestBody List<Long> Ids);
+
+ /**
+ * 新增实有房屋信息
+ *
+ * @param houseEditAdminDTO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/common/data/population/house/insert")
+ R insertHouse(@RequestBody ComMngPopulationHouseInsertAdminDTO houseEditAdminDTO);
+
+ /**
+ * 实有房屋统计
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计结果
+ */
+ @PostMapping("/common/data/population/house/statistics")
+ R getHouseTotalByAdmin(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 根据社区id查询社区所有省市区
+ *
+ * @param communityId
+ * 社区id
+ * @return 社区所在省市区
+ */
+ @PostMapping("/common/data/village/getRegion")
+ R getRegion(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 统计社区内小区数量
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计小区数量
+ */
+ @PostMapping("/common/data/village/statistics")
+ R villageStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 小区详情
+ *
+ * @param villageId
+ * 小区id
+ * @return 小区详情
+ */
+ @PostMapping("/village/getVillage")
+ R getVillage(@RequestParam("villageId") Long villageId);
+
+ /**
+ * 新增高龄认证
+ *
+ * @param eldersAuthAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/eldersauth/add")
+ R add(@RequestBody EldersAuthAddDTO eldersAuthAddDTO);
+
+ /**
+ * 修改高龄认证
+ *
+ * @param eldersAuthEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eldersauth/edit")
+ R edit(@RequestBody EldersAuthEditDTO eldersAuthEditDTO);
+
+ /**
+ * 分页查找高龄认证
+ *
+ * @param pageEldersAuthDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eldersauth/page")
+ R query(@RequestBody PageEldersAuthDTO pageEldersAuthDTO);
+
+ /**
+ * 删除高龄认证
+ *
+ * @param eldersAuthDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/eldersauth/delete")
+ R delete(@RequestBody EldersAuthDeleteDTO eldersAuthDeleteDTO);
+
+ /**
+ * 查询高龄认证详细信息
+ *
+ * @param id
+ * 高龄认证 id
+ * @return 查找结果
+ */
+ @PostMapping("/eldersauth/{id}")
+ R<EldersAuthDetailsVO> eldersAuthDetails(@PathVariable("id") Long id);
+
+ /**
+ * 获取用户家庭成员
+ *
+ * @param userId
+ * 用户ID
+ * @return
+ */
+ @PostMapping("/eldersauth/getMyfamilyElders/{userId}")
+ R getMyfamilyElders(@PathVariable("userId") Long userId);
+
+ /**
+ * 查询导出高龄老人
+ *
+ * @param pageEldersAuthDTO
+ * @return
+ */
+ @PostMapping("/eldersauth/eldersAuthQuery")
+ R eldersAuthQuery(@RequestBody PageEldersAuthDTO pageEldersAuthDTO);
+
+ /**
+ * 通过家庭成员ID添加
+ *
+ * @param eldersAuthAddByFamilyDTO
+ * 添加信息
+ * @return
+ */
+ @PostMapping("/eldersauth/addByFamilyUser")
+ R addByFamilyUser(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO);
+
+ /**
+ * 添加高龄认证反馈
+ *
+ * @param eldersAuthFeedbackAddDTO
+ * @return
+ */
+ @PostMapping("/eldersauth/addFeedback")
+ R addFeedback(@RequestBody EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO);
+
+ //2021-8-30 身份认证改版（高龄老人认证管理）接口
+ /**
+ * 分页查询高龄老人认证记录 pageElderAuthRecords 分页查询高龄老人认证记录
+ * @param pageElderAuthRecordsDTO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/elders/authRecords/page")
+ R pageElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
+
+ /**
+ * 根据高龄认证记录id查询详情 detailElderAuthRecords 根据高龄认证记录id查询详情
+ * @param authRecordId 高龄认证记录id
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @GetMapping("/elders/authRecords/detail")
+ R detailElderAuthRecords(@RequestParam(value = "authRecordId") Long authRecordId);
+
+ /**
+ * 高龄认证审核 examineElderAuthRecords 高龄认证审核
+ * @param comElderAuthRecordVO 高龄认证审核参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/elders/authRecords/examine")
+ R examineElderAuthRecords(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
+
+ /**
+ * 高龄认证标记 examineElderAuthRecords 高龄认证标记
+ * @param comElderAuthRecordVO 高龄认证标记参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/elders/authRecords/sign")
+ R signElderAuthRecords(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
+
+ /**
+ * 根据高龄认证记录id批量查询 getElderAuthRecordsByIds 根据高龄认证记录id批量查询
+ * @param ids 高龄认证记录id集合
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/elders/authRecords/getList")
+ R getElderAuthRecordsByIds(@RequestBody List<Long> ids);
+
+ /**
+ * 导出高龄认证统计记录 exportElderAuthRecordsStatistic
+ * @param pageElderAuthRecordsDTO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/elders/authRecords/statistic/export")
+ R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthStatisticDTO pageElderAuthRecordsDTO);
+
+ /**
+ * 导出高龄认证记录 exportElderAuthRecords 导出高龄认证记录
+ * @param pageElderAuthRecordsDTO 查询参数
+ * @return R 查询结果
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/elders/authRecords/export")
+ R exportElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
+
+ /**
+ * 分页查询养老金人员认证记录 pagePensionAuthRecords 分页查询养老金人员认证记录
+ * @param pageElderAuthRecordsDTO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/07 14:03
+ */
+ @PostMapping("/elders/pensionAuthRecords/page")
+ R pagePensionAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
+
+ /**
+ * 根据养老认证记录id查询详情 detailPensionAuthRecords 根据养老认证记录id查询详情
+ * @param authRecordId 养老认证记录id
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/07 11:03
+ */
+ @GetMapping("/elders/pensionAuthRecords/detail")
+ R detailPensionAuthRecords(@RequestParam(value = "authRecordId") Long authRecordId);
+
+ /**
+ * 养老认证审核 examinePensionAuthRecords 养老认证审核
+ * @param comPensionAuthRecordVO 养老认证审核参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/07 11:03
+ */
+ @PostMapping("/elders/pensionAuthRecords/examine")
+ R examinePensionAuthRecords(@RequestBody ComPensionAuthRecordVO comPensionAuthRecordVO);
+
+ /**
+ * 养老认证标记 signPensionAuthRecords 养老认证标记
+ * @param comPensionAuthRecordVO 养老认证标记参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/elders/pensionAuthRecords/sign")
+ R signPensionAuthRecords(@RequestBody ComPensionAuthRecordVO comPensionAuthRecordVO);
+
+ /**
+ * 根据养老认证记录id批量查询 getPensionAuthRecordsByIds 根据养老认证记录id批量查询
+ * @param ids 养老认证记录id集合
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/elders/pensionAuthRecords/getList")
+ R getPensionAuthRecordsByIds(@RequestBody List<Long> ids);
+
+ /**
+ * 导出养老认证记录 exportPensionAuthRecordsStatistic 导出养老认证记录
+ * @param pageElderAuthRecordsDTO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/elders/pensionAuthRecords/statistic/export")
+ R exportPensionAuthRecordsStatistic(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
+
+ /**
+ * 查询养老认证社区认证方式 setPensionAuthType 查询养老认证社区认证方式
+ * @param eldersAuthTypeQueryDTO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/10 16:03
+ */
+ @PostMapping("/elders/pensionAuthRecords/authtype")
+ R communityPensionAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);
+
+ /**
+ * 设置当前社区养老认证方式:核验类型（1.视频认证 2.人脸核验） setPensionAuthType 设置当前社区养老认证方式:核验类型（1.视频认证 2.人脸核验）
+ * @param communityId 社区id
+ * @param type 检验类型
+ * @return R 设置结果
+ * @author txb
+ * @date 2021/9/10 16:03
+ */
+ @PutMapping("/elders/pensionAuthRecords/authType/{type}")
+ R setPensionAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);
+
+ /**
+ * 小程序-查询疫苗分类列表
+ *
+ * @return 疫苗分类列表
+ */
+ @PostMapping("/vaccines/app/list")
+ R getVaccinesListByApp();
+
+ /**
+ * 小程序-疫苗类型对应家庭成员接种列表
+ *
+ * @return 疫苗类型对应家庭成员接种列表
+ */
+ @PostMapping("/vaccines/app/user/list")
+ R getVaccinesUserListByApp(@RequestBody VaccinesEnrollUserByAppDTO enrollUserByAppDTO);
+
+ /**
+ * 小程序-报名疫苗
+ *
+ * @param enrollByAppDTO
+ * 请求参数
+ * @return 报名结果
+ */
+ @PostMapping("/vaccines/app/enroll")
+ R VaccinesEnrollByApp(@RequestBody VaccinesEnrollByAppDTO enrollByAppDTO);
+
+ /**
+ * 小程序-查询用户家庭成员接种记录
+ *
+ * @param userId
+ * 用户id
+ * @return 用户家庭成员接种记录
+ */
+ @PostMapping("/vaccines/app/user/inoculation/list")
+ R getVaccinesUserInoculationListByApp(@RequestParam("userId") Long userId);
+
+ /**
+ * 后台管理-查询疫苗分类列表
+ *
+ * @param vaccinesByAdminDTO
+ * 请求参数
+ * @return 疫苗分类列表
+ */
+ @PostMapping("/vaccines/admin/list")
+ R getVaccinesListByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 修改疫苗分类信息
+ *
+ * @param vaccinesByAdminDTO
+ * 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/vaccines/admin/edit")
+ R editVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 新增疫苗分类信息
+ *
+ * @param vaccinesByAdminDTO
+ * 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/vaccines/admin/add")
+ R addVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 查询疫苗登记列表
+ *
+ * @param vaccinesByAdminDTO
+ * 请求参数
+ * @return 登记列表
+ */
+ @PostMapping("/vaccines/admin/enroll/list")
+ R getVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 删除疫苗分类信息
+ *
+ * @param id
+ * 疫苗分类id
+ * @return 删除结果
+ */
+ @PostMapping("/vaccines/admin/enroll/delete")
+ R deleteVaccinesByAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 根据条件导出登记列表
+ *
+ * @param vaccinesByAdminDTO
+ * 请求参数
+ * @return 登记列表
+ */
+ @PostMapping("/vaccines/admin/enroll/export")
+ R exportVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 查询接种记录列表
+ *
+ * @param inoculationByAdminDTO
+ * 请求参数
+ * @return 接种记录列表
+ */
+ @PostMapping("/vaccines/admin/inoculation/list")
+ R getVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO);
+
+ /**
+ * 接种记录信息导出
+ *
+ * @param inoculationByAdminDTO
+ * 请求参数
+ * @return 导出结果
+ */
+ @PostMapping("/vaccines/admin/inoculation/export")
+ R exportVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO);
+
+ /**
+ * 查询疫苗分类列表
+ *
+ * @return 疫苗分类列表
+ */
+ @PostMapping("/vaccines/admin/enroll/type/list")
+ R getEnrollTypeListByAdmin();
+
+ /**
+ * 查询老龄认证记录
+ *
+ * @param pageComEldersRecordsDTO
+ * @return
+ */
+ @PostMapping("/elders/records")
+ R queryEldersRecord(@RequestBody PageComEldersRecordsDTO pageComEldersRecordsDTO);
+
+ /**
+ * 查询老龄认证记录详细
+ *
+ * @param id
+ * @return
+ */
+ @PostMapping("/elders/records/deatils")
+ R<ComEldersAuthElderlyDetailsVO> comEldersAuthElderlyDetails(@RequestParam("id") Long id);
+
+ /**
+ * 查询老龄认证社区认证方式
+ *
+ * @param eldersAuthTypeQueryDTO
+ * @return
+ */
+ @PostMapping("/elders/authType")
+ R communityElderAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);
+
+ /**
+ * 分页查询高领老人列表
+ *
+ * @param pageEldersAuthElderlyDTO
+ * @return
+ */
+ @PostMapping("/eldersauthelderly/page")
+ R pageQueryEldersAuthElderly(@RequestBody PageEldersAuthElderlyDTO pageEldersAuthElderlyDTO);
+
+ /**
+ * 批量保存高龄老人
+ *
+ * @param newVoList
+ * @param communityId
+ * @return
+ */
+ @PostMapping("/eldersauthelderly/batchSave")
+ R listSaveEldersAuthElderlyExcelVO(@RequestBody List<EldersAuthElderlyExcelVO> newVoList,
+ @RequestParam("communityId") Long communityId, @RequestParam("createBy") Long createBy);
+
+ /**
+ * 批量保存楼栋
+ *
+ * @param newVoList
+ * @param communityId
+ * @return
+ */
+ @PostMapping("/building/batchSave")
+ R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList,
+ @RequestParam("communityId") Long communityId);
+
+ /**
+ * 插入字典
+ *
+ * @param dictionaryVO
+ * 字典数据
+ * @return R 是否保存成功
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("/dictionary/insertDiction")
+ R insertDiction(@RequestBody DictionaryVO dictionaryVO);
+
+ /**
+ * 插入字典项
+ *
+ * @param dictionaryVO
+ * 字典数据
+ * @return R 是否保存成功
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("/dictionary/insertDictionItem")
+ R insertDictionItem(@RequestBody BcDictionaryVO dictionaryVO);
+
+ /**
+ * 根据字典key查询字典项
+ *
+ * @param key
+ * @return
+ */
+ @GetMapping("/dictionary/listDictionaryByKey")
+ R<List<BcDictionaryVO>> listDictionaryByKey(@RequestParam("key") String key);
+
+ /**
+ * description 根据字典code查询自典项
+ *
+ * @param code
+ * 入参参数
+ * @return BcDictionaryVO 字典
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @GetMapping("/dictionary/getByCode")
+ BcDictionaryItemVO getByCode(@RequestParam("dictId") String dictId, @RequestParam("code") String code);
+
+ /**
+ * 查看高龄老人详情
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("/eldersauthelderly/{id}")
+ R getEldersAuthElderlyById(@PathVariable("id") Long id);
+
+ /**
+ * 修改高龄老人信息
+ *
+ * @param eldersAuthElderlyDTO
+ * @return
+ */
+ @PostMapping("/eldersauthelderly/update")
+ R updateEldersAuthElderly(@RequestBody EldersAuthElderlyDTO eldersAuthElderlyDTO);
+
+ /**
+ * 删除高领老人
+ *
+ * @param id
+ * @return
+ */
+ @PostMapping("/eldersauthelderly/delete")
+ R deleteEldersAuthElderly(@RequestParam("id") Long id);
+
+ /**
+ * 通过老人用户id获取老人信息
+ *
+ * @param authUserId
+ * 老人用户id
+ * @return 老人信息
+ */
+ @PostMapping("/elders/getAuth")
+ R getEldersAuthUserByApp(@RequestParam("authUserId") Long authUserId);
+
+ /**
+ * 人脸核验新增高龄认证记录
+ *
+ * @param authGetResultDTO
+ * 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/elders/add/auth")
+ R addEldersAuthByApp(@RequestBody ComEldersAuthGetResultDTO authGetResultDTO);
+
+ /**
+ * 高龄认证分页接口
+ *
+ * @param authPageDTO
+ * 请求参数
+ * @return 查询结果
+ */
+ @PostMapping("/elders/page/auth")
+ R pageEldersByApp(@RequestBody ComEldersAuthPageDTO authPageDTO);
+
+ /**
+ * 添加高龄老人接口
+ *
+ * @param authUserAddAppDTO
+ * 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/elders/add")
+ R addEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO);
+
+ /**
+ * 修改高龄老人接口
+ *
+ * @param authUserAddAppDTO
+ * 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/elders/edit")
+ R editEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO);
+
+ /**
+ * 分页查询生存认证记录
+ *
+ * @param pageEldersAuthElderlyDTO
+ * @return
+ */
+ @PostMapping("/elders/records/page")
+ R pageQueryEldersAuthRecord(@RequestBody PageEldersAuthRecordDTO pageEldersAuthElderlyDTO);
+
+ /**
+ * description 批量保存重点人群人员信息
+ *
+ * @param list
+ * 重点人群信息
+ * @return R 保存结果
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("/key_person/batch/save")
+ R saveBatchKeyPerson(@RequestBody List<KeyPersonInfoDTO> list);
+
+ @GetMapping("/screen/population/statistic")
+ R statistic(@RequestParam("communityId") Long communityId);
+
+ /**
+ * @param communityId
+ * @param type
+ * @return
+ */
+ @PostMapping("/elders/setCommunityAuthType")
+ R setCommunityAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);
+
+ @PostMapping("/elders/getAuthHistoryList")
+ R getAuthHistoryList(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);
+
+ @PostMapping("/elders/getAuthHistoryExport")
+ R getAuthHistoryExport(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);
+
+ @GetMapping("/screen/work/neighborCircle")
+ R statisticNeighborCircle(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 党员党支部统计信息
+ *
+ * @return
+ */
+ @PostMapping("/bigscreen/party/orgmembers")
+ R bigscreenPartyOrgmembers(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg);
+
+ /**
+ * 党员年龄占比、男女占比
+ *
+ * @return
+ */
+ @PostMapping("/bigscreen/party/ageGender")
+ R<BigScreenStatisticAgeGender>
+ ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO);
+
+ /**
+ * 党建数据概览
+ *
+ * @return
+ */
+ @PostMapping("/bigscreen/party/partybuild/{communityId}")
+ R<BigScreenStatisticPartyBuild> bigscreenPartybuild(@PathVariable("communityId") Long communityId);
+
+ /**
+ * 党员活动参加用户排行榜-TOP3
+ *
+ * @return
+ */
+ @PostMapping("/bigscreen/party/activitytopuser/{communityId}")
+ R<List<PartyBuildingMemberVO>> bigscreenPartyactivitytopuser(@PathVariable("communityId") Long communityId);
+
+ /**
+ * 党员活动
+ *
+ * @return
+ */
+ @PostMapping("/bigscreen/party/bigscreenPartyactivity")
+ R<List<BigScreenStatisticPartyActivity>>
+ bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);
+
+ /**
+ * 首页大屏统计接口
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计结果
+ */
+ @GetMapping("/screen/getScreenIndex")
+ R getScreenIndex(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 事件大屏统计接口
+ *
+ * @param screenEventDTO
+ * 请求参数
+ * @return 统计结果
+ */
+ @PostMapping("/screen/getScreenEvent")
+ R getScreenEvent(@RequestBody BigScreenEventDTO screenEventDTO);
+
+ /**
+ * 民生大屏统计接口
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计结果
+ */
+ @GetMapping("/screen/getScreenCivil")
+ R getScreenCivil(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大屏统计邻里圈
+ */
+ @GetMapping("/screen/work/wish")
+ R wish(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大屏统计社区-活动
+ *
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/work/activity")
+ R activity(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大屏统计议事投票
+ *
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/work/discuss")
+ R discuss(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大屏统计党建工作
+ *
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/work/pbWork")
+ R pbWork(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大屏统计随手拍
+ *
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/work/easyPhoto")
+ R easyPhoto(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大屏统计工作情况
+ *
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/work/workCount")
+ R workCount(@RequestParam("communityId") Long communityId);
+
+ /**
+ * description 批量保存残疾人人员信息
+ *
+ * @param list
+ * 疾人信息列表
+ * @return R 保存结果
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("/disable_person/batch/save")
+ R saveBatchDisabledPersons(@RequestBody List<DisabledPersonsDTO> list);
+
+ /**
+ * 获取社区网格
+ *
+ * @param communityId
+ * 社区id
+ * @return 网格数据
+ */
+ @GetMapping("/screen/getScreenGirds")
+ R getScreenGirds(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 事件大屏查询事件详情
+ *
+ * @param eventDetailDTO
+ * 请求参数
+ * @return 事件详情
+ */
+ @PostMapping("/screen/getScreenEventDetail")
+ R getScreenEventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO);
+
+ /**
+ * 工作大屏-议事投票列表
+ *
+ * @param discussListDTO
+ * 请求参数
+ * @return 议事投票列表
+ */
+ @PostMapping("/screen/work/getScreenDiscussList")
+ R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO);
+
+ /**
+ * 工作大屏-社区活动列表
+ *
+ * @param actActivityListDTO
+ * 请求参数
+ * @return 活动列表
+ */
+ @PostMapping("/screen/work/getScreenActActivityList")
+ R getScreenActActivityList(@RequestBody ScreenActActivityListDTO actActivityListDTO);
+
+ /**
+ * 工作大屏-社区活动报名人员列表
+ *
+ * @param activityPeopleListDTO
+ * 请求参数
+ * @return 社区活动报名人员列表
+ */
+ @PostMapping("/screen/work/getActActivityPeopleList")
+ R getActActivityPeopleList(@RequestBody ScreenActActivityPeopleListDTO activityPeopleListDTO);
+
+ /**
+ * 工作大屏-微心愿列表
+ *
+ * @param microListDTO
+ * 请求参数
+ * @return 微心愿列表
+ */
+ @PostMapping("/screen/work/getScreenMicroList")
+ R getScreenMicroList(@RequestBody ScreenMicroListDTO microListDTO);
+
+ /**
+ * 获取系统参数接口
+ *
+ * @param code
+ * 参数code
+ * @return 系统参数
+ */
+ @GetMapping("/sys/conf/get")
+ R getConf(@RequestParam("code") String code);
+
+ /**
+ * 获取人口数据信息
+ *
+ * @param populationListDTO
+ * 请求参数
+ * @return 人口数据
+ */
+ @PostMapping("/population/list/app")
+ R getPopulationListByApp(@RequestBody PagePopulationListDTO populationListDTO);
+
+ /**
+ * 根据人口id获取人口详情
+ *
+ * @param populationId
+ * 人口id
+ * @return 人口详情
+ */
+ @GetMapping("/population/detail/app")
+ R getPopulationDetailByApp(@RequestParam("populationId") Long populationId);
+
+ /**
+ * 修复人口加密问题
+ *
+ * @return 修复结果
+ */
+ @GetMapping("/population/repair")
+ R getPopulationRepairByApp();
+
+ /**
+ * 工作大屏-社区动态模块数据统计
+ *
+ * @param communityId
+ * 社区id
+ * @return 社区动态数据统计
+ */
+ @GetMapping("/screen/work/dynamic")
+ R dynamicWork(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 查询用户钱包信息
+ *
+ * @param walletDetailDTO
+ * 请求参数
+ * @return 用户钱包信息
+ */
+ @PostMapping("/wallet/get/my")
+ R getUserWalletDetail(@RequestBody ComActWalletDetailDTO walletDetailDTO);
+
+ /**
+ * 查询用户收支记录列表
+ *
+ * @param walletTradeDTO
+ * 请求参数
+ * @return 收支记录
+ */
+ @PostMapping("/wallet/get/trade")
+ R getUserWalletTrade(@RequestBody PageComActWalletTradeDTO walletTradeDTO);
+
+ /**
+ * 查询用户绑定的社区收益排行榜
+ *
+ * @param walletTradeDTO
+ * 请求参数
+ * @return 社区收益排行榜
+ */
+ @PostMapping("/wallet/get/ranking")
+ R getWalletRanking(@RequestBody PageComActWalletTradeDTO walletTradeDTO);
+
+ /**
+ * 综治后台-居民列表
+ *
+ * @param populationListDTO
+ * 请求参数
+ * @return 居民列表
+ */
+ @PostMapping("/population/grid/list")
+ R getGridPopulationList(@RequestBody ComMngPopulationListDTO populationListDTO);
+
+ /**
+ * 综治后台-删除居民
+ *
+ * @param ids
+ * 居民id集合
+ * @return 删除结果
+ */
+ @PostMapping("/population/grid/del")
+ R delGridPopulation(@RequestBody List<Long> ids);
+
+ /**
+ * 综治后台-居民详情
+ *
+ * @param populationId
+ * 居民id
+ * @return 居民详情
+ */
+ @GetMapping("/population/grid/get")
+ R getGridPopulationDetail(@RequestParam("populationId") Long populationId);
+
+ /**
+ * 综治app-小区列表
+ *
+ * @param villageListAppDTO
+ * 请求参数
+ * @return 小区列表
+ */
+ @PostMapping("/village/grid/list")
+ R getGridVillageList(@RequestBody ComMngVillageListAppDTO villageListAppDTO);
+
+ /**
+ * 综治app-根据小区id查询小区下楼栋列表
+ *
+ * @param villageId
+ * 小区id
+ * @return 楼栋列表
+ */
+ @PostMapping("/village/grid/building/list")
+ R getGridVillageBuildingList(@RequestParam("villageId") Long villageId);
+
+ /**
+ * 小区楼栋下房屋列表
+ *
+ * @param buildHouseAppDTO
+ * 请求参数
+ * @return 房屋列表
+ */
+ @PostMapping("/village/grid/building/house/list")
+ R getGridVillageBuildingHouseList(@RequestBody PageComMngVillageBuildHouseAppDTO buildHouseAppDTO);
+
+ /**
+ * 小区楼栋下房屋信息
+ *
+ * @param houseId
+ * 房屋id
+ * @return 房屋信息
+ */
+ @PostMapping("/village/grid/building/house/detail")
+ R getGridVillageBuildingHouseDetail(@RequestParam("houseId") Long houseId);
+
+ /**
+ * 查询平台人口列表
+ *
+ * @param populationDTO
+ * 请求参数
+ * @return 人口列表
+ */
+ @PostMapping("/village/grid/building/house/population/list")
+ R getBuildingHousePopulationList(@RequestBody PageComMngPopulationDTO populationDTO);
+
+ /**
+ * 批量向房屋新增人员
+ *
+ * @param housePopulationDTO
+ * 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/village/grid/building/house/add/population")
+ R addBuildingHousePopulation(@RequestBody AddComMngHousePopulationDTO housePopulationDTO);
+
+ /**
+ * 批量删除房屋内人员
+ *
+ * @param housePopulationDTO
+ * 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/village/grid/building/house/del/population")
+ R delBuildingHousePopulation(@RequestBody DelComMngHousePopulationDTO housePopulationDTO);
+
+ /**
+ * 综治后台-居民标签栏统计
+ *
+ * @return 居民统计
+ */
+ @GetMapping("/population/grid/statistics")
+ R getGridPopulationStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 综治后台-居民导出查询居民数据
+ *
+ * @param populationExportDTO
+ * 请求参数
+ * @return 导出结果
+ */
+ @PostMapping("/population/grid/export")
+ R getGridPopulationExport(@RequestBody ComMngPopulationExportDTO populationExportDTO);
+
+ /**
+ * 综治后台-居民管理小区列表
+ *
+ * @param name
+ * 小区名字
+ * @return 小区列表
+ */
+ @GetMapping("/population/village/relation")
+ R relationVillage(@RequestParam("name") String name);
+
+ /**
+ * 综治后台-居民管理-级联列表
+ *
+ * @param subordinateDTO
+ * 请求参数
+ * @return 级联列表
+ */
+ @PostMapping("/population/subordinate")
+ R subordinate(@RequestBody ComMngPopulationSubordinateDTO subordinateDTO);
+
+ /**
+ * 综治后台-居民关联房屋
+ *
+ * @param relationHouseDTO
+ * 请求参数
+ * @return 关联结果
+ */
+ @PostMapping("/population/relation/house")
+ R populationRelationHouse(@RequestBody ComMngPopulationRelationHouseDTO relationHouseDTO);
+
+ /**
+ * 综治后台-批量删除小区
+ *
+ * @param villageIds
+ * 小区id集合
+ * @return 删除结果
+ */
+ @PostMapping("/village/admin/del")
+ R delGridVillage(@RequestBody List<Long> villageIds);
+
+ /**
+ * 综治后台-小区内居民列表
+ *
+ * @param villagePopulationDTO
+ * 请求参数
+ * @return 居民列表
+ */
+ @PostMapping("/village/admin/population/list")
+ R getVillagePopulationAdmin(@RequestBody PageComMngVillagePopulationDTO villagePopulationDTO);
+
+ /**
+ * 综治后台-居民下房屋列表
+ *
+ * @param villagePopulationHouseDTO
+ * 请求参数
+ * @return 房屋列表
+ */
+ @PostMapping("/village/admin/population/house/list")
+ R getVillagePopulationHouseAdmin(@RequestBody PageComMngVillagePopulationHouseDTO villagePopulationHouseDTO);
+
+ /**
+ * 综治后台-小区统计
+ *
+ * @return 小区统计结果
+ */
+ @GetMapping("/village/admin/statistics")
+ R getGridVillageStatistics();
+
+ /**
+ * 综治后台-小区列表导出
+ *
+ * @param villageListAppDTO
+ * 请求参数
+ * @return 小区列表
+ */
+ @PostMapping("/village/admin/export")
+ R getGridVillageListExport(@RequestBody ComMngVillageListExportAdminDTO villageListAppDTO);
+
+ /**
+ * 社区后台-分页查询随手拍活动列表
+ *
+ * @param pageEasyPhotoActivityDTO
+ * 请求参数
+ * @return 随手拍活动列表
+ */
+ @PostMapping("/easy/photo/activity/page")
+ R pageEasyPhotoActivity(@RequestBody PageEasyPhotoActivityDTO pageEasyPhotoActivityDTO);
+
+ /**
+ * 社区后台-添加随手拍活动
+ *
+ * @param addEasyPhotoActivityDTO
+ * 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/easy/photo/activity/add")
+ R addEasyPhotoActivity(@RequestBody AddEasyPhotoActivityDTO addEasyPhotoActivityDTO);
+
+ /**
+ * 社区后台-编辑随手拍活动
+ *
+ * @param editEasyPhotoActivityDTO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/easy/photo/activity/edit")
+ R editEasyPhotoActivity(@RequestBody EditEasyPhotoActivityDTO editEasyPhotoActivityDTO);
+
+ /**
+ * 社区后台-取消随手拍活动
+ *
+ * @param id
+ * 随手拍活动id
+ * @return 取消结果
+ */
+ @GetMapping("/easy/photo/activity/cancel")
+ R cancelEasyPhotoActivity(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询随手拍活动下居民参与记录
+ *
+ * @param pageEasyPhotoActivityUserDTO
+ * 请求参数
+ * @return 居民参与记录
+ */
+ @PostMapping("/easy/photo/activity/page/user")
+ R pageEasyPhotoActivityUser(@RequestBody PageEasyPhotoActivityUserDTO pageEasyPhotoActivityUserDTO);
+
+ /**
+ * 随手拍活动定时任务
+ *
+ * @return 执行结果
+ */
+ @PostMapping("timeTaskEasyPhotoActivity")
+ R timedTaskEasyPhotoActivity();
+
+ /**
+ * 分页查询收益结算列表
+ *
+ * @param pageWalletAdminDTO
+ * 请求参数
+ * @return 收益结算列表
+ */
+ @PostMapping("/user/wallet/page")
+ R pageUserWalletAdmin(@RequestBody PageComActWalletAdminDTO pageWalletAdminDTO);
+
+ /**
+ * 用户结算收益
+ *
+ * @param settlementAdminDTO
+ * 请求参数
+ * @return 结算结果
+ */
+ @PostMapping("/user/wallet/settlement")
+ R userWalletSettlementAdmin(@RequestBody ComActWalletSettlementAdminDTO settlementAdminDTO);
+
+ /**
+ * 分页查询交易记录
+ *
+ * @param pageTradeAdminDTO
+ * 请求参数
+ * @return 交易记录列表
+ */
+ @PostMapping("/user/wallet/trade/page")
+ R pageUserWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);
+
+ /**
+ * 查询用户交易记录总额
+ *
+ * @param pageTradeAdminDTO
+ * 请求参数
+ * @return 交易记录总额
+ */
+ @PostMapping("/user/wallet/trade/total")
+ R getTradeUserTotalWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);
+
+ /**
+ * 查询用户导出数据
+ *
+ * @param pageTradeAdminDTO
+ * 请求参数
+ * @return 用户导出数据
+ */
+ @PostMapping("/user/wallet/trade/export")
+ R getTradeUserTotalWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);
+
+ /**
+ * 导出奖励台账数据
+ *
+ * @param pageTradeAdminDTO
+ * 请求参数
+ * @return 奖励台账数据
+ */
+ @PostMapping("/user/wallet/trade/reward/export")
+ R getTradeUserTotalJLWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);
+
+ /**
+ * 查询社区统计数据
+ *
+ * @param pageTradeAdminDTO
+ * 查询社区统计数据
+ * @return 社区统计数据
+ */
+ @PostMapping("/user/wallet/trade/statistics")
+ R getTradeUserStatisticsAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);
+
+ /**
+ * 社区随手拍列表统计
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计结果
+ */
+ @GetMapping("/easyphoto/statistics")
+ R easyPhotoStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询邻里圈话题列表
+ *
+ * @param circleTopicAdminDTO
+ * 请求参数
+ * @return 邻里圈话题列表
+ */
+ @PostMapping("/neighbor/pageNeighborTopicByAdmin")
+ R pageNeighborTopicByAdmin(@RequestBody ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO);
+
+ /**
+ * 添加邻里圈话题
+ *
+ * @param addCircleTopicAdminDTO
+ * 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/neighbor/addNeighborTopicByAdmin")
+ R addNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);
+
+ /**
+ * 编辑邻里圈话题
+ *
+ * @param addCircleTopicAdminDTO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/neighbor/editNeighborTopicByAdmin")
+ R editNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);
+
+ /**
+ * 小程序查询邻里圈话题列表
+ *
+ * 社区id
+ * @return 邻里圈话题列表
+ */
+ @GetMapping("/neighbor/getNeighborTopicByApp")
+ R getNeighborTopicByApp(@RequestParam("name") String name);
+
+ @GetMapping("/neighbor/getNeighborTopicByAppNew")
+ R getNeighborTopicByAppNew(@RequestParam("name") String name);
+ /**
+ * 删除话题
+ * @param id
+ * @return
+ */
+ @GetMapping("/neighbor/deleteNeighborTopic")
+ R deleteNeighborTopic(@RequestParam("id") Long id);
+
+ /**
+ * 综治后台-查询社区列表
+ *
+ * @return 社区列表
+ */
+ @GetMapping("/eventgrid/community/list")
+ R getCommunityLists();
+
+ /**
+ * 查询西区社区列表
+ *
+ * @return 社区列表
+ */
+ @GetMapping("/eventgrid/community/westList")
+ R getWestCommunityLists(@RequestParam(value = "areaCode",required = false)String areaCode);
+
+ /**
+ * 综治app-小区列表
+ * @param villageListAppDTO 请求参数
+ * @return 小区列表
+ */
+ @PostMapping("/village/grid/list/app")
+ R getGridVillageListApp(@RequestBody ComMngVillageListAppDTO villageListAppDTO);
+
+ /**
+ * 分页查询退役军人列表
+ *
+ * @param comExServicemanDTO
+ * 请求参数
+ * @return 退役军人列表
+ */
+ @PostMapping("/population/page/exServiceman")
+ R pageExServiceman(@RequestBody ComExServicemanDTO comExServicemanDTO);
+
+ /**
+ * 分页查询社区动态分类列表
+ *
+ * @param comActDynTypeDTO
+ * 请求参数
+ * @return 动态分类列表
+ */
+ @PostMapping("/dyn/type/page")
+ R pageDynTypeByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 查询社区下所有动态分类列表
+ *
+ * @param comActDynTypeDTO
+ * 请求参数
+ * @return 动态分类列表
+ */
+ @PostMapping("/dyn/type/list")
+ R getDynTypeListByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 添加社区动态分类
+ *
+ * @param comActDynTypeDTO
+ * 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/dyn/type/add")
+ R addDynTypeByAdmin(@RequestBody AddComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 编辑社区动态分类
+ *
+ * @param comActDynTypeDTO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/dyn/type/edit")
+ R editDynTypeByAdmin(@RequestBody EditComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 删除社区动态分类
+ *
+ * @param ids
+ * 社区动态分类id集合
+ * @return 删除结果
+ */
+ @PostMapping("/dyn/type/delete")
+ R deleteDynTypeByAdmin(@RequestBody List<Long> ids);
+
+ /**
+ * 随手拍发放奖励
+ *
+ * @param grantRewardDTO
+ * 请求参数
+ * @return 发放结果
+ */
+ @PostMapping("/easyphoto/grantReward")
+ R grantReward(@RequestBody GrantRewardDTO grantRewardDTO);
+
+ /**
+ * 获取最新活动和用户最新收益
+ *
+ * @param userId
+ * 用户id
+ * @param communityId
+ * 社区id
+ * @return 最新活动和用户最新收益
+ */
+ @PostMapping("/easyphoto/getUserReward")
+ R getUserReward(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 获取首页弹窗接口
+ * @param userId
+ * 用户id
+ * @param communityId
+ * 社区id
+ * @return 首页弹窗接口
+ */
+ @PostMapping("/easyphoto/getUserRewards")
+ R getUserRewards(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 读取用户随手拍奖励
+ *
+ * @param userId
+ * 用户id
+ * @return 读取结果
+ */
+ @PostMapping("/easyphoto/readUserReward")
+ R readUserReward(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询巡查记录
+ *
+ * @param comSwPatrolRecordPageDTO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/patrolRecord/page")
+ R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);
+
+ /**
+ * 新增巡查记录
+ *
+ * @param comSwPatrolRecordAddDTO
+ * 新增参数
+ * @return 新增结果
+ */
+ @PostMapping("/patrolRecord/addPatrolRecord")
+ R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO);
+
+ /**
+ * 编辑巡查记录 editPatrolRecord 编辑巡查记录
+ * @param comSwPatrolRecordEditDTO 编辑巡查记录参数
+ * @return R 编辑结果
+ * @author txb
+ * @date 2021/9/08 17:03
+ */
+ @PostMapping("/patrolRecord/edit")
+ R editPatrolRecord(@RequestBody ComSwPatrolRecordEditDTO comSwPatrolRecordEditDTO);
+
+ /**
+ * 根据巡查记录id查询详情
+ *
+ * @param patrolRecordId
+ * 巡查记录id
+ * @return 巡查记录详情查询结果
+ */
+ @GetMapping("/patrolRecord/detail")
+ R detailPatrolRecord(@RequestParam("patrolRecordId") Long patrolRecordId);
+
+ /**
+ * 分页查询安全工作记录
+ *
+ * @param comSwPatrolRecordPageDTO
+ * 查询参数
+ * @return 安全工作记录分页集合
+ */
+ @PostMapping("/patrolRecord/safetyWorkRecord/page")
+ R pageSafetyWorkRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);
+
+ /**
+ * 编辑安全工作记录 editSafetyWork 编辑安全工作记录
+ * @param comSwSafetyWorkEditDTO 编辑安全工作记录参数
+ * @return R 编辑结果
+ * @author txb
+ * @date 2021/9/08 17:03
+ */
+ @PostMapping("/patrolRecord/safetyWorkRecord/edit")
+ R editSafetyWork(@RequestBody ComSwSafetyWorkEditDTO comSwSafetyWorkEditDTO);
+
+ /**
+ * 根据安全工作记录id查询详情
+ *
+ * @param safetyWorkRecordId
+ * 安全工作记录
+ * @return 安全工作记录详情查询结果
+ */
+ @GetMapping("/patrolRecord/safetyWorkRecord/detail")
+ R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId,
+ @RequestParam(value = "communityId", required = false) Long communityId);
+
+ /**
+ * 根据巡查记录id查询安全工作记录详情
+ *
+ * @param patrolRecordId
+ * 巡查记录id
+ * @return 安全工作记录详情查询结果
+ */
+ @GetMapping("/patrolRecord/safetyWorkRecord/detailByPrId")
+ R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId,
+ @RequestParam(value = "communityId", required = false) Long communityId);
+
+ /**
+ * 分页查询隐患报告
+ *
+ * @param comSwPatrolRecordPageDTO
+ * 查询参数
+ * @return 隐患报告分页集合
+ */
+ @PostMapping("/patrolRecord/dangerReport/page")
+ R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);
+
+ /**
+ * 编辑隐患报告 editDangerReport 编辑隐患报告
+ * @param comSwDangerReportEditDTO 编辑隐患报告参数
+ * @return R 编辑结果
+ * @author txb
+ * @date 2021/9/08 17:03
+ */
+ @PostMapping("/patrolRecord/dangerReport/edit")
+ R editDangerReport(@RequestBody ComSwDangerReportEditDTO comSwDangerReportEditDTO);
+
+ /**
+ * 根据隐患报告id查询详情
+ *
+ * @param dangerReportId
+ * 隐患报告id
+ * @return 隐患报告详情查询结果
+ */
+ @GetMapping("/patrolRecord/dangerReport/detail")
+ R detailDangerReport(@RequestParam(value = "dangerReportId") Long dangerReportId);
+
+ /**
+ * 根据巡查记录id查询隐患报告详情
+ *
+ * @param patrolRecordId
+ * 巡查记录id
+ * @return 隐患报告详情查询结果
+ */
+ @GetMapping("/patrolRecord/dangerReport/detailByPrId")
+ R detailDangerReportByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId);
+
+ /**
+ * 处理隐患报告
+ *
+ * @param comSwDangerReportHandleDTO
+ * 隐患报告处理参数
+ * @return 处理结果
+ */
+ @PostMapping("/patrolRecord/dangerReport/handle")
+ R handleDangerReport(@RequestBody ComSwDangerReportHandleDTO comSwDangerReportHandleDTO);
+
+ /**
+ * 整改隐患报告
+ *
+ * @param comSwDangerReportRectifyDTO
+ * 隐患报告整改参数
+ * @return 整改结果
+ */
+ @PostMapping("/patrolRecord/dangerReport/rectify")
+ R rectifyDangerReport(@RequestBody ComSwDangerReportRectifyDTO comSwDangerReportRectifyDTO);
+
+ /**
+ * 隐患报告台账导出
+ *
+ * @param dangerReportIds
+ * @return
+ */
+ @PostMapping("/patrolRecord/dangerReport/export")
+ R exportDangerReport(@RequestBody List<Long> dangerReportIds);
+
+ /**
+ * 巡查记录统计接口
+ *
+ * @return 统计结果
+ */
+ @GetMapping("/patrolRecord/statistics")
+ R patrolRecordStatistics(@RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 小程序-查询积分说明
+ *
+ * @return 积分说明
+ */
+ @GetMapping("/integral/explain/applets")
+ R getIntegralExplainApplets();
+
+ /**
+ * 小程序-用户查询当前社区可领取积分规则列表
+ *
+ * @param userId
+ * 用户id
+ * @param communityId
+ * 社区id
+ * @return 可领取积分规则列表
+ */
+ @PostMapping("/integral/receive/applets")
+ R getIntegralReceiveApplets(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 小程序-积分统计
+ *
+ * @param userId
+ * 用户id
+ * @return 用户积分列表
+ */
+ @GetMapping("/integral/user/statistics")
+ R getIntegralUserListApplets(@RequestParam("userId") Long userId, @RequestParam(value = "communityId", required = false) Long communityId);
+
+ /**
+ * 查询我的积分余额
+ * @param userId
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/integral/user/balance")
+ R getUserIntegralBalance(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 小程序-查询社区积分账户排行榜
+ *
+ * @param communityRankDTO
+ * 请求参数
+ * @return 社区积分账户排行榜
+ */
+ @PostMapping("/integral/community/rank/applets")
+ R getIntegralCommunityRankApplets(@RequestBody ComActIntegralCommunityRankDTO communityRankDTO);
+
+ /**
+ * 小程序-查询用户社区积分明细
+ *
+ * @param communityTradeDTO
+ * 请求参数
+ * @return 用户社区积分明细
+ */
+ @PostMapping("/integral/community/trade/applets")
+ R getIntegralCommunityTradeApplets(@RequestBody ComActIntegralCommunityRankDTO communityTradeDTO);
+
+ /**
+ * 社区后台-根据社区id查询社区下积分规则列表
+ *
+ * @param integralRuleDTO
+ * 请求参数
+ * @return 社区下积分规则列表
+ */
+ @PostMapping("/integral/rule/list/admin")
+ R getIntegralRuleAdminList(@RequestBody PageComActIntegralRuleDTO integralRuleDTO);
+
+ /**
+ * 社区后台-编辑社区积分规则
+ *
+ * @param integralRuleDTO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/integral/rule/edit/admin")
+ R editIntegralRuleAdmin(@RequestBody EditComActIntegralRuleDTO integralRuleDTO);
+
+ /**
+ * 社区后台-分页查询社区下积分明细记录
+ *
+ * @param integralRuleDTO
+ * 请求参数
+ * @return 社区下积分明细记录
+ */
+ @PostMapping("/integral/user/trade/page/admin")
+ R getIntegralTradeListAdmin(@RequestBody PageComActIntegralTradeDTO integralRuleDTO);
+
+ /**
+ * 给用户添加积分
+ *
+ * @param integralUserDTO
+ * 请求参数
+ * @return 添加积分结果
+ */
+ @PostMapping("/integral/user/add/admin")
+ R addIntegralTradeAdmin(@RequestBody AddComActIntegralUserDTO integralUserDTO);
+
+ /**
+ * 根据社区活动id查询社区活动报名且未参与人员列表
+ *
+ * @param activityId
+ * 活动id
+ * @return 社区活动报名且未参与人员列表
+ */
+ @PostMapping("/integral/act/activity/admin")
+ R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId);
+
+ /**
+ * 分页查询值班表
+ *
+ * @param comSwRotaPageDTO
+ * 查询参数
+ * @return 值班表分页集合
+ */
+ @PostMapping("/patrolRecord/rota/page")
+ R pageRota(@RequestBody ComSwRotaPageDTO comSwRotaPageDTO);
+
+ /**
+ * 根据id查询值班表
+ *
+ * @param rotaId
+ * 值班表id
+ * @return 值班表详情
+ */
+ @GetMapping("/patrolRecord/rota/detail")
+ R detailRota(@RequestParam("rotaId") Long rotaId);
+
+ /**
+ * 新增值班表
+ *
+ * @param comSwRotaSaveDTOs
+ * 新增参数
+ * @return 新增结果
+ */
+ @PostMapping("/patrolRecord/rota/add")
+ R addRota(@RequestBody List<ComSwRotaSaveDTO> comSwRotaSaveDTOs);
+
+ /**
+ * 批量删除值班表
+ *
+ * @param rotaIds
+ * 值班ids
+ * @return 删除结果
+ */
+ @PostMapping("/patrolRecord/rota/delete")
+ R deleteRota(@RequestBody List<Long> rotaIds);
+
+ /**
+ * 根据日期查询值班人员
+ *
+ * @return 查询结果
+ */
+ @GetMapping("/patrolRecord/rota/getRotaPersonByDate")
+ R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);
+
+ /**
+ * 根据日期查询值班领导
+ *
+ * @return 查询结果
+ */
+ @GetMapping("/patrolRecord/rota/getRotaLeaderByDate")
+ R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);
+
+ /**
+ * 批量导入值班表
+ *
+ * @param list
+ * 值班表集合
+ */
+ @PostMapping("/patrolRecord/rota/import")
+ R listSaveSwRotaExcelVO(@RequestBody List<ComSwRotaExcelVO> list, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 定时任务检测即将开始的社区活动，并使用订阅消息通知用户
+ */
+ @PostMapping("timedTaskActivityNotice")
+ R timedTaskActivityNotice();
+
+ /**
+ * 定时任务检测待发布，调研中的问卷调查状态
+ */
+ @PostMapping("timedTaskQuestionnaire")
+ R timedTaskQuestionnaire();
+
+ /**
+ * 查询社区所有列表
+ *
+ * @return 社区列表
+ */
+ @GetMapping("/switch/community/all/list")
+ R communitySwitchList(@RequestParam("appId") String appId);
+
+ /**
+ * 根据名字查询所有社区列表
+ *
+ * @param name
+ * 社区名字
+ * @return 社区列表
+ */
+ @GetMapping("/switch/community/search/list")
+ R communitySwitchSearchList(@RequestParam(value = "name") String name,@RequestParam(value = "appId") String appId);
+
+ /**
+ * 根据经纬度以及距离搜索附近社区列表
+ *
+ * @param communityDTO
+ * 请求参数
+ * @return 社区列表
+ */
+ @PostMapping("/switch/community/search/distance/list")
+ R communitySwitchSearchDistanceList(@RequestBody SearchCommunityDTO communityDTO);
+
+ /**
+ * 问卷调查统计汇总
+ *
+ * @param summaryDTO
+ * 请求参数
+ * @return 统计汇总
+ */
+ @PostMapping("/questnaire/statisticsSummary")
+ R statisticsSummary(@RequestBody StatisticsSummaryDTO summaryDTO);
+
+ /**
+ * 问卷调查统计汇总导出数据查询
+ *
+ * @param questId
+ * 调查问卷id
+ * @return 调查统计汇总导出数据
+ */
+ @GetMapping("/questnaire/statisticsSummary/export")
+ R statisticsSummaryExport(@RequestParam("questId") Long questId);
+
+ /**
+ * 问卷调查统计汇总表头统计
+ *
+ * @param questId
+ * 调查问卷id
+ * @return 问卷调查统计汇总表头统计数据
+ */
+ @GetMapping("/questnaire/statisticsSummary/header")
+ R statisticsSummaryHeader(@RequestParam("questId") Long questId, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 运营后台-新增随手拍分类
+ *
+ * @param addPhotoClassify
+ * 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/classify/admin/add")
+ R addPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify);
+
+ /**
+ * 运营后台-编辑随手拍分类
+ *
+ * @param addPhotoClassify
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/classify/admin/edit")
+ R editPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify);
+
+ /**
+ * 运营后台-分页查询随手拍分类
+ *
+ * @param addPhotoClassify
+ * 请求参数
+ * @return 随手拍分类列表
+ */
+ @PostMapping("/classify/admin/page")
+ R pagePhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify);
+
+ /**
+ * 运营后台-随手拍分类详情
+ *
+ * @param id
+ * 随手拍分类id
+ * @return 随手拍分类
+ */
+ @GetMapping("/classify/admin/detail")
+ R detailPhotoClassify(@RequestParam("id") Long id);
+
+ /**
+ * 运营后台-随手拍分类删除
+ *
+ * @param id
+ * 随手拍分类id
+ * @return 删除结果
+ */
+ @GetMapping("/classify/admin/delete")
+ R deletePhotoClassify(@RequestParam("id") Long id);
+
+ /**
+ * 运营后台-查询随手拍分类列表
+ *
+ * @return 随手拍分类列表
+ */
+ @GetMapping("/classify/admin/list")
+ R listPhotoClassify(@RequestParam("areaCode") String areaCode);
+
+ /**
+ * 社区后台-切换随手拍公示状态
+ *
+ * @param comActEasyPhotoVO
+ * 请求参数
+ * @return 切换结果
+ */
+ @PostMapping("/easyphoto/switch/publicity")
+ R easyPhotoSwitchPublicity(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ * 查询社区待处理随手拍id集合
+ *
+ * @param communityId
+ * 社区id
+ * @return 社区待处理随手拍id集合
+ */
+ @GetMapping("/easyphoto/noHandle/list")
+ R easyPhotoNoHandleList(@RequestParam("communityId") Long communityId);
+
+ @GetMapping("/reserve/detail")
+ R reserveDetail(@RequestParam("id") Long id,@RequestParam("userId") Long userId,@RequestParam("recordId") Long recordId,@RequestParam("isBack") Integer isBack);
+
+ @PostMapping("/reserve/commit")
+ R reserveCommit(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
+
+ @PostMapping("/reserve/commitNoToken")
+ R reserveCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
+
+ @PostMapping("/reserve/homeQuarantine/commitNoToken")
+ R homeQuarantineCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
+ /**
+ * 我的预约/登记
+ * @param pageUserReserveDTO
+ * @return
+ */
+ @PostMapping("/reserve/userReserveList")
+ R userReserveList(@RequestBody PageUserReserveDTO pageUserReserveDTO);
+
+ /**
+ * 取消预约/登记
+ */
+ @PostMapping("/reserve/cancelReserve")
+ R userCancelReserve(@RequestBody CancelRecordDTO comActReserveRecordDO);
+
+ /**
+ * 预约详情操作记录
+ */
+ @PostMapping("/reserve/detailOperation")
+ R reserveOperation(@RequestBody OperationDetailDTO comActReserveOperationRecordDO);
+
+ /**
+ * 社区后台-分页查询预约登记列表
+ * @param pageReserveDTO 请求参数
+ * @return 预约登记列表
+ */
+ @PostMapping("/reserve/admin/page")
+ R pageReserveAdmin(@RequestBody PageReserveAdminDTO pageReserveDTO);
+
+ /**
+ * 社区后台-新增预约登记信息
+ * @param addReserveDTO 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/reserve/admin/add")
+ R addReserveAdmin(@RequestBody AddReserveAdminDTO addReserveDTO);
+
+ /**
+ * 社区后台-编辑预约登记信息
+ * @param editReserveDTO 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/reserve/admin/edit")
+ R editReserveAdmin(@RequestBody EditReserveAdminDTO editReserveDTO);
+
+ /**
+ * 社区后台-修改预约登记状态
+ * @param editReserveDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/reserve/admin/edit/status")
+ R editReserveStatusAdmin(@RequestBody EditComActReserveStatusDTO editReserveDTO);
+
+ /**
+ * 社区后台-继续预约登记
+ * @param editReserveDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/reserve/admin/edit/info")
+ R editReserveInfoAdmin(@RequestBody EditComActReserveInfoDTO editReserveDTO);
+
+ /**
+ * 社区后台-根据预约登记id查询详情
+ * @param reserveId 预约登记id
+ * @return 预约登记详情
+ */
+ @GetMapping("/reserve/admin/detail")
+ R<ComActReserveDetailAdminVO> detailReserveAdmin(@RequestParam("reserveId") Long reserveId);
+
+ /**
+ * 社区后台-根据社区id统计预约类数据
+ * @param makeStatisticsDTO 请求参数
+ * @return 统计预约类数据
+ */
+ @PostMapping("/reserve/admin/make/statistics")
+ R makeStatisticsAdmin(@RequestBody ComActReserveMakeStatisticsDTO makeStatisticsDTO);
+
+ /**
+ * 社区后台-查询导出预约统计汇总数据
+ * @param makeStatisticsDTO 请求参数
+ * @return 统计预约类数据
+ */
+ @PostMapping("/reserve/admin/make/statistics/export")
+ R makeStatisticsExportAdmin(@RequestBody ComActReserveMakeStatisticsDTO makeStatisticsDTO);
+
+ /**
+ * 社区后台-根据预约id查询预约明细
+ * @param pageMakeDTO 请求参数
+ * @return 预约明细
+ */
+ @PostMapping("/reserve/admin/make/page")
+ R pageMakeAdmin(@RequestBody PageReserveMakeAdminDTO pageMakeDTO);
+
+ /**
+ * 根据预约记录id查询预约明细操作记录
+ * @param reserveRecordId 预约记录id
+ * @return 预约明细操作记录
+ */
+ @GetMapping("/reserve/admin/make/detail")
+ R detailMakeAdmin(@RequestParam("reserveRecordId") Long reserveRecordId);
+
+ /**
+ * 批量取消预约记录
+ * @param reserveRecordDTO 请求参数
+ * @return 取消结果
+ */
+ @PostMapping("/reserve/admin/make/cancel")
+ R makeCancelAdmin(@RequestBody CancelReserveRecordDTO reserveRecordDTO);
+
+ /**
+ * 预约明细导出数据查询
+ * @param pageMakeDTO 请求参数
+ * @return 预约明细数据
+ */
+ @PostMapping("/reserve/admin/make/list/export")
+ R exportMakeAdmin(@RequestBody PageReserveMakeAdminDTO pageMakeDTO);
+
+ /**
+ * 分页查询登记统计汇总
+ * @param registerStatisticsDTO 请求参数
+ * @return 登记统计汇总
+ */
+ @PostMapping("/reserve/admin/register/page")
+ R registerStatisticsAdmin(@RequestBody ComActReserveRegisterStatisticsDTO registerStatisticsDTO);
+
+ /**
+ * 导出登记统计汇总
+ * @param registerStatisticsDTO 请求参数
+ * @return 登记统计汇总
+ */
+ @PostMapping("/reserve/admin/register/export")
+ R registerStatisticsExportAdmin(@RequestBody ComActReserveRegisterStatisticsDTO registerStatisticsDTO);
+
+ /**
+ * 分页查询预约处理列表
+ * @param pageMakeHandleDTO 请求参数
+ * @return 预约处理列表
+ */
+ @PostMapping("/reserve/admin/make/handle/page")
+ R pageMakeHandleAdmin(@RequestBody PageReserveMakeHandleAdminDTO pageMakeHandleDTO);
+
+ /**
+ * 批量处理预约记录
+ * @param makeHandleDTO 请求参数
+ * @return 处理结果
+ */
+ @PostMapping("/reserve/admin/make/handle")
+ R makeHandleAdmin(@RequestBody MakeHandleAdminDTO makeHandleDTO);
+
+ /**
+ * 导出预约处理列表数据查询
+ * @param pageMakeHandleDTO 请求参数
+ * @return 预约处理列表
+ */
+ @PostMapping("/reserve/admin/make/handle/export")
+ R exportMakeHandleAdmin(@RequestBody PageReserveMakeHandleAdminDTO pageMakeHandleDTO);
+
+ /**
+ * 删除预约登记信息
+ * @param reserveId 预约登记id
+ * @return 删除结果
+ */
+ @GetMapping("/reserve/admin/delete")
+ R deleteReserveAdmin(@RequestParam("reserveId") Long reserveId);
+
+ /**
+ * 查询社区所有预约信息列表
+ * @param communityId 社区id
+ * @return 预约信息列表
+ */
+ @GetMapping("/reserve/admin/list")
+ R listReserveAdmin(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 导出登记明细数据
+ *
+ * @param pageReserveRegisterDetailedAdminDTO
+ * @return 登记明细数据
+ */
+ @PostMapping("/reserve/admin/register/list/export")
+ R exportRegisterAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
+
+ /**
+ * 查询预约登记题目下属选择项列表
+ *
+ * @param reserveSubId
+ * 预约登记id
+ * @return 查询预约登记题目下属选择项列表
+ */
+ @GetMapping("/reserve/admin/subject/selection/list")
+ List<String> subjectSelectionListAdmin(@RequestParam("reserveSubId") Long reserveSubId);
+ /**
+ * 查询预约登记题目列表
+ * @param reserveId 预约登记id
+ * @return 约登记题目列表
+ */
+ @GetMapping("/reserve/admin/subject/list")
+ R subjectListAdmin(@RequestParam("reserveId") Long reserveId);
+
+ /**
+ * 分页查询登记明细列表
+ * @param detailedAdminDTO 请求参数
+ * @return 登记明细列表
+ */
+ @PostMapping("/reserve/admin/register/detailed/list")
+ R registerDetailedListAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
+
+ /**
+ * 导出登记明细列表
+ * @param detailedAdminDTO 请求参数
+ * @return 登记明细列表
+ */
+ @PostMapping("/reserve/admin/register/detailed/list/export")
+ R registerDetailedListAdminExport(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
+
+ /**
+ * 查询登记详情记录
+ * @param reserveRecordId 登记记录id
+ * @return 登记详情记录
+ */
+ @GetMapping("/reserve/admin/register/detailed/detail")
+ R registerDetailedDetailAdmin(@RequestParam("reserveRecordId") Long reserveRecordId);
+ /**
+ * 活动签到
+ *
+ * @param comActActRegistVO 请求参数
+ * @return 签到结果
+ */
+ @PostMapping("/activity/sign-in")
+ R activitySignIn(@RequestBody ComActActRegistVO comActActRegistVO);
+
+ /**
+ * 用户签到列表
+ *
+ * @param userId 用户id
+ * @return 用户签到记录列表
+ */
+ @GetMapping("/sign-in/user/list")
+ R listSignInActivity(@RequestParam("userId") Long userId);
+
+ /**
+ * 社区活动评价
+ *
+ * @param comActActEvaluateVO 社区评价VO
+ * @return 评价结果
+ */
+ @PostMapping("/activity/evaluate")
+ R activityEvaluate(@RequestBody ComActActEvaluateVO comActActEvaluateVO);
+
+ /**
+ * 用户评价列表
+ *
+ * @param userId 用户id
+ * @return 当前用户对所有活动的评价列表
+ */
+ @GetMapping("/evaluate/user/list")
+ R listEvaluate(@RequestParam("userId") Long userId);
+
+ /**
+ * 定时任务针对活动结束后7天还未评价的用户默认好评
+ */
+ @PostMapping("/activity/default-praise")
+ R timedTaskActivityDefaultPraise();
+
+ /**
+ * 小程序-用户新增话题
+ * @param circleTopicAppDTO 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/neighbor/addNeighborTopicByApp")
+ R addNeighborTopicByApp(@RequestBody AddNeighborCircleTopicAppDTO circleTopicAppDTO);
+
+ /**
+ * 小程序-删除邻里圈
+ * @param circleTopicAppDTO 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/neighbor/deleteNeighborByApp")
+ R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO);
+
+
+ /**
+ * 分页查询邻里圈列表
+ *
+ * @param neighborCircleAppDTO
+ * 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighbor/selectSolve")
+ R selectSolve(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);
+
+
+ /**
+ * 修改数据
+ * @param editNeighborCircleAdminVO
+ * @return
+ */
+ @PostMapping("/neighbor/update")
+ R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);
+
+ @PostMapping("/neighbor/serviceStatic")
+ R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO);
+
+ /**
+ * 求助我的问题数量统计
+ * @param type
+ * @param phone
+ * @return
+ */
+ @GetMapping("/neighbor/selectCount")
+ R selectCount(@RequestParam("type")Integer type,@RequestParam(value = "phone",required = false)String phone,@RequestParam("communityId")Long communityId);
+
+ /**
+ * 获取系统配置value
+ * @param key 系统配置code
+ * @param communityId 社区id
+ * @return 系统配置value
+ */
+ @GetMapping("/sys/conf/getSysConfValue")
+ R getSysConfValue(@RequestParam("key") String key,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 新增系统配置
+ * @param key 系统配置code
+ * @param communityId 社区id
+ * @param name 系统配置名称
+ * @param value 系统配置value
+ * @return 新增结果
+ */
+ @GetMapping("/sys/conf/addSysConfValue")
+ R addSysConfValue(@RequestParam("key") String key,@RequestParam("communityId") Long communityId,@RequestParam("name") String name,@RequestParam("value") String value);
+
+ /**
+ * 编辑系统配置
+ * @param communityId 社区id
+ * @param status 配置值
+ * @return 编辑结果
+ */
+ @GetMapping("/sys/conf/editSysConfValue")
+ R editSysConfValue(@RequestParam("communityId") Long communityId,@RequestParam("status") Integer status);
+
+ /**
+ * 议事投票后台公布结果
+ * @param publishResultDTO 请求参数
+ * @return 公布结果
+ */
+ @PostMapping("publishResultAdmin")
+ R publishResultAdmin(@RequestBody ComActDiscussPublishResultDTO publishResultDTO);
+
+ /**
+ * 议事投票-评论/回复删除
+ * @param id 评论/回复id
+ * @return 删除结果
+ */
+ @GetMapping("deleteDiscussCommentAdmin")
+ R deleteDiscussCommentAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 查询社区可发布议事投票权限配置
+ * @param communityId 社区id
+ * @return 社区可发布议事投票权限配置
+ */
+ @GetMapping("discussJurisdictionGet")
+ R discussJurisdictionGet(@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId);
+
+ /**
+ * 设置当前社区议事投票小程序身份验证参数(1.全部 2.党员 3.志愿者 4.社区工作人员)
+ * @param communityId 社区id
+ * @param value 需要设置的参数值
+ * @return 设置结果
+ */
+ @GetMapping("discussJurisdictionSet")
+ R discussJurisdictionSet(@RequestParam("communityId") Long communityId, @RequestParam("value") String value);
+
+ /**
+ * 议事投票检测状态定时任务
+ * @return 执行结果
+ */
+ @GetMapping("timedTaskDiscussInspectStatus")
+ R timedTaskDiscussInspectStatus();
+
+ /**
+ * 一起议增加浏览量
+ * @param discussId 一起议主键id
+ */
+ @PostMapping("discuss/increase-view-num")
+ void increaseViewNum(@RequestParam("discussId") Long discussId);
+
+ /**
+ * 定时任务每半小时执行一次将一起议浏览量写入到表中
+ */
+ @PostMapping("discuss/write-view-num")
+ R timedTaskWriteDiscussViewNumToTable();
+
+ /**
+ * 公布/编辑一起议投票结果
+ * @param comActDiscussDTO
+ * @return 请求结果
+ */
+ @PostMapping("discuss/edit-result")
+ R editDiscussResult(@RequestBody ComActDiscussDTO comActDiscussDTO);
+
+ /**
+ * 定时任务扫描高龄认证记录信息
+ * @return 执行结果
+ */
+ @PostMapping("/elders/auth/task")
+ R timedTaskEldersAuthJobHandler();
+
+ /**
+ * 身份认证定时任务
+ * @return 执行结果
+ */
+ @PostMapping("/elders/auth/record/task")
+ R timedTaskEldersAuthRecordJobHandler();
+
+ /**
+ * 身份认证定时任务
+ * @return 执行结果
+ */
+ @PostMapping("/elders/authRecords/statistics")
+ R timedTaskElderAuthStatisticsJobHandler();
+
+ /**
+ * 定时任务每年3月1号0点统计养老认证本期应该认证总人数
+ * @return 执行结果
+ */
+ @PostMapping("/elders/pensionAuthRecords/statistics")
+ R timedTaskPensionAuthStatisticsJobHandler();
+
+ /**
+ * 办事指南列表-按分类查询
+ * @param pageActWorkGuideDTO 请求参数
+ * @return 办事指南分类列表
+ */
+ @PostMapping("/listworkguide")
+ R listWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO);
+
+ /**
+ * 根据办事指南分类id查询办事指南列表
+ * @param classifyId 办事指南分类id
+ * @return 办事指南列表数据
+ */
+ @GetMapping("/listworkguide/classify")
+ R listWorkGuideByClassifyId(@RequestParam("classifyId") Long classifyId);
+
+ /**
+ * 小程序查询所有进行中的预约登记
+ * @param communityId 社区id
+ * @return 社区所有进行中的预约登记列表
+ */
+ @GetMapping("/reserve/list")
+ R reserveListApplets(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 查询社区高龄认证方式（1.视频认证 2.人脸核验）
+ * @param eldersAuthTypeQueryDTO 请求参数
+ * @return 社区高龄认证方式（1.视频认证 2.人脸核验）
+ */
+ @PostMapping("/elders/new/authtype")
+ R communityEldersAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);
+
+ /**
+ * 设置当前社区高龄认证方式:核验类型（1.视频认证 2.人脸核验）
+ * @param communityId 社区id
+ * @param type 检验类型
+ * @return R 设置结果
+ */
+ @PutMapping("/elders/new/authType/{type}")
+ R setEldersAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);
+
+ /**
+ * 新增身份认证
+ * @param addIdentityAuthDTO 新增身份认证请求参数
+ * @return 新增结果结果
+ */
+ @PostMapping("/identity-auth/add")
+ R addIdentityAuth(@RequestBody AddIdentityAuthDTO addIdentityAuthDTO);
+
+ /**
+ * 分页查询身份认证记录
+ * @param pageIdentityAuthRecordDTO 分页查询身份认证记录参数
+ * @return 身份认证记录列表
+ */
+ @PostMapping("/identity-auth/record/page")
+ R queryRecordWithPage(@RequestBody PageIdentityAuthRecordDTO pageIdentityAuthRecordDTO);
+
+ /**
+ * 获取身份认证详情
+ * @param authType 认证类型
+ * @param identityAuthId 认证id
+ * @return 认证记录详情
+ */
+ @GetMapping("/identity-auth/detail")
+ R retrieveIdentityAuthDetail(@RequestParam("authType") Integer authType,
+ @RequestParam("identityAuthId") Long identityAuthId);
+
+ /**
+ * 获取身份认证方式
+ * @param communityId
+ * @param identityAuthType
+ * @return 认证方式
+ */
+ @GetMapping("/identity-auth/mode")
+ R getIdentityAuthMode(@RequestParam(value = "communityId") Long communityId,
+ @RequestParam(value = "identityAuthType") Integer identityAuthType);
+
+ /**
+ * 获取身份认证人脸核验token
+ * @param getIdentityEidTokenDTO
+ * @return token
+ */
+ @PostMapping("/identity-auth/getEidToken")
+ R getEidToken(@RequestBody GetIdentityEidTokenDTO getIdentityEidTokenDTO);
+
+ /**
+ * 一起议获取是否有发布权
+ * @param comActDiscussDTO
+ * @return
+ */
+ @PostMapping("discuss/permissions")
+ R getDiscussPermissions(@RequestBody ComActDiscussDTO comActDiscussDTO);
+
+ /**
+ * 高龄认证统计-分页查询
+ * @param pageElderAuthStatisticDTO 请求参数
+ * @return 高龄认证统计列表
+ */
+ @PostMapping("/elders/auth/statistic/page")
+ R pageAuthStatisticAdmin(@RequestBody PageElderAuthStatisticDTO pageElderAuthStatisticDTO);
+
+ /**
+ * 高龄认证统计-标记
+ * @param signElderAuthStatisticDTO 请求参数
+ * @return 标记结果
+ */
+ @PostMapping("/elders/auth/statistic/sign")
+ R signAuthStatisticAdmin(@RequestBody SignElderAuthStatisticDTO signElderAuthStatisticDTO);
+
+ /**
+ * 高龄认证统计-统计表头数据
+ * @param statisticHeaderDTO 请求参数
+ * @return 统计表头数据
+ */
+ @PostMapping("/elders/auth/header/statistic")
+ R getAuthHeaderStatisticAdmin(@RequestBody ElderAuthStatisticHeaderDTO statisticHeaderDTO);
+
+ /**
+ * 养老认证统计-分页查询
+ * @param pensionAuthStatisticDTO 请求参数
+ * @return 养老认证统列表
+ */
+ @PostMapping("/elders/pension/auth/statistic/page")
+ R pagePensionAuthStatisticAdmin(@RequestBody PagePensionAuthStatisticDTO pensionAuthStatisticDTO);
+
+ /**
+ * 养老认证记标记
+ * @param signElderAuthStatisticDTO 请求参数
+ * @return 标记结果
+ */
+ @PostMapping("/elders/pension/auth/statistic/sign")
+ R signPensionAuthStatisticAdmin(@RequestBody SignElderAuthStatisticDTO signElderAuthStatisticDTO);
+
+ /**
+ * 养老认证表头统计
+ * @param statisticHeaderDTO 请求参数
+ * @return 统计结果
+ */
+ @PostMapping("/elders/pension/auth/header/statistic")
+ R getPensionAuthHeaderStatisticAdmin(@RequestBody ElderAuthStatisticHeaderDTO statisticHeaderDTO);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialOrg/queryAll")
+ R comActSocialOrgSelectAll(CommonPage commonPage);
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialOrg 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialOrg")
+ R comActSocialOrgInsert(@RequestBody ComActSocialOrgVO comActSocialOrg);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialOrg 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialOrg/update")
+ R comActSocialOrgUpdate(@RequestBody ComActSocialOrgVO comActSocialOrg);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialOrg/del")
+ R comActSocialOrgDelete(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActCommittee/queryAll")
+ R comActCommitteeSelectAll(@RequestBody CommonPage commonPage);
+ /**
+ * 新增数据
+ *
+ * @param comActCommittee 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActCommittee")
+ R comActCommitteeInsert(@RequestBody ComActCommiteeVO comActCommittee);
+ /**
+ * 修改数据
+ *
+ * @param comActCommittee 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActCommittee/update")
+ R comActCommitteeUpdate(@RequestBody ComActCommiteeVO comActCommittee);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActCommittee/del")
+ R comActCommitteeDelete(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comProperty/queryAll")
+ R comPropertySelectAll(@RequestBody CommonPage commonPage);
+ /**
+ * 新增数据
+ *
+ * @param comPropertyVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comProperty")
+ R comPropertyInsert(@RequestBody ComPropertyVO comPropertyVO);
+ /**
+ * 修改数据
+ *
+ * @param comPropertyVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comProperty/update")
+ R comPropertyUpdate(@RequestBody ComPropertyVO comPropertyVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comProperty/del")
+ R comPropertyDelete(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActFourMember/queryAll")
+ R comActFourMemberSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActFourMember/{id}")
+ R comActFourMemberSelectOne(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActFourMember 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActFourMember")
+ R comActFourMemberInsert(@RequestBody ComActFourMemberVO comActFourMember);
+
+ /**
+ * 修改数据
+ *
+ * @param comActFourMember 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActFourMember/update")
+ R comActFourMemberUpdate(@RequestBody ComActFourMemberVO comActFourMember);
+
+ /**
+ * 删除数据
+ *
+ * @param comActFourMember 主键结合
+ * @return 删除结果
+ */
+ @PostMapping("/comActFourMember/del")
+ R comActFourMemberDelete(@RequestBody ComActFourMemberVO comActFourMember);
+
+ /**
+ * 楼栋查询
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/building/query")
+ R comActFourMemberQueryBuilding(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 查询房屋二级级联菜单
+ *
+ * @param cascadeHouseDTO
+ * 请求参数
+ * @return 菜单列表
+ */
+ @PostMapping("/common/data/population/second/list")
+ R getSecondHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO);
+
+ /**
+ * 查询房屋二级级联菜单后台
+ *
+ * @param cascadeHouseDTO
+ * 请求参数
+ * @return 菜单列表
+ */
+ @PostMapping("/common/data/population/second/listBack")
+ R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO);
+
+ /**
+ * 微心愿处理人列表
+ * @param communityId 社区id
+ * @param type 处理人类型（1.后台用户 2.党员 3.志愿者）
+ * @return 处理人列表
+ */
+ @GetMapping("/wish/handle/list/admin")
+ R wishHandleListAdmin(@RequestParam(value = "communityId") Long communityId,@RequestParam("type") Integer type);
+
+ /**
+ * 便民服务新增分类
+ * @param convenientServiceCategoryDTO
+ * @return
+ */
+ @PostMapping("/convenient/service-category/add")
+ R addServiceCategory(@RequestBody ConvenientServiceCategoryDTO convenientServiceCategoryDTO);
+
+ /**
+ * 便民服务分类编辑
+ * @param convenientServiceCategoryDTO
+ * @return
+ */
+ @PutMapping("/convenient/service-category/put")
+ R putServiceCategory(@RequestBody ConvenientServiceCategoryDTO convenientServiceCategoryDTO);
+
+ /**
+ * 便民服务分类删除
+ * @param categoryId
+ * @return
+ */
+ @DeleteMapping("/convenient/service-category/delete")
+ R deleteServiceCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);
+
+ /**
+ * 获取便民服务分类详情
+ * @param categoryId
+ * @return
+ */
+ @GetMapping("/convenient/service-category/get")
+ R getServiceCategory(@RequestParam("categoryId") Long categoryId);
+
+ /**
+ * 分页查询便民服务分类
+ * @param pageConvenientServiceCategoryDTO
+ * @return
+ */
+ @PostMapping("/convenient/service-category/page")
+ R pageServiceCategory(@RequestBody PageConvenientServiceCategoryDTO pageConvenientServiceCategoryDTO);
+
+ /**
+ * 便民服务新增商家
+ * @param convenientMerchantDTO
+ * @return
+ */
+ @PostMapping("/convenient/merchant/add")
+ R addMerchant(@RequestBody ConvenientMerchantDTO convenientMerchantDTO);
+
+ /**
+ * 编辑便民服务商家
+ * @param convenientMerchantDTO
+ * @return
+ */
+ @PutMapping("/convenient/merchant/put")
+ R putMerchant(@RequestBody ConvenientMerchantDTO convenientMerchantDTO);
+
+ /**
+ * 删除便民服务商家
+ * @param merchantId
+ * @param operator
+ * @return
+ */
+ @DeleteMapping("/convenient/merchant/delete")
+ R deleteMerchant(@RequestParam("merchantId") Long merchantId, @RequestParam("operator") Long operator);
+
+ /**
+ * 分页查询便民服务商家
+ * @param pageConvenientMerchantDTO
+ * @return
+ */
+ @PostMapping("/convenient/merchant/page")
+ R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO);
+
+ /**
+ * 获取便民服务商家详情
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/convenient/merchant/get")
+ R getMerchant(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 获取便民服务商家详情
+ * @param userId
+ * @return
+ */
+ @GetMapping("/convenient/merchant/getMerchantByUserId")
+ R getMerchantByUserId(@RequestParam("userId") Long userId);
+
+ /**
+ * 禁用/启用便民服务商家
+ * @param disableOrEnableConvenientMerchantDTO
+ * @return
+ */
+ @PutMapping("/convenient/merchant/disable-or-enable")
+ R disableOrEnableMerchant(@RequestBody DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO);
+
+ /**
+ * 重置便民服务商家账号密码
+ * @param resetPasswordConvenientMerchantDTO
+ * @return
+ */
+ @PutMapping("/convenient/merchant/reset-password")
+ R resetPasswordMerchant(@RequestBody ResetPasswordConvenientMerchantDTO resetPasswordConvenientMerchantDTO);
+
+ /**
+ * 获取所有便民服务分类
+ * @return
+ */
+ @GetMapping("/convenient/service-category/all")
+ R getAllServiceCategories(@RequestParam("areaCode") String areaCode);
+
+ /**
+ * 获取用户便民服务商家详情
+ * @param account 商家绑定账号
+ * @return
+ */
+ @GetMapping("/convenient/getUserMerchantInfoByAccount")
+ R<ConvenientMerchantVO> getUserMerchantInfoByAccount(@RequestParam("account") String account);
+
+ /**
+ * 获取用户便民服务商家详情
+ * @param account 商家绑定账号
+ * @return
+ */
+ @GetMapping("/convenient/getMerchantInfoByAccount")
+ R<ConvenientMerchantVO> getMerchantInfoByAccount(@RequestParam("account") String account);
+
+ /**
+ * 获取商便民服务商家信息
+ * @param userId
+ * @return
+ */
+ @GetMapping("/convenient/merchantInfo")
+ R<ConvenientMerchantVO> getUserConvenientMerchantInfo(@RequestParam("userId") Long userId);
+
+ /**
+ * 新增便民服务产品分类信息
+ * @param convenientProductCategoryDTO
+ * @return
+ */
+ @PostMapping("/convenient/product-category/add")
+ R addProductCategory(@RequestBody ConvenientProductCategoryDTO convenientProductCategoryDTO);
+
+ /**
+ * 编辑便民服务产品分类信息
+ * @param convenientProductCategoryDTO
+ * @return
+ */
+ @PutMapping("/convenient/product-category/put")
+ R putProductCategory(@RequestBody ConvenientProductCategoryDTO convenientProductCategoryDTO);
+
+ /**
+ * 删除便民服务产品分类信息
+ * @param categoryId
+ * @param operator
+ * @return
+ */
+ @DeleteMapping("/convenient/product-category/delete")
+ R deleteProductCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);
+
+ /**
+ * 获取便民服务产品分类详情
+ * @param categoryId
+ * @return
+ */
+ @GetMapping("/convenient/product-category/get")
+ R getProductCategory(@RequestParam("categoryId") Long categoryId);
+
+ /**
+ * 分页查询便民服务产品分类信息
+ * @param pageConvenientProductCategoryDTO
+ * @return
+ */
+ @PostMapping("/convenient/product-category/page")
+ R pageProductCategory(@RequestBody PageConvenientProductCategoryDTO pageConvenientProductCategoryDTO);
+
+ /**
+ * 便民服务商家后台新增产品
+ * @param convenientProductDTO
+ * @return
+ */
+ @PostMapping("/convenient/product/add")
+ R addProduct(@RequestBody ConvenientProductDTO convenientProductDTO);
+
+ /**
+ * 便民服务商家后台编辑产品
+ * @param convenientProductDTO
+ * @return
+ */
+ @PutMapping("/convenient/product/put")
+ R putProduct(@RequestBody ConvenientProductDTO convenientProductDTO);
+
+ /**
+ * 便民服务商家后台获取产品详情
+ * @param productId
+ * @return
+ */
+ @GetMapping("/convenient/product/get")
+ R getProduct(@RequestParam("productId") Long productId);
+
+ /**
+ * 便民服务商家后台分页获取产品信息
+ * @param pageConvenientProductDTO
+ * @return
+ */
+ @PostMapping("/convenient/product/page")
+ R pageProduct(@RequestBody PageConvenientProductDTO pageConvenientProductDTO);
+
+ /**
+ * 便民服务商家后台删除产品信息
+ * @param deleteConvenientProductDTO
+ * @return
+ */
+ @DeleteMapping("/convenient/product/delete")
+ R deleteProduct(@RequestBody DeleteConvenientProductDTO deleteConvenientProductDTO);
+
+ /**
+ * 便民服务商家后台上架/下架产品
+ * @param onShelfOrOffShelfProductDTO
+ * @return
+ */
+ @PutMapping("/convenient/product/onShelf-or-offShelf")
+ R onShelfOrOffShelfProduct(@RequestBody OnShelfOrOffShelfProductDTO onShelfOrOffShelfProductDTO);
+
+ /**
+ * 获取所有产品分类
+ * @return
+ * @param merchantId
+ */
+ @GetMapping("/convenient/product-category/all")
+ R getAllProductCategory(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 获取该社区商家数量大于0的分类
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/convenient/service-category/suitable")
+ R getSuitableServiceCategories(@RequestParam("communityId") Long communityId,@RequestParam("areaCode")String areaCode);
+
+ /**
+ * 获取该社区下的热门商家
+ * @param pagePopularMerchantDTO
+ * @return
+ */
+ @PostMapping("/convenient/merchant/popular")
+ R getPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO);
+
+ /**
+ * 分页获取服务类型下商家信息
+ * @param pageClassifyMerchantDTO
+ * @return
+ */
+ @PostMapping("/convenient/merchant/classify")
+ R getClassifyMerchants(@RequestBody PageClassifyMerchantDTO pageClassifyMerchantDTO);
+
+ /**
+ * 获取商家详情
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/convenient/merchant/detail")
+ R getMerchantDetail(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 获取商家产品
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/convenient/product/list")
+ R getMerchantProduct(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 获取产品详情
+ * @param productId
+ * @return
+ */
+ @GetMapping("/convenient/product/detail")
+ R getProductDetail(@RequestParam("productId") Long productId);
+
+ /**
+ * 搜索商家信息
+ * @param pageSearchDTO
+ * @return
+ */
+ @PostMapping("/convenient/merchant/search")
+ R pageSearchMerchant(@RequestBody PageSearchDTO pageSearchDTO);
+
+ /**
+ * 搜索商品信息
+ * @param pageSearchDTO
+ * @return
+ */
+ @PostMapping("/convenient/product/search")
+ R pageSearchProduct(@RequestBody PageSearchDTO pageSearchDTO);
+
+ /**
+ * 增加商家店铺咨询量
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/convenient/merchant/consult")
+ R consultMerchant(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 增加产品浏览量
+ * @param productId
+ * @return
+ */
+ @GetMapping("/convenient/product/incr-view")
+ R incrProductView(@RequestParam("productId") Long productId);
+
+ /**
+ * 获取商家导出数据
+ * @param exportMerchantDTO
+ * @return
+ */
+ @PostMapping("/convenient/merchant/export")
+ R exportMerchant(@RequestBody ExportMerchantDTO exportMerchantDTO);
+
+ /**
+ * 增加商家店铺浏览量
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/convenient/merchant/incr-view")
+ R incrMerchantView(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 定时任务每隔半小时将商家浏览量和咨询量总值计入指定商家数据中
+ * @return
+ */
+ @PostMapping("/convenient/timedTaskWriteDataToMerchantJobHandler")
+ R timedTaskWriteDataToMerchantJobHandler();
+
+ /**
+ * 获取商家上下架产品数量
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/convenient/product/shelf-num")
+ R getProductShelfNum(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 群团组织成员列表-小程序分页查询
+ * @param pageClusterMemberDto 请求参数
+ * @return 群团组织成员列表
+ */
+ @PostMapping("/cluster/member/page/applets")
+ R pageClusterMemberApplets(@RequestBody PageClusterMemberDto pageClusterMemberDto);
+
+ /**
+ * 群团组织列表-小程序查询社区群团组织列表
+ * @param communityId 社区id
+ * @return 社区群团组织列表
+ */
+ @GetMapping("/cluster/list/applets")
+ R listClusterApplets(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询群团组织列表
+ * @param pageClusterAdminDto 请求参数
+ * @return 群团组织列表
+ */
+ @PostMapping("/cluster/page/admin")
+ R pageClusterAdmin(@RequestBody PageClusterAdminDto pageClusterAdminDto);
+
+ /**
+ * 新增群团组织
+ * @param addClusterAdminDto 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/cluster/add/admin")
+ R addClusterAdmin(@RequestBody AddClusterAdminDto addClusterAdminDto);
+
+ /**
+ * 修改群团组织
+ * @param editClusterAdminDto 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/cluster/edit/admin")
+ R editClusterAdmin(@RequestBody EditClusterAdminDto editClusterAdminDto);
+
+ /**
+ * 删除群团组织
+ * @param id 组织id
+ * @return 删除结果
+ */
+ @GetMapping("/cluster/delete/admin")
+ R deleteClusterAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 群团组织详情
+ * @param id 组织id
+ * @return 群团组织详情
+ */
+ @GetMapping("/cluster/detail/admin")
+ R detailClusterAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询群团组织成员列表
+ * @param pageClusterMemberAdminDto 请求参数
+ * @return 群团组织成员列表
+ */
+ @PostMapping("/cluster/member/page/admin")
+ R pageClusterMemberAdmin(@RequestBody PageClusterMemberAdminDto pageClusterMemberAdminDto);
+
+ /**
+ * 新增群团组织成员
+ * @param addClusterMemberAdminDto 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/cluster/member/add/admin")
+ R addClusterMemberAdmin(@RequestBody AddClusterMemberAdminDto addClusterMemberAdminDto);
+
+ /**
+ * 编辑群团组织成员
+ * @param editClusterMemberAdminDto 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/cluster/member/edit/admin")
+ R editClusterMemberAdmin(@RequestBody EditClusterMemberAdminDto editClusterMemberAdminDto);
+
+ /**
+ * 删除群团组织成员
+ * @param id 组织成员id
+ * @return 删除结果
+ */
+ @GetMapping("/cluster/member/delete/admin")
+ R deleteClusterMemberAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 群团组织成员详情
+ * @param id 组织成员id
+ * @return 群团组织成员详情
+ */
+ @GetMapping("/cluster/member/detail/admin")
+ R detailClusterMemberAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 查询系统民族列表
+ * @return 民族列表
+ */
+ @GetMapping("/cluster/member/nation/list/admin")
+ R memberNationListAdmin();
+
+ /**
+ * 群团组织成员导入
+ * @param list 导入数据
+ * @param communityId 社区id
+ * @param userId 操作用户id
+ * @return 导入结果
+ */
+ @PostMapping("/cluster/member/import/admin")
+ R importClusterMember(@RequestBody List<ComClusterMemberExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 群团组织导出数据查询
+ * @param pageClusterMemberAdminDto 请求参数
+ * @return 导出数据结果集
+ */
+ @PostMapping("/cluster/member/export/admin")
+ R exportClusterMember(@RequestBody PageClusterMemberAdminDto pageClusterMemberAdminDto);
+
+ /**
+ * 社区后台分页查询微心愿
+ * @param comActMicroWishVO 请求参数
+ * @return 微心愿列表
+ */
+ @PostMapping("pagemicrowishAdmin")
+ R pageMicroWishAdmin(@RequestBody ComActMicroWishVO comActMicroWishVO);
+
+ /**
+ * 小程序四长四员查询居民列表
+ */
+ @PostMapping("/comActFourMember/member")
+ R comActFourMemberQueryMember(@RequestBody CommonPage commonPage);
+
+ /**
+ *居民数据详情
+ */
+ @GetMapping("/comActFourMember/memberDetail")
+ R comActFourMemberMemberDetail(@RequestParam("id")Long id);
+
+ /**
+ * 根据房屋id列表删除房屋信息
+ *
+ * @param comMngPopulationHouseUserVO
+ * 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/common/data/population/house/user/delete")
+ R deleteHousesUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);
+
+ /**
+ * 新增实有房屋信息
+ *
+ * @param comMngPopulationHouseUserVO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/common/data/population/house/user/insert")
+ public R insertHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);
+
+ /**
+ * 编辑实有房屋信息
+ *
+ * @param comMngPopulationHouseUserVO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/common/data/population/house/user/edit")
+ public R editHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);
+
+ /**
+ * 根据id查询
+ *
+ * @param id
+ * 请求参数
+ * @return 删除结果
+ */
+ @GetMapping("/common/data/population/house/user/detail")
+ public R detailHousesUser(@RequestParam("id") Long id);
+
+ /**
+ * 社区后台-分页查询楼栋列表
+ * @param pageBuildingListDto 请求参数
+ * @return 楼栋列表
+ */
+ @PostMapping("/building/page/admin/")
+ R pageBuildingAdmin(@RequestBody PageBuildingListDto pageBuildingListDto);
+
+ /**
+ * 社区后台-查询楼栋列表表头统计数据
+ * @param communityId 社区id
+ * @return 楼栋列表表头统计数据
+ */
+ @GetMapping("/building/header/statistics/")
+ R buildingListHeaderStatisticsAdmin(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 社区后台-查询楼栋详情
+ * @param id 楼栋id
+ * @return 楼栋详情
+ */
+ @GetMapping("/building/detail/admin/")
+ R detailBuildAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 查询楼栋下单元列表
+ * @param id 楼栋id
+ * @return 单元列表
+ */
+ @GetMapping("/building/unit/list/admin")
+ R buildingUnitListAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 查询楼栋单元下房屋列表
+ * @param unitHouseListDto 请求参数
+ * @return 单元列表
+ */
+ @PostMapping("/building/unit/house/list/admin")
+ R buildingUnitHouseListAdmin(@RequestBody PageBuildingUnitHouseListDto unitHouseListDto);
+
+ /**
+ * 查询楼栋单元下房屋详情
+ * @param houseId 房屋id
+ * @param communityId 社区id
+ * @return 房屋详情
+ */
+ @GetMapping("/building/unit/house/detail/admin")
+ R unitHouseDetailAdmin(@RequestParam("houseId") Long houseId,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 查询社区下小区列表
+ * @param communityId 社区id
+ * @return 小区列表
+ */
+ @GetMapping("/building/village/list/admin")
+ R buildingVillageListAdmin(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 添加楼栋下单元
+ * @param addBuildingUnitDto 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/building/unit/add/admin")
+ R addBuildingUnitAdmin(@RequestBody AddBuildingUnitDto addBuildingUnitDto);
+
+ /**
+ * 修改楼栋下单元
+ * @param editBuildingUnitDto 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/building/unit/edit/admin")
+ R editBuildingUnitAdmin(@RequestBody EditBuildingUnitDto editBuildingUnitDto);
+
+ /**
+ * 添加户室
+ * @param addBuildingHouseDto 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/building/house/add/admin")
+ R addBuildingHouseAdmin(@RequestBody AddBuildingHouseDto addBuildingHouseDto);
+
+ /**
+ * 修改户室
+ * @param editBuildingHouseDto 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/building/house/edit/admin")
+ R editBuildingHouseAdmin(@RequestBody EditBuildingHouseDto editBuildingHouseDto);
+
+ /**
+ * 删除户室下人员关联信息
+ * @param housePopulationDto 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/building/house/population/delete/admin")
+ R deleteBuildingHousePopulationAdmin(@RequestBody DeleteBuildingHousePopulationDto housePopulationDto);
+
+ /**
+ * 删除楼栋
+ * @param id
+ * @return
+ */
+ @GetMapping("/building/delete")
+ R buildingDelete(@RequestParam("id")Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActWarehouseApply/queryAll")
+ public R comActWarehouseApplySelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 统计查询
+ *
+ * @param communityId
+ * @return 所有数据
+ */
+ @GetMapping("/comActWarehouseApply/selectStatics")
+ public R comActWarehouseApplySelectAll(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActWarehouseApply/{id}")
+ public R comActWarehouseApplySelectOne(@PathVariable("id") Integer id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActWarehouseApply 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActWarehouseApply")
+ public R comActWarehouseApplyInsert(@RequestBody ComActWarehouseApplyVO comActWarehouseApply);
+
+ /**
+ * 修改数据
+ *
+ * @param comActWarehouseApply 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActWarehouseApply/update")
+ public R comActWarehouseApplyUpdate(@RequestBody ComActWarehouseApplyVO comActWarehouseApply);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActWarehouseApply/del")
+ public R comActWarehouseApplyDelete(@RequestParam("id") Long id);
+
+ /**
+ * 生成二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @PostMapping("/comActWarehouseApply/getQRCode")
+ public R comActWarehouseApplyGetQRCode(@RequestBody QRCodeVO qrCodeVO);
+
+ /**
+ * 社区Id查询基础配置
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/comActWarehouseBase")
+ public R comActWarehouseBaseSelectOne(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 新增数据
+ *
+ * @param comActWarehouseBase 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActWarehouseBase")
+ public R comActWarehouseBaseInsert(@RequestBody ComActWarehouseBaseVO comActWarehouseBase);
+
+ /**
+ * 导出数据
+ */
+ @PostMapping("/comActWarehouseApply/export")
+ public R comActWarehouseApplyExport(@RequestBody CommonPage commonPage);
+
+ /**
+ * 后台导入捐赠物品
+ * @param list
+ * @return
+ */
+ @PostMapping("/comActWarehouseDonates/import")
+ R batchImportWarehouseDonates(@RequestBody List<WarehouseDonatesExcelVO> list);
+
+ /**
+ * 后台导出捐赠物品表格
+ * @param exportDonatesDTO
+ * @return
+ */
+ @PostMapping("/comActWarehouseDonates/donates/export")
+ R exportDonates(@RequestBody ExportDonatesDTO exportDonatesDTO);
+
+ /**
+ * 分页查询捐赠物品
+ * @param pageDonatesDTO
+ * @return
+ */
+ @PostMapping("/comActWarehouseDonates/donates/page")
+ R pageDonates(@RequestBody PageDonatesDTO pageDonatesDTO);
+
+ /**
+ * 新增物品捐赠
+ * @param comActWarehouseDonatesDTO
+ * @return
+ */
+ @PostMapping("/comActWarehouseDonates/donates/add")
+ R addDonates(@RequestBody ComActWarehouseDonatesDTO comActWarehouseDonatesDTO);
+
+ /**
+ * 查看物品捐赠详情
+ * @param donatesId
+ * @param isWhich
+ * @param userId
+ * @return
+ */
+ @GetMapping("/comActWarehouseDonates/donates/get")
+ R getDonates(@RequestParam("donatesId") Long donatesId, @RequestParam("isWhich") Integer isWhich, @RequestParam("userId") Long userId);
+
+ /**
+ * 捐赠物品后台签收
+ * @param comActWarehouseDonatesDTO
+ * @return
+ */
+ @PostMapping("/comActWarehouseDonates/donates/signing")
+ R signingDonates(@RequestBody ComActWarehouseDonatesDTO comActWarehouseDonatesDTO);
+
+ /**
+ * 用户取消捐赠
+ * @param donatesId
+ * @param currentUser
+ * @return
+ */
+ @GetMapping("/comActWarehouseDonates/donates/cancel")
+ R cancelDonates(@RequestParam("donatesId") Long donatesId, @RequestParam("currentUser") Long currentUser);
+
+ /**
+ * 捐赠物品统计查询
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/comActWarehouseDonates/donates/statistics")
+ R getDonatesStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActWarehouseOperation/queryAll")
+ public R comActWarehouseOperationSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 物品领用
+ * @param comActWarehouseApplyDTO
+ * @return
+ */
+ @PostMapping("/comActWarehouseDonates/donates/apply")
+ R applyDonates(@RequestBody ComActWarehouseApplyDTO comActWarehouseApplyDTO);
+
+ /**
+ * 生成二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @PostMapping("/comActActivityCode/getQRCode")
+ public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
+
+ /**
+ * 重置二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @PostMapping("/comActActivityCode/resetQRCode")
+ public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
+
+ /**
+ * 实有房屋数据修复定时任务
+ * @return 实有房屋数据修复定时任务
+ */
+ @GetMapping("/population/house/status/task")
+ R timedTaskHouseJobHandler();
+
+ /**
+ * 导出特殊群体
+ *
+ * @param pageInputUserDTO 请求参数
+ * @return 特殊群体列表
+ */
+ @PostMapping("common/data/special/export")
+ R specialInputUserExport(@RequestBody PageInputUserDTO pageInputUserDTO);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActAnnouncement/queryAll")
+ R comActAnnouncementSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActAnnouncement/{id}")
+ R comActAnnouncementSelectOne(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActAnnouncementVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActAnnouncement")
+ R comActAnnouncementInsert(@RequestBody ComActAnnouncementVO comActAnnouncementVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActAnnouncementVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActAnnouncement/update")
+ R comActAnnouncementUpdate(@RequestBody ComActAnnouncementVO comActAnnouncementVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActAnnouncement/del")
+ R comActAnnouncementDelete(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActColumn/queryAll")
+ R comActColumnSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActColumn/{id}")
+ R comActColumnSelectOne(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActColumn 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActColumn")
+ R comActColumnInsert(@RequestBody ComActColumnVO comActColumn);
+
+ /**
+ * 修改数据
+ *
+ * @param comActColumn 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActColumn/update")
+ R comActColumnUpdate(@RequestBody ComActColumnVO comActColumn);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActColumn/del")
+ R comActColumnDelete(@RequestParam("id") Long id);
+
+ /**
+ * 高龄认证添加
+ *
+ * @param comElderAuthRecordVO
+ * @return
+ */
+ @PostMapping("/elders/authRecord/add")
+ R addAuthRecord(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
+
+ /**
+ * 养老认证添加
+ *
+ * @param comElderAuthRecordVO
+ * @return
+ */
+ @PostMapping("/elders/pensionAuthRecord/add")
+ R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
+ /**
+ * 活动报名签到情况
+ * @param id 活动主键id
+ * @return
+ */
+ @GetMapping("/activity/sign-in/list")
+ R listSignInRecord(@RequestParam("id") Long id);
+
+ /**
+ * 活动签到记录
+ * @param id 活动主键
+ * @param userId 用户id
+ * @return
+ */
+ @GetMapping("/activity/regist/list")
+ R listRegistRecord(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+ /**
+ * 获取活动类型（目前只有志愿者活动需要获取）
+ * @param communityId
+ * @param type
+ * @return
+ */
+ @GetMapping("/activity/type/list")
+ R listActivityType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);
+
+ /**
+ * 添加活动类型
+ * @param comActActivityTypeVO
+ * @return
+ */
+ @PostMapping("/activity/type/add")
+ R addActivityType(@RequestBody ComActActivityTypeVO comActActivityTypeVO);
+
+ /**
+ * 我的评价
+ * @param userId
+ * @param activityId
+ * @return
+ */
+ @GetMapping("/activity/my-evaluate")
+ R listMyActivityEvaluate(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId);
+
+ /**
+ * 分页查询居家隔离统计
+ * @param detailedAdminDTO
+ * @return
+ */
+ @PostMapping("/reserve/admin/register/homeQuarantine/page")
+ R pageRegisterHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
+
+ /**
+ * 居家隔离导出
+ * @param pageReserveRegisterDetailedAdminDTO
+ * @return
+ */
+ @PostMapping("/reserve/admin/homeQuarantine/export")
+ R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
+
+ /**
+ * 分页查询物业宣传
+ * @param pageComPropertyPublicityDTO
+ * @return
+ */
+ @PostMapping("/property/publicity/page")
+ R pageComPropertyPublicity(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO);
+
+ /**
+ * 新增物业宣传
+ * @param comPropertyPublicityDTO
+ * @return
+ */
+ @PostMapping("/property/publicity/add")
+ R addComPropertyPublicity(@RequestBody ComPropertyPublicityDTO comPropertyPublicityDTO);
+
+ /**
+ * 修改物业宣传
+ * @param comPropertyPublicityDTO
+ * @return
+ */
+ @PostMapping("/property/publicity/update")
+ R updateComPropertyPublicity(@RequestBody ComPropertyPublicityDTO comPropertyPublicityDTO);
+
+ /**
+ * 查看物业宣传信息
+ * @param id
+ * @return
+ */
+ @GetMapping("/property/publicity/get")
+ R getComPropertyPublicity(@RequestParam("id") Long id);
+
+ /**
+ * 删除物业宣传
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/property/publicity/delete")
+ R deleteComPropertyPublicity(@RequestParam("id") Long id);
+
+ /**
+ * 物业公司列表
+ *
+ * @param villageId
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/property/publicity/list/property")
+ R listProperty(@RequestParam(value = "villageId", required = false) Long villageId, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询物业宣传-小程序
+ * @param pageComPropertyPublicityDTO
+ * @return
+ */
+ @PostMapping("/property/publicity/page/applet")
+ R pageComPropertyPublicityApplet(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO);
+
+ /**
+ * 增加物业宣传浏览量
+ * @param id
+ * @return
+ */
+ @GetMapping("/property/publicity/incr-view")
+ R incrPropertyPublicityView(@RequestParam("id") Long id);
+
+ /**
+ * 获取预设图片
+ * @param type
+ * @param subtype
+ * @return
+ */
+ @GetMapping("/picture/library/get")
+ R getPresetPictureLibrary(@RequestParam("type") Integer type, @RequestParam("subtype") Integer subtype);
+
+ /**
+ * 分页查询房屋租赁基础配置
+ * @param pageRentingHousesConfigDTO
+ * @return
+ */
+ @PostMapping("/rentingHousesConfig/page")
+ R pageRentingHousesConfig(@RequestBody PageRentingHousesConfigDTO pageRentingHousesConfigDTO);
+
+ /**
+ * 更新配置信息
+ * @param rentingHousesConfigDTO
+ * @return
+ */
+ @PutMapping("/rentingHousesConfig/update")
+ R updateRentingHousesConfig(@RequestBody RentingHousesConfigDTO rentingHousesConfigDTO);
+
+ /**
+ * 新增房源信息
+ * @param registerDTO
+ * @return
+ */
+ @PostMapping("/rentingHourseRegister/register")
+ R registerRentingHouse(@RequestBody RentingHouseRegisterDTO registerDTO);
+
+ /**
+ * 编辑房源信息
+ * @param registerDTO
+ * @return
+ */
+ @PostMapping("/rentingHourseRegister/update")
+ R updateRentingHouse(@RequestBody RentingHouseRegisterDTO registerDTO);
+
+ /**
+ * 分页获取房源信息
+ * @param pageRegisterDTO
+ * @return
+ */
+ @PostMapping("/rentingHourseRegister/page")
+ R pageRentingHouse(@RequestBody PageRentingHouseRegisterDTO pageRegisterDTO);
+
+ /**
+ * 发布/取消发布 房源信
+ * @param releaseOrCancelHouseDTO
+ * @return
+ */
+ @PutMapping("/rentingHourseRegister/releaseOrCancel")
+ R releaseOrCancelHouse(@RequestBody ReleaseOrCancelHouseDTO releaseOrCancelHouseDTO);
+
+ /**
+ * 删除房源信息
+ * @param registerId
+ * @return
+ */
+ @DeleteMapping("/rentingHourseRegister/delete")
+ R deleteRentingHouse(@RequestParam("registerId") Long registerId);
+
+ /**
+ * 获取详情-房源信息
+ * @param registerId
+ * @return
+ */
+ @GetMapping("/rentingHourseRegister/get")
+ R getRentingHouse(@RequestParam("registerId") Long registerId);
+
+ /**
+ * 附近的房源
+ */
+ @PostMapping("/rentingHourseRegister/nearby")
+ R nearby(@RequestBody NearbyDTO nearbyDTO);
+
+ /**
+ * 小程序分页获取房源信息
+ * @param pageRegisterDTO
+ * @return
+ */
+ @PostMapping("/rentingHourseRegister/houseList")
+ R pageRentingHouseApplet(@RequestBody PageRentingHouseRegisterDTO pageRegisterDTO);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/rentingHourseOrder/queryAll")
+ R selectRentingHourseOrderAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/rentingHourseOrder/{id}")
+ R selectRentingHourseOrderOne(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param rentingHourseOrder 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/rentingHourseOrder")
+ R insertRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrder);
+
+ /**
+ * 修改数据
+ *
+ * @param rentingHourseOrdervo 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/rentingHourseOrder/update")
+ R updateRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrdervo);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/rentingHourseOrder/del")
+ R deleteRentingHourseOrder(@RequestParam("id") Long id);
+
+ /**
+ * 支付回调处理订单状态以及房屋状态
+ */
+ @PostMapping("/rentingHourseOrder/wxNotify")
+ R wxNotifyRentingHourseOrder(@RequestBody WxPayNotifyOrderVO wxPayNotifyOrderVO);
+
+ /**
+ * 支付付款
+ */
+ @PostMapping("/rentingHourseOrder/wxPay")
+ R wxPayRentingHourseOrder(@RequestBody WxPayOrderVO wxPayOrderVO);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/rentingHoursePreOrder/queryAll")
+ R selectAllRentingHoursePreOrder(@RequestBody CommonPage commonPage);
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/rentingHoursePreOrder/{id}")
+ R selectOneRentingHoursePreOrder(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param rentingHoursePreOrderVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/rentingHoursePreOrder")
+ R insertRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);
+
+ /**
+ * 修改数据
+ *
+ * @param rentingHoursePreOrderVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/rentingHoursePreOrder/update")
+ R updateRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/rentingHoursePreOrder/del")
+ R deleteRentingHoursePreOrder(@RequestParam("id") Long id);
+
+ /**
+ * 普通订单统计
+ */
+ @PostMapping("/rentingHourseOrder/statics")
+ R staticsRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrderVO);
+
+ /**
+ * 定金订单统计
+ */
+ @PostMapping("/rentingHoursePreOrder/statics")
+ R staticsRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);
+
+ /**
+ * 获取房屋租赁配置
+ * @return
+ * @param type
+ */
+ @GetMapping("/rentingHousesConfig/getConfig")
+ R getRentingHouseConfig(@RequestParam("type") Integer type);
+
+ @GetMapping("/rentingHourseRegister/updateAllHouseUnionAppCode")
+ @Async
+ void updateAllHouseUnionAppCode(@RequestParam("areaCode") String areaCode);
+
+ /**
+ * 西区大屏治理数据
+ */
+ @GetMapping("/screen/getWestScreenStatics")
+ R westScreenStatics();
+
+ /**
+ * 西区大屏一标三实数据
+ * @return 西区大屏一标三实数据
+ */
+ @GetMapping("/screen/getComprehensivePopulationStatics")
+ R getComprehensivePopulationStatics(@RequestParam("streetId") Long streetId);
+
+ @GetMapping("/screen/getComprehensiveStreetList")
+ R getComprehensiveStreetList();
+
+ /**
+ * 通过社区id查询社区账号密码
+ * @param communityId 社区id
+ * @return 查询社区账号密码
+ */
+ @GetMapping("/screen/getCommunityPassword")
+ R getCommunityPassword(@RequestParam("communityId") Long communityId);
+
+ @GetMapping("/reserve/bigScreenStaticsReserve")
+ R bigScreenStaticsReserve(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 党员活动折线图
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/bigscreen/party/partyActivityLine")
+ R partyActivityLine(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 党员积分前3
+ * @param pageBigScreenStatisticPartyOrg
+ * @return
+ */
+ @PostMapping("/bigscreen/party/partyActivityTop")
+ R partyActivityTop(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg);
+
+ /**
+ * 社区服务大屏数据分析接口
+ */
+ @GetMapping("/screen/serviceData")
+ R serviceData(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 服务居民接口
+ */
+ @GetMapping("/screen/serviceUser")
+ R serviceUser(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大数据分析平台-居民自治
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/resident/autonomy")
+ R getResidentAutonomy(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大数据分析平台-清网治格
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/grids/governance")
+ R getGridsGovernance(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大数据分析平台-社区服务
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/community/service")
+ R getCommunityServiceStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页获取热度排行商家
+ * @param pagePopularMerchantDTO
+ * @return
+ */
+ @PostMapping("/screen/merchant/popular")
+ R getScreenPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO);
+
+ /**
+ * 新版大屏首页接口
+ */
+ @GetMapping("/screen/indexInfo")
+ R indexInfo(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-微心愿
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/microWish")
+ R indexMicroWish(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-随手拍
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/easyPhoto")
+ R indexEasyPhoto(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-随手拍展示列表
+ * @return
+ */
+ @PostMapping("/screen/index/easyPhotoList")
+ R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-社区问卷
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/questionnaire")
+ R indexQuestionnaire(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-社区动态
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/dyn")
+ R indexDyn(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-社区动态展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/dynList")
+ R indexDynList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-邻里圈
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/neighbor")
+ R indexNeighbor(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-邻里圈展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/neighborList")
+ R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-便民商家
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/merchant")
+ R indexMerchant(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-商家展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/merchantList")
+ R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-微心愿展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/microWishList")
+ R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-社区问卷展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/questionnaireList")
+ R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-居民活动
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/residentAct")
+ R indexResidentAct(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-居民活动展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/residentActList")
+ R indexResidentActList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-志愿者活动
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/volunteerAct")
+ R indexVolunteerAct(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-志愿者活动展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/volunteerActList")
+ R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 清网治格-根据事件分类获取近1月的社区事件数据
+ * @param type
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/event/list")
+ R getEventList(@RequestParam(value = "type") Integer type, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 清网治格-社区事件数据分页
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/event/page")
+ R pageEventList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 新增数字商业街商家
+ * @param mcsMerchantDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/merchant/add")
+ R addMcsMerchant(@RequestBody McsMerchantDTO mcsMerchantDTO);
+
+ /**
+ * 编辑数字商业街商家
+ * @param mcsMerchantDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/merchant/put")
+ R putMcsMerchant(@RequestBody McsMerchantDTO mcsMerchantDTO);
+
+ /**
+ * 查询数字商业街商家详情
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/merchant/get")
+ R getMcsMerchant(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 删除数字商业街商家
+ * @param merchantId
+ * @param userId
+ * @return
+ */
+ @DeleteMapping("/microcommercialstreet/merchant/delete")
+ R deleteMcsMerchant(@RequestParam("merchantId") Long merchantId, @RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询数字商业街商家
+ * @param pageMcsMerchantDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/merchant/page")
+ R pageMcsMerchant(@RequestBody PageMcsMerchantDTO pageMcsMerchantDTO);
+
+ /**
+ * 禁用/启用数字商业街商家
+ * @param disableOrEnableMcsMerchantDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/merchant/disable-or-enable")
+ R disableOrEnableMcsMerchant(@RequestBody DisableOrEnableMcsMerchantDTO disableOrEnableMcsMerchantDTO);
+
+ /**
+ * 获取所有数字商业街配置
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/config/all")
+ R getAllMcsConfig();
+
+ /**
+ * 修改数字商业街配置
+ * @param configs
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/config/put")
+ R putMcsConfig(@RequestBody List<McsConfigVO> configs);
+
+ /**
+ * 分页查询戳戳游戏
+ * @param pageMcsGameDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/game/page")
+ R pageMcsGame(@RequestBody PageMcsGameDTO pageMcsGameDTO);
+
+ /**
+ * 设为/取消游戏热门
+ * @param setPopularForGameDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/game/setPopular")
+ R setPopularForGame(@RequestBody SetPopularForGameDTO setPopularForGameDTO);
+
+ /**
+ * 上架/下架戳戳游戏
+ * @param setShelfForGameDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/game/setShelf")
+ R setShelfForGame(@RequestBody SetShelfForGameDTO setShelfForGameDTO);
+
+ /**
+ * 删除戳戳游戏
+ * @param gameId
+ * @param userId
+ * @return
+ */
+ @DeleteMapping("/microcommercialstreet/game/delete")
+ R deleteMcsGame(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询戳戳资讯
+ * @param pageMcsInformationDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/information/page")
+ R pageMcsInfo(@RequestBody PageMcsInformationDTO pageMcsInformationDTO);
+
+ /**
+ * 上架/下架戳戳资讯
+ * @param setShelfForInfoDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/information/setShelf")
+ R setShelfForMcsInfo(@RequestBody SetShelfForInfoDTO setShelfForInfoDTO);
+
+ /**
+ * 删除戳戳资讯
+ * @param infoId
+ * @param userId
+ * @return
+ */
+ @DeleteMapping("/microcommercialstreet/information/delete")
+ R deleteMcsInfo(@RequestParam("infoId") Long infoId, @RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询评价记录
+ * @param pageMcsEvaluateDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/evaluate/page")
+ R pageMcsEvaluate(@RequestBody PageMcsEvaluateDTO pageMcsEvaluateDTO);
+
+ /**
+ * 查询评价记录详情
+ * @param evaluateId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/evaluate/get")
+ R getMcsEvaluate(@RequestParam("evaluateId") Long evaluateId);
+
+ /**
+ * 删除评价记录
+ * @param evaluateId
+ * @return
+ */
+ @DeleteMapping("/microcommercialstreet/evaluate/delete")
+ R deleteMcsEvaluate(@RequestParam("evaluateId") Long evaluateId);
+
+ /**
+ * 新增戳戳游戏
+ * @param mcsGameDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/game/add")
+ R addMcsGame(@RequestBody McsGameDTO mcsGameDTO);
+
+ /**
+ * 编辑戳戳游戏
+ * @param mcsGameDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/game/put")
+ R putMcsGame(@RequestBody McsGameDTO mcsGameDTO);
+
+ /**
+ * 发布戳戳游戏
+ * @param gameId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/game/publish")
+ R publishMcsGame(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);
+
+ /**
+ * 结束戳戳游戏
+ * @param gameId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/game/finish")
+ R finishMcsGame(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);
+
+ /**
+ * 戳戳游戏/资讯顶部统计数据
+ * @param type
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/statistics/top")
+ R getTopStatistics(@RequestParam("type") Integer type, @RequestParam("userId") Long userId);
+
+ /**
+ * 新增戳戳资讯
+ * @param mcsInfoDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/information/add")
+ R addMcsInfo(@RequestBody McsInfoDTO mcsInfoDTO);
+
+ /**
+ * 编辑戳戳资讯
+ * @param mcsInfoDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/information/put")
+ R putMcsInfo(@RequestBody McsInfoDTO mcsInfoDTO);
+
+ /**
+ * 发布戳戳资讯
+ * @param infoId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/information/publish")
+ R publishMcsInfo(@RequestParam("infoId") Long infoId, @RequestParam("userId") Long userId);
+
+ /**
+ * 新增产品信息
+ * @param mcsProductDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/product/add")
+ R addMcsProduct(@RequestBody McsProductDTO mcsProductDTO);
+
+ /**
+ * 编辑产品信息
+ * @param mcsProductDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/product/put")
+ R putMcsProduct(@RequestBody McsProductDTO mcsProductDTO);
+
+ /**
+ * 删除产品信息
+ * @param deleteProductDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/product/delete")
+ R deleteMcsProduct(@RequestBody DeleteProductDTO deleteProductDTO);
+
+ /**
+ * 上架/下架产品信息
+ * @param setShelfForProductDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/product/setShelf")
+ R setShelfForMcsProduct(@RequestBody SetShelfForProductDTO setShelfForProductDTO);
+
+ /**
+ * 分页查询产品信息
+ * @param pageMcsProductDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/product/page")
+ R pageMcsProduct(@RequestBody PageMcsProductDTO pageMcsProductDTO);
+
+ /**
+ * 获取产品标签列表
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/label/list")
+ R getMcsLabelList(@RequestParam("userId") Long userId);
+
+ /**
+ * check商家/店铺是否有效
+ * @param userId
+ * @return
+ */
+ @GetMapping("/shop/checkStoreIsValid")
+ R checkStoreIsValid(@RequestParam("userId") Long userId);
+
+ /**
+ * 根据account查询微商业街商家信息
+ * @param account
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/getMcsMerchantByAccount")
+ R getMcsMerchantByAccount(@RequestParam("account") String account);
+
+ /**
+ * 完成订单更新/新增商家信息
+ * @param merchantName
+ * @param configId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/updateAfterOrder")
+ R updateMcsMerchantAfterOrder(@RequestParam(value = "merchantName", required = false) String merchantName,
+ @RequestParam("configId") Long configId, @RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/mcsOrder/queryAll")
+ R selectAllMscOrder(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/mcsOrder/{id}")
+ R selectOneMscOrder(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param mcsOrderVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/mcsOrder")
+ R insertMscOrder(@RequestBody McsOrderVO mcsOrderVO);
+
+ /**
+ * 修改数据
+ *
+ * @param mcsOrderVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/mcsOrder/update")
+ R updateMscOrder(@RequestBody McsOrderVO mcsOrderVO);
+
+ /**
+ * 微信支付
+ * @param mcsOrderVO
+ * @return
+ */
+ @PostMapping("/mcsOrder/wxPay")
+ R wxPayMscOrder(McsOrderVO mcsOrderVO);
+
+ /**
+ * 发送提醒短信
+ * @param id
+ * @return
+ */
+ @GetMapping("/mcsOrder/sendContent")
+ R sendContentMcsOrder(@RequestParam("id") Long id);
+
+ /**
+ *微信支付回调
+ * @param mcsOrderVO
+ * @return
+ */
+ @PostMapping("/mcsOrder/notify")
+ R notifyMcsOrder(@RequestBody McsOrderVO mcsOrderVO);
+
+ /**
+ * 验证码登录
+ * @param loginDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/loginWithPhone")
+ R loginWithPhone(@RequestBody LoginWithPhoneDTO loginDTO);
+
+ /**
+ * 首页顶部数据
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/index/topData")
+ R getMcsIndexTopData();
+
+ /**
+ * 戳戳卷领取
+ * @param gameId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/coupon/apply")
+ R applyMcsCoupon(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);
+
+ /**
+ * h5分页查询戳戳资讯
+ * @param pageMcsInformationDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/information/pageH5")
+ R pageH5McsInfo(@RequestBody PageMcsInformationDTO pageMcsInformationDTO);
+
+ /**
+ * h5分页查询戳戳游戏
+ * @param pageMcsGameDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/game/pageH5")
+ R pageH5McsGame(@RequestBody PageMcsGameDTO pageMcsGameDTO);
+
+ /**
+ * 游戏详情
+ * @param gameId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/game/get")
+ R getMcsGame(@RequestParam("gameId") Long gameId);
+
+ /**
+ * 资讯详情
+ * @param infoId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/info/get")
+ R getMcsInfo(@RequestParam("infoId") Long infoId);
+
+ /**
+ * H5分页查询数字商业街商家
+ * @param pageMcsMerchantDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/merchant/pageH5")
+ R pageH5McsMerchant(@RequestBody PageMcsMerchantDTO pageMcsMerchantDTO);
+
+ /**
+ * 我的戳戳卷
+ * @param type
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/myCoupon")
+ R getMyCoupon(@RequestParam(value = "type", required = false) Integer type, @RequestParam("userId") Long userId);
+
+ /**
+ * 新增评价记录
+ * @param mcsEvaluateDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/evaluate/add")
+ R addMcsEvaluate(@RequestBody McsEvaluateDTO mcsEvaluateDTO);
+
+ /**
+ * 我的评价-参与游戏列表
+ * @param pageJoinGameListDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/joinGame/page")
+ R getJoinGameList(@RequestBody PageJoinGameListDTO pageJoinGameListDTO);
+
+ /**
+ * 戳戳卷核销
+ * @param couponId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/coupon/verify")
+ R verifyMcsCoupon(@RequestParam("couponId") Long couponId, @RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询核销记录
+ * @param pageVerifyRecordDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/verifyRecord/page")
+ R pageMcsVerifyRecord(@RequestBody PageVerifyRecordDTO pageVerifyRecordDTO);
+
+ /**
+ * 游戏统计
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/game/statistics")
+ R getMcsGameStatistics(@RequestParam("userId") Long userId);
+
+ /**
+ * 修改用戶信息
+ * @param putUserInfoDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/putUserInfo")
+ R putUserInfo(@RequestBody PutUserInfoDTO putUserInfoDTO);
+
+ /**
+ * 根据userId获取商家信息
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/retrieveMcsMerchantInfoByUserId")
+ R retrieveMcsMerchantInfoByUserId(@RequestParam("userId") Long userId);
+
+ /**
+ * 定时任务-每隔5分钟执行一次，将已到期的微商业街商家旗下所有的游戏/资讯全部下架
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/offResourceForMcsMerchant")
+ R offResourceForMcsMerchant();
+
+ /**
+ * 获取产品信息详情
+ * @param productId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/product/get")
+ R getMcsProduct(@RequestParam("productId") Long productId);
+
+ /**
+ * 定时任务-每隔5分钟执行一次，将已到期的微商业街游戏结束
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/endStatusForMcsGame")
+ R endStatusForMcsGame();
+
+ @GetMapping("/reserve/record/delete")
+ R deleteRecord(@RequestParam("recordId")Long recordId);
+
+ /**
+ * 历史数据人员类型填充
+ * @param newVoList
+ * @param communityId
+ * @param userId
+ * @return
+ */
+ @PostMapping("/common/data/history/filled")
+ R filledPopulationPersonType(@RequestBody List<ComMngPopulationServeExcelVO> newVoList,
+ @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
+
+ /**
+ * 社区后台-分页查询志愿者组织队伍
+ *
+ * @param orgTeamDto 请求参数
+ * @return 志愿者组织队伍
+ */
+ @PostMapping("/comMngVolunteerOrgTeam/page")
+ R pageVolunteerOrgAdmin(@RequestBody PageComMngVolunteerOrgTeamDto orgTeamDto);
+
+ /**
+ * 社区后台-新增志愿者组织队伍
+ *
+ * @param orgTeamDto 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/comMngVolunteerOrgTeam/add")
+ R addVolunteerOrgAdmin(@RequestBody AddComMngVolunteerOrgTeamDto orgTeamDto);
+
+ /**
+ * 社区后台-编辑志愿者组织队伍
+ *
+ * @param orgTeamDto 请求参数
+ * @return 编辑结果
+ */
+ @PutMapping("/comMngVolunteerOrgTeam/edit")
+ R editVolunteerOrgAdmin(@RequestBody EditComMngVolunteerOrgTeamDto orgTeamDto);
+
+ /**
+ * 社区后台-删除志愿者组织队伍
+ *
+ * @param id 主键id
+ * @return 删除结果
+ */
+ @GetMapping("/comMngVolunteerOrgTeam/delete")
+ R deleteVolunteerOrgAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 社区后台-查询志愿者组织列表
+ *
+ * @param orgTeamDto 请求参数
+ * @return 志愿者组织列表
+ */
+ @PostMapping("/comMngVolunteerOrgTeam/list")
+ R listVolunteerOrgAdmin(@RequestBody PageComMngVolunteerOrgTeamDto orgTeamDto);
+
+ /**
+ * 社区后台-分页查询服务类型
+ *
+ * @param serviceTypeDto 请求参数
+ * @return 服务类型列表
+ */
+ @PostMapping("/comMngVolunteerServiceType/page")
+ R pageServiceTypeAdmin(@RequestBody PageComMngVolunteerServiceTypeDto serviceTypeDto);
+
+ /**
+ * 社区后台-新增服务类型
+ *
+ * @param serviceTypeDto 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/comMngVolunteerServiceType/add")
+ R addServiceTypeAdmin(@RequestBody AddComMngVolunteerServiceTypeDto serviceTypeDto);
+
+ /**
+ * 社区后台-编辑服务类型
+ *
+ * @param serviceTypeDto 请求参数
+ * @return 编辑结果
+ */
+ @PutMapping("/comMngVolunteerServiceType/edit")
+ R editServiceTypeAdmin(@RequestBody EditComMngVolunteerServiceTypeDto serviceTypeDto);
+
+ /**
+ * 社区后台-删除服务类型
+ *
+ * @param id 主键id
+ * @return 删除结果
+ */
+ @GetMapping("/comMngVolunteerServiceType/delete")
+ R deleteServiceTypeAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 社区后台-分页查询志愿者技能列表
+ *
+ * @param volunteerSkillDto 请求参数
+ * @return 志愿者技能列表
+ */
+ @PostMapping("/comMngVolunteerSkill/page")
+ R pageVolunteerSkillAdmin(@RequestBody PageComMngVolunteerSkillDto volunteerSkillDto);
+
+ /**
+ * 社区后台-新增志愿者技能
+ *
+ * @param volunteerSkillDto 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/comMngVolunteerSkill/add")
+ R addVolunteerSkillAdmin(@RequestBody AddComMngVolunteerSkillDto volunteerSkillDto);
+
+ /**
+ * 社区后台-编辑志愿者技能
+ *
+ * @param volunteerSkillDto 请求参数
+ * @return 编辑结果
+ */
+ @PutMapping("/comMngVolunteerSkill/edit")
+ R editVolunteerSkillAdmin(@RequestBody EditComMngVolunteerSkillDto volunteerSkillDto);
+
+ /**
+ * 社区后台-删除志愿者技能
+ *
+ * @param id 主键id
+ * @return 删除结果
+ */
+ @GetMapping("/comMngVolunteerSkill/delete")
+ R deleteVolunteerSkillAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 社区后台-查询志愿者服务类型列表
+ *
+ * @param serviceTypeDto 请求参数
+ * @return 志愿者服务列表
+ */
+ @PostMapping("/comMngVolunteerServiceType/list")
+ R listServiceTypeAdmin(@RequestBody PageComMngVolunteerServiceTypeDto serviceTypeDto);
+
+ /**
+ * 社区后台-查询志愿者技能列表
+ *
+ * @param volunteerSkillDto 请求参数
+ * @return 志愿者技能列表
+ */
+ @PostMapping("/comMngVolunteerSkill/list")
+ R listVolunteerSkillAdmin(@RequestBody PageComMngVolunteerSkillDto volunteerSkillDto);
+
+ /**
+ * 社区后台-志愿者组织统计
+ *
+ * @param communityId 社区id
+ * @return 志愿者组织统计
+ */
+ @GetMapping("/comMngVolunteerOrgTeam/statistics")
+ R statisticsVolunteerOrgAdmin(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 志愿者导入
+ *
+ * @param list 志愿者数据列表
+ * @param communityId 社区id
+ * @param userId 用户id
+ * @return 导入结果
+ */
+ @PostMapping("/volunteer/import/admin")
+ R importVolunteerAdmin(@RequestBody List<ComMngVolunteerExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ @PostMapping("/screen/hmk/baseInfo")
+ R hmkBaseInfo(@RequestBody CommonPage commonPage);
+
+ @GetMapping("/screen/hmk/partyProjectActivityLine")
+ R partyProjectActivityLine();
+
+ @PostMapping("/screen/hmk/projectActivityTop")
+ R projectActivityProject(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialOrg/{id}")
+ R comActSocialOrgSelectOne(@PathVariable("id") Long id);
+
+
+ /**
+ * 通过userId查询
+ *
+ * @param userId 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialOrg/selectByUserId")
+ R selectOneByUserId(@RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialMember/queryAll")
+ public R comActSocialMemberSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialMember/{id}")
+ public R comActSocialMemberSelectOne(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialMember")
+ public R comActSocialMemberInsert(@RequestBody ComActSocialMemberVO comActSocialMember);
+
+ /**
+ * 批量新增数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProjectMember/batch")
+ public R comActSocialMemberInsertBatch(@RequestBody ComActSocialProjectMemberVO comActSocialMember);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialMember/update")
+ public R comActSocialMemberUpdate(@RequestBody ComActSocialMemberVO comActSocialMember);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialMember/del")
+ public R comActSocialMemberDelete(@RequestParam("id") Long id);
+
+ /**
+ * 新增社工
+ * @param comActSocialWorkerAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialWorker/add")
+ R addComactsocialworker(@RequestBody ComActSocialWorkerAddDTO comActSocialWorkerAddDTO);
+
+ /**
+ * 修改社工
+ * @param comActSocialWorkerEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/comActSocialWorker/edit")
+ R editComactsocialworker(@RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO);
+
+ /**
+ * 分页查找社工
+ * @param pageComActSocialWorkerDTO
+ * @return 维护结果
+ */
+ @PostMapping("/comActSocialWorker/page")
+ R queryComactsocialworker(@RequestBody PageComActSocialWorkerDTO pageComActSocialWorkerDTO);//返回 R<IPage<ComActSocialWorkerVO>>
+
+ /**
+ * 删除社工
+ * @param comActSocialWorkerDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/comActSocialWorker/delete")
+ R deleteComactsocialworker(@RequestBody ComActSocialWorkerDeleteDTO comActSocialWorkerDeleteDTO);
+
+ /**
+ * 查询社工详细信息
+ * @param id 社工 id
+ * @return 查找结果
+ */
+ @PostMapping("/comActSocialWorker/{id}")
+ R<ComActSocialWorkerVO> comActSocialWorkerDetails(@PathVariable("id") Long id);
+
+ /**
+ * 批量导入社工
+ *
+ * @param list 社工集合
+ */
+ @PostMapping("/comActSocialWorker/input")
+ R listSaveSocialWorkerExcelVO(@RequestBody List<ComActSocialWorkerExcelVO> list, @RequestParam("communityId") Long communityId);
+
+ /**
+ *活动查询社工列表
+ * @param commonPage
+ * @return
+ */
+ @PostMapping("/comActSocialWorker/activity")
+ R activity(@RequestBody CommonPage commonPage);
+
+ /**
+ * 社工查询活动
+ * @param commonPage
+ * @return
+ */
+ @PostMapping("/comActSocialWorker/activityList")
+ R activityList(@RequestBody CommonPage commonPage);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialWorkerService/queryAll")
+ R selectAllComActSocialWorkerService(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialWorkerService/{id}")
+ R selectOneComActSocialWorkerService(@PathVariable("id") Long id);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialWorkerServiceVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialWorkerService/update")
+ R updateComActSocialWorkerService(@RequestBody ComActSocialWorkerServiceVO comActSocialWorkerServiceVO);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialProject/queryAll")
+ R selectAllComActSocialProject(@RequestBody CommonPage commonPage);
+
+ /**
+ * 平台详情接口
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialProject/{id}")
+ R selectOneComActSocialProject(@PathVariable("id") Long id);
+
+ /**
+ * 根据项目id分页获取关联项目
+ */
+ @PostMapping("/comActSocialProject/getRelation")
+ R getRelationComActSocialProject(@RequestBody CommonPage commonPage);
+
+ /**
+ * 新增数据
+ *
+ * @param socialProjectVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProject")
+ R insertComActSocialProject(@RequestBody SocialProjectVO socialProjectVO);
+ /**
+ * 修改数据
+ *
+ * @param socialProjectVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialProject/update")
+ R updateComActSocialProject(@RequestBody SocialProjectVO socialProjectVO);
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProject/del")
+ R deleteComActSocialProject(@RequestParam("id") Long id);
+ /**
+ * 小程序详情接口
+ * @param id
+ * @param userId
+ * @return
+ */
+ @GetMapping("/comActSocialProject/getApplet")
+ R getAppletComActSocialProject(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialProjectMember/queryAll")
+ public R selectAllComActSocialProjectMember(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialProjectMember/{id}")
+ public R selectOneComActSocialProjectMember(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectMemberVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProjectMember")
+ public R insertComActSocialProjectMember(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectMemberVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialProjectMember/update")
+ public R updateComActSocialProjectMember(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProjectMember/del")
+ public R deleteComActSocialProjectMember(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialProjectPublicity/queryAll")
+ public R selectAllComActSocialProjectPublicity(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialProjectPublicity/getByApplet/{id}")
+ public R selectOneComActSocialProjectPublicity(@PathVariable("id") Long id);
+
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectPublicityVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProjectPublicity")
+ public R insertComActSocialProjectPublicity(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectPublicityVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialProjectPublicity/update")
+ public R updateComActSocialProjectPublicity(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProjectPublicity/del")
+ public R deleteComActSocialProjectPublicity(@RequestParam("id") Long id);
+ /**
+ * 多条删除数据
+ *
+ * @param ids 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProjectPublicity/delBatch")
+ public R delBatchComActSocialProjectPublicity(@RequestParam("ids") List<Long> ids);
+
+ /**
+ * 根据projectId查询所有进度
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialProjectSchedule/queryAll")
+ public R selectAllComActSocialProjectSchedule(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialProjectSchedule/{id}")
+ public R selectOneComActSocialProjectSchedule(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectScheduleVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProjectSchedule")
+ public R insertComActSocialProjectSchedule(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectScheduleVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialProjectSchedule/update")
+ public R updateComActSocialProjectSchedule(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProjectSchedule/del")
+ public R deleteComActSocialProjectSchedule(@RequestParam("id") Long id);
+
+ /**
+ * 项目分类级联
+ * @param comActColumnVO
+ * @return
+ */
+ @PostMapping("/comActColumn/queryLevel")
+ public R queryLevel(@RequestBody ComActColumnVO comActColumnVO);
+
+ @PostMapping("/comActRaffle/queryAll")
+ R selectAllComActRaffle(@RequestBody CommonPage commonPage);
+
+ @GetMapping("/comActRaffle/detail")
+ R selectOneComActRaffle(@RequestParam("id") Long id,@RequestParam("userId")Long userId);
+
+ @PostMapping("/comActRaffle")
+ R insertComActRaffle(@RequestBody ComActRaffleVO comActRaffleVO);
+
+ @PostMapping("/comActRaffle/update")
+ R updateComActRaffle(@RequestBody ComActRaffleVO comActRaffleVO);
+
+ @GetMapping("/comActRaffle/del")
+ R deleteComActRaffle(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActRaffleRecord/queryAll")
+ R selectAllComActRaffleRecord(@RequestBody CommonPage commonPage);
+
+ @GetMapping("/comActRaffleRecord/queryPrize")
+ R queryPrize(@RequestParam("id")Long id);
+
+ /**
+ * 生成二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @PostMapping("/comActRaffleRecord/getQRCode")
+ R getRaffleQRCode(@RequestBody QRCodeVO qrCodeVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActRaffleRecordVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActRaffleRecord/update")
+ R updateRaffleRecord(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO);
+
+ @PostMapping("/comActRaffleRecord")
+ R insertRaffleRecord(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActRaffleRecord/{id}")
+ R selectOneRaffleRecord(@PathVariable("id") Long id);
+ /**
+ * 导出
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActRaffleRecord/export")
+ R exportComActRaffleRecord(@RequestBody CommonPage commonPage);
+
+ /**
+ * [方法描述] 根据社区ID查询所属城市所在区区域代码，
+ *
+ * @param communityId
+ * 社区ID
+ * @return String 区域code
+ * @author manailin
+ * @date 2022/2/17 10:09
+ */
+ @GetMapping("act/getActBelongRegionCode")
+ String getActBelongRegionCode(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 新增团队类型
+ * @param addTeamTypeDTO
+ * @return
+ */
+ @PostMapping("/fms/teamType/add")
+ R addFmsTeamType(@RequestBody AddTeamTypeDTO addTeamTypeDTO);
+
+ /**
+ * 修改团队类型
+ * @param editTeamTypeDTO
+ * @return
+ */
+ @PostMapping("/fms/teamType/edit")
+ R editFmsTeamType(@RequestBody EditTeamTypeDTO editTeamTypeDTO);
+
+ /**
+ * 删除团队类型
+ * @param teamTypeId
+ * @param communityId
+ * @return
+ */
+ @DeleteMapping("/fms/teamType/delete")
+ R deleteFmsTeamType(@RequestParam("teamTypeId") Long teamTypeId,
+ @RequestParam("communityId") Long communityId);
+
+ /**
+ * 获取团队类型列表
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/fms/teamType/list")
+ R listFmsTeamType(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 新增团队
+ * @param addTeamDTO
+ * @return
+ */
+ @PostMapping("/fms/team/add")
+ R addFmsTeam(@RequestBody AddTeamDTO addTeamDTO);
+
+ /**
+ * 修改团队信息
+ * @param editTeamDTO
+ * @return
+ */
+ @PostMapping("/fms/team/edit")
+ R editFmsTeam(@RequestBody EditTeamDTO editTeamDTO);
+
+ /**
+ * 删除团队
+ * @param teamId
+ * @return
+ */
+ @DeleteMapping("/fms/team/delete")
+ R deleteFmsTeam(@RequestParam("teamId") Long teamId);
+
+ /**
+ * 获取团队列表
+ * @param teamTypeId
+ * @return
+ */
+ @GetMapping("/fms/team/list")
+ R listFmsTeam(@RequestParam("teamTypeId") Long teamTypeId);
+
+ /**
+ * 获取团队详情
+ * @param teamId
+ * @return
+ */
+ @GetMapping("/fms/team/detail")
+ R detailFmsTeam(@RequestParam("teamId") Long teamId);
+
+ /**
+ * 级联查询团队数据
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/fms/team/cascade")
+ R retrieveFmsTeamCascade(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 新增团队成员
+ * @param addTeamMemberDTO
+ * @return
+ */
+ @PostMapping("/fms/teamMember/add")
+ R addFmsTeamMember(@RequestBody AddTeamMemberDTO addTeamMemberDTO);
+
+ /**
+ * 编辑团队成员
+ * @param editTeamMemberDTO
+ * @return
+ */
+ @PostMapping("/fms/teamMember/edit")
+ R editFmsTeamMember(@RequestBody EditTeamMemberDTO editTeamMemberDTO);
+
+ /**
+ * 删除团队成员
+ * @param deleteTeamMemberDTO
+ * @return
+ */
+ @PostMapping("/fms/teamMember/delete")
+ R deleteFmsTeamMember(@RequestBody DeleteTeamMemberDTO deleteTeamMemberDTO);
+
+ /**
+ * 分页查询团队成员
+ * @param pageTeamMemberDTO
+ * @return
+ */
+ @PostMapping("/fms/teamMember/page")
+ R pageFmsTeamMember(@RequestBody PageTeamMemberDTO pageTeamMemberDTO);
+
+ /**
+ * 微团队顶部统计
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/fms/teamMember/statistics")
+ R statisticsFmsTeamMember(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 批量导入团队成员
+ * @param voList
+ * @param communityId
+ * @param userId
+ * @return
+ */
+ @PostMapping("/fms/teamMember/import")
+ R listSaveFmsTeamMemberExcelVO(@RequestBody List<ComFmsTeamMemberImportExcelVO> voList,
+ @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
+
+ /**
+ * 团队人员导出
+ * @param pageTeamMemberDTO
+ * @return
+ */
+ @PostMapping("/fms/teamMember/export")
+ R exportTeamMember(@RequestBody PageTeamMemberDTO pageTeamMemberDTO);
+
+ /**
+ * 后台新增微服务
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/service/adminAdd")
+ R addFmsServiceAdmin(@RequestBody AddFmsServiceAdminDTO adminDTO);
+
+ /**
+ * 后台分页查询微服务
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/service/adminPage")
+ R pageFmsServiceAdmin(@RequestBody PageFmsServiceAdminDTO adminDTO);
+
+ /**
+ * 后台核实微服务
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/service/approval")
+ R approvalFmsService(@RequestBody ApprovalFmsServiceAdminDTO adminDTO);
+
+ /**
+ * 级联查询团队服务人员
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/fms/teamMember/cascade")
+ R retrieveFmsTeamMemberCascade(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 后台查看微服务详情
+ * @param serviceId
+ * @return
+ */
+ @GetMapping("/fms/service/detailAdmin")
+ R detailFmsServiceAdmin(@RequestParam("serviceId") Long serviceId);
+
+ /**
+ * 后台删除微服务
+ * @param serviceId
+ * @return
+ */
+ @DeleteMapping("/fms/service/delete")
+ R deleteFmsServiceAdmin(@RequestParam("serviceId") Long serviceId);
+
+ /**
+ * 微服务顶部统计
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/fms/service/statistics")
+ R statisticsFmsService(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 后台导入微服务数据
+ * @param voList
+ * @param communityId
+ * @param userId
+ * @return
+ */
+ @PostMapping("/fms/service/import")
+ R listSaveFmsServiceExcelVO(@RequestBody List<ComFmsServiceImportExcelVO> voList,
+ @RequestParam("communityId") Long communityId,
+ @RequestParam("userId") Long userId);
+
+ /**
+ * 后台新增微讲堂
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/classroom/add")
+ R addFmsClassroom(@RequestBody AddFmsClassroomAdminDTO adminDTO);
+
+ /**
+ * 后台编辑微讲堂
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/classroom/edit")
+ R editFmsClassroom(@RequestBody EditFmsClassroomAdminDTO adminDTO);
+
+ /**
+ * 后台删除微讲堂
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/fms/classroom/delete")
+ R deleteFmsClassroom(@RequestParam("id") Long id);
+
+ /**
+ * 后台获取微讲堂详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/fms/classroom/detail")
+ R detailFmsClassroom(@RequestParam("id") Long id);
+
+ /**
+ * 后台分页查询微讲堂
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/classroom/pageAdmin")
+ R pageFmsClassroomAdmin(@RequestBody PageFmsClassroomAdminDTO adminDTO);
+
+ /**
+ * 微讲堂顶部统计
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/fms/classroom/statistics")
+ R statisticsFmsClassroom(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 后台分页查询微调节/微防控
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/event/page")
+ R pageFmsEvent(@RequestBody PageFmsEventAdminDTO adminDTO);
+
+ /**
+ * 微调节/微防控顶部统计
+ * @param type
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/fms/event/statistics")
+ R statisticsFmsEvent(@RequestParam("type") Integer type, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 微调节/微防控事件详情
+ * @param eventId
+ * @return
+ */
+ @GetMapping("/fms/event/detail")
+ R detailFmsEvent(@RequestParam("eventId") Long eventId);
+
+ /**
+ * 小程序分页查询团队信息
+ * @param pageFmsTeamDTO
+ * @return
+ */
+ @PostMapping("/fms/team/pageApplets")
+ R pageFmsTeamApplets(@RequestBody PageFmsTeamDTO pageFmsTeamDTO);
+
+ /**
+ * 获取微讲堂详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/fms/classroom/detailApplets")
+ R detailFmsClassroomApplets(@RequestParam("id") Long id);
+
+ /**
+ * 小程序分页查询微调节/微防控
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/event/pageApplets")
+ R pageFmsEventApplets(@RequestBody PageFmsEventAdminDTO adminDTO);
+
+ /**
+ * 小程序分页查询微服务
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/service/pageApplets")
+ R pageFmsServiceApplets(@RequestBody PageFmsServiceAppletsDTO adminDTO);
+
+ /**
+ * 小程序查看微服务详情
+ * @param serviceId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/fms/service/detailApplets")
+ R detailFmsServiceApplets(@RequestParam("serviceId") Long serviceId, @RequestParam(value = "userId", required = false) Long userId);
+
+ /**
+ * 微服务申请
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/service/apply")
+ R applyFmsService(@RequestBody ApplyFmsServiceDTO adminDTO);
+
+ /**
+ * 分页查询我的微服务
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/service/pageMy")
+ R pageMyFmsService(@RequestBody PageFmsServiceAppletsDTO adminDTO);
+
+ /**
+ * 微服务评价
+ * @param evaluationFmsServiceDTO
+ * @return
+ */
+ @PostMapping("/fms/service/evaluate")
+ R evaluateFmsService(@RequestBody EvaluationFmsServiceDTO evaluationFmsServiceDTO);
+
+ /**
+ * 微团队成员分页查询服务处理
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/service/pageDeal")
+ R pageDealFmsService(@RequestBody PageFmsServiceAppletsDTO adminDTO);
+
+ /**
+ * 微团队成员服务反馈
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/service/feedback")
+ R feedbackFmsService(@RequestBody FeedbackFmsServiceDTO adminDTO);
+
+ /**
+ * 定时任务针对服务结束后3天还未评价的用户默认好评
+ * @return
+ */
+ @PostMapping("/fms/service/defaultPraise")
+ R timedTaskFmsServiceDefaultPraise();
+
+ @GetMapping("/activity/partyMemberCount")
+ R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year);
+
+ /**
+ * 根据小区id查询楼栋列表
+ * @param villageId 小区id
+ * @return 查询楼栋列表
+ */
+ @GetMapping("/building/getBuildListByVillageId")
+ R getBuildListByVillageId(@RequestParam(value = "villageId") Long villageId);
+ /**
+ * 党员活动详情数据
+ * @return
+ */
+ @PostMapping("/activity/partyMemberDetail")
+ R partyMemberDetail(@RequestBody CommonPage commonPage);
+ /**
+ * 导出党员活动详情数据
+ * @return
+ */
+ @PostMapping("/activity/exportPartyMemberDetail")
+ R exportPartyMemberDetail(@RequestBody CommonPage commonPage);
+
+ /**
+ * 金沙定制页面-党建引领基础数据
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/partyBuildIng/base")
+ R getPartyBuildIngBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 党员活动展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/partyBuildIng/partyAct")
+ R pagePartyBuildIngAct(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 议事投票展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/partyBuildIng/discuss")
+ R pagePartyBuildIngDiscuss(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 金沙定制页面-四长四员
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/fourMember/base")
+ R getFourMemberBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 杨家坪定制页面-五微服务
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/fms/base")
+ R getFmsBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 杨家坪定制页面-微团队展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/fms/team")
+ R pageFmsTeam(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 杨家坪定制页面-居家养老基础数据
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/alarm/base")
+ R getAlarmBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 杨家坪定制页面-报警记录展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/alarm/record")
+ R pageAlarmRecord(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 杨家坪定制页面-报警设备点位图
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/alarm/pointMap")
+ R getAlarmPointMap(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 杨家坪定制页面-志愿服务
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/volunteer/base")
+ R getVolunteerBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 金沙定制页面-志愿线展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/partyBuildIng/microWish")
+ R pagePartyBuildIngMicroWish(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 金沙定制页面-四长四员解决问题展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/fourMember/resolve")
+ R pageFourMemberResolve(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 金沙定制页面-四长四员院落议事展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/courtyard/list")
+ R pageCourtyardDiscuss(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 金沙定制页面-院落议事
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/courtyard/base")
+ R getCourtyardBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comActEasyPhotoHandler 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-03-01 13:45:10
+ */
+ @PostMapping("/comActEasyPhotoHandler/page")
+ R queryEasyPhotoHandler(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler);
+
+ /**
+ * description edit 编辑数据
+ *
+ * @param comActEasyPhotoHandler 请求参数
+ * @return 编辑结果
+ * @author lyq
+ * @date 2022-03-01 13:45:10
+ */
+ @PostMapping("/comActEasyPhotoHandler/edit")
+ R editEasyPhotoHandler(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler);
+
+ @GetMapping("/reserve/fiveCount")
+ R fiveCount(@RequestParam("reserveId") Long reserveId);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActEasyPhotoMember/del")
+ R comActEasyPhotoMemberDelete(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActEasyPhotoMember/queryAll")
+ R comActEasyPhotoMemberSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActEasyPhotoMember/{id}")
+ R comActEasyPhotoMemberSelectOne(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActEasyPhotoMemberVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActEasyPhotoMember")
+ R comActEasyPhotoMemberInsert(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActEasyPhotoMemberVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActEasyPhotoMember/update")
+ R comActEasyPhotoMemberUpdate(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param comActAcidRecordDTO 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActAcidRecord/queryAll")
+ R selectAllComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActAcidRecord/{id}")
+ R selectOneComActAcidRecord(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActAcidRecordVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActAcidRecord")
+ R insertComActAcidRecord(@RequestBody ComActAcidRecordVO comActAcidRecordVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActAcidRecordVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActAcidRecord/update")
+ R updateComActAcidRecord(@RequestBody ComActAcidRecordVO comActAcidRecordVO);
+
+
+ /**
+ * 小程序修改填报记录
+ *
+ * @param comActAcidRecordVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActAcidRecord/updateApplets")
+ R updateApplets(@RequestBody ComActAcidRecordVO comActAcidRecordVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActAcidRecord/del")
+ R deleteComActAcidRecord(@RequestParam("id") Long id);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActAcidRecord/detailByApp")
+ R detailByApp(@RequestParam("id") Long id,@RequestParam("localCity")String localCity);
+
+ @GetMapping("/comActAcidRecord/charts")
+ R charts(@RequestParam("date")String date,@RequestParam("localCity")String localCity);
+
+ @PostMapping("/comActAcidRecord/export")
+ R exportComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);
+
+ @GetMapping("/comActAcidRecord/checkCommit")
+ R checkCommit(@RequestParam(value = "userId",required = false)Long userId);
+
+
+ /**
+ * 5项常规统计
+ * @return
+ */
+ @GetMapping("/comActAcidRecord/fiveCount")
+ R comActAcidRecordFiveCount(@RequestParam("localCity")String localCity);
+
+ /**
+ * 7项常规统计
+ * @return
+ */
+ @GetMapping("/comActAcidRecord/fiveCountPlus")
+ R comActAcidRecordFiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity,@RequestParam(value = "loginAccount",required = false)String loginAccount);
+
+ @GetMapping("/comActAcidRecord/statics")
+ R comActAcidRecordStatics(@RequestParam("date")String date);
+
+ @GetMapping("/comActAcidRecord/test")
+ R test();
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActReserveDangerArea/queryAll")
+ R selectAllComActReserveDangerArea(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActReserveDangerArea/{id}")
+ R selectOneComActReserveDangerArea(@PathVariable("id") Long id);
+
+ /**
+ * 修改数据
+ *
+ * @param comActReserveDangerAreaVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActReserveDangerArea/update")
+ R updateComActReserveDangerArea(@RequestBody ComActReserveDangerAreaVO comActReserveDangerAreaVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActReserveDangerArea/del")
+ R deleteComActReserveDangerArea(@RequestParam("id") Long id);
+
+ /**
+ * 风险区数据统计
+ * @return
+ */
+ @GetMapping("/comActReserveDangerArea/statics")
+ R staticsComActReserveDangerArea();
+
+ /**
+ * 批量设置起始时间
+ * @param editDangerBatchDTO
+ * @return
+ */
+ @PostMapping("/comActReserveDangerArea/updateBatch")
+ R updateBatchComActReserveDangerArea(@RequestBody EditDangerBatchDTO editDangerBatchDTO);
+
+ @GetMapping("/comAreaTownCommunity/areaTownCommunity")
+ R areaTownCommunity(@RequestParam("name")String name,@RequestParam("userId")Long userId);
+
+ /**
+ * 物业公司详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/comProperty/detail")
+ R detailProperty(@RequestParam("id") Long id);
+
+ /**
+ * 添加物业工作人员
+ * @param propertyWorkerDTO
+ * @return
+ */
+ @PostMapping("/comPropertyWorker/add")
+ R addPropertyWorker(@RequestBody PropertyWorkerDTO propertyWorkerDTO);
+
+ /**
+ * 编辑物业工作人员
+ * @param propertyWorkerDTO
+ * @return
+ */
+ @PutMapping("/comPropertyWorker/update")
+ R updatePropertyWorker(@RequestBody PropertyWorkerDTO propertyWorkerDTO);
+
+ /**
+ * 删除物业工作人员
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/comPropertyWorker/delete")
+ R deletePropertyWorker(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询物业工作人员
+ * @param pagePropertyWorkerDTO
+ * @return
+ */
+ @PostMapping("/comPropertyWorker/page")
+ R pagePropertyWorker(@RequestBody PagePropertyWorkerDTO pagePropertyWorkerDTO);
+
+ /**
+ * 物业工作人员详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/comPropertyWorker/detail")
+ R detailPropertyWorker(@RequestParam("id") Long id);
+
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActAcidMember/queryAll")
+ R selectAllComActAcidMember(@RequestBody ComActAcidMemberDTO commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActAcidMember/{id}")
+ R selectOneComActAcidMember(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActAcidMemberVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActAcidMember")
+ R insertComActAcidMember(@RequestBody ComActAcidMemberVO comActAcidMemberVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActAcidMemberVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActAcidMember/update")
+ R updateComActAcidMember(@RequestBody ComActAcidMemberVO comActAcidMemberVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActAcidMember/del")
+ R deleteComActAcidMember(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询风险人员
+ * @param pageDangerMemberDTO
+ * @return
+ */
+ @PostMapping("/comActAcidDangerMember/page")
+ R pageDangerMember(@RequestBody PageDangerMemberDTO pageDangerMemberDTO);
+
+ /**
+ * 后台分页查询风险人员
+ * @param pageDangerMemberDTO
+ * @return
+ */
+ @PostMapping("/comActAcidDangerMember/queryAll")
+ R pageDangerMemberAdmin(@RequestBody ComActAcidDangerMemberDTO pageDangerMemberDTO);
+
+ /**
+ * 列表查询
+ *
+ * @param comActAcidCheckRecordDTO 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActAcidCheckRecord/queryAll")
+ R selectAllComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordDTO comActAcidCheckRecordDTO);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActAcidCheckRecord/{id}")
+ R selectOneComActAcidCheckRecord(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActAcidCheckRecordVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActAcidCheckRecord")
+ R insertComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActAcidCheckRecordVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActAcidCheckRecord/update")
+ R updateComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO);
+
+ @GetMapping("/bcRegion/levelList")
+ R levelList(@RequestParam("level")Integer level,@RequestParam("code")String code);
+
+ @GetMapping("/bcRegion/levelListBackstage")
+ R levelListBackstage();
+
+ /**
+ * 单位活动统计
+ */
+ @GetMapping("/neighbor/activityAnalysis")
+ R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,
+ @RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "range",required = false)Integer range,
+ @RequestParam(value = "communityId",required = false) Long communityId,
+ @RequestParam(value = "page",required = false) Integer page,
+ @RequestParam(value = "size",required = false) Integer size,
+ @RequestParam(value = "belongTo",required = false) String belongTo,
+ @RequestParam(value = "unitId",required = false) Long unitId,
+ @RequestParam(value = "loginAccount",required = false) String loginAccount,
+ @RequestParam(value = "searchContent",required = false) String searchContent);
+
+ @GetMapping("/neighbor/export")
+ public List<ExcelDO> export(@RequestParam(value = "year",required = false) Integer year,
+ @RequestParam(value = "belongTo",required = false) String belongTo,
+ @RequestParam(value = "communityId",required = false) Long communityId);
+
+ @GetMapping("/neighbor/partyExcel")
+ public List<PartyExcelDO> partyExcel(@RequestParam(value = "year",required = false) Integer year,
+ @RequestParam(value = "belongTo",required = false) String belongTo,
+ @RequestParam(value = "communityId",required = false) Long communityId,
+ @RequestParam(value = "unitId",required = false) Long unitId);
+
+ /**
+ * 批量删除活动
+ * @param ids
+ * @return
+ */
+ @PostMapping("batchDel")
+ R deleteActivities(@RequestBody List<Long> ids);
+
+ /**
+ * 街道详情
+ * @param id
+ * @return
+ */
+ @GetMapping("detailStreet")
+ R detailStreet(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询项目报名列表
+ * @param pageProjectSignListDTO
+ * @return
+ */
+ @PostMapping("/comActSocialProject/signList")
+ R pageProjectSignList(@RequestBody PageProjectSignListDTO pageProjectSignListDTO);
+
+ /**
+ * 分页查询孵化申请
+ * @param pageHatchAuditDTO
+ * @return
+ */
+ @PostMapping("/comActSocialOrgHatchAudit/page")
+ R pageHatchAudit(@RequestBody PageSocialOrgHatchAuditDTO pageHatchAuditDTO);
+
+ /**
+ * 查看孵化申请详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/comActSocialOrgHatchAudit/detail")
+ R detailHatchAudit(@RequestParam("id") Long id);
+
+ /**
+ * 修改孵化申请
+ * @param hatchAuditDTO
+ * @return
+ */
+ @PostMapping("/comActSocialOrgHatchAudit/update")
+ R updateHatchAudit(@RequestBody SocialOrgHatchAuditDTO hatchAuditDTO);
+
+ /**
+ * 分页查询孵化数据
+ * @param pageHatchDTO
+ * @return
+ */
+ @PostMapping("/comActSocialOrgHatch/page")
+ R pageOrgHatch(@RequestBody PageSocialOrgHatchDTO pageHatchDTO);
+
+ /**
+ * 查看孵化数据详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/comActSocialOrgHatch/detail")
+ R detailOrgHatch(@RequestParam("id") Long id);
+
+ /**
+ * 修改孵化状态
+ * @param id
+ * @param status
+ * @return
+ */
+ @PutMapping("/comActSocialOrgHatch/updateStatus")
+ R updateOrgHatchStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);
+
+ /**
+ * 获取孵化流程配置
+ * @return
+ */
+ @GetMapping("/comActSocialOrgHatchAudit/process")
+ R getHatchAuditProcess();
+
+ /**
+ * 修改孵化流程配置
+ * @param processDTO
+ * @return
+ */
+ @PutMapping("/comActSocialOrgHatchAudit/process")
+ R putHatchAuditProcess(@RequestBody HatchAuditProcessDTO processDTO);
+
+ /**
+ * 新增孵化申请
+ * @param hatchAuditDTO
+ * @return
+ */
+ @PostMapping("/comActSocialOrgHatchAudit/add")
+ R addHatchAudit(@RequestBody SocialOrgHatchAuditDTO hatchAuditDTO);
+
+ /**
+ * 查看孵化申请审核进度
+ * @param userId
+ * @return
+ */
+ @GetMapping("/comActSocialOrgHatchAudit/schedule")
+ R getHatchAuditSchedule(@RequestParam("userId") Long userId);
+
+ /**
+ * 项目公开报名
+ * @param projectId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/comActSocialProject/sign")
+ R signProject(@RequestParam("projectId") Long projectId, @RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询用户报名的项目
+ * @param pageProjectDTO
+ * @return
+ */
+ @PostMapping("/comActSocialProject/project")
+ R pageProjectWhichIsSignedByUser(@RequestBody PageProjectDTO pageProjectDTO);
+
+ /**
+ * 删除孵化申请详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/comActSocialOrgHatchAudit/delete")
+ R deleteHatchAudit(@RequestParam("id") Long id);
+
+ /**
+ * 删除孵化数据
+ * @param id
+ * @return
+ */
+ @GetMapping("/comActSocialOrgHatch/delete")
+ R deleteOrgHatch(@RequestParam("id") Long id);
+
+ /**
+ * 新增社区企业
+ * @param addEnterpriseDTO
+ * @return
+ */
+ @PostMapping("/enterprise/add")
+ R addEnterprise(@RequestBody AddEnterpriseDTO addEnterpriseDTO);
+
+ /**
+ * 修改社区企业
+ * @param editEnterpriseDTO
+ * @return
+ */
+ @PostMapping("/enterprise/edit")
+ R editEnterprise(@RequestBody EditEnterpriseDTO editEnterpriseDTO);
+
+ /**
+ * 删除社区企业
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/enterprise/delete")
+ R deleteEnterprise(@RequestParam("id") Long id);
+
+ /**
+ * 获取社区企业详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/enterprise/detail")
+ R detailEnterprise(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询社区企业
+ * @param pageEnterpriseDTO
+ * @return
+ */
+ @PostMapping("/enterprise/page")
+ R pageEnterprise(@RequestBody PageEnterpriseDTO pageEnterpriseDTO);
+
+ /**
+ * 孵化中心-基础数据
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/hatch/base")
+ R getHatchBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 孵化中心-孵化成果展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/hatchResult/list")
+ R pageHatchResult(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 孵化中心-孵化进度展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/hatchSchedule/list")
+ R pageHatchSchedule(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 五社联动基础数据
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/fiveAssociations/base")
+ R getFiveAssociationsBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 五社联动项目展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/socialProject/list")
+ R pageSocialProjectList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 五社联动社会组织展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/socialOrg/list")
+ R pageSocialOrgList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 新增服务分类
+ * @param addEnterpriseTypeDTO
+ * @return
+ */
+ @PostMapping("/enterpriseType/add")
+ R addEnterpriseType(@RequestBody AddEnterpriseTypeDTO addEnterpriseTypeDTO);
+
+ /**
+ * 修改服务分类
+ * @param enterpriseTypeDTO
+ * @return
+ */
+ @PostMapping("/enterpriseType/edit")
+ R editEnterpriseType(@RequestBody EditEnterpriseTypeDTO enterpriseTypeDTO);
+
+ /**
+ * 删除服务分类
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/enterpriseType/delete")
+ R deleteEnterpriseType(@RequestParam("id") Long id);
+
+ /**
+ * 获取服务分类详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/enterpriseType/detail")
+ R detailEnterpriseType(@RequestParam("id") Long id);
+ /**
+ * 分页查询服务分类
+ * @param pageEnterpriseTypeDTO
+ * @return
+ */
+ @PostMapping("/enterpriseType/page")
+ R pageEnterpriseType(@RequestBody PageEnterpriseTypeDTO pageEnterpriseTypeDTO);
+
+ /**
+ * 获取服务分类列表
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/enterpriseType/list")
+ R getEnterpriseTypeList(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 新增人大代表
+ * @param addDpcDTO
+ * @return
+ */
+ @PostMapping("/dpc/add")
+ R addDpc(@RequestBody AddDpcDTO addDpcDTO);
+
+ /**
+ * 修改人大代表
+ * @param editDpcDTO
+ * @return
+ */
+ @PostMapping("/dpc/edit")
+ R editDpc(@RequestBody EditDpcDTO editDpcDTO);
+
+ /**
+ * 删除人大代表
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/dpc/delete")
+ R deleteDpc(@RequestParam("id") Long id);
+
+ /**
+ * 获取人大代表详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/dpc/detail")
+ R detailDpc(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询人大代表
+ * @param pageDpcDTO
+ * @return
+ */
+ @PostMapping("/dpc/page")
+ R pageDpc(@RequestBody PageDpcDTO pageDpcDTO);
+
+ /**
+ * 获取人大代表反馈记录
+ * @param id
+ * @return
+ */
+ @GetMapping("/dpc/feedback")
+ R getFeedbackList(@RequestParam("id") Long id);
+
+ /**
+ * 人大代表反馈随手拍
+ * @param comActEasyPhotoVO
+ * @return
+ */
+ @PostMapping("/dpc/feedback")
+ R addEasyPhotoFeedbackForDpc(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ * 人大代表
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/dpc/base")
+ R dpcBase(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 人大代表-随手拍展示列表
+ * @return
+ */
+ @PostMapping("/screen/dpc/easyPhotoList")
+ R dpcEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 查询详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/comActEasyPhotoHandler/detail")
+ R detailEasyPhotoHandler(@RequestParam("id") Long id);
+
+ /**
+ * 活动邀请列表
+ * @param pageActivityInviteDTO
+ * @return
+ */
+ @PostMapping("/activity/invite/list")
+ R pageActivityInviteList(@RequestBody PageActivityInviteDTO pageActivityInviteDTO);
+
+ /**
+ * 添加邀请人员
+ * @param list
+ * @return
+ */
+ @PostMapping("/activity/invite/add")
+ R activityInviteAdd(@RequestBody List<ActivityInviteDTO> list);
+
+ /**
+ * 删除邀请人员
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/activity/invite/delete")
+ R activityInviteDelete(@RequestParam("id") Long id);
+
+ /**
+ * 获取积分详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/integral/user/detail")
+ R getUserIntegralDetail(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询可关联清单列表
+ * @param neighborCircleAppDTO
+ * @return
+ */
+ @PostMapping("/neighbor/pageRelationList")
+ R pageRelationList(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);
+
+ /**
+ * 投票情况-分页查询
+ * @param pageVoteSituationDTO
+ * @return
+ */
+ @PostMapping("pageVoteSituation")
+ R pageVoteSituation(@RequestBody PageVoteSituationDTO pageVoteSituationDTO);
+
+ /**
+ * 投票情况详情
+ * @param optionUserId
+ * @return
+ */
+ @GetMapping("detailVoteSituation")
+ R detailVoteSituation(@RequestParam("optionUserId") Long optionUserId);
+
+ /**
+ * 批量核对防疫信息数据
+ * @param batchCheckAcidRecordDTO
+ * @return
+ */
+ @PostMapping("/comActAcidRecord/batchCheck")
+ R batchCheck(@RequestBody BatchCheckAcidRecordDTO batchCheckAcidRecordDTO);
+
+ /**
+ * 小程序获取可用的行业中心列表
+ * @return
+ * */
+ @GetMapping("/sanshuo/industryCenter/appletsList")
+ R industryCenterAppList();
+
+ /**
+ * 后台获取行业中心列表
+ * */
+ @GetMapping("/sanshuo/industryCenter/list")
+ R backIndustrytList(@RequestParam(value = "keyWord",required = false)String keyWord,
+ @RequestParam(value = "page",required = false)Integer page,
+ @RequestParam(value = "size",required = false)Integer size);
+
+ /**
+ * 添加业务中心
+ * */
+ @PostMapping("/sanshuo/industryCenter")
+ R addIndustry(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO);
+
+ /**
+ * 修改业务中心
+ * */
+ @PutMapping("/sanshuo/industryCenter")
+ R updateIndustry(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO);
+
+ /**
+ * 删除业务中心
+ * */
+ @DeleteMapping("/sanshuo/industryCenter/remove")
+ R removeIndustry(@RequestParam("id") Long id);
+
+ /**
+ * 重置业务中心密码
+ * */
+ @PostMapping("/sanshuo/industryCenter/resetPass")
+ R resetIndustryPassword(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO);
+
+ /**
+ * 业务中心详情
+ * */
+ @GetMapping("/sanshuo/industryCenter/detail")
+ R industryCenterDetail(@RequestParam("id") Long id);
+
+ /**
+ * 后台获取专家列表
+ * */
+ @GetMapping("/sanshuo/expert/backstageList")
+ R backExpertList(@RequestParam(value = "keyWord",required = false)@ApiParam("搜索关键字") String keyWord,
+ @RequestParam(value = "page",required = false)Integer page,
+ @RequestParam(value = "size",required = false)Integer size,
+ @RequestParam(value = "level",required = false)Integer level);
+
+ /**
+ * 添加专家
+ * */
+ @PostMapping("/sanshuo/expert")
+ R addExpert(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO);
+
+ /**
+ * 修改专家
+ * */
+ @PutMapping("/sanshuo/expert")
+ R updateExpert(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO);
+
+ /**
+ * 删除专家
+ * */
+ @DeleteMapping("/sanshuo/expert/remove")
+ R removeExpert(@RequestParam("id")Long id);
+
+ /**
+ * 重置专家登陆密码
+ * */
+ @PostMapping("/sanshuo/expert/resetPassword")
+ R resetExpertPassword(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO);
+
+ /**
+ * 小程序获取可选择专家列表
+ * */
+ @GetMapping("/sanshuo/expert/appletsList")
+ R expertAppList(@RequestParam (value = "type",required = false)Integer type,@RequestParam(value = "id",required = false)Long id);
+
+ /**
+ * 获取专家详情
+ * */
+ @GetMapping("/sanshuo/expert/detail")
+ R expertDetail(@RequestParam("id") Long id);
+
+ /**
+ * 后台事件列表
+ * */
+ @GetMapping("/sanshuo/event/list")
+ R backEventList(@RequestParam(value = "keyWord",required = false)String keyWord,
+ @RequestParam(value = "page",required = false)Integer page,
+ @RequestParam(value = "size",required = false)Integer size);
+
+ /**
+ * 事件详情
+ * */
+ @GetMapping("/sanshuo/event/detail")
+ R eventDetail(@RequestParam(value = "id",required = false)Long id);
+
+ /**
+ * 小程序获取事件列表
+ * */
+ @GetMapping("/sanshuo/event/appletsList")
+ R eventAppList();
+
+ /**
+ * 新增事件类型
+ * */
+ @PostMapping("/sanshuo/event")
+ R addEvent(@RequestBody ComMediateTypeDTO comSanshuoEventDTO);
+
+ /**
+ * 新增事件类型
+ * */
+ @PutMapping("/sanshuo/event")
+ R updateEvent(@RequestBody ComMediateTypeDTO comSanshuoEventDTO);
+
+ /**
+ * 删除事件类型
+ * */
+ @DeleteMapping("/sanshuo/event/remove")
+ R removeEvent(@RequestParam(value = "id",required = false)Long id);
+
+ /**
+ * 专家风采
+ * */
+ @GetMapping("/sanshuo/expert/expertShow")
+ R expertShow();
+
+
+ @GetMapping("/sanshuo/expert/expertRange")
+ R expertRange();
+
+ /**
+ * 大屏事件统计
+ * */
+ @PostMapping("/sanshuo/comEvent/indexData")
+ R sanshuoIndexDate(IndexDateDTO indexDateDTO);
+
+ /**
+ * 事件占比统计饼图
+ * */
+ @GetMapping("sanshuo/comEvent/indexData/event")
+ R eventIndexData(@RequestParam("type") Integer type);
+
+ /**
+ * 专家风采列表
+ * */
+ @GetMapping("/sanshuo/expert/expertShowList")
+ R expertShowList(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "id",required = false)Long id);
+
+ /**
+ * 修改街道信息
+ * */
+ @PostMapping("/updateStreet")
+ R updateStreet(@RequestBody ComStreetVO comStreetVO);
+
+ /**
+ * 删除街道
+ * */
+ @GetMapping("/removeStreet")
+ R removeStreet(@RequestParam(value = "id",required = false)Long id);
+
+ /***
+ * 删除社区
+ * */
+ @GetMapping("/removeCommunity")
+ R removeCommunity(@RequestParam(value = "id",required = false)Long id);
+
+ @PostMapping("/repassCommunity")
+ R repassCommunity(@RequestBody ComActVO comActVO);
+
+ @PostMapping("/repassStreet")
+ R repassStreet(@RequestBody ComStreetVO comActVO);
+
+ /**
+ * 是否有绑定手机号码的专家账号
+ * */
+ @GetMapping("/sanshuo/expert/checkExpert")
+ R isExpert(@RequestParam(value = "number",required = false) String number);
+
+ @GetMapping("/sanshuo/comEvent/streetList")
+ R streetList();
+
+ @PostMapping("/sanshuo/expert/importExpert")
+ R importExpert(@RequestBody MultipartFile file);
+
+ @GetMapping("/sanshuo/comEvent/communityList")
+ R westList();
+
+ @GetMapping("/sanshuo/expert/backstageList2")
+ R expertBackStageList(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "page",required = false)Integer page,
+ @RequestParam(value = "size",required = false)Integer size,@RequestParam(value = "keyWord",required = false)String keyWord);
+
+ /**
+ * 查询社区id集合
+ * @param id
+ * @return
+ */
+ @GetMapping("selectCommunityIds")
+ R selectCommunityIds(@RequestParam("id") Long id);
+
+ /**
+ * 查询社区id集合
+ * @param id
+ * @return
+ */
+ @GetMapping("selectAutomessageSysUserById")
+ R selectAutomessageSysUserById(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询议事委员会列表
+ * */
+ @GetMapping("/proceedings/list")
+ R proceedingsList(@RequestParam(value = "page",required = false) Integer page,
+ @RequestParam(value = "size",required = false) Integer size,
+ @RequestParam(value = "keyWord",required = false) String keyWord);
+ /**
+ * 添加或修改议事委员会
+ * */
+ @PostMapping("/proceedings")
+ R addOrUpdateProceedings(@RequestBody ComActProceedingsDTO comActProceedingsDTO);
+
+ /**
+ * 自提点分页查询
+ * @param pageConvenientElevatingPointDTO
+ * @return
+ */
+ @PostMapping("/convenient/point/page")
+ R pagePoint(PageConvenientElevatingPointDTO pageConvenientElevatingPointDTO);
+
+ /**
+ * 新增自提点
+ * @param convenientElevatingPointDTO
+ * @return
+ */
+ @PostMapping("/convenient/point/add")
+ R addPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO);
+
+ /**
+ * 编辑自提点
+ * @param convenientElevatingPointDTO
+ * @return
+ */
+ @PutMapping("/convenient/point/put")
+ R putPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO);
+
+ /**
+ * 删除便民服务 自提点
+ * @param pointId
+ * @param operator
+ * @return
+ */
+ @DeleteMapping("/convenient/point/delete")
+ R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator);
+
+ /**
+ * 便民服务详情 自提点
+ * @param pointId
+ * @return
+ */
+ @GetMapping("/convenient/point/detail")
+ R detailPoint(@RequestParam("pointId") Long pointId);
+
+ /**
+ * 新增商品分类
+ * @param convenientGoodsCategoryDTO
+ * @return
+ */
+ @PostMapping("/convenient/goodsCategory/add")
+ R addGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);
+
+ /**
+ * 编辑
+ * @param convenientGoodsCategoryDTO
+ * @return
+ */
+ @PutMapping("/convenient/goodsCategory/put")
+ R putGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);
+
+ /**
+ * 删除商品分类
+ * @param categoryId
+ * @return
+ */
+ @DeleteMapping("/convenient/goodsCategory/delete")
+ R deleteGoodsCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);
+
+ /**
+ * 获取商品分类详情
+ * @param categoryId
+ * @return
+ */
+ @GetMapping("/convenient/goodsCategory/get")
+ R getGoodsCategory(@RequestParam("categoryId") Long categoryId);
+
+ /**
+ * 分页查询商品分类
+ * @param pageConvenientGoodsCategoryDTO
+ * @return
+ */
+ @PostMapping("/convenient/goodsCategory/page")
+ R pageGoodsCategory(@RequestBody PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO);
+
+ @GetMapping("/dataCount")
+ R dataCount();
+
+ @DeleteMapping("/proceedings/remove")
+ R removeProceedings(@RequestParam("id") Long id);
+
+ /**
+ * 获取物业公司通知公告列表
+ * */
+ @GetMapping("comProperty/noticeList")
+ R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId);
+
+ /**
+ * 获取所有商品分类
+ * @return
+ */
+ @GetMapping("/convenient/goodsCategory/getAllGoodsCategories")
+ R getAllGoodsCategories();
+
+ /**
+ * 分页查询用户收货地址列表
+ *
+ * @param comShopAddressDTO
+ * 请求参数
+ * @return 用户收货地址列表
+ */
+ @PostMapping("/shopFlower/shopUserAddressList")
+ R shopFlowerUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO);
+
+ /**
+ * 用户添加收货地址
+ *
+ * @param comShopAddressDTO
+ * 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/shopFlower/shopAddUserAddress")
+ R shopFlowerAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);
+
+ /**
+ * 用户修改收货地址
+ *
+ * @param comShopAddressDTO
+ * 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/shopFlower/shopEditUserAddress")
+ R shopFlowerEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);
+
+ /**
+ * 用户删除收货地址
+ *
+ * @param addressId
+ * 收货地址id
+ * @return 删除结果
+ */
+ @DeleteMapping("/shopFlower/shopDelUserAddress")
+ R shopFlowerDelUserAddress(@RequestParam("addressId") Long addressId);
+
+ /**
+ * 订单预览
+ *
+ * @param orderPreviewDTO 请求参数
+ * @return 订单预览数据
+ */
+ @PostMapping("/shopFlower/orderPreview")
+ R orderPreviewFlower(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO);
+
+ /**
+ * 创建订单
+ *
+ * @param orderCreateDTO 创建订单请求参数
+ * @return 创建结果
+ */
+ @PostMapping("/shopFlower/orderCreate")
+ R orderCreateFlower(@RequestBody ComShopOrderCreateDTO orderCreateDTO);
+
+ /**
+ * 分页查询用户订单列表
+ *
+ * @param comOrderListDTO 请求参数
+ * @return 查询结果
+ */
+ @PostMapping("/shopFlower/pageOrderList")
+ R pageOrderListFlower(@RequestBody PageComFlowerOrderListDTO comOrderListDTO);
+
+ /**
+ * 根据订单id查询订单详情
+ *
+ * @param orderId 订单id
+ * @return 订单详情
+ */
+ @GetMapping("/shopFlower/orderDetail")
+ R orderDetailFlower(@RequestParam("orderId") Long orderId,@RequestParam(value = "phone",required = false) String phone);
+
+ /**
+ * 根据订单id取消订单
+ *
+ * @param comShopOrderQueryDTO 请求参数
+ * @return 取消结果
+ */
+ @PostMapping("/shopFlower/orderCancel")
+ R orderCancelFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);
+
+ /**
+ * 根据订单id删除订单
+ *
+ * @param orderId 订单id
+ * @return 删除结果
+ */
+ @DeleteMapping("/shopFlower/orderDelete")
+ R orderDeleteFlower(@RequestParam("orderId") Long orderId);
+
+ /**
+ * 根据订单id确认收货
+ *
+ * @param comShopOrderQueryDTO 请求参数
+ * @return 确认结果
+ */
+ @PostMapping("/shopFlower/orderConfirm")
+ R orderConfirmFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);
+
+ /**
+ * 分页查询 商家订单
+ *
+ * @param pageComShopOrderSearchDTO 分页数据
+ * @return 分页订单
+ */
+ @PostMapping("/shopFlower/order/page")
+ R pageShopOrderFlower(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
+ /**
+ * 订单发货
+ *
+ * @param orderShipDTO 发货信息
+ * @return 发货结果
+ */
+ @PostMapping("/shopFlower/shipOrder")
+ R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO);
+
+ /**
+ * 订单配送
+ *
+ * @param deliverDTO 订单ID
+ * @return 配送结果
+ */
+ @PostMapping("/shopFlower/deliverOrder")
+ R deliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO);
+
+ /**
+ * 订单配送
+ *
+ * @param deliverDTO 订单ID
+ * @return 配送完成
+ */
+ @PostMapping("/shopFlower/finishDeliverOrder")
+ R finishDeliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO);
+
+ /**
+ * 获取当前商铺周围的自提点信息以及距离手机距离
+ *
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/convenient/point/findPointByMerchantId")
+ R findPointByMerchantId(@RequestParam("merchantId") Long merchantId, @RequestParam("lat") String lat, @RequestParam("lng") String lng);
+
+ /**
+ * 保存评价
+ * @param comShopFlowerEvaluateDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/saveEvaluate")
+ R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO);
+
+ /**
+ * 分页查询评价
+ * @param pageComShopFlowerEvaluateDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageEvaluate")
+ R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO);
+
+ /**
+ * 评价详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/shopFlower/detailEvaluate")
+ R detailEvaluate(@RequestParam("id") Long id);
+
+ /**
+ * 删除评价
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/shopFlower/deleteEvaluate")
+ R deleteEvaluate(@RequestParam("id") Long id);
+
+ /**
+ * 取货码
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "取货码")
+ @GetMapping("/shopFlower/getQRCode")
+ R getQRCode(@RequestParam("id") Long id);
+
+ /**
+ * 保存配送单
+ * @param comShopFlowerOrderDeliveryDTO
+ */
+ @PostMapping("/shopFlower/saveDelivery")
+ R saveDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);
+
+ /**
+ * 更新配送单
+ * @param comShopFlowerOrderDeliveryDTO
+ */
+ @PostMapping("/shopFlower/updateDelivery")
+ R updateDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);
+
+ /**
+ * 已配送、已送达 分页查询
+ * @param pageComFlowerOrderDeliveryDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageDelivery")
+ R pageDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);
+
+ /**
+ * 未配送 分页查询
+ * @param pageComFlowerOrderDeliveryDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageNoDelivery")
+ R pageNoDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);
+
+ /**
+ * 未配送-开始配送-订单列表
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageNoDeliveryOrderList")
+ R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);
+
+ /**
+ * 根据商家id查询商家的订单
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageOrderByStoreId")
+ R pageOrderByStoreId(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);
+
+ /**
+ * 微信支付订单回调
+ *
+ * @param wxPayNotifyOrderDTO
+ * 订单支付回调参数
+ */
+ @PostMapping("/shopFlower/wxOrderPayNotify")
+ void wxOrderPayNotifyFlower(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO);
+
+ /**
+ * 点击去支付订单
+ *
+ * @param orderPayDTO
+ * 请求参数
+ * @return 支付对象
+ */
+ @PostMapping("/shopFlower/wxPay")
+ R wxPayFlower(@RequestBody OrderPayDTO orderPayDTO);
+
+ /**
+ * 获取社区动态置顶banner
+ * @param communityId 社区id
+ * */
+ @PostMapping("/easyphoto/getUserRewardsNew")
+ R getUserRewardsNew(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 统计查询订单数量
+ * @param deliveryType
+ * @param userId
+ * @return
+ */
+ @GetMapping("/shopFlower/selectCountByDeliveryType")
+ R selectCountByDeliveryType(@RequestParam("deliveryType") Integer deliveryType,@RequestParam("userId") Long userId);
+
+ /**
+ * 查询我的店铺各类统计数据
+ * @param userId
+ * @return
+ */
+ @GetMapping("/shopFlower/selectCountByUserId")
+ R selectCountByUserId(@RequestParam("userId") Long userId);
+
+
+ /**
+ * 创建退款订单
+ * @param comShopFlowerRefundOrderDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/createRefundOrder")
+ R createRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO);
+
+ /**
+ * 分页查询
+ * @param pageComOrderRefundDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageRefundOrder")
+ R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO);
+
+ /**
+ * 修改退款订单
+ * @param comShopFlowerRefundOrderDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/updateRefundOrder")
+ R updateRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO);
+
+
+ /**
+ * 商家后台-退款申请统计
+ * @param storeId
+ * @return
+ */
+ @GetMapping("/shopFlower/selectCountGroupStatus")
+ R selectCountGroupStatus(@RequestParam("storeId") Long storeId);
+
+ /**
+ * 新增商品浏览量
+ * @param goodsId
+ * @return
+ */
+ @GetMapping("/shopFlower/incrGoodsView")
+ R incrGoodsView(@RequestParam("goodsId") Long goodsId);
+
+ /**
+ * 出入账分页
+ * @param pageComShopFlowerOrderPayDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageOrderPay")
+ R pageOrderPay(@RequestBody PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO);
+
+ /**
+ * 获取商家的营业额和可结算金额
+ * @param storeId
+ * @return
+ */
+ @GetMapping("/shopFlower/getQuota")
+ R getQuota(@RequestParam("storeId") Long storeId);
+
+ /**
+ * 取消退款
+ * @param id
+ * @return
+ */
+ @GetMapping("/shopFlower/refundOrderCancel")
+ R refundOrderCancel(@RequestParam("id") Long id);
+
+ /**
+ * 退款订单详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/shopFlower/refundOrderDetail")
+ R refundOrderDetail(@RequestParam("id") Long id);
+
+ /**
+ * 清点商品 确认送达详情
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageOrderByDeliveryNo")
+ R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);
+
+ /**
+ * 商家后台经营数据统计-上
+ * @param storeId
+ * @return
+ */
+ @GetMapping("/shopFlower/selectSumOrderAndAmountByStoreId")
+ R selectSumOrderAndAmountByStoreId(@RequestParam("storeId") Long storeId);
+
+ /**
+ * 统计时间区域的订单量 15天 30天 一年
+ * @param storeId
+ * @param type
+ * @return
+ */
+ @GetMapping("/shopFlower/selectOrderLineChart") R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type") Integer type,@RequestParam("tab") Integer tab);
+
+ /**
+ * 统计上架的上下架商品数量
+ * @param userId
+ * @return
+ */
+ @GetMapping("/shopFlower/countSaleByUserId")
+ R countSaleByUserId(@RequestParam("userId") Long userId);
+
+ /**
+ * 查询统计基础数据
+ * @return
+ */
+ @GetMapping("/selectBasicData")
+ R selectBasicData();
+
+ /**
+ * 统计在职干部特长
+ * @return
+ */
+ @GetMapping("/statisticsPbMemberType")
+ R statisticsPbMemberType();
+
+
+ /**
+ * 统计单位
+ * @return
+ */
+ @GetMapping("/selectUnitByNatureName")
+ R selectUnitByNatureName();
+
+ /**
+ * 大屏-社区活动分页
+ * @return
+ */
+ @PostMapping("pageActivityBigScreen")
+ R pageActivityBigScreen(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 疫情防控 健康码统计
+ * @return
+ */
+ @GetMapping("/comActAcidRecord/selectColorMarkGroup")
+ R selectColorMarkGroup();
+
+
+ @GetMapping("easyphoto/selectStatisticsPhoto")
+ R selectStatisticsPhoto();
+
+ /**
+ * 获取商家周围 n(km)的自提点数量
+ *
+ * @param distance
+ * @return
+ */
+ @GetMapping("/convenient/point/findPointNumByDistance")
+ R findPointNumByDistance(@RequestParam("distance") Integer distance, @RequestParam("lat") String lat, @RequestParam("lng") String lng);
+
+
+ /**
+ * 普达大屏-自治动态
+ * */
+ @GetMapping("/pudaScreen/autonomyDynamic")
+ R autonomyDynamic();
+
+ /**
+ * 普达大屏-红色物业
+ * */
+ @GetMapping("/pudaScreen/propertyDynamic")
+ R propertyDynamic();
+
+ /**
+ * 普达大屏-党建数据
+ **/
+ @GetMapping("/pudaScreen/partyData")
+ R partyData();
+
+ /**
+ *
+ * 普达大屏-居民信息
+ * */
+ @GetMapping("/pudaScreen/peopleInfo")
+ R peopleInfo();
+
+
+ /**
+ * 普达大屏-小区院落
+ * */
+ @GetMapping("/pudaScreen/countryard")
+ R countryard();
+
+ /**
+ * 普达大屏-基础数据
+ * */
+ @GetMapping("/pudaScreen/basicData")
+ R basicData();
+
+ /**
+ * 普达大屏-特殊人群
+ * */
+ @GetMapping("/pudaScreen/specialPeople")
+ R specialPeople();
+
+
+
+ /**
+ * 通过洗车订单查询银联订单
+ *
+ * @return
+ */
+ @GetMapping("/unionpay/detail")
+ R queryById(@RequestParam("Id") String id);
+
+
+ /**
+ * 通过银联订单查询洗车订单
+ *
+ * @return
+ */
+ @GetMapping("/unionpay/unionpayDetail")
+ R carWashById(@RequestParam("Id") String id);
+
+ /**
+ * 新增洗车订单和银联订单关系
+ * @param carWashId
+ * @param unionpayOrderId
+ * @param money
+ * @return
+ */
+ @PostMapping("/unionpay/add")
+ int add(@RequestParam("carWashId") String carWashId,
+ @RequestParam("unionpayOrderId") String unionpayOrderId,
+ @RequestParam("money") String money);
+
+
+
+
+
+
+ /*********************************************************************************************************
+ *
+ *
+ * 最美志愿者
+ *
+ *
+ * *********************************************************************************************************/
+ @GetMapping("/MostBeautifu/queryById")
+ public R queryById2(@RequestParam("id") String Id);
+
+
+ /**
+ * 分页查询
+ * @param name
+ * @param unmountType
+ * @return
+ */
+ @GetMapping("/MostBeautifu/getqueryList")
+ public R queryList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize")int pageSize,
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "unmountType", required = false) String unmountType);
+
+
+
+ /**
+ * 新增
+ * @param mostBeautifulVolunteerVO
+ * @return
+ */
+ @PostMapping("/MostBeautifu/addMostBeautiful")
+ public R insertMostBeautifulVolunteer(@RequestBody MostBeautifulVolunteerVO mostBeautifulVolunteerVO);
+
+
+ /**
+ * 更新
+ * @param mostBeautifulVolunteerVO
+ * @return
+ */
+ @PostMapping("/MostBeautifu/upMostBeautiful")
+ public R updateById(@RequestBody MostBeautifulVolunteerVO mostBeautifulVolunteerVO);
+
+
+ /**
+ * 删除
+ * @param Id
+ * @return
+ */
+ @DeleteMapping("/MostBeautifu/delectVuId")
+ public R deleteById(@RequestParam("id") String Id);
+
+
+ /********************************************************************************************************************
+ *
+ *
+ * 志愿者活动
+ *
+ *
+ *******************************************************************************************************************/
+ /**
+ * 获取单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("Volunteer/queryById")
+ R volunteerQueryById(@RequestParam("id") String id);
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("Volunteer/queryList")
+ R volunteerQueryList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "acState", required = false) String acState,
+ @RequestParam(value = "acType", required = false) String acType,
+ @RequestParam(value = "actityBeginTime", required = false) Date actityBeginTime,
+ @RequestParam(value = "actityEndTime", required = false) Date actityEndTime);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("Volunteer/insertVolunteer")
+ R insertVolunteer(@RequestBody VolunteerActivityVO volunteerActivityVO);
+
+
+ @PostMapping("Volunteer/updateById")
+ R volunteerUpdateById(@RequestBody VolunteerActivityVO volunteerActivityVO);
+
+
+ @DeleteMapping("Volunteer/deleteById")
+ R volunteerDeleteById(@RequestParam("id") String id);
+
+
+
+ /**
+ * 定时刷新活动状态
+ * @return
+ */
+ @GetMapping("/Volunteer/timedTaskVolunteerActivitiesJobHandler")
+ public R timedTaskVolunteerActivitiesJobHandler();
+
+
+ /*******************************************************************************************************************
+ *
+ *
+ * 志愿者活动类型
+ *
+ *
+ *******************************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerType/volunteerTypeGetList")
+ public R volunteerTypeGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("type") String type);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerType/insertvolunteerType")
+ public R insertvolunteerType(@RequestBody VolunteerTypeVO volunteerTypeVO);
+
+ /**
+ * 更新
+ * @param volunteerTypeVO
+ * @return
+ */
+ @PostMapping("/VolunteerType/volunteerTypeUpdate")
+ public R volunteerTypeUpdate(@RequestBody VolunteerTypeVO volunteerTypeVO);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/VolunteerType/volunteerTypeDelete")
+ public R volunteerTypeDelete(@RequestParam("id") String id);
+
+ /*****************************************************************************************************************
+ *
+ *
+ * 志愿者参加活动
+ *
+ *
+ ****************************************************************************************************************/
+ /**
+ * 志愿者单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerActivitiesPeople/vapGetById")
+ public R vapGetById(@RequestParam("id") String id);
+
+ /**
+ * 参与人员列表
+ * @param activityId
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/VolunteerActivitiesPeople/vapGetList")
+ public R vapGetList(@RequestParam("activityId") String activityId,
+ @RequestParam("communityId") String communityId);
+
+ /**
+ * 添加参与人员
+ * @param volunteerActivitiesPeopleVO
+ * @return
+ */
+ @PostMapping("/VolunteerActivitiesPeople/vapInsert")
+ public R vapInsert(@RequestBody VolunteerActivitiesPeopleVO volunteerActivitiesPeopleVO);
+
+ /**
+ * 修改参与人员
+ * @param volunteerActivitiesPeopleVO
+ * @return
+ */
+ @PostMapping("/VolunteerActivitiesPeople/vapUpdate")
+ public R vapUpdate(@RequestBody VolunteerActivitiesPeopleVO volunteerActivitiesPeopleVO);
+
+ /**
+ * 删除参与人员
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/VolunteerActivitiesPeople/vapDelete")
+ public R vapDelete(@RequestParam("id") String id);
+
+
+ /**
+ * 志愿者活动 奖励发放
+ * @param grantIntegral
+ * @return
+ */
+ @PostMapping("/VolunteerActivitiesPeople/grantIntegral")
+ public R grantIntegral(@RequestBody GrantIntegral grantIntegral);
+
+ /**************************************************************************************************************
+ *
+ *
+ * 积分明细记录
+ *
+ *****************************************************************************************************************/
+ /**
+ * 获取单个详情
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralRecord/getId")
+ public R VolunteerIntegralRecordGetId(@RequestParam("id") String id);
+
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralRecord/getList")
+ public R VolunteerIntegralRecordGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("userId") String userId);
+
+ /**
+ * 新增
+ *
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralRecord/insertVolunteer")
+ public R VolunteerIntegralRecordInsertVolunteer(@RequestBody() VolunteerIntegralRecordVO volunteerIntegralRecordVO);
+
+ /**
+ * 便捷
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralRecord/updateId")
+ public R VolunteerIntegralRecordUpdateId(@RequestBody() VolunteerIntegralRecordVO volunteerIntegralRecordVO);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/VolunteerIntegralRecord/deleteId")
+ public R VolunteerIntegralRecordDeleteId(@RequestParam("id") String id);
+
+ /*************************************************************************************************************
+ *
+ *
+ * 路北社区积分商城
+ *
+ *
+ ****************************************************************************************************************/
+
+ /**
+ * 获取单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/queryById")
+ public R VolunteerIntegralMerchantQueryById(@RequestParam("id") String id);
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/queryList")
+ public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "state", required = false) String state,
+ @RequestParam(value = "goodType", required = false) String goodType,
+ @RequestParam(value = "merchantId", required = false) String merchantId);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralMerchant/insertVolunteer")
+ public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO);
+
+ @PostMapping("/VolunteerIntegralMerchant/updateById")
+ public R VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO);
+
+
+ @PostMapping("/VolunteerIntegralMerchant/unmount")
+ public R VolunteerIntegralMerchantUnmount(@RequestBody VolunteerIntegralMerchantVO vimVO);
+
+ @DeleteMapping("/VolunteerIntegralMerchant/deleteById")
+ public R VolunteerIntegralMerchantDeleteById(@RequestParam("id") String id);
+
+
+ /***********************************************************************************************************
+ *
+ *
+ * 订单兑换
+ *
+ *
+ ***********************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/order/getList")
+ public R getList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "goodsId", required = false) String goodsId,
+ @RequestParam(value = "orderNumber", required = false) String orderNumber,
+ @RequestParam(value = "goodsName", required = false) String goodsName,
+ @RequestParam(value = "condition", required = false) String condition,
+ @RequestParam(value = "userName", required = false) String userName,
+ @RequestParam(value = "communityId", required = false) String communityId,
+ @RequestParam(value = "userId", required = false) String userId,
+ @RequestParam(value = "orderType", required = false) String orderType,
+ @RequestParam(value = "merchantId", required = false) String merchantId);
+
+ /**
+ * 查询详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/order/getData")
+ public R getData(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralMerchant/order/insertData")
+ public R insertData(@RequestBody VolunteerCreditsExchangeVO item);
+
+ /**
+ * 新增用户购买商家商品记录
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralMerchant/order/insertMerchantData")
+ public R insertMerchantData(@RequestBody VolunteerCreditsExchangeVO item);
+
+ /**
+ * 更新
+ * @param item
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralMerchant/order/update")
+ public R update(@RequestBody VolunteerCreditsExchangeVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/VolunteerIntegralMerchant/order/delete")
+ public R delete(@RequestParam("id") String id);
+
+ /**
+ * 核销
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/order/conditionData")
+ public R conditionData(@RequestParam("id") String id);
+
+ /*****************************************************************************************************************
+ *
+ *
+ * 路北社区商家管理
+ *
+ *
+ *****************************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/getList")
+ public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "merchantState", required = false) String merchantState,
+ @RequestParam(value = "merchantType", required = false) String merchantType,
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "communityId", required = false) String communityId);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/insert")
+ public R insertVolunteerMerchant(@RequestBody VolunteerMerchantVO vtvo);
+
+
+ @PostMapping("/VolunteerMerchant/update")
+ public R updateVolunteerMerchant(@RequestBody VolunteerMerchantVO vtvo);
+
+
+ @DeleteMapping("/VolunteerMerchant/delete")
+ public R deleteVolunteerMerchant(@RequestParam("id") String id);
+
+ @GetMapping("/VolunteerMerchant/getUser")
+ public R volunteerMerchantGetUser(@RequestParam("communityId") String communityId,
+ @RequestParam(value = "userName", required = false) String userName,
+ @RequestParam(value = "userPhone", required = false)String userPhone);
+
+
+ @GetMapping("/VolunteerMerchant/getById")
+ public R volunteerMerchantGetById(@RequestParam("id") String id);
+
+ /**
+ * 是否是商家
+ * @param userId
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/isMerchant")
+ public R isMerchant(@RequestParam("userId") String userId);
+
+
+ /**
+ * 社区取消订单
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/order/communityCancellation")
+ public R communityCancellation(@RequestParam("id") String id);
+
+
+
+
+
+ /****************************************************************************************************************
+ *
+ * 商家评论
+ *
+ ***************************************************************************************************************/
+
+ /**
+ * 商家评论分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/evaluate/getList")
+ public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("communityId") String communityId,
+ @RequestParam("merchantId") String merchantId);
+
+ /**
+ * 商家评论获取详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/evaluate/getData")
+ public R volunteerMerchantGetData(@RequestParam("id") String id);
+
+ /**
+ * 商家评论新增评价
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/evaluate/insert")
+ public R volunteerMerchantInsert(@RequestBody VolunteerMerchantEvaluateVO item);
+
+ /**
+ * 商家评论更新评价
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/evaluate/update")
+ public R volunteerMerchantUpdate(@RequestBody VolunteerMerchantEvaluateVO item);
+
+
+ /**
+ * 商家评论删除评价
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/VolunteerMerchant/evaluate/delete")
+ public R volunteerMerchantDelete(@RequestParam("id") String id);
+
+
+
+ /***************************************************************************************************************
+ *
+ * 路北社区商家提现
+ *
+ ****************************************************************************************************************/
+
+ /**
+ * 商家提现列表啊
+ * @param disposeType
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/withdraw/getList")
+ public R WithdrawGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "disposeType", required = false) String disposeType,
+ @RequestParam(value = "merchantName", required = false) String merchantName,
+ @RequestParam(value = "merchantId", required = false) String merchantId,
+ @RequestParam(value = "communityId", required = false) String communityId);
+
+ /**
+ * 新增商家提现
+ * @param item
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/withdraw/insert")
+ public R WithdrawInsert(@RequestBody VolunteerMerchantWithdrawVO item);
+
+ /**
+ * 编辑商家提现
+ * @param item
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/withdraw/update")
+ public R WithdrawUpdate(@RequestBody VolunteerMerchantWithdrawVO item);
+
+ /**
+ * 删除商家提现
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/withdraw/delete")
+ public R WithdrawDelete(@RequestParam("id") String id);
+
+ /**
+ * 处理商家提现
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/withdraw/dispose")
+ public R WithdrawDispose(@RequestParam("id") String id);
+
+
+
+
+ /***************************************************************************************************************
+ *
+ * 路北社区系统配置 商家折扣 兑换地点信息
+ *
+ ****************************************************************************************************************/
+
+ /**
+ * 详情
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/Community/Config/getData")
+ public R ConfiggetData(@RequestParam("communityId") String communityId);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/Community/Config/insertvo")
+ public R Configinsertvo(@RequestBody VolunteerCommunityConfigVO item);
+
+
+
+ /*******************************************************************************************************************
+ *
+ *
+ * 社区折扣
+ *
+ *
+ ******************************************************************************************************************/
+
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/community/discount/getList")
+ public R CommunityDiscountgetList(@RequestParam("communityId") String communityId);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/community/discount/insert")
+ public R CommunityDiscountinsert(@RequestBody VolunteerCommunityDiscountVO item);
+
+
+ @PostMapping("/VolunteerMerchant/community/discount/update")
+ public R CommunityDiscountupdate(@RequestBody VolunteerCommunityDiscountVO item);
+
+
+ @DeleteMapping("/VolunteerMerchant/community/discount/delete")
+ public R CommunityDiscountdelete(@RequestParam("id") String id);
+
+
+
+
+ /**
+ * 报名/取消报名社区活动
+ * 金汇社区专用
+ * @param signactivityVO
+ * 报名参数
+ * @return 报名 取消报名 结果
+ */
+ @PostMapping("/jinhui/jinhuiSignActivity")
+ public R jinhuiSignActivity(@RequestBody SignactivityVO signactivityVO);
+
+
+
+ /**
+ * 用户签到
+ * 金汇社区专用
+ * @param comActActRegistVO 签到参数
+ * @return 签到结果
+ */
+ @PostMapping("/jinhui/jinhuiActivitySignIn")
+ public R jinhuiActivitySignIn(@RequestBody ComActActRegistVO comActActRegistVO);
+
+
+
+
+ @GetMapping("/integral/user/getIntegralUserRank")
+ public R getIntegralUserRank(@RequestParam("communityId") Long communityId,
+ @RequestParam("userId") Long userId);
+
+
+ @GetMapping("/largeScreen/panzhihuaMap")
+ public R panzhihuaMap(@RequestParam("areaCode")String areaCode);
+
+ @GetMapping("/largeScreen/oneTagThreeReal")
+ public R oneTagThreeReal(@RequestParam("streetId") Long streetId);
+
+ @PostMapping("/largeScreen/searchStreet")
+ public R searchStreet(@RequestBody BuildingDto buildingDto);
+
+ @PostMapping("/largeScreen/huachengDyn")
+ public R huachengDyn(@RequestBody ComActDynVO comActDynVO);
+
+ @GetMapping("/largeScreen/getScreenStatics")
+ public R getScreenStatics();
+
+ @GetMapping("/largeScreen/populationStatics")
+ public R populationStatics(@RequestParam("streetId") Long streetId);
+
+ @GetMapping("/largeScreen/probably")
+ public R probably(@RequestParam("year") Integer year,@RequestParam("belongTo") String belongTo);
+ /**
+ * 查询 一标三实 数据
+ */
+ @GetMapping("/largeScreen/sumAreaStreet")
+ R<SumAreaStreetResp> sumAreaStreet();
+
+
+ /**
+ * 下拉 明细
+ */
+ @GetMapping(("/largeScreen/areaStreetDetail"))
+ R<AreaStreetDetail> areaStreetDetail(@RequestParam("code") String code,
+ @RequestParam("type") String type);
+
+ @GetMapping("/largeScreen/qryReport")
+ R<List<QryReportResp>> qryReport(@RequestParam(value = "yearTime",required = false) String yearTime);
+
+
+ /*****************************************************************************************************************
+ *
+ * 社区宣传
+ *
+ ******************************************************************************************************************/
+ @GetMapping("/sys/conf/getCommunityPublicityData")
+ public R getCommunityPublicityData(@RequestParam("communityId") String communityId);
+
+ @PostMapping("/sys/conf/addCommunityPublicityDate")
+ public R addCommunityPublicityDate(@RequestBody CommunityPublicityVO item);
+
+ @PostMapping("/sys/conf/editCommunityPublicityDate")
+ public R editCommunityPublicityDate(@RequestBody CommunityPublicityVO item);
+
+ @DeleteMapping("/sys/conf/deleteCommunityPublicityData")
+ public R deleteCommunityPublicityData(@RequestParam("communityId") String communityId);
+
+
+
+ /**
+ * 社区活动自动定时更新用户未签退时间
+ * @return
+ */
+ @GetMapping("/comActAcidRecord/comActActRegistUpdateEndTime")
+ public R comActActRegistUpdateEndTime();
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityUnionService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityUnionService.java
new file mode 100644
index 0000000..33fd506
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityUnionService.java
@@ -0,0 +1,297 @@
+package com.panzhihua.common.service.community;
+
+import com.panzhihua.common.model.dtos.equipment.*;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.ResultData;
+import com.panzhihua.common.model.vos.union.StructuredVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 川工之家
+ */
+@FeignClient(name = "equipment")
+public interface CommunityUnionService
+{
+
+ /**
+ * 新闻基本面,技术面相关接口
+ * @param structureds
+ * @return
+ */
+ @PostMapping("/roomck-web/roomck/ivsCommomEventController")
+ public ResultData ivsCommomEventController(@RequestBody List<StructuredVO> structureds);
+
+
+ /**
+ * 新增户外劳工站巡查
+ *
+ * @param unionInspectionDto
+ * @return 新增结果
+ */
+ @PostMapping("/unionInspection/add")
+ public R add(@RequestBody UnionInspectionDto unionInspectionDto);
+
+
+ /**
+ * 分页户外劳工站巡查
+ *
+ * @param unionInspectionDto
+ * @return 动态结果
+ */
+ @PostMapping("/unionInspection/query")
+ public R query(@RequestBody UnionInspectionDto unionInspectionDto);
+
+
+ /**
+ * 分页总工会-户外劳工站-动态
+ *
+ * @param unionOutdoorLaborDynamicDto
+ * @return 动态结果
+ */
+ @PostMapping("/unionOutdoorLaborDynamic/page")
+ R unionOutdoorLaborDynamicQuery(@RequestBody UnionOutdoorLaborDynamicDto unionOutdoorLaborDynamicDto);
+
+ /**
+ * 查询总工会-户外劳工站-动态
+ *
+ * @param id
+ * 动态 id
+ * @return 查找结果
+ */
+ @GetMapping("/unionOutdoorLaborDynamic/{id}")
+ R unionOutdoorLaborDynamicDetail(@PathVariable("id") Long id) ;
+
+
+
+ /**
+ * 分页总工会户外劳工站
+ *
+ * @param unionOutdoorSiteDto
+ * @return 动态结果
+ */
+ @PostMapping("/unionOutdoorSite/page")
+ R unionOutdoorSitequery(@RequestBody UnionOutdoorSiteDto unionOutdoorSiteDto);
+
+ /**
+ * 查询总工会户外劳工站
+ *
+ * @param id
+ * 户外劳工站 id
+ * @return 查找结果
+ */
+ @GetMapping("/unionOutdoorSite/{id}")
+ R unionOutdoorSiteDetail(@PathVariable("id") Long id);
+
+
+
+
+
+ /**
+ * 户外劳工站上报表
+ *
+ * @param unionReportDto
+ * @return 新增结果
+ */
+ @PostMapping("/unionReport/add")
+ public R unionReportAdd(@RequestBody UnionReportDto unionReportDto);
+
+ /**
+ * 分页户外劳工站上报表
+ *
+ * @param unionReportDto
+ * @return 动态结果
+ */
+ @PostMapping("/unionReport/query")
+ public R unionReportQuery(@RequestBody UnionReportDto unionReportDto);
+
+
+
+
+
+ /**
+ * 总工会户外劳登录
+ *
+ * @param loginUserInfoVO
+ * @return 总工会户外劳共用户
+ */
+ @PostMapping("/unionUser/login")
+ public R unionUserLogin(@RequestBody LoginUserInfoVO loginUserInfoVO);
+
+
+
+ /**
+ * 登录（H5）
+ *
+ * @param phone
+ * @return 总工会户外劳共用户
+ */
+ @GetMapping("/unionUser/loginH5")
+ R unionUserLoginH5(@RequestParam(value = "phone") String phone);
+
+ /**
+ * 总工会户外劳工站用户认证
+ *
+ * @param unionUserDto
+ * @return 总工会户外劳共用户
+ */
+ @PostMapping("/unionUser/authentication")
+ R unionUserAuthentication(@RequestBody UnionUserDto unionUserDto);
+
+ /**
+ * 用户开门
+ * @param qRCode 二维码字符串
+ * @return 总工会户外劳共用户
+ */
+ @GetMapping("/unionUser/openDoor")
+ R openDoor(@RequestParam(value = "qRCode") String qRCode);
+
+
+ /**
+ * 查询城市下属所有地区列表
+ *
+ * @param cityAdcode
+ * 城市地址编码
+ * @return 地区列表
+ */
+ @PostMapping("listareadistrict")
+ R listAreaDistrict(@RequestParam("cityAdcode") Long cityAdcode);
+
+
+ /******************************************************************************************************************
+ *
+ * 积分明细记录
+ *
+ ****************************************************************************************************************/
+
+ @GetMapping("/UnionIntegralRecord/getList")
+ public R unionIntegralRecordGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "communityId",required = false) String communityId,
+ @RequestParam(value = "integralType",required = false) String integralType,
+ @RequestParam(value = "nameOrNum",required = false) String nameOrNum);
+
+ @GetMapping("/UnionIntegralRecord/getData")
+ public R unionIntegralRecordGetData(@RequestParam("id") String id);
+
+ @PostMapping("/UnionIntegralRecord/insert")
+ public R unionIntegralRecordInsert(@RequestBody UnionIntegralRecordDto item);
+
+ @PostMapping("/UnionIntegralRecord/update")
+ public R unionIntegralRecordUpdate(@RequestBody UnionIntegralRecordDto item);
+
+ /**
+ * 删除接口
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/UnionIntegralRecord/delete")
+ public R unionIntegralRecordDelete(@RequestParam("id") String id);
+
+
+ /***************************************************************************************************************
+ *
+ *
+ * 积分总表
+ *
+ * *************************************************************************************************************/
+
+ @GetMapping("/UnionIntegralSummarize/getList")
+ public R unionIntegralSummarizeGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "communityId",required = false) String communityId);
+
+
+ @GetMapping("/UnionIntegralSummarize/getData")
+ public R unionIntegralSummarizeGetData(@RequestParam("id") String id);
+
+
+ @GetMapping("/UnionIntegralSummarize/getUserData")
+ public R unionIntegralSummarizeGetUserData();
+
+ @PostMapping("/UnionIntegralSummarize/insert")
+ public R unionIntegralSummarizeInsert(@RequestBody UnionIntegralSummarizeDto item);
+
+ @PostMapping("/UnionIntegralSummarize/update")
+ public R unionIntegralSummarizeUpdate(@RequestBody UnionIntegralSummarizeDto item);
+
+ /**
+ * 删除接口
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/UnionIntegralSummarize/delete")
+ public R unionIntegralSummarizeDelete(@RequestParam("id") String id);
+
+
+ /*******************************************************************************************************************
+ *
+ *
+ * 兑换记录
+ *
+ *
+ ******************************************************************************************************************/
+
+
+ @GetMapping("/UnionExchangeRecord/getList")
+ public R unionExchangeRecordGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "communityId",required = false) String communityId,
+ @RequestParam(value = "orderType",required = false) String orderType);
+
+
+ @GetMapping("/UnionExchangeRecord/getData")
+ public R unionExchangeRecordGetData(@RequestParam("id") String id);
+
+ @PostMapping("/UnionExchangeRecord/insert")
+ public R unionExchangeRecordInsert(@RequestBody UnionExchangeRecordDto item);
+
+ @PostMapping("/UnionExchangeRecord/update")
+ public R unionExchangeRecordUpdate(@RequestBody UnionExchangeRecordDto item);
+
+ /**
+ * 删除接口
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/UnionExchangeRecord/delete")
+ public R unionExchangeRecordDelete(@RequestParam("id") String id);
+
+ /**********************************************************************************************************
+ *
+ *
+ * 收货地址
+ *
+ *
+ ************************************************************************************************************/
+
+ @GetMapping("/UnionShippingAddress/getList")
+ public R unionShippingAddressGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "communityId",required = false) String communityId);
+
+
+ @GetMapping("/UnionShippingAddress/getData")
+ public R unionShippingAddressGetData(@RequestParam("id") String id);
+
+
+ @GetMapping("/UnionShippingAddress/getDefaultData")
+ public R unionShippingAddressGetDefaultData();
+
+ @PostMapping("/UnionShippingAddress/insert")
+ public R unionShippingAddressInsert(@RequestBody UnionShippingAddressDto item);
+
+ @PostMapping("/UnionShippingAddress/update")
+ public R unionShippingAddressUpdate(@RequestBody UnionShippingAddressDto item);
+
+ /**
+ * 删除接口
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/UnionShippingAddress/delete")
+ public R unionShippingAddressDelete(@RequestParam("id") String id);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityWestService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityWestService.java
new file mode 100644
index 0000000..7bb5a12
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityWestService.java
@@ -0,0 +1,9858 @@
+package com.panzhihua.common.service.community;
+
+import java.util.List;
+
+import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
+import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
+import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
+import com.panzhihua.common.model.dtos.community.enterprise.*;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
+import com.panzhihua.common.model.dtos.PageDTO;
+import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
+import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
+import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerAddDTO;
+import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerDeleteDTO;
+import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerEditDTO;
+import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerExcelVO;
+import com.panzhihua.common.model.dtos.civil.PageComActSocialWorkerDTO;
+import com.panzhihua.common.model.dtos.common.AddComMngVolunteerOrgTeamDto;
+import com.panzhihua.common.model.dtos.common.AddComMngVolunteerServiceTypeDto;
+import com.panzhihua.common.model.dtos.common.AddComMngVolunteerSkillDto;
+import com.panzhihua.common.model.dtos.common.EditComActEasyPhotoHandlerDto;
+import com.panzhihua.common.model.dtos.common.EditComMngVolunteerOrgTeamDto;
+import com.panzhihua.common.model.dtos.common.EditComMngVolunteerServiceTypeDto;
+import com.panzhihua.common.model.dtos.common.EditComMngVolunteerSkillDto;
+import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoHandlerDto;
+import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
+import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
+import com.panzhihua.common.model.dtos.common.PageComMngVolunteerSkillDto;
+import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
+import com.panzhihua.common.model.dtos.community.AddIdentityAuthDTO;
+import com.panzhihua.common.model.dtos.community.CancelRecordDTO;
+import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
+import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO;
+import com.panzhihua.common.model.dtos.community.ComActDiscussCommentUserDTO;
+import com.panzhihua.common.model.dtos.community.ComActDiscussDTO;
+import com.panzhihua.common.model.dtos.community.ComActDiscussOptionUserDTO;
+import com.panzhihua.common.model.dtos.community.ComActDiscussUserDTO;
+import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
+import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
+import com.panzhihua.common.model.dtos.community.ComCvtBusinessDTO;
+import com.panzhihua.common.model.dtos.community.ComCvtCategoryDTO;
+import com.panzhihua.common.model.dtos.community.ComCvtServeDTO;
+import com.panzhihua.common.model.dtos.community.ComExServicemanDTO;
+import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO;
+import com.panzhihua.common.model.dtos.community.ComMngCarSaveDTO;
+import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
+import com.panzhihua.common.model.dtos.community.ComMngPopulationEditDTO;
+import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
+import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO;
+import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseInsertAdminDTO;
+import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseUserVO;
+import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
+import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO;
+import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
+import com.panzhihua.common.model.dtos.community.ComPropertyPublicityDTO;
+import com.panzhihua.common.model.dtos.community.ComSwDangerReportEditDTO;
+import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO;
+import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
+import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
+import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordEditDTO;
+import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
+import com.panzhihua.common.model.dtos.community.ComSwRotaPageDTO;
+import com.panzhihua.common.model.dtos.community.ComSwRotaSaveDTO;
+import com.panzhihua.common.model.dtos.community.ComSwSafetyWorkEditDTO;
+import com.panzhihua.common.model.dtos.community.DisabledPersonsDTO;
+import com.panzhihua.common.model.dtos.community.EditComActDynTypeDTO;
+import com.panzhihua.common.model.dtos.community.EldersAuthAddByFamilyDTO;
+import com.panzhihua.common.model.dtos.community.EldersAuthAddDTO;
+import com.panzhihua.common.model.dtos.community.EldersAuthDeleteDTO;
+import com.panzhihua.common.model.dtos.community.EldersAuthEditDTO;
+import com.panzhihua.common.model.dtos.community.EldersAuthElderlyDTO;
+import com.panzhihua.common.model.dtos.community.EldersAuthFeedbackAddDTO;
+import com.panzhihua.common.model.dtos.community.EldersAuthTypeQueryDTO;
+import com.panzhihua.common.model.dtos.community.ExportComMngCarExcelDTO;
+import com.panzhihua.common.model.dtos.community.ExportRealAssetsExcelDTO;
+import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO;
+import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
+import com.panzhihua.common.model.dtos.community.GrantRewardDTO;
+import com.panzhihua.common.model.dtos.community.KeyPersonInfoDTO;
+import com.panzhihua.common.model.dtos.community.OperationDetailDTO;
+import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
+import com.panzhihua.common.model.dtos.community.PageComActDTO;
+import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO;
+import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO;
+import com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO;
+import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO;
+import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
+import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
+import com.panzhihua.common.model.dtos.community.PageComCvtCategoryDTO;
+import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO;
+import com.panzhihua.common.model.dtos.community.PageComEldersRecordsDTO;
+import com.panzhihua.common.model.dtos.community.PageComMngCarDTO;
+import com.panzhihua.common.model.dtos.community.PageComMngRealAssetsDTO;
+import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO;
+import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
+import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
+import com.panzhihua.common.model.dtos.community.PageComPropertyPublicityDTO;
+import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
+import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO;
+import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
+import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO;
+import com.panzhihua.common.model.dtos.community.PageEldersAuthHistoryDTO;
+import com.panzhihua.common.model.dtos.community.PageEldersAuthRecordDTO;
+import com.panzhihua.common.model.dtos.community.PageIdentityAuthRecordDTO;
+import com.panzhihua.common.model.dtos.community.PageQuestnaireAnswerDTO;
+import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
+import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO;
+import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
+import com.panzhihua.common.model.dtos.community.building.admin.AddBuildingHouseDto;
+import com.panzhihua.common.model.dtos.community.building.admin.AddBuildingUnitDto;
+import com.panzhihua.common.model.dtos.community.building.admin.DeleteBuildingHousePopulationDto;
+import com.panzhihua.common.model.dtos.community.building.admin.EditBuildingHouseDto;
+import com.panzhihua.common.model.dtos.community.building.admin.EditBuildingUnitDto;
+import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingListDto;
+import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingUnitHouseListDto;
+import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
+import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterAdminDto;
+import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterMemberAdminDto;
+import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterAdminDto;
+import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterMemberAdminDto;
+import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterAdminDto;
+import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterMemberAdminDto;
+import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductCategoryDTO;
+import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductDTO;
+import com.panzhihua.common.model.dtos.community.convenient.ConvenientServiceCategoryDTO;
+import com.panzhihua.common.model.dtos.community.convenient.DeleteConvenientProductDTO;
+import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.ExportMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.OnShelfOrOffShelfProductDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductCategoryDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageConvenientServiceCategoryDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO;
+import com.panzhihua.common.model.dtos.community.convenient.ResetPasswordConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoActivityDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO;
+import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
+import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.community.fms.AddFmsClassroomAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.AddFmsServiceAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.AddTeamDTO;
+import com.panzhihua.common.model.dtos.community.fms.AddTeamMemberDTO;
+import com.panzhihua.common.model.dtos.community.fms.AddTeamTypeDTO;
+import com.panzhihua.common.model.dtos.community.fms.ApplyFmsServiceDTO;
+import com.panzhihua.common.model.dtos.community.fms.ApprovalFmsServiceAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.DeleteTeamMemberDTO;
+import com.panzhihua.common.model.dtos.community.fms.EditFmsClassroomAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.EditTeamDTO;
+import com.panzhihua.common.model.dtos.community.fms.EditTeamMemberDTO;
+import com.panzhihua.common.model.dtos.community.fms.EditTeamTypeDTO;
+import com.panzhihua.common.model.dtos.community.fms.EvaluationFmsServiceDTO;
+import com.panzhihua.common.model.dtos.community.fms.FeedbackFmsServiceDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsClassroomAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsEventAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAppletsDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsTeamDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageTeamMemberDTO;
+import com.panzhihua.common.model.dtos.community.integral.ComActIntegralCommunityRankDTO;
+import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
+import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO;
+import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO;
+import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.DeleteProductDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.DisableOrEnableMcsMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsEvaluateDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsInfoDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsProductDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageJoinGameListDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsEvaluateDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsInformationDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsProductDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageVerifyRecordDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PutUserInfoDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetPopularForGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForInfoDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForProductDTO;
+import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.NearbyDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHouseRegisterDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHousesConfigDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.ReleaseOrCancelHouseDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHouseRegisterDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHousesConfigDTO;
+import com.panzhihua.common.model.dtos.community.reserve.AddReserveAdminDTO;
+import com.panzhihua.common.model.dtos.community.reserve.CancelReserveRecordDTO;
+import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO;
+import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO;
+import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveInfoDTO;
+import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveStatusDTO;
+import com.panzhihua.common.model.dtos.community.reserve.EditReserveAdminDTO;
+import com.panzhihua.common.model.dtos.community.reserve.MakeHandleAdminDTO;
+import com.panzhihua.common.model.dtos.community.reserve.PageReserveAdminDTO;
+import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO;
+import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO;
+import com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO;
+import com.panzhihua.common.model.dtos.community.social.HatchAuditProcessDTO;
+import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
+import com.panzhihua.common.model.dtos.community.social.PageProjectSignListDTO;
+import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchAuditDTO;
+import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchDTO;
+import com.panzhihua.common.model.dtos.community.social.SocialOrgHatchAuditDTO;
+import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
+import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
+import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO;
+import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO;
+import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
+import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
+import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
+import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseDonatesDTO;
+import com.panzhihua.common.model.dtos.community.warehouse.ExportDonatesDTO;
+import com.panzhihua.common.model.dtos.community.warehouse.PageDonatesDTO;
+import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
+import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
+import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
+import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
+import com.panzhihua.common.model.dtos.grid.ComMngVillageListAppDTO;
+import com.panzhihua.common.model.dtos.grid.DelComMngHousePopulationDTO;
+import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
+import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO;
+import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationRelationHouseDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngVillageListExportAdminDTO;
+import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
+import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationHouseDTO;
+import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAdminDTO;
+import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborAddBrowseAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentReplyAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborFabulousAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborForwardAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborReplyAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
+import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopFundsExportDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderDeliverDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderExportDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderQueryDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderShipDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopSysConfDTO;
+import com.panzhihua.common.model.dtos.shop.OrderPayDTO;
+import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopAddressDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopFundsSearchDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopSysConfDTO;
+import com.panzhihua.common.model.dtos.shop.WxPayNotifyOrderDTO;
+import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesInoculationByAdminDTO;
+import com.panzhihua.common.model.vos.BcDictionaryItemVO;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.ComActSocialMemberVO;
+import com.panzhihua.common.model.vos.DictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
+import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
+import com.panzhihua.common.model.vos.community.ActivitySignVO;
+import com.panzhihua.common.model.vos.community.BatchhouseVO;
+import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
+import com.panzhihua.common.model.vos.community.ComActActRegistVO;
+import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
+import com.panzhihua.common.model.vos.community.ComActActivityVO;
+import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
+import com.panzhihua.common.model.vos.community.ComActColumnVO;
+import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
+import com.panzhihua.common.model.vos.community.ComActDynVO;
+import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
+import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
+import com.panzhihua.common.model.vos.community.ComActMessageBackVO;
+import com.panzhihua.common.model.vos.community.ComActMessageVO;
+import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
+import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
+import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
+import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
+import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
+import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
+import com.panzhihua.common.model.vos.community.ComElderAuthRecordImportExcelVO;
+import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO;
+import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
+import com.panzhihua.common.model.vos.community.ComMngBuildingExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationCorrectExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationCultExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationDisabilityExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationDrugExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationElderExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationKeyExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationLowSecurityExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationMajorExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationPensionExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationRehabilitationExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationSentenceExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationVeteransExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngRealAssetsExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngRealAssetsVO;
+import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngRealCompanyVO;
+import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
+import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
+import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO;
+import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngVillageVO;
+import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
+import com.panzhihua.common.model.vos.community.ComOpsHouseUndercarriageVO;
+import com.panzhihua.common.model.vos.community.ComOpsHouseVO;
+import com.panzhihua.common.model.vos.community.ComPensionAuthRecordImportExcelVO;
+import com.panzhihua.common.model.vos.community.ComPensionAuthRecordVO;
+import com.panzhihua.common.model.vos.community.ComPropertyVO;
+import com.panzhihua.common.model.vos.community.ComStreetVO;
+import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO;
+import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
+import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
+import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
+import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
+import com.panzhihua.common.model.vos.community.SignactivityVO;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
+import com.panzhihua.common.model.vos.community.bigscreen.PartyBuildingMemberVO;
+import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import com.panzhihua.common.model.vos.community.fms.ComFmsServiceImportExcelVO;
+import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportExcelVO;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsConfigVO;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsOrderVO;
+import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
+import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
+import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
+import com.panzhihua.common.model.vos.community.rentHouse.RentingHourseOrderVO;
+import com.panzhihua.common.model.vos.community.rentHouse.RentingHoursePreOrderVO;
+import com.panzhihua.common.model.vos.community.rentHouse.WxPayNotifyOrderVO;
+import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
+import com.panzhihua.common.model.vos.community.reserve.ComActReserveDetailAdminVO;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectScheduleVO;
+import com.panzhihua.common.model.vos.community.social.ComActSocialWorkerServiceVO;
+import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
+import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerExcelVO;
+import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyVO;
+import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseBaseVO;
+import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
+import com.panzhihua.common.model.vos.community.warehouse.WarehouseDonatesExcelVO;
+import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
+import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
+import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
+import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
+import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
+import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
+import com.panzhihua.common.model.vos.shop.ShopStoreVO;
+import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
+import com.panzhihua.common.model.vos.user.UserPhoneVO;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 社区
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-07 15:59
+ **/
+@FeignClient(name = "huacheng-community", contextId = "community1")
+public interface CommunityWestService {
+ /**
+ * 新增社区活动
+ *
+ * @param comActActivityVO
+ * 新增信息
+ * @return 新增结果
+ */
+ @PostMapping("/addactivity")
+ R addActivity(@RequestBody ComActActivityVO comActActivityVO);
+
+ /**
+ * 编辑社区活动
+ *
+ * @param comActActivityVO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("/putactivity")
+ R putActivity(@RequestBody ComActActivityVO comActActivityVO);
+
+ /**
+ * 删除社区活动
+ *
+ * @param comActActivityVO
+ * 活动主键
+ * @return 删除结果
+ */
+ @PostMapping("deleteactivity")
+ R deleteActivity(@RequestBody ComActActivityVO comActActivityVO);
+
+ /**
+ * 分页查询社区活动
+ *
+ * @param comActActivityVO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("pageactivity")
+ R pageActivity(@RequestBody ComActActivityVO comActActivityVO);
+
+ /**
+ * 发布活动
+ *
+ * @param comActActivityVO
+ * 主键id 发布时间
+ * @return 发布结果
+ */
+ @PostMapping("releaseactivity")
+ R releaseActivity(@RequestBody ComActActivityVO comActActivityVO);
+
+ /**
+ * 取消活动
+ *
+ * @param comActActivityVO
+ * 取消原因
+ * @return 取消结果
+ */
+ @PostMapping("cancelactivity")
+ R cancelActivity(@RequestBody ComActActivityVO comActActivityVO);
+
+ /**
+ * 活动详情
+ *
+ * @param id
+ * 活动id
+ * @param userId
+ * 当前登录者id
+ * @return 详情
+ */
+ @PostMapping("detailactivity")
+ R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId,@RequestParam(value = "pageNum", required = false) Long pageNum,@RequestParam(value = "pageSize", required = false) Long pageSize);
+
+ /**
+ * 分页活动报名名单
+ *
+ * @param activitySignVO
+ * 查询参数
+ * @return 报名人员集合
+ */
+ @PostMapping("listactivitysign")
+ R listActivitySign(@RequestBody ActivitySignVO activitySignVO);
+
+ /**
+ * description getSignLists 查询活动报名名单
+ * @param activitySignVO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/8/24 14:03
+ */
+ @PostMapping("/activity/sign/getList")
+ R getSignLists(@RequestBody ActivitySignVO activitySignVO);
+
+ /**
+ * description listActivityRegists 分页查询活动评价
+ * @param comActActEvaluateVO 活动评价vo
+ * @return R 分页查询结果
+ * @author txb
+ * @date 2021/8/24 14:03
+ */
+ @PostMapping("/activity/evaluate/page")
+ R pageActivityEvaluates(@RequestBody ComActActEvaluateVO comActActEvaluateVO);
+
+ /**
+ * description getEvaluateLists 查询活动评价
+ * @param comActActEvaluateVO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/8/24 14:03
+ */
+ @PostMapping("/activity/evaluate/getList")
+ R getEvaluateLists(@RequestBody ComActActEvaluateVO comActActEvaluateVO);
+
+ /**
+ * description pageActivityRegists 分页查询活动签到
+ * @param comActActRegistVO 活动签到vo
+ * @return R 分页查询结果
+ * @author txb
+ * @date 2021/8/24 14:03
+ */
+ @PostMapping("/activity/regist/page")
+ R pageActivityRegists(@RequestBody ComActActRegistVO comActActRegistVO);
+
+ /**
+ * description getRegistLists 查询活动签到
+ * @param comActActRegistVO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/8/25 9:33
+ */
+ @PostMapping("/activity/regist/getList")
+ R getRegistLists(@RequestBody ComActActRegistVO comActActRegistVO);
+
+ /**
+ * description getRegistLists 查询活动未签到
+ * @param comActActRegistVO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/8/25 9:33
+ */
+ @PostMapping("/activity/noRegist/getList")
+ R getNoRegistLists(@RequestBody ComActActRegistVO comActActRegistVO);
+
+ /**
+ * description activityStagistics 活动数据统计
+ * @param activityId 活动id
+ * @return R 统计结果
+ * @author txb
+ * @date 2021/8/25 13:33
+ */
+ @GetMapping("/activity/statistics")
+ R activityStatistics(@RequestParam("activityId") Long activityId);
+
+ /**
+ * 获取活动历史封面 getPictureList
+ * @param userId 用户id
+ * @return R 统计结果
+ * @author txb
+ * @date 2021/8/27 13:33
+ */
+ @GetMapping("/activity/picture/getList")
+ R getPictureList(@RequestParam("userId") Long userId);
+
+ /**
+ * 获取系统预置图库 getSysPictureList
+ * @return R 系统图库集
+ * @author txb
+ * @date 2021/8/27 13:33
+ */
+ @GetMapping("/activity/sysPicture/getList")
+ R getSysPictureList(@RequestParam("type")Integer type);
+
+ /**
+ * 活动报名名单
+ *
+ * @param activitySignVO
+ * 查询参数
+ * @return 报名人员集合
+ */
+ @PostMapping("listactivitysigns")
+ R listActivitySigns(@RequestBody ActivitySignVO activitySignVO);
+
+ /**
+ * 新增社区动态
+ *
+ * @param comActDynVO
+ * 新增信息
+ * @return 新增结果
+ */
+ @PostMapping("adddynamic")
+ R addDynamic(@RequestBody ComActDynVO comActDynVO);
+
+ /**
+ * 编辑社区动态
+ *
+ * @param comActDynVO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("putdynamic")
+ R putDynamic(@RequestBody ComActDynVO comActDynVO);
+
+ /**
+ * 删除社区动态
+ *
+ * @param comActDynVO
+ * 动态id
+ * @return 删除结果
+ */
+ @PostMapping("deletedynamic")
+ R deleteDynamic(@RequestBody ComActDynVO comActDynVO);
+
+ /**
+ * 分页查询社区动态
+ *
+ * @param comActDynVO
+ * 查询参数
+ * @return 动态集合
+ */
+ @PostMapping("pagedynamic")
+ R pageDynamic(@RequestBody ComActDynVO comActDynVO);
+
+ /**
+ * 管理后台分页查询社区动态
+ *
+ * @param comActDynVO
+ * 查询参数
+ * @return 动态集合
+ */
+ @PostMapping("pagedynamicByAdmin")
+ R pageDynamicByAdmin(@RequestBody ComActDynVO comActDynVO);
+
+ /**
+ * 社区动态详情
+ *
+ * @param id
+ * 动态id
+ * @return 详情
+ */
+ @PostMapping("detaildynamic")
+ R detailDynamic(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询随手拍
+ *
+ * @param comActEasyPhotoVO
+ * 查询参数
+ * @return 心愿列表
+ */
+ @PostMapping("pageeasyphoto")
+ R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ * 随手拍详情
+ *
+ * @param id
+ * 随手拍主键
+ * @param userId
+ * 登录用户id
+ * @return 详情内容
+ */
+ @PostMapping("detaileasyphoto")
+ R detailEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+ /**
+ * 随手拍删除
+ *
+ * @param id
+ * 随手拍主键
+ * @param userId
+ * 登录用户id
+ * @return 详情内容
+ */
+ @PostMapping("deleteEasyPhoto")
+ R deleteEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询微心愿
+ *
+ * @param comActMicroWishVO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("pagemicrowish")
+ R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO);
+
+ /**
+ * 小程序分页查询微心愿
+ *
+ * @param comActMicroWishVO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("pagemicrowish/applets")
+ R pageMicroWishApplets(@RequestBody ComActMicroWishVO comActMicroWishVO);
+
+ /**
+ * 心愿详情
+ *
+ * @param id
+ * 查询主键
+ * @param userId
+ * 登录用户id
+ * @return 心愿内容
+ */
+ @PostMapping("detailmicrowish")
+ R detailMicroWish(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+ /**
+ * 审核、分配、反馈心愿
+ *
+ * @param comActMicroWishVO
+ * 具体操作
+ * @return 操作结果
+ */
+ @PostMapping("putlmicrowish")
+ R putlMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO);
+
+ /**
+ * 分页展示我的所有活动 时间倒序排列
+ *
+ * @param comActActivityVO
+ * 分页参数
+ * @return 分页集合
+ */
+ @PostMapping("pagemyactivity")
+ R pageMyActivity(@RequestBody ComActActivityVO comActActivityVO);
+
+ /**
+ * 报名/取消报名社区活动
+ *
+ * @param signactivityVO
+ * 报名参数
+ * @return 报名 取消报名 结果
+ */
+ @PostMapping("signactivity")
+ R signActivity(@RequestBody SignactivityVO signactivityVO);
+
+ /**
+ * 上传随手拍
+ *
+ * @param comActEasyPhotoVO
+ * 上传数据
+ * @return 上传结果
+ */
+ @PostMapping("addeasyphoto")
+ R addEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ * 查询随手拍是否有活动
+ *
+ * @return 活动详情
+ */
+ @PostMapping("getEasyPhotoActivity")
+ R getEasyPhotoActivity(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 发布微心愿
+ *
+ * @param comActMicroWishVO
+ * 发布内容
+ * @return 发布结果
+ */
+ @PostMapping("addmicrowish")
+ R addMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO);
+
+ /**
+ * 点赞/取消点赞随手拍
+ *
+ * @param comActEasyPhotoVO
+ * 操作参数
+ * @return 操作结果
+ */
+ @PostMapping("puteasyphoto")
+ R putEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ * 点赞/取消点赞微心愿
+ *
+ * @param comActMicroWishVO
+ * 操作参数
+ * @return 操作结果
+ */
+ @PostMapping("putmicrowish")
+ R putMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO);
+
+ /**
+ * 新增社区动态浏览记录
+ *
+ * @param id
+ * 动态主键
+ * @param userId
+ * 登录用户id
+ * @return 新增结果
+ */
+ @PostMapping("adddynamicuser")
+ R addDynamicUser(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+ /**
+ * 审核、反馈随手拍
+ *
+ * @param comActEasyPhotoVO
+ * 操作参数
+ * @return 操作结果
+ */
+ @PostMapping("puteasyphotostatus")
+ R putEasypHotoStatus(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ * 城管随手拍统计
+ */
+ @PostMapping("/esayPhotoCount")
+ R esayphotoCount(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ *
+ * 城管安排
+ */
+ @PostMapping("updatePageeasyphoto")
+ R updatePageeasyphoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ *
+ * 随手拍城管导出
+ */
+ @PostMapping("exportEasyPhoto")
+ R exportEasyPhoto(@RequestBody ExportEasyPhotoDTO exportEasyPhotoDTO);
+
+ /**
+ * 新增社区
+ *
+ * @param comActVO
+ * 社区信息
+ * @return 新增结果
+ */
+ @PostMapping("addcommunity")
+ R addCommunity(@RequestBody ComActVO comActVO);
+
+ /**
+ * 编辑社区
+ *
+ * @param comActVO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("putCommunity")
+ R putCommunity(@RequestBody ComActVO comActVO);
+
+ /**
+ * 房屋信息
+ *
+ * @param userId
+ * 用户id
+ * @return 房屋信息
+ */
+ @PostMapping("detailhouse")
+ R detailHouse(@RequestParam("userId") Long userId);
+
+ /**
+ * 新增小区
+ *
+ * @param comMngStructAreaVO
+ * 小区信息
+ * @return 新增结果
+ */
+ @PostMapping("addarea")
+ R addArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO);
+
+ /**
+ * 分页查询小区
+ *
+ * @param comMngStructAreaVO
+ * 查询参数
+ * @return 分页结果
+ */
+ @PostMapping("pagearea")
+ R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO);
+
+ /**
+ * 编辑小区
+ *
+ * @param comMngStructAreaVO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("putarea")
+ R putArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO);
+
+ /**
+ * 删除小区
+ *
+ * @param comMngStructAreaVO
+ * 地址编码
+ * @return 删除结果
+ */
+ @PostMapping("deletearea")
+ R deleteArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO);
+
+ /**
+ * 小区批量建房
+ *
+ * @param batchhouseVO
+ * 建房参数
+ * @return 建房结果
+ */
+ @PostMapping("batchhouse")
+ R batchHouse(@RequestBody BatchhouseVO batchhouseVO);
+
+ /**
+ * 展示下级建筑
+ *
+ * @param houseCode
+ * 房屋编号
+ * @return 下级建筑列表
+ */
+ @PostMapping("listsubordinatebuilding")
+ R listSubordinatebuilding(@RequestParam("houseCode") String houseCode);
+
+ /**
+ * 实有单位归属地
+ *
+ * @param comMngRealCompanyBelongsDTO
+ * @return
+ */
+ @PostMapping("/common/data/company/belongs")
+ R belongsComMngRealCompany(@RequestBody ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO);
+
+ /**
+ * 添加同级地址
+ *
+ * @param comMngStructHouseVO
+ * 同级参数
+ * @return 添加结果
+ */
+ @PostMapping("addhouse")
+ R addHouse(@RequestBody BatchhouseVO comMngStructHouseVO);
+
+ /**
+ * 编辑地址
+ *
+ * @param comMngStructHouseVO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("addhouse")
+ R putHouse(@RequestBody ComMngStructHouseVO comMngStructHouseVO);
+
+ /**
+ * 删除地址
+ *
+ * @param comMngStructHouseVO
+ * 删除指定地址和所有下级
+ * @return 删除结果
+ */
+ @PostMapping("deletehouse")
+ R deleteHouse(@RequestBody ComMngStructHouseVO comMngStructHouseVO);
+
+ /**
+ * 新增其他建筑
+ *
+ * @param comMngStructOtherBuildVO
+ * 建筑参数
+ * @return 新增结果
+ */
+ @PostMapping("addotherbuild")
+ R addOtherbuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO);
+
+ /**
+ * 查询所有建筑类型
+ *
+ * @return 类型列表
+ */
+ @PostMapping("listbuildtype")
+ R listBuildType();
+
+ /**
+ * 分页查询 其他建筑
+ *
+ * @param comMngStructOtherBuildVO
+ * 分页查询参数
+ * @return 查询结果
+ */
+ @PostMapping("pageotherbuild")
+ R pageOtherBuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO);
+
+ /**
+ * 获取志愿者详情
+ *
+ * @param id
+ * 志愿者信息
+ * @return 增加结果
+ */
+ @GetMapping("getVolunteerById")
+ R getVolunteerById(@RequestParam("id") Long id);
+
+ /**
+ * 增加志愿者
+ *
+ * @param comMngVolunteerMngVO
+ * 志愿者信息
+ * @return 增加结果
+ */
+ @PostMapping("addvolunteer")
+ R addVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);
+
+ /**
+ * 删除志愿者
+ *
+ * @param comMngVolunteerMngVO
+ * 手机号
+ * @return 删除结果
+ */
+ @PostMapping("deletevolunteer")
+ R deleteVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);
+
+ /**
+ * 编辑志愿者
+ *
+ * @param comMngVolunteerMngVO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("putvolunteer")
+ R putVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);
+
+ /**
+ * 分页展示志愿者
+ *
+ * @param comMngVolunteerMngVO
+ * 查询参数
+ * @return 分页集合返回
+ */
+ @PostMapping("pagevolunteer")
+ R pageVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);
+
+ /**
+ * 分页展示志愿者审核
+ *
+ * @param comMngVolunteerMngVO
+ * 查询参数
+ * @return 查询结果
+ */
+ @PostMapping("pagevolunteerexamine")
+ R pageVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);
+
+ /**
+ * 志愿者审核详情
+ *
+ * @param id
+ * 主键
+ * @return 详情
+ */
+ @PostMapping("detailvolunteerexamine")
+ R detailVolunteerExamine(@RequestParam("id") Long id);
+
+ /**
+ * 志愿者审核
+ *
+ * @param comMngVolunteerMngVO
+ * 审核操作
+ * @return 审核结果
+ */
+ @PostMapping("putvolunteerexamine")
+ R putVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);
+
+ /**
+ * 删除志愿者审核
+ *
+ * @param comMngVolunteerMngVO
+ * 主键
+ * @return 删除结果
+ */
+ @PostMapping("deletevolunteerexamine")
+ R deleteVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO);
+
+ /**
+ * 查询区域
+ *
+ * @param comActVO
+ * 登录人的经纬度、或者指定区域的社区
+ * @return 10个社区
+ */
+ @PostMapping("listcommunity")
+ R listCommunity(@RequestBody ComActVO comActVO);
+
+ /**
+ * 用户修改手机号对应的志愿者手机号也要修改
+ *
+ * @param userPhoneVO
+ * 新旧手机号
+ * @return 修改结果
+ */
+ @PostMapping("putvolunteerphone")
+ R putVolunteerPhone(@RequestBody UserPhoneVO userPhoneVO);
+
+ /**
+ * 房屋地址下拉列表
+ *
+ * @param parentCode
+ * 父级编码
+ * @param areaId
+ * 小区id
+ * @return 下级列表
+ */
+ @PostMapping("listhouses")
+ R listHouses(@RequestParam("parentCode") String parentCode, @RequestParam("areaId") Long areaId);
+
+ /**
+ * 新增房屋
+ *
+ * @param comMngStructHouseVO
+ * 房屋信息
+ * @return 新增结果
+ */
+ @PostMapping("addhouses")
+ R addHouses(@RequestBody ComMngStructHouseVO comMngStructHouseVO);
+
+ /**
+ * 查询小区
+ *
+ * @param communityId
+ * 社区id
+ * @return 小区集合
+ */
+ @PostMapping("listarea")
+ R listArea(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 用户参加的所有社区活动
+ *
+ * @param userId
+ * 用户id
+ * @param status
+ * @return 活动列表
+ */
+ @PostMapping("listactivity")
+ R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type",required = false)Integer type);
+
+ /**
+ * 用户确认心愿
+ *
+ * @param comActMicroWishVO
+ * 用户评价
+ * @return 确认结果
+ */
+ @PostMapping("putmicrowishconfirm")
+ R putMicroWishConfirm(@RequestBody ComActMicroWishVO comActMicroWishVO);
+
+ /**
+ * 建筑类型
+ *
+ * @param communityId
+ * 社区id
+ * @return 建筑集合
+ */
+ @PostMapping("listcommngstructbuildtype")
+ R listComMngStructBuildType(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 增加删除建筑类型
+ *
+ * @param systemmanagementConfigVO
+ * 操作内容
+ * @return 操作结果
+ */
+ @PostMapping("putcommngstructbuildtype")
+ R putComMngStructBuildType(@RequestBody SystemmanagementConfigVO systemmanagementConfigVO);
+
+ /**
+ * 获取广告跳转内容配置
+ *
+ * @return 跳转内容集合
+ */
+ @PostMapping("getjumpcontent")
+ R getJumpContent();
+
+ /**
+ * 编辑运营后台系统配置
+ *
+ * @param appletesBackstageConfigDTO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("putjumpcontent")
+ R putJumpContent(@RequestBody AppletesBackstageConfigDTO appletesBackstageConfigDTO);
+
+ /**
+ * 社区详情
+ *
+ * @param communityId
+ * 社区id
+ * @return 社区详情
+ */
+ @PostMapping("detailcommunity")
+ R detailCommunity(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 小区详情
+ *
+ * @param areaId
+ * 小区id
+ * @return 小区信息
+ */
+ @PostMapping("detailarea")
+ R detailArea(@RequestParam("areaId") Long areaId);
+
+ /**
+ * 分页查询社区
+ *
+ * @param pageComActDTO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("pagecommunity")
+ R pageCommunity(@RequestBody PageComActDTO pageComActDTO);
+
+ /**
+ * 志愿者详情
+ *
+ * @param id
+ * 主键
+ * @return
+ */
+ @PostMapping("detailvolunteer")
+ R detailVolunteer(@RequestParam("id") Long id);
+
+ /**
+ * 查询平台所有的社区
+ *
+ * @return 社区集合 按照创建顺序倒序排列
+ */
+ @PostMapping("listcommunityall")
+ R listCommunityAll(@RequestParam("areaCode")String areaCode);
+
+ /**
+ * 首页广告banner
+ *
+ * @return
+ */
+ @PostMapping("listadvertisement")
+ R listAdvertisement();
+
+ /**
+ * 新增广告
+ *
+ * @param comOpsAdvDTO
+ * @return
+ */
+ @PostMapping("addadvertisement")
+ R addAdvertisement(@RequestBody ComOpsAdvDTO comOpsAdvDTO);
+
+ /**
+ * 编辑广告
+ *
+ * @param comOpsAdvDTO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("putadvertisement")
+ R putAdvertisement(@RequestBody ComOpsAdvDTO comOpsAdvDTO);
+
+ /**
+ * 广告位置下拉列表
+ *
+ * @return 位置集合
+ */
+ @PostMapping("listadvpos")
+ R listAdvpos();
+
+ /**
+ * 跳转内容下拉列表
+ *
+ * @return 跳转内容集合
+ */
+ @PostMapping("listadvjump")
+ R listAdvjump();
+
+ /**
+ * 社区管理后台数据看板 代办事件
+ *
+ * @param communityId
+ * 社区id
+ * @param userId
+ * @return 代办事件列表
+ */
+ @PostMapping("indexdatacommunitybackstage")
+ R indexDataCommunityBackstage(@RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
+
+ /**
+ * 删除社区
+ *
+ * @param communityId
+ * 社区id
+ * @return 删除结果
+ */
+ @PostMapping("delectcommunity")
+ R delectCommunity(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 定时任务刷新社区动态置顶状态
+ *
+ * @return
+ */
+ @PostMapping("timedtaskdynistopping")
+ R timedTaskDynIstopping();
+
+ /**
+ * 定时任务刷新社区动态发布状态
+ *
+ * @return
+ */
+ @PostMapping("timedtaskdynstatus")
+ R timedTaskDynStatus();
+
+ /**
+ * 定时任务查询所有要取消的社区活动
+ *
+ * @return 社区活动集合
+ */
+ @PostMapping("timedtaskactactivity")
+ R timedTaskActActivity();
+
+ /**
+ * 定时任务刷新社区活动的各个状态 除取消外
+ *
+ * @return
+ */
+ @PostMapping("timedtaskactactivityall")
+ R timedTaskActActivityAll();
+
+ /**
+ * 定时任务刷新社区活动的各个状态 除取消外
+ *
+ * @return
+ */
+ @PostMapping("timedtaskactmicrowish")
+ R timedTaskActMicroWishAll();
+
+ /**
+ * 其他建筑详情
+ *
+ * @param id
+ * 主键id
+ * @return 建筑内容
+ */
+ @PostMapping("detailotherbuild")
+ R detailOtherbuild(@RequestParam("id") Long id);
+
+ /**
+ * 编辑其他建筑
+ *
+ * @param comMngStructOtherBuildVO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("putotherbuild")
+ R putOtherbuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO);
+
+ /**
+ * 删除其他建筑
+ *
+ * @param id
+ * 主键
+ * @return 删除结果
+ */
+ @PostMapping("deleteotherbuild")
+ R deleteOtherbuild(@RequestParam("id") Long id);
+
+ /**
+ * 社区后台分页查询社区活动
+ *
+ * @param comActActivityVO
+ * 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("pageactivitycommunityback")
+ R pageActivityCommunityBack(@RequestBody ComActActivityVO comActActivityVO);
+
+ /**
+ * 小程序分页查询随手拍
+ *
+ * @param comActEasyPhotoVO
+ * 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("pageeasyphotoapplets")
+ R pageEasyPhotoApplets(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ * 随手拍评论分页查询
+ *
+ * @param pageComActEasyPhotoCommentDTO
+ * 查询参数
+ * @return 查询结果
+ */
+ @PostMapping("pagecomacteasyphotocomment")
+ R pageComActEasyPhotoComment(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO);
+
+ /**
+ * 评论点赞/取消点赞
+ *
+ * @param comActEasyPhotoCommentUserDTO
+ * 操作
+ * @return 操作结果
+ */
+ @PostMapping("commentsign")
+ R commentSign(@RequestBody ComActEasyPhotoCommentUserDTO comActEasyPhotoCommentUserDTO);
+
+ /**
+ * 随手拍--评论--新增评论
+ *
+ * @param comActEasyPhotoCommentDTO
+ * 新增内容
+ * @return 新增结果
+ */
+ @PostMapping("addcomacteasyphotocomment")
+ R addComActEasyPhotoComment(@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO);
+
+ /**
+ * 议事投票-新增
+ *
+ * @param comActDiscussDTO
+ * 新增参数
+ * @return 新增结果
+ */
+ @PostMapping("adddiscuss")
+ R addDiscuss(@RequestBody ComActDiscussDTO comActDiscussDTO);
+
+ /**
+ * 议事投票-新增
+ *
+ * @param comActDiscussDTO
+ * 新增参数
+ * @return 新增结果
+ */
+ @PostMapping("editdiscuss")
+ R editDiscuss(@RequestBody ComActDiscussDTO comActDiscussDTO);
+
+ /**
+ * 议事投票-详情
+ *
+ * @param discussDetailDTO
+ * 请求参数
+ * @return ComActDiscussVO
+ */
+ @PostMapping("detaildiscuss")
+ R detailDiscuss(@RequestBody ComActDiscussDetailDTO discussDetailDTO);
+
+ /**
+ * 分页查询评论下回复列表
+ * @param discussDetailDTO 请求参数
+ * @return 回复列表
+ */
+ @PostMapping("discussCommentReplyAdmin")
+ R discussCommentReplyAdmin(@RequestBody ComActDiscussDetailDTO discussDetailDTO);
+
+ /**
+ * 议事投票-删除
+ *
+ * @param id
+ * 主键
+ * @return 删除结果
+ */
+ @PostMapping("deletediscuss")
+ R deleteDiscuss(@RequestParam("id") Long id);
+
+ /**
+ * 议事投票-回复
+ *
+ * @param comActDiscussCommentDTO
+ * 评论内容
+ * @return 回复结果
+ */
+ @PostMapping("adddiscusscomment")
+ R addDiscussComment(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO);
+
+ /**
+ * 议事投票-分页查询
+ *
+ * @param pageComActDiscussDTO
+ * 查询参数
+ * @return ComActDiscussVO
+ */
+ @PostMapping("pagediscuss")
+ R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
+
+ /**
+ * 议事投票-后台分页查询
+ *
+ * @param pageComActDiscussDTO
+ * 查询参数
+ * @return ComActDiscussVO
+ */
+ @PostMapping("pagediscussAdmin")
+ R pageDiscussAdmin(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
+
+ /**
+ * 议事投票-评论-查看
+ *
+ * @param id
+ * 主键
+ * @return 详情
+ */
+ @PostMapping("detaildiscusscomment")
+ R detailDiscussComment(@RequestParam("id") Long id);
+
+ /**
+ * 议事投票评论详情
+ * @param pageComActDiscussCommentDTO 请求参数
+ * @return 议事投票详情
+ */
+ @PostMapping("detaildiscusscommentAdmin")
+ R detailDiscussCommentAdmin(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
+
+ /**
+ * 议事投票-评论-置顶
+ *
+ * @param id
+ * 主键
+ * @return 置顶结果
+ */
+ @PostMapping("putdiscusscommenttop")
+ R putDiscussCommentTop(@RequestParam("id") Long id);
+
+ /**
+ * 议事投票-评论-回复
+ *
+ * @param comActDiscussCommentDTO
+ * 回复内容
+ * @return 回复结果
+ */
+ @PostMapping("adddiscusscommentback")
+ R addDiscussCommentBack(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO);
+
+ /**
+ * 议事投票-评论-分页查询
+ *
+ * @param pageComActDiscussCommentDTO
+ * 分页查询参数
+ * @return ComActDiscussCommentVO
+ */
+ @PostMapping("pagediscusscomment")
+ R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
+
+ /**
+ * 议事投票-评论-后台分页查询
+ *
+ * @param pageComActDiscussCommentDTO
+ * 分页查询参数
+ * @return ComActDiscussCommentVO
+ */
+ @PostMapping("pagediscusscommentAdmin")
+ R pageDiscussCommentAdmin(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
+
+ /**
+ * 议事投票-分页查询 小程序
+ *
+ * @param pageComActDiscussDTO
+ * 查询参数
+ * @return ComActDiscussVO 分页
+ */
+ @PostMapping("pagediscussapplets")
+ R pageDiscussApplets(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
+
+ /**
+ * 议事投票-点赞、取消点赞
+ *
+ * @param comActDiscussUserDTO
+ * 操作类型
+ * @return 操作结果
+ */
+ @PostMapping("putdiscussuser")
+ R putDiscussUser(@RequestBody ComActDiscussUserDTO comActDiscussUserDTO);
+
+ /**
+ * 议事投票-评论-分页查询 小程序
+ *
+ * @param pageComActDiscussCommentDTO
+ * 分页参数
+ * @return ComActDiscussCommentVO
+ */
+ @PostMapping("pagediscusscommentapplets")
+ R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
+
+ /**
+ * 议事投票-详情 小程序
+ *
+ * @param id
+ * 主键
+ * @param userId
+ * 登录用户主键
+ * @return ComActDiscussVO
+ */
+ @PostMapping("detaildiscussapplets")
+ R detailDiscussApplets(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+ /**
+ * 议事投票-投票
+ *
+ * @param comActDiscussOptionUserDTO
+ * 投票信息
+ * @return 投票结果
+ */
+ @PostMapping("adddiscussoptionuser")
+ R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO);
+
+ /**
+ * 议事投票-评论-点赞、取消点赞
+ *
+ * @param comActDiscussUserDTO
+ * 评论点赞
+ * @return 点赞结果
+ */
+ @PostMapping("putdiscusscommentuser")
+ R putDiscussCommentUser(@RequestBody ComActDiscussCommentUserDTO comActDiscussUserDTO);
+
+ /**
+ * 分页查询广告
+ *
+ * @param pageComOpsAdvDTO
+ * 查询内容
+ * @return 查询结果 ComOpsAdvVO
+ */
+ @PostMapping("pageadvertisement")
+ R pageAdvertisement(@RequestBody PageComOpsAdvDTO pageComOpsAdvDTO);
+
+ /**
+ * 广告详情
+ *
+ * @param id
+ * 主键
+ * @return 广告内容
+ */
+ @PostMapping("detailadvertisement")
+ R detailAdvertisement(@RequestParam("id") Long id);
+
+ /**
+ * 删除广告
+ *
+ * @param id
+ * 主键
+ * @return 删除结果
+ */
+ @PostMapping("deleteadvertisement")
+ R deleteAdvertisement(@RequestParam("id") Long id);
+
+ /**
+ * 查询城市下属所有地区列表
+ *
+ * @param cityAdcode
+ * 城市地址编码
+ * @return 地区列表
+ */
+ @PostMapping("listareadistrict")
+ R listAreaDistrict(@RequestParam("cityAdcode") Long cityAdcode);
+
+ /**
+ * 首页图表数据汇总
+ *
+ * @param communityId
+ * 社区id
+ * @return 图表数据
+ */
+ @PostMapping("indexdatacommunitybackstageechart")
+ R indexDataCommunityBackstageEchart(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 选择导入的小区
+ *
+ * @param param
+ * 小区名字 模糊查询
+ * @param communityId
+ * 社区id
+ * @return 小区集合 ComMngStructAreaVO
+ */
+ @PostMapping("listareas")
+ R listAreas(@RequestParam("param") String param, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 检查小区是否已经批量设置过房屋并且返回小区房屋门号规则
+ *
+ * @param id
+ * 小区id
+ * @return ComMngStructAreaVO
+ */
+ @PostMapping("checkAreaHouse")
+ R checkAreaHouse(@RequestParam("id") Long id);
+
+ /**
+ * 新增留言
+ *
+ * @param comActMessageVO
+ * 新增留言信息
+ * @return 发布结果
+ */
+ @PostMapping("addmessage")
+ R addMessage(@RequestBody ComActMessageVO comActMessageVO);
+
+ /**
+ * 我的留言
+ *
+ * @param comActMessageVO
+ * 留言信息
+ * @return 发布结果
+ */
+ @PostMapping("pagemymessage")
+ R pageMyMessageApplets(@RequestBody ComActMessageVO comActMessageVO);
+
+ /**
+ * 给我的留言
+ *
+ * @param comActMessageVO
+ * 留言信息
+ * @return 发布结果
+ */
+ @PostMapping("pagesendtomemessage")
+ R pageSendToMessageApplets(@RequestBody ComActMessageVO comActMessageVO);
+
+ /**
+ * 新增留言回复
+ *
+ * @param comActMessageBackVO
+ * 保存留言回复信息
+ * @return 发布结果
+ */
+ @PostMapping("addmessageback")
+ R addMessageBack(@RequestBody ComActMessageBackVO comActMessageBackVO);
+
+ /**
+ * 根据id查询留言列表
+ *
+ * @return 发布结果
+ */
+ @PostMapping("pagemessagebyuser")
+ R pageMessageByUser(@RequestBody ComActMessageVO comActMessageVO);
+
+ /**
+ * 根据id删除留言
+ *
+ * @return 删除结果
+ */
+ @PostMapping("deletemessage")
+ R deleteMessage(@RequestBody ComActMessageVO comActMessageVO);
+
+ /**
+ * 根据id集合批量设置是否公开
+ *
+ * @return 删除结果
+ */
+ @PostMapping("resetmessagepublic")
+ R resetMessagePublic(@RequestBody ResetComActMessageVO resetComActMessageVO);
+
+ /**
+ * 分页显示社区所有留言
+ *
+ * @param comActMessageVO
+ * 留言信息
+ * @return 结果集合
+ */
+ @PostMapping("pagemycommunitymessage")
+ R pageMyCommunityMessage(@RequestBody ComActMessageVO comActMessageVO);
+
+ /**
+ * 根据id查找留言详情
+ *
+ * @param id
+ * @return
+ */
+ @PostMapping("detailmessage")
+ R detailMessage(@RequestParam("id") Long id);
+
+ /**
+ * 小程序通过便民服务区域分页查询便民服务商家
+ *
+ * @param comCvtBusinessAppletsDTO
+ * 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/business/area/page")
+ R pageComCvtBusinessByServiceArea(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO);
+
+ /**
+ * 议事投票-新增
+ *
+ * @param comOpsHouseDTO
+ * 新增参数
+ * @return 新增结果
+ */
+ @PostMapping("addOpsHouse")
+ R addOpsHouse(@RequestBody ComOpsHouseDTO comOpsHouseDTO);
+
+ /**
+ * 议事投票-详情
+ *
+ * @param id
+ * 主键
+ * @return ComOpsHouseVO
+ */
+ @PostMapping("detailOpsHouse")
+ R detailOpsHouse(@RequestParam("id") Long id);
+
+ /**
+ * 房屋租售-修改
+ *
+ * @param comOpsHouseVO
+ * 修改参数
+ * @return 修改结果
+ */
+ @PostMapping("/putOpsHouse")
+ R putOpsHouse(@RequestBody ComOpsHouseVO comOpsHouseVO);
+
+ /**
+ * 房屋租售-小程序修改
+ *
+ * @param comOpsHouseVO
+ * 修改参数
+ * @return 修改结果
+ */
+ @PostMapping("/putOpsHouseByApplets")
+ R putOpsHouseByApplets(@RequestBody ComOpsHouseVO comOpsHouseVO);
+
+ /**
+ * 房屋租售-上下架
+ *
+ * @param comOpsHouseVO
+ * 上下架参数
+ * @return 上下架结果
+ */
+ @PostMapping("/undercarriageHouse")
+ R undercarriageHouse(@RequestBody ComOpsHouseUndercarriageVO comOpsHouseVO);
+
+ /**
+ * 议事投票-删除
+ *
+ * @param id
+ * 主键
+ * @return 删除结果
+ */
+ @PostMapping("deleteOpsHouse")
+ R deleteOpsHouse(@RequestParam("id") Long id);
+
+ /**
+ * 房屋租售-分页查询
+ *
+ * @param pageComOpsHouseDTO
+ * 查询参数
+ * @return ComOpsHouseVO
+ */
+ @PostMapping("pageOpsHouse")
+ R pageOpsHouse(@RequestBody PageComOpsHouseDTO pageComOpsHouseDTO);
+
+ /**
+ * 社区后台分页查询便民服务商家
+ *
+ * @param pageComCvtBusinessDTO
+ * 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/business/page")
+ R pageComCvtBusiness(@RequestBody PageComCvtBusinessDTO pageComCvtBusinessDTO);
+
+ /**
+ * 添加便民服务商家信息
+ *
+ * @param comCvtBusinessDTO
+ * @return
+ */
+ @PostMapping("/convenient/business/add")
+ R addComCvtBusiness(ComCvtBusinessDTO comCvtBusinessDTO);
+
+ /**
+ * 编辑便民服务商家
+ *
+ * @param comCvtBusinessDTO
+ * 商家参数
+ * @return 返回结果
+ */
+ @PutMapping("/convenient/business/put")
+ R putComCvtBusiness(@RequestBody ComCvtBusinessDTO comCvtBusinessDTO);
+
+ /**
+ * 查询便民服务商家详情
+ *
+ * @param id
+ * 商家主键
+ * @return 返回结果
+ */
+ @GetMapping("/convenient/business/get")
+ R getComCvtBusiness(@RequestParam("id") Long id);
+
+ /**
+ * 删除便民服务商家信息
+ *
+ * @param id
+ * 商家主键
+ * @return 返回结果
+ */
+ @DeleteMapping("/convenient/business/delete")
+ R deleteComCvtBusiness(@RequestParam("id") Long id);
+
+ /**
+ * 社区后台分页查询便民服务分类
+ *
+ * @param pageComCvtCategoryDTO
+ * 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/category/page")
+ R pageComCvtCategory(@RequestBody PageComCvtCategoryDTO pageComCvtCategoryDTO);
+
+ /**
+ * 社区后台分页查询便民服务分类
+ *
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/category/all")
+ R allComCvtCategory();
+
+ /**
+ * 新增便民服务分类
+ *
+ * @param comCvtCategoryDTO
+ * 分类参数
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/category/add")
+ R addComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO);
+
+ /**
+ * 编辑便民服务分类
+ *
+ * @param comCvtCategoryDTO
+ * 分类参数
+ * @return 返回结果
+ */
+ @PutMapping("/convenient/category/put")
+ R putComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO);
+
+ /**
+ * 查询便民服务分类详情
+ *
+ * @param id
+ * 分类主键
+ * @return 返回结果
+ */
+ @GetMapping("/convenient/category/get")
+ R getComCvtCategory(@RequestParam("id") Long id);
+
+ /**
+ * 删除便民服务分类信息
+ *
+ * @param id
+ * 分类主键
+ * @return 返回结果
+ */
+ @DeleteMapping("/convenient/category/delete")
+ R deleteComCvtCategory(@RequestParam("id") Long id);
+
+ /**
+ * 社区后台分页查询便民服务
+ *
+ * @param pageComCvtServeDTO
+ * 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/serve/page")
+ R pageComCvtServe(@RequestBody PageComCvtServeDTO pageComCvtServeDTO);
+
+ /**
+ * 新增便民服务
+ *
+ * @param comCvtServeDTO
+ * 参数
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/serve/add")
+ R addComCvtServe(@RequestBody ComCvtServeDTO comCvtServeDTO);
+
+ /**
+ * 编辑便民服务
+ *
+ * @param comCvtServeDTO
+ * 分类参数
+ * @return 返回结果
+ */
+ @PutMapping("/convenient/serve/put")
+ R putComCvtServe(@RequestBody ComCvtServeDTO comCvtServeDTO);
+
+ /**
+ * 查询便民服务详情
+ *
+ * @param id
+ * 服务主键
+ * @return 返回结果
+ */
+ @GetMapping("/convenient/serve/get")
+ R getComCvtServe(@RequestParam("id") Long id);
+
+ /**
+ * 删除便民服务信息
+ *
+ * @param id
+ * 服务主键
+ * @return 返回结果
+ */
+ @DeleteMapping("/convenient/serve/delete")
+ R deleteComCvtServe(@RequestParam("id") Long id);
+
+ /**
+ * 小程序便民服务商家详情
+ *
+ * @param id
+ * 商家ID
+ * @return
+ */
+ @GetMapping("/convenient/business/serve/get")
+ R getComCvtBusinessServeDetail(@RequestParam("id") Long id);
+
+ /**
+ * 批量导入便民服务
+ *
+ * @param list
+ * 便民服务集合
+ */
+ @PostMapping("/convenient/serve/import")
+ R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list,
+ @RequestParam(value = "communityId", required = false) Long communityId);
+
+ /**
+ * 导出房屋信息
+ *
+ * @param areaId
+ * @return
+ */
+ @PostMapping("/house/export")
+ R houseExport(@RequestParam("areaId") Long areaId);
+
+ /**
+ * 小程序添加车辆信息
+ *
+ * @param comCvtBusinessDTO
+ * @return
+ */
+ @PostMapping("/common/data/car/user/register")
+ R addComMngCarApplet(@RequestBody ComMngCarAppletDTO comCvtBusinessDTO);
+
+ /**
+ * 小程序用户登记车辆列表
+ *
+ * @param userId
+ * @return
+ */
+ @GetMapping("/common/data/car/user/list")
+ R userComMngCarList(@RequestParam("userId") Long userId);
+
+ @PostMapping("/common/data/car/page")
+ R pageQueryComMngCar(@RequestBody PageComMngCarDTO pageComMngCarDTO);
+
+ @PostMapping("/common/data/car/save")
+ R saveComMngCar(@RequestBody ComMngCarSaveDTO comMngCarSaveDTO);
+
+ /**
+ * 删除车辆信息
+ *
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/common/data/car/delete")
+ R deleteComMngCar(@RequestParam(value = "id") Long id);
+
+ /**
+ * 批量导入便民服务
+ *
+ * @param list
+ * 便民服务集合
+ */
+ @PostMapping("/common/data/car/import")
+ R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 车辆导出
+ *
+ * @param exportComMngCarExcelDTO
+ * @return
+ */
+ @PostMapping("/common/data/car/export")
+ R exportRealCar(@RequestBody ExportComMngCarExcelDTO exportComMngCarExcelDTO);
+
+ /**
+ * 社区后台实有单位管理列表
+ *
+ * @param pageComMngRealCompanyDTO
+ * @return
+ */
+ @PostMapping("/common/data/company/page")
+ R pageQueryComMngRealCompany(@RequestBody PageComMngRealCompanyDTO pageComMngRealCompanyDTO);
+
+ /**
+ * 社区后台实有单位统计
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计结果
+ */
+ @PostMapping("/common/data/company/statistics")
+ R getComMngRealCompanyTotalByAdmin(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 社区后台添加修改实有单位
+ *
+ * @param comMngRealCompanyVO
+ * @return
+ */
+ @PostMapping("/common/data/company/save")
+ R saveComMngRealCompany(@RequestBody ComMngRealCompanyVO comMngRealCompanyVO);
+
+ /**
+ * 社区后台删除实有单位
+ *
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/common/data/company/delete")
+ R deleteComMngRealCompany(@RequestParam(value = "id") Long id);
+
+ /**
+ * 实有单位详情
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("/common/data/company/detail")
+ R detailComMngRealCompany(@RequestParam(value = "id") Long id);
+
+ /**
+ * 批量导入实有单位
+ *
+ * @param list
+ * 实有单位集合
+ */
+ @PostMapping("/common/data/company/import")
+ R listSaveMngRealCompanyExcelVO(@RequestBody List<ComMngRealCompanyExcelVO> list,
+ @RequestParam("communityId") Long communityId);
+
+ /**
+ * 实有单位导出
+ *
+ * @param exportRealCompanyExcelDTO
+ * @return
+ */
+ @PostMapping("/common/data/company/export")
+ R exportRealCompany(ExportRealCompanyExcelDTO exportRealCompanyExcelDTO);
+
+ /**
+ * 社区后台实有单位管理列表
+ *
+ * @param pageComMngRealAssetsDTO
+ * @return
+ */
+ @PostMapping("/common/data/assets/page")
+ R pageQueryComMngRealAssets(@RequestBody PageComMngRealAssetsDTO pageComMngRealAssetsDTO);
+
+ /**
+ * 社区后台添加修改实有单位
+ *
+ * @param comMngRealAssetsVO
+ * @return
+ */
+ @PostMapping("/common/data/assets/save")
+ R saveComMngRealAssets(@RequestBody ComMngRealAssetsVO comMngRealAssetsVO);
+
+ /**
+ * 社区后台删除实有单位
+ *
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/common/data/assets/delete")
+ R deleteComMngRealAssets(@RequestParam(value = "id") Long id);
+
+ /**
+ * 实有单位详情
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("/common/data/assets/detail")
+ R detailComMngRealAssets(@RequestParam(value = "id") Long id);
+
+ /**
+ * 批量导入实有单位
+ *
+ * @param list
+ * 实有单位集合
+ */
+ @PostMapping("/common/data/assets/import")
+ R listSaveMngRealAssetsExcelVO(@RequestBody List<ComMngRealAssetsExcelVO> list,
+ @RequestParam("communityId") Long communityId);
+
+ /**
+ * 实有单位导出
+ *
+ * @param exportRealAssetsExcelDTO
+ * @return
+ */
+ @PostMapping("/common/data/assets/export")
+ R exportRealAssets(ExportRealAssetsExcelDTO exportRealAssetsExcelDTO);
+
+ /**
+ * 查询所有省份
+ *
+ * @return
+ */
+ @GetMapping("/common/data/province")
+ R getProvince();
+
+ /**
+ * 查询省份下所有的城市
+ *
+ * @param provinceAdcode
+ * @return
+ */
+ @GetMapping("/common/data/city")
+ R getCityByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode);
+
+ /**
+ * 查询城市下所有的区县
+ *
+ * @param cityAdcode
+ * @return
+ */
+ @GetMapping("/common/data/district")
+ R getDistrictByCityCode(@RequestParam(value = "cityAdcode") Integer cityAdcode);
+
+ /**
+ * 查询省下所有区域 tree结构
+ *
+ * @param provinceAdcode
+ * 省份code
+ * @param areaCode
+ * @return 查询结果
+ */
+ @GetMapping("/common/data/area/all")
+ R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode, @RequestParam(value = "areaCode", required = false) String areaCode);
+
+ /**
+ * 分页查询街道
+ *
+ * @param pageComStreetDTO
+ * 查询条件
+ * @return 查询结果
+ */
+ @PostMapping("/pagestreet")
+ R pageStreet(@RequestBody PageComStreetDTO pageComStreetDTO);
+
+ /**
+ * 新增街道
+ *
+ * @param comStreetVOO
+ * 需要新增的街道数据
+ * @return 新增结果
+ */
+ @PostMapping("/addstreet")
+ R addStreet(@RequestBody ComStreetVO comStreetVOO);
+
+ /**
+ * 删除街道
+ *
+ * @param Ids
+ * 需要删除街道id集合
+ * @return 删除结果
+ */
+ @PostMapping("/deletestreet")
+ R delectStreat(@RequestBody List<Long> Ids);
+
+ /**
+ * 查询街道
+ *
+ * @param comStreetVO
+ * 查询条件
+ * @return 返回结果
+ */
+ @PostMapping("/liststreet")
+ R listStreet(ComStreetVO comStreetVO);
+
+ /**
+ * 分页查询实有房屋
+ *
+ * @param pageComMngVillageDTO
+ * 查询条件
+ * @return 返回结果
+ */
+ @PostMapping("/pagevillage")
+ R pageVillage(@RequestBody PageComMngVillageDTO pageComMngVillageDTO);
+
+ /**
+ * 新增实有房屋
+ *
+ * @param comMngVillageVO
+ * 新增的实有房屋数据
+ * @return 新增结果
+ */
+ @PostMapping("/addvillage")
+ R addVillage(@RequestBody ComMngVillageVO comMngVillageVO);
+
+ /**
+ * 删除实有房屋
+ *
+ * @param Ids
+ * 需要删除的id集合
+ * @return 删除结果
+ */
+ @PostMapping("/deletevillage")
+ R delectVillage(@RequestBody List<Long> Ids);
+
+ /**
+ * 查询实有房屋
+ *
+ * @param comMngVillageVO
+ * 查询条件
+ * @return 查询结果
+ */
+ @PostMapping("/listvillage")
+ R listVillage(ComMngVillageVO comMngVillageVO);
+
+ /**
+ * 根据房屋id查询实有房屋
+ *
+ * @param villageId
+ * 查询条件
+ * @return 查询结果
+ */
+ @PostMapping("/getVillageById")
+ R getVillageById(@RequestParam(value = "villageId") Long villageId);
+
+ /**
+ * 批量导入实有房屋
+ *
+ * @param list
+ * 实有房屋数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/village/import")
+ R listSaveVillageServeExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 批量导入实有人口
+ *
+ * @param list
+ * 实有人口数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/import")
+ R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入吸毒人员
+ *
+ * @param list
+ * 吸毒人员数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importDrug")
+ R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入社区矫正人员
+ *
+ * @param list
+ * 社区矫正人员数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importCorrect")
+ R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入重精人员
+ *
+ * @param list
+ * 重精人员数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importMajor")
+ R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入邪教人员
+ *
+ * @param list
+ * 邪教人员数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importCult")
+ R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入刑释人员
+ *
+ * @param list
+ * 刑释人员数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importRehabilitation")
+ R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入重点上访人员
+ *
+ * @param list
+ * 重点上访人员数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importKey")
+ R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入服刑人员
+ *
+ * @param list
+ * 服刑人员数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importSentence")
+ R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入退役军人
+ *
+ * @param list
+ * 退役军人数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importVeterans")
+ R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入残疾人
+ *
+ * @param list
+ * 残疾人数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importDisability")
+ R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入低保户
+ *
+ * @param list
+ * 低保户数据
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importLowSecurity")
+ R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入高龄老人 listSavePopulationElderExcelVO 批量导入高龄老人
+ * @param list 高龄老人数据
+ * @param communityId 社区id
+ * @return R 导入结果
+ * @author txb
+ * @date 2021/9/01 15:03
+ */
+ @PostMapping("/common/data/population/importElder")
+ R listSavePopulationElderExcelVO(@RequestBody List<ComMngPopulationElderExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入养老金人员 listSavePopulationPensionExcelVO 批量导入养老金人员
+ * @param list 养老金人员数据
+ * @param communityId 社区id
+ * @return R 导入结果
+ * @author txb
+ * @date 2021/9/01 15:03
+ */
+ @PostMapping("/common/data/population/importPension")
+ R listSavePopulationPensionExcelVO(@RequestBody List<ComMngPopulationPensionExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入高龄老人线下认证记录 listSaveElderAuthRecordExcelVO 批量导入高龄老人线下认证记录
+ * @param list 高龄老人线下认证记录数据
+ * @param communityId 社区id
+ * @param userId 登录人id
+ * @return R 导入结果
+ * @author txb
+ * @date 2021/9/01 15:03
+ */
+ @PostMapping("/elders/authRecords/underLine/import")
+ R listSaveElderAuthRecordExcelVO(@RequestBody List<ComElderAuthRecordImportExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 批量导入养老线下认证记录 listSavePensionAuthRecordExcelVO 批量导入养老线下认证记录
+ * @param list 养老线下认证记录数据
+ * @param communityId 社区id
+ * @param userId 登录人id
+ * @return R 导入结果
+ * @author txb
+ * @date 2021/9/01 15:03
+ */
+ @PostMapping("/elders/pensionAuthRecords/underLine/import")
+ R listSavePensionAuthRecordExcelVO(@RequestBody List<ComPensionAuthRecordImportExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 确认导入实有人口（有则更新，无则新建）
+ *
+ * @param list
+ * 用户信息
+ * @param communityId
+ * 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/import/confirm")
+ R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 分页查询实有人口
+ *
+ * @param comMngPopulationVO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/common/data/population/page")
+ R pagePopulation(ComMngPopulationDTO comMngPopulationVO);
+
+ /**
+ * 导出老人
+ *
+ * @param comMngPopulationVO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/common/data/population/exportOld")
+ R exportOld(ComMngPopulationDTO comMngPopulationVO);
+
+
+ /**
+ * 根据身份证查询实有人口信息
+ */
+ @GetMapping("/common/data/population/selectByIdCard")
+ R selectByIdCard(@RequestParam("idCard") String idCard);
+
+ /**
+ * 根据id实有人口详细信息
+ *
+ * @param populationId
+ * 实有人口id
+ * @return 实有人口详细信息
+ */
+ @PostMapping("/common/data/population/detail")
+ R<ComMngPopulationVO> detailPopulation(@RequestParam(value = "populationId") Long populationId, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 根据id查询实有人口电子档案信息
+ *
+ * @param populationId
+ * 实有人口id
+ * @return 实有人口电子档信息
+ */
+ @PostMapping("/common/data/population/electronicArchives")
+ R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId);
+
+ /**
+ * 根据id修改实有人口标签列表
+ *
+ * @param populationTagDTO
+ * 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/common/data/population/editTag")
+ R editTagPopulation(ComMngPopulationTagDTO populationTagDTO);
+
+ /**
+ * 批量删除实有人口
+ *
+ * @param ids
+ * 实有人口id集合
+ * @return 删除结果
+ */
+ @PostMapping("/common/data/population/delete")
+ R deletePopulations(@RequestBody List<Long> ids,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 根据社区id查询所有实有人口
+ *
+ * @param communityId
+ * 社区id
+ * @return 查询结果
+ */
+ @PostMapping("/common/data/population/getAll")
+ R getPopulationListByCommunityId(@RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 根据id集合查询实有人口
+ *
+ * @param Ids
+ * 实有人口id集合
+ * @return 查询结果
+ */
+ @PostMapping("/common/data/population/getList")
+ R getPopulationLists(@RequestBody List<Long> Ids);
+
+ /**
+ * 根据小区id查询实有人口
+ *
+ * @param villageId
+ * 小区id
+ * @return 查询结果
+ */
+ @PostMapping("/common/data/population/getListByVillageId")
+ R getPopulationListByVillageId(@RequestParam("villageId") Long villageId);
+
+ /**
+ * 创建调查问卷
+ *
+ * @param questnaireVO
+ * @return
+ */
+ @PostMapping("/questnaire/addquestnaire")
+ R addQuestnaire(@RequestBody QuestnaireVO questnaireVO);
+
+ /**
+ * 小程序-社区问卷列表
+ *
+ * @param pageQuestnaireDTO
+ * 请求参数
+ * @return 社区问卷列表
+ */
+ @PostMapping("/questnaire/pagequestnaire")
+ R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO);
+
+ /**
+ * 社区后台-社区问卷列表
+ *
+ * @param pageQuestnaireDTO
+ * 请求参数
+ * @return 社区问卷列表
+ */
+ @PostMapping("/questnaire/admin/pagequestnaire")
+ R pageQuestnaireAdmin(@RequestBody PageQuestnaireDTO pageQuestnaireDTO);
+
+ /**
+ * 编辑问卷——问卷、题目、选项
+ *
+ * @param questnaireVO
+ * @return
+ */
+ @PostMapping("/questnaire/editquestnaire")
+ R editQuestnaire(@RequestBody QuestnaireVO questnaireVO);
+
+ /**
+ * 修改问卷状态
+ *
+ * @param editComActQuestnaireVo
+ * @return
+ */
+ @PostMapping("/questnaire/editquestnairedo")
+ R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo);
+
+ /**
+ * 删除问卷 ——隐藏
+ *
+ * @param questId
+ * 调查问卷Id
+ * @return
+ */
+ @PostMapping("/questnaire/deletequestnaire")
+ R editQuestnaireDO(@RequestParam("questId") Long questId, @RequestParam("userId") Long userId);
+
+ /**
+ * 问卷答题结果
+ *
+ * @param questId
+ * 问卷ID
+ */
+ @PostMapping("/questnaire/answerslist")
+ R answerResultList(@RequestParam("questId") Long questId);
+
+ /**
+ * 问卷调查详细
+ *
+ * @param questId
+ * 问卷ID
+ * @return 用户问卷调查详细
+ */
+ @GetMapping("/questnaire/view")
+ R view(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);
+
+ /**
+ * 小程序-问卷调查详情
+ *
+ * @param userId
+ * 用户id
+ * @param questId
+ * 问卷id
+ * @return 问卷调查详情
+ */
+ @GetMapping("/questnaire/view/detail")
+ R viewDetail(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);
+
+ /**
+ * 小程序-新增问卷调查浏览数量
+ *
+ * @param questId
+ * 问卷调查id
+ * @return 增加结果
+ */
+ @GetMapping("/questnaire/add/view")
+ R addView(@RequestParam("questId") Long questId);
+
+ /**
+ * 小程序-用户弹窗添加不在提醒接口
+ *
+ * @param questId
+ * 问卷id
+ * @param userId
+ * 用户id
+ * @return 添加结果
+ */
+ @GetMapping("/questnaire/add/noNotice")
+ R addNoNotice(@RequestParam("questId") Long questId, @RequestParam("userId") Long userId);
+
+ /**
+ * 社区后台-查询问卷调查详情
+ *
+ * @param questId
+ * 问卷id
+ * @return 问卷调查详情
+ */
+ @GetMapping("/questnaire/admin/detail")
+ R QuesDetail(@RequestParam("questId") Long questId);
+
+ /**
+ * 用户问卷调查详细
+ *
+ * @param userId
+ * 用户ID
+ * @param questId
+ * 问卷ID
+ * @return 用户问卷调查详细
+ */
+ @GetMapping("/questnaire/usersanswer")
+ R answerInfoQuestnaire(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);
+
+ /**
+ * 查看用户问卷调查统计信息
+ *
+ * @param questId
+ * 问卷ID
+ * @return 用户问卷调查统计信息
+ */
+ @GetMapping("/questnaire/stat")
+ R statistics(@RequestParam("questId") Long questId);
+
+ /**
+ * 问卷题目 答卷信息
+ *
+ * @param pageQuestnaireSubDetailsDTO
+ * 问卷ID
+ */
+ @PostMapping("/questnaire/qaqeustanswerdetails")
+ R qaQeustAnswerDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO);
+
+ /**
+ * 社区问卷分页
+ *
+ * @param pageQuestnaireAnswerDTO
+ * 社区问卷分页参数
+ * @return 分页数据
+ */
+ @PostMapping("/questnaire/pagequestnaireanswer")
+ R pageQuestnaireAnswer(@RequestBody PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO);
+
+ /**
+ * 居民填写问卷调查问卷
+ *
+ * @param usersAnswerQuestnaireVO
+ * 填写情况
+ */
+ @PostMapping("/questnaire/usersanswequestnaire")
+ R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO);
+
+ /**
+ * 店铺列表-分页查询
+ *
+ * @param pageComShopStoreDTO
+ * 分页条件
+ */
+ @PostMapping("/shop/pageShopStore")
+ R pageStoreList(@RequestBody PageComShopStoreDTO pageComShopStoreDTO);
+
+ /**
+ * 保存店铺
+ *
+ * @param storeVO
+ * 数据
+ */
+ @PostMapping("/shop/saveStore")
+ R saveStore(@RequestBody ShopStoreVO storeVO);
+
+ /**
+ * 新增店铺
+ *
+ * @param storeVO
+ * 店铺信息
+ * @return 新增结果
+ */
+ @PostMapping("/shop/addStore")
+ R addStore(@RequestBody ShopStoreVO storeVO);
+
+ /**
+ * 编辑店铺、启用、禁用
+ *
+ * @param storeVO
+ * 数据
+ * @param id
+ * 商铺id
+ */
+ @PostMapping("/shop/editStore/{id}")
+ R editStore(@RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id);
+
+ /**
+ * 删除店铺
+ *
+ * @param id
+ * 商铺id
+ */
+ @PostMapping("/shop/deleteStore")
+ R deleteStore(@RequestBody Long[] id);
+
+ /**
+ * 获取详情
+ *
+ * @param id
+ * 商铺id
+ */
+ @GetMapping("/shop/getStoreInfo")
+ R getStoreInfo(@RequestParam("id") Long id);
+
+ /**
+ * 商品列表-分页查询
+ *
+ * @param pageComShopGoodsDTO
+ * 添加数据
+ */
+ @PostMapping("/shop/pageGoods")
+ R pageGoodsList(@RequestBody PageComShopGoodsDTO pageComShopGoodsDTO);
+
+ /**
+ * 新增商品
+ *
+ * @param addShopGoodsVO
+ * @return
+ */
+ @PostMapping("/shop/saveShopGoods")
+ R saveShopGoods(@RequestBody AddShopGoodsVO addShopGoodsVO);
+
+ /**
+ * 编辑商品
+ *
+ * @param id
+ * @param addShopGoodsVO
+ * @return
+ */
+ @PostMapping("/shop/editShopGoods/{id}")
+ R editShopGoods(@PathVariable("id") Long id, @RequestBody AddShopGoodsVO addShopGoodsVO);
+
+ /**
+ * 删除商品
+ *
+ * @param id
+ * @return
+ */
+ @PostMapping("/shop/deleteShopGoods")
+ R deleteShopGoods(@RequestBody Long[] id);
+
+ /**
+ * 修改商品状态
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("/shop/changeShopGoodsStatus")
+ R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);
+
+ /**
+ * 结果
+ *
+ * @param shopOperlog
+ * 商城后台操作日志
+ */
+ @PostMapping("/shop/addShopOperLog")
+ R addShopOperLog(@RequestBody ShopOperLogVO shopOperlog);
+
+ /**
+ * 分页查询 商家后台操作日志
+ *
+ * @param pageDTO
+ * 分页数据
+ * @return 分页日志
+ */
+ @PostMapping("/shop/pageShopOperLog")
+ R pageShopOperLog(@RequestBody PageDTO pageDTO);
+
+ /**
+ * 订单分页查询
+ *
+ * @param pageComShopOrderSearchDTO
+ * 分页数据
+ * @return 订单分页查询
+ */
+ @PostMapping("/shop/order/page")
+ R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
+
+ /**
+ * 分页查询店铺列表
+ *
+ * @param comShopStoreDTO
+ * 请求参数
+ * @return 店铺列表
+ */
+ @PostMapping("/shop/pageShopStore")
+ R pageShopStore(@RequestBody PageComShopStoreDTO comShopStoreDTO);
+
+ /**
+ * 根据id查询店铺详情
+ *
+ * @param comShopStoreDTO
+ * 请求参数
+ * @return 店铺详情
+ */
+ @PostMapping("/shop/shopStoreDetail")
+ R shopStoreDetail(@RequestBody PageComShopStoreDTO comShopStoreDTO);
+
+ /**
+ * 分页查询商品列表
+ *
+ * @param comShopGoodsDTO
+ * 请求参数
+ * @return 商品列表
+ */
+ @PostMapping("/shop/pageShopGoods")
+ R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO);
+
+ /**
+ * 根据商品id查询商品信息
+ *
+ * @param goodsId
+ * 商品id
+ * @return 商品信息
+ */
+ @PostMapping("/shop/shopGoodsDetail")
+ R shopGoodsDetail(@RequestParam("goodsId") Long goodsId);
+
+ /**
+ * 查询用户购物车列表
+ *
+ * @param userId
+ * 用户id
+ * @return 购物车列表
+ */
+ @PostMapping("/shop/shopCartList")
+ R shopCartList(@RequestParam("userId") Long userId);
+
+ /**
+ * 查询用户购物车数量
+ *
+ * @param userId
+ * 用户id
+ * @return 用户购物车商品数量
+ */
+ @PostMapping("/shop/shopCartUserTotal")
+ R shopCartUserTotal(@RequestParam("userId") Long userId);
+
+ /**
+ * 购物车添加
+ *
+ * @param comShopCartDTO
+ * 请求参数
+ * @return 购物车列表
+ */
+ @PostMapping("/shop/shopAddCart")
+ R shopAddCart(@RequestBody ComShopCartDTO comShopCartDTO);
+
+ /**
+ * 购物车内商品数量修改
+ *
+ * @param shopEditNubCartDTO
+ * 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/shop/shopEditNubCart")
+ R shopEditNubCart(@RequestBody ComShopEditNubCartDTO shopEditNubCartDTO);
+
+ /**
+ * 删除购物车记录
+ *
+ * @param Ids
+ * 购物车id集合
+ * @return 删除结果
+ */
+ @PostMapping("/shop/shopDelCart")
+ R shopDelCart(@RequestBody List<Long> Ids);
+
+ /**
+ * 分页查询用户收货地址列表
+ *
+ * @param comShopAddressDTO
+ * 请求参数
+ * @return 用户收货地址列表
+ */
+ @PostMapping("/shop/shopUserAddressList")
+ R shopUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO);
+
+ /**
+ * 用户添加收货地址
+ *
+ * @param comShopAddressDTO
+ * 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/shop/shopAddUserAddress")
+ R shopAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);
+
+ /**
+ * 用户修改收货地址
+ *
+ * @param comShopAddressDTO
+ * 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/shop/shopEditUserAddress")
+ R shopEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);
+
+ /**
+ * 用户删除收货地址
+ *
+ * @param addressId
+ * 收货地址id
+ * @return 删除结果
+ */
+ @PostMapping("/shop/shopDelUserAddress")
+ R shopDelUserAddress(@RequestParam("addressId") Long addressId);
+
+ /**
+ * 订单预览
+ *
+ * @param orderPreviewDTO
+ * 请求参数
+ * @return 订单预览数据
+ */
+ @PostMapping("/shop/orderPreview")
+ R orderPreview(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO);
+
+ /**
+ * 创建订单
+ *
+ * @param orderCreateDTO
+ * 创建订单请求参数
+ * @return 创建结果
+ */
+ @PostMapping("/shop/orderCreate")
+ R orderCreate(@RequestBody ComShopOrderCreateDTO orderCreateDTO);
+
+ /**
+ * 分页查询用户订单列表
+ *
+ * @param comOrderListDTO
+ * 请求参数
+ * @return 查询结果
+ */
+ @PostMapping("/shop/pageOrderList")
+ R pageOrderList(@RequestBody PageComOrderListDTO comOrderListDTO);
+
+ /**
+ * 根据订单id查询订单详情
+ *
+ * @param orderId
+ * 订单id
+ * @return 订单详情
+ */
+ @PostMapping("/shop/orderDetail")
+ R orderDetail(@RequestParam("orderId") Long orderId);
+
+ /**
+ * 根据订单id取消订单
+ *
+ * @param comShopOrderQueryDTO
+ * 请求参数
+ * @return 取消结果
+ */
+ @PostMapping("/shop/orderCancel")
+ R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);
+
+ /**
+ * 根据订单id删除订单
+ *
+ * @param orderId
+ * 订单id
+ * @return 删除结果
+ */
+ @PostMapping("/shop/orderDelete")
+ R orderDelete(@RequestParam("orderId") Long orderId);
+
+ /**
+ * 根据订单id确认收货
+ *
+ * @param comShopOrderQueryDTO
+ * 请求参数
+ * @return 确认结果
+ */
+ @PostMapping("/shop/orderConfirm")
+ R orderConfirm(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);
+
+ /**
+ * 统计用户订单数量
+ *
+ * @param userId
+ * 用户id
+ * @return 统计结果
+ */
+ @PostMapping("/shop/orderStatistics")
+ R orderStatistics(@RequestParam("userId") Long userId);
+
+ /**
+ * 商家资金的订单详情
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("/shop/capitalDetailByStore")
+ R capitalDetailByStore(@RequestParam("id") Long id);
+
+ /**
+ * 订单发货
+ *
+ * @param orderShipDTO
+ * 商城订单发货信息
+ * @return 发货结果
+ */
+ @PostMapping("/shop/shipOrder")
+ R shipOrder(@RequestBody ComShopOrderShipDTO orderShipDTO);
+
+ /**
+ * 订单配送
+ *
+ * @param deliverDTO
+ * 订单信息
+ * @return 配送结果
+ */
+ @PostMapping("/shop/deliverOrder")
+ R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO);
+
+ /**
+ * 订单完成配送
+ *
+ * @param deliverDTO
+ * 订单信息
+ * @return 配送完成结果
+ */
+ @PostMapping("/shop/finishDeliverOrder")
+ R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO);
+
+ /**
+ * 获取用户商户详情
+ *
+ * @param userId
+ * 用户ID
+ */
+ @GetMapping("/shop/getUserStoreInfo")
+ R getUserStoreInfo(@RequestParam("userId") Long userId);
+
+ /**
+ * 获取用户商户详情
+ *
+ * @param account
+ * 用户账号
+ */
+ @GetMapping("/shop/getUserStoreInfoByAccount")
+ R<ShopStoreVO> getUserStoreInfoByAccount(@RequestParam("account") String account);
+
+ /**
+ * 订单导出信息
+ *
+ * @param comShopOrderExportDTO
+ * 订单导出信息
+ * @return 订单导出信息
+ */
+ @PostMapping("/shop/shopOrderExportData")
+ R shopOrderExportData(@RequestBody ComShopOrderExportDTO comShopOrderExportDTO);
+
+ /**
+ * 资金管理导出信息
+ *
+ * @param comShopFundsExportDTO
+ * 资金管理导出信息
+ * @return 资金管理导出信息
+ */
+ @PostMapping("/shop/shopOrderFundsExportData")
+ R shopOrderFundsExportData(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO);
+
+ /**
+ * 店铺资金统计信息
+ *
+ * @param userId
+ * 用户ID
+ * @return 店铺资金统计信息
+ */
+ @GetMapping("/shop/getFundsStat")
+ R getFundsStat(@RequestParam("userId") Long userId);
+
+ /**
+ * 店铺资金统计信息
+ *
+ * @param pageComShopFundsSearchDTO
+ * 店铺资金
+ * @return 店铺资金统计信息
+ */
+ @PostMapping("/shop/pageShopFunds")
+ R pageShopFunds(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO);
+
+ /**
+ * 微信支付订单回调
+ *
+ * @param wxPayNotifyOrderDTO
+ * 订单支付回调参数
+ */
+ @PostMapping("/shop/wxOrderPayNotify")
+ void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO);
+
+ /**
+ * 点击去支付订单
+ *
+ * @param orderPayDTO
+ * 请求参数
+ * @return 支付对象
+ */
+ @PostMapping("/shop/wxPay")
+ R wxPay(@RequestBody OrderPayDTO orderPayDTO);
+
+ /**
+ * 编辑实有人口
+ *
+ * @param populationEditDTO
+ * @return
+ */
+ @PostMapping("/common/data/population/edit")
+ R editPopulation(@RequestBody ComMngPopulationEditDTO populationEditDTO,
+ @RequestParam("communityId") Long communityId);
+
+ /**
+ * 微心愿删除
+ *
+ * @param id
+ * 微心愿id
+ */
+ @PostMapping("deletemicrowish")
+ R deletemicrowish(@RequestParam("id") Long id);
+
+ /**
+ * 基础数据》特殊群体》分页查询
+ *
+ * @param pageInputUserDTO
+ * @return
+ */
+ @PostMapping("common/data/special/page")
+ R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO);
+
+ /**
+ * 删除特殊群体人员
+ *
+ * @param id
+ * 特殊群体id
+ * @return 删除结果
+ */
+ @PostMapping("common/data/special/delete")
+ R deleteSpecialInputUser(@RequestParam(value = "id") Long id,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 办事指南_新增
+ *
+ * @param workGuideVO
+ * 新增信息
+ * @return 新增结果
+ */
+ @PostMapping("/addworkguide")
+ R addWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId") Long userId);
+
+ /**
+ * 办事指南_编辑
+ *
+ * @param workGuideVO
+ * @return 编辑结果
+ */
+ @PostMapping("/editworkguide")
+ R editWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId") Long userId);
+
+ /**
+ * 办事指南_详情
+ *
+ * @param workGuideId
+ * @return 详情
+ */
+ @GetMapping("/detailworkguide")
+ R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 办事指南_分页
+ *
+ * @param pageActWorkGuideDTO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/pageworkguide")
+ R pageWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO);
+
+ /**
+ * 办事指南_删除
+ *
+ * @param workGuideId
+ * 办事指南id
+ * @return 删除结果
+ */
+ @PostMapping("/delectworkguide")
+ R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId);
+
+ /**
+ * 分页查询办事指南-分类管理 pageWorkGuideClassify 分页查询办事指南-分类管理
+ * @param comActWorkGuideClassifyVO 查询参数
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @PostMapping("/workGuide/classify/apage")
+ R pageWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO);
+
+ /**
+ * 办事指南-分类管理新增或修改 addWorkGuideClassify 办事指南-分类管理新增或修改
+ * @param comActWorkGuideClassifyVO 新增或修改参数
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @PostMapping("/workGuide/classify/add")
+ R addWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO);
+
+ /**
+ * 办事指南-分类管理删除 deleteWorkGuideClassify 办事指南-分类管理删除
+ * @param workGuideClassifyId 办事指南-分类管理id
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @GetMapping("/workGuide/classify/delete")
+ R deleteWorkGuideClassify(@RequestParam("workGuideClassifyId") Long workGuideClassifyId);
+
+ /**
+ * 办事指南-分类管理列表查询 getWorkGuideClassifyList 办事指南-分类管理列表查询
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @GetMapping("/workGuide/classify/getList")
+ R getWorkGuideClassifyList(@RequestParam("areaCode")String areaCode);
+
+ /**
+ * 分页查询邻里圈
+ *
+ * @param neighborCircleAppDTO
+ * 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighborWest/pageNeighborByApp")
+ R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);
+
+ /**
+ * 用户发布邻里圈审核
+ *
+ * @param addNeighborCircleAppDTO
+ * 邻里圈请求参数
+ * @return 发布结果
+ */
+ @PostMapping("/neighborWest/addNeighborByApp")
+ R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO);
+
+ /**
+ * 用户查看邻里圈详情
+ *
+ * @param neighborCircleAppDTO
+ * 请求参数
+ * @return 邻里圈详情
+ */
+ @PostMapping("/neighborWest/neighborDetailByApp")
+ R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO);
+
+ /**
+ * 管理后台查询邻里圈列表
+ *
+ * @param comActNeighborCircleAdminDTO
+ * 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighborWest/pageNeighborByAdmin")
+ R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
+
+ /**
+ * 后台修改邻里圈
+ *
+ * @param editNeighborCircleAdminVO
+ * 请求参数
+ */
+ @PostMapping("/neighborWest/changeStatusByAdmin")
+ R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);
+
+ /**
+ * 邻里圈_后台删除
+ *
+ * @param id
+ * 邻里圈id
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighborWest/deleteByAdmin")
+ R deleteByAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 查看邻里圈基础_详情
+ *
+ * @param id
+ * 邻里圈id
+ * @return 邻里圈列表
+ */
+ @GetMapping("/neighborWest/detailNeighborByAdmin")
+ R detailNeighborByAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 邻里圈的所有评论_分页
+ *
+ * @param dto
+ * 请求参数
+ * @return 评论列表
+ */
+ @PostMapping("/neighborWest/detailNeighborAllCommentByAdmin")
+ R detailNeighborAllCommentByAdmin(@RequestBody DetailNeighborAllCommentByAdminDTO dto);
+
+ /**
+ * 评论的状态_修改
+ *
+ * @param vo
+ * 请求参数
+ */
+ @PostMapping("/neighborWest/changeCommentStatusByAdmin")
+ R changeCommentStatusByAdmin(@RequestBody ChangeCommentStatusByAdminVO vo);
+
+ /**
+ * 邻里圈评论_详情
+ *
+ * @param id
+ * 评论id
+ */
+ @GetMapping("/neighborWest/detailNeighborCommentByAdmin")
+ R detailNeighborCommentByAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 用户查询邻里圈列表
+ *
+ * @param neighborCircleAppDTO
+ * 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighborWest/neighborExamineByApp")
+ R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);
+
+ /**
+ * 邻里圈点赞
+ *
+ * @param fabulousAppDTO
+ * 请求参数
+ * @return 点赞结果
+ */
+ @PostMapping("/neighborWest/neighborFabulousByApp")
+ R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO);
+
+ /**
+ * 邻里圈转发
+ *
+ * @param forwardAppDTO
+ * 请求参数
+ * @return 转发结果
+ */
+ @PostMapping("/neighborWest/neighborForwardByApp")
+ R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO);
+
+ /**
+ * 邻里圈评论
+ *
+ * @param commentAppDTO
+ * 请求参数
+ * @return 评论结果
+ */
+ @PostMapping("/neighborWest/neighborCommentByApp")
+ R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO);
+
+ /**
+ * 邻里圈回复
+ *
+ * @param replyAppDTO
+ * 请求参数
+ * @return 回复结果
+ */
+ @PostMapping("/neighborWest/neighborReplyByApp")
+ R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO);
+
+ /**
+ * 定时任务更新邻里圈近3天评论数/点赞数/浏览量
+ *
+ * @return 执行结果
+ */
+ @PostMapping("/neighborWest/timeTaskCircleFlow")
+ R timedTaskNeighborCircleRecord();
+
+ /**
+ * 邻里圈评论回复_分页
+ *
+ * @param dto
+ * 参数
+ */
+ @PostMapping("/neighborWest/detailNeighborCommentAllReply")
+ R detailNeighborCommentAllReply(@RequestBody DetailNeighborCommentReplyByAdminDTO dto);
+
+ /**
+ * 邻里圈评论回复_基本详情
+ *
+ * @param id
+ * 参数
+ */
+ @GetMapping("/neighborWest/detailNeighborCommentReply")
+ R detailNeighborCommentReply(@RequestParam("id") Long id);
+
+ /**
+ * 评论回复状态_修改
+ *
+ * @param changeStatusReplyVO
+ * 参数
+ */
+ @PostMapping("/neighborWest/changeCommentReplyStatusByAdmin")
+ R changeCommentReplyStatusByAdmin(@RequestBody ChangeCommentReplyStatusByAdminVO changeStatusReplyVO);
+
+ /**
+ * 邻里圈取消点赞
+ *
+ * @param fabulousAppDTO
+ * 请求参数
+ * @return 取消点赞结果
+ */
+ @PostMapping("/neighborWest/neighborFabulousCancelByApp")
+ R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO);
+
+ /**
+ * 添加邻里圈浏览记录
+ *
+ * @param addBrowseAppDTO
+ * 请求参数
+ * @return 返回参数
+ */
+ @PostMapping("/neighborWest/neighborAddBrowseByApp")
+ R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO);
+
+ /**
+ * 邻里圈_添加
+ *
+ * @param addNeighborCircleAdminVO
+ * 参数
+ */
+ @PostMapping("/neighborWest/addNeighborByAdmin")
+ R addNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO);
+
+ /**
+ * 分页查询评论下所有回复
+ *
+ * @param commentReplyAppDTO
+ * 请求参数
+ * @return 回复列表
+ */
+ @PostMapping("/neighborWest/neighborCommentReplyByApp")
+ R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO);
+
+ /**
+ * 实有房屋_编辑
+ *
+ * @param villageId
+ * 实有房屋id
+ * @param comMngVillageVO
+ * 请求参数
+ * @return
+ */
+ @PostMapping("/editvillage/{villageId}")
+ R editvillage(@PathVariable("villageId") Long villageId, @RequestBody ComMngVillageVO comMngVillageVO);
+
+ /**
+ * 商城系统配置
+ *
+ * @param comShopSysConfDTO
+ * @return
+ */
+ @PostMapping("/shop/conf/edit")
+ R editShopSysConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO);
+
+ /**
+ * 商城系统配置查询
+ *
+ * @param pageComShopSysConfDTO
+ * @return
+ */
+ @PostMapping("/shop/conf/get")
+ R pageShopSysConf(@RequestBody PageComShopSysConfDTO pageComShopSysConfDTO);
+
+ /**
+ * 编辑实有人口_电子档案
+ *
+ * @param userElectronicFileVO
+ * @return
+ */
+ @PostMapping("/common/data/population/edit/electronicArchives")
+ R editUserElectronicFile(@RequestBody UserElectronicFileVO userElectronicFileVO);
+
+ /**
+ * 实有人口统计
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计结果
+ */
+ @PostMapping("/common/data/population/statistics")
+ R getPopulationTotalByAdmin(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 查询房屋级联菜单
+ *
+ * @param cascadeHouseDTO
+ * 请求参数
+ * @return 菜单列表
+ */
+ @PostMapping("/common/data/population/cascade/list")
+ R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO);
+
+ /**
+ * 分页查询房屋列表
+ *
+ * @param populationHouseAdminDTO
+ * 请求参数
+ * @return 房屋列表
+ */
+ @PostMapping("/common/data/population/page/house")
+ R pageHouse(@RequestBody ComMngPopulationHouseAdminDTO populationHouseAdminDTO);
+
+ /**
+ * 根据id查询实有房屋信息
+ *
+ * @param houseId
+ * 房屋id
+ * @return 房屋信息
+ */
+ @PostMapping("/common/data/population/house/detail")
+ R getHouseDetail(@RequestParam(value = "houseId") Long houseId);
+
+ /**
+ * 编辑实有房屋信息
+ *
+ * @param houseEditAdminDTO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/common/data/population/house/edit")
+ R editHouse(@RequestBody ComMngPopulationHouseEditAdminDTO houseEditAdminDTO);
+
+ /**
+ * 根据房屋id列表删除房屋信息
+ *
+ * @param Ids
+ * 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/common/data/population/house/delete")
+ R deleteHouses(@RequestBody List<Long> Ids);
+
+ /**
+ * 新增实有房屋信息
+ *
+ * @param houseEditAdminDTO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/common/data/population/house/insert")
+ R insertHouse(@RequestBody ComMngPopulationHouseInsertAdminDTO houseEditAdminDTO);
+
+ /**
+ * 实有房屋统计
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计结果
+ */
+ @PostMapping("/common/data/population/house/statistics")
+ R getHouseTotalByAdmin(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 根据社区id查询社区所有省市区
+ *
+ * @param communityId
+ * 社区id
+ * @return 社区所在省市区
+ */
+ @PostMapping("/common/data/village/getRegion")
+ R getRegion(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 统计社区内小区数量
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计小区数量
+ */
+ @PostMapping("/common/data/village/statistics")
+ R villageStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 小区详情
+ *
+ * @param villageId
+ * 小区id
+ * @return 小区详情
+ */
+ @PostMapping("/village/getVillage")
+ R getVillage(@RequestParam("villageId") Long villageId);
+
+ /**
+ * 新增高龄认证
+ *
+ * @param eldersAuthAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/eldersauth/add")
+ R add(@RequestBody EldersAuthAddDTO eldersAuthAddDTO);
+
+ /**
+ * 修改高龄认证
+ *
+ * @param eldersAuthEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eldersauth/edit")
+ R edit(@RequestBody EldersAuthEditDTO eldersAuthEditDTO);
+
+ /**
+ * 分页查找高龄认证
+ *
+ * @param pageEldersAuthDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eldersauth/page")
+ R query(@RequestBody PageEldersAuthDTO pageEldersAuthDTO);
+
+ /**
+ * 删除高龄认证
+ *
+ * @param eldersAuthDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/eldersauth/delete")
+ R delete(@RequestBody EldersAuthDeleteDTO eldersAuthDeleteDTO);
+
+ /**
+ * 查询高龄认证详细信息
+ *
+ * @param id
+ * 高龄认证 id
+ * @return 查找结果
+ */
+ @PostMapping("/eldersauth/{id}")
+ R<EldersAuthDetailsVO> eldersAuthDetails(@PathVariable("id") Long id);
+
+ /**
+ * 获取用户家庭成员
+ *
+ * @param userId
+ * 用户ID
+ * @return
+ */
+ @PostMapping("/eldersauth/getMyfamilyElders/{userId}")
+ R getMyfamilyElders(@PathVariable("userId") Long userId);
+
+ /**
+ * 查询导出高龄老人
+ *
+ * @param pageEldersAuthDTO
+ * @return
+ */
+ @PostMapping("/eldersauth/eldersAuthQuery")
+ R eldersAuthQuery(@RequestBody PageEldersAuthDTO pageEldersAuthDTO);
+
+ /**
+ * 通过家庭成员ID添加
+ *
+ * @param eldersAuthAddByFamilyDTO
+ * 添加信息
+ * @return
+ */
+ @PostMapping("/eldersauth/addByFamilyUser")
+ R addByFamilyUser(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO);
+
+ /**
+ * 添加高龄认证反馈
+ *
+ * @param eldersAuthFeedbackAddDTO
+ * @return
+ */
+ @PostMapping("/eldersauth/addFeedback")
+ R addFeedback(@RequestBody EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO);
+
+ //2021-8-30 身份认证改版（高龄老人认证管理）接口
+ /**
+ * 分页查询高龄老人认证记录 pageElderAuthRecords 分页查询高龄老人认证记录
+ * @param pageElderAuthRecordsDTO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/elders/authRecords/page")
+ R pageElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
+
+ /**
+ * 根据高龄认证记录id查询详情 detailElderAuthRecords 根据高龄认证记录id查询详情
+ * @param authRecordId 高龄认证记录id
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @GetMapping("/elders/authRecords/detail")
+ R detailElderAuthRecords(@RequestParam(value = "authRecordId") Long authRecordId);
+
+ /**
+ * 高龄认证审核 examineElderAuthRecords 高龄认证审核
+ * @param comElderAuthRecordVO 高龄认证审核参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/elders/authRecords/examine")
+ R examineElderAuthRecords(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
+
+ /**
+ * 高龄认证标记 examineElderAuthRecords 高龄认证标记
+ * @param comElderAuthRecordVO 高龄认证标记参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/elders/authRecords/sign")
+ R signElderAuthRecords(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
+
+ /**
+ * 根据高龄认证记录id批量查询 getElderAuthRecordsByIds 根据高龄认证记录id批量查询
+ * @param ids 高龄认证记录id集合
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/elders/authRecords/getList")
+ R getElderAuthRecordsByIds(@RequestBody List<Long> ids);
+
+ /**
+ * 导出高龄认证统计记录 exportElderAuthRecordsStatistic
+ * @param pageElderAuthRecordsDTO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/elders/authRecords/statistic/export")
+ R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthStatisticDTO pageElderAuthRecordsDTO);
+
+ /**
+ * 导出高龄认证记录 exportElderAuthRecords 导出高龄认证记录
+ * @param pageElderAuthRecordsDTO 查询参数
+ * @return R 查询结果
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/elders/authRecords/export")
+ R exportElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
+
+ /**
+ * 分页查询养老金人员认证记录 pagePensionAuthRecords 分页查询养老金人员认证记录
+ * @param pageElderAuthRecordsDTO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/07 14:03
+ */
+ @PostMapping("/elders/pensionAuthRecords/page")
+ R pagePensionAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
+
+ /**
+ * 根据养老认证记录id查询详情 detailPensionAuthRecords 根据养老认证记录id查询详情
+ * @param authRecordId 养老认证记录id
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/07 11:03
+ */
+ @GetMapping("/elders/pensionAuthRecords/detail")
+ R detailPensionAuthRecords(@RequestParam(value = "authRecordId") Long authRecordId);
+
+ /**
+ * 养老认证审核 examinePensionAuthRecords 养老认证审核
+ * @param comPensionAuthRecordVO 养老认证审核参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/07 11:03
+ */
+ @PostMapping("/elders/pensionAuthRecords/examine")
+ R examinePensionAuthRecords(@RequestBody ComPensionAuthRecordVO comPensionAuthRecordVO);
+
+ /**
+ * 养老认证标记 signPensionAuthRecords 养老认证标记
+ * @param comPensionAuthRecordVO 养老认证标记参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/elders/pensionAuthRecords/sign")
+ R signPensionAuthRecords(@RequestBody ComPensionAuthRecordVO comPensionAuthRecordVO);
+
+ /**
+ * 根据养老认证记录id批量查询 getPensionAuthRecordsByIds 根据养老认证记录id批量查询
+ * @param ids 养老认证记录id集合
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/elders/pensionAuthRecords/getList")
+ R getPensionAuthRecordsByIds(@RequestBody List<Long> ids);
+
+ /**
+ * 导出养老认证记录 exportPensionAuthRecordsStatistic 导出养老认证记录
+ * @param pageElderAuthRecordsDTO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/elders/pensionAuthRecords/statistic/export")
+ R exportPensionAuthRecordsStatistic(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
+
+ /**
+ * 查询养老认证社区认证方式 setPensionAuthType 查询养老认证社区认证方式
+ * @param eldersAuthTypeQueryDTO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/10 16:03
+ */
+ @PostMapping("/elders/pensionAuthRecords/authtype")
+ R communityPensionAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);
+
+ /**
+ * 设置当前社区养老认证方式:核验类型（1.视频认证 2.人脸核验） setPensionAuthType 设置当前社区养老认证方式:核验类型（1.视频认证 2.人脸核验）
+ * @param communityId 社区id
+ * @param type 检验类型
+ * @return R 设置结果
+ * @author txb
+ * @date 2021/9/10 16:03
+ */
+ @PutMapping("/elders/pensionAuthRecords/authType/{type}")
+ R setPensionAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);
+
+ /**
+ * 小程序-查询疫苗分类列表
+ *
+ * @return 疫苗分类列表
+ */
+ @PostMapping("/vaccines/app/list")
+ R getVaccinesListByApp();
+
+ /**
+ * 小程序-疫苗类型对应家庭成员接种列表
+ *
+ * @return 疫苗类型对应家庭成员接种列表
+ */
+ @PostMapping("/vaccines/app/user/list")
+ R getVaccinesUserListByApp(@RequestBody VaccinesEnrollUserByAppDTO enrollUserByAppDTO);
+
+ /**
+ * 小程序-报名疫苗
+ *
+ * @param enrollByAppDTO
+ * 请求参数
+ * @return 报名结果
+ */
+ @PostMapping("/vaccines/app/enroll")
+ R VaccinesEnrollByApp(@RequestBody VaccinesEnrollByAppDTO enrollByAppDTO);
+
+ /**
+ * 小程序-查询用户家庭成员接种记录
+ *
+ * @param userId
+ * 用户id
+ * @return 用户家庭成员接种记录
+ */
+ @PostMapping("/vaccines/app/user/inoculation/list")
+ R getVaccinesUserInoculationListByApp(@RequestParam("userId") Long userId);
+
+ /**
+ * 后台管理-查询疫苗分类列表
+ *
+ * @param vaccinesByAdminDTO
+ * 请求参数
+ * @return 疫苗分类列表
+ */
+ @PostMapping("/vaccines/admin/list")
+ R getVaccinesListByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 修改疫苗分类信息
+ *
+ * @param vaccinesByAdminDTO
+ * 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/vaccines/admin/edit")
+ R editVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 新增疫苗分类信息
+ *
+ * @param vaccinesByAdminDTO
+ * 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/vaccines/admin/add")
+ R addVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 查询疫苗登记列表
+ *
+ * @param vaccinesByAdminDTO
+ * 请求参数
+ * @return 登记列表
+ */
+ @PostMapping("/vaccines/admin/enroll/list")
+ R getVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 删除疫苗分类信息
+ *
+ * @param id
+ * 疫苗分类id
+ * @return 删除结果
+ */
+ @PostMapping("/vaccines/admin/enroll/delete")
+ R deleteVaccinesByAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 根据条件导出登记列表
+ *
+ * @param vaccinesByAdminDTO
+ * 请求参数
+ * @return 登记列表
+ */
+ @PostMapping("/vaccines/admin/enroll/export")
+ R exportVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 查询接种记录列表
+ *
+ * @param inoculationByAdminDTO
+ * 请求参数
+ * @return 接种记录列表
+ */
+ @PostMapping("/vaccines/admin/inoculation/list")
+ R getVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO);
+
+ /**
+ * 接种记录信息导出
+ *
+ * @param inoculationByAdminDTO
+ * 请求参数
+ * @return 导出结果
+ */
+ @PostMapping("/vaccines/admin/inoculation/export")
+ R exportVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO);
+
+ /**
+ * 查询疫苗分类列表
+ *
+ * @return 疫苗分类列表
+ */
+ @PostMapping("/vaccines/admin/enroll/type/list")
+ R getEnrollTypeListByAdmin();
+
+ /**
+ * 查询老龄认证记录
+ *
+ * @param pageComEldersRecordsDTO
+ * @return
+ */
+ @PostMapping("/elders/records")
+ R queryEldersRecord(@RequestBody PageComEldersRecordsDTO pageComEldersRecordsDTO);
+
+ /**
+ * 查询老龄认证记录详细
+ *
+ * @param id
+ * @return
+ */
+ @PostMapping("/elders/records/deatils")
+ R<ComEldersAuthElderlyDetailsVO> comEldersAuthElderlyDetails(@RequestParam("id") Long id);
+
+ /**
+ * 查询老龄认证社区认证方式
+ *
+ * @param eldersAuthTypeQueryDTO
+ * @return
+ */
+ @PostMapping("/elders/authType")
+ R communityElderAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);
+
+ /**
+ * 分页查询高领老人列表
+ *
+ * @param pageEldersAuthElderlyDTO
+ * @return
+ */
+ @PostMapping("/eldersauthelderly/page")
+ R pageQueryEldersAuthElderly(@RequestBody PageEldersAuthElderlyDTO pageEldersAuthElderlyDTO);
+
+ /**
+ * 批量保存高龄老人
+ *
+ * @param newVoList
+ * @param communityId
+ * @return
+ */
+ @PostMapping("/eldersauthelderly/batchSave")
+ R listSaveEldersAuthElderlyExcelVO(@RequestBody List<EldersAuthElderlyExcelVO> newVoList,
+ @RequestParam("communityId") Long communityId, @RequestParam("createBy") Long createBy);
+
+ /**
+ * 批量保存楼栋
+ *
+ * @param newVoList
+ * @param communityId
+ * @return
+ */
+ @PostMapping("/building/batchSave")
+ R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList,
+ @RequestParam("communityId") Long communityId);
+
+ /**
+ * 插入字典
+ *
+ * @param dictionaryVO
+ * 字典数据
+ * @return R 是否保存成功
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("/dictionary/insertDiction")
+ R insertDiction(@RequestBody DictionaryVO dictionaryVO);
+
+ /**
+ * 插入字典项
+ *
+ * @param dictionaryVO
+ * 字典数据
+ * @return R 是否保存成功
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("/dictionary/insertDictionItem")
+ R insertDictionItem(@RequestBody BcDictionaryVO dictionaryVO);
+
+ /**
+ * 根据字典key查询字典项
+ *
+ * @param key
+ * @return
+ */
+ @GetMapping("/dictionary/listDictionaryByKey")
+ R<List<BcDictionaryVO>> listDictionaryByKey(@RequestParam("key") String key);
+
+ /**
+ * description 根据字典code查询自典项
+ *
+ * @param code
+ * 入参参数
+ * @return BcDictionaryVO 字典
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @GetMapping("/dictionary/getByCode")
+ BcDictionaryItemVO getByCode(@RequestParam("dictId") String dictId, @RequestParam("code") String code);
+
+ /**
+ * 查看高龄老人详情
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("/eldersauthelderly/{id}")
+ R getEldersAuthElderlyById(@PathVariable("id") Long id);
+
+ /**
+ * 修改高龄老人信息
+ *
+ * @param eldersAuthElderlyDTO
+ * @return
+ */
+ @PostMapping("/eldersauthelderly/update")
+ R updateEldersAuthElderly(@RequestBody EldersAuthElderlyDTO eldersAuthElderlyDTO);
+
+ /**
+ * 删除高领老人
+ *
+ * @param id
+ * @return
+ */
+ @PostMapping("/eldersauthelderly/delete")
+ R deleteEldersAuthElderly(@RequestParam("id") Long id);
+
+ /**
+ * 通过老人用户id获取老人信息
+ *
+ * @param authUserId
+ * 老人用户id
+ * @return 老人信息
+ */
+ @PostMapping("/elders/getAuth")
+ R getEldersAuthUserByApp(@RequestParam("authUserId") Long authUserId);
+
+ /**
+ * 人脸核验新增高龄认证记录
+ *
+ * @param authGetResultDTO
+ * 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/elders/add/auth")
+ R addEldersAuthByApp(@RequestBody ComEldersAuthGetResultDTO authGetResultDTO);
+
+ /**
+ * 高龄认证分页接口
+ *
+ * @param authPageDTO
+ * 请求参数
+ * @return 查询结果
+ */
+ @PostMapping("/elders/page/auth")
+ R pageEldersByApp(@RequestBody ComEldersAuthPageDTO authPageDTO);
+
+ /**
+ * 添加高龄老人接口
+ *
+ * @param authUserAddAppDTO
+ * 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/elders/add")
+ R addEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO);
+
+ /**
+ * 修改高龄老人接口
+ *
+ * @param authUserAddAppDTO
+ * 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/elders/edit")
+ R editEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO);
+
+ /**
+ * 分页查询生存认证记录
+ *
+ * @param pageEldersAuthElderlyDTO
+ * @return
+ */
+ @PostMapping("/elders/records/page")
+ R pageQueryEldersAuthRecord(@RequestBody PageEldersAuthRecordDTO pageEldersAuthElderlyDTO);
+
+ /**
+ * description 批量保存重点人群人员信息
+ *
+ * @param list
+ * 重点人群信息
+ * @return R 保存结果
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("/key_person/batch/save")
+ R saveBatchKeyPerson(@RequestBody List<KeyPersonInfoDTO> list);
+
+ @GetMapping("/screen/population/statistic")
+ R statistic(@RequestParam("communityId") Long communityId);
+
+ /**
+ * @param communityId
+ * @param type
+ * @return
+ */
+ @PostMapping("/elders/setCommunityAuthType")
+ R setCommunityAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);
+
+ @PostMapping("/elders/getAuthHistoryList")
+ R getAuthHistoryList(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);
+
+ @PostMapping("/elders/getAuthHistoryExport")
+ R getAuthHistoryExport(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);
+
+ @GetMapping("/screen/work/neighborCircle")
+ R statisticNeighborCircle(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 党员党支部统计信息
+ *
+ * @return
+ */
+ @PostMapping("/bigscreen/party/orgmembers")
+ R bigscreenPartyOrgmembers(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg);
+
+ /**
+ * 党员年龄占比、男女占比
+ *
+ * @return
+ */
+ @PostMapping("/bigscreen/party/ageGender")
+ R<BigScreenStatisticAgeGender>
+ ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO);
+
+ /**
+ * 党建数据概览
+ *
+ * @return
+ */
+ @PostMapping("/bigscreen/party/partybuild/{communityId}")
+ R<BigScreenStatisticPartyBuild> bigscreenPartybuild(@PathVariable("communityId") Long communityId);
+
+ /**
+ * 党员活动参加用户排行榜-TOP3
+ *
+ * @return
+ */
+ @PostMapping("/bigscreen/party/activitytopuser/{communityId}")
+ R<List<PartyBuildingMemberVO>> bigscreenPartyactivitytopuser(@PathVariable("communityId") Long communityId);
+
+ /**
+ * 党员活动
+ *
+ * @return
+ */
+ @PostMapping("/bigscreen/party/bigscreenPartyactivity")
+ R<List<BigScreenStatisticPartyActivity>>
+ bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);
+
+ /**
+ * 首页大屏统计接口
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计结果
+ */
+ @GetMapping("/screen/getScreenIndex")
+ R getScreenIndex(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 事件大屏统计接口
+ *
+ * @param screenEventDTO
+ * 请求参数
+ * @return 统计结果
+ */
+ @PostMapping("/screen/getScreenEvent")
+ R getScreenEvent(@RequestBody BigScreenEventDTO screenEventDTO);
+
+ /**
+ * 民生大屏统计接口
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计结果
+ */
+ @GetMapping("/screen/getScreenCivil")
+ R getScreenCivil(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大屏统计邻里圈
+ */
+ @GetMapping("/screen/work/wish")
+ R wish(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大屏统计社区-活动
+ *
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/work/activity")
+ R activity(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大屏统计议事投票
+ *
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/work/discuss")
+ R discuss(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大屏统计党建工作
+ *
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/work/pbWork")
+ R pbWork(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大屏统计随手拍
+ *
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/work/easyPhoto")
+ R easyPhoto(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大屏统计工作情况
+ *
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/work/workCount")
+ R workCount(@RequestParam("communityId") Long communityId);
+
+ /**
+ * description 批量保存残疾人人员信息
+ *
+ * @param list
+ * 疾人信息列表
+ * @return R 保存结果
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("/disable_person/batch/save")
+ R saveBatchDisabledPersons(@RequestBody List<DisabledPersonsDTO> list);
+
+ /**
+ * 获取社区网格
+ *
+ * @param communityId
+ * 社区id
+ * @return 网格数据
+ */
+ @GetMapping("/screen/getScreenGirds")
+ R getScreenGirds(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 事件大屏查询事件详情
+ *
+ * @param eventDetailDTO
+ * 请求参数
+ * @return 事件详情
+ */
+ @PostMapping("/screen/getScreenEventDetail")
+ R getScreenEventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO);
+
+ /**
+ * 工作大屏-议事投票列表
+ *
+ * @param discussListDTO
+ * 请求参数
+ * @return 议事投票列表
+ */
+ @PostMapping("/screen/work/getScreenDiscussList")
+ R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO);
+
+ /**
+ * 工作大屏-社区活动列表
+ *
+ * @param actActivityListDTO
+ * 请求参数
+ * @return 活动列表
+ */
+ @PostMapping("/screen/work/getScreenActActivityList")
+ R getScreenActActivityList(@RequestBody ScreenActActivityListDTO actActivityListDTO);
+
+ /**
+ * 工作大屏-社区活动报名人员列表
+ *
+ * @param activityPeopleListDTO
+ * 请求参数
+ * @return 社区活动报名人员列表
+ */
+ @PostMapping("/screen/work/getActActivityPeopleList")
+ R getActActivityPeopleList(@RequestBody ScreenActActivityPeopleListDTO activityPeopleListDTO);
+
+ /**
+ * 工作大屏-微心愿列表
+ *
+ * @param microListDTO
+ * 请求参数
+ * @return 微心愿列表
+ */
+ @PostMapping("/screen/work/getScreenMicroList")
+ R getScreenMicroList(@RequestBody ScreenMicroListDTO microListDTO);
+
+ /**
+ * 获取系统参数接口
+ *
+ * @param code
+ * 参数code
+ * @return 系统参数
+ */
+ @GetMapping("/sys/conf/get")
+ R getConf(@RequestParam("code") String code);
+
+ /**
+ * 获取人口数据信息
+ *
+ * @param populationListDTO
+ * 请求参数
+ * @return 人口数据
+ */
+ @PostMapping("/population/list/app")
+ R getPopulationListByApp(@RequestBody PagePopulationListDTO populationListDTO);
+
+ /**
+ * 根据人口id获取人口详情
+ *
+ * @param populationId
+ * 人口id
+ * @return 人口详情
+ */
+ @GetMapping("/population/detail/app")
+ R getPopulationDetailByApp(@RequestParam("populationId") Long populationId);
+
+ /**
+ * 修复人口加密问题
+ *
+ * @return 修复结果
+ */
+ @GetMapping("/population/repair")
+ R getPopulationRepairByApp();
+
+ /**
+ * 工作大屏-社区动态模块数据统计
+ *
+ * @param communityId
+ * 社区id
+ * @return 社区动态数据统计
+ */
+ @GetMapping("/screen/work/dynamic")
+ R dynamicWork(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 查询用户钱包信息
+ *
+ * @param walletDetailDTO
+ * 请求参数
+ * @return 用户钱包信息
+ */
+ @PostMapping("/wallet/get/my")
+ R getUserWalletDetail(@RequestBody ComActWalletDetailDTO walletDetailDTO);
+
+ /**
+ * 查询用户收支记录列表
+ *
+ * @param walletTradeDTO
+ * 请求参数
+ * @return 收支记录
+ */
+ @PostMapping("/wallet/get/trade")
+ R getUserWalletTrade(@RequestBody PageComActWalletTradeDTO walletTradeDTO);
+
+ /**
+ * 查询用户绑定的社区收益排行榜
+ *
+ * @param walletTradeDTO
+ * 请求参数
+ * @return 社区收益排行榜
+ */
+ @PostMapping("/wallet/get/ranking")
+ R getWalletRanking(@RequestBody PageComActWalletTradeDTO walletTradeDTO);
+
+ /**
+ * 综治后台-居民列表
+ *
+ * @param populationListDTO
+ * 请求参数
+ * @return 居民列表
+ */
+ @PostMapping("/population/grid/list")
+ R getGridPopulationList(@RequestBody ComMngPopulationListDTO populationListDTO);
+
+ /**
+ * 综治后台-删除居民
+ *
+ * @param ids
+ * 居民id集合
+ * @return 删除结果
+ */
+ @PostMapping("/population/grid/del")
+ R delGridPopulation(@RequestBody List<Long> ids);
+
+ /**
+ * 综治后台-居民详情
+ *
+ * @param populationId
+ * 居民id
+ * @return 居民详情
+ */
+ @GetMapping("/population/grid/get")
+ R getGridPopulationDetail(@RequestParam("populationId") Long populationId);
+
+ /**
+ * 综治app-小区列表
+ *
+ * @param villageListAppDTO
+ * 请求参数
+ * @return 小区列表
+ */
+ @PostMapping("/village/grid/list")
+ R getGridVillageList(@RequestBody ComMngVillageListAppDTO villageListAppDTO);
+
+ /**
+ * 综治app-根据小区id查询小区下楼栋列表
+ *
+ * @param villageId
+ * 小区id
+ * @return 楼栋列表
+ */
+ @PostMapping("/village/grid/building/list")
+ R getGridVillageBuildingList(@RequestParam("villageId") Long villageId);
+
+ /**
+ * 小区楼栋下房屋列表
+ *
+ * @param buildHouseAppDTO
+ * 请求参数
+ * @return 房屋列表
+ */
+ @PostMapping("/village/grid/building/house/list")
+ R getGridVillageBuildingHouseList(@RequestBody PageComMngVillageBuildHouseAppDTO buildHouseAppDTO);
+
+ /**
+ * 小区楼栋下房屋信息
+ *
+ * @param houseId
+ * 房屋id
+ * @return 房屋信息
+ */
+ @PostMapping("/village/grid/building/house/detail")
+ R getGridVillageBuildingHouseDetail(@RequestParam("houseId") Long houseId);
+
+ /**
+ * 查询平台人口列表
+ *
+ * @param populationDTO
+ * 请求参数
+ * @return 人口列表
+ */
+ @PostMapping("/village/grid/building/house/population/list")
+ R getBuildingHousePopulationList(@RequestBody PageComMngPopulationDTO populationDTO);
+
+ /**
+ * 批量向房屋新增人员
+ *
+ * @param housePopulationDTO
+ * 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/village/grid/building/house/add/population")
+ R addBuildingHousePopulation(@RequestBody AddComMngHousePopulationDTO housePopulationDTO);
+
+ /**
+ * 批量删除房屋内人员
+ *
+ * @param housePopulationDTO
+ * 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/village/grid/building/house/del/population")
+ R delBuildingHousePopulation(@RequestBody DelComMngHousePopulationDTO housePopulationDTO);
+
+ /**
+ * 综治后台-居民标签栏统计
+ *
+ * @return 居民统计
+ */
+ @GetMapping("/population/grid/statistics")
+ R getGridPopulationStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 综治后台-居民导出查询居民数据
+ *
+ * @param populationExportDTO
+ * 请求参数
+ * @return 导出结果
+ */
+ @PostMapping("/population/grid/export")
+ R getGridPopulationExport(@RequestBody ComMngPopulationExportDTO populationExportDTO);
+
+ /**
+ * 综治后台-居民管理小区列表
+ *
+ * @param name
+ * 小区名字
+ * @return 小区列表
+ */
+ @GetMapping("/population/village/relation")
+ R relationVillage(@RequestParam("name") String name);
+
+ /**
+ * 综治后台-居民管理-级联列表
+ *
+ * @param subordinateDTO
+ * 请求参数
+ * @return 级联列表
+ */
+ @PostMapping("/population/subordinate")
+ R subordinate(@RequestBody ComMngPopulationSubordinateDTO subordinateDTO);
+
+ /**
+ * 综治后台-居民关联房屋
+ *
+ * @param relationHouseDTO
+ * 请求参数
+ * @return 关联结果
+ */
+ @PostMapping("/population/relation/house")
+ R populationRelationHouse(@RequestBody ComMngPopulationRelationHouseDTO relationHouseDTO);
+
+ /**
+ * 综治后台-批量删除小区
+ *
+ * @param villageIds
+ * 小区id集合
+ * @return 删除结果
+ */
+ @PostMapping("/village/admin/del")
+ R delGridVillage(@RequestBody List<Long> villageIds);
+
+ /**
+ * 综治后台-小区内居民列表
+ *
+ * @param villagePopulationDTO
+ * 请求参数
+ * @return 居民列表
+ */
+ @PostMapping("/village/admin/population/list")
+ R getVillagePopulationAdmin(@RequestBody PageComMngVillagePopulationDTO villagePopulationDTO);
+
+ /**
+ * 综治后台-居民下房屋列表
+ *
+ * @param villagePopulationHouseDTO
+ * 请求参数
+ * @return 房屋列表
+ */
+ @PostMapping("/village/admin/population/house/list")
+ R getVillagePopulationHouseAdmin(@RequestBody PageComMngVillagePopulationHouseDTO villagePopulationHouseDTO);
+
+ /**
+ * 综治后台-小区统计
+ *
+ * @return 小区统计结果
+ */
+ @GetMapping("/village/admin/statistics")
+ R getGridVillageStatistics();
+
+ /**
+ * 综治后台-小区列表导出
+ *
+ * @param villageListAppDTO
+ * 请求参数
+ * @return 小区列表
+ */
+ @PostMapping("/village/admin/export")
+ R getGridVillageListExport(@RequestBody ComMngVillageListExportAdminDTO villageListAppDTO);
+
+ /**
+ * 社区后台-分页查询随手拍活动列表
+ *
+ * @param pageEasyPhotoActivityDTO
+ * 请求参数
+ * @return 随手拍活动列表
+ */
+ @PostMapping("/easy/photo/activity/page")
+ R pageEasyPhotoActivity(@RequestBody PageEasyPhotoActivityDTO pageEasyPhotoActivityDTO);
+
+ /**
+ * 社区后台-添加随手拍活动
+ *
+ * @param addEasyPhotoActivityDTO
+ * 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/easy/photo/activity/add")
+ R addEasyPhotoActivity(@RequestBody AddEasyPhotoActivityDTO addEasyPhotoActivityDTO);
+
+ /**
+ * 社区后台-编辑随手拍活动
+ *
+ * @param editEasyPhotoActivityDTO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/easy/photo/activity/edit")
+ R editEasyPhotoActivity(@RequestBody EditEasyPhotoActivityDTO editEasyPhotoActivityDTO);
+
+ /**
+ * 社区后台-取消随手拍活动
+ *
+ * @param id
+ * 随手拍活动id
+ * @return 取消结果
+ */
+ @GetMapping("/easy/photo/activity/cancel")
+ R cancelEasyPhotoActivity(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询随手拍活动下居民参与记录
+ *
+ * @param pageEasyPhotoActivityUserDTO
+ * 请求参数
+ * @return 居民参与记录
+ */
+ @PostMapping("/easy/photo/activity/page/user")
+ R pageEasyPhotoActivityUser(@RequestBody PageEasyPhotoActivityUserDTO pageEasyPhotoActivityUserDTO);
+
+ /**
+ * 随手拍活动定时任务
+ *
+ * @return 执行结果
+ */
+ @PostMapping("timeTaskEasyPhotoActivity")
+ R timedTaskEasyPhotoActivity();
+
+ /**
+ * 分页查询收益结算列表
+ *
+ * @param pageWalletAdminDTO
+ * 请求参数
+ * @return 收益结算列表
+ */
+ @PostMapping("/user/wallet/page")
+ R pageUserWalletAdmin(@RequestBody PageComActWalletAdminDTO pageWalletAdminDTO);
+
+ /**
+ * 用户结算收益
+ *
+ * @param settlementAdminDTO
+ * 请求参数
+ * @return 结算结果
+ */
+ @PostMapping("/user/wallet/settlement")
+ R userWalletSettlementAdmin(@RequestBody ComActWalletSettlementAdminDTO settlementAdminDTO);
+
+ /**
+ * 分页查询交易记录
+ *
+ * @param pageTradeAdminDTO
+ * 请求参数
+ * @return 交易记录列表
+ */
+ @PostMapping("/user/wallet/trade/page")
+ R pageUserWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);
+
+ /**
+ * 查询用户交易记录总额
+ *
+ * @param pageTradeAdminDTO
+ * 请求参数
+ * @return 交易记录总额
+ */
+ @PostMapping("/user/wallet/trade/total")
+ R getTradeUserTotalWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);
+
+ /**
+ * 查询用户导出数据
+ *
+ * @param pageTradeAdminDTO
+ * 请求参数
+ * @return 用户导出数据
+ */
+ @PostMapping("/user/wallet/trade/export")
+ R getTradeUserTotalWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);
+
+ /**
+ * 导出奖励台账数据
+ *
+ * @param pageTradeAdminDTO
+ * 请求参数
+ * @return 奖励台账数据
+ */
+ @PostMapping("/user/wallet/trade/reward/export")
+ R getTradeUserTotalJLWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);
+
+ /**
+ * 查询社区统计数据
+ *
+ * @param pageTradeAdminDTO
+ * 查询社区统计数据
+ * @return 社区统计数据
+ */
+ @PostMapping("/user/wallet/trade/statistics")
+ R getTradeUserStatisticsAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);
+
+ /**
+ * 社区随手拍列表统计
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计结果
+ */
+ @GetMapping("/easyphoto/statistics")
+ R easyPhotoStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询邻里圈话题列表
+ *
+ * @param circleTopicAdminDTO
+ * 请求参数
+ * @return 邻里圈话题列表
+ */
+ @PostMapping("/neighborWest/pageNeighborTopicByAdmin")
+ R pageNeighborTopicByAdmin(@RequestBody ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO);
+
+ /**
+ * 添加邻里圈话题
+ *
+ * @param addCircleTopicAdminDTO
+ * 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/neighborWest/addNeighborTopicByAdmin")
+ R addNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);
+
+ /**
+ * 编辑邻里圈话题
+ *
+ * @param addCircleTopicAdminDTO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/neighborWest/editNeighborTopicByAdmin")
+ R editNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);
+
+ /**
+ * 小程序查询邻里圈话题列表
+ *
+ * @param communityId
+ * 社区id
+ * @return 邻里圈话题列表
+ */
+ @GetMapping("/neighborWest/getNeighborTopicByApp")
+ R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name);
+
+ /**
+ * 综治后台-查询社区列表
+ *
+ * @return 社区列表
+ */
+ @GetMapping("/eventgrid/community/list")
+ R getCommunityLists();
+
+ /**
+ * 查询西区社区列表
+ *
+ * @return 社区列表
+ */
+ @GetMapping("/eventgrid/community/westList")
+ R getWestCommunityLists(@RequestParam("areaCode")String areaCode);
+
+ /**
+ * 综治app-小区列表
+ * @param villageListAppDTO 请求参数
+ * @return 小区列表
+ */
+ @PostMapping("/village/grid/list/app")
+ R getGridVillageListApp(@RequestBody ComMngVillageListAppDTO villageListAppDTO);
+
+ /**
+ * 分页查询退役军人列表
+ *
+ * @param comExServicemanDTO
+ * 请求参数
+ * @return 退役军人列表
+ */
+ @PostMapping("/population/page/exServiceman")
+ R pageExServiceman(@RequestBody ComExServicemanDTO comExServicemanDTO);
+
+ /**
+ * 分页查询社区动态分类列表
+ *
+ * @param comActDynTypeDTO
+ * 请求参数
+ * @return 动态分类列表
+ */
+ @PostMapping("/dyn/type/page")
+ R pageDynTypeByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 查询社区下所有动态分类列表
+ *
+ * @param comActDynTypeDTO
+ * 请求参数
+ * @return 动态分类列表
+ */
+ @PostMapping("/dyn/type/list")
+ R getDynTypeListByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 添加社区动态分类
+ *
+ * @param comActDynTypeDTO
+ * 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/dyn/type/add")
+ R addDynTypeByAdmin(@RequestBody AddComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 编辑社区动态分类
+ *
+ * @param comActDynTypeDTO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/dyn/type/edit")
+ R editDynTypeByAdmin(@RequestBody EditComActDynTypeDTO comActDynTypeDTO);
+
+ /**
+ * 删除社区动态分类
+ *
+ * @param ids
+ * 社区动态分类id集合
+ * @return 删除结果
+ */
+ @PostMapping("/dyn/type/delete")
+ R deleteDynTypeByAdmin(@RequestBody List<Long> ids);
+
+ /**
+ * 随手拍发放奖励
+ *
+ * @param grantRewardDTO
+ * 请求参数
+ * @return 发放结果
+ */
+ @PostMapping("/easyphoto/grantReward")
+ R grantReward(@RequestBody GrantRewardDTO grantRewardDTO);
+
+ /**
+ * 获取最新活动和用户最新收益
+ *
+ * @param userId
+ * 用户id
+ * @param communityId
+ * 社区id
+ * @return 最新活动和用户最新收益
+ */
+ @PostMapping("/easyphoto/getUserReward")
+ R getUserReward(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 获取首页弹窗接口
+ * @param userId
+ * 用户id
+ * @param communityId
+ * 社区id
+ * @return 首页弹窗接口
+ */
+ @PostMapping("/easyphoto/getUserRewards")
+ R getUserRewards(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 读取用户随手拍奖励
+ *
+ * @param userId
+ * 用户id
+ * @return 读取结果
+ */
+ @PostMapping("/easyphoto/readUserReward")
+ R readUserReward(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询巡查记录
+ *
+ * @param comSwPatrolRecordPageDTO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/patrolRecord/page")
+ R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);
+
+ /**
+ * 新增巡查记录
+ *
+ * @param comSwPatrolRecordAddDTO
+ * 新增参数
+ * @return 新增结果
+ */
+ @PostMapping("/patrolRecord/addPatrolRecord")
+ R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO);
+
+ /**
+ * 编辑巡查记录 editPatrolRecord 编辑巡查记录
+ * @param comSwPatrolRecordEditDTO 编辑巡查记录参数
+ * @return R 编辑结果
+ * @author txb
+ * @date 2021/9/08 17:03
+ */
+ @PostMapping("/patrolRecord/edit")
+ R editPatrolRecord(@RequestBody ComSwPatrolRecordEditDTO comSwPatrolRecordEditDTO);
+
+ /**
+ * 根据巡查记录id查询详情
+ *
+ * @param patrolRecordId
+ * 巡查记录id
+ * @return 巡查记录详情查询结果
+ */
+ @GetMapping("/patrolRecord/detail")
+ R detailPatrolRecord(@RequestParam("patrolRecordId") Long patrolRecordId);
+
+ /**
+ * 分页查询安全工作记录
+ *
+ * @param comSwPatrolRecordPageDTO
+ * 查询参数
+ * @return 安全工作记录分页集合
+ */
+ @PostMapping("/patrolRecord/safetyWorkRecord/page")
+ R pageSafetyWorkRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);
+
+ /**
+ * 编辑安全工作记录 editSafetyWork 编辑安全工作记录
+ * @param comSwSafetyWorkEditDTO 编辑安全工作记录参数
+ * @return R 编辑结果
+ * @author txb
+ * @date 2021/9/08 17:03
+ */
+ @PostMapping("/patrolRecord/safetyWorkRecord/edit")
+ R editSafetyWork(@RequestBody ComSwSafetyWorkEditDTO comSwSafetyWorkEditDTO);
+
+ /**
+ * 根据安全工作记录id查询详情
+ *
+ * @param safetyWorkRecordId
+ * 安全工作记录
+ * @return 安全工作记录详情查询结果
+ */
+ @GetMapping("/patrolRecord/safetyWorkRecord/detail")
+ R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId,
+ @RequestParam(value = "communityId", required = false) Long communityId);
+
+ /**
+ * 根据巡查记录id查询安全工作记录详情
+ *
+ * @param patrolRecordId
+ * 巡查记录id
+ * @return 安全工作记录详情查询结果
+ */
+ @GetMapping("/patrolRecord/safetyWorkRecord/detailByPrId")
+ R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId,
+ @RequestParam(value = "communityId", required = false) Long communityId);
+
+ /**
+ * 分页查询隐患报告
+ *
+ * @param comSwPatrolRecordPageDTO
+ * 查询参数
+ * @return 隐患报告分页集合
+ */
+ @PostMapping("/patrolRecord/dangerReport/page")
+ R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);
+
+ /**
+ * 编辑隐患报告 editDangerReport 编辑隐患报告
+ * @param comSwDangerReportEditDTO 编辑隐患报告参数
+ * @return R 编辑结果
+ * @author txb
+ * @date 2021/9/08 17:03
+ */
+ @PostMapping("/patrolRecord/dangerReport/edit")
+ R editDangerReport(@RequestBody ComSwDangerReportEditDTO comSwDangerReportEditDTO);
+
+ /**
+ * 根据隐患报告id查询详情
+ *
+ * @param dangerReportId
+ * 隐患报告id
+ * @return 隐患报告详情查询结果
+ */
+ @GetMapping("/patrolRecord/dangerReport/detail")
+ R detailDangerReport(@RequestParam(value = "dangerReportId") Long dangerReportId);
+
+ /**
+ * 根据巡查记录id查询隐患报告详情
+ *
+ * @param patrolRecordId
+ * 巡查记录id
+ * @return 隐患报告详情查询结果
+ */
+ @GetMapping("/patrolRecord/dangerReport/detailByPrId")
+ R detailDangerReportByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId);
+
+ /**
+ * 处理隐患报告
+ *
+ * @param comSwDangerReportHandleDTO
+ * 隐患报告处理参数
+ * @return 处理结果
+ */
+ @PostMapping("/patrolRecord/dangerReport/handle")
+ R handleDangerReport(@RequestBody ComSwDangerReportHandleDTO comSwDangerReportHandleDTO);
+
+ /**
+ * 整改隐患报告
+ *
+ * @param comSwDangerReportRectifyDTO
+ * 隐患报告整改参数
+ * @return 整改结果
+ */
+ @PostMapping("/patrolRecord/dangerReport/rectify")
+ R rectifyDangerReport(@RequestBody ComSwDangerReportRectifyDTO comSwDangerReportRectifyDTO);
+
+ /**
+ * 隐患报告台账导出
+ *
+ * @param dangerReportIds
+ * @return
+ */
+ @PostMapping("/patrolRecord/dangerReport/export")
+ R exportDangerReport(@RequestBody List<Long> dangerReportIds);
+
+ /**
+ * 巡查记录统计接口
+ *
+ * @return 统计结果
+ */
+ @GetMapping("/patrolRecord/statistics")
+ R patrolRecordStatistics(@RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 小程序-查询积分说明
+ *
+ * @return 积分说明
+ */
+ @GetMapping("/integral/explain/applets")
+ R getIntegralExplainApplets();
+
+ /**
+ * 小程序-用户查询当前社区可领取积分规则列表
+ *
+ * @param userId
+ * 用户id
+ * @param communityId
+ * 社区id
+ * @return 可领取积分规则列表
+ */
+ @PostMapping("/integral/receive/applets")
+ R getIntegralReceiveApplets(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 小程序-查询用户积分列表
+ *
+ * @param userId
+ * 用户id
+ * @return 用户积分列表
+ */
+ @PostMapping("/integral/user/list/applets")
+ R getIntegralUserListApplets(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 小程序-查询社区积分账户排行榜
+ *
+ * @param communityRankDTO
+ * 请求参数
+ * @return 社区积分账户排行榜
+ */
+ @PostMapping("/integral/community/rank/applets")
+ R getIntegralCommunityRankApplets(@RequestBody ComActIntegralCommunityRankDTO communityRankDTO);
+
+ /**
+ * 小程序-查询用户社区积分明细
+ *
+ * @param communityTradeDTO
+ * 请求参数
+ * @return 用户社区积分明细
+ */
+ @PostMapping("/integral/community/trade/applets")
+ R getIntegralCommunityTradeApplets(@RequestBody ComActIntegralCommunityRankDTO communityTradeDTO);
+
+ /**
+ * 社区后台-根据社区id查询社区下积分规则列表
+ *
+ * @param integralRuleDTO
+ * 请求参数
+ * @return 社区下积分规则列表
+ */
+ @PostMapping("/integral/rule/list/admin")
+ R getIntegralRuleAdminList(@RequestBody PageComActIntegralRuleDTO integralRuleDTO);
+
+ /**
+ * 社区后台-编辑社区积分规则
+ *
+ * @param integralRuleDTO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/integral/rule/edit/admin")
+ R editIntegralRuleAdmin(@RequestBody EditComActIntegralRuleDTO integralRuleDTO);
+
+ /**
+ * 社区后台-分页查询社区下积分明细记录
+ *
+ * @param integralRuleDTO
+ * 请求参数
+ * @return 社区下积分明细记录
+ */
+ @PostMapping("/integral/user/trade/page/admin")
+ R getIntegralTradeListAdmin(@RequestBody PageComActIntegralTradeDTO integralRuleDTO);
+
+ /**
+ * 给用户添加积分
+ *
+ * @param integralUserDTO
+ * 请求参数
+ * @return 添加积分结果
+ */
+ @PostMapping("/integral/user/add/admin")
+ R addIntegralTradeAdmin(@RequestBody AddComActIntegralUserDTO integralUserDTO);
+
+ /**
+ * 根据社区活动id查询社区活动报名且未参与人员列表
+ *
+ * @param activityId
+ * 活动id
+ * @return 社区活动报名且未参与人员列表
+ */
+ @PostMapping("/integral/act/activity/admin")
+ R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId);
+
+ /**
+ * 分页查询值班表
+ *
+ * @param comSwRotaPageDTO
+ * 查询参数
+ * @return 值班表分页集合
+ */
+ @PostMapping("/patrolRecord/rota/page")
+ R pageRota(@RequestBody ComSwRotaPageDTO comSwRotaPageDTO);
+
+ /**
+ * 根据id查询值班表
+ *
+ * @param rotaId
+ * 值班表id
+ * @return 值班表详情
+ */
+ @GetMapping("/patrolRecord/rota/detail")
+ R detailRota(@RequestParam("rotaId") Long rotaId);
+
+ /**
+ * 新增值班表
+ *
+ * @param comSwRotaSaveDTOs
+ * 新增参数
+ * @return 新增结果
+ */
+ @PostMapping("/patrolRecord/rota/add")
+ R addRota(@RequestBody List<ComSwRotaSaveDTO> comSwRotaSaveDTOs);
+
+ /**
+ * 批量删除值班表
+ *
+ * @param rotaIds
+ * 值班ids
+ * @return 删除结果
+ */
+ @PostMapping("/patrolRecord/rota/delete")
+ R deleteRota(@RequestBody List<Long> rotaIds);
+
+ /**
+ * 根据日期查询值班人员
+ *
+ * @return 查询结果
+ */
+ @GetMapping("/patrolRecord/rota/getRotaPersonByDate")
+ R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);
+
+ /**
+ * 根据日期查询值班领导
+ *
+ * @return 查询结果
+ */
+ @GetMapping("/patrolRecord/rota/getRotaLeaderByDate")
+ R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);
+
+ /**
+ * 批量导入值班表
+ *
+ * @param list
+ * 值班表集合
+ */
+ @PostMapping("/patrolRecord/rota/import")
+ R listSaveSwRotaExcelVO(@RequestBody List<ComSwRotaExcelVO> list, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 定时任务检测即将开始的社区活动，并使用订阅消息通知用户
+ */
+ @PostMapping("timedTaskActivityNotice")
+ R timedTaskActivityNotice();
+
+ /**
+ * 定时任务检测待发布，调研中的问卷调查状态
+ */
+ @PostMapping("timedTaskQuestionnaire")
+ R timedTaskQuestionnaire();
+
+ /**
+ * 查询社区所有列表
+ *
+ * @return 社区列表
+ */
+ @GetMapping("/switch/community/all/list")
+ R communitySwitchList(@RequestParam("areaCode") String areaCode);
+
+ /**
+ * 根据名字查询所有社区列表
+ *
+ * @param name
+ * 社区名字
+ * @return 社区列表
+ */
+ @GetMapping("/switch/community/search/list")
+ R communitySwitchSearchList(@RequestParam(value = "name") String name,@RequestParam(value = "areaCode") String areaCode);
+
+ /**
+ * 根据经纬度以及距离搜索附近社区列表
+ *
+ * @param communityDTO
+ * 请求参数
+ * @return 社区列表
+ */
+ @PostMapping("/switch/community/search/distance/list")
+ R communitySwitchSearchDistanceList(@RequestBody SearchCommunityDTO communityDTO);
+
+ /**
+ * 问卷调查统计汇总
+ *
+ * @param summaryDTO
+ * 请求参数
+ * @return 统计汇总
+ */
+ @PostMapping("/questnaire/statisticsSummary")
+ R statisticsSummary(@RequestBody StatisticsSummaryDTO summaryDTO);
+
+ /**
+ * 问卷调查统计汇总导出数据查询
+ *
+ * @param questId
+ * 调查问卷id
+ * @return 调查统计汇总导出数据
+ */
+ @GetMapping("/questnaire/statisticsSummary/export")
+ R statisticsSummaryExport(@RequestParam("questId") Long questId);
+
+ /**
+ * 问卷调查统计汇总表头统计
+ *
+ * @param questId
+ * 调查问卷id
+ * @return 问卷调查统计汇总表头统计数据
+ */
+ @GetMapping("/questnaire/statisticsSummary/header")
+ R statisticsSummaryHeader(@RequestParam("questId") Long questId, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 运营后台-新增随手拍分类
+ *
+ * @param addPhotoClassify
+ * 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/classify/admin/add")
+ R addPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify);
+
+ /**
+ * 运营后台-编辑随手拍分类
+ *
+ * @param addPhotoClassify
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/classify/admin/edit")
+ R editPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify);
+
+ /**
+ * 运营后台-分页查询随手拍分类
+ *
+ * @param addPhotoClassify
+ * 请求参数
+ * @return 随手拍分类列表
+ */
+ @PostMapping("/classify/admin/page")
+ R pagePhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify);
+
+ /**
+ * 运营后台-随手拍分类详情
+ *
+ * @param id
+ * 随手拍分类id
+ * @return 随手拍分类
+ */
+ @GetMapping("/classify/admin/detail")
+ R detailPhotoClassify(@RequestParam("id") Long id);
+
+ /**
+ * 运营后台-随手拍分类删除
+ *
+ * @param id
+ * 随手拍分类id
+ * @return 删除结果
+ */
+ @GetMapping("/classify/admin/delete")
+ R deletePhotoClassify(@RequestParam("id") Long id);
+
+ /**
+ * 运营后台-查询随手拍分类列表
+ *
+ * @return 随手拍分类列表
+ */
+ @GetMapping("/classify/admin/list")
+ R listPhotoClassify(@RequestParam("areaCode") String areaCode);
+
+ /**
+ * 社区后台-切换随手拍公示状态
+ *
+ * @param comActEasyPhotoVO
+ * 请求参数
+ * @return 切换结果
+ */
+ @PostMapping("/easyphoto/switch/publicity")
+ R easyPhotoSwitchPublicity(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ * 查询社区待处理随手拍id集合
+ *
+ * @param communityId
+ * 社区id
+ * @return 社区待处理随手拍id集合
+ */
+ @GetMapping("/easyphoto/noHandle/list")
+ R easyPhotoNoHandleList(@RequestParam("communityId") Long communityId);
+
+ @GetMapping("/reserve/detail")
+ R reserveDetail(@RequestParam("id") Long id,@RequestParam("userId") Long userId,@RequestParam("recordId") Long recordId,@RequestParam("isBack") Integer isBack);
+
+ @PostMapping("/reserve/commit")
+ R reserveCommit(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
+
+ @PostMapping("/reserve/commitNoToken")
+ R reserveCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
+ /**
+ * 我的预约/登记
+ * @param pageUserReserveDTO
+ * @return
+ */
+ @PostMapping("/reserve/userReserveList")
+ R userReserveList(@RequestBody PageUserReserveDTO pageUserReserveDTO);
+
+ /**
+ * 取消预约/登记
+ */
+ @PostMapping("/reserve/cancelReserve")
+ R userCancelReserve(@RequestBody CancelRecordDTO comActReserveRecordDO);
+
+ /**
+ * 预约详情操作记录
+ */
+ @PostMapping("/reserve/detailOperation")
+ R reserveOperation(@RequestBody OperationDetailDTO comActReserveOperationRecordDO);
+
+ /**
+ * 社区后台-分页查询预约登记列表
+ * @param pageReserveDTO 请求参数
+ * @return 预约登记列表
+ */
+ @PostMapping("/reserve/admin/page")
+ R pageReserveAdmin(@RequestBody PageReserveAdminDTO pageReserveDTO);
+
+ /**
+ * 社区后台-新增预约登记信息
+ * @param addReserveDTO 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/reserve/admin/add")
+ R addReserveAdmin(@RequestBody AddReserveAdminDTO addReserveDTO);
+
+ /**
+ * 社区后台-编辑预约登记信息
+ * @param editReserveDTO 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/reserve/admin/edit")
+ R editReserveAdmin(@RequestBody EditReserveAdminDTO editReserveDTO);
+
+ /**
+ * 社区后台-修改预约登记状态
+ * @param editReserveDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/reserve/admin/edit/status")
+ R editReserveStatusAdmin(@RequestBody EditComActReserveStatusDTO editReserveDTO);
+
+ /**
+ * 社区后台-继续预约登记
+ * @param editReserveDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/reserve/admin/edit/info")
+ R editReserveInfoAdmin(@RequestBody EditComActReserveInfoDTO editReserveDTO);
+
+ /**
+ * 社区后台-根据预约登记id查询详情
+ * @param reserveId 预约登记id
+ * @return 预约登记详情
+ */
+ @GetMapping("/reserve/admin/detail")
+ R<ComActReserveDetailAdminVO> detailReserveAdmin(@RequestParam("reserveId") Long reserveId);
+
+ /**
+ * 社区后台-根据社区id统计预约类数据
+ * @param makeStatisticsDTO 请求参数
+ * @return 统计预约类数据
+ */
+ @PostMapping("/reserve/admin/make/statistics")
+ R makeStatisticsAdmin(@RequestBody ComActReserveMakeStatisticsDTO makeStatisticsDTO);
+
+ /**
+ * 社区后台-查询导出预约统计汇总数据
+ * @param makeStatisticsDTO 请求参数
+ * @return 统计预约类数据
+ */
+ @PostMapping("/reserve/admin/make/statistics/export")
+ R makeStatisticsExportAdmin(@RequestBody ComActReserveMakeStatisticsDTO makeStatisticsDTO);
+
+ /**
+ * 社区后台-根据预约id查询预约明细
+ * @param pageMakeDTO 请求参数
+ * @return 预约明细
+ */
+ @PostMapping("/reserve/admin/make/page")
+ R pageMakeAdmin(@RequestBody PageReserveMakeAdminDTO pageMakeDTO);
+
+ /**
+ * 根据预约记录id查询预约明细操作记录
+ * @param reserveRecordId 预约记录id
+ * @return 预约明细操作记录
+ */
+ @GetMapping("/reserve/admin/make/detail")
+ R detailMakeAdmin(@RequestParam("reserveRecordId") Long reserveRecordId);
+
+ /**
+ * 批量取消预约记录
+ * @param reserveRecordDTO 请求参数
+ * @return 取消结果
+ */
+ @PostMapping("/reserve/admin/make/cancel")
+ R makeCancelAdmin(@RequestBody CancelReserveRecordDTO reserveRecordDTO);
+
+ /**
+ * 预约明细导出数据查询
+ * @param pageMakeDTO 请求参数
+ * @return 预约明细数据
+ */
+ @PostMapping("/reserve/admin/make/list/export")
+ R exportMakeAdmin(@RequestBody PageReserveMakeAdminDTO pageMakeDTO);
+
+ /**
+ * 分页查询登记统计汇总
+ * @param registerStatisticsDTO 请求参数
+ * @return 登记统计汇总
+ */
+ @PostMapping("/reserve/admin/register/page")
+ R registerStatisticsAdmin(@RequestBody ComActReserveRegisterStatisticsDTO registerStatisticsDTO);
+
+ /**
+ * 导出登记统计汇总
+ * @param registerStatisticsDTO 请求参数
+ * @return 登记统计汇总
+ */
+ @PostMapping("/reserve/admin/register/export")
+ R registerStatisticsExportAdmin(@RequestBody ComActReserveRegisterStatisticsDTO registerStatisticsDTO);
+
+ /**
+ * 分页查询预约处理列表
+ * @param pageMakeHandleDTO 请求参数
+ * @return 预约处理列表
+ */
+ @PostMapping("/reserve/admin/make/handle/page")
+ R pageMakeHandleAdmin(@RequestBody PageReserveMakeHandleAdminDTO pageMakeHandleDTO);
+
+ /**
+ * 批量处理预约记录
+ * @param makeHandleDTO 请求参数
+ * @return 处理结果
+ */
+ @PostMapping("/reserve/admin/make/handle")
+ R makeHandleAdmin(@RequestBody MakeHandleAdminDTO makeHandleDTO);
+
+ /**
+ * 导出预约处理列表数据查询
+ * @param pageMakeHandleDTO 请求参数
+ * @return 预约处理列表
+ */
+ @PostMapping("/reserve/admin/make/handle/export")
+ R exportMakeHandleAdmin(@RequestBody PageReserveMakeHandleAdminDTO pageMakeHandleDTO);
+
+ /**
+ * 删除预约登记信息
+ * @param reserveId 预约登记id
+ * @return 删除结果
+ */
+ @GetMapping("/reserve/admin/delete")
+ R deleteReserveAdmin(@RequestParam("reserveId") Long reserveId);
+
+ /**
+ * 查询社区所有预约信息列表
+ * @param communityId 社区id
+ * @return 预约信息列表
+ */
+ @GetMapping("/reserve/admin/list")
+ R listReserveAdmin(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 导出登记明细数据
+ *
+ * @param pageReserveRegisterDetailedAdminDTO
+ * @return 登记明细数据
+ */
+ @PostMapping("/reserve/admin/register/list/export")
+ R exportRegisterAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
+
+ /**
+ * 查询预约登记题目下属选择项列表
+ *
+ * @param reserveSubId
+ * 预约登记id
+ * @return 查询预约登记题目下属选择项列表
+ */
+ @GetMapping("/reserve/admin/subject/selection/list")
+ List<String> subjectSelectionListAdmin(@RequestParam("reserveSubId") Long reserveSubId);
+ /**
+ * 查询预约登记题目列表
+ * @param reserveId 预约登记id
+ * @return 约登记题目列表
+ */
+ @GetMapping("/reserve/admin/subject/list")
+ R subjectListAdmin(@RequestParam("reserveId") Long reserveId);
+
+ /**
+ * 分页查询登记明细列表
+ * @param detailedAdminDTO 请求参数
+ * @return 登记明细列表
+ */
+ @PostMapping("/reserve/admin/register/detailed/list")
+ R registerDetailedListAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
+
+ /**
+ * 导出登记明细列表
+ * @param detailedAdminDTO 请求参数
+ * @return 登记明细列表
+ */
+ @PostMapping("/reserve/admin/register/detailed/list/export")
+ R registerDetailedListAdminExport(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
+
+ /**
+ * 查询登记详情记录
+ * @param reserveRecordId 登记记录id
+ * @return 登记详情记录
+ */
+ @GetMapping("/reserve/admin/register/detailed/detail")
+ R registerDetailedDetailAdmin(@RequestParam("reserveRecordId") Long reserveRecordId);
+ /**
+ * 活动签到
+ *
+ * @param comActActRegistVO 请求参数
+ * @return 签到结果
+ */
+ @PostMapping("/activity/sign-in")
+ R activitySignIn(@RequestBody ComActActRegistVO comActActRegistVO);
+
+ /**
+ * 用户签到列表
+ *
+ * @param userId 用户id
+ * @return 用户签到记录列表
+ */
+ @GetMapping("/sign-in/user/list")
+ R listSignInActivity(@RequestParam("userId") Long userId);
+
+ /**
+ * 社区活动评价
+ *
+ * @param comActActEvaluateVO 社区评价VO
+ * @return 评价结果
+ */
+ @PostMapping("/activity/evaluate")
+ R activityEvaluate(@RequestBody ComActActEvaluateVO comActActEvaluateVO);
+
+ /**
+ * 用户评价列表
+ *
+ * @param userId 用户id
+ * @return 当前用户对所有活动的评价列表
+ */
+ @GetMapping("/evaluate/user/list")
+ R listEvaluate(@RequestParam("userId") Long userId);
+
+ /**
+ * 定时任务针对活动结束后7天还未评价的用户默认好评
+ */
+ @PostMapping("/activity/default-praise")
+ R timedTaskActivityDefaultPraise();
+
+ /**
+ * 小程序-用户新增话题
+ * @param circleTopicAppDTO 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/neighborWest/addNeighborTopicByApp")
+ R addNeighborTopicByApp(@RequestBody AddNeighborCircleTopicAppDTO circleTopicAppDTO);
+
+ /**
+ * 小程序-删除邻里圈
+ * @param circleTopicAppDTO 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/neighborWest/deleteNeighborByApp")
+ R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO);
+
+ /**
+ * 获取系统配置value
+ * @param key 系统配置code
+ * @param communityId 社区id
+ * @return 系统配置value
+ */
+ @GetMapping("/sys/conf/getSysConfValue")
+ R getSysConfValue(@RequestParam("key") String key,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 新增系统配置
+ * @param key 系统配置code
+ * @param communityId 社区id
+ * @param name 系统配置名称
+ * @param value 系统配置value
+ * @return 新增结果
+ */
+ @GetMapping("/sys/conf/addSysConfValue")
+ R addSysConfValue(@RequestParam("key") String key,@RequestParam("communityId") Long communityId,@RequestParam("name") String name,@RequestParam("value") String value);
+
+ /**
+ * 编辑系统配置
+ * @param communityId 社区id
+ * @param status 配置值
+ * @return 编辑结果
+ */
+ @GetMapping("/sys/conf/editSysConfValue")
+ R editSysConfValue(@RequestParam("communityId") Long communityId,@RequestParam("status") Integer status);
+
+ /**
+ * 议事投票后台公布结果
+ * @param publishResultDTO 请求参数
+ * @return 公布结果
+ */
+ @PostMapping("publishResultAdmin")
+ R publishResultAdmin(@RequestBody ComActDiscussPublishResultDTO publishResultDTO);
+
+ /**
+ * 议事投票-评论/回复删除
+ * @param id 评论/回复id
+ * @return 删除结果
+ */
+ @GetMapping("deleteDiscussCommentAdmin")
+ R deleteDiscussCommentAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 查询社区可发布议事投票权限配置
+ * @param communityId 社区id
+ * @return 社区可发布议事投票权限配置
+ */
+ @GetMapping("discussJurisdictionGet")
+ R discussJurisdictionGet(@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId);
+
+ /**
+ * 设置当前社区议事投票小程序身份验证参数(1.全部 2.党员 3.志愿者 4.社区工作人员)
+ * @param communityId 社区id
+ * @param value 需要设置的参数值
+ * @return 设置结果
+ */
+ @GetMapping("discussJurisdictionSet")
+ R discussJurisdictionSet(@RequestParam("communityId") Long communityId, @RequestParam("value") String value);
+
+ /**
+ * 议事投票检测状态定时任务
+ * @return 执行结果
+ */
+ @GetMapping("timedTaskDiscussInspectStatus")
+ R timedTaskDiscussInspectStatus();
+
+ /**
+ * 一起议增加浏览量
+ * @param discussId 一起议主键id
+ */
+ @PostMapping("discuss/increase-view-num")
+ void increaseViewNum(@RequestParam("discussId") Long discussId);
+
+ /**
+ * 定时任务每半小时执行一次将一起议浏览量写入到表中
+ */
+ @PostMapping("discuss/write-view-num")
+ R timedTaskWriteDiscussViewNumToTable();
+
+ /**
+ * 公布/编辑一起议投票结果
+ * @param comActDiscussDTO
+ * @return 请求结果
+ */
+ @PostMapping("discuss/edit-result")
+ R editDiscussResult(@RequestBody ComActDiscussDTO comActDiscussDTO);
+
+ /**
+ * 定时任务扫描高龄认证记录信息
+ * @return 执行结果
+ */
+ @PostMapping("/elders/auth/task")
+ R timedTaskEldersAuthJobHandler();
+
+ /**
+ * 身份认证定时任务
+ * @return 执行结果
+ */
+ @PostMapping("/elders/auth/record/task")
+ R timedTaskEldersAuthRecordJobHandler();
+
+ /**
+ * 身份认证定时任务
+ * @return 执行结果
+ */
+ @PostMapping("/elders/authRecords/statistics")
+ R timedTaskElderAuthStatisticsJobHandler();
+
+ /**
+ * 定时任务每年3月1号0点统计养老认证本期应该认证总人数
+ * @return 执行结果
+ */
+ @PostMapping("/elders/pensionAuthRecords/statistics")
+ R timedTaskPensionAuthStatisticsJobHandler();
+
+ /**
+ * 办事指南列表-按分类查询
+ * @param pageActWorkGuideDTO 请求参数
+ * @return 办事指南分类列表
+ */
+ @PostMapping("/listworkguide")
+ R listWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO);
+
+ /**
+ * 根据办事指南分类id查询办事指南列表
+ * @param classifyId 办事指南分类id
+ * @return 办事指南列表数据
+ */
+ @GetMapping("/listworkguide/classify")
+ R listWorkGuideByClassifyId(@RequestParam("classifyId") Long classifyId);
+
+ /**
+ * 小程序查询所有进行中的预约登记
+ * @param communityId 社区id
+ * @return 社区所有进行中的预约登记列表
+ */
+ @GetMapping("/reserve/list")
+ R reserveListApplets(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 查询社区高龄认证方式（1.视频认证 2.人脸核验）
+ * @param eldersAuthTypeQueryDTO 请求参数
+ * @return 社区高龄认证方式（1.视频认证 2.人脸核验）
+ */
+ @PostMapping("/elders/new/authtype")
+ R communityEldersAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);
+
+ /**
+ * 设置当前社区高龄认证方式:核验类型（1.视频认证 2.人脸核验）
+ * @param communityId 社区id
+ * @param type 检验类型
+ * @return R 设置结果
+ */
+ @PutMapping("/elders/new/authType/{type}")
+ R setEldersAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);
+
+ /**
+ * 新增身份认证
+ * @param addIdentityAuthDTO 新增身份认证请求参数
+ * @return 新增结果结果
+ */
+ @PostMapping("/identity-auth/add")
+ R addIdentityAuth(@RequestBody AddIdentityAuthDTO addIdentityAuthDTO);
+
+ /**
+ * 分页查询身份认证记录
+ * @param pageIdentityAuthRecordDTO 分页查询身份认证记录参数
+ * @return 身份认证记录列表
+ */
+ @PostMapping("/identity-auth/record/page")
+ R queryRecordWithPage(@RequestBody PageIdentityAuthRecordDTO pageIdentityAuthRecordDTO);
+
+ /**
+ * 获取身份认证详情
+ * @param authType 认证类型
+ * @param identityAuthId 认证id
+ * @return 认证记录详情
+ */
+ @GetMapping("/identity-auth/detail")
+ R retrieveIdentityAuthDetail(@RequestParam("authType") Integer authType,
+ @RequestParam("identityAuthId") Long identityAuthId);
+
+ /**
+ * 获取身份认证方式
+ * @param communityId
+ * @param identityAuthType
+ * @return 认证方式
+ */
+ @GetMapping("/identity-auth/mode")
+ R getIdentityAuthMode(@RequestParam(value = "communityId") Long communityId,
+ @RequestParam(value = "identityAuthType") Integer identityAuthType);
+
+ /**
+ * 获取身份认证人脸核验token
+ * @param getIdentityEidTokenDTO
+ * @return token
+ */
+ @PostMapping("/identity-auth/getEidToken")
+ R getEidToken(@RequestBody GetIdentityEidTokenDTO getIdentityEidTokenDTO);
+
+ /**
+ * 一起议获取是否有发布权
+ * @param comActDiscussDTO
+ * @return
+ */
+ @PostMapping("discuss/permissions")
+ R getDiscussPermissions(@RequestBody ComActDiscussDTO comActDiscussDTO);
+
+ /**
+ * 高龄认证统计-分页查询
+ * @param pageElderAuthStatisticDTO 请求参数
+ * @return 高龄认证统计列表
+ */
+ @PostMapping("/elders/auth/statistic/page")
+ R pageAuthStatisticAdmin(@RequestBody PageElderAuthStatisticDTO pageElderAuthStatisticDTO);
+
+ /**
+ * 高龄认证统计-标记
+ * @param signElderAuthStatisticDTO 请求参数
+ * @return 标记结果
+ */
+ @PostMapping("/elders/auth/statistic/sign")
+ R signAuthStatisticAdmin(@RequestBody SignElderAuthStatisticDTO signElderAuthStatisticDTO);
+
+ /**
+ * 高龄认证统计-统计表头数据
+ * @param statisticHeaderDTO 请求参数
+ * @return 统计表头数据
+ */
+ @PostMapping("/elders/auth/header/statistic")
+ R getAuthHeaderStatisticAdmin(@RequestBody ElderAuthStatisticHeaderDTO statisticHeaderDTO);
+
+ /**
+ * 养老认证统计-分页查询
+ * @param pensionAuthStatisticDTO 请求参数
+ * @return 养老认证统列表
+ */
+ @PostMapping("/elders/pension/auth/statistic/page")
+ R pagePensionAuthStatisticAdmin(@RequestBody PagePensionAuthStatisticDTO pensionAuthStatisticDTO);
+
+ /**
+ * 养老认证记标记
+ * @param signElderAuthStatisticDTO 请求参数
+ * @return 标记结果
+ */
+ @PostMapping("/elders/pension/auth/statistic/sign")
+ R signPensionAuthStatisticAdmin(@RequestBody SignElderAuthStatisticDTO signElderAuthStatisticDTO);
+
+ /**
+ * 养老认证表头统计
+ * @param statisticHeaderDTO 请求参数
+ * @return 统计结果
+ */
+ @PostMapping("/elders/pension/auth/header/statistic")
+ R getPensionAuthHeaderStatisticAdmin(@RequestBody ElderAuthStatisticHeaderDTO statisticHeaderDTO);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialOrg/queryAll")
+ R comActSocialOrgSelectAll(CommonPage commonPage);
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialOrg 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialOrg")
+ R comActSocialOrgInsert(@RequestBody ComActSocialOrgVO comActSocialOrg);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialOrg 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialOrg/update")
+ R comActSocialOrgUpdate(@RequestBody ComActSocialOrgVO comActSocialOrg);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialOrg/del")
+ R comActSocialOrgDelete(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActCommittee/queryAll")
+ R comActCommitteeSelectAll(@RequestBody CommonPage commonPage);
+ /**
+ * 新增数据
+ *
+ * @param comActCommittee 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActCommittee")
+ R comActCommitteeInsert(@RequestBody ComActCommiteeVO comActCommittee);
+ /**
+ * 修改数据
+ *
+ * @param comActCommittee 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActCommittee/update")
+ R comActCommitteeUpdate(@RequestBody ComActCommiteeVO comActCommittee);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActCommittee/del")
+ R comActCommitteeDelete(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comProperty/queryAll")
+ R comPropertySelectAll(@RequestBody CommonPage commonPage);
+ /**
+ * 新增数据
+ *
+ * @param comPropertyVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comProperty")
+ R comPropertyInsert(@RequestBody ComPropertyVO comPropertyVO);
+ /**
+ * 修改数据
+ *
+ * @param comPropertyVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comProperty/update")
+ R comPropertyUpdate(@RequestBody ComPropertyVO comPropertyVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comProperty/del")
+ R comPropertyDelete(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActFourMember/queryAll")
+ R comActFourMemberSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActFourMember/{id}")
+ R comActFourMemberSelectOne(@PathVariable("id") Integer id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActFourMember 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActFourMember")
+ R comActFourMemberInsert(@RequestBody ComActFourMemberVO comActFourMember);
+
+ /**
+ * 修改数据
+ *
+ * @param comActFourMember 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActFourMember/update")
+ R comActFourMemberUpdate(@RequestBody ComActFourMemberVO comActFourMember);
+
+ /**
+ * 删除数据
+ *
+ * @param comActFourMember 主键结合
+ * @return 删除结果
+ */
+ @PostMapping("/comActFourMember/del")
+ R comActFourMemberDelete(@RequestBody ComActFourMemberVO comActFourMember);
+
+ /**
+ * 楼栋查询
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/building/query")
+ R comActFourMemberQueryBuilding(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 查询房屋二级级联菜单
+ *
+ * @param cascadeHouseDTO
+ * 请求参数
+ * @return 菜单列表
+ */
+ @PostMapping("/common/data/population/second/list")
+ R getSecondHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO);
+
+ /**
+ * 查询房屋二级级联菜单后台
+ *
+ * @param cascadeHouseDTO
+ * 请求参数
+ * @return 菜单列表
+ */
+ @PostMapping("/common/data/population/second/listBack")
+ R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO);
+
+ /**
+ * 微心愿处理人列表
+ * @param communityId 社区id
+ * @param type 处理人类型（1.后台用户 2.党员 3.志愿者）
+ * @return 处理人列表
+ */
+ @GetMapping("/wish/handle/list/admin")
+ R wishHandleListAdmin(@RequestParam(value = "communityId") Long communityId,@RequestParam("type") Integer type);
+
+ /**
+ * 便民服务新增分类
+ * @param convenientServiceCategoryDTO
+ * @return
+ */
+ @PostMapping("/convenient/service-category/add")
+ R addServiceCategory(@RequestBody ConvenientServiceCategoryDTO convenientServiceCategoryDTO);
+
+ /**
+ * 便民服务分类编辑
+ * @param convenientServiceCategoryDTO
+ * @return
+ */
+ @PutMapping("/convenient/service-category/put")
+ R putServiceCategory(@RequestBody ConvenientServiceCategoryDTO convenientServiceCategoryDTO);
+
+ /**
+ * 便民服务分类删除
+ * @param categoryId
+ * @return
+ */
+ @DeleteMapping("/convenient/service-category/delete")
+ R deleteServiceCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);
+
+ /**
+ * 获取便民服务分类详情
+ * @param categoryId
+ * @return
+ */
+ @GetMapping("/convenient/service-category/get")
+ R getServiceCategory(@RequestParam("categoryId") Long categoryId);
+
+ /**
+ * 分页查询便民服务分类
+ * @param pageConvenientServiceCategoryDTO
+ * @return
+ */
+ @PostMapping("/convenient/service-category/page")
+ R pageServiceCategory(@RequestBody PageConvenientServiceCategoryDTO pageConvenientServiceCategoryDTO);
+
+ /**
+ * 便民服务新增商家
+ * @param convenientMerchantDTO
+ * @return
+ */
+ @PostMapping("/convenient/merchant/add")
+ R addMerchant(@RequestBody ConvenientMerchantDTO convenientMerchantDTO);
+
+ /**
+ * 编辑便民服务商家
+ * @param convenientMerchantDTO
+ * @return
+ */
+ @PutMapping("/convenient/merchant/put")
+ R putMerchant(@RequestBody ConvenientMerchantDTO convenientMerchantDTO);
+
+ /**
+ * 删除便民服务商家
+ * @param merchantId
+ * @param operator
+ * @return
+ */
+ @DeleteMapping("/convenient/merchant/delete")
+ R deleteMerchant(@RequestParam("merchantId") Long merchantId, @RequestParam("operator") Long operator);
+
+ /**
+ * 分页查询便民服务商家
+ * @param pageConvenientMerchantDTO
+ * @return
+ */
+ @PostMapping("/convenient/merchant/page")
+ R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO);
+
+ /**
+ * 获取便民服务商家详情
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/convenient/merchant/get")
+ R getMerchant(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 禁用/启用便民服务商家
+ * @param disableOrEnableConvenientMerchantDTO
+ * @return
+ */
+ @PutMapping("/convenient/merchant/disable-or-enable")
+ R disableOrEnableMerchant(@RequestBody DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO);
+
+ /**
+ * 重置便民服务商家账号密码
+ * @param resetPasswordConvenientMerchantDTO
+ * @return
+ */
+ @PutMapping("/convenient/merchant/reset-password")
+ R resetPasswordMerchant(@RequestBody ResetPasswordConvenientMerchantDTO resetPasswordConvenientMerchantDTO);
+
+ /**
+ * 获取所有便民服务分类
+ * @return
+ */
+ @GetMapping("/convenient/service-category/all")
+ R getAllServiceCategories(@RequestParam("areaCode") String areaCode);
+
+ /**
+ * 获取用户便民服务商家详情
+ * @param account 商家绑定账号
+ * @return
+ */
+ @GetMapping("/convenient/getUserMerchantInfoByAccount")
+ R<ConvenientMerchantVO> getUserMerchantInfoByAccount(@RequestParam("account") String account);
+
+ /**
+ * 获取商便民服务商家信息
+ * @param userId
+ * @return
+ */
+ @GetMapping("/convenient/merchantInfo")
+ R<ConvenientMerchantVO> getUserConvenientMerchantInfo(@RequestParam("userId") Long userId);
+
+ /**
+ * 新增便民服务产品分类信息
+ * @param convenientProductCategoryDTO
+ * @return
+ */
+ @PostMapping("/convenient/product-category/add")
+ R addProductCategory(@RequestBody ConvenientProductCategoryDTO convenientProductCategoryDTO);
+
+ /**
+ * 编辑便民服务产品分类信息
+ * @param convenientProductCategoryDTO
+ * @return
+ */
+ @PutMapping("/convenient/product-category/put")
+ R putProductCategory(@RequestBody ConvenientProductCategoryDTO convenientProductCategoryDTO);
+
+ /**
+ * 删除便民服务产品分类信息
+ * @param categoryId
+ * @param operator
+ * @return
+ */
+ @DeleteMapping("/convenient/product-category/delete")
+ R deleteProductCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);
+
+ /**
+ * 获取便民服务产品分类详情
+ * @param categoryId
+ * @return
+ */
+ @GetMapping("/convenient/product-category/get")
+ R getProductCategory(@RequestParam("categoryId") Long categoryId);
+
+ /**
+ * 分页查询便民服务产品分类信息
+ * @param pageConvenientProductCategoryDTO
+ * @return
+ */
+ @PostMapping("/convenient/product-category/page")
+ R pageProductCategory(@RequestBody PageConvenientProductCategoryDTO pageConvenientProductCategoryDTO);
+
+ /**
+ * 便民服务商家后台新增产品
+ * @param convenientProductDTO
+ * @return
+ */
+ @PostMapping("/convenient/product/add")
+ R addProduct(@RequestBody ConvenientProductDTO convenientProductDTO);
+
+ /**
+ * 便民服务商家后台编辑产品
+ * @param convenientProductDTO
+ * @return
+ */
+ @PutMapping("/convenient/product/put")
+ R putProduct(@RequestBody ConvenientProductDTO convenientProductDTO);
+
+ /**
+ * 便民服务商家后台获取产品详情
+ * @param productId
+ * @return
+ */
+ @GetMapping("/convenient/product/get")
+ R getProduct(@RequestParam("productId") Long productId);
+
+ /**
+ * 便民服务商家后台分页获取产品信息
+ * @param pageConvenientProductDTO
+ * @return
+ */
+ @PostMapping("/convenient/product/page")
+ R pageProduct(@RequestBody PageConvenientProductDTO pageConvenientProductDTO);
+
+ /**
+ * 便民服务商家后台删除产品信息
+ * @param deleteConvenientProductDTO
+ * @return
+ */
+ @DeleteMapping("/convenient/product/delete")
+ R deleteProduct(@RequestBody DeleteConvenientProductDTO deleteConvenientProductDTO);
+
+ /**
+ * 便民服务商家后台上架/下架产品
+ * @param onShelfOrOffShelfProductDTO
+ * @return
+ */
+ @PutMapping("/convenient/product/onShelf-or-offShelf")
+ R onShelfOrOffShelfProduct(@RequestBody OnShelfOrOffShelfProductDTO onShelfOrOffShelfProductDTO);
+
+ /**
+ * 获取所有产品分类
+ * @return
+ * @param merchantId
+ */
+ @GetMapping("/convenient/product-category/all")
+ R getAllProductCategory(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 获取该社区商家数量大于0的分类
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/convenient/service-category/suitable")
+ R getSuitableServiceCategories(@RequestParam("communityId") Long communityId,@RequestParam("areaCode")String areaCode);
+
+ /**
+ * 获取该社区下的热门商家
+ * @param pagePopularMerchantDTO
+ * @return
+ */
+ @PostMapping("/convenient/merchant/popular")
+ R getPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO);
+
+ /**
+ * 分页获取服务类型下商家信息
+ * @param pageClassifyMerchantDTO
+ * @return
+ */
+ @PostMapping("/convenient/merchant/classify")
+ R getClassifyMerchants(@RequestBody PageClassifyMerchantDTO pageClassifyMerchantDTO);
+
+ /**
+ * 获取商家详情
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/convenient/merchant/detail")
+ R getMerchantDetail(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 获取商家产品
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/convenient/product/list")
+ R getMerchantProduct(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 获取产品详情
+ * @param productId
+ * @return
+ */
+ @GetMapping("/convenient/product/detail")
+ R getProductDetail(@RequestParam("productId") Long productId);
+
+ /**
+ * 搜索商家信息
+ * @param pageSearchDTO
+ * @return
+ */
+ @PostMapping("/convenient/merchant/search")
+ R pageSearchMerchant(@RequestBody PageSearchDTO pageSearchDTO);
+
+ /**
+ * 搜索商品信息
+ * @param pageSearchDTO
+ * @return
+ */
+ @PostMapping("/convenient/product/search")
+ R pageSearchProduct(@RequestBody PageSearchDTO pageSearchDTO);
+
+ /**
+ * 增加商家店铺咨询量
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/convenient/merchant/consult")
+ R consultMerchant(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 增加产品浏览量
+ * @param productId
+ * @return
+ */
+ @GetMapping("/convenient/product/incr-view")
+ R incrProductView(@RequestParam("productId") Long productId);
+
+ /**
+ * 获取商家导出数据
+ * @param exportMerchantDTO
+ * @return
+ */
+ @PostMapping("/convenient/merchant/export")
+ R exportMerchant(@RequestBody ExportMerchantDTO exportMerchantDTO);
+
+ /**
+ * 增加商家店铺浏览量
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/convenient/merchant/incr-view")
+ R incrMerchantView(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 定时任务每隔半小时将商家浏览量和咨询量总值计入指定商家数据中
+ * @return
+ */
+ @PostMapping("/convenient/timedTaskWriteDataToMerchantJobHandler")
+ R timedTaskWriteDataToMerchantJobHandler();
+
+ /**
+ * 获取商家上下架产品数量
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/convenient/product/shelf-num")
+ R getProductShelfNum(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 群团组织成员列表-小程序分页查询
+ * @param pageClusterMemberDto 请求参数
+ * @return 群团组织成员列表
+ */
+ @PostMapping("/cluster/member/page/applets")
+ R pageClusterMemberApplets(@RequestBody PageClusterMemberDto pageClusterMemberDto);
+
+ /**
+ * 群团组织列表-小程序查询社区群团组织列表
+ * @param communityId 社区id
+ * @return 社区群团组织列表
+ */
+ @GetMapping("/cluster/list/applets")
+ R listClusterApplets(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询群团组织列表
+ * @param pageClusterAdminDto 请求参数
+ * @return 群团组织列表
+ */
+ @PostMapping("/cluster/page/admin")
+ R pageClusterAdmin(@RequestBody PageClusterAdminDto pageClusterAdminDto);
+
+ /**
+ * 新增群团组织
+ * @param addClusterAdminDto 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/cluster/add/admin")
+ R addClusterAdmin(@RequestBody AddClusterAdminDto addClusterAdminDto);
+
+ /**
+ * 修改群团组织
+ * @param editClusterAdminDto 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/cluster/edit/admin")
+ R editClusterAdmin(@RequestBody EditClusterAdminDto editClusterAdminDto);
+
+ /**
+ * 删除群团组织
+ * @param id 组织id
+ * @return 删除结果
+ */
+ @GetMapping("/cluster/delete/admin")
+ R deleteClusterAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 群团组织详情
+ * @param id 组织id
+ * @return 群团组织详情
+ */
+ @GetMapping("/cluster/detail/admin")
+ R detailClusterAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询群团组织成员列表
+ * @param pageClusterMemberAdminDto 请求参数
+ * @return 群团组织成员列表
+ */
+ @PostMapping("/cluster/member/page/admin")
+ R pageClusterMemberAdmin(@RequestBody PageClusterMemberAdminDto pageClusterMemberAdminDto);
+
+ /**
+ * 新增群团组织成员
+ * @param addClusterMemberAdminDto 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/cluster/member/add/admin")
+ R addClusterMemberAdmin(@RequestBody AddClusterMemberAdminDto addClusterMemberAdminDto);
+
+ /**
+ * 编辑群团组织成员
+ * @param editClusterMemberAdminDto 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/cluster/member/edit/admin")
+ R editClusterMemberAdmin(@RequestBody EditClusterMemberAdminDto editClusterMemberAdminDto);
+
+ /**
+ * 删除群团组织成员
+ * @param id 组织成员id
+ * @return 删除结果
+ */
+ @GetMapping("/cluster/member/delete/admin")
+ R deleteClusterMemberAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 群团组织成员详情
+ * @param id 组织成员id
+ * @return 群团组织成员详情
+ */
+ @GetMapping("/cluster/member/detail/admin")
+ R detailClusterMemberAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 查询系统民族列表
+ * @return 民族列表
+ */
+ @GetMapping("/cluster/member/nation/list/admin")
+ R memberNationListAdmin();
+
+ /**
+ * 群团组织成员导入
+ * @param list 导入数据
+ * @param communityId 社区id
+ * @param userId 操作用户id
+ * @return 导入结果
+ */
+ @PostMapping("/cluster/member/import/admin")
+ R importClusterMember(@RequestBody List<ComClusterMemberExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 群团组织导出数据查询
+ * @param pageClusterMemberAdminDto 请求参数
+ * @return 导出数据结果集
+ */
+ @PostMapping("/cluster/member/export/admin")
+ R exportClusterMember(@RequestBody PageClusterMemberAdminDto pageClusterMemberAdminDto);
+
+ /**
+ * 社区后台分页查询微心愿
+ * @param comActMicroWishVO 请求参数
+ * @return 微心愿列表
+ */
+ @PostMapping("pagemicrowishAdmin")
+ R pageMicroWishAdmin(@RequestBody ComActMicroWishVO comActMicroWishVO);
+
+ /**
+ * 小程序四长四员查询居民列表
+ */
+ @PostMapping("/comActFourMember/member")
+ R comActFourMemberQueryMember(@RequestBody CommonPage commonPage);
+
+ /**
+ *居民数据详情
+ */
+ @GetMapping("/comActFourMember/memberDetail")
+ R comActFourMemberMemberDetail(@RequestParam("id")Long id);
+
+ /**
+ * 根据房屋id列表删除房屋信息
+ *
+ * @param comMngPopulationHouseUserVO
+ * 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/common/data/population/house/user/delete")
+ R deleteHousesUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);
+
+ /**
+ * 新增实有房屋信息
+ *
+ * @param comMngPopulationHouseUserVO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/common/data/population/house/user/insert")
+ public R insertHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);
+
+ /**
+ * 编辑实有房屋信息
+ *
+ * @param comMngPopulationHouseUserVO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/common/data/population/house/user/edit")
+ public R editHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);
+
+ /**
+ * 根据id查询
+ *
+ * @param id
+ * 请求参数
+ * @return 删除结果
+ */
+ @GetMapping("/common/data/population/house/user/detail")
+ public R detailHousesUser(@RequestParam("id") Long id);
+
+ /**
+ * 社区后台-分页查询楼栋列表
+ * @param pageBuildingListDto 请求参数
+ * @return 楼栋列表
+ */
+ @PostMapping("/building/page/admin/")
+ R pageBuildingAdmin(@RequestBody PageBuildingListDto pageBuildingListDto);
+
+ /**
+ * 社区后台-查询楼栋列表表头统计数据
+ * @param communityId 社区id
+ * @return 楼栋列表表头统计数据
+ */
+ @GetMapping("/building/header/statistics/")
+ R buildingListHeaderStatisticsAdmin(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 社区后台-查询楼栋详情
+ * @param id 楼栋id
+ * @return 楼栋详情
+ */
+ @GetMapping("/building/detail/admin/")
+ R detailBuildAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 查询楼栋下单元列表
+ * @param id 楼栋id
+ * @return 单元列表
+ */
+ @GetMapping("/building/unit/list/admin")
+ R buildingUnitListAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 查询楼栋单元下房屋列表
+ * @param unitHouseListDto 请求参数
+ * @return 单元列表
+ */
+ @PostMapping("/building/unit/house/list/admin")
+ R buildingUnitHouseListAdmin(@RequestBody PageBuildingUnitHouseListDto unitHouseListDto);
+
+ /**
+ * 查询楼栋单元下房屋详情
+ * @param houseId 房屋id
+ * @param communityId 社区id
+ * @return 房屋详情
+ */
+ @GetMapping("/building/unit/house/detail/admin")
+ R unitHouseDetailAdmin(@RequestParam("houseId") Long houseId,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 查询社区下小区列表
+ * @param communityId 社区id
+ * @return 小区列表
+ */
+ @GetMapping("/building/village/list/admin")
+ R buildingVillageListAdmin(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 添加楼栋下单元
+ * @param addBuildingUnitDto 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/building/unit/add/admin")
+ R addBuildingUnitAdmin(@RequestBody AddBuildingUnitDto addBuildingUnitDto);
+
+ /**
+ * 修改楼栋下单元
+ * @param editBuildingUnitDto 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/building/unit/edit/admin")
+ R editBuildingUnitAdmin(@RequestBody EditBuildingUnitDto editBuildingUnitDto);
+
+ /**
+ * 添加户室
+ * @param addBuildingHouseDto 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/building/house/add/admin")
+ R addBuildingHouseAdmin(@RequestBody AddBuildingHouseDto addBuildingHouseDto);
+
+ /**
+ * 修改户室
+ * @param editBuildingHouseDto 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/building/house/edit/admin")
+ R editBuildingHouseAdmin(@RequestBody EditBuildingHouseDto editBuildingHouseDto);
+
+ /**
+ * 删除户室下人员关联信息
+ * @param housePopulationDto 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/building/house/population/delete/admin")
+ R deleteBuildingHousePopulationAdmin(@RequestBody DeleteBuildingHousePopulationDto housePopulationDto);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActWarehouseApply/queryAll")
+ public R comActWarehouseApplySelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 统计查询
+ *
+ * @param communityId
+ * @return 所有数据
+ */
+ @GetMapping("/comActWarehouseApply/selectStatics")
+ public R comActWarehouseApplySelectAll(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActWarehouseApply/{id}")
+ public R comActWarehouseApplySelectOne(@PathVariable("id") Integer id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActWarehouseApply 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActWarehouseApply")
+ public R comActWarehouseApplyInsert(@RequestBody ComActWarehouseApplyVO comActWarehouseApply);
+
+ /**
+ * 修改数据
+ *
+ * @param comActWarehouseApply 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActWarehouseApply/update")
+ public R comActWarehouseApplyUpdate(@RequestBody ComActWarehouseApplyVO comActWarehouseApply);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActWarehouseApply/del")
+ public R comActWarehouseApplyDelete(@RequestParam("id") Long id);
+
+ /**
+ * 生成二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @PostMapping("/comActWarehouseApply/getQRCode")
+ public R comActWarehouseApplyGetQRCode(@RequestBody QRCodeVO qrCodeVO);
+
+ /**
+ * 社区Id查询基础配置
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/comActWarehouseBase")
+ public R comActWarehouseBaseSelectOne(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 新增数据
+ *
+ * @param comActWarehouseBase 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActWarehouseBase")
+ public R comActWarehouseBaseInsert(@RequestBody ComActWarehouseBaseVO comActWarehouseBase);
+
+ /**
+ * 导出数据
+ */
+ @PostMapping("/comActWarehouseApply/export")
+ public R comActWarehouseApplyExport(@RequestBody CommonPage commonPage);
+
+ /**
+ * 后台导入捐赠物品
+ * @param list
+ * @return
+ */
+ @PostMapping("/comActWarehouseDonates/import")
+ R batchImportWarehouseDonates(@RequestBody List<WarehouseDonatesExcelVO> list);
+
+ /**
+ * 后台导出捐赠物品表格
+ * @param exportDonatesDTO
+ * @return
+ */
+ @PostMapping("/comActWarehouseDonates/donates/export")
+ R exportDonates(@RequestBody ExportDonatesDTO exportDonatesDTO);
+
+ /**
+ * 分页查询捐赠物品
+ * @param pageDonatesDTO
+ * @return
+ */
+ @PostMapping("/comActWarehouseDonates/donates/page")
+ R pageDonates(@RequestBody PageDonatesDTO pageDonatesDTO);
+
+ /**
+ * 新增物品捐赠
+ * @param comActWarehouseDonatesDTO
+ * @return
+ */
+ @PostMapping("/comActWarehouseDonates/donates/add")
+ R addDonates(@RequestBody ComActWarehouseDonatesDTO comActWarehouseDonatesDTO);
+
+ /**
+ * 查看物品捐赠详情
+ * @param donatesId
+ * @param isWhich
+ * @param userId
+ * @return
+ */
+ @GetMapping("/comActWarehouseDonates/donates/get")
+ R getDonates(@RequestParam("donatesId") Long donatesId, @RequestParam("isWhich") Integer isWhich, @RequestParam("userId") Long userId);
+
+ /**
+ * 捐赠物品后台签收
+ * @param comActWarehouseDonatesDTO
+ * @return
+ */
+ @PostMapping("/comActWarehouseDonates/donates/signing")
+ R signingDonates(@RequestBody ComActWarehouseDonatesDTO comActWarehouseDonatesDTO);
+
+ /**
+ * 用户取消捐赠
+ * @param donatesId
+ * @param currentUser
+ * @return
+ */
+ @GetMapping("/comActWarehouseDonates/donates/cancel")
+ R cancelDonates(@RequestParam("donatesId") Long donatesId, @RequestParam("currentUser") Long currentUser);
+
+ /**
+ * 捐赠物品统计查询
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/comActWarehouseDonates/donates/statistics")
+ R getDonatesStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActWarehouseOperation/queryAll")
+ public R comActWarehouseOperationSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 物品领用
+ * @param comActWarehouseApplyDTO
+ * @return
+ */
+ @PostMapping("/comActWarehouseDonates/donates/apply")
+ R applyDonates(@RequestBody ComActWarehouseApplyDTO comActWarehouseApplyDTO);
+
+ /**
+ * 生成二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @PostMapping("/comActActivityCode/getQRCode")
+ public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
+
+ /**
+ * 重置二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @PostMapping("/comActActivityCode/resetQRCode")
+ public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
+
+ /**
+ * 实有房屋数据修复定时任务
+ * @return 实有房屋数据修复定时任务
+ */
+ @GetMapping("/population/house/status/task")
+ R timedTaskHouseJobHandler();
+
+ /**
+ * 导出特殊群体
+ *
+ * @param pageInputUserDTO 请求参数
+ * @return 特殊群体列表
+ */
+ @PostMapping("common/data/special/export")
+ R specialInputUserExport(@RequestBody PageInputUserDTO pageInputUserDTO);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActAnnouncement/queryAll")
+ R comActAnnouncementSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActAnnouncement/{id}")
+ R comActAnnouncementSelectOne(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActAnnouncementVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActAnnouncement")
+ R comActAnnouncementInsert(@RequestBody ComActAnnouncementVO comActAnnouncementVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActAnnouncementVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActAnnouncement/update")
+ R comActAnnouncementUpdate(@RequestBody ComActAnnouncementVO comActAnnouncementVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActAnnouncement/del")
+ R comActAnnouncementDelete(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActColumn/queryAll")
+ R comActColumnSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActColumn/{id}")
+ R comActColumnSelectOne(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActColumn 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActColumn")
+ R comActColumnInsert(@RequestBody ComActColumnVO comActColumn);
+
+ /**
+ * 修改数据
+ *
+ * @param comActColumn 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActColumn/update")
+ R comActColumnUpdate(@RequestBody ComActColumnVO comActColumn);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActColumn/del")
+ R comActColumnDelete(@RequestParam("id") Long id);
+
+ /**
+ * 高龄认证添加
+ *
+ * @param comElderAuthRecordVO
+ * @return
+ */
+ @PostMapping("/elders/authRecord/add")
+ R addAuthRecord(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
+
+ /**
+ * 养老认证添加
+ *
+ * @param comElderAuthRecordVO
+ * @return
+ */
+ @PostMapping("/elders/pensionAuthRecord/add")
+ R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
+ /**
+ * 活动报名签到情况
+ * @param id 活动主键id
+ * @return
+ */
+ @GetMapping("/activity/sign-in/list")
+ R listSignInRecord(@RequestParam("id") Long id);
+
+ /**
+ * 活动签到记录
+ * @param id 活动主键
+ * @param userId 用户id
+ * @return
+ */
+ @GetMapping("/activity/regist/list")
+ R listRegistRecord(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+ /**
+ * 获取活动类型（目前只有志愿者活动需要获取）
+ * @param communityId
+ * @param type
+ * @return
+ */
+ @GetMapping("/activity/type/list")
+ R listActivityType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);
+
+ /**
+ * 添加活动类型
+ * @param comActActivityTypeVO
+ * @return
+ */
+ @PostMapping("/activity/type/add")
+ R addActivityType(@RequestBody ComActActivityTypeVO comActActivityTypeVO);
+
+ /**
+ * 我的评价
+ * @param userId
+ * @param activityId
+ * @return
+ */
+ @GetMapping("/activity/my-evaluate")
+ R listMyActivityEvaluate(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId);
+
+ /**
+ * 分页查询居家隔离统计
+ * @param detailedAdminDTO
+ * @return
+ */
+ @PostMapping("/reserve/admin/register/homeQuarantine/page")
+ R pageRegisterHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
+
+ /**
+ * 居家隔离导出
+ * @param pageReserveRegisterDetailedAdminDTO
+ * @return
+ */
+ @PostMapping("/reserve/admin/homeQuarantine/export")
+ R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
+
+ /**
+ * 分页查询物业宣传
+ * @param pageComPropertyPublicityDTO
+ * @return
+ */
+ @PostMapping("/property/publicity/page")
+ R pageComPropertyPublicity(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO);
+
+ /**
+ * 新增物业宣传
+ * @param comPropertyPublicityDTO
+ * @return
+ */
+ @PostMapping("/property/publicity/add")
+ R addComPropertyPublicity(@RequestBody ComPropertyPublicityDTO comPropertyPublicityDTO);
+
+ /**
+ * 修改物业宣传
+ * @param comPropertyPublicityDTO
+ * @return
+ */
+ @PostMapping("/property/publicity/update")
+ R updateComPropertyPublicity(@RequestBody ComPropertyPublicityDTO comPropertyPublicityDTO);
+
+ /**
+ * 查看物业宣传信息
+ * @param id
+ * @return
+ */
+ @GetMapping("/property/publicity/get")
+ R getComPropertyPublicity(@RequestParam("id") Long id);
+
+ /**
+ * 删除物业宣传
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/property/publicity/delete")
+ R deleteComPropertyPublicity(@RequestParam("id") Long id);
+
+ /**
+ * 物业公司列表
+ *
+ * @param villageId
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/property/publicity/list/property")
+ R listProperty(@RequestParam(value = "villageId", required = false) Long villageId, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询物业宣传-小程序
+ * @param pageComPropertyPublicityDTO
+ * @return
+ */
+ @PostMapping("/property/publicity/page/applet")
+ R pageComPropertyPublicityApplet(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO);
+
+ /**
+ * 增加物业宣传浏览量
+ * @param id
+ * @return
+ */
+ @GetMapping("/property/publicity/incr-view")
+ R incrPropertyPublicityView(@RequestParam("id") Long id);
+
+ /**
+ * 获取预设图片
+ * @param type
+ * @param subtype
+ * @return
+ */
+ @GetMapping("/picture/library/get")
+ R getPresetPictureLibrary(@RequestParam("type") Integer type, @RequestParam("subtype") Integer subtype);
+
+ /**
+ * 分页查询房屋租赁基础配置
+ * @param pageRentingHousesConfigDTO
+ * @return
+ */
+ @PostMapping("/rentingHousesConfig/page")
+ R pageRentingHousesConfig(@RequestBody PageRentingHousesConfigDTO pageRentingHousesConfigDTO);
+
+ /**
+ * 更新配置信息
+ * @param rentingHousesConfigDTO
+ * @return
+ */
+ @PutMapping("/rentingHousesConfig/update")
+ R updateRentingHousesConfig(@RequestBody RentingHousesConfigDTO rentingHousesConfigDTO);
+
+ /**
+ * 新增房源信息
+ * @param registerDTO
+ * @return
+ */
+ @PostMapping("/rentingHourseRegister/register")
+ R registerRentingHouse(@RequestBody RentingHouseRegisterDTO registerDTO);
+
+ /**
+ * 编辑房源信息
+ * @param registerDTO
+ * @return
+ */
+ @PostMapping("/rentingHourseRegister/update")
+ R updateRentingHouse(@RequestBody RentingHouseRegisterDTO registerDTO);
+
+ /**
+ * 分页获取房源信息
+ * @param pageRegisterDTO
+ * @return
+ */
+ @PostMapping("/rentingHourseRegister/page")
+ R pageRentingHouse(@RequestBody PageRentingHouseRegisterDTO pageRegisterDTO);
+
+ /**
+ * 发布/取消发布 房源信
+ * @param releaseOrCancelHouseDTO
+ * @return
+ */
+ @PutMapping("/rentingHourseRegister/releaseOrCancel")
+ R releaseOrCancelHouse(@RequestBody ReleaseOrCancelHouseDTO releaseOrCancelHouseDTO);
+
+ /**
+ * 删除房源信息
+ * @param registerId
+ * @return
+ */
+ @DeleteMapping("/rentingHourseRegister/delete")
+ R deleteRentingHouse(@RequestParam("registerId") Long registerId);
+
+ /**
+ * 获取详情-房源信息
+ * @param registerId
+ * @return
+ */
+ @GetMapping("/rentingHourseRegister/get")
+ R getRentingHouse(@RequestParam("registerId") Long registerId);
+
+ /**
+ * 附近的房源
+ */
+ @PostMapping("/rentingHourseRegister/nearby")
+ R nearby(@RequestBody NearbyDTO nearbyDTO);
+
+ /**
+ * 小程序分页获取房源信息
+ * @param pageRegisterDTO
+ * @return
+ */
+ @PostMapping("/rentingHourseRegister/houseList")
+ R pageRentingHouseApplet(@RequestBody PageRentingHouseRegisterDTO pageRegisterDTO);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/rentingHourseOrder/queryAll")
+ R selectRentingHourseOrderAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/rentingHourseOrder/{id}")
+ R selectRentingHourseOrderOne(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param rentingHourseOrder 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/rentingHourseOrder")
+ R insertRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrder);
+
+ /**
+ * 修改数据
+ *
+ * @param rentingHourseOrdervo 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/rentingHourseOrder/update")
+ R updateRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrdervo);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/rentingHourseOrder/del")
+ R deleteRentingHourseOrder(@RequestParam("id") Long id);
+
+ /**
+ * 支付回调处理订单状态以及房屋状态
+ */
+ @PostMapping("/rentingHourseOrder/wxNotify")
+ R wxNotifyRentingHourseOrder(@RequestBody WxPayNotifyOrderVO wxPayNotifyOrderVO);
+
+ /**
+ * 支付付款
+ */
+ @PostMapping("/rentingHourseOrder/wxPay")
+ R wxPayRentingHourseOrder(@RequestBody WxPayOrderVO wxPayOrderVO);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/rentingHoursePreOrder/queryAll")
+ R selectAllRentingHoursePreOrder(@RequestBody CommonPage commonPage);
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/rentingHoursePreOrder/{id}")
+ R selectOneRentingHoursePreOrder(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param rentingHoursePreOrderVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/rentingHoursePreOrder")
+ R insertRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);
+
+ /**
+ * 修改数据
+ *
+ * @param rentingHoursePreOrderVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/rentingHoursePreOrder/update")
+ R updateRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/rentingHoursePreOrder/del")
+ R deleteRentingHoursePreOrder(@RequestParam("id") Long id);
+
+ /**
+ * 普通订单统计
+ */
+ @PostMapping("/rentingHourseOrder/statics")
+ R staticsRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrderVO);
+
+ /**
+ * 定金订单统计
+ */
+ @PostMapping("/rentingHoursePreOrder/statics")
+ R staticsRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);
+
+ /**
+ * 获取房屋租赁配置
+ * @return
+ * @param type
+ */
+ @GetMapping("/rentingHousesConfig/getConfig")
+ R getRentingHouseConfig(@RequestParam("type") Integer type);
+
+ @GetMapping("/rentingHourseRegister/updateAllHouseUnionAppCode")
+ @Async
+ void updateAllHouseUnionAppCode(@RequestParam("areaCode") String areaCode);
+
+ /**
+ * 西区大屏治理数据
+ */
+ @GetMapping("/screen/getWestScreenStatics")
+ R westScreenStatics();
+
+ /**
+ * 西区大屏一标三实数据
+ * @return 西区大屏一标三实数据
+ */
+ @GetMapping("/screen/getComprehensivePopulationStatics")
+ R getComprehensivePopulationStatics(@RequestParam("streetId") Long streetId);
+
+ @GetMapping("/screen/getComprehensiveStreetList")
+ R getComprehensiveStreetList();
+
+ /**
+ * 通过社区id查询社区账号密码
+ * @param communityId 社区id
+ * @return 查询社区账号密码
+ */
+ @GetMapping("/screen/getCommunityPassword")
+ R getCommunityPassword(@RequestParam("communityId") Long communityId);
+
+ @GetMapping("/reserve/bigScreenStaticsReserve")
+ R bigScreenStaticsReserve(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 党员活动折线图
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/bigscreen/party/partyActivityLine")
+ R partyActivityLine(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 党员积分前3
+ * @param pageBigScreenStatisticPartyOrg
+ * @return
+ */
+ @PostMapping("/bigscreen/party/partyActivityTop")
+ R partyActivityTop(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg);
+
+ /**
+ * 社区服务大屏数据分析接口
+ */
+ @GetMapping("/screen/serviceData")
+ R serviceData(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 服务居民接口
+ */
+ @GetMapping("/screen/serviceUser")
+ R serviceUser(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大数据分析平台-居民自治
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/resident/autonomy")
+ R getResidentAutonomy(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大数据分析平台-清网治格
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/grids/governance")
+ R getGridsGovernance(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大数据分析平台-社区服务
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/community/service")
+ R getCommunityServiceStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页获取热度排行商家
+ * @param pagePopularMerchantDTO
+ * @return
+ */
+ @PostMapping("/screen/merchant/popular")
+ R getScreenPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO);
+
+ /**
+ * 新版大屏首页接口
+ */
+ @GetMapping("/screen/indexInfo")
+ R indexInfo(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-微心愿
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/microWish")
+ R indexMicroWish(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-随手拍
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/easyPhoto")
+ R indexEasyPhoto(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-随手拍展示列表
+ * @return
+ */
+ @PostMapping("/screen/index/easyPhotoList")
+ R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-社区问卷
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/questionnaire")
+ R indexQuestionnaire(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-社区动态
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/dyn")
+ R indexDyn(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-社区动态展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/dynList")
+ R indexDynList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-邻里圈
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/neighbor")
+ R indexNeighbor(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-邻里圈展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/neighborList")
+ R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-便民商家
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/merchant")
+ R indexMerchant(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-商家展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/merchantList")
+ R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-微心愿展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/microWishList")
+ R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-社区问卷展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/questionnaireList")
+ R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-居民活动
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/residentAct")
+ R indexResidentAct(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-居民活动展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/residentActList")
+ R indexResidentActList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-志愿者活动
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/volunteerAct")
+ R indexVolunteerAct(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-志愿者活动展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/volunteerActList")
+ R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 清网治格-根据事件分类获取近1月的社区事件数据
+ * @param type
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/event/list")
+ R getEventList(@RequestParam(value = "type") Integer type, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 清网治格-社区事件数据分页
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/event/page")
+ R pageEventList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 新增数字商业街商家
+ * @param mcsMerchantDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/merchant/add")
+ R addMcsMerchant(@RequestBody McsMerchantDTO mcsMerchantDTO);
+
+ /**
+ * 编辑数字商业街商家
+ * @param mcsMerchantDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/merchant/put")
+ R putMcsMerchant(@RequestBody McsMerchantDTO mcsMerchantDTO);
+
+ /**
+ * 查询数字商业街商家详情
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/merchant/get")
+ R getMcsMerchant(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 删除数字商业街商家
+ * @param merchantId
+ * @param userId
+ * @return
+ */
+ @DeleteMapping("/microcommercialstreet/merchant/delete")
+ R deleteMcsMerchant(@RequestParam("merchantId") Long merchantId, @RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询数字商业街商家
+ * @param pageMcsMerchantDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/merchant/page")
+ R pageMcsMerchant(@RequestBody PageMcsMerchantDTO pageMcsMerchantDTO);
+
+ /**
+ * 禁用/启用数字商业街商家
+ * @param disableOrEnableMcsMerchantDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/merchant/disable-or-enable")
+ R disableOrEnableMcsMerchant(@RequestBody DisableOrEnableMcsMerchantDTO disableOrEnableMcsMerchantDTO);
+
+ /**
+ * 获取所有数字商业街配置
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/config/all")
+ R getAllMcsConfig();
+
+ /**
+ * 修改数字商业街配置
+ * @param configs
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/config/put")
+ R putMcsConfig(@RequestBody List<McsConfigVO> configs);
+
+ /**
+ * 分页查询戳戳游戏
+ * @param pageMcsGameDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/game/page")
+ R pageMcsGame(@RequestBody PageMcsGameDTO pageMcsGameDTO);
+
+ /**
+ * 设为/取消游戏热门
+ * @param setPopularForGameDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/game/setPopular")
+ R setPopularForGame(@RequestBody SetPopularForGameDTO setPopularForGameDTO);
+
+ /**
+ * 上架/下架戳戳游戏
+ * @param setShelfForGameDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/game/setShelf")
+ R setShelfForGame(@RequestBody SetShelfForGameDTO setShelfForGameDTO);
+
+ /**
+ * 删除戳戳游戏
+ * @param gameId
+ * @param userId
+ * @return
+ */
+ @DeleteMapping("/microcommercialstreet/game/delete")
+ R deleteMcsGame(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询戳戳资讯
+ * @param pageMcsInformationDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/information/page")
+ R pageMcsInfo(@RequestBody PageMcsInformationDTO pageMcsInformationDTO);
+
+ /**
+ * 上架/下架戳戳资讯
+ * @param setShelfForInfoDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/information/setShelf")
+ R setShelfForMcsInfo(@RequestBody SetShelfForInfoDTO setShelfForInfoDTO);
+
+ /**
+ * 删除戳戳资讯
+ * @param infoId
+ * @param userId
+ * @return
+ */
+ @DeleteMapping("/microcommercialstreet/information/delete")
+ R deleteMcsInfo(@RequestParam("infoId") Long infoId, @RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询评价记录
+ * @param pageMcsEvaluateDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/evaluate/page")
+ R pageMcsEvaluate(@RequestBody PageMcsEvaluateDTO pageMcsEvaluateDTO);
+
+ /**
+ * 查询评价记录详情
+ * @param evaluateId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/evaluate/get")
+ R getMcsEvaluate(@RequestParam("evaluateId") Long evaluateId);
+
+ /**
+ * 删除评价记录
+ * @param evaluateId
+ * @return
+ */
+ @DeleteMapping("/microcommercialstreet/evaluate/delete")
+ R deleteMcsEvaluate(@RequestParam("evaluateId") Long evaluateId);
+
+ /**
+ * 新增戳戳游戏
+ * @param mcsGameDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/game/add")
+ R addMcsGame(@RequestBody McsGameDTO mcsGameDTO);
+
+ /**
+ * 编辑戳戳游戏
+ * @param mcsGameDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/game/put")
+ R putMcsGame(@RequestBody McsGameDTO mcsGameDTO);
+
+ /**
+ * 发布戳戳游戏
+ * @param gameId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/game/publish")
+ R publishMcsGame(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);
+
+ /**
+ * 结束戳戳游戏
+ * @param gameId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/game/finish")
+ R finishMcsGame(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);
+
+ /**
+ * 戳戳游戏/资讯顶部统计数据
+ * @param type
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/statistics/top")
+ R getTopStatistics(@RequestParam("type") Integer type, @RequestParam("userId") Long userId);
+
+ /**
+ * 新增戳戳资讯
+ * @param mcsInfoDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/information/add")
+ R addMcsInfo(@RequestBody McsInfoDTO mcsInfoDTO);
+
+ /**
+ * 编辑戳戳资讯
+ * @param mcsInfoDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/information/put")
+ R putMcsInfo(@RequestBody McsInfoDTO mcsInfoDTO);
+
+ /**
+ * 发布戳戳资讯
+ * @param infoId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/information/publish")
+ R publishMcsInfo(@RequestParam("infoId") Long infoId, @RequestParam("userId") Long userId);
+
+ /**
+ * 新增产品信息
+ * @param mcsProductDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/product/add")
+ R addMcsProduct(@RequestBody McsProductDTO mcsProductDTO);
+
+ /**
+ * 编辑产品信息
+ * @param mcsProductDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/product/put")
+ R putMcsProduct(@RequestBody McsProductDTO mcsProductDTO);
+
+ /**
+ * 删除产品信息
+ * @param deleteProductDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/product/delete")
+ R deleteMcsProduct(@RequestBody DeleteProductDTO deleteProductDTO);
+
+ /**
+ * 上架/下架产品信息
+ * @param setShelfForProductDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/product/setShelf")
+ R setShelfForMcsProduct(@RequestBody SetShelfForProductDTO setShelfForProductDTO);
+
+ /**
+ * 分页查询产品信息
+ * @param pageMcsProductDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/product/page")
+ R pageMcsProduct(@RequestBody PageMcsProductDTO pageMcsProductDTO);
+
+ /**
+ * 获取产品标签列表
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/label/list")
+ R getMcsLabelList(@RequestParam("userId") Long userId);
+
+ /**
+ * check商家/店铺是否有效
+ * @param userId
+ * @return
+ */
+ @GetMapping("/shop/checkStoreIsValid")
+ R checkStoreIsValid(@RequestParam("userId") Long userId);
+
+ /**
+ * 根据account查询微商业街商家信息
+ * @param account
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/getMcsMerchantByAccount")
+ R getMcsMerchantByAccount(@RequestParam("account") String account);
+
+ /**
+ * 完成订单更新/新增商家信息
+ * @param merchantName
+ * @param configId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/updateAfterOrder")
+ R updateMcsMerchantAfterOrder(@RequestParam(value = "merchantName", required = false) String merchantName,
+ @RequestParam("configId") Long configId, @RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/mcsOrder/queryAll")
+ R selectAllMscOrder(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/mcsOrder/{id}")
+ R selectOneMscOrder(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param mcsOrderVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/mcsOrder")
+ R insertMscOrder(@RequestBody McsOrderVO mcsOrderVO);
+
+ /**
+ * 修改数据
+ *
+ * @param mcsOrderVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/mcsOrder/update")
+ R updateMscOrder(@RequestBody McsOrderVO mcsOrderVO);
+
+ /**
+ * 微信支付
+ * @param mcsOrderVO
+ * @return
+ */
+ @PostMapping("/mcsOrder/wxPay")
+ R wxPayMscOrder(McsOrderVO mcsOrderVO);
+
+ /**
+ * 发送提醒短信
+ * @param id
+ * @return
+ */
+ @GetMapping("/mcsOrder/sendContent")
+ R sendContentMcsOrder(@RequestParam("id") Long id);
+
+ /**
+ *微信支付回调
+ * @param mcsOrderVO
+ * @return
+ */
+ @PostMapping("/mcsOrder/notify")
+ R notifyMcsOrder(@RequestBody McsOrderVO mcsOrderVO);
+
+ /**
+ * 验证码登录
+ * @param loginDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/loginWithPhone")
+ R loginWithPhone(@RequestBody LoginWithPhoneDTO loginDTO);
+
+ /**
+ * 首页顶部数据
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/index/topData")
+ R getMcsIndexTopData();
+
+ /**
+ * 戳戳卷领取
+ * @param gameId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/coupon/apply")
+ R applyMcsCoupon(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);
+
+ /**
+ * h5分页查询戳戳资讯
+ * @param pageMcsInformationDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/information/pageH5")
+ R pageH5McsInfo(@RequestBody PageMcsInformationDTO pageMcsInformationDTO);
+
+ /**
+ * h5分页查询戳戳游戏
+ * @param pageMcsGameDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/game/pageH5")
+ R pageH5McsGame(@RequestBody PageMcsGameDTO pageMcsGameDTO);
+
+ /**
+ * 游戏详情
+ * @param gameId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/game/get")
+ R getMcsGame(@RequestParam("gameId") Long gameId);
+
+ /**
+ * 资讯详情
+ * @param infoId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/info/get")
+ R getMcsInfo(@RequestParam("infoId") Long infoId);
+
+ /**
+ * H5分页查询数字商业街商家
+ * @param pageMcsMerchantDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/merchant/pageH5")
+ R pageH5McsMerchant(@RequestBody PageMcsMerchantDTO pageMcsMerchantDTO);
+
+ /**
+ * 我的戳戳卷
+ * @param type
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/myCoupon")
+ R getMyCoupon(@RequestParam(value = "type", required = false) Integer type, @RequestParam("userId") Long userId);
+
+ /**
+ * 新增评价记录
+ * @param mcsEvaluateDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/evaluate/add")
+ R addMcsEvaluate(@RequestBody McsEvaluateDTO mcsEvaluateDTO);
+
+ /**
+ * 我的评价-参与游戏列表
+ * @param pageJoinGameListDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/joinGame/page")
+ R getJoinGameList(@RequestBody PageJoinGameListDTO pageJoinGameListDTO);
+
+ /**
+ * 戳戳卷核销
+ * @param couponId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/coupon/verify")
+ R verifyMcsCoupon(@RequestParam("couponId") Long couponId, @RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询核销记录
+ * @param pageVerifyRecordDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/verifyRecord/page")
+ R pageMcsVerifyRecord(@RequestBody PageVerifyRecordDTO pageVerifyRecordDTO);
+
+ /**
+ * 游戏统计
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/game/statistics")
+ R getMcsGameStatistics(@RequestParam("userId") Long userId);
+
+ /**
+ * 修改用戶信息
+ * @param putUserInfoDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/putUserInfo")
+ R putUserInfo(@RequestBody PutUserInfoDTO putUserInfoDTO);
+
+ /**
+ * 根据userId获取商家信息
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/retrieveMcsMerchantInfoByUserId")
+ R retrieveMcsMerchantInfoByUserId(@RequestParam("userId") Long userId);
+
+ /**
+ * 定时任务-每隔5分钟执行一次，将已到期的微商业街商家旗下所有的游戏/资讯全部下架
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/offResourceForMcsMerchant")
+ R offResourceForMcsMerchant();
+
+ /**
+ * 获取产品信息详情
+ * @param productId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/product/get")
+ R getMcsProduct(@RequestParam("productId") Long productId);
+
+ /**
+ * 定时任务-每隔5分钟执行一次，将已到期的微商业街游戏结束
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/endStatusForMcsGame")
+ R endStatusForMcsGame();
+
+ @GetMapping("/reserve/record/delete")
+ R deleteRecord(@RequestParam("recordId")Long recordId);
+
+ /**
+ * 历史数据人员类型填充
+ * @param newVoList
+ * @param communityId
+ * @param userId
+ * @return
+ */
+ @PostMapping("/common/data/history/filled")
+ R filledPopulationPersonType(@RequestBody List<ComMngPopulationServeExcelVO> newVoList,
+ @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
+
+ /**
+ * 社区后台-分页查询志愿者组织队伍
+ *
+ * @param orgTeamDto 请求参数
+ * @return 志愿者组织队伍
+ */
+ @PostMapping("/comMngVolunteerOrgTeam/page")
+ R pageVolunteerOrgAdmin(@RequestBody PageComMngVolunteerOrgTeamDto orgTeamDto);
+
+ /**
+ * 社区后台-新增志愿者组织队伍
+ *
+ * @param orgTeamDto 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/comMngVolunteerOrgTeam/add")
+ R addVolunteerOrgAdmin(@RequestBody AddComMngVolunteerOrgTeamDto orgTeamDto);
+
+ /**
+ * 社区后台-编辑志愿者组织队伍
+ *
+ * @param orgTeamDto 请求参数
+ * @return 编辑结果
+ */
+ @PutMapping("/comMngVolunteerOrgTeam/edit")
+ R editVolunteerOrgAdmin(@RequestBody EditComMngVolunteerOrgTeamDto orgTeamDto);
+
+ /**
+ * 社区后台-删除志愿者组织队伍
+ *
+ * @param id 主键id
+ * @return 删除结果
+ */
+ @GetMapping("/comMngVolunteerOrgTeam/delete")
+ R deleteVolunteerOrgAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 社区后台-查询志愿者组织列表
+ *
+ * @param orgTeamDto 请求参数
+ * @return 志愿者组织列表
+ */
+ @PostMapping("/comMngVolunteerOrgTeam/list")
+ R listVolunteerOrgAdmin(@RequestBody PageComMngVolunteerOrgTeamDto orgTeamDto);
+
+ /**
+ * 社区后台-分页查询服务类型
+ *
+ * @param serviceTypeDto 请求参数
+ * @return 服务类型列表
+ */
+ @PostMapping("/comMngVolunteerServiceType/page")
+ R pageServiceTypeAdmin(@RequestBody PageComMngVolunteerServiceTypeDto serviceTypeDto);
+
+ /**
+ * 社区后台-新增服务类型
+ *
+ * @param serviceTypeDto 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/comMngVolunteerServiceType/add")
+ R addServiceTypeAdmin(@RequestBody AddComMngVolunteerServiceTypeDto serviceTypeDto);
+
+ /**
+ * 社区后台-编辑服务类型
+ *
+ * @param serviceTypeDto 请求参数
+ * @return 编辑结果
+ */
+ @PutMapping("/comMngVolunteerServiceType/edit")
+ R editServiceTypeAdmin(@RequestBody EditComMngVolunteerServiceTypeDto serviceTypeDto);
+
+ /**
+ * 社区后台-删除服务类型
+ *
+ * @param id 主键id
+ * @return 删除结果
+ */
+ @GetMapping("/comMngVolunteerServiceType/delete")
+ R deleteServiceTypeAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 社区后台-分页查询志愿者技能列表
+ *
+ * @param volunteerSkillDto 请求参数
+ * @return 志愿者技能列表
+ */
+ @PostMapping("/comMngVolunteerSkill/page")
+ R pageVolunteerSkillAdmin(@RequestBody PageComMngVolunteerSkillDto volunteerSkillDto);
+
+ /**
+ * 社区后台-新增志愿者技能
+ *
+ * @param volunteerSkillDto 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/comMngVolunteerSkill/add")
+ R addVolunteerSkillAdmin(@RequestBody AddComMngVolunteerSkillDto volunteerSkillDto);
+
+ /**
+ * 社区后台-编辑志愿者技能
+ *
+ * @param volunteerSkillDto 请求参数
+ * @return 编辑结果
+ */
+ @PutMapping("/comMngVolunteerSkill/edit")
+ R editVolunteerSkillAdmin(@RequestBody EditComMngVolunteerSkillDto volunteerSkillDto);
+
+ /**
+ * 社区后台-删除志愿者技能
+ *
+ * @param id 主键id
+ * @return 删除结果
+ */
+ @GetMapping("/comMngVolunteerSkill/delete")
+ R deleteVolunteerSkillAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 社区后台-查询志愿者服务类型列表
+ *
+ * @param serviceTypeDto 请求参数
+ * @return 志愿者服务列表
+ */
+ @PostMapping("/comMngVolunteerServiceType/list")
+ R listServiceTypeAdmin(@RequestBody PageComMngVolunteerServiceTypeDto serviceTypeDto);
+
+ /**
+ * 社区后台-查询志愿者技能列表
+ *
+ * @param volunteerSkillDto 请求参数
+ * @return 志愿者技能列表
+ */
+ @PostMapping("/comMngVolunteerSkill/list")
+ R listVolunteerSkillAdmin(@RequestBody PageComMngVolunteerSkillDto volunteerSkillDto);
+
+ /**
+ * 社区后台-志愿者组织统计
+ *
+ * @param communityId 社区id
+ * @return 志愿者组织统计
+ */
+ @GetMapping("/comMngVolunteerOrgTeam/statistics")
+ R statisticsVolunteerOrgAdmin(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 志愿者导入
+ *
+ * @param list 志愿者数据列表
+ * @param communityId 社区id
+ * @param userId 用户id
+ * @return 导入结果
+ */
+ @PostMapping("/volunteer/import/admin")
+ R importVolunteerAdmin(@RequestBody List<ComMngVolunteerExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ @PostMapping("/screen/hmk/baseInfo")
+ R hmkBaseInfo(@RequestBody CommonPage commonPage);
+
+ @GetMapping("/screen/hmk/partyProjectActivityLine")
+ R partyProjectActivityLine();
+
+ @PostMapping("/screen/hmk/projectActivityTop")
+ R projectActivityProject(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialOrg/{id}")
+ R comActSocialOrgSelectOne(@PathVariable("id") Long id);
+
+
+ /**
+ * 通过userId查询
+ *
+ * @param userId 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialOrg/selectByUserId")
+ R selectOneByUserId(@RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialMember/queryAll")
+ public R comActSocialMemberSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialMember/{id}")
+ public R comActSocialMemberSelectOne(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialMember")
+ public R comActSocialMemberInsert(@RequestBody ComActSocialMemberVO comActSocialMember);
+
+ /**
+ * 批量新增数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProjectMember/batch")
+ public R comActSocialMemberInsertBatch(@RequestBody ComActSocialProjectMemberVO comActSocialMember);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialMember/update")
+ public R comActSocialMemberUpdate(@RequestBody ComActSocialMemberVO comActSocialMember);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialMember/del")
+ public R comActSocialMemberDelete(@RequestParam("id") Long id);
+
+ /**
+ * 新增社工
+ * @param comActSocialWorkerAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialWorker/add")
+ R addComactsocialworker(@RequestBody ComActSocialWorkerAddDTO comActSocialWorkerAddDTO);
+
+ /**
+ * 修改社工
+ * @param comActSocialWorkerEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/comActSocialWorker/edit")
+ R editComactsocialworker(@RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO);
+
+ /**
+ * 分页查找社工
+ * @param pageComActSocialWorkerDTO
+ * @return 维护结果
+ */
+ @PostMapping("/comActSocialWorker/page")
+ R queryComactsocialworker(@RequestBody PageComActSocialWorkerDTO pageComActSocialWorkerDTO);//返回 R<IPage<ComActSocialWorkerVO>>
+
+ /**
+ * 删除社工
+ * @param comActSocialWorkerDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/comActSocialWorker/delete")
+ R deleteComactsocialworker(@RequestBody ComActSocialWorkerDeleteDTO comActSocialWorkerDeleteDTO);
+
+ /**
+ * 查询社工详细信息
+ * @param id 社工 id
+ * @return 查找结果
+ */
+ @PostMapping("/comActSocialWorker/{id}")
+ R<ComActSocialWorkerVO> comActSocialWorkerDetails(@PathVariable("id") Long id);
+
+ /**
+ * 批量导入社工
+ *
+ * @param list 社工集合
+ */
+ @PostMapping("/comActSocialWorker/input")
+ R listSaveSocialWorkerExcelVO(@RequestBody List<ComActSocialWorkerExcelVO> list, @RequestParam("communityId") Long communityId);
+
+ /**
+ *活动查询社工列表
+ * @param commonPage
+ * @return
+ */
+ @PostMapping("/comActSocialWorker/activity")
+ R activity(@RequestBody CommonPage commonPage);
+
+ /**
+ * 社工查询活动
+ * @param commonPage
+ * @return
+ */
+ @PostMapping("/comActSocialWorker/activityList")
+ R activityList(@RequestBody CommonPage commonPage);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialWorkerService/queryAll")
+ R selectAllComActSocialWorkerService(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialWorkerService/{id}")
+ R selectOneComActSocialWorkerService(@PathVariable("id") Long id);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialWorkerServiceVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialWorkerService/update")
+ R updateComActSocialWorkerService(@RequestBody ComActSocialWorkerServiceVO comActSocialWorkerServiceVO);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialProject/queryAll")
+ R selectAllComActSocialProject(@RequestBody CommonPage commonPage);
+
+ /**
+ * 平台详情接口
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialProject/{id}")
+ R selectOneComActSocialProject(@PathVariable("id") Long id);
+
+ /**
+ * 根据项目id分页获取关联项目
+ */
+ @PostMapping("/comActSocialProject/getRelation")
+ R getRelationComActSocialProject(@RequestBody CommonPage commonPage);
+
+ /**
+ * 新增数据
+ *
+ * @param socialProjectVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProject")
+ R insertComActSocialProject(@RequestBody SocialProjectVO socialProjectVO);
+ /**
+ * 修改数据
+ *
+ * @param socialProjectVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialProject/update")
+ R updateComActSocialProject(@RequestBody SocialProjectVO socialProjectVO);
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProject/del")
+ R deleteComActSocialProject(@RequestParam("id") Long id);
+ /**
+ * 小程序详情接口
+ * @param id
+ * @param userId
+ * @return
+ */
+ @GetMapping("/comActSocialProject/getApplet")
+ R getAppletComActSocialProject(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialProjectMember/queryAll")
+ public R selectAllComActSocialProjectMember(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialProjectMember/{id}")
+ public R selectOneComActSocialProjectMember(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectMemberVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProjectMember")
+ public R insertComActSocialProjectMember(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectMemberVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialProjectMember/update")
+ public R updateComActSocialProjectMember(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProjectMember/del")
+ public R deleteComActSocialProjectMember(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialProjectPublicity/queryAll")
+ public R selectAllComActSocialProjectPublicity(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialProjectPublicity/getByApplet/{id}")
+ public R selectOneComActSocialProjectPublicity(@PathVariable("id") Long id);
+
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectPublicityVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProjectPublicity")
+ public R insertComActSocialProjectPublicity(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectPublicityVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialProjectPublicity/update")
+ public R updateComActSocialProjectPublicity(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProjectPublicity/del")
+ public R deleteComActSocialProjectPublicity(@RequestParam("id") Long id);
+ /**
+ * 多条删除数据
+ *
+ * @param ids 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProjectPublicity/delBatch")
+ public R delBatchComActSocialProjectPublicity(@RequestParam("ids") List<Long> ids);
+
+ /**
+ * 根据projectId查询所有进度
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialProjectSchedule/queryAll")
+ public R selectAllComActSocialProjectSchedule(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialProjectSchedule/{id}")
+ public R selectOneComActSocialProjectSchedule(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectScheduleVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProjectSchedule")
+ public R insertComActSocialProjectSchedule(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectScheduleVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialProjectSchedule/update")
+ public R updateComActSocialProjectSchedule(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProjectSchedule/del")
+ public R deleteComActSocialProjectSchedule(@RequestParam("id") Long id);
+
+ /**
+ * 项目分类级联
+ * @param comActColumnVO
+ * @return
+ */
+ @PostMapping("/comActColumn/queryLevel")
+ public R queryLevel(@RequestBody ComActColumnVO comActColumnVO);
+
+ @PostMapping("/comActRaffle/queryAll")
+ R selectAllComActRaffle(@RequestBody CommonPage commonPage);
+
+ @GetMapping("/comActRaffle/detail")
+ R selectOneComActRaffle(@RequestParam("id") Long id,@RequestParam("userId")Long userId);
+
+ @PostMapping("/comActRaffle")
+ R insertComActRaffle(@RequestBody ComActRaffleVO comActRaffleVO);
+
+ @PostMapping("/comActRaffle/update")
+ R updateComActRaffle(@RequestBody ComActRaffleVO comActRaffleVO);
+
+ @GetMapping("/comActRaffle/del")
+ R deleteComActRaffle(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActRaffleRecord/queryAll")
+ R selectAllComActRaffleRecord(@RequestBody CommonPage commonPage);
+
+ @GetMapping("/comActRaffleRecord/queryPrize")
+ R queryPrize(@RequestParam("id")Long id);
+
+ /**
+ * 生成二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @PostMapping("/comActRaffleRecord/getQRCode")
+ R getRaffleQRCode(@RequestBody QRCodeVO qrCodeVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActRaffleRecordVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActRaffleRecord/update")
+ R updateRaffleRecord(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO);
+
+ @PostMapping("/comActRaffleRecord")
+ R insertRaffleRecord(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActRaffleRecord/{id}")
+ R selectOneRaffleRecord(@PathVariable("id") Long id);
+ /**
+ * 导出
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActRaffleRecord/export")
+ R exportComActRaffleRecord(@RequestBody CommonPage commonPage);
+
+ /**
+ * [方法描述] 根据社区ID查询所属城市所在区区域代码，
+ *
+ * @param communityId
+ * 社区ID
+ * @return String 区域code
+ * @author manailin
+ * @date 2022/2/17 10:09
+ */
+ @GetMapping("act/getActBelongRegionCode")
+ String getActBelongRegionCode(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 新增团队类型
+ * @param addTeamTypeDTO
+ * @return
+ */
+ @PostMapping("/fms/teamType/add")
+ R addFmsTeamType(@RequestBody AddTeamTypeDTO addTeamTypeDTO);
+
+ /**
+ * 修改团队类型
+ * @param editTeamTypeDTO
+ * @return
+ */
+ @PostMapping("/fms/teamType/edit")
+ R editFmsTeamType(@RequestBody EditTeamTypeDTO editTeamTypeDTO);
+
+ /**
+ * 删除团队类型
+ * @param teamTypeId
+ * @param communityId
+ * @return
+ */
+ @DeleteMapping("/fms/teamType/delete")
+ R deleteFmsTeamType(@RequestParam("teamTypeId") Long teamTypeId,
+ @RequestParam("communityId") Long communityId);
+
+ /**
+ * 获取团队类型列表
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/fms/teamType/list")
+ R listFmsTeamType(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 新增团队
+ * @param addTeamDTO
+ * @return
+ */
+ @PostMapping("/fms/team/add")
+ R addFmsTeam(@RequestBody AddTeamDTO addTeamDTO);
+
+ /**
+ * 修改团队信息
+ * @param editTeamDTO
+ * @return
+ */
+ @PostMapping("/fms/team/edit")
+ R editFmsTeam(@RequestBody EditTeamDTO editTeamDTO);
+
+ /**
+ * 删除团队
+ * @param teamId
+ * @return
+ */
+ @DeleteMapping("/fms/team/delete")
+ R deleteFmsTeam(@RequestParam("teamId") Long teamId);
+
+ /**
+ * 获取团队列表
+ * @param teamTypeId
+ * @return
+ */
+ @GetMapping("/fms/team/list")
+ R listFmsTeam(@RequestParam("teamTypeId") Long teamTypeId);
+
+ /**
+ * 获取团队详情
+ * @param teamId
+ * @return
+ */
+ @GetMapping("/fms/team/detail")
+ R detailFmsTeam(@RequestParam("teamId") Long teamId);
+
+ /**
+ * 级联查询团队数据
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/fms/team/cascade")
+ R retrieveFmsTeamCascade(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 新增团队成员
+ * @param addTeamMemberDTO
+ * @return
+ */
+ @PostMapping("/fms/teamMember/add")
+ R addFmsTeamMember(@RequestBody AddTeamMemberDTO addTeamMemberDTO);
+
+ /**
+ * 编辑团队成员
+ * @param editTeamMemberDTO
+ * @return
+ */
+ @PostMapping("/fms/teamMember/edit")
+ R editFmsTeamMember(@RequestBody EditTeamMemberDTO editTeamMemberDTO);
+
+ /**
+ * 删除团队成员
+ * @param deleteTeamMemberDTO
+ * @return
+ */
+ @PostMapping("/fms/teamMember/delete")
+ R deleteFmsTeamMember(@RequestBody DeleteTeamMemberDTO deleteTeamMemberDTO);
+
+ /**
+ * 分页查询团队成员
+ * @param pageTeamMemberDTO
+ * @return
+ */
+ @PostMapping("/fms/teamMember/page")
+ R pageFmsTeamMember(@RequestBody PageTeamMemberDTO pageTeamMemberDTO);
+
+ /**
+ * 微团队顶部统计
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/fms/teamMember/statistics")
+ R statisticsFmsTeamMember(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 批量导入团队成员
+ * @param voList
+ * @param communityId
+ * @param userId
+ * @return
+ */
+ @PostMapping("/fms/teamMember/import")
+ R listSaveFmsTeamMemberExcelVO(@RequestBody List<ComFmsTeamMemberImportExcelVO> voList,
+ @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
+
+ /**
+ * 团队人员导出
+ * @param pageTeamMemberDTO
+ * @return
+ */
+ @PostMapping("/fms/teamMember/export")
+ R exportTeamMember(@RequestBody PageTeamMemberDTO pageTeamMemberDTO);
+
+ /**
+ * 后台新增微服务
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/service/adminAdd")
+ R addFmsServiceAdmin(@RequestBody AddFmsServiceAdminDTO adminDTO);
+
+ /**
+ * 后台分页查询微服务
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/service/adminPage")
+ R pageFmsServiceAdmin(@RequestBody PageFmsServiceAdminDTO adminDTO);
+
+ /**
+ * 后台核实微服务
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/service/approval")
+ R approvalFmsService(@RequestBody ApprovalFmsServiceAdminDTO adminDTO);
+
+ /**
+ * 级联查询团队服务人员
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/fms/teamMember/cascade")
+ R retrieveFmsTeamMemberCascade(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 后台查看微服务详情
+ * @param serviceId
+ * @return
+ */
+ @GetMapping("/fms/service/detailAdmin")
+ R detailFmsServiceAdmin(@RequestParam("serviceId") Long serviceId);
+
+ /**
+ * 后台删除微服务
+ * @param serviceId
+ * @return
+ */
+ @DeleteMapping("/fms/service/delete")
+ R deleteFmsServiceAdmin(@RequestParam("serviceId") Long serviceId);
+
+ /**
+ * 微服务顶部统计
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/fms/service/statistics")
+ R statisticsFmsService(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 后台导入微服务数据
+ * @param voList
+ * @param communityId
+ * @param userId
+ * @return
+ */
+ @PostMapping("/fms/service/import")
+ R listSaveFmsServiceExcelVO(@RequestBody List<ComFmsServiceImportExcelVO> voList,
+ @RequestParam("communityId") Long communityId,
+ @RequestParam("userId") Long userId);
+
+ /**
+ * 后台新增微讲堂
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/classroom/add")
+ R addFmsClassroom(@RequestBody AddFmsClassroomAdminDTO adminDTO);
+
+ /**
+ * 后台编辑微讲堂
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/classroom/edit")
+ R editFmsClassroom(@RequestBody EditFmsClassroomAdminDTO adminDTO);
+
+ /**
+ * 后台删除微讲堂
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/fms/classroom/delete")
+ R deleteFmsClassroom(@RequestParam("id") Long id);
+
+ /**
+ * 后台获取微讲堂详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/fms/classroom/detail")
+ R detailFmsClassroom(@RequestParam("id") Long id);
+
+ /**
+ * 后台分页查询微讲堂
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/classroom/pageAdmin")
+ R pageFmsClassroomAdmin(@RequestBody PageFmsClassroomAdminDTO adminDTO);
+
+ /**
+ * 微讲堂顶部统计
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/fms/classroom/statistics")
+ R statisticsFmsClassroom(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 后台分页查询微调节/微防控
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/event/page")
+ R pageFmsEvent(@RequestBody PageFmsEventAdminDTO adminDTO);
+
+ /**
+ * 微调节/微防控顶部统计
+ * @param type
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/fms/event/statistics")
+ R statisticsFmsEvent(@RequestParam("type") Integer type, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 微调节/微防控事件详情
+ * @param eventId
+ * @return
+ */
+ @GetMapping("/fms/event/detail")
+ R detailFmsEvent(@RequestParam("eventId") Long eventId);
+
+ /**
+ * 小程序分页查询团队信息
+ * @param pageFmsTeamDTO
+ * @return
+ */
+ @PostMapping("/fms/team/pageApplets")
+ R pageFmsTeamApplets(@RequestBody PageFmsTeamDTO pageFmsTeamDTO);
+
+ /**
+ * 获取微讲堂详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/fms/classroom/detailApplets")
+ R detailFmsClassroomApplets(@RequestParam("id") Long id);
+
+ /**
+ * 小程序分页查询微调节/微防控
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/event/pageApplets")
+ R pageFmsEventApplets(@RequestBody PageFmsEventAdminDTO adminDTO);
+
+ /**
+ * 小程序分页查询微服务
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/service/pageApplets")
+ R pageFmsServiceApplets(@RequestBody PageFmsServiceAppletsDTO adminDTO);
+
+ /**
+ * 小程序查看微服务详情
+ * @param serviceId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/fms/service/detailApplets")
+ R detailFmsServiceApplets(@RequestParam("serviceId") Long serviceId, @RequestParam(value = "userId", required = false) Long userId);
+
+ /**
+ * 微服务申请
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/service/apply")
+ R applyFmsService(@RequestBody ApplyFmsServiceDTO adminDTO);
+
+ /**
+ * 分页查询我的微服务
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/service/pageMy")
+ R pageMyFmsService(@RequestBody PageFmsServiceAppletsDTO adminDTO);
+
+ /**
+ * 微服务评价
+ * @param evaluationFmsServiceDTO
+ * @return
+ */
+ @PostMapping("/fms/service/evaluate")
+ R evaluateFmsService(@RequestBody EvaluationFmsServiceDTO evaluationFmsServiceDTO);
+
+ /**
+ * 微团队成员分页查询服务处理
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/service/pageDeal")
+ R pageDealFmsService(@RequestBody PageFmsServiceAppletsDTO adminDTO);
+
+ /**
+ * 微团队成员服务反馈
+ * @param adminDTO
+ * @return
+ */
+ @PostMapping("/fms/service/feedback")
+ R feedbackFmsService(@RequestBody FeedbackFmsServiceDTO adminDTO);
+
+ /**
+ * 定时任务针对服务结束后3天还未评价的用户默认好评
+ * @return
+ */
+ @PostMapping("/fms/service/defaultPraise")
+ R timedTaskFmsServiceDefaultPraise();
+
+ @GetMapping("/activity/partyMemberCount")
+ R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year);
+
+ /**
+ * 根据小区id查询楼栋列表
+ * @param villageId 小区id
+ * @return 查询楼栋列表
+ */
+ @GetMapping("/building/getBuildListByVillageId")
+ R getBuildListByVillageId(@RequestParam(value = "villageId") Long villageId);
+ /**
+ * 党员活动详情数据
+ * @return
+ */
+ @PostMapping("/activity/partyMemberDetail")
+ R partyMemberDetail(@RequestBody CommonPage commonPage);
+ /**
+ * 导出党员活动详情数据
+ * @return
+ */
+ @PostMapping("/activity/exportPartyMemberDetail")
+ R exportPartyMemberDetail(@RequestBody CommonPage commonPage);
+
+ /**
+ * 金沙定制页面-党建引领基础数据
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/partyBuildIng/base")
+ R getPartyBuildIngBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 党员活动展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/partyBuildIng/partyAct")
+ R pagePartyBuildIngAct(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 议事投票展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/partyBuildIng/discuss")
+ R pagePartyBuildIngDiscuss(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 金沙定制页面-四长四员
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/fourMember/base")
+ R getFourMemberBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 杨家坪定制页面-五微服务
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/fms/base")
+ R getFmsBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 杨家坪定制页面-微团队展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/fms/team")
+ R pageFmsTeam(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 杨家坪定制页面-居家养老基础数据
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/alarm/base")
+ R getAlarmBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 杨家坪定制页面-报警记录展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/alarm/record")
+ R pageAlarmRecord(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 杨家坪定制页面-报警设备点位图
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/alarm/pointMap")
+ R getAlarmPointMap(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 杨家坪定制页面-志愿服务
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/volunteer/base")
+ R getVolunteerBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 金沙定制页面-志愿线展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/partyBuildIng/microWish")
+ R pagePartyBuildIngMicroWish(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 金沙定制页面-四长四员解决问题展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/fourMember/resolve")
+ R pageFourMemberResolve(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 金沙定制页面-四长四员院落议事展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/courtyard/list")
+ R pageCourtyardDiscuss(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 金沙定制页面-院落议事
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/courtyard/base")
+ R getCourtyardBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comActEasyPhotoHandler 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-03-01 13:45:10
+ */
+ @PostMapping("/comActEasyPhotoHandler/page")
+ R queryEasyPhotoHandler(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler);
+
+ /**
+ * description edit 编辑数据
+ *
+ * @param comActEasyPhotoHandler 请求参数
+ * @return 编辑结果
+ * @author lyq
+ * @date 2022-03-01 13:45:10
+ */
+ @PostMapping("/comActEasyPhotoHandler/edit")
+ R editEasyPhotoHandler(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler);
+
+ @GetMapping("/reserve/fiveCount")
+ R fiveCount(@RequestParam("reserveId") Long reserveId);
+
+ /**
+ * 批量删除活动
+ * @param ids
+ * @return
+ */
+ @PostMapping("batchDel")
+ R deleteActivities(@RequestBody List<Long> ids);
+
+ /**
+ * 街道详情
+ * @param id
+ * @return
+ */
+ @GetMapping("detailStreet")
+ R detailStreet(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询项目报名列表
+ * @param pageProjectSignListDTO
+ * @return
+ */
+ @PostMapping("/comActSocialProject/signList")
+ R pageProjectSignList(@RequestBody PageProjectSignListDTO pageProjectSignListDTO);
+
+ /**
+ * 分页查询孵化申请
+ * @param pageHatchAuditDTO
+ * @return
+ */
+ @PostMapping("/comActSocialOrgHatchAudit/page")
+ R pageHatchAudit(@RequestBody PageSocialOrgHatchAuditDTO pageHatchAuditDTO);
+
+ /**
+ * 查看孵化申请详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/comActSocialOrgHatchAudit/detail")
+ R detailHatchAudit(@RequestParam("id") Long id);
+
+ /**
+ * 修改孵化申请
+ * @param hatchAuditDTO
+ * @return
+ */
+ @PostMapping("/comActSocialOrgHatchAudit/update")
+ R updateHatchAudit(@RequestBody SocialOrgHatchAuditDTO hatchAuditDTO);
+
+ /**
+ * 分页查询孵化数据
+ * @param pageHatchDTO
+ * @return
+ */
+ @PostMapping("/comActSocialOrgHatch/page")
+ R pageOrgHatch(@RequestBody PageSocialOrgHatchDTO pageHatchDTO);
+
+ /**
+ * 查看孵化数据详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/comActSocialOrgHatch/detail")
+ R detailOrgHatch(@RequestParam("id") Long id);
+
+ /**
+ * 修改孵化状态
+ * @param id
+ * @param status
+ * @return
+ */
+ @PutMapping("/comActSocialOrgHatch/updateStatus")
+ R updateOrgHatchStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);
+
+ /**
+ * 获取孵化流程配置
+ * @return
+ */
+ @GetMapping("/comActSocialOrgHatchAudit/process")
+ R getHatchAuditProcess();
+
+ /**
+ * 修改孵化流程配置
+ * @param processDTO
+ * @return
+ */
+ @PutMapping("/comActSocialOrgHatchAudit/process")
+ R putHatchAuditProcess(@RequestBody HatchAuditProcessDTO processDTO);
+
+ /**
+ * 新增孵化申请
+ * @param hatchAuditDTO
+ * @return
+ */
+ @PostMapping("/comActSocialOrgHatchAudit/add")
+ R addHatchAudit(@RequestBody SocialOrgHatchAuditDTO hatchAuditDTO);
+
+ /**
+ * 查看孵化申请审核进度
+ * @param userId
+ * @return
+ */
+ @GetMapping("/comActSocialOrgHatchAudit/schedule")
+ R getHatchAuditSchedule(@RequestParam("userId") Long userId);
+
+ /**
+ * 项目公开报名
+ * @param projectId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/comActSocialProject/sign")
+ R signProject(@RequestParam("projectId") Long projectId, @RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询用户报名的项目
+ * @param pageProjectDTO
+ * @return
+ */
+ @PostMapping("/comActSocialProject/project")
+ R pageProjectWhichIsSignedByUser(@RequestBody PageProjectDTO pageProjectDTO);
+
+ /**
+ * 删除孵化申请详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/comActSocialOrgHatchAudit/delete")
+ R deleteHatchAudit(@RequestParam("id") Long id);
+
+ /**
+ * 删除孵化数据
+ * @param id
+ * @return
+ */
+ @GetMapping("/comActSocialOrgHatch/delete")
+ R deleteOrgHatch(@RequestParam("id") Long id);
+
+ /**
+ * 新增社区企业
+ * @param addEnterpriseDTO
+ * @return
+ */
+ @PostMapping("/enterprise/add")
+ R addEnterprise(@RequestBody AddEnterpriseDTO addEnterpriseDTO);
+
+ /**
+ * 修改社区企业
+ * @param editEnterpriseDTO
+ * @return
+ */
+ @PostMapping("/enterprise/edit")
+ R editEnterprise(@RequestBody EditEnterpriseDTO editEnterpriseDTO);
+
+ /**
+ * 删除社区企业
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/enterprise/delete")
+ R deleteEnterprise(@RequestParam("id") Long id);
+
+ /**
+ * 获取社区企业详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/enterprise/detail")
+ R detailEnterprise(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询社区企业
+ * @param pageEnterpriseDTO
+ * @return
+ */
+ @PostMapping("/enterprise/page")
+ R pageEnterprise(@RequestBody PageEnterpriseDTO pageEnterpriseDTO);
+
+ /**
+ * 孵化中心-基础数据
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/hatch/base")
+ R getHatchBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 孵化中心-孵化成果展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/hatchResult/list")
+ R pageHatchResult(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 孵化中心-孵化进度展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/hatchSchedule/list")
+ R pageHatchSchedule(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 五社联动基础数据
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/fiveAssociations/base")
+ R getFiveAssociationsBaseData(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 五社联动项目展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/socialProject/list")
+ R pageSocialProjectList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 五社联动社会组织展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/socialOrg/list")
+ R pageSocialOrgList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 新增服务分类
+ * @param addEnterpriseTypeDTO
+ * @return
+ */
+ @PostMapping("/enterpriseType/add")
+ R addEnterpriseType(@RequestBody AddEnterpriseTypeDTO addEnterpriseTypeDTO);
+
+ /**
+ * 修改服务分类
+ * @param enterpriseTypeDTO
+ * @return
+ */
+ @PostMapping("/enterpriseType/edit")
+ R editEnterpriseType(@RequestBody EditEnterpriseTypeDTO enterpriseTypeDTO);
+
+ /**
+ * 删除服务分类
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/enterpriseType/delete")
+ R deleteEnterpriseType(@RequestParam("id") Long id);
+
+ /**
+ * 获取服务分类详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/enterpriseType/detail")
+ R detailEnterpriseType(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询服务分类
+ * @param pageEnterpriseTypeDTO
+ * @return
+ */
+ @PostMapping("/enterpriseType/page")
+ R pageEnterpriseType(@RequestBody PageEnterpriseTypeDTO pageEnterpriseTypeDTO);
+
+ /**
+ * 获取服务分类列表
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/enterpriseType/list")
+ R getEnterpriseTypeList(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 新增人大代表
+ * @param addDpcDTO
+ * @return
+ */
+ @PostMapping("/dpc/add")
+ R addDpc(@RequestBody AddDpcDTO addDpcDTO);
+
+ /**
+ * 修改人大代表
+ * @param editDpcDTO
+ * @return
+ */
+ @PostMapping("/dpc/edit")
+ R editDpc(@RequestBody EditDpcDTO editDpcDTO);
+
+ /**
+ * 删除人大代表
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/dpc/delete")
+ R deleteDpc(@RequestParam("id") Long id);
+
+ /**
+ * 获取人大代表详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/dpc/detail")
+ R detailDpc(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询人大代表
+ * @param pageDpcDTO
+ * @return
+ */
+ @PostMapping("/dpc/page")
+ R pageDpc(@RequestBody PageDpcDTO pageDpcDTO);
+
+ /**
+ * 获取人大代表反馈记录
+ * @param id
+ * @return
+ */
+ @GetMapping("/dpc/feedback")
+ R getFeedbackList(@RequestParam("id") Long id);
+
+ /**
+ * 人大代表反馈随手拍
+ * @param comActEasyPhotoVO
+ * @return
+ */
+ @PostMapping("/dpc/feedback")
+ R addEasyPhotoFeedbackForDpc(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ * 人大代表
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/dpc/base")
+ R dpcBase(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 人大代表-随手拍展示列表
+ * @return
+ */
+ @PostMapping("/screen/dpc/easyPhotoList")
+ R dpcEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 查询详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/comActEasyPhotoHandler/detail")
+ R detailEasyPhotoHandler(@RequestParam("id") Long id);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
new file mode 100644
index 0000000..d2956e4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -0,0 +1,1381 @@
+package com.panzhihua.common.service.grid;
+
+import java.util.List;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.model.dtos.IdDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenDrawEventListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
+import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.dtos.grid.admin.EventGridMemberCascadeAddDTO;
+import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO;
+import com.panzhihua.common.model.query.visit.EventTasksQuery;
+import com.panzhihua.common.model.query.visit.EventVisitListQuery;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.grid.*;
+import com.panzhihua.common.model.vos.visit.EventVisitingTasksVO;
+
+/**
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @date 2021-05-26
+ * @since 1.0
+ */
+@FeignClient(name = "grid")
+public interface GridService {
+
+ /**
+ * 分页查找事件
+ *
+ * @param pageEventDTO
+ * @return 维护结果
+ */
+ @PostMapping("/event/page")
+ R query(@RequestBody PageEventDTO pageEventDTO);
+
+ /**
+ * 删除事件
+ *
+ * @param CommonEventDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/event/delete")
+ R delete(@RequestBody CommonEventDeleteDTO CommonEventDeleteDTO);
+
+ /**
+ * 查询事件详细信息
+ *
+ * @param id
+ * 事件 id
+ * @return 查找结果
+ */
+ @PostMapping("/event/{id}")
+ R<EventDetailsVO> eventDetails(@PathVariable("id") Long id);
+
+ /**
+ * 新增网格和网格员的关联关系
+ *
+ * @param eventGridMemberAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/eventgridmemberrelation/add")
+ R add(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO);
+
+ /**
+ * 修改网格和网格员的关联关系
+ *
+ * @param eventGridMemberEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventgridmemberrelation/edit")
+ R edit(@RequestBody EventGridMemberEditDTO eventGridMemberEditDTO);
+
+ /**
+ * 分页查找网格和网格员的关联关系
+ *
+ * @param pageEventGridMemberRelationDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventgridmemberrelation/page")
+ R query(@RequestBody PageEventGridMemberRelationDTO pageEventGridMemberRelationDTO);
+
+ /**
+ * 删除网格和网格员的关联关系
+ *
+ * @param eventGridMemberRelationDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/eventgridmemberrelation/delete")
+ R delete(@RequestBody EventGridMemberRelationDeleteDTO eventGridMemberRelationDeleteDTO);
+
+ /**
+ * 查询网格和网格员的关联关系详细信息
+ *
+ * @param id
+ * 网格和网格员的关联关系 id
+ * @return 查找结果
+ */
+ @PostMapping("/eventgridmemberrelation/{id}")
+ R<EventGridMemberRelationDetailsVO> eventGridMemberRelationDetails(@PathVariable("id") Long id);
+
+ /**
+ * 新增网格员定时上报地理预警记录
+ *
+ * @param eventGridMemberWarnLogAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/eventgridmemberwarnlog/add")
+ R add(@RequestBody EventGridMemberWarnLogAddDTO eventGridMemberWarnLogAddDTO);
+
+ /**
+ * 修改网格员定时上报地理预警记录
+ *
+ * @param eventGridMemberWarnLogEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventgridmemberwarnlog/edit")
+ R edit(@RequestBody EventGridMemberWarnLogEditDTO eventGridMemberWarnLogEditDTO);
+
+ /**
+ * 分页查找网格员定时上报地理预警记录
+ *
+ * @param pageEventGridMemberWarnLogDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventgridmemberwarnlog/page")
+ R query(@RequestBody PageEventGridMemberWarnLogDTO pageEventGridMemberWarnLogDTO);
+
+ /**
+ * 删除网格员定时上报地理预警记录
+ *
+ * @param eventGridMemberWarnLogDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/eventgridmemberwarnlog/delete")
+ R delete(@RequestBody EventGridMemberWarnLogDeleteDTO eventGridMemberWarnLogDeleteDTO);
+
+ /**
+ * 查询网格员定时上报地理预警记录详细信息
+ *
+ * @param id
+ * 网格员定时上报地理预警记录 id
+ * @return 查找结果
+ */
+ @PostMapping("/eventgridmemberwarnlog/{id}")
+ R<EventGridMemberWarnLogDetailsVO> eventGridMemberWarnLogDetails(@PathVariable("id") Long id);
+
+ /**
+ * 新增重点人群记录
+ *
+ * @param eventMainMemberAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/eventmainmember/add")
+ R add(@RequestBody EventMainMemberAddDTO eventMainMemberAddDTO);
+
+ /**
+ * 修改重点人群记录
+ *
+ * @param eventMainMemberEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventmainmember/edit")
+ R edit(@RequestBody EventMainMemberEditDTO eventMainMemberEditDTO);
+
+ /**
+ * 分页查找重点人群记录
+ *
+ * @param pageEventMainMemberDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventmainmember/page")
+ R query(@RequestBody PageEventMainMemberDTO pageEventMainMemberDTO);
+
+ /**
+ * 删除重点人群记录
+ *
+ * @param eventMainMemberDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/eventmainmember/delete")
+ R delete(@RequestBody EventMainMemberDeleteDTO eventMainMemberDeleteDTO);
+
+ /**
+ * 查询重点人群记录详细信息
+ *
+ * @param id
+ * 重点人群记录 id
+ * @return 查找结果
+ */
+ @PostMapping("/eventmainmember/{id}")
+ R<EventMainMemberDetailsVO> eventMainMemberDetails(@PathVariable("id") Long id);
+
+ /**
+ * 新增事件或者走访中关联的图片音频和视频文件
+ *
+ * @param eventResourceAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/eventresource/add")
+ R add(@RequestBody EventResourceAddDTO eventResourceAddDTO);
+
+ /**
+ * 修改事件或者走访中关联的图片音频和视频文件
+ *
+ * @param eventResourceEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventresource/edit")
+ R edit(@RequestBody EventResourceEditDTO eventResourceEditDTO);
+
+ /**
+ * 分页查找事件或者走访中关联的图片音频和视频文件
+ *
+ * @param pageEventResourceDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventresource/page")
+ R query(@RequestBody PageEventResourceDTO pageEventResourceDTO);
+
+ /**
+ * 删除事件或者走访中关联的图片音频和视频文件
+ *
+ * @param eventResourceDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/eventresource/delete")
+ R delete(@RequestBody EventResourceDeleteDTO eventResourceDeleteDTO);
+
+ /**
+ * 查询事件或者走访中关联的图片音频和视频文件详细信息
+ *
+ * @param id
+ * 事件或者走访中关联的图片音频和视频文件 id
+ * @return 查找结果
+ */
+ @PostMapping("/eventresource/{id}")
+ R<EventResourceDetailsVO> eventResourceDetails(@PathVariable("id") Long id);
+
+ /**
+ * 新增事件处理流转记录
+ *
+ * @param eventTransferRecordAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/eventtransferrecord/add")
+ R add(@RequestBody EventTransferRecordAddDTO eventTransferRecordAddDTO);
+
+ /**
+ * 修改事件处理流转记录
+ *
+ * @param eventTransferRecordEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventtransferrecord/edit")
+ R edit(@RequestBody EventTransferRecordEditDTO eventTransferRecordEditDTO);
+
+ /**
+ * 分页查找事件处理流转记录
+ *
+ * @param pageEventTransferRecordDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventtransferrecord/page")
+ R query(@RequestBody PageEventTransferRecordDTO pageEventTransferRecordDTO);
+
+ /**
+ * 删除事件处理流转记录
+ *
+ * @param eventTransferRecordDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/eventtransferrecord/delete")
+ R delete(@RequestBody EventTransferRecordDeleteDTO eventTransferRecordDeleteDTO);
+
+ /**
+ * 查询事件处理流转记录详细信息
+ *
+ * @param id
+ * 事件处理流转记录 id
+ * @return 查找结果
+ */
+ @PostMapping("/eventtransferrecord/{id}")
+ R<EventTransferRecordDetailsVO> eventTransferRecordDetails(@PathVariable("id") Long id);
+
+ /**
+ * 新增重点人群走访记录
+ *
+ * @param eventVisitingTasksAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/eventvisitingtasks/add")
+ R add(@RequestBody EventVisitingTasksAddDTO eventVisitingTasksAddDTO);
+
+ /**
+ * 修改重点人群走访记录
+ *
+ * @param eventVisitingTasksEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventvisitingtasks/edit")
+ R edit(@RequestBody EventVisitingTasksEditDTO eventVisitingTasksEditDTO);
+
+ /**
+ * 分页查找重点人群走访记录
+ *
+ * @param pageEventVisitingTasksDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventvisitingtasks/page")
+ R query(@RequestBody PageEventVisitingTasksDTO pageEventVisitingTasksDTO);
+
+ /**
+ * 删除重点人群走访记录
+ *
+ * @param eventVisitingTasksDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/eventvisitingtasks/delete")
+ R delete(@RequestBody EventVisitingTasksDeleteDTO eventVisitingTasksDeleteDTO);
+
+ /**
+ * 查询重点人群走访记录详细信息
+ *
+ * @param id
+ * 重点人群走访记录 id
+ * @return 查找结果
+ */
+ @PostMapping("/eventvisitingtasks/{id}")
+ R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(@PathVariable("id") Long id);
+
+ /**
+ * 新增APP应用版本信息
+ *
+ * @param eventApplicationAppReleaseAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/eventapplicationapprelease/add")
+ R add(@RequestBody EventApplicationAppReleaseAddDTO eventApplicationAppReleaseAddDTO);
+
+ /**
+ * 修改APP应用版本信息
+ *
+ * @param eventApplicationAppReleaseEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventapplicationapprelease/edit")
+ R edit(@RequestBody EventApplicationAppReleaseEditDTO eventApplicationAppReleaseEditDTO);
+
+ /**
+ * 分页查找APP应用版本信息
+ *
+ * @param pageEventApplicationAppReleaseDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventapplicationapprelease/page")
+ R query(@RequestBody PageEventApplicationAppReleaseDTO pageEventApplicationAppReleaseDTO);
+
+ /**
+ * 删除APP应用版本信息
+ *
+ * @param eventApplicationAppReleaseDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/eventapplicationapprelease/delete")
+ R delete(@RequestBody EventApplicationAppReleaseDeleteDTO eventApplicationAppReleaseDeleteDTO);
+
+ /**
+ * 查询APP应用版本信息详细信息
+ *
+ * @param id
+ * APP应用版本信息 id
+ * @return 查找结果
+ */
+ @PostMapping("/eventapplicationapprelease/{id}")
+ R<EventApplicationAppReleaseDetailsVO> eventApplicationAppReleaseDetails(@PathVariable("id") Long id);
+
+ /**
+ * 新增用户协议和隐私政策信息
+ *
+ * @param eventApplicationUserNoticeAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/eventapplicationusernotice/add")
+ R add(@RequestBody EventApplicationUserNoticeAddDTO eventApplicationUserNoticeAddDTO);
+
+ /**
+ * 修改用户协议和隐私政策信息
+ *
+ * @param eventApplicationUserNoticeEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventapplicationusernotice/edit")
+ R edit(@RequestBody EventApplicationUserNoticeEditDTO eventApplicationUserNoticeEditDTO);
+
+ /**
+ * 分页查找用户协议和隐私政策信息
+ *
+ * @param pageEventApplicationUserNoticeDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventapplicationusernotice/page")
+ R query(@RequestBody PageEventApplicationUserNoticeDTO pageEventApplicationUserNoticeDTO);
+
+ /**
+ * 删除用户协议和隐私政策信息
+ *
+ * @param eventApplicationUserNoticeDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/eventapplicationusernotice/delete")
+ R delete(@RequestBody EventApplicationUserNoticeDeleteDTO eventApplicationUserNoticeDeleteDTO);
+
+ /**
+ * 查询用户协议和隐私政策信息详细信息
+ *
+ * @param id
+ * 用户协议和隐私政策信息 id
+ * @return 查找结果
+ */
+ @PostMapping("/eventapplicationusernotice/{id}")
+ R<EventApplicationUserNoticeDetailsVO> eventApplicationUserNoticeDetails(@PathVariable("id") Long id);
+
+ /**
+ * 新增区县/街道/社区/网格员网格数据管理
+ *
+ * @param eventGridDataAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/eventgriddata/add")
+ R add(@RequestBody EventGridDataAddDTO eventGridDataAddDTO);
+
+ /**
+ * 修改区县/街道/社区/网格员网格数据管理
+ *
+ * @param eventGridDataEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventgriddata/edit")
+ R edit(@RequestBody EventGridDataEditDTO eventGridDataEditDTO);
+
+ /**
+ * 分页查找区县/街道/社区/网格员网格数据管理
+ *
+ * @param pageEventGridDataDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventgriddata/page")
+ R query(@RequestBody PageEventGridDataDTO pageEventGridDataDTO);
+
+ /**
+ * 删除区县/街道/社区/网格员网格数据管理
+ *
+ * @param eventGridDataDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/eventgriddata/delete")
+ R delete(@RequestBody EventGridDataDeleteDTO eventGridDataDeleteDTO);
+
+ /**
+ * 查询区县/街道/社区/网格员网格数据管理详细信息
+ *
+ * @param id
+ * 区县/街道/社区/网格员网格数据管理 id
+ * @return 查找结果
+ */
+ @PostMapping("/eventgriddata/{id}")
+ R<EventGridDataDetailsVO> eventGridDataDetails(@PathVariable("id") Long id);
+
+ /**
+ * 新增网格员定时上报地理信息
+ *
+ * @param eventGridMemberGpsLogAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/eventgridmembergpslog/add")
+ R add(@RequestBody EventGridMemberGpsLogAddDTO eventGridMemberGpsLogAddDTO);
+
+ /**
+ * 修改网格员定时上报地理信息
+ *
+ * @param eventGridMemberGpsLogEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventgridmembergpslog/edit")
+ R edit(@RequestBody EventGridMemberGpsLogEditDTO eventGridMemberGpsLogEditDTO);
+
+ /**
+ * 分页查找网格员定时上报地理信息
+ *
+ * @param pageEventGridMemberGpsLogDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eventgridmembergpslog/page")
+ R query(@RequestBody PageEventGridMemberGpsLogDTO pageEventGridMemberGpsLogDTO);
+
+ /**
+ * 删除网格员定时上报地理信息
+ *
+ * @param eventGridMemberGpsLogDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/eventgridmembergpslog/delete")
+ R delete(@RequestBody EventGridMemberGpsLogDeleteDTO eventGridMemberGpsLogDeleteDTO);
+
+ /**
+ * 查询网格员定时上报地理信息详细信息
+ *
+ * @param id
+ * 网格员定时上报地理信息 id
+ * @return 查找结果
+ */
+ @PostMapping("/eventgridmembergpslog/{id}")
+ R<EventGridMemberGpsLogDetailsVO> eventGridMemberGpsLogDetails(@PathVariable("id") Long id);
+
+ /**
+ * 添加事件
+ *
+ * @param commonEventAddDTO
+ * @return
+ */
+ @PostMapping("/event/addCommon")
+ R addCommon(@RequestBody CommonEventAddDTO commonEventAddDTO);
+
+ /**
+ * 保存事件草稿
+ *
+ * @param commonEventEditDTO
+ * @return
+ */
+ @PostMapping("/event/saveDraft")
+ R saveDraft(@RequestBody CommonEventEditDTO commonEventEditDTO);
+
+ /**
+ * 突发事件上报社区
+ *
+ * @param commonEventReportDTO
+ * @return
+ */
+ @PostMapping("/event/report")
+ R report(@RequestBody CommonEventReportDTO commonEventReportDTO);
+
+ /**
+ * 突发事件撤销
+ *
+ * @param eventRevokeDTO
+ * @return
+ */
+ @PostMapping("/event/emergenciesRevoke")
+ R emergenciesRevoke(@RequestBody EventRevokeDTO eventRevokeDTO);
+
+ /**
+ * 处理事件
+ *
+ * @param commonEventDealDTO
+ * @return
+ */
+ @PostMapping("/event/dealEvent")
+ R dealEvent(@RequestBody CommonEventDealDTO commonEventDealDTO);
+
+ /**
+ * 处理事件
+ *
+ * @param commonEventVerifyDTO
+ * @return
+ */
+ @PostMapping("/event/verify")
+ R verifyEvent(@RequestBody CommonEventVerifyDTO commonEventVerifyDTO);
+
+ /**
+ * 处理事件
+ *
+ * @param commonEventRepublishDTO
+ * @return
+ */
+ @PostMapping("/event/republish")
+ R republishEvent(@RequestBody CommonEventRepublishDTO commonEventRepublishDTO);
+
+ /**
+ * 网格数据待处理统计信息
+ *
+ * @param eventGridStatisticsDataDTO
+ * @return
+ */
+ @PostMapping("/eventgriddata/getGridStatisticsdData")
+ R getGridStatisticsdData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO);
+
+ /**
+ * 查询用户网格
+ *
+ * @param pageEventGridDataDTO
+ * @return
+ */
+ @PostMapping("/eventgriddata/userGrid")
+ R userGrid(@RequestBody PageEventGridDataDTO pageEventGridDataDTO);
+
+ /**
+ * 特殊人员信息上报
+ *
+ * @param specialEventAddDTO
+ * @return
+ */
+ @PostMapping("/event/addSpecial")
+ R addSpecial(@RequestBody SpecialEventAddDTO specialEventAddDTO);
+
+ /**
+ * 获取指定特殊人员信息
+ *
+ * @param idCard
+ * @return
+ */
+ @PostMapping("/event/getSpecialPopulation")
+ R getSpecialPopulation(String idCard);
+
+ /**
+ * 保存殊人群事件上报草稿
+ *
+ * @param specialEventEditDTO
+ * @return
+ */
+ @PostMapping("/event/saveSpecialDraft")
+ R saveSpecialDraft(@RequestBody SpecialEventEditDTO specialEventEditDTO);
+
+ /**
+ * 草稿发布
+ *
+ * @param commonEventPublicDTO
+ * @return
+ */
+ @PostMapping("/event/draftRelease")
+ R draftRelease(@RequestBody CommonEventPublicDTO commonEventPublicDTO);
+
+ /**
+ * 查询随手拍列表
+ *
+ * @param easyAppDTO
+ * 请求参数
+ * @return 随手拍列表
+ */
+ @PostMapping("/easy/list")
+ R easyList(@RequestBody PageEasyAppDTO easyAppDTO);
+
+ /**
+ * 查询随手拍详情
+ *
+ * @param easyId
+ * 随手拍id
+ * @return 随手拍详情
+ */
+ @PostMapping("/easy/detail")
+ R easyDetailByApp(@RequestParam("easyId") Long easyId);
+
+ /**
+ * 查询随手拍类型列表
+ *
+ * @return 类型列表
+ */
+ @PostMapping("/easy/type/list")
+ R easyTypeListByApp();
+
+ /**
+ * 随手拍处理
+ *
+ * @param photoHandleDTO
+ * 请求参数
+ * @return 处理结果
+ */
+ @PostMapping("/easy/handle")
+ R easyHandle(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO);
+
+ /**
+ * 随手拍公示状态切换
+ *
+ * @param photoHandleDTO
+ * 请求参数
+ * @return 切换结果
+ */
+ @PostMapping("/easy/publicity")
+ R easyPublicity(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO);
+
+ /**
+ * 随手拍上报社区
+ *
+ * @param photoHandleDTO
+ * 请求参数
+ * @return 上报结果
+ */
+ @PostMapping("/easy/report")
+ R easyReport(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO);
+
+ /**
+ * 添加发布宣传教育事件
+ *
+ * @param publicityEventAddDTO
+ * 请求参数
+ * @return 添加发布结果
+ */
+ @PostMapping("/event/addPublicity")
+ R addPublicity(@RequestBody PublicityEventAddDTO publicityEventAddDTO);
+
+ /**
+ * 保存宣传教育事件草稿
+ *
+ * @param publicityEventEditDTO
+ * 请求参数
+ * @return 保存结果
+ */
+ @PostMapping("/event/savePublicityDraft")
+ R savePublicityDraft(@RequestBody PublicityEventEditDTO publicityEventEditDTO);
+
+ /**
+ * 分页查询宣传教育事件
+ *
+ * @param pagePublicityEventDTO
+ * 请求参数
+ * @return 结果
+ */
+ @PostMapping("/event/queryPublicity")
+ R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO);
+
+ /**
+ * 分页查询宣传教育事件
+ *
+ * @param pagePublicityEventDTO
+ * 请求参数
+ * @return 结果
+ */
+ @PostMapping("/event/queryPublicityCommunity")
+ R queryPublicityCommunity(@RequestBody PagePublicityEventCommunityDTO pagePublicityEventDTO);
+
+ /**
+ * 分页查询社区列表
+ *
+ * @return 结果
+ */
+ @PostMapping("/event/actList")
+ R actList();
+
+ /**
+ * 地图模块-根据网格id查询网格详细信息
+ *
+ * @param gridId
+ * 网格id
+ * @return 网格详细信息
+ */
+ @PostMapping("/map/getGridDetail")
+ R getGridDetail(@RequestParam("gridId") Long gridId);
+
+ /**
+ * 地图模块-根据网格员id查询今日运动轨迹
+ *
+ * @param userId
+ * 网格员id
+ * @return 运动轨迹
+ */
+ @PostMapping("/map/getTrajectoryByApp")
+ R getTrajectoryByApp(@RequestParam("userId") Long userId);
+
+ /**
+ * 地图模块-根据网格员id查询关联网格列表
+ *
+ * @param userId
+ * 网格员id
+ * @return 网格列表
+ */
+ @PostMapping("/map/getMapGridListByApp")
+ R getMapGridListByApp(@RequestParam("userId") Long userId);
+
+ /**
+ * 获取最新版本信息
+ *
+ * @return 版本信息
+ */
+ @GetMapping("/eventapplicationapprelease/edition")
+ R editionUpdate();
+
+ /**
+ * 首页待处理
+ *
+ * @param eventGridTodoDataDTO
+ * @return
+ */
+ @PostMapping("/eventgriddata/getGridTodoData")
+ R getGridTodoData(@RequestBody EventGridTodoDataDTO eventGridTodoDataDTO);
+
+ /**
+ * 后台获取网格员运动轨迹
+ *
+ * @param workTrajectoryDTO
+ * 请求参数
+ * @return 运动轨迹
+ */
+ @PostMapping("/map/gridMemberWorkTrajectory")
+ R gridMemberWorkTrajectory(@RequestBody EventGridMemberWorkTrajectoryDTO workTrajectoryDTO);
+
+ /**
+ * 后台获取网格员预警记录
+ *
+ * @param gridMemberWainDTO
+ * 请求参数
+ * @return 预警记录
+ */
+ @PostMapping("/map/gridMemberWorkWarning")
+ R gridMemberWorkWarning(@RequestBody EventGridMemberWainDTO gridMemberWainDTO);
+
+ /**
+ * 分页查询网格
+ *
+ * @param eventGridDataDTO
+ * 请求参数
+ * @return 网格列表
+ */
+ @PostMapping("/eventgriddata/data/list")
+ R getGridDataList(@RequestBody PageEventGridDataAdminDTO eventGridDataDTO);
+
+ /**
+ * 查询社区下所有网格员
+ *
+ * @param communityId
+ * 社区id
+ * @return 网格员列表
+ */
+ @PostMapping("/eventgriddata/member/list")
+ R getGridMemberLists(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 查询管理事件
+ *
+ * @param pageEventManageDTO
+ * @return
+ */
+ @PostMapping("/event/manage/list")
+ R queryEventToManage(@RequestBody PageEventManageDTO pageEventManageDTO);
+
+ /**
+ * 社区网格后台标记事件无效
+ *
+ * @param eventRevokeDTO
+ * @return
+ */
+ @PostMapping("/event/markInvalid")
+ R markEventInvalid(@RequestBody EventRevokeDTO eventRevokeDTO);
+
+ /**
+ * 社区网格后台重新发布已标记无效的事件
+ *
+ * @param commonEventRepublishDTO
+ * @return
+ */
+ @PostMapping("/event/republishInvalid")
+ R republishInvalidEvent(@RequestBody CommonEventRepublishDTO commonEventRepublishDTO);
+
+ /**
+ * 后台新增网格
+ *
+ * @param eventGridDataDTO
+ * 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/eventgriddata/data/add")
+ R addGridDataByAdmin(@RequestBody EventGridDataAddAdminDTO eventGridDataDTO);
+
+ /**
+ * 后台修改网格
+ *
+ * @param eventGridDataDTO
+ * 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/eventgriddata/data/edit")
+ R editGridDataByAdmin(@RequestBody EventGridDataEditAdminDTO eventGridDataDTO);
+
+ /**
+ * 后台管理-分页查询随手拍列表
+ *
+ * @param easyAppDTO
+ * 请求参数
+ * @return 随手拍列表
+ */
+ @PostMapping("/easy/admin/list")
+ R easyListByAdmin(@RequestBody PageEasyAdminDTO easyAppDTO);
+
+ /**
+ * 后台管理-随手拍详情
+ *
+ * @param easyId
+ * 随手拍id
+ * @return 随手拍详情
+ */
+ @PostMapping("/easy/admin/detail")
+ R easyDetailByAdmin(@RequestParam("easyId") Long easyId);
+
+ /**
+ * 后台管理-随手拍处理
+ *
+ * @param photoHandleDTO
+ * 请求参数
+ * @return 处理结果
+ */
+ @PostMapping("/easy/admin/handle")
+ R easyHandleByAdmin(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO);
+
+ /**
+ * 后台管理-批量修改随手拍公示状态/删除随手拍
+ *
+ * @param photoHandleDTO
+ * 请求参数
+ * @return 修改/删除结果
+ */
+ @PostMapping("/easy/admin/publicity")
+ R easyPublicityByAdmin(@RequestBody ComActEasyPhotoEditAdminDTO photoHandleDTO);
+
+ /**
+ * 查询网格下所有网格员
+ *
+ * @param gridId
+ * @return
+ */
+ @PostMapping("/eventgriddata/grid/member")
+ R getGridMemberListsByGrid(@RequestParam("gridId") Long gridId);
+
+ /**
+ * 查询网格下所有网格员
+ *
+ * @param communityId
+ * @return
+ */
+ @PostMapping("/eventgriddata/communitygrid")
+ R getGridDataListByCommunity(@RequestParam("gridId") Long communityId);
+
+ /**
+ * 后台管理-统计模块
+ *
+ * @param communityId
+ * 社区id
+ * @return 统计信息
+ */
+ @GetMapping("/statistics/admin/eventStatistics")
+ R eventStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 后台管理-删除网格
+ *
+ * @param Ids
+ * 网格id集合
+ * @return 删除结果
+ */
+ @PostMapping("/eventgriddata/data/delete")
+ R deleteGridData(@RequestBody List<Long> Ids);
+
+ /**
+ * 后台管理-网格员统计
+ *
+ * @param statisticsAdminDTO
+ * 请求参数
+ * @return 网格员统计信息
+ */
+ @PostMapping("/statistics/admin/gridMemberStatistics")
+ R gridMemberStatistics(@RequestBody MemberStatisticsAdminDTO statisticsAdminDTO);
+
+ /**
+ * 批量删除
+ *
+ * @param eventDeleteDTO
+ * @return
+ */
+ @PostMapping("/event/deleteEventBatch")
+ R deleteEventBatch(@RequestBody EventDeleteDTO eventDeleteDTO);
+
+ /**
+ * 批量发布事件
+ *
+ * @param commonEventBatchRepublishDTO
+ * @return
+ */
+ @PostMapping("/event/batchRepublishEvent")
+ R batchRepublishEvent(@RequestBody CommonEventBatchRepublishDTO commonEventBatchRepublishDTO);
+
+ /**
+ * 批量事件标为无效
+ *
+ * @param eventBatchRevokeDTO
+ * @return
+ */
+ @PostMapping("/event/batchMarkInvalid")
+ R batchMarkEventInvalid(@RequestBody EventBatchRevokeDTO eventBatchRevokeDTO);
+
+ /**
+ * 批量事件标为无效
+ *
+ * @param pageEventGridNearbyDTO
+ * @return
+ */
+ @PostMapping("/event/grid/nearby")
+ R getNearByGrid(PageEventGridNearbyDTO pageEventGridNearbyDTO);
+
+ /**
+ * 根据网格id查询网格统计数据
+ *
+ * @param gridId
+ * 网格id
+ * @return 网格统计数据
+ */
+ @PostMapping("/statistics/getGridEventStatistics")
+ R getGridEventStatisticsByApp(@RequestParam("gridId") Long gridId, @RequestParam("userId") Long userId);
+
+ /**
+ * 查询网格事件统计数据
+ *
+ * @param statisticsDTO
+ * 请求参数
+ * @return 网格事件统计数据
+ */
+ @PostMapping("/statistics/event/getGridEventStatistics")
+ R getGridEventDetailStatisticsByApp(@RequestBody GridEventStatisticsDTO statisticsDTO);
+
+ /**
+ * 网格员上报地理位置
+ *
+ * @param memberPositionDTO
+ * 请求参数
+ * @return 上报结果
+ */
+ @PostMapping("/eventgridmembergpslog/add")
+ R gridReportPosition(@RequestBody GridMemberPositionDTO memberPositionDTO);
+
+ /**
+ * 直接上报社区
+ *
+ * @param commonEventDirectReportDTO
+ * @return
+ */
+ @PostMapping("/event/reportDirect")
+ R reportDirect(@RequestBody CommonEventDirectReportDTO commonEventDirectReportDTO);
+
+ /**
+ * 定时任务扫描网格员工作状态
+ *
+ * @return 定时任务扫描结果
+ */
+ @PostMapping("/eventgridmemberwarnlog/judge")
+ R timedTaskGridMember();
+
+ /**
+ * 事件大屏查询事件列表
+ *
+ * @param eventListDTO
+ * 请求参数
+ * @return 事件列表
+ */
+ @PostMapping("/screen/event/list")
+ R getScreenEventList(@RequestBody ScreenEventListDTO eventListDTO);
+
+ /**
+ * 特殊人群上报-社区人口数据列表
+ *
+ * @param specialPopulationDTO
+ * 请求参数
+ * @return 社区人口数据列表
+ */
+ @PostMapping("/event/special/population/list")
+ R specialPopulationList(@RequestBody PageEventSpecialPopulationDTO specialPopulationDTO);
+
+ /**
+ * description 根据本地网格ID，查询对于的浪潮市平台对应的ID
+ *
+ * @param id
+ * 本地网格ID
+ * @return String 浪潮市平台对应的ID
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @GetMapping("/lc_compare/{id}")
+ String getLcGridIdByLocal(@PathVariable("id") Long id);
+
+ /**
+ * description 根据本地网格ID，查询对于的浪潮市平台对应的ID
+ *
+ * @param localUserId
+ * 本地网格员ID
+ * @return String 浪潮市平台对应的ID
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @GetMapping("/lc_compare/getLcUserId")
+ String getLcUserIdByLocalUserId(@RequestParam("localUserId") String localUserId);
+
+ /**
+ * description 获取所有未上传到浪潮平台的事件列表
+ *
+ * @return String 事件列表
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @GetMapping("/event/getUnUploadEvent")
+ List<EventDetailsVO> getUnUploadEvent();
+
+ /**
+ * description 更新上传是否成功标识
+ *
+ * @param id
+ * 事件主键ID
+ * @return Boolean 上传是否成功
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @GetMapping("/event/updateLcUploadFlag")
+ Boolean updateLcUploadFlag(@RequestParam("id") Long id);
+
+ /**
+ * 工作大屏-事件管理模块数据统计
+ *
+ * @param communityId
+ * 社区id
+ * @return 事件管理数据统计
+ */
+ @GetMapping("/screen/work/event")
+ R eventWork(@RequestParam("communityId") Long communityId);
+
+ /**
+ * description 获取所有未上传到浪潮平台的走访事件列表
+ *
+ * @return String 事件列表
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @GetMapping("/eventvisitingtasks/getUnUploadVisitingTask")
+ List<LcEventVisitingTasksListDTO> getUnUploadVisitingTask();
+
+ /**
+ * description 更新走访任务上传是否成功标识
+ *
+ * @param id
+ * 事件主键ID
+ * @return Boolean 上传是否成功
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("/eventvisitingtasks/updateLcUploadFlagVisitingTask")
+ Boolean updateLcUploadFlagVisitingTask(@RequestParam("id") Long id);
+
+ /**
+ * 后台统计走访任务
+ *
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/eventvisitingtasks/count")
+ R countVisit(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 查询走访记录
+ *
+ * @param query
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/list")
+ R list(@RequestBody EventTasksQuery query);
+
+ /**
+ * 走访任务列表
+ *
+ * app走访任务列表
+ *
+ * @param query
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/appTaskList")
+ R appTaskList(@RequestBody EventTasksQuery query);
+
+ /**
+ * 后台走访任务列表
+ *
+ * @param query
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/taskList")
+ R taskList(@RequestBody EventTasksQuery query);
+
+ /**
+ * 导出
+ *
+ * @param query
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/exportTaskList")
+ List<EventVisitingTasksVO> exportTaskList(@RequestBody EventTasksQuery query);
+
+ /**
+ * 删除走访任务
+ *
+ * @param idDTO
+ * @param communityId
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/delete")
+ R delete(@RequestBody IdDTO idDTO, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 被走访人员列表
+ *
+ * @param query
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/visitorList")
+ R visitorList(@RequestBody EventVisitListQuery query);
+
+ /**
+ * 走访详情
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("/eventvisitingtasks/detail/{id}")
+ R detail(@PathVariable("id") Long id);
+
+ /**
+ * 撤销走访
+ *
+ * @param idDTO
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/cancel")
+ R cancel(@RequestBody IdDTO idDTO);
+
+ /**
+ * 恢复走访
+ *
+ * @param idDTO
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/reset")
+ R reset(@RequestBody IdDTO idDTO);
+
+ /**
+ * 新增走访
+ *
+ * @param idDTO
+ * @param communityId
+ * @param userId
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/add")
+ R addVisitingTask(@RequestBody IdDTO idDTO, @RequestParam("communityId") Long communityId,
+ @RequestParam("userId") Long userId);
+
+ /**
+ * 开始走访
+ *
+ * @param id
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/start")
+ R start(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+ /**
+ * 完成走访记录
+ *
+ * @param taskCompleteDTO
+ * @return
+ */
+ @PostMapping("/eventvisitingtasks/complete")
+ R complete(@RequestBody EventVisitCompleteDTO taskCompleteDTO);
+
+ /**
+ * 查询市平台网格员列表
+ *
+ * @return 市平台网格员列表
+ */
+ @GetMapping("/eventgridmemberrelation/lc/list")
+ R gridMemberLcList();
+
+ /**
+ * 综治后台-添加网格员级联列表
+ *
+ * @param memberCascadeAddDTO
+ * 请求参数
+ * @return 级联列表
+ */
+ @PostMapping("/eventgridmemberrelation/cascade/list")
+ R gridMemberCascadeList(@RequestBody EventGridMemberCascadeAddDTO memberCascadeAddDTO);
+
+ /**
+ * 综治后台-查询所有市平台网格列表
+ *
+ * @return 市平台网格列表
+ */
+ @GetMapping("/eventgriddata/lc/list")
+ R getLcGridLists();
+
+ /**
+ * 首页查询网格级联列表
+ *
+ * @param cascadeListDTO
+ * 请求参数
+ * @return 网格列表
+ */
+ @PostMapping("/map/getMapGridListsByApp")
+ R getMapGridListsByApp(@RequestBody EventGridCascadeListDTO cascadeListDTO);
+
+ /**
+ * 首页查询网格级联列表2
+ *
+ * @param userId
+ * 用户id
+ * @return 网格列表
+ */
+ @PostMapping("/map/getMapGridsListsByApp")
+ R getMapGridsListsByApp(@RequestParam("userId") Long userId);
+
+ /**
+ * 绘制多边形统计数据
+ *
+ * @param eventListDTO
+ * 请求参数
+ * @return 统计数据
+ */
+ @PostMapping("/screen/getCivilDrawList")
+ R getCivilDrawList(@RequestBody ScreenDrawEventListDTO eventListDTO);
+
+ /**
+ * 新版绘制多边形统计数据
+ * @param eventListDTO
+ * @return
+ */
+ @PostMapping("/screen/getCivilDrawListNew")
+ R getCivilDrawListNew(@RequestBody ScreenDrawEventListDTO eventListDTO);
+
+ /**
+ * 大屏-根据小区id查询小区统计人数
+ *
+ * @param villageId
+ * 小区id
+ * @return 小区统计数据
+ */
+ @GetMapping("/screen/village/statistics")
+ R civilVillageStatistics(@RequestParam("villageId") Long villageId);
+
+ /**
+ * 查询所有网格员工作汇总数据
+ *
+ * @param statisticsAdminDTO
+ * 请求参数
+ * @return 网格员工作汇总数据
+ */
+ @PostMapping("/statistics/admin/gridMemberStatisticsAll")
+ R gridMemberStatisticsAll(@RequestBody MemberStatisticsAdminDTO statisticsAdminDTO);
+
+ /**
+ * 定时任务-给上月已走访的人员创建定时任务
+ * @return 执行结果
+ */
+ @PostMapping("/eventvisitingtasks/timedTaskVisitingJobHandler")
+ R timedTaskVisitingJobHandler();
+
+ /**
+ * 查询社区网格员运动轨迹
+ * @param communityId 社区id
+ * @return 社区网格员运动轨迹
+ */
+ @GetMapping("/screen/member/trajectory")
+ R getGridsMemberTrajectory(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 西区大数据分析平台-综合治理栏
+ * @return
+ */
+ @GetMapping("/screen/comprehensive/governance")
+ R getComprehensiveGovernanceStatics();
+
+ /**
+ * 大屏-新根据小区id查询小区统计人数
+ *
+ * @param villageId
+ * 小区id
+ * @return 小区统计数据
+ */
+ @GetMapping("/screen/village/statistics-new")
+ R civilVillageStatisticsNew(@RequestParam("villageId") Long villageId);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
new file mode 100644
index 0000000..0b0b1a6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
@@ -0,0 +1,1156 @@
+package com.panzhihua.common.service.jinhui;
+
+import com.panzhihua.common.model.dtos.community.ComActWorkGuideDTO;
+import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
+import com.panzhihua.common.model.dtos.community.convenient.JinhuiPageConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
+import com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO;
+import com.panzhihua.common.model.vos.jinhui.*;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 金汇社区
+ */
+@FeignClient(name = "huacheng-jinhui-community")
+public interface JinhuiCommunityService
+{
+ /****************************************************************************************************
+ *
+ *
+ * 金汇币总币
+ *
+ *
+ *****************************************************************************************************/
+
+
+ @GetMapping("/jinhuiCoinTable/getList")
+ public R coinTableGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("type") String type);
+
+ @GetMapping("/jinhuiCoinTable/getDetails")
+ public R coinTableGetDetails(@RequestParam("userId") String userId);
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiCoinTable/addData")
+ public R coinTableAddData(@RequestBody JinhuiCoinGeneralTableVO jinhuiGoldCoinRecordVO);
+
+ @PostMapping("/jinhuiCoinTable/editData")
+ public R coinTableEditData(@RequestBody JinhuiCoinGeneralTableVO jinhuiGoldCoinRecordVO);
+
+ @PostMapping("/jinhuiCoinTable/expurgateData")
+ public R coinTableExpurgateData(@RequestParam("id") String id);
+
+
+
+
+
+
+ /****************************************************************************************************
+ *
+ *
+ * 金汇币记录
+ *
+ *
+ *****************************************************************************************************/
+
+ @GetMapping("/jinhuiRecord/getList")
+ public R recordGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("userId") String userId);
+
+ @GetMapping("/jinhuiRecord/getDetails")
+ public R recordGetDetails(@RequestParam("id") String id);
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiRecord/addData")
+ public R recordAddData(@RequestBody JinhuiGoldCoinRecordVO jinhuiGoldCoinRecordVO);
+
+ @PostMapping("/jinhuiRecord/editData")
+ public R recordEditData(@RequestBody JinhuiGoldCoinRecordVO jinhuiGoldCoinRecordVO);
+
+ @PostMapping("/jinhuiRecord/expurgateData")
+ public R recordExpurgateData(@RequestParam("id") String id);
+
+
+ /*************************************************************************************************
+ *
+ * 办事指南
+ *
+ ***************************************************************************************************/
+
+ /**
+ * 办事指南_新增
+ *
+ * @param workGuideDTO
+ * 新增信息
+ * @return 新增结果
+ */
+ @PostMapping("/JinhuiWorkGuide/addworkguide")
+ @Transactional(rollbackFor = Exception.class)
+ public R addWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") String userId);
+
+ /**
+ * 办事指南_编辑
+ *
+ * @param workGuideDTO
+ * @return 编辑结果
+ */
+ @PostMapping("/JinhuiWorkGuide/editworkguide")
+ @Transactional(rollbackFor = Exception.class)
+ public R putWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") String userId) ;
+
+ /**
+ * 办事指南_详情
+ *
+ * @param workGuideId
+ * @return 详情
+ */
+ @GetMapping("/JinhuiWorkGuide/detailworkguide")
+ public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId,
+ @RequestParam("communityId") String communityId) ;
+
+ /**
+ * 办事指南_分页
+ *
+ * @param pageActWorkGuideDTO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/JinhuiWorkGuide/pageworkguide")
+ public R pageWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) ;
+
+ /**
+ * 办事指南_删除
+ *
+ * @param workGuideId
+ * 办事指南id
+ * @return 删除结果
+ */
+ @PostMapping("/JinhuiWorkGuide/delectworkguide")
+ R delectWorkGuide(@RequestParam("workGuideId") String workGuideId) ;
+
+ /**
+ * 分页查询办事执念-分类管理 addWorkGuideClassify 分页查询办事执念-分类管理
+ * @param comActWorkGuideClassifyVO 查询参数
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @PostMapping("/JinhuiWorkGuide/workGuide/classify/apage")
+ public R pageWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO) ;
+
+ /**
+ * 办事执念-分类管理新增或修改 addWorkGuideClassify 办事执念-分类管理新增或修改
+ * @param comActWorkGuideClassifyVO 新增或修改参数
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @PostMapping("/JinhuiWorkGuide/workGuide/classify/add")
+ public R addWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO) ;
+
+ /**
+ * 办事执念-分类管理删除 addWorkGuideClassify 办事执念-分类管理删除
+ * @param workGuideClassifyId 办事执念-分类管理id
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @GetMapping("/JinhuiWorkGuide/workGuide/classify/delete")
+ public R deleteWorkGuideClassify(@RequestParam("workGuideClassifyId") String workGuideClassifyId) ;
+
+ /**
+ * 办事指南-分类管理列表查询 getWorkGuideClassifyList 办事指南-分类管理列表查询
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @GetMapping("/JinhuiWorkGuide/workGuide/classify/getList")
+ public R getWorkGuideClassifyList(@RequestParam("areaCode")String areaCode) ;
+
+ /**
+ * 办事指南列表-按分类查询
+ * @param pageActWorkGuideDTO 请求参数
+ * @return 办事指南分类列表
+ */
+ @PostMapping("/JinhuiWorkGuide/listworkguide")
+ public R listWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) ;
+
+ /**
+ * 根据办事指南分类id查询办事指南列表
+ * @param classifyId 办事指南分类id
+ * @return 办事指南列表数据
+ */
+ @GetMapping("/JinhuiWorkGuide/listworkguide/classify")
+ public R listWorkGuideByClassifyId(@RequestParam("classifyId") String classifyId) ;
+
+
+ /**********************************************************************************************
+ *
+ *
+ * 便民服务
+ *
+ *
+ ************************************************************************************************/
+
+ /**
+ * 删除便民服务商家
+ *
+ * @param merchantId
+ * @return
+ */
+ @DeleteMapping("/jinhuiMerchant/delete")
+ public R deleteMerchant(@RequestParam("merchantId") String merchantId);
+
+ /**
+ * 分页查询便民服务商家 运营后台
+ *
+ * @param pageConvenientMerchantDTO
+ * @return
+ */
+ @PostMapping("/jinhuiMerchant/page")
+ public R pageMerchant(@RequestBody JinhuiPageConvenientMerchantDTO pageConvenientMerchantDTO);
+
+ /**
+ * 获取便民服务商家详情
+ *
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/jinhuiMerchant/get")
+ public R getMerchant(@RequestParam("merchantId") String merchantId);
+
+
+ /**
+ * 分页查询 商家类别
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiMerchant/getCategories")
+ public R getListCategories(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize);
+
+
+
+ @PostMapping("/jinhuiMerchant/addData")
+ public R merchantAddData(@RequestBody JinhuiConvenientMerchantVO item);
+
+ @PostMapping("/jinhuiMerchant/editData")
+ public R merchantEditData(@RequestBody JinhuiConvenientMerchantVO item);
+
+ /**************************************************************************************************************
+ *
+ *
+ * 商家评论
+ *
+ *
+ *************************************************************************************************************/
+ /**
+ * 商家评论列表
+ * @param pageNum
+ * @param pageSize
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/jinghuiMerchantEvaluate/getList")
+ public R merchantEvaluateGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("merchantId") String merchantId);
+
+ /**
+ * 商家评论列单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/jinghuiMerchantEvaluate/getDetails")
+ public R merchantEvaluateGetDetails(@RequestParam("id") String id);
+ /**
+ * 商家评论列添加
+ * @param
+ * @return
+ */
+ @PostMapping("/jinghuiMerchantEvaluate/addData")
+ public R merchantEvaluateAddData(@RequestBody JinghuiMerchantEvaluateVO item);
+
+ /**
+ * 商家评论列编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/jinghuiMerchantEvaluate/editData")
+ public R merchantEvaluateEditData(@RequestBody JinghuiMerchantEvaluateVO item);
+
+ /**
+ * 商家评论列删除
+ * @param id
+ * @return
+ */
+ @PostMapping("/jinghuiMerchantEvaluate/expurgateData")
+ public R merchantEvaluateExpurgateData(@RequestParam("id") String id);
+
+
+ /*********************************************************************************************************
+ *
+ *
+ * 金汇预约空间
+ *
+ *
+ *********************************************************************************************************/
+ /**
+ * 金汇空间预约模块分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/interspaceGetList")
+ public R interspaceGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "intendantType",required = false) String intendantType);
+
+ /**
+ * 金汇空间预约模块单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/interspaceGetDetails")
+ public R interspaceGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 金汇空间预约模块新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiInterspace/interspaceAddData")
+ public R interspaceAddData(@RequestBody JinhuiInterspaceVO item);
+
+
+ /**
+ * 金汇空间预约模块编辑
+ * @return
+ */
+ @PostMapping("/JinhuiInterspace/interspaceEditData")
+ public R interspaceEditData(@RequestBody JinhuiInterspaceVO item);
+
+
+ /**
+ * 金汇空间预约模块删除
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/interspaceExpurgateData")
+ public R interspaceExpurgateData(@RequestParam("id") String id);
+
+
+ /****************************************************************************************************
+ *
+ *
+ * 空间预约分类
+ *
+ *
+ ******************************************************************************************************/
+ /**
+ * 空间预约分类分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/interspaceTypeGetList")
+ public R interspaceTypeGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize);
+
+ /**
+ * 空间预约分类单个详情
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/interspaceTypeGetDetails")
+ public R interspaceTypeGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 空间预约分类新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiInterspace/interspaceTypeAddData")
+ public R interspaceTypeAddData(@RequestBody JinhuiInterspaceTypeVO item);
+
+ /**
+ * 空间预约分类编辑
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiInterspace/interspaceTypeEditData")
+ public R interspaceTypeEditData(@RequestBody JinhuiInterspaceTypeVO item);
+
+
+ /**
+ * 空间预约分类删除
+ * @param
+ * @return
+ */
+ @DeleteMapping("/JinhuiInterspace/interspaceTypeExpurgateData")
+ public R interspaceTypeExpurgateData(@RequestParam("id") String id);
+
+
+
+ /***************************************************************************************************************
+ *
+ *
+ * 空间预约申请
+ *
+ *
+ **************************************************************************************************************/
+ /**
+ * 空间预约申请分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/applyFor/getList")
+ public R applyForGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "intendantType",required = false) String intendantType,
+ @RequestParam(value = "state",required = false) String state,
+ @RequestParam(value = "interspaceTime",required = false) String interspaceTime,
+ @RequestParam(value = "subscribeTimeFrame",required = false) String subscribeTimeFrame,
+ @RequestParam(value = "interspaceId",required = false) String interspaceId,
+ @RequestParam(value = "userId",required = false) String userId);
+
+ /**
+ * 空间预约申请详情
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiInterspace/applyFor/getDetails")
+ public R applyForGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 空间预约申请新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiInterspace/applyFor/addData")
+ public R applyForAddData(@RequestBody JinhuiInterspaceApplyForVO item);
+
+ /**
+ * 空间预约申请编辑
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiInterspace/applyFor/editData")
+ public R applyForEditData(@RequestBody JinhuiInterspaceApplyForVO item);
+
+ /**
+ * 空间预约申请删除
+ * @param
+ * @return
+ */
+ @DeleteMapping("/JinhuiInterspace/applyFor/expurgateData")
+ public R applyForExpurgateData(@RequestParam("id") String id);
+
+
+ /**************************************************************************************************************
+ *
+ *
+ * 金汇微心愿
+ *
+ *
+ ***************************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/micro/volunteering/getList")
+ public R volunteeringGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "userId", required = false)String userId,
+ @RequestParam(value = "state", required = false)String state);
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/micro/volunteering/getDetails")
+ public R volunteeringGetDetails(@RequestParam("id") String id);
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/micro/volunteering/addData")
+ public R volunteeringAddData(@RequestBody JinhuiMicroVolunteeringVO item);
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/micro/volunteering/editData")
+ public R volunteeringEditData(@RequestBody JinhuiMicroVolunteeringVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/micro/volunteering/expurgateData")
+ public R volunteeringExpurgateData(@RequestParam("id") String id);
+
+
+
+ /***************************************************************************************************************
+ *
+ *
+ * 金汇微心愿分类
+ *
+ *
+ *****************************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/micro/type/getList")
+ public R volunteeringTypeGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize);
+
+
+ /**
+ * 详情
+ * @param
+ * @return
+ */
+ @GetMapping("/micro/type/getDetails")
+ public R volunteeringTypeGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/micro/type/addData")
+ public R volunteeringTypeAddData(@RequestBody JinhuiMicroVolunteeringTypeVO item);
+
+ /**
+ * 编辑
+ * @param
+ * @return
+ */
+ @PostMapping("/micro/type/editData")
+ public R volunteeringTypeEditData(@RequestBody JinhuiMicroVolunteeringTypeVO item);
+
+ /**
+ * 删除
+ * @param
+ * @return
+ */
+ @DeleteMapping("/micro/type/expurgateData")
+ public R volunteeringTypeExpurgateData(@RequestParam("id") String id);
+
+
+ /*********************************************************************************************************
+ *
+ *
+ * 金汇商城商品
+ *
+ *
+ *********************************************************************************************************/
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiShopping/shoppingGetList")
+ public R shoppingGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "goodName", required = false) String goodName,
+ @RequestParam(value = "goodType", required = false) String goodType,
+ @RequestParam(value = "id", required = false) String id);
+
+
+ @GetMapping("/jinhuiShopping/shoppingGetDetails")
+ public R shoppingGetDetails(@RequestParam("id") String id,@RequestParam("communityId") String communityId);
+
+ /**
+ * 新增
+ *
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiShopping/shoppingAddData")
+ public R shoppingAddData(@RequestBody JinhuiShoppingVO item);
+
+
+ @PostMapping("/jinhuiShopping/shoppingEditData")
+ public R shoppingEditData(@RequestBody JinhuiShoppingVO item);
+
+ @DeleteMapping("/jinhuiShopping/shoppingExpurgateData")
+ public R shoppingExpurgateData(@RequestParam("id") String id);
+
+
+ /********************************************************************************************************
+ *
+ *
+ * 金汇商城商品订单
+ *
+ *
+ ********************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiShopping/orderGetList")
+ public R orderGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "userId", required = false)String userId,
+ @RequestParam(value = "goodsId", required = false)String goodsId,
+ @RequestParam(value = "orderNumber", required = false)String orderNumber,
+ @RequestParam(value = "goodName", required = false)String goodName,
+ @RequestParam(value = "name", required = false)String name,
+ @RequestParam(value = "cancelType", required = false)String cancelType);
+
+ /**
+ * 分页详情
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiShopping/orderGetDetails")
+ public R orderGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiShopping/orderAddData")
+ public R orderAddData(@RequestBody JinhuiShoppingOrderVO item);
+
+
+ /**
+ * 编辑
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiShopping/orderEditData")
+ public R orderEditData(@RequestBody JinhuiShoppingOrderVO item);
+
+
+ /**
+ * 取消
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiShopping/orderCancelOrder")
+ public R orderCancelOrder(@RequestParam("orderId") String orderId);
+
+
+ /**
+ * 删除
+ * @param
+ * @return
+ */
+ @DeleteMapping("/jinhuiShopping/orderExpurgateData")
+ public R orderExpurgateData(@RequestParam("id") String id);
+
+
+ /***************************************************************************************************************
+ *
+ *
+ * 社区配置兑换地址 时间
+ *
+ * *******************************************************************************************************
+ * @return
+ */
+
+ @GetMapping("/jinhuiConfig/configGetDetails")
+ public R configGetDetails(@RequestParam("communityId") String communityId);
+
+
+ @PostMapping("/jinhuiConfig/configAddData")
+ public R configAddData(@RequestBody JinhuiConfigVO item);
+
+ @PostMapping("/jinhuiConfig/configEditData")
+ public R configEditData(@RequestBody JinhuiConfigVO item);
+
+ @DeleteMapping("/jinhuiConfig/configExpurgateData")
+ public R configExpurgateData(@RequestParam("communityId") String communityId);
+
+
+
+ /*************************************************************************************************************
+ *
+ *
+ * 商家分类
+ *
+ *
+ **************************************************************************************************************/
+
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/jinhuiMerchant/getDetailsCategories")
+ public R getDetailsCategories(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiMerchant/addDataCategories")
+ public R addDataCategories(@RequestBody JinhuiComConvenientServiceCategoriesVO item);
+
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/jinhuiMerchant/editDataCategories")
+ public R editDataCategories(@RequestBody JinhuiComConvenientServiceCategoriesVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @GetMapping("/jinhuiMerchant/expurgateDataCategories")
+ public R expurgateDataCategories(@RequestParam("id") String id);
+
+
+ /*********************************************************************************************************
+ *
+ *
+ * 金汇体验活动
+ *
+ *
+ **********************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiExperience/experienceGetList")
+ public R experienceGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "activityName", required = false) String activityName,
+ @RequestParam(value = "activityType", required = false) String activityType,
+ @RequestParam(value = "starTime", required = false) Date starTime,
+ @RequestParam(value = "endTime", required = false) Date endTime);
+
+ /**
+ * 单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiExperience/experienceGetDetails")
+ public R experienceGetDetails(@RequestParam("id") String id,
+ @RequestParam(value = "userId", required = false) String userId);
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiExperience/experienceAddData")
+ public R experienceAddData(@RequestBody JinhuiExperienceActivityVO item);
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/JinhuiExperience/experienceEditData")
+ public R experienceEditData(@RequestBody JinhuiExperienceActivityVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiExperience/experienceExpurgateData")
+ public R experienceExpurgateData(@RequestParam("id") String id);
+
+
+ /******************************************************************************************************
+ *
+ * 金汇文章
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiArticle/articleGetList")
+ public R articleGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "articleType", required = false) String articleType,
+ @RequestParam(value = "conditionType", required = false) String conditionType);
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiArticle/articleGetDetails")
+ public R articleGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiArticle/articleAddData")
+ public R articleAddData(@RequestBody JinhuiArticleManagementVO item);
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/JinhuiArticle/articleEditData")
+ public R articleEditData(@RequestBody JinhuiArticleManagementVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiArticle/articleExpurgateData")
+ public R articleExpurgateData(@RequestParam("id") String id);
+
+
+
+ /*******************************************************************************************************
+ *
+ * 金汇报名体验
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiExperience/applyExperienceGetList")
+ public R applyExperienceGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "userId", required = false) String userId,
+ @RequestParam(value = "isFeedback", required = false) String isFeedback,
+ @RequestParam(value = "activityId", required = false) String activityId);
+
+
+ @GetMapping("/JinhuiExperience/applyExperienceGetDetails")
+ public R applyExperienceGetDetails(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "userId", required = false) String userId,
+ @RequestParam(value = "activityId", required = false) String activityId);
+
+ /**
+ * 新增
+ *
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiExperience/applyExperienceAddData")
+ public R applyExperienceAddData(@RequestBody JinhuiApplyExperienceVO item);
+
+ @PostMapping("/JinhuiExperience/applyExperienceEditData")
+ public R applyExperienceEditData(@RequestBody JinhuiApplyExperienceVO item);
+
+ @DeleteMapping("/JinhuiExperience/applyExperienceExpurgateData")
+ public R applyExperienceExpurgateData(@RequestParam("id") String id);
+
+
+ /**
+ * 填写反馈接口
+ * @return
+ */
+ @GetMapping("/JinhuiExperience/applyExperienceFilIn")
+ public R filIn(@RequestParam("userId") String userId,
+ @RequestParam("activityId") String activityId,
+ @RequestParam("content") String content);
+
+
+
+ /**************************************************************************************************************
+ *
+ *
+ * 定时任务
+ *
+ *
+ *******************************************************************************************************************/
+
+ //金汇社区定时任务
+ @GetMapping("/JinhuiExperience/timedTaskJinhuiActivitiesJobHandler")
+ public R timedTaskJinhuiActivitiesJobHandler();
+
+
+
+ /************************************************************************************************************
+ *
+ *
+ * 用户提交办理 /JinhuiWorkGuide/
+ *
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiWorkGuide/answer/getList")
+ public R answerGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "userId", required = false) String userId,
+ @RequestParam(value = "transactType", required = false) String transactType);
+
+ /**
+ * 获取详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiWorkGuide/answer/getDetails")
+ public R answerGetDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiWorkGuide/answer/addData")
+ public R answerAddData(@RequestBody JinhuiQuestnaireUserAnswerVO item);
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/JinhuiWorkGuide/answer/editData")
+ public R answerEditData(@RequestBody JinhuiQuestnaireUserAnswerVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/JinhuiWorkGuide/answer/expurgateData")
+ public R answerExpurgateData(@RequestParam("id") String id);
+
+
+
+
+ /********************************************************************************************************
+ *
+ *
+ * 金汇网格
+ *
+ *
+ ****************************************************************************************************/
+
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiReseau/getReseauList")
+ public R getReseauList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize);
+
+
+ @GetMapping("/jinhuiReseau/getReseauDetails")
+ public R getReseauDetails(@RequestParam("id")String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiReseau/addReseauData")
+ public R addReseauData(@RequestBody JinhuiReseauVO item);
+
+
+ @PostMapping("/jinhuiReseau/editReseauData")
+ public R editReseauData(@RequestBody JinhuiReseauVO item);
+
+ @PostMapping("/jinhuiReseau/expurgateReseauData")
+ public R expurgateReseauData(@RequestParam("id") String id);
+
+
+ /**
+ * 获取未绑定人员的网格
+ * @return
+ */
+ @GetMapping("/jinhuiReseau/getReseauBoxList")
+ public R getReseauBoxList();
+
+ /********************************************************************************************************
+ *
+ *
+ * 金汇网格员
+ *
+ *
+ ****************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiReseau/getPeopleList")
+ public R getPeopleList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize);
+
+
+ /**
+ * 分页查询
+ * 获取本社区用户
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiReseau/getPeopleUserList")
+ public R getPeopleUserList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "nameAndPhone", required = false) String nameAndPhone);
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/jinhuiReseau/getPeopleDetails")
+ public R getPeopleDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/jinhuiReseau/addPeopleData")
+ public R addPeopleData(@RequestBody JinhuiReseauPeopleVO item);
+
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/jinhuiReseau/editPeopleData")
+ public R editPeopleData(@RequestBody JinhuiReseauPeopleVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/jinhuiReseau/expurgatePeopleData")
+ public R expurgatePeopleData(@RequestParam("id") String id);
+
+
+ /****************************************************************************************************************
+ *
+ *
+ * 金汇慈善公益
+ *
+ *
+ ******************************************************************************************************************/
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiCharity/getCharityList")
+ public R getCharityList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "title", required = false) String title,
+ @RequestParam(value = "label", required = false) String label,
+ @RequestParam(value = "state", required = false) String state);
+
+ /**
+ * 金汇大屏用
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/JinhuiCharity/getJinhuiCharityList")
+ public R getJinhuiCharityList();
+
+ /**
+ * 获取详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/JinhuiCharity/getCharityDetails")
+ public R getCharityDetails(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/JinhuiCharity/addCharityData")
+ public R addCharityData(@RequestBody JinhuiCharityVO item);
+
+ @PostMapping("/JinhuiCharity/editCharityData")
+ public R editCharityData(@RequestBody JinhuiCharityVO item);
+
+ @DeleteMapping("/JinhuiCharity/expurgateCharityData")
+ public R expurgateCharityData(@RequestParam("id") String id);
+
+
+ /***************************************************************************************************************
+ *
+ * 金汇大屏
+ *
+ **************************************************************************************************************/
+ /**
+ * 金汇首页数据
+ * @return
+ */
+ @GetMapping("/JinhuiLargeScreen/getIndexInfo")
+ public R getIndexInfo();
+
+
+ /**
+ * 金汇大屏社区服务
+ * @return
+ */
+ @GetMapping("/JinhuiLargeScreen/getCommunityServices")
+ public R getCommunityServices();
+
+ /**
+ * 金汇居家养老
+ * @return
+ */
+ @GetMapping("/JinhuiLargeScreen/getOldMan")
+ public R getOldMan();
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComDataStatisticsFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComDataStatisticsFeign.java
new file mode 100644
index 0000000..8d1219c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComDataStatisticsFeign.java
@@ -0,0 +1,38 @@
+package com.panzhihua.common.service.partybuilding;
+
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.model.dtos.common.AddComPbCheckUnitDto;
+import com.panzhihua.common.model.dtos.common.EditComPbCheckUnitDto;
+import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * title: 党建-数据统计业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 党建-数据统计业务层接口
+ *
+ * @author lyq
+ * @date 2022-02-16 16:22:48
+ */
+@FeignClient(name = "huacheng-partybuilding", contextId = "comDataStatistics", path = "comDataStatistics")
+public interface ComDataStatisticsFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comPbCheckUnit 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-02-16 16:22:48
+ */
+ @PostMapping("/page")
+ R pageDataStatisticsMember(@RequestBody PageComPbCheckUnitDto comPbCheckUnit);
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java
new file mode 100644
index 0000000..fba49df
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java
@@ -0,0 +1,161 @@
+package com.panzhihua.common.service.partybuilding;
+
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.TreeListVO;
+import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
+import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.constants.Constants;
+import org.springframework.cloud.openfeign.FeignClient;
+
+import java.util.List;
+
+/**
+ * title: 党建-报到单位业务层接口
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 党建-报到单位业务层接口
+ *
+ * @author lyq
+ * @date 2022-02-16 16:22:48
+ */
+@FeignClient(name = "huacheng-partybuilding", contextId = "comPbCheckUnit", path = "comPbCheckUnit")
+public interface ComPbCheckUnitFeign {
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comPbCheckUnit 请求参数
+ * @return 分页查询列表数据
+ * @author lyq
+ * @date 2022-02-16 16:22:48
+ */
+ @PostMapping("/page")
+ R queryByPage(@RequestBody PageComPbCheckUnitDto comPbCheckUnit);
+
+ @PostMapping("/treeList")
+ R treeList(@RequestBody TreeListVO treeListVO);
+
+ @GetMapping("/orgList")
+ public R orgList();
+ /**
+ * description insert 新增数据
+ *
+ * @param comPbCheckUnit 请求参数
+ * @return 新增结果
+ * @author lyq
+ * @date 2022-02-16 16:22:48
+ */
+ @PostMapping("/add")
+ R insert(@RequestBody AddComPbCheckUnitDto comPbCheckUnit);
+
+ /**
+ * description update 修改数据
+ *
+ * @param comPbCheckUnit 请求参数
+ * @return 修改结果
+ * @author lyq
+ * @date 2022-02-16 16:22:48
+ */
+ @PutMapping("/edit")
+ R update(@RequestBody EditComPbCheckUnitDto comPbCheckUnit);
+
+ /**
+ * description deleteById 通过主键删除数据
+ *
+ * @param id 主键id
+ * @return 删除结果
+ * @author lyq
+ * @date 2022-02-16 16:22:48
+ */
+ @GetMapping("/delete")
+ R deleteById(@RequestParam("id") Long id);
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-02-16 16:22:48
+ */
+ @GetMapping("/detail")
+ R detailById(@RequestParam("id") Long id);
+
+ /**
+ * description queryByList 查询列表
+ *
+ * @param comPbCheckUnit 请求参数
+ * @return 查询列表数据
+ * @author lyq
+ * @date 2022-02-16 16:22:48
+ */
+ @PostMapping("/list")
+ R queryByList(@RequestBody PageComPbCheckUnitDto comPbCheckUnit);
+
+ /**
+ * 批量导入报道单位
+ * @param list 导入数据
+ * @param communityId 社区id
+ * @param userId 用户id
+ * @return 导入结果
+ */
+ @PostMapping("/importCheckUnit")
+ R importCheckUnit(@RequestBody List<ComPbCheckUnitExcelVO> list,@RequestParam(value = "communityId") Long communityId
+ ,@RequestParam(value = "userId") Long userId);
+
+ /**
+ * 报到单位统计-顶部数据
+ * @param communityId
+ * @param belongTo
+ * @param choice
+ * @return
+ */
+ @GetMapping("/statistics/top")
+ R unitStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId,
+ @RequestParam(value = "belongTo") String belongTo,
+ @RequestParam(value = "choice", required = false) String choice,
+ @RequestParam(value = "unitIds", required = false) Long[] unitIds,
+ @RequestParam(value = "yearTime",required = false) String yearTime);
+
+ /**
+ * 报到单位统计
+ * @param commonDto
+ * @return
+ */
+ @PostMapping("/statistics")
+ R unitStatistics(@RequestBody PagePbCheckUnitCommonDto commonDto);
+
+ /**
+ * 报到党员统计-顶部数据
+ * @param communityId
+ * @param belongTo
+ * @param choice
+ * @param checkUnitId
+ * @return
+ */
+ @GetMapping("/pbStatistics/top")
+ R pbStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId,
+ @RequestParam(value = "belongTo") String belongTo,
+ @RequestParam(value = "choice", required = false) String choice,
+ @RequestParam(value = "checkUnitId", required = false) Long checkUnitId,
+ @RequestParam(value = "unitIds", required = false) Long[] unitIds,
+ @RequestParam(value = "yearTime",required = false) String yearTime);
+
+ /**
+ * 报到党员统计-按单位归属统计
+ * @param commonDto
+ * @return
+ */
+ @PostMapping("/pbStatistics/belong")
+ R pbStatisticsBelong(@RequestBody PagePbCheckUnitCommonDto commonDto);
+
+ /**
+ * 报到党员统计-按单位统计
+ * @param commonDto
+ * @return
+ */
+ @PostMapping("/pbStatistics/unit")
+ R pbStatisticsUnit(@RequestBody PagePbCheckUnitCommonDto commonDto);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
new file mode 100644
index 0000000..372cf63
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
@@ -0,0 +1,651 @@
+package com.panzhihua.common.service.partybuilding;
+
+import com.panzhihua.common.model.dtos.partybuilding.*;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.building.*;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ */
+@FeignClient(name = "huacheng-partybuilding", contextId = "NewStriveForFeign")
+public interface NewStriveForFeign
+{
+
+
+ /************************************************************************************************************
+ *
+ * 党员排序
+ *
+ ************************************************************************************************************/
+
+ @GetMapping("/NewStriveFor/getUserRank")
+ public R getUserRank(@RequestParam("userId") String userId);
+
+ @GetMapping("/NewStriveFor/getUserRankList")
+ public R getUserRankList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("userId") String userId);
+
+ @GetMapping("/NewStriveFor/getAllintegral")
+ public R getAllintegral(@RequestParam("type") String type,
+ @RequestParam("userId") String userId);
+
+
+
+
+ /************************************************************************************************************
+ *
+ * 问题需求清单
+ *
+ ************************************************************************************************************/
+
+
+ @GetMapping("/NeedProblem/getList")
+ public R getNeedProblemList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "search", required = false)String search,
+ @RequestParam(value = "classifyId", required = false)String classifyId,
+ @RequestParam(value = "status", required = false)String status,
+ @RequestParam(value = "kind", required = false)String kind,
+ @RequestParam(value = "userId", required = false)String userId,
+ @RequestParam(value = "userIds", required = false)String userIds,
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "isDisplay", required = false)String isDisplay,
+ @RequestParam(value = "startTime", required = false) Date startTime,
+ @RequestParam(value = "endTime", required = false) Date endTime);
+
+ @GetMapping("/NeedProblem/getMyJoinNeedProblemList")
+ public R getMyJoinNeedProblemList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "search", required = false)String search,
+ @RequestParam(value = "status", required = false)String status,
+ @RequestParam(value = "kind", required = false)String kind,
+ @RequestParam(value = "userIds", required = false)String userIds,
+ @RequestParam(value = "userId", required = false)String userId,
+ @RequestParam(value = "isDisplay", required = false)String isDisplay,
+ @RequestParam(value = "startTime", required = false) Date startTime,
+ @RequestParam(value = "endTime", required = false) Date endTime);
+
+
+ @GetMapping("/NeedProblem/getDetails")
+ public R getNeedProblemDetails(@RequestParam("id") String id,@RequestParam("userIds") String userIds);
+
+ @PostMapping("/NeedProblem/addData")
+ public R addNeedProblemData(@RequestBody NeedProblemInventoryDTO item);
+
+ @PostMapping("/NeedProblem/editData")
+ public R editNeedProblemData(@RequestBody NeedProblemInventoryDTO item);
+
+ @DeleteMapping("/NeedProblem/expurgateData")
+ public R expurgateNeedProblemData(@RequestParam("id") String id);
+
+
+ /*******************************************************************************************************
+ *
+ * 任务需求报名
+ *
+ *******************************************************************************************************/
+ @GetMapping("/NeedClaim/getNeedClaimList")
+ public R getNeedClaimList(@RequestParam(value = "taskId", required = false) String taskId,
+ @RequestParam(value = "userId", required = false) String userId,
+ @RequestParam(value = "unitId", required = false) String unitId);
+
+ @GetMapping("/NeedClaim/getNeedClaimDetails")
+ public R getNeedClaimDetails(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "taskId", required = false) String taskId,
+ @RequestParam(value = "userId", required = false) String userId);
+
+ @PostMapping("/NeedClaim/addNeedClaimData")
+ public R addNeedClaimData(@RequestBody NeedProblemClaimDTO item);
+
+ @PostMapping("/NeedClaim/editNeedClaimData")
+ public R editNeedClaimData(@RequestBody NeedProblemClaimDTO item);
+
+ @DeleteMapping("/NeedClaim/expurgateNeedClaimData")
+ public R expurgateNeedClaimData(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "taskId", required = false) String taskId,
+ @RequestParam(value = "userId", required = false) String userId);
+
+
+ @GetMapping("/NeedClaim/needClaimSignIn")
+ public R needClaimSignIn(@RequestParam("taskId") String taskId,
+ @RequestParam("userId") String userId,
+ @RequestParam("type") String type);
+
+
+ /***************************************************************************************************************
+ *
+ * 代单位接受
+ *
+ *************************************************************************************************************/
+
+ @GetMapping("/NeedTask/getNeedTaskList")
+ public R getNeedTaskList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "unitId", required = false) String unitId,
+ @RequestParam(value = "kind", required = false) String kind,
+ @RequestParam(value = "status", required = false) String status);
+
+ @GetMapping("/NeedTask/getNeedTaskDetails")
+ public R getNeedTaskDetails(@RequestParam("id") String id);
+
+ @PostMapping("/NeedTask/addNeedTaskData")
+ public R addNeedTaskData(@RequestBody NeedProblemUnitTaskDTO item);
+
+ @PostMapping("/NeedTask/editNeedTaskData")
+ public R editNeedTaskData(@RequestBody NeedProblemUnitTaskDTO item);
+
+ @DeleteMapping("/NeedTask/expurgateNeedTaskData")
+ public R expurgateNeedTaskData(@RequestParam("id") String id);
+
+
+ /*******************************************************************************************************************
+ *
+ * 新双争双评社区共建
+ *
+ ****************************************************************************************************************/
+ @GetMapping("/NewFightCommunity/getNeedClaimList")
+ public R getNewFightCommunityList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "communityId", required = false) String communityId,
+ @RequestParam(value = "userId", required = false) String userId);
+
+ @GetMapping("/NewFightCommunity/getNeedClaimDetails")
+ public R getNewFightCommunityDetails(@RequestParam("id") String id,
+ @RequestParam(value = "userId", required = false) String userId);
+
+ @PostMapping("/NewFightCommunity/addNeedClaimData")
+ public R addNewFightCommunityData(@RequestBody NewFightCommunityConstructionDTO item);
+
+ @PostMapping("/NewFightCommunity/editNeedClaimData")
+ public R editNewFightCommunityData(@RequestBody NewFightCommunityConstructionDTO item);
+
+ @DeleteMapping("/NewFightCommunity/expurgateNeedClaimData")
+ public R expurgateNewFightCommunityData(@RequestParam(value = "id", required = false) String id);
+
+
+ /**************************************************************************************************************
+ *
+ * 项目规划
+ *
+ ****************************************************************************************************************/
+
+ @GetMapping("/NewFightCommunity/getProjectPlanList")
+ public R getProjectPlanList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("projectId") String projectId);
+
+ @GetMapping("/NewFightCommunity/getProjectPlanDetails")
+ public R getProjectPlanDetails(@RequestParam("id") String id);
+
+ @PostMapping("/NewFightCommunity/addProjectPlanData")
+ public R addProjectPlanData(@RequestBody NewFightProjectPlanDTO item);
+
+ @PostMapping("/NewFightCommunity/editProjectPlanData")
+ public R editProjectPlanData(@RequestBody NewFightProjectPlanDTO item);
+
+ @DeleteMapping("/NewFightCommunity/expurgateProjectPlanData")
+ public R expurgateProjectPlanData(@RequestParam("id") String id);
+
+
+ @GetMapping("/NewFightCommunity/editProjectPlanAccomplish")
+ public R editProjectPlanAccomplish(@RequestParam("id") String id);
+
+
+ /********************************************************************************************************
+ *
+ * 项目参与
+ *
+ ******************************************************************************************************/
+
+
+ @GetMapping("/NewFightCommunity/getJoinList")
+ public R getJoinList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("projectId") String projectId);
+
+ @GetMapping("/NewFightCommunity/getJoinDetails")
+ public R getJoinDetails(@RequestParam("id") String id);
+
+ @PostMapping("/NewFightCommunity/addJoinData")
+ public R addJoinData(@RequestBody NewFightProjectJoinDTO item);
+
+ @PostMapping("/NewFightCommunity/editJoinData")
+ public R editJoinData(@RequestBody NewFightProjectJoinDTO item);
+
+ @DeleteMapping("/NewFightCommunity/expurgateJoinData")
+ public R expurgateJoinData(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "projectId", required = false) String projectId,
+ @RequestParam(value = "userId", required = false) String userId);
+
+
+
+ /********************************************************************************************************
+ *
+ * 项目评论
+ *
+ ******************************************************************************************************/
+ @GetMapping("/NewFightCommunity/getEvaluateList")
+ public R getEvaluateList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("projectId") String projectId);
+
+ @GetMapping("/NewFightCommunity/getEvaluateDetails")
+ public R getEvaluateDetails(@RequestParam("id") String id);
+
+
+ @PostMapping("/NewFightCommunity/addEvaluateData")
+ public R addEvaluateData(@RequestBody NewFightProjectEvaluateDTO item);
+
+ @PostMapping("/NewFightCommunity/editEvaluateData")
+ public R editEvaluateData(@RequestBody NewFightProjectEvaluateDTO item);
+
+ @DeleteMapping("/NewFightCommunity/expurgateEvaluateData")
+ public R expurgateEvaluateData(@RequestParam("id") String id);
+
+
+ /************************************************************************************************************
+ *
+ * 资源共享
+ *
+ *************************************************************************************************************/
+
+ @GetMapping("/ResourceSharing/getResourceSharingList")
+ public R getResourceSharingList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "unitId", required = false)String unitId,
+ @RequestParam(value = "meritId", required = false) String meritId);
+
+ @GetMapping("/ResourceSharing/getResourceSharingDetails")
+ public R getResourceSharingDetails(@RequestParam("id") String id);
+
+ @PostMapping("/ResourceSharing/addResourceSharingData")
+ public R addResourceSharingData(@RequestBody NewFightResourceSharingDTO item);
+
+ @PostMapping("/ResourceSharing/editResourceSharingData")
+ public R editResourceSharingData(@RequestBody NewFightResourceSharingDTO item);
+
+ @DeleteMapping("/ResourceSharing/expurgateResourceSharingData")
+ public R expurgateResourceSharingData(@RequestParam("id") String id);
+
+
+ /************************************************************************************************************
+ *
+ * 社区设置兑换时间地点
+ *
+ ******************************************************************************************************************/
+ @GetMapping("/FightConfig/getConfigDetails")
+ public R getConfigDetails(@RequestParam("communityId") String communityId);
+
+
+ @PostMapping("/FightConfig/addConfigData")
+ public R addConfigData(@RequestBody NewFightConfigVO item);
+
+ @PostMapping("/FightConfig/editConfigData")
+ public R editConfigData(@RequestBody NewFightConfigVO item);
+
+
+ @DeleteMapping("/FightConfig/expurgateConfigData")
+ public R expurgateConfigData(@RequestParam("communityId") String communityId);
+
+
+ /*******************************************************************************************************
+ *
+ * 积分商城
+ *
+ *******************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/FightShopping/getFightShoppingList")
+ public R getFightShoppingList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("communityId") String communityId,
+ @RequestParam(value = "goodName", required = false)String goodName,
+ @RequestParam(value = "goodType", required = false)String goodType,
+ @RequestParam(value = "id", required = false)String id);
+
+
+ @GetMapping("/FightShopping/getFightShoppingDetails")
+ public R getFightShoppingDetails(@RequestParam("id") String id);
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/FightShopping/addFightShoppingData")
+ public R addFightShoppingData(@RequestBody NewFightShoppingVO item);
+
+
+ @PostMapping("/FightShopping/editFightShoppingData")
+ public R editFightShoppingData(@RequestBody NewFightShoppingVO item);
+
+ @DeleteMapping("/FightShopping/expurgateFightShoppingData")
+ public R expurgateFightShoppingData(@RequestParam("id") String id);
+
+
+ /*******************************************************************************************************
+ *
+ * 商家模块
+ *
+ * ********************************************************************************************************/
+
+ /**
+ * 删除便民服务商家
+ *
+ * @param merchantId
+ * @param operator
+ * @return
+ */
+ @DeleteMapping("/FightConvenient/deleteMerchantById")
+ public R deleteMerchantById(@RequestParam("communityId") String merchantId);
+
+ /**
+ * 编辑状态
+ *
+ * @param merchantId
+ * @param status
+ * @return
+ */
+ @GetMapping("/FightConvenient/editMerchantStatus")
+ public R editMerchantStatus(@RequestParam("communityId") String merchantId,
+ @RequestParam("status") String status);
+
+ /**
+ * 分页查询便民服务商家 运营后台
+ *
+ * @return
+ */
+ @GetMapping("/FightConvenient/pageMerchant")
+ public R pageMerchant(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("communityId") String communityId,
+ @RequestParam(value = "isDel", required = false) String isDel,
+ @RequestParam(value = "keyword", required = false)String keyword,
+ @RequestParam(value = "status", required = false)String status) ;
+
+ /**
+ * 查询商家信息
+ *
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/FightConvenient/selectMerchantById")
+ public R selectMerchantById(@RequestParam("merchantId") String merchantId);
+
+ @PostMapping("/FightConvenient/addMerchantData")
+ public R addMerchantData(@RequestBody NewFightConvenientMerchantVO item) ;
+
+ @PostMapping("/FightConvenient/editMerchantData")
+ public R editMerchantData(@RequestBody NewFightConvenientMerchantVO item);
+
+
+ @GetMapping("/FightConvenient/selectUserList")
+ public R selectUserList(@RequestParam("communityId") String communityId,
+ @RequestParam("phoneOrname") String phoneOrname);
+
+
+
+ @GetMapping("/FightConvenient/selectUserListB")
+ public R selectUserListB(@RequestParam("communityId") String communityId,
+ @RequestParam("phoneOrname") String phoneOrname);
+
+
+
+ @GetMapping("/FightConvenient/selectUserBind")
+ public R selectUserBind(@RequestParam("communityId") String communityId,
+ @RequestParam("userId") String userId);
+
+ /*****************************************************************************************************
+ *
+ * 用户积分任务完成情况
+ *
+ *******************************************************************************************************/
+ /**
+ * 列表
+ * @param
+ * @return
+ */
+ @GetMapping("/IntegratingTask/getTaskList")
+ public R getIntegratingTaskList(@RequestParam("userId") String userId,
+ @RequestParam("communityId") String communityId);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/IntegratingTask/addIntegratingTaskData")
+ public R addIntegratingTaskData(@RequestBody IntegratingTaskVO item);
+
+
+ /**
+ * 添加或者修改积分
+ * @param item
+ * @return
+ */
+ @PostMapping("/IntegratingTask/upIntegral")
+ public R upIntegral(@RequestBody NewFightIntegral item);
+
+
+ /**
+ * 每日签到记录列表 前15条
+ * @param userId
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/IntegratingTask/getEverydayList")
+ public R getEverydayList(@RequestParam("userId") String userId,
+ @RequestParam("communityId") String communityId);
+
+
+ /*******************************************************************************************************************
+
+ *
+ * 商品订单
+ *
+ ****************************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/NewFightOrder/orderGetList")
+ public R orderGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "userId", required = false)String userId,
+ @RequestParam(value = "goodsId", required = false)String goodsId,
+ @RequestParam(value = "orderNumber", required = false)String orderNumber,
+ @RequestParam(value = "goodName", required = false)String goodName,
+ @RequestParam(value = "name", required = false)String name,
+ @RequestParam(value = "cancelType", required = false)String cancelType,
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "merchantId", required = false) String merchantId,
+ @RequestParam(value = "orderType", required = false) String orderType);
+
+ /**
+ * 分页详情
+ * @param
+ * @return
+ */
+ @GetMapping("/NewFightOrder/orderGetDetails")
+ public R orderGetDetails(@RequestParam("id") String id,
+ @RequestParam(value = "communityId") String communityId);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/NewFightOrder/orderAddData")
+ public R orderAddData(@RequestBody NewFightShoppingOrderVO item);
+
+
+ /**
+ * 编辑
+ * @param
+ * @return
+ */
+ @PostMapping("/NewFightOrder/orderEditData")
+ public R orderEditData(@RequestBody NewFightShoppingOrderVO item);
+
+
+ /**
+ * 取消
+ * @param
+ * @return
+ */
+ @GetMapping("/NewFightOrder/orderCancelOrder")
+ public R orderCancelOrder(@RequestParam("orderId") String orderId,
+ @RequestParam(value = "communityId") String communityId);
+
+
+ /**
+ * 删除
+ * @param
+ * @return
+ */
+ @DeleteMapping("/NewFightOrder/orderExpurgateData")
+ public R orderExpurgateData(@RequestParam("id") String id,
+ @RequestParam(value = "communityId") String communityId);
+
+
+
+
+
+
+
+
+
+
+
+ /**
+ * 每日定时清空 定时任务
+ */
+ @GetMapping("/IntegratingTask/everydaYtruncateData")
+ public R truncateData();
+
+
+ /**
+ * 新双争双评需求问题清单 任务认领 开始 结束 定时任务
+ * @return
+ */
+ @PostMapping("/NeedProblem/timedNewFightNeedProblemInventoryHandler")
+ public R timedNewFightNeedProblemInventoryHandler();
+
+
+ //定时任务 社区组织共建 定时更新项目进度
+ @PostMapping("/NewFightCommunity/taskTimed/getListTime")
+ public R taskTimedGetListTime();
+
+
+ /******************************************************************************************************************
+ *
+ * 街道大屏
+ *
+ *****************************************************************************************************************/
+
+
+ @GetMapping("/StreetBigScreen/getCommunityId")
+ public R getCommunityId(@RequestParam("streetId") String streetId);
+
+
+ /**
+ * 获取核心指标数据
+ * @param streetId
+ * @return
+ */
+ @GetMapping("/StreetBigScreen/getCoreData")
+ public R getCoreData(@RequestParam(value = "streetId", required = false) String streetId,
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "type", required = false)String type,
+ @RequestParam(value = "starTime", required = false)String starTime,
+ @RequestParam(value = "endTime", required = false)String endTime);
+
+
+ /**
+ * 获取三务三资数据
+ * @param streetId
+ * @param communityId
+ * @param type
+ * @param starTime
+ * @param endTime
+ * @return
+ */
+ @GetMapping("/StreetBigScreen/getThreeNum")
+ public R getThreeNum(@RequestParam(value = "streetId", required = false) String streetId,
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "type", required = false)String type,
+ @RequestParam(value = "starTime", required = false)String starTime,
+ @RequestParam(value = "endTime", required = false)String endTime);
+
+
+
+ /**
+ * 双报到双服务
+ * @param streetId
+ * @param communityId
+ * @param type
+ * @param starTime
+ * @param endTime
+ * @return
+ */
+ @GetMapping("/StreetBigScreen/getDoubleRegistration")
+ public R getDoubleRegistration(@RequestParam(value = "streetId", required = false) String streetId,
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "type", required = false)String type,
+ @RequestParam(value = "starTime", required = false)String starTime,
+ @RequestParam(value = "endTime", required = false)String endTime);
+
+ /**
+ * 随手拍 微心愿
+ * @param streetId
+ * @param communityId
+ * @param type
+ * @param starTime
+ * @param endTime
+ * @return
+ */
+ @GetMapping("/StreetBigScreen/getPhotoMicroWish")
+ public R getPhotoMicroWish(@RequestParam(value = "streetId", required = false) String streetId,
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "type", required = false)String type,
+ @RequestParam(value = "starTime", required = false)String starTime,
+ @RequestParam(value = "endTime", required = false)String endTime);
+
+
+
+ /**
+ * 社区活动、议事投票、问卷调查、社区动态发布趋势
+ * @param streetId
+ * @param communityId
+ * @param type
+ * @param starTime
+ * @param endTime
+ * @return
+ */
+ @GetMapping("/StreetBigScreen/getAllData")
+ public R getAllData(@RequestParam(value = "streetId", required = false) String streetId,
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "type", required = false)String type,
+ @RequestParam(value = "starTime", required = false)String starTime,
+ @RequestParam(value = "endTime", required = false)String endTime);
+
+
+ /**
+ * 新双争双评需求问题清单 签退时间更新
+ * @return
+ */
+ @GetMapping("/NeedClaim/upNewFightNeedProblemClaimEndTime")
+ public R upNewFightNeedProblemClaimEndTime();
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
new file mode 100644
index 0000000..a3b57c5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
@@ -0,0 +1,650 @@
+package com.panzhihua.common.service.partybuilding;
+
+import java.util.List;
+
+import com.panzhihua.common.model.dtos.community.PageMemberForInviteDTO;
+import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.panzhihua.common.model.dtos.partybuilding.*;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.partybuilding.*;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 党建
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-30 09:50
+ **/
+@FeignClient(value = "huacheng-partybuilding")
+public interface PartyBuildingService {
+ /**
+ * 新增党员
+ *
+ * @param partyBuildingMemberVO
+ * 党员基本信息
+ * @return 新增结果
+ */
+ @PostMapping("/partybuildIng/addpartybuildingmember")
+ R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO);
+
+ /**
+ * 社区所有启用的党组织列表
+ *
+ * @return 党组织集合
+ */
+ @PostMapping("/partybuildIng/listpartyorganization")
+ R listPartyOrganization(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询所有的党组织列表
+ *
+ * @return 党组织集合
+ */
+ @PostMapping("/partybuildIng/listpartyorganizationAll")
+ R listPartyOrganizationAll(@RequestBody PartyOrganizationVO partyOrganizationVO);
+
+ /**
+ * 查询所有党组织列表
+ * @param partyOrganizationVO 请求参数
+ * @return 党组织列表
+ */
+ @PostMapping("/partybuildIng/getPbOrgAllList")
+ R getPbOrgAllList(@RequestBody PartyOrganizationVO partyOrganizationVO);
+
+ /**
+ * 新增党支部
+ *
+ * @param partyOrganizationVO
+ * 党支部基本信息
+ * @return 新增结果
+ */
+ @PostMapping("/partybuildIng/addpartyorganization")
+ R addPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
+
+ /**
+ * 编辑党支部
+ *
+ * @param partyOrganizationVO
+ * 党支部基本信息
+ * @return 编辑结果
+ */
+ @PostMapping("/partybuildIng/updatepartyorganization")
+ R updatePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
+
+ /**
+ * 启用，禁用党支部
+ *
+ * @param partyOrganizationVO
+ * 党支部基本信息
+ * @return 编辑结果
+ */
+ @PostMapping("/partybuildIng/resetpartyorganization")
+ R resetPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
+
+ /**
+ * 删除党支部
+ *
+ * @param partyOrganizationVO
+ * 党支部基本信息
+ * @return 删除结果
+ */
+ @PostMapping("/partybuildIng/deletepartyorganization")
+ R deletePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
+
+ /**
+ * 批量新增党员
+ *
+ * @param list
+ * 党员集合
+ */
+ @PostMapping("/partybuildIng/listsavepartybuildingmemberexcelvo")
+ R listSavePartyBuildingMemberExcelVO(@RequestBody List<PartyBuildingMemberExcelVO> list);
+
+ /**
+ * 分页查询党员信息
+ *
+ * @param pagePartyOrganizationVO
+ * 查询信息
+ * @return 分页数据
+ */
+ @PostMapping("/partybuildIng/pagepartyorganization")
+ R pagePartyOrganization(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO);
+
+ /**
+ * 导出党员信息
+ *
+ * @param pagePartyOrganizationVO
+ * 查询信息
+ * @return 分页数据
+ */
+ @PostMapping("/partybuildIng/exportPartyMember")
+ R exportPartyMember(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO);
+
+ /**
+ * 党员活动
+ *
+ * @param partyBuildingActivityVO
+ * 党员活动查询参数
+ * @return 参加的所有活动
+ */
+ @PostMapping("/partybuildIng/listpartymemberactivities")
+ R listPartyMemberActivities(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO);
+
+ /**
+ * 活动报名名单分页查询
+ *
+ * @param pageActivityMembersVO
+ * 查询参数 手机号 名字
+ * @return 分页数据
+ */
+ @PostMapping("/partybuildIng/pageactivitymembers")
+ R pageActivityMembers(@RequestBody PageActivityMembersVO pageActivityMembersVO);
+
+ /**
+ * 编辑党员信息 新增字段均可编辑
+ *
+ * @param partyBuildingMemberVO
+ * 编辑字段
+ * @return 编辑结果
+ */
+ @PostMapping("/partybuildIng/updatepartybuildingmember")
+ R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO);
+
+ /**
+ * 党员活动详情
+ *
+ * @param id
+ * 活动id
+ * @return 活动详情内容
+ */
+ @PostMapping("/partybuildIng/activityinfo")
+ R activityinfo(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+ /**
+ * 查询指定社区的所有党员
+ *
+ * @param communityId
+ * 社区id
+ * @return 党员列表
+ */
+ @PostMapping("/partybuildIng/listPartyMember")
+ R listPartyMember(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 社区下拉选择身份
+ *
+ * @return 身份集合
+ */
+ @PostMapping("/partybuildIng/listidentity")
+ R listIdentity();
+
+ /**
+ * 新增党委
+ *
+ * @param partyCommitteeVO
+ * 新增信息
+ * @return 新增结果
+ */
+ @PostMapping("/partybuildIng/addpartycommittee")
+ R addPartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);
+
+ /**
+ * 编辑党委
+ *
+ * @param partyCommitteeVO
+ * 编辑信息
+ * @return 编辑结果
+ */
+ @PostMapping("/partybuildIng/updatepartycommittee")
+ R updatePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);
+
+ /**
+ * 删除党委
+ *
+ * @param partyCommitteeVO
+ * 删除id
+ * @return 删除结果
+ */
+ @PostMapping("/partybuildIng/deletepartycommittee")
+ R deletePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);
+
+ /**
+ * 分页社区党委查询
+ *
+ * @param partyCommitteeVO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/partybuildIng/pagepartycommittee")
+ R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);
+
+ /**
+ * 新建党建动态
+ *
+ * @param partyCommitteeVO
+ * 动态内容
+ * @return 新增结果
+ */
+ @PostMapping("/partybuildIng/adddynamic")
+ R adddYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO);
+
+ /**
+ * 编辑动态
+ *
+ * @param partyCommitteeVO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("/partybuildIng/updatedynamic")
+ R updateYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO);
+
+ /**
+ * 动态详情
+ *
+ * @param id
+ * 动态主键
+ * @return 详情
+ */
+ @PostMapping("/partybuildIng/infodynamic")
+ R infoYnamic(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询党员动态/政策文件
+ *
+ * @param partyBuildingComPbDynVO
+ * 查询参数
+ * @return 分页数据
+ */
+ @PostMapping("/partybuildIng/pagedynamic")
+ R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO);
+
+ /**
+ * 删除动态
+ *
+ * @param id
+ * 动态主键
+ * @return 删除结果
+ */
+ @PostMapping("/partybuildIng/deletedynamic")
+ R deleteYnamic(@RequestParam("id") Long id);
+
+ /**
+ * 新增党员活动
+ *
+ * @param partyBuildingActivityVO
+ * 参数
+ * @return 新增结果
+ */
+ @PostMapping("/partybuildIng/addactivity")
+ R addactivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO);
+
+ /**
+ * 编辑党员活动
+ *
+ * @param partyBuildingActivityVO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("/partybuildIng/updateactivity")
+ R updateActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO);
+
+ /**
+ * 发布党员活动
+ *
+ * @param id
+ * 主键id
+ * @return 发布结果
+ */
+ @PostMapping("/partybuildIng/releaseactivity")
+ R releaseActivity(@RequestParam("id") Long id);
+
+ /**
+ * 删除党员活动
+ *
+ * @param id
+ * 主键id
+ * @return 删除结果
+ */
+ @PostMapping("/partybuildIng/deleteactivity")
+ R deleteActivity(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询党员活动
+ *
+ * @param partyBuildingActivityVO
+ * 查询条件
+ * @return 查询结果
+ */
+ @PostMapping("/partybuildIng/pageactivity")
+ R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO);
+
+ /**
+ * 增加阅读记录
+ *
+ * @param comPbDynUserVO
+ * 记录内容
+ * @return 增加结果
+ */
+ @PostMapping("/partybuildIng/adddynuser")
+ R addDynUser(@RequestBody ComPbDynUserVO comPbDynUserVO);
+
+ /**
+ * 删除党员
+ *
+ * @param id
+ * 党员主键
+ * @return 删除结果
+ */
+ @PostMapping("/partybuildIng/deletepartybuildingmember")
+ R deleteDynUser(@RequestParam("id") Long id);
+
+ /**
+ * 取消活动
+ *
+ * @param partyBuildingActivityVO
+ * 取消原因
+ * @return 操作结果
+ */
+ @PostMapping("/partybuildIng/cancelactivity")
+ R cancelActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO);
+
+ /**
+ * 用户的所有党建活动
+ *
+ * @param userId
+ * 用户id
+ * @param communityId
+ * 社区id 同一用户在不同社区都是党员
+ * @param status
+ * @return 党建活动列表
+ */
+ @PostMapping("/partybuildIng/listactivity")
+ R listActivity(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId,
+ @RequestParam(value = "status", required = false) Integer status);
+
+ /**
+ * 党员活动人员参入列表
+ *
+ * @param id
+ * 活动id
+ * @return 党员集合
+ */
+ @PostMapping("/partybuildIng/listpartybuildingmember")
+ R listPartyBuildingMember(@RequestParam("id") Long id);
+
+ /**
+ * 报名、取消报名党员活动
+ *
+ * @param activitySignUpDTO
+ * 操作参数
+ * @return 操作结果
+ */
+ @PostMapping("/partybuildIng/putactivitysignup")
+ R putActivitySignUp(@RequestBody ActivitySignUpDTO activitySignUpDTO);
+
+ /**
+ * 获取党建活动所有参入人员的id集合
+ *
+ * @param id
+ * 党建活动id
+ * @return 人员id集合
+ */
+ @PostMapping("/partybuildIng/selectallpartybuildingactivitymembers")
+ R selectAllPartyBuildingActivityMembers(@RequestParam("id") Long id);
+
+ /**
+ * 定时任务刷新党建动态发布状态
+ *
+ * @return 刷新数据数量
+ */
+ @PostMapping("/partybuildIng/timedtaskpartybuildingstatus")
+ R timedTaskPartyBuildingStatus();
+
+ /**
+ * 定时任务取消党建活动
+ *
+ * @return 需要取消的所有党建活动
+ */
+ @PostMapping("/partybuildIng/timedtaskpartybuildingactivity")
+ R timedTaskPartyBuildingActivity();
+
+ /**
+ * 定时任务刷新党建活动的各个状态 除取消外
+ *
+ * @return 修改结果
+ */
+ @PostMapping("/partybuildIng/timedtaskpartybuildingactivityall")
+ R timedTaskPartyBuildingActivityAll();
+
+ /**
+ * 新增服务团队人员
+ *
+ * @param comPbServiceTeamDTO
+ * 新增内容
+ * @return 新增结果
+ */
+ @PostMapping("/partybuildIng/addserviceteam")
+ R addServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO);
+
+ /**
+ * 编辑团队人员
+ *
+ * @param comPbServiceTeamDTO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("/partybuildIng/putserviceteam")
+ R putServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO);
+
+ /**
+ * 删除服务团队人员
+ *
+ * @param comPbServiceTeamDTO
+ * 删除主键
+ * @return 删除结果
+ */
+ @PostMapping("/partybuildIng/deleteserviceteam")
+ R deleteServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO);
+
+ /**
+ * 分页查询服务团队成员
+ *
+ * @param pageComPbServiceTeamDTO
+ * 查询参数
+ * @return 查询结果
+ */
+ @PostMapping("/partybuildIng/pageserviceteam")
+ R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO);
+
+
+ @GetMapping("/partybuildIng/getComPbServiceTeamData")
+ public R getComPbServiceTeamData(@RequestParam("communityId") String communityId,
+ @RequestParam("phone") String phone);
+
+
+ /**
+ * 创建党员活动 小程序创建党员活动
+ *
+ * @param comPbActivityDTO
+ * 创建内容
+ * @return 创建结果
+ */
+ @PostMapping("/partybuildIng/addactivityinfo")
+ R addActivityApplets(@RequestBody ComPbActivityDTO comPbActivityDTO);
+
+ /**
+ * 查询用户党员认证信息
+ *
+ * @param id
+ * @param communityId
+ * 用户ID
+ * @return 查询结果
+ */
+ @GetMapping("/partybuildIng/usercertification")
+ R userCertification(@RequestParam("id") Long id,@RequestParam("communityId")Long communityId);
+
+ /**
+ * 查询待认证党员信息
+ *
+ * @param pagePartyBuildingMemberVO
+ * 查询参数
+ * @return 查询结果
+ */
+ @PostMapping("/partybuildIng/pageusercertification")
+ R pagePrePartybuildingmember(@RequestBody PagePartyBuildingMemberVO pagePartyBuildingMemberVO);
+
+ /**
+ * 根据身份证号码查询党员信息
+ *
+ * @param idCard
+ * 身份证号码
+ * @return 党员信息
+ */
+ @PostMapping("/partybuildIng/getPartyBuildingByIdCard")
+ R getPartyBuildingByIdCard(@RequestParam("idCard") String idCard);
+
+ /**
+ * 社区所有启用的党组织列表
+ *
+ * @return 党组织集合
+ */
+ @PostMapping("/partybuildIng/listpartyorganizationByApp")
+ R listPartyOrganizationByApp(@RequestBody ComListPartyDTO comListPartyDTO);
+
+ /**
+ * 根据id删除党员认证
+ *
+ * @param id
+ * 党员认证id
+ * @return 党员认证id
+ */
+ @PostMapping("/partybuildIng/deleteprepartybuildingmember")
+ R deleteprepartybuildingmember(@RequestParam("id") Long id);
+
+ /**
+ * 导出党员信息
+ *
+ * @param organizationVO
+ * 请求参数
+ * @return 党员信息列表
+ */
+ @PostMapping("/partybuildIng/exportPbMember")
+ R exportPbMember(@RequestBody PagePartyOrganizationVO organizationVO);
+
+ /**
+ * 选择人员
+ *
+ * @param param
+ * 查询条件
+ * @param communityId
+ * 社区id
+ * @return 查询结果
+ */
+ @PostMapping("/partybuildIng/getTotlePerson")
+ R getTotlePerson(@RequestParam(value = "param", required = false) String param,
+ @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 根据党员活动id查询活动下报名人员
+ *
+ * @param activityId
+ * 党员活动id
+ * @return 活动下报名人员
+ */
+ @PostMapping("/partybuildIng/getTaskPbActivityPeopleList")
+ R getTaskPbActivityPeopleList(@RequestParam("activityId") Long activityId);
+
+ /**
+ * 分页查询党员数据统计
+ * @param statisticsMemberDto 请求参数
+ * @return 党员数据统计
+ */
+ @PostMapping("/partybuildIng/pageDataStatisticsMember")
+ R pageDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto);
+
+ /**
+ * 根据组织id查询组织下统计数据
+ * @param statisticsOrgDto 请求参数
+ * @return 组织下统计数据
+ */
+ @PostMapping("/partybuildIng/getOrgDataStatistics")
+ R getOrgDataStatistics(@RequestBody ComDataStatisticsOrgDto statisticsOrgDto);
+
+ /**
+ * 查询党组织表头统计数据
+ * @param communityId
+ * 社区id
+ * @return 党组织表头统计数据
+ */
+ @GetMapping("/partybuildIng/getHeaderOrgDataStatistics")
+ R getHeaderOrgDataStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 党员数据统计-党员导出数据查询
+ * @param statisticsMemberDto 请求参数
+ * @return 党员导出数据
+ */
+ @PostMapping("/partybuildIng/exportDataStatisticsMember")
+ R exportDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto);
+
+ /**
+ * 党委导入接口
+ * @param memberRoleExcelVoList 数据列表
+ * @param communityId 社区id
+ * @param userId 用户id
+ * @return 导入结果
+ */
+ @PostMapping("/partybuildIng/importPbMemberRole")
+ R importPbMemberRole(@RequestBody List<ComPbMemberRoleExcelVo> memberRoleExcelVoList,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId);
+
+ /**
+ * 身份证查询是否党员
+ * @param idCard
+ * @return
+ */
+ @GetMapping("/partybuildIng/checkMember")
+ R checkMember(@RequestParam("idCard")String idCard);
+
+ /**
+ * 小程序分页查询党员列表
+ * @param partyBuildingMemberVO 请求参数
+ * @return 党员列表
+ */
+ @PostMapping("/partybuildIng/getPagePbMember")
+ R getPagePbMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO);
+
+
+ @PostMapping("/partybuildIng/getProject")
+ public R getProjectList(@RequestBody ProjectVO projectVO);
+
+ @PostMapping("/partybuildIng/addProject")
+ public R addProject(@RequestBody ProjectVO projectVO);
+
+ @PostMapping("/partybuildIng/updateProject")
+ public R updateProject(@RequestBody ProjectVO projectVO);
+
+ @PostMapping("/partybuildIng/deleteProject")
+ public R deleteProject(@RequestBody ProjectVO projectVO);
+
+ @GetMapping("/partybuildIng/getPartyMember")
+ public R getPartyMember(@RequestParam("phone")String phone,@RequestParam("type")Integer type);
+
+ @GetMapping("/partybuildIng/memberDetail")
+ public R memberDetail(@RequestParam("id")Long id);
+
+ @GetMapping("/comPbCheckUnit/detailByPhone")
+ public R detailByPhone(@RequestParam("phone") String phone);
+
+ /**
+ * 分页查询注册党员列表
+ * @param pageMemberForInviteDTO
+ * @return
+ */
+ @PostMapping("/partybuildIng/page/registerMember")
+ R pageRegisterMember(@RequestBody PageMemberForInviteDTO pageMemberForInviteDTO);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingWestService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingWestService.java
new file mode 100644
index 0000000..5100235
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingWestService.java
@@ -0,0 +1,605 @@
+package com.panzhihua.common.service.partybuilding;
+
+import java.util.List;
+
+import com.panzhihua.common.model.vos.partybuilding.*;
+import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.panzhihua.common.model.dtos.partybuilding.*;
+import com.panzhihua.common.model.vos.R;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 党建
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-30 09:50
+ **/
+@FeignClient(value = "huacheng-partybuilding", contextId = "partybuilding1")
+public interface PartyBuildingWestService {
+ /**
+ * 新增党员
+ *
+ * @param partyBuildingMemberVO
+ * 党员基本信息
+ * @return 新增结果
+ */
+ @PostMapping("/partybuildIngWest/addpartybuildingmember")
+ R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO);
+
+ /**
+ * 社区所有启用的党组织列表
+ *
+ * @return 党组织集合
+ */
+ @PostMapping("/partybuildIngWest/listpartyorganization")
+ R listPartyOrganization(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询所有的党组织列表
+ *
+ * @return 党组织集合
+ */
+ @PostMapping("/partybuildIngWest/listpartyorganizationAll")
+ R listPartyOrganizationAll(@RequestBody PartyOrganizationVO partyOrganizationVO);
+
+ /**
+ * 查询所有党组织列表
+ * @param partyOrganizationVO 请求参数
+ * @return 党组织列表
+ */
+ @PostMapping("/partybuildIngWest/getPbOrgAllList")
+ R getPbOrgAllList(@RequestBody PartyOrganizationVO partyOrganizationVO);
+
+ /**
+ * 新增党支部
+ *
+ * @param partyOrganizationVO
+ * 党支部基本信息
+ * @return 新增结果
+ */
+ @PostMapping("/partybuildIngWest/addpartyorganization")
+ R addPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
+
+ /**
+ * 编辑党支部
+ *
+ * @param partyOrganizationVO
+ * 党支部基本信息
+ * @return 编辑结果
+ */
+ @PostMapping("/partybuildIngWest/updatepartyorganization")
+ R updatePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
+
+ /**
+ * 启用，禁用党支部
+ *
+ * @param partyOrganizationVO
+ * 党支部基本信息
+ * @return 编辑结果
+ */
+ @PostMapping("/partybuildIngWest/resetpartyorganization")
+ R resetPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
+
+ /**
+ * 删除党支部
+ *
+ * @param partyOrganizationVO
+ * 党支部基本信息
+ * @return 删除结果
+ */
+ @PostMapping("/partybuildIngWest/deletepartyorganization")
+ R deletePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
+
+ /**
+ * 批量新增党员
+ *
+ * @param list
+ * 党员集合
+ */
+ @PostMapping("/partybuildIngWest/listsavepartybuildingmemberexcelvo")
+ R listSavePartyBuildingMemberExcelVO(@RequestBody List<PartyBuildingMemberExcelVO> list);
+
+ /**
+ * 分页查询党员信息
+ *
+ * @param pagePartyOrganizationVO
+ * 查询信息
+ * @return 分页数据
+ */
+ @PostMapping("/partybuildIngWest/pagepartyorganization")
+ R pagePartyOrganization(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO);
+
+ /**
+ * 导出党员信息
+ *
+ * @param pagePartyOrganizationVO
+ * 查询信息
+ * @return 分页数据
+ */
+ @PostMapping("/partybuildIngWest/exportPartyMember")
+ R exportPartyMember(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO);
+
+ /**
+ * 党员活动
+ *
+ * @param partyBuildingActivityVO
+ * 党员活动查询参数
+ * @return 参加的所有活动
+ */
+ @PostMapping("/partybuildIngWest/listpartymemberactivities")
+ R listPartyMemberActivities(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO);
+
+ /**
+ * 活动报名名单分页查询
+ *
+ * @param pageActivityMembersVO
+ * 查询参数 手机号 名字
+ * @return 分页数据
+ */
+ @PostMapping("/partybuildIngWest/pageactivitymembers")
+ R pageActivityMembers(@RequestBody PageActivityMembersVO pageActivityMembersVO);
+
+ /**
+ * 编辑党员信息 新增字段均可编辑
+ *
+ * @param partyBuildingMemberVO
+ * 编辑字段
+ * @return 编辑结果
+ */
+ @PostMapping("/partybuildIngWest/updatepartybuildingmember")
+ R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO);
+
+ /**
+ * 党员活动详情
+ *
+ * @param id
+ * 活动id
+ * @return 活动详情内容
+ */
+ @PostMapping("/partybuildIngWest/activityinfo")
+ R activityinfo(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+ /**
+ * 查询指定社区的所有党员
+ *
+ * @param communityId
+ * 社区id
+ * @return 党员列表
+ */
+ @PostMapping("/partybuildIngWest/listPartyMember")
+ R listPartyMember(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 社区下拉选择身份
+ *
+ * @return 身份集合
+ */
+ @PostMapping("/partybuildIngWest/listidentity")
+ R listIdentity();
+
+ /**
+ * 新增党委
+ *
+ * @param partyCommitteeVO
+ * 新增信息
+ * @return 新增结果
+ */
+ @PostMapping("/partybuildIngWest/addpartycommittee")
+ R addPartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);
+
+ /**
+ * 编辑党委
+ *
+ * @param partyCommitteeVO
+ * 编辑信息
+ * @return 编辑结果
+ */
+ @PostMapping("/partybuildIngWest/updatepartycommittee")
+ R updatePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);
+
+ /**
+ * 删除党委
+ *
+ * @param partyCommitteeVO
+ * 删除id
+ * @return 删除结果
+ */
+ @PostMapping("/partybuildIngWest/deletepartycommittee")
+ R deletePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);
+
+ /**
+ * 分页社区党委查询
+ *
+ * @param partyCommitteeVO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/partybuildIngWest/pagepartycommittee")
+ R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);
+
+ /**
+ * 新建党建动态
+ *
+ * @param partyCommitteeVO
+ * 动态内容
+ * @return 新增结果
+ */
+ @PostMapping("/partybuildIngWest/adddynamic")
+ R adddYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO);
+
+ /**
+ * 编辑动态
+ *
+ * @param partyCommitteeVO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("/partybuildIngWest/updatedynamic")
+ R updateYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO);
+
+ /**
+ * 动态详情
+ *
+ * @param id
+ * 动态主键
+ * @return 详情
+ */
+ @PostMapping("/partybuildIngWest/infodynamic")
+ R infoYnamic(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询党员动态/政策文件
+ *
+ * @param partyBuildingComPbDynVO
+ * 查询参数
+ * @return 分页数据
+ */
+ @PostMapping("/partybuildIngWest/pagedynamic")
+ R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO);
+
+ /**
+ * 删除动态
+ *
+ * @param id
+ * 动态主键
+ * @return 删除结果
+ */
+ @PostMapping("/partybuildIngWest/deletedynamic")
+ R deleteYnamic(@RequestParam("id") Long id);
+
+ /**
+ * 新增党员活动
+ *
+ * @param partyBuildingActivityVO
+ * 参数
+ * @return 新增结果
+ */
+ @PostMapping("/partybuildIngWest/addactivity")
+ R addactivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO);
+
+ /**
+ * 编辑党员活动
+ *
+ * @param partyBuildingActivityVO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("/partybuildIngWest/updateactivity")
+ R updateActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO);
+
+ /**
+ * 发布党员活动
+ *
+ * @param id
+ * 主键id
+ * @return 发布结果
+ */
+ @PostMapping("/partybuildIngWest/releaseactivity")
+ R releaseActivity(@RequestParam("id") Long id);
+
+ /**
+ * 删除党员活动
+ *
+ * @param id
+ * 主键id
+ * @return 删除结果
+ */
+ @PostMapping("/partybuildIngWest/deleteactivity")
+ R deleteActivity(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询党员活动
+ *
+ * @param partyBuildingActivityVO
+ * 查询条件
+ * @return 查询结果
+ */
+ @PostMapping("/partybuildIngWest/pageactivity")
+ R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO);
+
+ /**
+ * 增加阅读记录
+ *
+ * @param comPbDynUserVO
+ * 记录内容
+ * @return 增加结果
+ */
+ @PostMapping("/partybuildIngWest/adddynuser")
+ R addDynUser(@RequestBody ComPbDynUserVO comPbDynUserVO);
+
+ /**
+ * 删除党员
+ *
+ * @param id
+ * 党员主键
+ * @return 删除结果
+ */
+ @PostMapping("/partybuildIngWest/deletepartybuildingmember")
+ R deleteDynUser(@RequestParam("id") Long id);
+
+ /**
+ * 取消活动
+ *
+ * @param partyBuildingActivityVO
+ * 取消原因
+ * @return 操作结果
+ */
+ @PostMapping("/partybuildIngWest/cancelactivity")
+ R cancelActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO);
+
+ /**
+ * 用户的所有党建活动
+ *
+ * @param userId
+ * 用户id
+ * @param communityId
+ * 社区id 同一用户在不同社区都是党员
+ * @param status
+ * @return 党建活动列表
+ */
+ @PostMapping("/partybuildIngWest/listactivity")
+ R listActivity(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId,
+ @RequestParam(value = "status", required = false) Integer status);
+
+ /**
+ * 党员活动人员参入列表
+ *
+ * @param id
+ * 活动id
+ * @return 党员集合
+ */
+ @PostMapping("/partybuildIngWest/listpartybuildingmember")
+ R listPartyBuildingMember(@RequestParam("id") Long id);
+
+ /**
+ * 报名、取消报名党员活动
+ *
+ * @param activitySignUpDTO
+ * 操作参数
+ * @return 操作结果
+ */
+ @PostMapping("/partybuildIngWest/putactivitysignup")
+ R putActivitySignUp(@RequestBody ActivitySignUpDTO activitySignUpDTO);
+
+ /**
+ * 获取党建活动所有参入人员的id集合
+ *
+ * @param id
+ * 党建活动id
+ * @return 人员id集合
+ */
+ @PostMapping("/partybuildIngWest/selectallpartybuildingactivitymembers")
+ R selectAllPartyBuildingActivityMembers(@RequestParam("id") Long id);
+
+ /**
+ * 定时任务刷新党建动态发布状态
+ *
+ * @return 刷新数据数量
+ */
+ @PostMapping("/partybuildIngWest/timedtaskpartybuildingstatus")
+ R timedTaskPartyBuildingStatus();
+
+ /**
+ * 定时任务取消党建活动
+ *
+ * @return 需要取消的所有党建活动
+ */
+ @PostMapping("/partybuildIngWest/timedtaskpartybuildingactivity")
+ R timedTaskPartyBuildingActivity();
+
+ /**
+ * 定时任务刷新党建活动的各个状态 除取消外
+ *
+ * @return 修改结果
+ */
+ @PostMapping("/partybuildIngWest/timedtaskpartybuildingactivityall")
+ R timedTaskPartyBuildingActivityAll();
+
+ /**
+ * 新增服务团队人员
+ *
+ * @param comPbServiceTeamDTO
+ * 新增内容
+ * @return 新增结果
+ */
+ @PostMapping("/partybuildIngWest/addserviceteam")
+ R addServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO);
+
+ /**
+ * 编辑团队人员
+ *
+ * @param comPbServiceTeamDTO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("/partybuildIngWest/putserviceteam")
+ R putServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO);
+
+ /**
+ * 删除服务团队人员
+ *
+ * @param comPbServiceTeamDTO
+ * 删除主键
+ * @return 删除结果
+ */
+ @PostMapping("/partybuildIngWest/deleteserviceteam")
+ R deleteServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO);
+
+ /**
+ * 分页查询服务团队成员
+ *
+ * @param pageComPbServiceTeamDTO
+ * 查询参数
+ * @return 查询结果
+ */
+ @PostMapping("/partybuildIngWest/pageserviceteam")
+ R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO);
+
+ /**
+ * 创建党员活动 小程序创建党员活动
+ *
+ * @param comPbActivityDTO
+ * 创建内容
+ * @return 创建结果
+ */
+ @PostMapping("/partybuildIngWest/addactivityinfo")
+ R addActivityApplets(@RequestBody ComPbActivityDTO comPbActivityDTO);
+
+ /**
+ * 查询用户党员认证信息
+ *
+ * @param id
+ * @param communityId
+ * 用户ID
+ * @return 查询结果
+ */
+ @GetMapping("/partybuildIngWest/usercertification")
+ R userCertification(@RequestParam("id") Long id,@RequestParam("communityId")Long communityId);
+
+ /**
+ * 查询待认证党员信息
+ *
+ * @param pagePartyBuildingMemberVO
+ * 查询参数
+ * @return 查询结果
+ */
+ @PostMapping("/partybuildIngWest/pageusercertification")
+ R pagePrePartybuildingmember(@RequestBody PagePartyBuildingMemberVO pagePartyBuildingMemberVO);
+
+ /**
+ * 根据身份证号码查询党员信息
+ *
+ * @param idCard
+ * 身份证号码
+ * @return 党员信息
+ */
+ @PostMapping("/partybuildIngWest/getPartyBuildingByIdCard")
+ R getPartyBuildingByIdCard(@RequestParam("idCard") String idCard);
+
+ /**
+ * 社区所有启用的党组织列表
+ *
+ * @return 党组织集合
+ */
+ @PostMapping("/partybuildIngWest/listpartyorganizationByApp")
+ R listPartyOrganizationByApp(@RequestBody ComListPartyDTO comListPartyDTO);
+
+ /**
+ * 根据id删除党员认证
+ *
+ * @param id
+ * 党员认证id
+ * @return 党员认证id
+ */
+ @PostMapping("/partybuildIngWest/deleteprepartybuildingmember")
+ R deleteprepartybuildingmember(@RequestParam("id") Long id);
+
+ /**
+ * 导出党员信息
+ *
+ * @param organizationVO
+ * 请求参数
+ * @return 党员信息列表
+ */
+ @PostMapping("/partybuildIngWest/exportPbMember")
+ R exportPbMember(@RequestBody PagePartyOrganizationVO organizationVO);
+
+ /**
+ * 选择人员
+ *
+ * @param param
+ * 查询条件
+ * @param communityId
+ * 社区id
+ * @return 查询结果
+ */
+ @PostMapping("/partybuildIngWest/getTotlePerson")
+ R getTotlePerson(@RequestParam(value = "param", required = false) String param,
+ @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 根据党员活动id查询活动下报名人员
+ *
+ * @param activityId
+ * 党员活动id
+ * @return 活动下报名人员
+ */
+ @PostMapping("/partybuildIngWest/getTaskPbActivityPeopleList")
+ R getTaskPbActivityPeopleList(@RequestParam("activityId") Long activityId);
+
+ /**
+ * 分页查询党员数据统计
+ * @param statisticsMemberDto 请求参数
+ * @return 党员数据统计
+ */
+ @PostMapping("/partybuildIngWest/pageDataStatisticsMember")
+ R pageDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto);
+
+ /**
+ * 根据组织id查询组织下统计数据
+ * @param statisticsOrgDto 请求参数
+ * @return 组织下统计数据
+ */
+ @PostMapping("/partybuildIngWest/getOrgDataStatistics")
+ R getOrgDataStatistics(@RequestBody ComDataStatisticsOrgDto statisticsOrgDto);
+
+ /**
+ * 查询党组织表头统计数据
+ * @param communityId
+ * 社区id
+ * @return 党组织表头统计数据
+ */
+ @GetMapping("/partybuildIngWest/getHeaderOrgDataStatistics")
+ R getHeaderOrgDataStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 党员数据统计-党员导出数据查询
+ * @param statisticsMemberDto 请求参数
+ * @return 党员导出数据
+ */
+ @PostMapping("/partybuildIngWest/exportDataStatisticsMember")
+ R exportDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto);
+
+ /**
+ * 党委导入接口
+ * @param memberRoleExcelVoList 数据列表
+ * @param communityId 社区id
+ * @param userId 用户id
+ * @return 导入结果
+ */
+ @PostMapping("/partybuildIngWest/importPbMemberRole")
+ R importPbMemberRole(@RequestBody List<ComPbMemberRoleExcelVo> memberRoleExcelVoList,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId);
+
+ /**
+ * 身份证查询是否党员
+ * @param idCard
+ * @return
+ */
+ @GetMapping("/partybuildIngWest/checkMember")
+ R checkMember(@RequestParam("idCard")String idCard);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java
new file mode 100644
index 0000000..2c46c6d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java
@@ -0,0 +1,225 @@
+package com.panzhihua.common.service.property;
+
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.property.*;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.Serializable;
+
+/**
+ * 物业接口
+ */
+@FeignClient(name = "huacheng-property")
+public interface PropertyService {
+ /**
+ * 分页查询所有数据
+ * @return 所有数据
+ */
+ @PostMapping("/comPropertyRepair/queryAll")
+ R comPropertyRepairSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 分页查询所有数据 脱敏
+ * @return 所有数据
+ */
+ @PostMapping("/comPropertyRepair/queryAllDesensitize")
+ R comPropertyRepairSelectAllDesensitize(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comPropertyRepair/{id}")
+ R comPropertyRepairSelectOne(@PathVariable("id") Long id);
+
+ /**
+ * 通过主键查询单条数据 脱敏
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comPropertyRepair/desensitize/{id}")
+ R comPropertyRepairSelectOneDesensitize(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comPropertyRepair 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comPropertyRepair")
+ R comPropertyRepairInsert(@RequestBody ComPropertyRepairVO comPropertyRepair);
+
+ /**
+ * 修改数据
+ *
+ * @param comPropertyRepair 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comPropertyRepair/update")
+ R comPropertyRepairUpdate(@RequestBody ComPropertyRepairVO comPropertyRepair);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comPropertyRepair/del")
+ R comPropertyRepairDelete(@RequestParam("id") Long id);
+
+ /**
+ * 查询报警列表
+ * @param commonPage
+ * @return
+ */
+ @PostMapping("/comPropertyAlarm/queryAll")
+ R comPropertyAlarmSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comPropertyAlarm/{id}")
+ R comPropertyAlarmSelectOne(@PathVariable("id") Integer id);
+
+ /**
+ * 新增数据
+ *
+ * @param comPropertyAlarm 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comPropertyAlarm")
+ R comPropertyAlarmInsert(@RequestBody ComPropertyAlarmVO comPropertyAlarm);
+
+ /**
+ * 修改数据
+ *
+ * @param comPropertyAlarm 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comPropertyAlarm/update")
+ R comPropertyAlarmUpdate(@RequestBody ComPropertyAlarmVO comPropertyAlarm);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comPropertyAlarm/del")
+ R comPropertyAlarmDelete(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comPropertyEquipment/queryAll")
+ R comPropertyEquipmentSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comPropertyEquipment/{id}")
+ R comPropertyEquipmentSelectOne(@PathVariable("id") Integer id);
+
+ /**
+ * 新增数据
+ *
+ * @param comPropertyEquipment 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comPropertyEquipment")
+ R comPropertyEquipmentInsert(@RequestBody ComPropertyEquipmentVO comPropertyEquipment);
+
+ /**
+ * 修改数据
+ *
+ * @param comPropertyEquipment 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comPropertyEquipment/update")
+ R comPropertyEquipmentUpdate(@RequestBody ComPropertyEquipmentVO comPropertyEquipment);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comPropertyEquipment/del")
+ R comPropertyEquipmentDelete(@RequestParam("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comPropertyAlarmSettingVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comPropertyAlarmSetting")
+ R comPropertyAlarmSettingInsert(@RequestBody ComPropertyAlarmSettingVO comPropertyAlarmSettingVO);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param communityId 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comPropertyAlarmSetting")
+ R comPropertyAlarmSettingSelectOne(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comPropertyHelp/queryAll")
+ R comPropertyHelpSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comPropertyHelp/{id}")
+ R comPropertyHelpSelectOne(@PathVariable("id") Serializable id);
+
+ /**
+ * 新增数据
+ *
+ * @param comPropertyHelp 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comPropertyHelp")
+ R comPropertyHelpInsert(@RequestBody ComPropertyHelpVO comPropertyHelp);
+
+ /**
+ * 修改数据
+ *
+ * @param comPropertyHelp 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comPropertyHelp/update")
+ R comPropertyHelpUpdate(@RequestBody ComPropertyHelpVO comPropertyHelp);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comPropertyHelp/del")
+ R comPropertyHelpDelete(@RequestParam("id") Long id);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
new file mode 100644
index 0000000..ee3fca6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -0,0 +1,1339 @@
+package com.panzhihua.common.service.user;
+
+import java.util.List;
+
+import com.panzhihua.common.model.dtos.DataKanBansDto;
+import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
+import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.model.dtos.PageDTO;
+import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
+import com.panzhihua.common.model.dtos.community.ExportUserDTO;
+import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
+import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.dtos.user.*;
+import com.panzhihua.common.model.vos.*;
+import com.panzhihua.common.model.vos.shop.ShopStoreVO;
+import com.panzhihua.common.model.vos.user.*;
+
+import javax.validation.Valid;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: feign-userservice
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 08:58
+ **/
+@FeignClient(name = "huacheng-user")
+public interface UserService {
+
+ /**
+ * 新增微信用户
+ *
+ * @param openid
+ * 微信小程序标志
+ * @param sessionKey
+ * 会话密钥
+ * @param unionid
+ * 微信平台唯一ID
+ * @return 新增结果
+ */
+ @PostMapping("/addOrUpdate")
+ R addOrUpdate(@RequestParam("openid") String openid, @RequestParam("sessionKey") String sessionKey,
+ @RequestParam("unionid") String unionid,@RequestParam("appId")String appId);
+
+ /**
+ * 维护小程序用户基本信息 头像 昵称 性别
+ *
+ * @param userId
+ * 数据库用户ID
+ * @param nickName
+ * 昵称
+ * @param gender
+ * 性别
+ * @param avatarUrl
+ * 头像
+ * @return 维护结果
+ */
+ @PostMapping("/updateUserWeiXinInfo")
+ R updateUserWeiXinInfo(@RequestParam("userId") Long userId, @RequestParam("nickName") String nickName,
+ @RequestParam("gender") int gender, @RequestParam("avatarUrl") String avatarUrl);
+
+ /**
+ * 维护微信用户手机号
+ *
+ * @param userId
+ * 数据库ID
+ * @param purePhoneNumber
+ * 没有区号的手机号
+ * @return 维护结果
+ */
+ @PostMapping("/updateUserWeiXinPhone")
+ R updateUserWeiXinPhone(@RequestParam("userId") Long userId,
+ @RequestParam("purePhoneNumber") String purePhoneNumber);
+
+ /**
+ * 获取平台用户
+ *
+ * @param userId
+ * 用户ID
+ * @return 平台用户信息
+ */
+ @PostMapping("/getUserInfoUserId")
+ R<LoginUserInfoVO> getUserInfoByUserId(@RequestParam("userId") String userId);
+
+ /**
+ * 获取平台用户
+ *
+ * @param userName
+ * 登录账户+_type
+ * @return 平台用户信息
+ */
+ @PostMapping(value = "/getUserInfo")
+ R<LoginUserInfoVO> getUserInfo(@RequestParam("userName") String userName);
+
+ /**
+ * 获取平台所有权限路径url
+ *
+ * @return 所有url
+ */
+ @PostMapping("/role/getAllMenu")
+ R<List<MenuVO>> getAllMenu();
+
+ /**
+ *
+ * @param username
+ * 用户的ID
+ * @return 用户所有角色
+ */
+ @PostMapping("/role/getUserRoles")
+ R<List<String>> getUserRoles(@RequestParam("username") String username);
+
+ /**
+ * 查询社区的党委角色
+ *
+ * @param communityId
+ * 社区id
+ * @return 党委角色列表
+ */
+ @PostMapping("/role/listidentity")
+ R listIdentity(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 修改用户登录密码
+ *
+ * @param changePasswordVO
+ * 新密码
+ * @return 修改结果
+ */
+ @PostMapping("changepassword")
+ R changePassword(@RequestBody ChangePasswordVO changePasswordVO);
+
+ /**
+ * 重置密码用户登录密码默认admin123456
+ *
+ * @param userId
+ * 新密码
+ * @return 修改结果
+ */
+ @GetMapping("resetPassword")
+ R resetPassword(@RequestParam("userId") Long userId);
+
+ @GetMapping("/resetPasswordAccount")
+ R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId);
+
+ /**
+ * 批量重置密码用户登录密码默认admin123456
+ *
+ * @param userIds
+ * 新密码
+ * @return 修改结果
+ */
+ @GetMapping("resetPasswordPatch")
+ R resetPasswordPatch(@RequestParam("userIds") Long[] userIds,@RequestParam("password") String password);
+
+ /**
+ * 某社区后台人员查询
+ *
+ * @param param
+ * 名字
+ * @param communityId
+ * 社区id
+ * @return 人员集合
+ */
+ @PostMapping("listactivitymanager")
+ R listActivityManager(@RequestParam("param") String param, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 微心愿搜索社区团队人员列表
+ *
+ * @param param
+ * 请求参数
+ * @param communityId
+ * 社区id
+ * @return 社区团队人员列表
+ */
+ @PostMapping("listactivitymanager2")
+ R listActivityManager2(@RequestParam("param") String param, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询人脸识别
+ *
+ * @param loginUserInfoVO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("pageuserface")
+ R pageUserFace(@RequestBody LoginUserInfoVO loginUserInfoVO);
+
+ /**
+ * 编辑人脸采集数据通过、驳回、删除
+ *
+ * @param loginUserInfoVO
+ * 操作信息
+ * @return 操作结果
+ */
+ @PostMapping("putuserface")
+ R putUserFace(@RequestBody LoginUserInfoVO loginUserInfoVO);
+
+ /**
+ * 分页查询人口管理
+ *
+ * @param userInfoVO
+ * 查询参数
+ * @return 分页数据
+ */
+ @PostMapping("pageuser")
+ R pageUser(@RequestBody AppletUserInfoVO userInfoVO);
+
+ /**
+ * 查询所有人员标签
+ *
+ * @return 标签集合
+ */
+ @PostMapping("listtag")
+ R listTag();
+
+ /**
+ * 人员详情
+ *
+ * @param userId
+ * 用户id
+ * @return 人员详情
+ */
+ @PostMapping("detailuser")
+ R<LoginUserInfoVO> detailUser(@RequestParam("userId") Long userId);
+
+ /**
+ * 设置用户标签
+ *
+ * @param loginUserInfoVO
+ * 标签信息
+ * @return 设置结果
+ */
+ @PostMapping("putusertag")
+ R putUserTag(@RequestBody LoginUserInfoVO loginUserInfoVO);
+
+ /**
+ * 修改用户志愿者状态
+ *
+ * @param phone
+ * 志愿者手机号
+ * @param type
+ * 1 支援者 0不是志愿者
+ */
+ @PostMapping("putuserisvolunteer")
+ R putUserIsVolunteer(@RequestParam("phone") String phone, @RequestParam("type") int type);
+
+ /**
+ * 修改用户志愿者状态
+ *
+ * @param userId
+ * 用户ID
+ * @param type
+ * 1 支援者 0不是志愿者
+ */
+ @PostMapping("putuserisvolunteerbyid")
+ R putUserIsVolunteerById(@RequestParam("userId") Long userId, @RequestParam("type") int type);
+
+ /**
+ * 用户绑定社区、小区
+ *
+ * @param loginUserInfoVO
+ * 社区小区数据
+ * @return 绑定结果
+ */
+ @PostMapping("putusercommunityarea")
+ R putUserCommunityArea(@RequestBody LoginUserInfoVO loginUserInfoVO);
+
+ /**
+ * 用户实名认证
+ *
+ * @param loginUserInfoVO
+ * 认证数据
+ * @return 认证结果
+ */
+ @PostMapping("putuserauthentication")
+ R putUserAuthentication(@RequestBody LoginUserInfoVO loginUserInfoVO);
+
+ /**
+ * 修改用户手机号
+ *
+ * @param userPhoneVO
+ * 手机号信息
+ * @return 修改结果
+ */
+ @PostMapping("putuserphone")
+ R putUserphone(@RequestBody UserPhoneVO userPhoneVO);
+
+ /**
+ * 修改用户信息
+ *
+ * @param loginUserInfoVO
+ * 修改内容
+ * @return 修改结果
+ */
+ @PostMapping("putuser")
+ R putUser(@RequestBody LoginUserInfoVO loginUserInfoVO);
+
+ /**
+ * 家庭成员列表
+ *
+ * @param userId
+ * 登录用户
+ * @return 成员集合
+ */
+ @PostMapping("listfamily")
+ R listFamily(@RequestParam("userId") Long userId, @RequestParam(value = "pageNum") Long pageNum,
+ @RequestParam("pageSize") Long pageSize);
+
+ /**
+ * 新增家庭成员
+ *
+ * @param comMngFamilyInfoVO
+ * 家庭成员基本信息
+ * @return 增加结果
+ */
+ @PostMapping("addFamily")
+ R addFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO);
+
+ /**
+ * 编辑家庭成员
+ *
+ * @param comMngFamilyInfoVO
+ * 家庭成员信息
+ * @return 编辑结果
+ */
+ @PostMapping("putfamily")
+ R putFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO);
+
+ /**
+ * 新增运营、社区后台账户
+ *
+ * @param administratorsUserVO
+ * 账户信息
+ * @return 新增结果
+ */
+ @PostMapping("adduserbackstage")
+ R addUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO);
+
+ /**
+ * 新增社区后台物业，社会组织，业主委员会账户
+ *
+ * @param administratorsUserVO
+ * 账户信息
+ * @return 新增结果
+ */
+ @PostMapping("adduserbackstageproperty")
+ R addUserBackstageProperty(@RequestBody AdministratorsUserVO administratorsUserVO);
+
+
+ /**
+ * 更新
+ *
+ * @param administratorsUserVO
+ * 编辑账户内容
+ * @return 编辑结果
+ */
+ @PostMapping("updateStreet")
+ R updateStreet(@RequestBody AdministratorsUserVO administratorsUserVO);
+
+ /**
+ * 编辑运营、社区后台账户
+ *
+ * @param administratorsUserVO
+ * 编辑账户内容
+ * @return 编辑结果
+ */
+ @PostMapping("putuserbackstage")
+ R putUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO);
+
+ /**
+ * 删除后台用户
+ *
+ * @param administratorsUserVO
+ * 用户主键
+ * @return 删除结果
+ */
+ @PostMapping("deleteuserbackstage")
+ R deleteUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO);
+
+ /**
+ * 角色下拉列表
+ *
+ * @param communityId
+ * 对应社区 0 表示运营后台
+ * @return 角色集合
+ */
+ @PostMapping("/role/listrolebackstage")
+ R listRoleBackstage(@RequestParam("communityId") Long communityId,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize,@RequestParam("areaCode")String areaCode);
+
+ /**
+ * 分页查询后台用户
+ *
+ * @param administratorsUserVO
+ * 查询参数
+ * @return 后台用户
+ */
+ @PostMapping("pageuserbackstage")
+ R pageUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO);
+
+ /**
+ * 新增角色
+ *
+ * @param roleVO
+ * 角色信息
+ * @return 新增结果
+ */
+ @PostMapping("/role/addrolebackstage")
+ R addRoleBackstage(@RequestBody RoleVO roleVO);
+
+ /**
+ * 删除角色
+ *
+ * @param roleVO
+ * 角色主键
+ * @return 删除结果
+ */
+ @PostMapping("/role/deleterolebackstage")
+ R deleteRoleBackstage(@RequestBody RoleVO roleVO);
+
+ /**
+ * 平台菜单列表
+ *
+ * @param communityId
+ * 社区id 0 运营平台
+ * @return 菜单集合
+ */
+ @PostMapping("/role/listmenubackstage")
+ R listMenuBackstage(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 设置角色的权限
+ *
+ * @param menuRoleVO
+ * 用户设置的权限id
+ * @return 设置结果
+ */
+ @PostMapping("/role/putmenurole")
+ R putMenuRole(@RequestBody MenuRoleVO menuRoleVO);
+
+ /**
+ * 保存操作日志
+ *
+ * @param operlog
+ * 日志内容
+ * @return 保存结果
+ */
+ @PostMapping("addoperlog")
+ R addOperLog(@RequestBody SysOperLogVO operlog);
+
+ /**
+ * 分页展示操作日志
+ *
+ * @param sysOperLogVO
+ * 分页参数
+ * @return 分页集合
+ */
+ @PostMapping("pageoperlog")
+ R pageOperLog(@RequestBody SysOperLogVO sysOperLogVO);
+
+ /**
+ * 用户协议
+ *
+ * @return 协议集合
+ */
+ @PostMapping("listagreement")
+ R listAgreement(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 编辑用户协议
+ *
+ * @param sysUserAgreementVO
+ * 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("putagreement")
+ R putAgreement(@RequestBody SysUserAgreementVO sysUserAgreementVO);
+
+ /**
+ * 用户标签
+ *
+ * @param communityId
+ * 社区id
+ * @return 标签集合
+ */
+ @PostMapping("listcommngusertag")
+ R listComMngUserTag(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 新增删除用户标签
+ *
+ * @param systemmanagementConfigVO
+ * 操作内容
+ * @return 操作结果
+ */
+ @PostMapping("putcommngusertag")
+ R putComMngUserTag(@RequestBody SystemmanagementConfigVO systemmanagementConfigVO);
+
+ /**
+ * 分页查询小程序用户
+ *
+ * @param pageUserAppletsBackstageDTO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("pageuserappletsbackstage")
+ R pageUserAppletsBackstage(@RequestBody PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO);
+
+ /**
+ * 编辑用户状态
+ *
+ * @param pageUserAppletsBackstageDTO
+ * 启用或者禁用 1 启用 2 禁用
+ * @return 编辑结果
+ */
+ @PostMapping("putuserappletsbackstage")
+ R putUserAppletsBackstage(@RequestBody PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO);
+
+ /**
+ * 调试接口--清除昵称、社区、小区
+ *
+ * @param userId
+ * 登录用户id
+ * @return 清除结果
+ */
+ @PostMapping("deleteusertest")
+ R deleteUserTest(@RequestParam("userId") Long userId);
+
+ /**
+ * 用户协议和隐私政策
+ *
+ * @param type
+ * 所属app 1居民端app 2网格员端app 3商家端app
+ * @return 协议内容
+ */
+ @PostMapping("useragreement")
+ R userAgreement(@RequestParam("type") int type,@RequestParam("appid")String appId);
+
+ /**
+ * uu洗车登录
+ * @param uuLoginVO
+ * @return
+ */
+ @PostMapping("uuLogin")
+ R uuLogin(@RequestBody UuLoginVO uuLoginVO);
+
+ /**
+ * 意见反馈
+ *
+ * @param sysUserFeedbackDTO
+ * 反馈内容
+ * @return 反馈结果
+ */
+ @PostMapping("addfeedback")
+ R addFeedback(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO);
+
+ /**
+ * 分页通知列表
+ *
+ * @param pageDTO
+ * 分页参数
+ * @return 分页结果
+ */
+ @PostMapping("pagenotice")
+ R pageNotice(@RequestBody PageDTO pageDTO);
+
+ /**
+ * 通知已读
+ *
+ * @param noticeReadDTO
+ * 通知已读
+ * @return 修改状态
+ */
+ @PostMapping("putnotice")
+ R putNotice(@RequestBody NoticeReadDTO noticeReadDTO);
+
+ /**
+ * 分页查询用户意见反馈
+ *
+ * @param pageFeedBackDTO
+ * 分页查询参数
+ * @return 意见集合
+ */
+ @PostMapping("pagefeedback")
+ R pageFeedback(@RequestBody PageFeedBackDTO pageFeedBackDTO);
+
+ /**
+ * 未读消息汇总
+ *
+ * @param userId
+ * 登录用户信息
+ * @return 未读汇总
+ */
+ @PostMapping("noticeunreadnum")
+ R noticeUnreadNum(@RequestParam("userId") Long userId);
+
+ /**
+ * 反馈意见详情
+ *
+ * @param id
+ * 反馈主键
+ * @return 反馈详情
+ */
+ @PostMapping("detailfeedback")
+ R detailFeedback(@RequestParam("id") Long id);
+
+ /**
+ * 数据看板
+ *
+ * @return 运营后台数据看板
+ */
+ @PostMapping("datakanban")
+ R dataKanban(@RequestParam("areaCode")String areaCode);
+
+ /**
+ * 用户菜单获取
+ *
+ * @param userId
+ * 登录用户id
+ * @return 用户菜单
+ */
+ @PostMapping("/role/listmenu")
+ R listmenu(@RequestParam("userId") Long userId);
+
+ /**
+ * 社区管理后台数据看板
+ *
+ * @param communityId
+ * 社区id
+ * @return 看板用户数据
+ */
+ @PostMapping("indexdatacommunitybackstage")
+ R indexDataCommunityBackstage(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 定时任务维护用户持续登录时间
+ *
+ * @return 维护结果
+ */
+ @PostMapping("timedtaskcontinuouslandingdays")
+ R timedTaskContinuousLandingDays();
+
+ /**
+ * 新增用户通知
+ *
+ * @param sysUserNoticeVO
+ * 通知内容
+ * @return 新增结果
+ */
+ @PostMapping("addnotice")
+ R addNotice(@RequestBody SysUserNoticeVO sysUserNoticeVO);
+
+ /**
+ * 修改用户的党员状态
+ *
+ * @param idCard
+ * 身份证号
+ * @return 修改结果
+ */
+ @PostMapping("updateuserispartymember")
+ R updateUserIsPartymember(@RequestParam("idCard") String idCard);
+
+ /**
+ * 修改党员状态
+ * @param phone
+ * @return
+ */
+ @PostMapping("updateuserispartymemberByPhone")
+ R updateUserIsPartymemberByPhone(@RequestParam("phone") String phone);
+ /**
+ * 修改用户的为非党员状态
+ *
+ * @param idCard
+ * 身份证号
+ * @return 修改结果
+ */
+ @PostMapping("updateusernotpartymember")
+ R updateUserNotPartymember(@RequestParam("idCard") String idCard);
+
+ /**
+ * 获取角色的权限配置列表
+ *
+ * @param roleId
+ * 角色id
+ * @return 菜单列表
+ */
+ @PostMapping("/role/listmenubackstagebyrole")
+ R listMenuBackstageByRole(@RequestParam("roleId") Long roleId);
+
+ /**
+ * 获取各种协议
+ *
+ * @param type
+ * 1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策
+ * @return 协议内容
+ */
+ @PostMapping("agreement")
+ R agreement(@RequestParam("type") Integer type,@RequestParam("appId")String appId);
+
+ /**
+ * 维护用户最后登录时间
+ *
+ * @param userId
+ * 用户主键
+ * @return 维护结果
+ */
+ @PostMapping("putuserlastlogintime")
+ R putUserLastLoginTime(@RequestParam("userId") Long userId);
+
+ /**
+ * 删除意见反馈
+ *
+ * @param id
+ * 主键
+ * @return 删除结果
+ */
+ @PostMapping("deletefeedback")
+ R deleteFeedback(@RequestParam("id") Long id);
+
+ /**
+ * 批量导入居民用户
+ *
+ * @param list
+ * 居民用户集合
+ * @param areaName
+ * 小区名字
+ * @return 导入结果
+ */
+ @PostMapping("batchsaveuser")
+ R batchSaveUser(@RequestBody List<EexcelUserDTO> list, @RequestParam("areaName") StringBuffer areaName);
+
+ /**
+ * 校验小区是否存在
+ *
+ * @param areaName
+ * 小区名字
+ * @return 校验结果
+ */
+ @PostMapping("checkaereaname")
+ R checkAereaName(@RequestParam("areaName") String areaName);
+
+ /**
+ * 社区人员详情包括导入人员
+ *
+ * @param userId
+ * 人员id
+ * @return CommunityUserInfoVO
+ */
+ @PostMapping("detailusercomunity")
+ R detailUserComunity(@RequestParam("userId") Long userId);
+
+ /**
+ * 用户搜索了就下载搜索的用户否则下载所有用户
+ *
+ * @param exportUserDTO
+ * 用户搜索内容
+ * @return List<EexcelUserDTO> excel内容
+ */
+ @PostMapping("export")
+ R export(@RequestBody ExportUserDTO exportUserDTO);
+
+ /**
+ * 通过手机号码查询用户信息
+ *
+ * @param phone
+ * @return
+ */
+ @GetMapping("getUserByPhone")
+ R getSysUserVOByPhone(@RequestParam(value = "phone") String phone);
+
+ /**
+ * 通过账号查询用户信息
+ *
+ * @param account
+ * @return
+ */
+ @GetMapping("getUserByAccount")
+ R getSysUserVOByAccountAndType(@RequestParam(value = "account") String account,
+ @RequestParam(value = "type") Integer type);
+
+ /**
+ * 基础数据》居民管理》居民列表
+ *
+ * @param pageInputUserDTO
+ * 查询参数
+ * @return 分页数据
+ */
+ @PostMapping("common/data/user/page")
+ R pageInputUser(@RequestBody PageInputUserDTO pageInputUserDTO);
+
+ /**
+ * 基础数据》居民管理》设置用户标签
+ *
+ * @param inputUserTagsDTO
+ * 标签信息
+ * @return 设置结果
+ */
+ @PostMapping("common/data/user/tags")
+ R setInputUserTag(@RequestBody InputUserTagsDTO inputUserTagsDTO);
+
+ /**
+ * 基础数据》居民管理》批量导入居民用户
+ *
+ * @param list
+ * 居民用户集合
+ * @param areaName
+ * 小区名字
+ * @return 导入结果
+ */
+ @PostMapping("common/data/user/import")
+ R batchSaveInputUser(@RequestBody List<EexcelUserDTO> list, @RequestParam("areaName") StringBuffer areaName);
+
+ /**
+ * 基础数据》居民管理》 居民详情
+ *
+ * @param id
+ * 人员id
+ * @return CommunityUserInfoVO
+ */
+ @PostMapping("/common/data/user/detail")
+ R inputUserDetail(@RequestParam("id") Long id);
+
+ /**
+ * 基础数据》居民管理》 导出居民信息
+ *
+ * @param exportUserDTO
+ * 用户搜索内容
+ * @return List<EexcelUserDTO> excel内容
+ */
+ @PostMapping("/common/data/user/export")
+ R inputUserExport(@RequestBody ExportUserDTO exportUserDTO);
+
+ /**
+ * 基础数据》特殊群体》分页查询
+ *
+ * @param pageInputUserDTO
+ * @return
+ */
+ @PostMapping("common/data/special/page")
+ R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO);
+
+ /**
+ * 删除特殊群体用户
+ *
+ * @param id
+ * @return
+ */
+ @DeleteMapping("common/data/special/delete1")
+ R deleteSpecialInputUser(@RequestParam(value = "id") Long id);
+
+ /**
+ * 基础数据》特殊群体》分页查询标签列表
+ *
+ * @param comMngUserTagDTO
+ * @return
+ */
+ @PostMapping("common/data/special/tags/page")
+ R specialInputUserTags(@RequestBody PageInputUserDTO comMngUserTagDTO);
+
+ /**
+ * 新增或修改特殊群体标签
+ *
+ * @param comMngTagVO
+ * @return
+ */
+ @PostMapping("common/data/special/tags/save")
+ R saveSpecialInputUserTags(@RequestBody ComMngTagVO comMngTagVO);
+
+ /**
+ * 删除特殊群体标签
+ *
+ * @param id
+ * @return
+ */
+ @DeleteMapping("common/data/special/tags/delete")
+ R deleteSpecialInputUserTags(@RequestParam(value = "id") Long id);
+
+ /**
+ * 特殊群体导出
+ *
+ * @param exportSpecialUserDTO
+ * @return
+ */
+ @PostMapping("/common/data/special/export")
+ R specialUserExport(@RequestBody ExportSpecialUserDTO exportSpecialUserDTO);
+
+ /**
+ * 查询所有人员标签
+ *
+ * @return 标签集合
+ */
+ @PostMapping("listtag/getTag")
+ R listTags();
+
+ /**
+ * 添加SysUser信息
+ *
+ * @param storeVO
+ * sysUser信息
+ * @return 添加sysUser结果
+ */
+ @PostMapping("addSysUser")
+ R addSysUser(@RequestBody ShopStoreVO storeVO);
+
+ /**
+ * 修改SysUser信息
+ *
+ * @param storeVO
+ * sysUser信息
+ * @return 修改结果
+ */
+ @PostMapping("editSysUser")
+ R editSysUser(@RequestBody ShopStoreVO storeVO);
+
+ /**
+ * 修改用户小程序首页活动提示
+ *
+ * @param userEditTipsDTO
+ * 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("editUserTips")
+ R editUserTips(@RequestBody SysUserEditTipsDTO userEditTipsDTO);
+
+ /**
+ * 获取用户电子档案
+ *
+ * @param userId
+ * 家庭成员信息
+ * @return 结果
+ */
+ @GetMapping("getUserArchives")
+ R getUserArchives(@RequestParam("userId") Long userId);
+
+ /**
+ * 编辑用户电子档案
+ *
+ * @param userArchivesVO
+ * 编辑的信息
+ * @return 编辑结果
+ */
+ @PostMapping("updateUserArchives")
+ R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO);
+
+ /**
+ * 修改app用户密码
+ *
+ * @param userInfoAppDTO
+ * 请求参数
+ * @return 修改结果
+ */
+ @PutMapping("updateUserPassByApp")
+ R updateUserPassByApp(@RequestBody EditUserInfoPassAppDTO userInfoAppDTO);
+
+ /**
+ * 添加网格员
+ *
+ * @param eventGridMemberAddDTO
+ * 请求参数
+ * @return 结果
+ */
+ @PostMapping("addGridUser")
+ R addGridUser(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO);
+
+ /**
+ * 分页查询网格员
+ *
+ * @param memberRelationDTO
+ * 请求参数
+ * @return 结果
+ */
+ @PostMapping("member/list")
+ R getGridMemberList(@RequestBody PageEventGridMemberRelationDTO memberRelationDTO);
+
+ /**
+ * 修改网格员信息
+ *
+ * @param eventGridMemberAddDTO
+ * 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("editGridUser")
+ R editGridUser(@RequestBody EventGridMemberEditAdminDTO eventGridMemberAddDTO);
+
+ /**
+ * 重置网格员密码
+ *
+ * @param gridMemberDTO
+ * 请求参数
+ * @return 重置结果
+ */
+ @PostMapping("passResetUser")
+ R gridMemberPassReset(@RequestBody EventGridMemberPassResetDTO gridMemberDTO);
+
+ /**
+ * 批量删除网格员
+ *
+ * @param Ids
+ * 网格员id集合
+ * @return 删除结果
+ */
+ @PostMapping("deleteMembers")
+ R deleteMembers(@RequestBody List<Long> Ids);
+
+ /**
+ * 批量修改网格员状态
+ *
+ * @param gridMemberEditDTO
+ * 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("gridMemberEditStatus")
+ R gridMemberEditStatus(@RequestBody EventGridMemberEditStatusDTO gridMemberEditDTO);
+
+ @GetMapping("big/no/tip")
+ R noTips(@RequestParam("userId") Long userId);
+
+ /**
+ * 查询社区的收益说明
+ *
+ * @param communityId
+ * 社区id
+ * @return 收益说明
+ */
+ @PostMapping("listagreements")
+ R listAgreements(@RequestParam("communityId") Long communityId);
+
+ @PostMapping("user/getUserGrids")
+ R getGridIsOk(@RequestParam("userId") Long userId);
+
+ @GetMapping("getGridsMemberList")
+ R getGridsMemberList(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 根据用户id查询用户openid
+ *
+ * @param userId
+ * 用户id
+ * @return openid
+ */
+ @GetMapping("getUserOpenId")
+ R getUserOpenId(@RequestParam("userId") Long userId);
+
+ /**
+ * 查询社区后台工作人员列表
+ *
+ * @param communityId
+ * 社区id
+ * @return 社区后台工作人员列表
+ */
+ @GetMapping("getUserListByCommunityId")
+ R getUserListByCommunityId(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 检查当前用户是否是社区工作人员
+ * @param phone
+ * @param communityId
+ * @return
+ */
+ @GetMapping("checkIsTeam")
+ R checkCurrentUserIsTeam(@RequestParam("phone") String phone, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 便民服务新增商家账号
+ * @param convenientMerchantDTO
+ * @return 商家用户id
+ */
+ @PostMapping("insertMerchantAccount")
+ R addConvenientMerchantUser(@RequestBody ConvenientMerchantDTO convenientMerchantDTO);
+
+ /**
+ * 修改便民服务商家绑定账号
+ * @param userId
+ * @param account
+ * @return
+ */
+ @PutMapping("putMerchantUserAccount")
+ R putUserAccount(@RequestParam("userId") Long userId, @RequestParam("account") String account);
+
+ /**
+ * 禁用/启用便民服务商家用户
+ * @param disableOrEnableConvenientMerchantDTO
+ * @return
+ */
+ @PutMapping("disableOrEnableMerchantUsers")
+ R disableOrEnableMerchantUsers(@RequestBody DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO);
+
+ /**
+ * 根据openid维护社区团队里是否注册
+ * @param openid 用户微信唯一标识
+ */
+ @GetMapping("judgeCommunityTeam")
+ void judgeCommunityTeam(@RequestParam("openid") String openid);
+
+ /**
+ * 数据看板升级版
+ *
+ * @return 运营后台数据看板升级版
+ */
+ @PostMapping("datakanbans")
+ R dataKanBans(@RequestBody DataKanBansDto dataKanBansDto);
+
+ /**
+ * 运营后台-用户数据统计汇总
+ * @return 用户数据统计汇总
+ */
+ @GetMapping("community/statistics")
+ R communityStatistics(@RequestParam("areaCode") String areaCode);
+
+ /**
+ * 运营后台-用户数据统计导出
+ * @return 用户数据
+ */
+ @GetMapping("community/statistics/export")
+ R communityStatisticsExport(@RequestParam("areaCode") String areaCode);
+
+ /**
+ * 通过UnionId获取用户信息
+ * @param unionId
+ * @return
+ */
+ @GetMapping("/getByUnionId")
+ R getUserInfoByUnionId(@RequestParam("unionId") String unionId);
+
+ /**
+ * 小程序id获取相关信息
+ * @param appId
+ * @return
+ */
+ @GetMapping("/sysAppConfig/selectByAppid")
+ R<SysAppConfigVO> selectByAppid(@RequestParam("appId")String appId);
+
+ /**
+ * 通过区域编码 类型获取动态模板id
+ * @param areaCode
+ * @param type
+ * @return
+ */
+ @GetMapping("/sysTemplateConfig/selectTemplate")
+ R<SysTemplateConfigVO> selectTemplate(@RequestParam("areaCode")String areaCode,@RequestParam("type")Integer type);
+
+ /**
+ * 微商业街新增商家账号
+ * @param mcsMerchantDTO
+ * @return 商家用户id
+ */
+ @PostMapping("insertMcsMerchantAccount")
+ R addMcsMerchantUser(@RequestBody McsMerchantDTO mcsMerchantDTO);
+
+ /**
+ * 微商业街修改商家账号
+ * @param mcsMerchantDTO
+ * @return
+ */
+ @PutMapping("putMcsMerchantUser")
+ R putMcsMerchantUser(@RequestBody McsMerchantDTO mcsMerchantDTO);
+
+ /**
+ * 检查用户是否有效
+ * @param userId
+ * @param type
+ * @return
+ */
+ @PutMapping("checkUserIsValid")
+ Boolean checkUserIsValid(@RequestParam("userId") Long userId, @RequestParam("type") Integer type);
+
+ /**
+ * 根据手机号、用户类型查询用户
+ * @param phone
+ * @param type
+ * @return
+ */
+ @GetMapping("/getSysUserByPhone")
+ R getSysUserByPhone(@RequestParam("phone") String phone, @RequestParam("type") Integer type);
+
+ /**
+ * 发送验证码
+ * @param phone 手机号
+ * @param clientIP 用户ip
+ * @param prefixKey redis Key 前缀
+ * @param limit 获取次数限制
+ * @param timeout 超次数获取时间等待
+ * @return
+ */
+ @GetMapping("/sendMessageCode")
+ R sendMessageCode(@RequestParam("phone") String phone,
+ @RequestParam(value = "clientIP", required = false) String clientIP,
+ @RequestParam("prefixKey") String prefixKey,
+ @RequestParam("limit") Integer limit,
+ @RequestParam("timeout") Integer timeout);
+
+ /**
+ * 根据openId获取微商业街用户
+ * @param openid
+ * @return
+ */
+ @GetMapping("/getMcsUserByOpenId")
+ R getMcsUserByOpenId(@RequestParam("openid") String openid);
+
+ /**
+ * 商业街用户微信授权-绑定手机号
+ * @param bindUserPhoneDTO
+ * @return
+ */
+ @PostMapping("/mcs/bindPhone")
+ R bindOrAddMcsUser(@RequestBody @Valid BindUserPhoneDTO bindUserPhoneDTO);
+
+ /**
+ * 删除用户信息缓存
+ * @param phone
+ */
+ @DeleteMapping("/deleteUserCashByPhone")
+ R deleteUserCashByPhone(@RequestParam("phone") String phone);
+
+ /**
+ * 修改用户党员状态
+ * @param userId 用户id
+ * @return 修改结果
+ */
+ @PostMapping("/update/user/party/status")
+ R updateUserPartyStatus(@RequestParam("userId") Long userId);
+
+ /**
+ *导出验证密码
+ */
+ @GetMapping("/checkExport")
+ R checkExport(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword);
+
+ @GetMapping("/indexData/totalData")
+ R newIndexData(@RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "type",required = false) Long streetId,
+ @RequestParam(value = "areaCode",required = false) Long areaCode,@RequestParam("appId")String appId);
+
+ @GetMapping("/indexData/userRate")
+ R userRate(@RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "streetId",required = false) Long streetId,
+ @RequestParam(value = "areaCode",required = false) Long areaCode,
+ @RequestParam(value = "range",required = false) Integer range,@RequestParam(value = "appId",required = false) String appId);
+
+
+ @GetMapping("/indexData/realUser")
+ R realUser(@RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "streetId",required = false) Long streetId,
+ @RequestParam(value = "areaCode",required = false) Long areaCode,
+ @RequestParam(value = "range",required = false) Integer range,@RequestParam(value = "appId",required = false) String appId);
+
+ @GetMapping("/indexData/userActivity")
+ R userActivity(@RequestParam(value = "type", required = false) Integer type,
+ @RequestParam(value = "streetId", required = false) Long streetId,
+ @RequestParam(value = "areaCode", required = false) Long areaCode,
+ @RequestParam(value = "range", required = false) Integer range, @RequestParam(value = "appId",required = false) String appId);
+
+ @GetMapping("/indexData/getAreaAndStreet")
+ R getAreaAndStreet();
+ /**
+ * uu洗车推送
+ * @param washPhone
+ * @param phone
+ * @param washName
+ * @param orderStatus
+ * @return
+ */
+ @GetMapping("/uuPush")
+ R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
+ /**
+ * 无水洗车推送
+ * @param washPhone
+ * @param phone
+ * @param washName
+ * @param orderStatus
+ * @return
+ */
+ @GetMapping("/wsPush")
+ R wsPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
+ @GetMapping("/communityList")
+ R communityList(@RequestParam("name") String name, @RequestParam("id") Long id);
+
+
+ @PostMapping("/tfLogin")
+ R tfLogin(@RequestBody UuLoginVO uuLoginVO);
+
+ /**
+ * 三说会堂添加后台账户
+ * */
+ @PostMapping("/sanshuoAddUser")
+ R sanShuoAddUser(@RequestBody AdministratorsUserVO administratorsUserVO);
+
+ /**
+ * 三说会堂重置密码
+ * */
+ @GetMapping("/sanshuoResetPassword")
+ R sanShuoResetPassword(@RequestParam("account") String account,@RequestParam("pass")String password);
+
+
+ @GetMapping("/accept")
+ R accept(@RequestParam("userId")Long userId);
+
+ @PostMapping("/addComPbCheckUser")
+ R addComPbCheckUser(@RequestBody ComPbCheckUserDTO comPbCheckUserDTO);
+
+
+ /**
+ * 是否为专家登陆小程序
+ * */
+ @GetMapping("/isSanShuoExpert")
+ R isExpert(@RequestParam("number") String number);
+
+ /**
+ * 删除用户专家权限
+ * */
+ @GetMapping("/removeExpertRole")
+ R removeExpertRole(@RequestParam(value = "phone",required = false) String phone);
+
+ /**
+ *回复反馈意见或修改返回意见的回复
+ * */
+ @PostMapping("/feedBackReply")
+ R updateFeedBack(@RequestBody SysUserFeedbackVO sysUserFeedbackVO);
+
+ @GetMapping("/myFeedBack")
+ R myFeedBack(@RequestParam("userId") Long userId,@RequestParam(value = "type",required = false)Integer type,@RequestParam("propertyId")Long propertyId);
+
+ /**
+ * 获取所有社区等
+ * @return
+ */
+ @GetMapping("/getAllCommunityList")
+ R getAllCommunityList();
+
+ @GetMapping("/propertyCheck")
+ R propertyCheck(@RequestParam("phone") String phone);
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AES.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AES.java
new file mode 100644
index 0000000..f1f4374
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AES.java
@@ -0,0 +1,174 @@
+package com.panzhihua.common.utlis;
+
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+
+import javax.crypto.*;
+import javax.crypto.spec.SecretKeySpec;
+
+public class AES {
+ /**
+ * 加密
+ *
+ * @param content
+ * 需要加密的内容
+ * @param password
+ * 加密密码
+ * @return
+ */
+ public static byte[] encrypt(String content, String password) {
+ try {
+ KeyGenerator kgen = KeyGenerator.getInstance("AES");
+
+ SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");
+ secureRandom.setSeed(password.getBytes());
+ kgen.init(128, secureRandom);
+
+ SecretKey secretKey = kgen.generateKey();
+ byte[] enCodeFormat = secretKey.getEncoded();
+ SecretKeySpec key = new SecretKeySpec(enCodeFormat, "AES");
+ Cipher cipher = Cipher.getInstance("AES");// 创建密码器
+ byte[] byteContent = content.getBytes(StandardCharsets.UTF_8);
+ cipher.init(Cipher.ENCRYPT_MODE, key);// 初始化
+ byte[] result = cipher.doFinal(byteContent);
+ return result; // 加密
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ } catch (NoSuchPaddingException e) {
+ e.printStackTrace();
+ } catch (InvalidKeyException e) {
+ e.printStackTrace();
+ } catch (IllegalBlockSizeException e) {
+ e.printStackTrace();
+ } catch (BadPaddingException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ /**
+ * 解密
+ *
+ * @param content
+ * 待解密内容
+ * @param password
+ * 解密密钥
+ * @return
+ */
+ public static byte[] decrypt(byte[] content, String password) {
+ try {
+ String charset = "utf-8";
+ KeyGenerator kgen = KeyGenerator.getInstance("AES");
+
+ SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");
+ secureRandom.setSeed(password.getBytes());
+ kgen.init(128, secureRandom);
+
+ SecretKey secretKey = kgen.generateKey();
+ byte[] enCodeFormat = secretKey.getEncoded();
+ SecretKeySpec key = new SecretKeySpec(enCodeFormat, "AES");
+ Cipher cipher = Cipher.getInstance("AES");// 创建密码器
+ cipher.init(Cipher.DECRYPT_MODE, key);// 初始化
+ byte[] result = cipher.doFinal(content);
+ return result; // 加密
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ } catch (NoSuchPaddingException e) {
+ e.printStackTrace();
+ } catch (InvalidKeyException e) {
+ e.printStackTrace();
+ } catch (IllegalBlockSizeException e) {
+ e.printStackTrace();
+ } catch (BadPaddingException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ /**
+ * 将二进制转换成16进制
+ *
+ * @param buf
+ * @return
+ */
+ public static String parseByte2HexStr(byte[] buf) {
+ StringBuffer sb = new StringBuffer();
+ for (int i = 0; i < buf.length; i++) {
+ String hex = Integer.toHexString(buf[i] & 0xFF);
+ if (hex.length() == 1) {
+ hex = '0' + hex;
+ }
+ sb.append(hex.toUpperCase());
+ }
+ return sb.toString();
+ }
+
+ /**
+ * 将16进制转换为二进制
+ *
+ * @param hexStr
+ * @return
+ */
+ public static byte[] parseHexStr2Byte(String hexStr) {
+ if (hexStr.length() < 1)
+ return null;
+ byte[] result = new byte[hexStr.length() / 2];
+ for (int i = 0; i < hexStr.length() / 2; i++) {
+ int high = Integer.parseInt(hexStr.substring(i * 2, i * 2 + 1), 16);
+ int low = Integer.parseInt(hexStr.substring(i * 2 + 1, i * 2 + 2), 16);
+ result[i] = (byte)(high * 16 + low);
+ }
+ return result;
+ }
+
+ /**
+ * 加密
+ *
+ * @param content
+ * 需要加密的内容
+ * @param password
+ * 加密密码
+ * @return
+ */
+ public static byte[] encrypt2(String content, String password) {
+ try {
+ SecretKeySpec key = new SecretKeySpec(password.getBytes(), "AES");
+ Cipher cipher = Cipher.getInstance("AES/ECB/NoPadding");
+ byte[] byteContent = content.getBytes(StandardCharsets.UTF_8);
+ cipher.init(Cipher.ENCRYPT_MODE, key);// 初始化
+ byte[] result = cipher.doFinal(byteContent);
+ return result; // 加密
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ } catch (NoSuchPaddingException e) {
+ e.printStackTrace();
+ } catch (InvalidKeyException e) {
+ e.printStackTrace();
+ } catch (IllegalBlockSizeException e) {
+ e.printStackTrace();
+ } catch (BadPaddingException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public static void main(String[] args) throws UnsupportedEncodingException {
+ String content = "我是shoneworn";
+ String password = "12345678";
+ // 加密
+ System.out.println("加密前：" + content);
+ byte[] encode = encrypt(content, password);
+
+ // 传输过程,不转成16进制的字符串，就等着程序崩溃掉吧
+ String code = parseByte2HexStr(encode);
+ System.out.println("密文字符串：" + code);
+ byte[] decode = parseHexStr2Byte(code);
+ // 解密
+ byte[] decryptResult = decrypt(decode, password);
+ System.out.println("解密后：" + new String(decryptResult, StandardCharsets.UTF_8)); // 不转码会乱码
+
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AddressUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AddressUtils.java
new file mode 100644
index 0000000..b9b1861
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AddressUtils.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.utlis;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.constants.Constants;
+
+/**
+ * 获取地址类
+ *
+ * @author ruoyi
+ */
+public class AddressUtils {
+ // IP地址查询
+ public static final String IP_URL = "http://whois.pconline.com.cn/ipJson.jsp";
+ // 未知地址
+ public static final String UNKNOWN = "XX XX";
+ private static final Logger log = LoggerFactory.getLogger(AddressUtils.class);
+
+ public static String getRealAddressByIP(String ip) {
+ String address = UNKNOWN;
+ // 内网不查询
+ if (IpUtils.internalIp(ip)) {
+ return "内网IP";
+ }
+ // if (RuoYiConfig.isAddressEnabled())
+ if (true) {
+ try {
+ String rspStr = HttpUtils.sendGet(IP_URL, "ip=" + ip + "&json=true", Constants.GBK);
+ if (StringUtils.isEmpty(rspStr)) {
+ log.error("获取地理位置异常 {}", ip);
+ return UNKNOWN;
+ }
+ JSONObject obj = JSONObject.parseObject(rspStr);
+ String region = obj.getString("pro");
+ String city = obj.getString("city");
+ return String.format("%s %s", region, city);
+ } catch (Exception e) {
+ log.error("获取地理位置异常 {}", ip);
+ }
+ }
+ return address;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AgeUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AgeUtils.java
new file mode 100644
index 0000000..d55983e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AgeUtils.java
@@ -0,0 +1,159 @@
+package com.panzhihua.common.utlis;
+
+import cn.hutool.core.util.IdcardUtil;
+import com.panzhihua.common.constants.Constants;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * Created by qing on 2017/3/28.
+ */
+public class AgeUtils {
+ // 根据年月日计算年龄,birthTimeString:"1994-11-14"
+ public static int getAgeFromBirthTime(String birthTimeString) {
+ // 先截取到字符串中的年、月、日
+ int selectYear = Integer.parseInt(birthTimeString.substring(0, 4));
+ int selectMonth = Integer.parseInt(birthTimeString.substring(4, 6));
+ int selectDay = Integer.parseInt(birthTimeString.substring(6, 8));
+ // 得到当前时间的年、月、日
+ Calendar cal = Calendar.getInstance();
+ int yearNow = cal.get(Calendar.YEAR);
+ int monthNow = cal.get(Calendar.MONTH) + 1;
+ int dayNow = cal.get(Calendar.DATE);
+
+ // 用当前年月日减去生日年月日
+ int yearMinus = yearNow - selectYear;
+ int monthMinus = monthNow - selectMonth;
+ int dayMinus = dayNow - selectDay;
+
+ int age = yearMinus;// 先大致赋值
+ if (yearMinus < 0) {// 选了未来的年份
+ age = 0;
+ } else if (yearMinus == 0) {// 同年的，要么为1，要么为0
+ if (monthMinus < 0) {// 选了未来的月份
+ age = 0;
+ } else if (monthMinus == 0) {// 同月份的
+ if (dayMinus < 0) {// 选了未来的日期
+ age = 0;
+ } else if (dayMinus >= 0) {
+ age = 1;
+ }
+ } else if (monthMinus > 0) {
+ age = 1;
+ }
+ } else if (yearMinus > 0) {
+ if (monthMinus < 0) {// 当前月>生日月
+ } else if (monthMinus == 0) {// 同月份的，再根据日期计算年龄
+ if (dayMinus < 0) {
+ } else if (dayMinus >= 0) {
+ age = age + 1;
+ }
+ } else if (monthMinus > 0) {
+ age = age + 1;
+ }
+ }
+ return age;
+ }
+
+ // 根据时间戳计算年龄
+ public static int getAgeFromBirthTime(long birthTimeLong) {
+ Date date = new Date(birthTimeLong * 1000l);
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ String birthTimeString = format.format(date);
+ return getAgeFromBirthTime(birthTimeString);
+ }
+
+ public static String getAgeFormatBirthday(String brithday) {
+ if (StringUtils.isEmpty(brithday)) {
+ return "";
+ }
+ String year = brithday.substring(0, 4);
+ String month = brithday.substring(4, 6);
+ String ri = brithday.substring(6, 8);
+ return year + "-" + month + "-" + ri;
+ }
+
+ public static int getAgeFromBirthTimes(String birthTimeString) {
+ // 先截取到字符串中的年、月、日
+ int selectYear = Integer.parseInt(birthTimeString.substring(0, 4));
+ int selectMonth = Integer.parseInt(birthTimeString.substring(5, 7));
+ int selectDay = Integer.parseInt(birthTimeString.substring(8, 10));
+ // 得到当前时间的年、月、日
+ Calendar cal = Calendar.getInstance();
+ int yearNow = cal.get(Calendar.YEAR);
+ int monthNow = cal.get(Calendar.MONTH) + 1;
+ int dayNow = cal.get(Calendar.DATE);
+
+ // 用当前年月日减去生日年月日
+ int yearMinus = yearNow - selectYear;
+ int monthMinus = monthNow - selectMonth;
+ int dayMinus = dayNow - selectDay;
+
+ int age = yearMinus;// 先大致赋值
+ if (yearMinus < 0) {// 选了未来的年份
+ age = 0;
+ } else if (yearMinus == 0) {// 同年的，要么为1，要么为0
+ if (monthMinus < 0) {// 选了未来的月份
+ age = 0;
+ } else if (monthMinus == 0) {// 同月份的
+ if (dayMinus < 0) {// 选了未来的日期
+ age = 0;
+ } else if (dayMinus >= 0) {
+ age = 1;
+ }
+ } else if (monthMinus > 0) {
+ age = 1;
+ }
+ } else if (yearMinus > 0) {
+ if (monthMinus < 0) {// 当前月>生日月
+ } else if (monthMinus == 0) {// 同月份的，再根据日期计算年龄
+ if (dayMinus < 0) {
+ } else if (dayMinus >= 0) {
+ age = age + 1;
+ }
+ } else if (monthMinus > 0) {
+ age = age + 1;
+ }
+ }
+ return age - 1;
+ }
+
+ /**
+ * 根据身份证号判断年龄段
+ * @param idCard 身份证号
+ * @return 年龄段(1.80-89周岁 2.90-99周岁 3.100周岁（含）以上)
+ */
+ public static int getAgeCategory(String idCard){
+ int nub = -1;
+ int age = 0;
+ try {
+ age = IdcardUtil.getAgeByIdCard(idCard);
+ }catch (Exception e){
+ return -1;
+ }
+ if (age >= Constants.EIGHTY && age < Constants.NINETY) {
+ nub = 1;
+ }else if (age >= Constants.NINETY && age < Constants.ONE_HUNDRED){
+ nub = 2;
+ }else if (age >= Constants.ONE_HUNDRED){
+ nub = 3;
+ }
+ return nub;
+ }
+
+ public static int getAgeFromBirthTimes(long birthTimeLong) {
+ Date date = new Date(birthTimeLong * 1000l);
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ String birthTimeString = format.format(date);
+ return getAgeFromBirthTimes(birthTimeString);
+ }
+
+ public static void main(String[] args) {
+ String yese = "19980516";
+ String year = yese.substring(0, 4);
+ String month = yese.substring(4, 6);
+ String ri = yese.substring(6, 8);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java
new file mode 100644
index 0000000..8e2fda9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java
@@ -0,0 +1,417 @@
+package com.panzhihua.common.utlis;
+
+import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.imageio.ImageIO;
+import javax.xml.bind.DatatypeConverter;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.net.URL;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * @author lyq
+ * 前端H5组件库工具类
+ */
+@Slf4j
+public class AssemblyUtils {
+
+ /**
+ * 数据转换--登记明细用户填写答案导出数据格式转换
+ *
+ * @param answerContentVOList 用户答题记录
+ * @return 用户填写答案数据
+ */
+ public static List<List<Object>> ReserveData(List<ComActQuestnaireAnswerContentVO> answerContentVOList) {
+ //结果数据集合
+ List<List<Object>> resultList = new ArrayList<>();
+ //构建单个用户数据
+ List<Object> userData = new ArrayList<>();
+
+ String noExport = "本人对信息内容";
+ //遍历答案列表
+ Long reserveRecordId = 0L;
+ Long reserveSubId = 0L;
+ Boolean isOldDuo = false;
+ StringBuffer sb = new StringBuffer();
+ if (answerContentVOList != null && answerContentVOList.size() > 0) {
+ int a=0;
+ for (ComActQuestnaireAnswerContentVO userAnswers : answerContentVOList) {
+ a++;
+ if(answerContentVOList.size()==26&&a==9){
+ userData.add(" ");
+ }
+ //判断是文字描述直接跳过
+ if (userAnswers.getOptionType().equals(5)
+ || (StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport))) {
+ continue;
+ }
+ //判断reserveRecordId为空则为第一条记录,默认加上昵称和灯谜是
+ if (reserveRecordId.equals(0L)) {
+ reserveRecordId = userAnswers.getReserveRecordId();
+ userData.add(userAnswers.getNickName());
+ userData.add(DateUtils.format(userAnswers.getTime(), DateUtils.ymdhms_format));
+ }
+ //根据reserveRecordId判断是否是第二条填报记录
+ if (!reserveRecordId.equals(userAnswers.getReserveRecordId())) {
+ reserveSubId = 0L;
+
+ if(isOldDuo){
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ isOldDuo = false;
+ }
+ resultList.add(userData);
+ userData = new ArrayList<>();
+ reserveRecordId = userAnswers.getReserveRecordId();
+ userData.add(userAnswers.getNickName());
+ userData.add(DateUtils.format(userAnswers.getTime(), DateUtils.ymdhms_format));
+ if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
+ userData.add(userAnswers.getAnswerContent());
+ }else{
+ userData.add(" ");
+ }
+ }else{
+ if(reserveSubId.equals(0L)){
+ reserveSubId = userAnswers.getReserveSubId();
+ }
+
+ if(!reserveSubId.equals(userAnswers.getReserveSubId())){
+ reserveSubId = userAnswers.getReserveSubId();
+
+ //如果是承诺字段则不导出
+ if(StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport)){
+ continue;
+ }
+
+ //判断当前的组件类型是否是图片上传，导出时需要导出图片
+ if(userAnswers.getOptionType().equals(11)){
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
+ if(userAnswers.getAnswerContent().contains("_compress")){
+ userData.add(new URL(userAnswers.getAnswerContent()));
+ }
+ else {
+ URL url=new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg");
+ if(url.getContent()!=null){
+ userData.add(url);
+ }
+ else {
+ userData.add(userAnswers.getAnswerContent());
+ }
+ }
+ //userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6)));
+ }
+ else {
+ userData.add(" ");
+ }
+ }catch (Exception e){
+ userData.add(" ");
+ e.printStackTrace();
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
+ //判断当前组件类型是否签名
+ if(userAnswers.getOptionType().equals(12)){
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
+ }catch (Exception e){
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
+
+ if(userAnswers.getOptionType().equals(1)){
+ isOldDuo = true;
+ sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
+ continue;
+ }else{
+ if(isOldDuo){
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }
+ isOldDuo = false;
+ }
+ sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }else{
+ //如果是承诺字段则不导出
+ if(StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport)){
+ continue;
+ }
+ //判断当前的组件类型是否是图片上传，导出时需要导出图片
+ if(userAnswers.getOptionType().equals(11)){
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
+ if(userAnswers.getAnswerContent().contains("_compress")){
+ userData.add(new URL(userAnswers.getAnswerContent()));
+ }
+ else {
+ URL url=new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg");
+ if(url.getContent()!=null){
+ userData.add(url);
+ }
+ else {
+ userData.add(userAnswers.getAnswerContent());
+ }
+
+ }
+ //userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6)));
+ }
+ else {
+ userData.add(" ");
+ }
+ }catch (Exception e){
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
+ //判断当前组件类型是否签名
+ if(userAnswers.getOptionType().equals(12)){
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ //userData.add(new URL("http://image.panzhihua.nhys.cdnhxx.com//idcard/967dbdef3ef3465a9169fbea204f9aa7.jpg"));
+ userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
+ }catch (Exception e){
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
+ if(userAnswers.getOptionType().equals(1)){
+ isOldDuo = true;
+ sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
+ continue;
+ }else{
+ if(isOldDuo){
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }
+ isOldDuo = false;
+ }
+ sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }
+ }
+ }
+ if(isOldDuo){
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ }
+ resultList.add(userData);
+ }
+ return resultList;
+ }
+
+ public static List<List<Object>> ReserveDataNoImage(List<ComActQuestnaireAnswerContentVO> answerContentVOList) {
+ //结果数据集合
+ List<List<Object>> resultList = new ArrayList<>();
+ //构建单个用户数据
+ List<Object> userData = new ArrayList<>();
+
+ String noExport = "以上信息仅用于";
+ //遍历答案列表
+ Long reserveRecordId = 0L;
+ Long reserveSubId = 0L;
+ Boolean isOldDuo = false;
+ StringBuffer sb = new StringBuffer();
+ if (answerContentVOList != null && answerContentVOList.size() > 0) {
+ int a=0;
+ for (ComActQuestnaireAnswerContentVO userAnswers : answerContentVOList) {
+ a++;
+ if(answerContentVOList.size()==26&&a==9){
+ userData.add(" ");
+ }
+ //判断是文字描述直接跳过
+ if (userAnswers.getOptionType().equals(5) ||userAnswers.getOptionType().equals(11)
+ || (StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport))) {
+ continue;
+ }
+ //判断reserveRecordId为空则为第一条记录,默认加上昵称和灯谜是
+ if (reserveRecordId.equals(0L)) {
+ reserveRecordId = userAnswers.getReserveRecordId();
+ userData.add(userAnswers.getNickName());
+ userData.add(DateUtils.format(userAnswers.getTime(), DateUtils.ymdhms_format));
+ }
+ //根据reserveRecordId判断是否是第二条填报记录
+ if (!reserveRecordId.equals(userAnswers.getReserveRecordId())) {
+ reserveSubId = 0L;
+
+ if(isOldDuo){
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ isOldDuo = false;
+ }
+ resultList.add(userData);
+ userData = new ArrayList<>();
+ reserveRecordId = userAnswers.getReserveRecordId();
+ userData.add(userAnswers.getNickName());
+ userData.add(DateUtils.format(userAnswers.getTime(), DateUtils.ymdhms_format));
+ if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
+ userData.add(userAnswers.getAnswerContent());
+ }else{
+ userData.add(" ");
+ }
+ }else{
+ if(reserveSubId.equals(0L)){
+ reserveSubId = userAnswers.getReserveSubId();
+ }
+
+ if(!reserveSubId.equals(userAnswers.getReserveSubId())){
+ reserveSubId = userAnswers.getReserveSubId();
+
+ //如果是承诺字段则不导出
+ if(StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport)){
+ continue;
+ }
+
+ //判断当前的组件类型是否是图片上传，导出时需要导出图片
+ if(userAnswers.getOptionType().equals(11)){
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
+ if(userAnswers.getAnswerContent().contains("_compress")){
+ userData.add(new URL(userAnswers.getAnswerContent()));
+ }
+ else {
+ URL url=new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg");
+ if(url.getContent()!=null){
+ userData.add(url);
+ }
+ else {
+ userData.add(userAnswers.getAnswerContent());
+ }
+ }
+ //userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6)));
+ }
+ else {
+ userData.add(" ");
+ }
+ }catch (Exception e){
+ userData.add(" ");
+ e.printStackTrace();
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
+ //判断当前组件类型是否签名
+ if(userAnswers.getOptionType().equals(12)){
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
+ }catch (Exception e){
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
+
+ if(userAnswers.getOptionType().equals(1)){
+ isOldDuo = true;
+ sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
+ continue;
+ }else{
+ if(isOldDuo){
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }
+ isOldDuo = false;
+ }
+ sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }else{
+ //如果是承诺字段则不导出
+ if(StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport)){
+ continue;
+ }
+ //判断当前的组件类型是否是图片上传，导出时需要导出图片
+ if(userAnswers.getOptionType().equals(11)){
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
+ if(userAnswers.getAnswerContent().contains("_compress")){
+ userData.add(new URL(userAnswers.getAnswerContent()));
+ }
+ else {
+ URL url=new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg");
+ if(url.getContent()!=null){
+ userData.add(url);
+ }
+ else {
+ userData.add(userAnswers.getAnswerContent());
+ }
+
+ }
+ //userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6)));
+ }
+ else {
+ userData.add(" ");
+ }
+ }catch (Exception e){
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
+ //判断当前组件类型是否签名
+ if(userAnswers.getOptionType().equals(12)){
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ //userData.add(new URL("http://image.panzhihua.nhys.cdnhxx.com//idcard/967dbdef3ef3465a9169fbea204f9aa7.jpg"));
+ userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
+ }catch (Exception e){
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
+ if(userAnswers.getOptionType().equals(1)){
+ isOldDuo = true;
+ sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
+ continue;
+ }else{
+ if(isOldDuo){
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }
+ isOldDuo = false;
+ }
+ sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }
+ }
+ }
+ if(isOldDuo){
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ }
+ resultList.add(userData);
+ }
+ return resultList;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/CharsetKit.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/CharsetKit.java
new file mode 100644
index 0000000..6063a11
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/CharsetKit.java
@@ -0,0 +1,84 @@
+package com.panzhihua.common.utlis;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * 字符集工具类
+ *
+ * @author ruoyi
+ */
+public class CharsetKit {
+ /** ISO-8859-1 */
+ public static final String ISO_8859_1 = "ISO-8859-1";
+ /** UTF-8 */
+ public static final String UTF_8 = "UTF-8";
+ /** GBK */
+ public static final String GBK = "GBK";
+
+ /** ISO-8859-1 */
+ public static final Charset CHARSET_ISO_8859_1 = StandardCharsets.ISO_8859_1;
+ /** UTF-8 */
+ public static final Charset CHARSET_UTF_8 = StandardCharsets.UTF_8;
+ /** GBK */
+ public static final Charset CHARSET_GBK = Charset.forName(GBK);
+
+ /**
+ * 转换为Charset对象
+ *
+ * @param charset
+ * 字符集，为空则返回默认字符集
+ * @return Charset
+ */
+ public static Charset charset(String charset) {
+ return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
+ }
+
+ /**
+ * 转换字符串的字符集编码
+ *
+ * @param source
+ * 字符串
+ * @param srcCharset
+ * 源字符集，默认ISO-8859-1
+ * @param destCharset
+ * 目标字符集，默认UTF-8
+ * @return 转换后的字符集
+ */
+ public static String convert(String source, String srcCharset, String destCharset) {
+ return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
+ }
+
+ /**
+ * 转换字符串的字符集编码
+ *
+ * @param source
+ * 字符串
+ * @param srcCharset
+ * 源字符集，默认ISO-8859-1
+ * @param destCharset
+ * 目标字符集，默认UTF-8
+ * @return 转换后的字符集
+ */
+ public static String convert(String source, Charset srcCharset, Charset destCharset) {
+ if (null == srcCharset) {
+ srcCharset = StandardCharsets.ISO_8859_1;
+ }
+
+ if (null == destCharset) {
+ srcCharset = StandardCharsets.UTF_8;
+ }
+
+ if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset)) {
+ return source;
+ }
+ return new String(source.getBytes(srcCharset), destCharset);
+ }
+
+ /**
+ * @return 系统字符集编码
+ */
+ public static String systemCharset() {
+ return Charset.defaultCharset().name();
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ClazzUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ClazzUtils.java
new file mode 100644
index 0000000..b087ce9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ClazzUtils.java
@@ -0,0 +1,53 @@
+package com.panzhihua.common.utlis;
+
+import java.lang.reflect.Field;
+import java.text.DecimalFormat;
+import java.util.Arrays;
+
+import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
+
+/**
+ * 工具类
+ */
+public class ClazzUtils {
+
+ /**
+ * 如果string属性为“”， 则将其设置为NULL
+ *
+ * @param o
+ */
+ public static void setIfStringIsEmpty(Object o) {
+ if (o == null) {
+ return;
+ }
+ Class clazz = o.getClass();
+ Field[] fields = clazz.getDeclaredFields();
+ Arrays.stream(fields).forEach(field -> {
+ if (String.class == field.getType()) {
+ try {
+ field.setAccessible(true);
+ if (field.get(o) != null) {
+ String oVal = (String)field.get(o);
+ if ("".equals(oVal)) {
+ field.set(o, null);
+ }
+ }
+ } catch (IllegalAccessException e) {
+ }
+ }
+ });
+ }
+
+ public static void main(String[] args) {
+ PageComShopOrderSearchDTO dto = new PageComShopOrderSearchDTO();
+ dto.setGoodsName("");
+ dto.setOrderNo("123");
+ setIfStringIsEmpty(dto);
+ System.out.println(dto);
+
+ double d = 1234.200;
+ DecimalFormat df = new DecimalFormat("0.00");
+ System.out.println(df.format(d));
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/Constant.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/Constant.java
new file mode 100644
index 0000000..888fb0a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/Constant.java
@@ -0,0 +1,82 @@
+package com.panzhihua.common.utlis;
+
+public class Constant {
+
+ /**
+ * 存储当前登录用户id的字段名
+ */
+ public static final String CURRENT_USER_ID = "CURRENT_USER_ID";
+
+ /**
+ * 存储当前登录用户id的字段名
+ */
+ public static final String CURRENT_USER_NAME = "CURRENT_USER_NAME";
+
+ /**
+ * 存储当前登录用户的角色
+ */
+ public static final String CURRENT_USER_ROLE = "CURRENT_USER_ROLE";
+
+ /**
+ * 存储当前登录用户的deptId
+ */
+ public static final String CURRENT_USER_DEPT_ID = "CURRENT_USER_DEPT_Id";
+ public static final String CURRENT_USER_ORG_ID = "CURRENT_USER_ORG_Id";
+ public static final String CURRENT_USER_PHONE = "CURRENT_USER_PHONE";
+ /**
+ * 存放OpLogContent的header字段
+ */
+ public static final String OP_LOG_CONTENT = "OP_LOG_CONTENT";
+
+ /**
+ * token有效期（小时）
+ */
+ public static final int TOKEN_EXPIRES_HOUR = 168;
+
+ /**
+ * redis存储手机验证码过期时间(10分钟)
+ */
+ public static final long AUTH_CODE_EXPIRED_SECONDS = 60 * 10;
+
+ /**
+ * 验证码长度
+ */
+ public static final int AUTH_CODE_LENGTH = 6;
+
+
+ /**
+ * 登录用户 redis key
+ */
+ public static final String LOGIN_TOKEN_KEY = "login_tokens:";
+ /**
+ * 令牌
+ */
+ public static final String TOKEN = "token";
+
+ /**
+ * 令牌前缀
+ */
+ public static final String TOKEN_PREFIX = "admin:";
+
+ /**
+ * 令牌前缀
+ */
+ public static final String LOGIN_USER_KEY = "login_user_key";
+
+ /**
+ * 存放Authorization的header字段
+ */
+ public static final String AUTHORIZATION = "Authorization";
+
+ /**
+ * 小程序 花城e+token
+ */
+ public static final String HCAUTHORIZATION = "HCAuthorization";
+
+
+ /**
+ * 小程序 花城e+token
+ */
+ public static final String UNION_AUTHORIZATION = "Union_Authorization";
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/Convert.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/Convert.java
new file mode 100644
index 0000000..3ec7b94
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/Convert.java
@@ -0,0 +1,918 @@
+package com.panzhihua.common.utlis;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.text.NumberFormat;
+import java.util.Set;
+
+/**
+ * 类型转换器
+ *
+ * @author ruoyi
+ */
+public class Convert {
+ /**
+ * 转换为字符串<br>
+ * 如果给定的值为null，或者转换失败，返回默认值<br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @param defaultValue
+ * 转换错误时的默认值
+ * @return 结果
+ */
+ public static String toStr(Object value, String defaultValue) {
+ if (null == value) {
+ return defaultValue;
+ }
+ if (value instanceof String) {
+ return (String)value;
+ }
+ return value.toString();
+ }
+
+ /**
+ * 转换为字符串<br>
+ * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @return 结果
+ */
+ public static String toStr(Object value) {
+ return toStr(value, null);
+ }
+
+ /**
+ * 转换为字符<br>
+ * 如果给定的值为null，或者转换失败，返回默认值<br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @param defaultValue
+ * 转换错误时的默认值
+ * @return 结果
+ */
+ public static Character toChar(Object value, Character defaultValue) {
+ if (null == value) {
+ return defaultValue;
+ }
+ if (value instanceof Character) {
+ return (Character)value;
+ }
+
+ final String valueStr = toStr(value, null);
+ return StringUtils.isEmpty(valueStr) ? defaultValue : valueStr.charAt(0);
+ }
+
+ /**
+ * 转换为字符<br>
+ * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @return 结果
+ */
+ public static Character toChar(Object value) {
+ return toChar(value, null);
+ }
+
+ /**
+ * 转换为byte<br>
+ * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @param defaultValue
+ * 转换错误时的默认值
+ * @return 结果
+ */
+ public static Byte toByte(Object value, Byte defaultValue) {
+ if (value == null) {
+ return defaultValue;
+ }
+ if (value instanceof Byte) {
+ return (Byte)value;
+ }
+ if (value instanceof Number) {
+ return ((Number)value).byteValue();
+ }
+ final String valueStr = toStr(value, null);
+ if (StringUtils.isEmpty(valueStr)) {
+ return defaultValue;
+ }
+ try {
+ return Byte.parseByte(valueStr);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * 转换为byte<br>
+ * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @return 结果
+ */
+ public static Byte toByte(Object value) {
+ return toByte(value, null);
+ }
+
+ /**
+ * 转换为Short<br>
+ * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @param defaultValue
+ * 转换错误时的默认值
+ * @return 结果
+ */
+ public static Short toShort(Object value, Short defaultValue) {
+ if (value == null) {
+ return defaultValue;
+ }
+ if (value instanceof Short) {
+ return (Short)value;
+ }
+ if (value instanceof Number) {
+ return ((Number)value).shortValue();
+ }
+ final String valueStr = toStr(value, null);
+ if (StringUtils.isEmpty(valueStr)) {
+ return defaultValue;
+ }
+ try {
+ return Short.parseShort(valueStr.trim());
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * 转换为Short<br>
+ * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @return 结果
+ */
+ public static Short toShort(Object value) {
+ return toShort(value, null);
+ }
+
+ /**
+ * 转换为Number<br>
+ * 如果给定的值为空，或者转换失败，返回默认值<br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @param defaultValue
+ * 转换错误时的默认值
+ * @return 结果
+ */
+ public static Number toNumber(Object value, Number defaultValue) {
+ if (value == null) {
+ return defaultValue;
+ }
+ if (value instanceof Number) {
+ return (Number)value;
+ }
+ final String valueStr = toStr(value, null);
+ if (StringUtils.isEmpty(valueStr)) {
+ return defaultValue;
+ }
+ try {
+ return NumberFormat.getInstance().parse(valueStr);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * 转换为Number<br>
+ * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @return 结果
+ */
+ public static Number toNumber(Object value) {
+ return toNumber(value, null);
+ }
+
+ /**
+ * 转换为int<br>
+ * 如果给定的值为空，或者转换失败，返回默认值<br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @param defaultValue
+ * 转换错误时的默认值
+ * @return 结果
+ */
+ public static Integer toInt(Object value, Integer defaultValue) {
+ if (value == null) {
+ return defaultValue;
+ }
+ if (value instanceof Integer) {
+ return (Integer)value;
+ }
+ if (value instanceof Number) {
+ return ((Number)value).intValue();
+ }
+ final String valueStr = toStr(value, null);
+ if (StringUtils.isEmpty(valueStr)) {
+ return defaultValue;
+ }
+ try {
+ return Integer.parseInt(valueStr.trim());
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * 转换为int<br>
+ * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @return 结果
+ */
+ public static Integer toInt(Object value) {
+ return toInt(value, null);
+ }
+
+ /**
+ * 转换为Integer数组<br>
+ *
+ * @param str
+ * 被转换的值
+ * @return 结果
+ */
+ public static Integer[] toIntArray(String str) {
+ return toIntArray(",", str);
+ }
+
+ /**
+ * 转换为Long数组<br>
+ *
+ * @param str
+ * 被转换的值
+ * @return 结果
+ */
+ public static Long[] toLongArray(String str) {
+ return toLongArray(",", str);
+ }
+
+ /**
+ * 转换为Integer数组<br>
+ *
+ * @param split
+ * 分隔符
+ * @param split
+ * 被转换的值
+ * @return 结果
+ */
+ public static Integer[] toIntArray(String split, String str) {
+ if (StringUtils.isEmpty(str)) {
+ return new Integer[] {};
+ }
+ String[] arr = str.split(split);
+ final Integer[] ints = new Integer[arr.length];
+ for (int i = 0; i < arr.length; i++) {
+ final Integer v = toInt(arr[i], 0);
+ ints[i] = v;
+ }
+ return ints;
+ }
+
+ /**
+ * 转换为Long数组<br>
+ *
+ * @param split
+ * 分隔符
+ * @param str
+ * 被转换的值
+ * @return 结果
+ */
+ public static Long[] toLongArray(String split, String str) {
+ if (StringUtils.isEmpty(str)) {
+ return new Long[] {};
+ }
+ String[] arr = str.split(split);
+ final Long[] longs = new Long[arr.length];
+ for (int i = 0; i < arr.length; i++) {
+ final Long v = toLong(arr[i], null);
+ longs[i] = v;
+ }
+ return longs;
+ }
+
+ /**
+ * 转换为String数组<br>
+ *
+ * @param str
+ * 被转换的值
+ * @return 结果
+ */
+ public static String[] toStrArray(String str) {
+ return toStrArray(",", str);
+ }
+
+ /**
+ * 转换为String数组<br>
+ *
+ * @param split
+ * 分隔符
+ * @param split
+ * 被转换的值
+ * @return 结果
+ */
+ public static String[] toStrArray(String split, String str) {
+ return str.split(split);
+ }
+
+ /**
+ * 转换为long<br>
+ * 如果给定的值为空，或者转换失败，返回默认值<br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @param defaultValue
+ * 转换错误时的默认值
+ * @return 结果
+ */
+ public static Long toLong(Object value, Long defaultValue) {
+ if (value == null) {
+ return defaultValue;
+ }
+ if (value instanceof Long) {
+ return (Long)value;
+ }
+ if (value instanceof Number) {
+ return ((Number)value).longValue();
+ }
+ final String valueStr = toStr(value, null);
+ if (StringUtils.isEmpty(valueStr)) {
+ return defaultValue;
+ }
+ try {
+ // 支持科学计数法
+ return new BigDecimal(valueStr.trim()).longValue();
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * 转换为long<br>
+ * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @return 结果
+ */
+ public static Long toLong(Object value) {
+ return toLong(value, null);
+ }
+
+ /**
+ * 转换为double<br>
+ * 如果给定的值为空，或者转换失败，返回默认值<br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @param defaultValue
+ * 转换错误时的默认值
+ * @return 结果
+ */
+ public static Double toDouble(Object value, Double defaultValue) {
+ if (value == null) {
+ return defaultValue;
+ }
+ if (value instanceof Double) {
+ return (Double)value;
+ }
+ if (value instanceof Number) {
+ return ((Number)value).doubleValue();
+ }
+ final String valueStr = toStr(value, null);
+ if (StringUtils.isEmpty(valueStr)) {
+ return defaultValue;
+ }
+ try {
+ // 支持科学计数法
+ return new BigDecimal(valueStr.trim()).doubleValue();
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * 转换为double<br>
+ * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @return 结果
+ */
+ public static Double toDouble(Object value) {
+ return toDouble(value, null);
+ }
+
+ /**
+ * 转换为Float<br>
+ * 如果给定的值为空，或者转换失败，返回默认值<br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @param defaultValue
+ * 转换错误时的默认值
+ * @return 结果
+ */
+ public static Float toFloat(Object value, Float defaultValue) {
+ if (value == null) {
+ return defaultValue;
+ }
+ if (value instanceof Float) {
+ return (Float)value;
+ }
+ if (value instanceof Number) {
+ return ((Number)value).floatValue();
+ }
+ final String valueStr = toStr(value, null);
+ if (StringUtils.isEmpty(valueStr)) {
+ return defaultValue;
+ }
+ try {
+ return Float.parseFloat(valueStr.trim());
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * 转换为Float<br>
+ * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @return 结果
+ */
+ public static Float toFloat(Object value) {
+ return toFloat(value, null);
+ }
+
+ /**
+ * 转换为boolean<br>
+ * String支持的值为：true、false、yes、ok、no，1,0 如果给定的值为空，或者转换失败，返回默认值<br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @param defaultValue
+ * 转换错误时的默认值
+ * @return 结果
+ */
+ public static Boolean toBool(Object value, Boolean defaultValue) {
+ if (value == null) {
+ return defaultValue;
+ }
+ if (value instanceof Boolean) {
+ return (Boolean)value;
+ }
+ String valueStr = toStr(value, null);
+ if (StringUtils.isEmpty(valueStr)) {
+ return defaultValue;
+ }
+ valueStr = valueStr.trim().toLowerCase();
+ switch (valueStr) {
+ case "true":
+ return true;
+ case "false":
+ return false;
+ case "yes":
+ return true;
+ case "ok":
+ return true;
+ case "no":
+ return false;
+ case "1":
+ return true;
+ case "0":
+ return false;
+ default:
+ return defaultValue;
+ }
+ }
+
+ /**
+ * 转换为boolean<br>
+ * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @return 结果
+ */
+ public static Boolean toBool(Object value) {
+ return toBool(value, null);
+ }
+
+ /**
+ * 转换为Enum对象<br>
+ * 如果给定的值为空，或者转换失败，返回默认值<br>
+ *
+ * @param clazz
+ * Enum的Class
+ * @param value
+ * 值
+ * @param defaultValue
+ * 默认值
+ * @return Enum
+ */
+ public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value, E defaultValue) {
+ if (value == null) {
+ return defaultValue;
+ }
+ if (clazz.isAssignableFrom(value.getClass())) {
+ @SuppressWarnings("unchecked")
+ E myE = (E)value;
+ return myE;
+ }
+ final String valueStr = toStr(value, null);
+ if (StringUtils.isEmpty(valueStr)) {
+ return defaultValue;
+ }
+ try {
+ return Enum.valueOf(clazz, valueStr);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * 转换为Enum对象<br>
+ * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+ *
+ * @param clazz
+ * Enum的Class
+ * @param value
+ * 值
+ * @return Enum
+ */
+ public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value) {
+ return toEnum(clazz, value, null);
+ }
+
+ /**
+ * 转换为BigInteger<br>
+ * 如果给定的值为空，或者转换失败，返回默认值<br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @param defaultValue
+ * 转换错误时的默认值
+ * @return 结果
+ */
+ public static BigInteger toBigInteger(Object value, BigInteger defaultValue) {
+ if (value == null) {
+ return defaultValue;
+ }
+ if (value instanceof BigInteger) {
+ return (BigInteger)value;
+ }
+ if (value instanceof Long) {
+ return BigInteger.valueOf((Long)value);
+ }
+ final String valueStr = toStr(value, null);
+ if (StringUtils.isEmpty(valueStr)) {
+ return defaultValue;
+ }
+ try {
+ return new BigInteger(valueStr);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * 转换为BigInteger<br>
+ * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @return 结果
+ */
+ public static BigInteger toBigInteger(Object value) {
+ return toBigInteger(value, null);
+ }
+
+ /**
+ * 转换为BigDecimal<br>
+ * 如果给定的值为空，或者转换失败，返回默认值<br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @param defaultValue
+ * 转换错误时的默认值
+ * @return 结果
+ */
+ public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue) {
+ if (value == null) {
+ return defaultValue;
+ }
+ if (value instanceof BigDecimal) {
+ return (BigDecimal)value;
+ }
+ if (value instanceof Long) {
+ return new BigDecimal((Long)value);
+ }
+ if (value instanceof Double) {
+ return new BigDecimal((Double)value);
+ }
+ if (value instanceof Integer) {
+ return new BigDecimal((Integer)value);
+ }
+ final String valueStr = toStr(value, null);
+ if (StringUtils.isEmpty(valueStr)) {
+ return defaultValue;
+ }
+ try {
+ return new BigDecimal(valueStr);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * 转换为BigDecimal<br>
+ * 如果给定的值为空，或者转换失败，返回默认值<br>
+ * 转换失败不会报错
+ *
+ * @param value
+ * 被转换的值
+ * @return 结果
+ */
+ public static BigDecimal toBigDecimal(Object value) {
+ return toBigDecimal(value, null);
+ }
+
+ /**
+ * 将对象转为字符串<br>
+ * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
+ *
+ * @param obj
+ * 对象
+ * @return 字符串
+ */
+ public static String utf8Str(Object obj) {
+ return str(obj, CharsetKit.CHARSET_UTF_8);
+ }
+
+ /**
+ * 将对象转为字符串<br>
+ * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
+ *
+ * @param obj
+ * 对象
+ * @param charsetName
+ * 字符集
+ * @return 字符串
+ */
+ public static String str(Object obj, String charsetName) {
+ return str(obj, Charset.forName(charsetName));
+ }
+
+ /**
+ * 将对象转为字符串<br>
+ * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
+ *
+ * @param obj
+ * 对象
+ * @param charset
+ * 字符集
+ * @return 字符串
+ */
+ public static String str(Object obj, Charset charset) {
+ if (null == obj) {
+ return null;
+ }
+
+ if (obj instanceof String) {
+ return (String)obj;
+ } else if (obj instanceof byte[] || obj instanceof Byte[]) {
+ return str(obj, charset);
+ } else if (obj instanceof ByteBuffer) {
+ return str((ByteBuffer)obj, charset);
+ }
+ return obj.toString();
+ }
+
+ /**
+ * 将byte数组转为字符串
+ *
+ * @param bytes
+ * byte数组
+ * @param charset
+ * 字符集
+ * @return 字符串
+ */
+ public static String str(byte[] bytes, String charset) {
+ return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset));
+ }
+
+ /**
+ * 解码字节码
+ *
+ * @param data
+ * 字符串
+ * @param charset
+ * 字符集，如果此字段为空，则解码的结果取决于平台
+ * @return 解码后的字符串
+ */
+ public static String str(byte[] data, Charset charset) {
+ if (data == null) {
+ return null;
+ }
+
+ if (null == charset) {
+ return new String(data);
+ }
+ return new String(data, charset);
+ }
+
+ /**
+ * 将编码的byteBuffer数据转换为字符串
+ *
+ * @param data
+ * 数据
+ * @param charset
+ * 字符集，如果为空使用当前系统字符集
+ * @return 字符串
+ */
+ public static String str(ByteBuffer data, String charset) {
+ if (data == null) {
+ return null;
+ }
+
+ return str(data, Charset.forName(charset));
+ }
+
+ /**
+ * 将编码的byteBuffer数据转换为字符串
+ *
+ * @param data
+ * 数据
+ * @param charset
+ * 字符集，如果为空使用当前系统字符集
+ * @return 字符串
+ */
+ public static String str(ByteBuffer data, Charset charset) {
+ if (null == charset) {
+ charset = Charset.defaultCharset();
+ }
+ return charset.decode(data).toString();
+ }
+
+ // ----------------------------------------------------------------------- 全角半角转换
+ /**
+ * 半角转全角
+ *
+ * @param input
+ * String.
+ * @return 全角字符串.
+ */
+ public static String toSBC(String input) {
+ return toSBC(input, null);
+ }
+
+ /**
+ * 半角转全角
+ *
+ * @param input
+ * String
+ * @param notConvertSet
+ * 不替换的字符集合
+ * @return 全角字符串.
+ */
+ public static String toSBC(String input, Set<Character> notConvertSet) {
+ char[] c = input.toCharArray();
+ for (int i = 0; i < c.length; i++) {
+ if (null != notConvertSet && notConvertSet.contains(c[i])) {
+ // 跳过不替换的字符
+ continue;
+ }
+
+ if (c[i] == ' ') {
+ c[i] = '\u3000';
+ } else if (c[i] < '\177') {
+ c[i] = (char)(c[i] + 65248);
+
+ }
+ }
+ return new String(c);
+ }
+
+ /**
+ * 全角转半角
+ *
+ * @param input
+ * String.
+ * @return 半角字符串
+ */
+ public static String toDBC(String input) {
+ return toDBC(input, null);
+ }
+
+ /**
+ * 替换全角为半角
+ *
+ * @param text
+ * 文本
+ * @param notConvertSet
+ * 不替换的字符集合
+ * @return 替换后的字符
+ */
+ public static String toDBC(String text, Set<Character> notConvertSet) {
+ char[] c = text.toCharArray();
+ for (int i = 0; i < c.length; i++) {
+ if (null != notConvertSet && notConvertSet.contains(c[i])) {
+ // 跳过不替换的字符
+ continue;
+ }
+
+ if (c[i] == '\u3000') {
+ c[i] = ' ';
+ } else if (c[i] > '\uFF00' && c[i] < '\uFF5F') {
+ c[i] = (char)(c[i] - 65248);
+ }
+ }
+ String returnString = new String(c);
+
+ return returnString;
+ }
+
+ /**
+ * 数字金额大写转换 先写个完整的然后将如零拾替换成零
+ *
+ * @param n
+ * 数字
+ * @return 中文大写数字
+ */
+ public static String digitUppercase(double n) {
+ String[] fraction = {"角", "分"};
+ String[] digit = {"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"};
+ String[][] unit = {{"元", "万", "亿"}, {"", "拾", "佰", "仟"}};
+
+ String head = n < 0 ? "负" : "";
+ n = Math.abs(n);
+
+ String s = "";
+ for (int i = 0; i < fraction.length; i++) {
+ s += (digit[(int)(Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "");
+ }
+ if (s.length() < 1) {
+ s = "整";
+ }
+ int integerPart = (int)Math.floor(n);
+
+ for (int i = 0; i < unit[0].length && integerPart > 0; i++) {
+ String p = "";
+ for (int j = 0; j < unit[1].length && n > 0; j++) {
+ p = digit[integerPart % 10] + unit[1][j] + p;
+ integerPart = integerPart / 10;
+ }
+ s = p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i] + s;
+ }
+ return head
+ + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整");
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/CopyUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/CopyUtil.java
new file mode 100644
index 0000000..a2c41ed
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/CopyUtil.java
@@ -0,0 +1,299 @@
+package com.panzhihua.common.utlis;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.StringUtils;
+
+import com.alibaba.fastjson.JSONObject;
+import com.esotericsoftware.reflectasm.MethodAccess;
+
+import cn.hutool.core.bean.BeanUtil;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 通用情况拷贝
+ *
+ * @author tkq
+ * @date 14:36 2019/4/10
+ */
+@Slf4j
+public class CopyUtil {
+ private static final Logger logger = LoggerFactory.getLogger(CopyUtil.class);
+
+ @SuppressWarnings("rawtypes")
+ private static Map<Class, MethodAccess> methodMap = new ConcurrentHashMap<>();
+
+ private static Map<String, Integer> methodIndexMap = new ConcurrentHashMap<>();
+
+ @SuppressWarnings("rawtypes")
+ private static Map<Class, List<String>> fieldMap = new ConcurrentHashMap<>();
+
+ private CopyUtil() {
+
+ }
+
+ /**
+ * <p>
+ * 对数组进行拷贝
+ * </p>
+ *
+ * @author tkq
+ * @date 2018年12月19日
+ */
+ public static <T> List<T> copyList(List<?> desc, Class<T> targetClass) {
+ if (desc == null) {
+ return new ArrayList<>();
+ }
+ if (desc.isEmpty()) {
+ return new ArrayList<>();
+ }
+ // 创建返回对象
+ List<T> targetList = new ArrayList<>(desc.size());
+ for (Object des : desc) {
+ if (null != des) {
+ try {
+ T newInstance = targetClass.newInstance();
+ copyProperties(des, newInstance);
+ targetList.add(newInstance);
+ } catch (InstantiationException | IllegalAccessException e) {
+ logger.error(e.getMessage(), e);
+ }
+ }
+ }
+ return targetList;
+ }
+
+ /**
+ * <p>
+ * 对数组进行拷贝
+ * </p>
+ *
+ * @author manailin
+ * @date 2018年12月19日
+ */
+ public static <T> List<T> beanCopyList(List<?> desc, Class<T> targetClass) {
+ if (desc == null) {
+ return new ArrayList<>();
+ }
+ if (desc.isEmpty()) {
+ return new ArrayList<>();
+ }
+ // 创建返回对象
+ List<T> targetList = new ArrayList<>(desc.size());
+ for (Object des : desc) {
+ if (null != des) {
+ try {
+ T newInstance = targetClass.newInstance();
+ BeanUtil.copyProperties(des, newInstance);
+ targetList.add(newInstance);
+ } catch (InstantiationException | IllegalAccessException e) {
+ logger.error(e.getMessage(), e);
+ }
+ }
+ }
+ return targetList;
+ }
+
+ /**
+ * @Title:
+ * @Description: 根据目标对象类型进行拷贝
+ * @author tkq
+ * @date:2019/1/2
+ * @Copyright: 2018 All rights reserved. 注意：禁止外泄以及用于其他的商业目
+ */
+ public static <T> T copyPropertiesByClass(Object desc, Class<T> targetClass) {
+ if (desc != null) {
+ try {
+ T newInstance = targetClass.newInstance();
+ copyProperties(desc, newInstance);
+ return newInstance;
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 进行复制方法
+ *
+ * @param dataSource
+ * 源目标对象
+ * @param target
+ * 目标对象
+ * @author tkq
+ * @date 14:37 2019-11-13
+ */
+ public static void copyProperties(Object dataSource, Object target) {
+ if (target == null) {
+ return;
+ }
+ if (dataSource == null) {
+ return;
+ }
+ MethodAccess descMethodAccess = methodMap.get(target.getClass());
+ if (descMethodAccess == null) {
+ descMethodAccess = cache(target);
+ }
+ MethodAccess orgiMethodAccess = methodMap.get(dataSource.getClass());
+ if (orgiMethodAccess == null) {
+ orgiMethodAccess = cache(dataSource);
+ }
+
+ List<String> fieldList = fieldMap.get(dataSource.getClass());
+ for (String field : fieldList) {
+ String getKey = dataSource.getClass().getName() + "." + "get" + field;
+ String setkey = target.getClass().getName() + "." + "set" + field;
+ Integer setIndex = methodIndexMap.get(setkey);
+ if (setIndex != null) {
+ int getIndex = methodIndexMap.get(getKey);
+ // 参数一需要反射的对象
+ // 参数二class.getDeclaredMethods 对应方法的index
+ // 参数对三象集合
+ try {
+ descMethodAccess.invoke(target, setIndex.intValue(), orgiMethodAccess.invoke(dataSource, getIndex));
+ } catch (Exception e) {
+ log.info("field：" + field);
+ throw e;
+ }
+ }
+ }
+ }
+
+ /**
+ * 单例模式
+ *
+ * @param object
+ * 实体对象
+ * @return MethodAccess
+ * @author tkq
+ * @date 14:36 2019/4/10
+ */
+ private static MethodAccess cache(Object object) {
+ Class<?> name = object.getClass();
+ synchronized (name) {
+ MethodAccess methodAccess = MethodAccess.get(name);
+ Class<?> className = object.getClass();
+ Set<Field> fields = new HashSet<>();
+ for (; className != Object.class; className = className.getSuperclass()) {
+ fields.addAll(Arrays.asList(className.getDeclaredFields()));
+ }
+ List<String> fieldList = new ArrayList<>(fields.size());
+ for (Field field : fields) {
+ // 是否是私有的，是否是静态的
+ if (Modifier.isPrivate(field.getModifiers()) && !Modifier.isStatic(field.getModifiers())) {
+ // 非公共私有变量
+ // 获取属性名称
+ String fieldName = StringUtils.capitalize(field.getName());
+ // 获取get方法的下标
+ int getIndex = methodAccess.getIndex("get" + fieldName);
+ // 获取set方法的下标
+ int setIndex = methodAccess.getIndex("set" + fieldName);
+ // 将类名get方法名，方法下标注册到map中
+ methodIndexMap.put(object.getClass().getName() + "." + "get" + fieldName, getIndex);
+ // 将类名set方法名，方法下标注册到map中
+ methodIndexMap.put(object.getClass().getName() + "." + "set" + fieldName, setIndex);
+ // 将属性名称放入集合里
+ fieldList.add(fieldName);
+ }
+ }
+ // 将类名，属性名称注册到map中
+ fieldMap.put(name, fieldList);
+ methodMap.put(name, methodAccess);
+ return methodAccess;
+ }
+ }
+
+ /**
+ * @description 复制属性
+ * @param source
+ * 源数据
+ * @param targetClass
+ * 目标对象类型
+ * @return
+ * @author weifei
+ * @date 2020/8/20 10:38
+ */
+ public static <T, K> K copyProperties(T source, Class<K> targetClass) {
+ if (source == null || targetClass == null) {
+ return null;
+ }
+ // 创建对象
+ try {
+ K k = targetClass.newInstance();
+ // 复制对象
+ BeanUtils.copyProperties(source, k);
+ return k;
+ } catch (Exception e) {
+ throw new RuntimeException(e.getMessage());
+ }
+ }
+
+ /**
+ * @description 复制属性
+ * @param source
+ * 源数据
+ * @param targetClass
+ * 目标对象类型
+ * @return
+ * @author weifei
+ * @date 2020/12/16 10:12
+ */
+ public static <T, K> List<K> copyProperties(List<T> source, Class<K> targetClass) {
+ if (source == null || targetClass == null) {
+ return null;
+ }
+ List<K> returnValue = new ArrayList<>();
+ try {
+ source.forEach(s -> {
+ K k = copyProperties(s, targetClass);
+ if (k != null) {
+ returnValue.add(k);
+ }
+ });
+ } catch (Exception e) {
+ throw new RuntimeException(e.getMessage());
+ }
+ return returnValue;
+ }
+
+ /**
+ * @description 深度复制对象
+ * @param source
+ * 元数据
+ * @param targetClass
+ * 目标对象类型
+ * @return
+ * @author weifei
+ * @date 2021/3/1 14:21
+ */
+ public static <T, K> K deepCopyObject(T source, Class<K> targetClass) {
+ if (source == null || targetClass == null) {
+ return null;
+ }
+ return JSONObject.parseObject(JSONObject.toJSONBytes(source), targetClass);
+ }
+
+ /**
+ * @description 深度复制list对象
+ * @param source
+ * 元数据
+ * @param targetClass
+ * 目标对象类型
+ * @return
+ * @author weifei
+ * @date 2021/3/1 14:26
+ */
+ public static <T, K> List<K> deepCopyListObject(List<T> source, Class<K> targetClass) {
+ if (source == null || targetClass == null) {
+ return null;
+ }
+ return JSONObject.parseArray(JSONObject.toJSONString(source), targetClass);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
new file mode 100644
index 0000000..71bfc6d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
@@ -0,0 +1,1222 @@
+package com.panzhihua.common.utlis;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.*;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class DateUtils {
+
+ public static DateTimeFormatter format_ymdhms = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ public static DateTimeFormatter format_ymd = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ public static DateTimeFormatter format_ymdhms_string = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
+ public static DateTimeFormatter format_ymdhms_yyyyMMddmmHHssSSS = DateTimeFormatter.ofPattern("yyyyMMddmmHHssSSS");
+ public static DateTimeFormatter format_ymdhms_no_signal = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
+ public static SimpleDateFormat yyyyMMdd_format = new SimpleDateFormat("yyyy-MM-dd");
+ public static SimpleDateFormat yyyy_MM_dd_format = new SimpleDateFormat("yyyy/MM/ddHH:mm:ss");
+ public static SimpleDateFormat ymdhms_format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ public static SimpleDateFormat ymdhm_format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ public static DateTimeFormatter format_ymd_String = DateTimeFormatter.ofPattern("yyMMdd");
+ public static SimpleDateFormat yyyyMM_format = new SimpleDateFormat("yyyy-MM");
+ public static SimpleDateFormat format_yyymmdd = new SimpleDateFormat("yyyyMMdd");
+ public static SimpleDateFormat format_yyyy = new SimpleDateFormat("yyyy");
+ public static SimpleDateFormat format_yyyyMMddHHmmss = new SimpleDateFormat("yyyyMMddHHmmss");
+ private static DateTimeFormatter format_ymdhmssss = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
+ private static DateTimeFormatter format_ymds = DateTimeFormatter.ofPattern("yyyyMMdd");
+ private static DateTimeFormatter format_yms = DateTimeFormatter.ofPattern("yyyyMM");
+ private static DateTimeFormatter format_y = DateTimeFormatter.ofPattern("yyyy");
+
+ /**
+ * 将日期对象格式化成指定的字符串格式
+ *
+ * @param date
+ * 日期对象
+ * @param formatString
+ * 格式化字符串
+ * @return String
+ */
+ public static String getDateFormatString(Date date, String formatString) {
+
+ String dateString = "";
+ SimpleDateFormat format = new SimpleDateFormat(formatString);
+ if (date != null) {
+ dateString = format.format(date);
+ }
+ return dateString;
+ }
+
+ /**
+ * 字符串转date
+ *
+ * @param date
+ * 时间戳
+ * @param format
+ * format
+ * @return 时间
+ */
+ public static Date stringToDate(String date, SimpleDateFormat format) {
+ try {
+ if (StringUtils.isBlank(date)) {
+ return null;
+ }
+ return format.parse(date);
+ } catch (ParseException e) {
+ log.error(e.getMessage(), e);
+ }
+ return null;
+ }
+
+ /**
+ * 字符串转date
+ *
+ * @param date
+ * 时间戳
+ * @return 时间
+ */
+ public static Date stringToDateStandard(String date) {
+ SimpleDateFormat format = ymdhms_format;
+ if (StringUtils.isNotBlank(date)) {
+ if (date.split("-").length == 3) {
+ if (date.split(":").length != 3) {
+ format = yyyyMMdd_format;
+ }
+ } else if (date.split("-").length == 2) {
+ format = new SimpleDateFormat("yyyy-MM");
+ }
+ try {
+ return format.parse(date);
+ } catch (ParseException e) {
+ log.error(e.getMessage(), e);
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 字符串转date
+ *
+ * @param date
+ * 时间戳
+ * @return 时间
+ */
+ public static Date stringToDateStandardByYYYY_MM_dd(String date) {
+ SimpleDateFormat format = yyyy_MM_dd_format;
+ if (StringUtils.isNotBlank(date)) {
+ try {
+ return format.parse(date);
+ } catch (ParseException e) {
+ log.error(e.getMessage(), e);
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 获取当前时间
+ *
+ * @return
+ * @throws Exception
+ */
+ public static LocalDateTime getCurrentDate() {
+ LocalDateTime now = LocalDateTime.now();
+ return now;
+ }
+
+ /**
+ * 返回当前事件的时间戳
+ *
+ * @return
+ */
+ public static Long getCurrentDateTimeStamp() {
+ return LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+ }
+
+ /**
+ * 获取当前时间字符串，格式为yyyy-MM-dd HH:mm:ss
+ *
+ * @return
+ */
+ public static String getCurrentDateStr() {
+ String nowtime = getCurrentDate().format(format_ymdhms);
+ return nowtime;
+ }
+
+ public static String getCurrentDateymd() {
+ String nowtime = getCurrentDate().format(format_ymdhms_string);
+ return nowtime;
+ }
+
+ public static String getCurrentDateyymd() {
+ String nowtime = getCurrentDate().format(format_ymd_String);
+ return nowtime;
+ }
+
+ /**
+ * 获取当前时间字符串，格式为yyyyMMdd
+ *
+ * @return
+ */
+ public static String getCurrentDateString() {
+ String nowtime = getCurrentDate().format(format_ymds);
+ return nowtime;
+ }
+
+ /**
+ * 获取当前时间字符串，格式为yyyy-MM-dd
+ *
+ * @return
+ */
+ public static String getCurrentDateStrymd() {
+ String nowtime = getCurrentDate().format(format_ymd);
+ return nowtime;
+ }
+
+ public static String getCurrentDateStr_MS() {
+ String nowtime = getCurrentDate().format(format_ymdhmssss);
+ return nowtime;
+ }
+
+ /**
+ * 获取当前时间long值
+ *
+ * @return
+ */
+ public static long getCurrentDataLong() {
+ return new Date().getTime();
+ }
+
+ /**
+ * 获取当前时间
+ *
+ * @param format
+ * @return
+ * @throws Exception
+ */
+ public static Date getCurrentDate(SimpleDateFormat format) {
+ String tempDate = format.format(new Date());
+ try {
+ return format.parse(tempDate);
+ } catch (ParseException e) {
+ log.error(e.getMessage(), e);
+ }
+ return null;
+ }
+
+ /**
+ * @param date
+ * @param newFormat
+ * @return
+ * @throws Exception
+ */
+ public static Date getDate(Date date, SimpleDateFormat newFormat) {
+ String tempDate = newFormat.format(date);
+ try {
+ return newFormat.parse(tempDate);
+ } catch (ParseException e) {
+ log.error(e.getMessage(), e);
+ }
+ return null;
+ }
+
+ public static String format(Date date, SimpleDateFormat format) {
+ if (null == date) {
+ return "";
+ }
+ return format.format(date);
+ }
+
+ /**
+ * 将给定的时间秒转换为中文格式的时分秒
+ *
+ * @param second
+ * @return
+ */
+ public static String formatSecond_ZH_HMS(Integer second) {
+ String result = "0秒";
+ if (null != second) {
+ int hours = second / (60 * 60);
+ int minutes = second / 60 - hours * 60;
+ int seconds = second - minutes * 60 - hours * 60 * 60;
+
+ String format;
+ Object[] array;
+
+ if (hours > 0) {
+ format = "%1$,d时%2$,d分%3$,d秒";
+ array = new Object[] {hours, minutes, seconds};
+ } else if (minutes > 0) {
+ format = "%1$,d分%2$,d秒";
+ array = new Object[] {minutes, seconds};
+ } else {
+ format = "%1$,d秒";
+ array = new Object[] {seconds};
+ }
+ result = String.format(format, array);
+ }
+ return result;
+ }
+
+ /**
+ * 对日期进行加法操作
+ *
+ * @param date
+ * @param days
+ * @return
+ */
+ public static Date addDay(Date date, Integer days) {
+ if (null != date) {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(date);
+ cal.add(Calendar.DATE, days);
+ return cal.getTime();
+ }
+ return null;
+ }
+
+ /**
+ * 对日期进行加法操作
+ *
+ * @param date
+ * @param month
+ * @return
+ */
+ public static Date addMonth(Date date, Integer month) {
+ if (null != date) {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(date);
+ cal.add(Calendar.MONTH, month);
+ return cal.getTime();
+ }
+ return null;
+ }
+
+ /**
+ * 对日期进行加法操作
+ *
+ * @param date
+ * @param hours
+ * @return
+ */
+ public static Date addHours(Date date, Integer hours) {
+ if (null != date) {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(date);
+ cal.add(Calendar.HOUR_OF_DAY, hours);
+ return cal.getTime();
+ }
+ return null;
+ }
+
+ /**
+ * 对日期的分钟进行加法操作
+ *
+ * @param date
+ * @param minutes
+ * @return
+ */
+ public static Date addMinutes(Date date, Integer minutes) {
+ if (null != date) {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(date);
+ cal.add(Calendar.MINUTE, minutes);
+ return cal.getTime();
+ }
+ return null;
+ }
+
+ /**
+ * 比较两个日期的大小
+ *
+ * @param date1
+ * @param date2
+ * @return 日期相等，返回0；前者大，返回1；后者大，返回-1；
+ */
+ public static int dateCompare(Date date1, Date date2) {
+ Calendar c1 = Calendar.getInstance();
+ c1.setTime(date1);
+
+ Calendar c2 = Calendar.getInstance();
+ c2.setTime(date2);
+
+ return c1.compareTo(c2);
+ }
+
+ /**
+ * 判断当前日期是否在指定日期区域内(包含起止日期) [startDate,endDate]
+ * <p/>
+ * [null,null] --> return 1;
+ *
+ * @param now
+ * @param startDate
+ * @param endDate
+ * @return -1：超出并小于startDate；0:在范围内；1：超出并大于endDate；
+ */
+ public static int validateDate(Date now, Date startDate, Date endDate) {
+ if (null == startDate && null == endDate) {
+ return 0;
+ }
+ if (null == startDate) {
+ // 当前时间大于endDate
+ if (dateCompare(now, endDate) == 1) {
+ return 1;
+ } else {
+ return 0;
+ }
+ } else {
+ if (null == endDate) {
+ // 当前时间小于startDate
+ if (dateCompare(startDate, now) == 1) {
+ return -1;
+ } else {
+ return 0;
+ }
+ } else {
+ if (dateCompare(startDate, now) == 1) {
+ return -1;
+ } else if (dateCompare(now, endDate) == 1) {
+ return 1;
+ } else {
+ return 0;
+ }
+ }
+ }
+ }
+
+ /**
+ * 计算两个日期先差多少秒
+ *
+ * @param pre
+ * 前一个日期
+ * @param after
+ * 后一个日期
+ * @return
+ */
+ public static long calTimeDifference(Date pre, Date after) {
+ return (after.getTime() - pre.getTime()) / 1000;
+ }
+
+ /**
+ * 计算两个时间相差的天数
+ *
+ * @param stardate
+ * @param enddate
+ * @return
+ */
+ public static int getHour(Date stardate, Date enddate) {
+ long nd = 1000 * 24 * 60 * 60;
+ long nh = 1000 * 60 * 60;
+ long nm = 1000 * 60;
+ long diff = enddate.getTime() - stardate.getTime();
+
+ long day = diff / nd;
+
+ long hour = diff / nh;
+
+ long min = diff / nm;
+
+ return (int)hour;
+ }
+
+ /**
+ * 结束时间与当前时间计算相差的月数
+ *
+ * @param enddate
+ * @return
+ */
+ public static int getMonthSpace(String enddate, DateTimeFormatter format) {
+ LocalDate formatted = LocalDate.parse(enddate, format);
+ LocalDate today = LocalDate.now();
+ Period per = Period.between(today, formatted);
+ if (per.getYears() == 0) {
+ return per.getMonths();
+ } else if (per.getYears() > 0) {
+ return (per.getYears() * 12) + per.getMonths();
+ }
+
+ return (per.getYears() * 12) + per.getMonths();
+ }
+
+ /**
+ * 获取某个时间段之前的时间点
+ *
+ * @return
+ */
+ public static String getSomeTimeStapStr(String sign) {
+ LocalDateTime beginDateTime = null;
+ if (sign.equals("day")) {// 一天前时间
+ beginDateTime = LocalDateTime.now().minusDays(1L);
+ } else if (sign.equals("week")) {
+ beginDateTime = LocalDateTime.now().minusWeeks(1L);
+ } else if (sign.equals("month")) {
+ beginDateTime = LocalDateTime.now().minusMonths(1L);
+ } else if (sign.equals("year")) {
+ beginDateTime = LocalDateTime.now().minusYears(1L);
+ }
+ String beginTime = beginDateTime.format(format_ymdhms);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ try {
+ long timestap = sdf.parse(beginTime).getTime();
+ beginTime = timestap + "";
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return beginTime;
+ }
+
+ public static String getSomeTimeDateStr(String sign) {
+ String beginTime = "";
+ LocalDateTime beginDateTime = null;
+ if (sign.equals("day")) {// 一天前时间
+ beginDateTime = LocalDateTime.now().minusDays(1L);
+ } else if (sign.equals("week")) {
+ beginDateTime = LocalDateTime.now().minusWeeks(1L);
+ } else if (sign.equals("month")) {
+ beginDateTime = LocalDateTime.now().minusMonths(1L);
+ } else if (sign.equals("year")) {
+ beginDateTime = LocalDateTime.now().minusYears(1L);
+ }
+ if (beginDateTime != null) {
+ beginTime = beginDateTime.format(format_ymdhms);
+ }
+ return beginTime;
+ }
+
+ /**
+ * 获取失效时间点（在什么时间失效）
+ *
+ * @param minutes
+ * 有效分钟数
+ * @return
+ */
+ public static LocalDateTime getInvalidLocalDateTime(Long minutes) {
+ return LocalDateTime.now().minusMinutes(minutes);
+ }
+
+ /**
+ * 获取当前年份
+ *
+ * @return
+ */
+ public static String getCurrentYear() {
+ Calendar instance = Calendar.getInstance();
+ return instance.get(Calendar.YEAR) + "";
+ }
+
+ /**
+ * 获取当前月份
+ *
+ * @return
+ */
+ public static String getCurrentMonth() {
+ Calendar instance = Calendar.getInstance();
+ int month = instance.get(Calendar.MONTH);
+ String result;
+ if (month < 10) {
+ result = "0" + month;
+ } else {
+ result = month + "";
+ }
+ return result;
+ }
+
+ /**
+ * 获取无符号的当前时间
+ *
+ * @return
+ */
+ public static String getCurrentDateStrNoSignal() {
+ return getCurrentDate().format(format_ymdhms_no_signal);
+ }
+
+ /**
+ * 获取前几个小时的时间
+ *
+ * @param hours
+ * @return
+ */
+ public static String getNextHourDateStrNoSignal(long hours) {
+ return LocalDateTime.now().plusHours(hours).format(format_ymdhms_no_signal);
+ }
+
+ public static Date localDateTimeToDate(LocalDateTime localDateTime) {
+ ZoneId zone = ZoneId.systemDefault();
+ Instant instant = localDateTime.atZone(zone).toInstant();
+ return Date.from(instant);
+ }
+
+ /**
+ * 小时取整
+ *
+ * @param date
+ * @param hour
+ * @return
+ */
+ public static Date integralHour(Date date, Integer hour) {
+ if (date == null || hour == null) {
+ return null;
+ }
+ long l = date.getTime() - 1;
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:00:00");
+ try {
+ Date parse = sdf.parse(sdf.format(new Date(l)));
+ return addHours(parse, hour);
+ } catch (ParseException e) {
+ return null;
+ }
+ }
+
+ /**
+ * 分钟取整 以十分钟为单位 ，去除尾端，加上 参数 46->40+minutes*10
+ *
+ * @param date
+ * @param minutes
+ * @return
+ */
+ public static Date integral10Min(Date date, Integer minutes) {
+ if (date == null || minutes == null) {
+ return null;
+ }
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(date);
+ int i = cal.get(Calendar.MINUTE);// 获取分钟
+ if (i % 10 == 0) {
+ minutes--;
+ }
+ minutes = minutes * 10 - i % 10;
+ long l = date.getTime() - 1;
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:00");
+ try {
+ Date parse = sdf.parse(sdf.format(new Date(l)));
+ return addMinutes(parse, minutes);
+ } catch (ParseException e) {
+ return null;
+ }
+ }
+
+ /**
+ * 天数取整
+ *
+ * @param date
+ * @param day
+ * @return
+ */
+ public static Date integralDay(Date date, Integer day) {
+ if (date == null || day == null) {
+ return null;
+ }
+ long l = date.getTime() - 1;
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
+ try {
+ Date parse = sdf.parse(sdf.format(new Date(l)));
+ return addDay(parse, day);
+ } catch (ParseException e) {
+ return null;
+ }
+ }
+
+ /**
+ * 日期相加减
+ *
+ * @param time
+ * 时间字符串 yyyy-MM-dd HH:mm:ss
+ * @param num
+ * 加的数，-num就是减去
+ * @return 减去相应的数量的年的日期
+ * @throws ParseException
+ */
+ public static Date yearAddNum(Date time, Integer num) {
+ // SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ // Date date = format.parse(time);
+
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(time);
+ calendar.add(Calendar.YEAR, num);
+ Date newTime = calendar.getTime();
+ return newTime;
+ }
+
+ public static boolean isValidDate(String str) {
+ boolean convertSuccess = true;
+ SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
+ try {
+ format.setLenient(false);
+ format.parse(str);
+ } catch (ParseException e) {
+ convertSuccess = false;
+ }
+ return convertSuccess;
+ }
+
+ public static Date toValidDate(String str) {
+ Date date = null;
+ SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
+ try {
+ format.setLenient(false);
+ date = format.parse(str);
+ } catch (ParseException e) {
+ log.error("党员导入日期格式错误");
+ date = new Date();
+ }
+ return date;
+ }
+
+ /**
+ * 将日期对象格式化成yyyy-MM-dd格式的字符串
+ *
+ * @param date
+ * 日期对象
+ * @return String
+ */
+ public static String getDateStringYMD(Date date) {
+
+ String dateString = "";
+ if (date != null) {
+ dateString = yyyyMMdd_format.format(date);
+ }
+ return dateString;
+ }
+
+ /**
+ * 获取当前月第一天
+ *
+ * @return
+ */
+ public static Date getFirstDayOfMonth() {
+ Calendar cal = Calendar.getInstance();
+ cal.add(Calendar.MONTH, 0);
+ int actualMinimum = cal.getActualMinimum(Calendar.DAY_OF_MONTH);
+ cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY), actualMinimum, 00, 00, 00);
+ return cal.getTime();
+ }
+
+ /**
+ * 获取当前年月的第一天时间
+ *
+ * @param year
+ * 年份
+ * @param month
+ * 月份
+ * @return 时间
+ */
+ public static Date getYearMonthStart(Integer year, Integer month) {
+ Calendar cal = Calendar.getInstance();
+ // 设置年份
+ cal.set(Calendar.YEAR, year);
+ // 设置月份
+ cal.set(Calendar.MONTH, month - 1);
+ // 获取某月最小天数
+ int firstDay = cal.getMinimum(Calendar.DATE);
+ // 设置日历中月份的最小天数
+ cal.set(Calendar.DAY_OF_MONTH, firstDay);
+ int actualMinimum = cal.getActualMinimum(Calendar.DAY_OF_MONTH);
+ cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY), actualMinimum, 00, 00, 00);
+ return cal.getTime();
+ }
+
+ /**
+ * 获取当前年月的最后一天时间
+ *
+ * @param year
+ * 年份
+ * @param month
+ * 月份
+ * @return 时间
+ */
+ public static Date getYearMonthEnd(Integer year, Integer month) {
+ Calendar cal = Calendar.getInstance();
+ // 设置年份
+ cal.set(Calendar.YEAR, year);
+ // 设置月份
+ cal.set(Calendar.MONTH, month - 1);
+ // 获取某月最大天数
+ int lastDay = cal.getMaximum(Calendar.DATE);
+ // 设置日历中月份的最大天数
+ cal.set(Calendar.DAY_OF_MONTH, lastDay);
+ int actualMinimum = cal.getActualMinimum(Calendar.DAY_OF_MONTH);
+ cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY), actualMinimum, 00, 00, 00);
+ return cal.getTime();
+ }
+
+ public static Date getDateM(Date start, int min) {
+ Calendar date1 = Calendar.getInstance();
+ date1.setTime(start);
+ date1.add(Calendar.MONTH, min);
+ return date1.getTime();
+ }
+
+ public static Date parseDateYM(String str) {
+ try {
+ return yyyyMM_format.parse(str);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public static int getMonth(Date date) {
+ Calendar instance = Calendar.getInstance();
+ instance.setTime(date);
+ return instance.get(Calendar.MONTH);
+ }
+
+ public static int getYear(Date date) {
+ Calendar instance = Calendar.getInstance();
+ instance.setTime(date);
+ return instance.get(Calendar.YEAR);
+ }
+
+ public static boolean before(Date start, Date end) {
+ Calendar date1 = Calendar.getInstance();
+ date1.setTime(start);
+ Calendar date2 = Calendar.getInstance();
+ date2.setTime(end);
+ return date1.before(date2);
+ }
+
+ /**
+ * date2比date1多的天数
+ *
+ * @param date1
+ * @param date2
+ * @return
+ */
+ public static int differentDays(Date date1, Date date2) {
+ Calendar cal1 = Calendar.getInstance();
+ cal1.setTime(date1);
+
+ Calendar cal2 = Calendar.getInstance();
+ cal2.setTime(date2);
+ int day1 = cal1.get(Calendar.DAY_OF_YEAR);
+ int day2 = cal2.get(Calendar.DAY_OF_YEAR);
+
+ int year1 = cal1.get(Calendar.YEAR);
+ int year2 = cal2.get(Calendar.YEAR);
+ if (year1 != year2) // 同一年
+ {
+ int timeDistance = 0;
+ for (int i = year1; i < year2; i++) {
+ if (i % 4 == 0 && i % 100 != 0 || i % 400 == 0) // 闰年
+ {
+ timeDistance += 366;
+ } else // 不是闰年
+ {
+ timeDistance += 365;
+ }
+ }
+
+ return timeDistance + (day2 - day1);
+ } else // 不同年
+ {
+ // System.out.println("判断day2 - day1 : " + (day2-day1));
+ return day2 - day1;
+ }
+ }
+
+ /**
+ * 计算剩余天数，不足一天按一天算
+ * @param expireDate
+ * @return
+ */
+ public static int retrieveRemainingDays(Date expireDate) {
+ Date nowDate = new Date();
+ Calendar startDate = Calendar.getInstance();
+ startDate.setTime(nowDate);
+ Calendar endDate = Calendar.getInstance();
+ endDate.setTime(expireDate);
+ Calendar date = (Calendar) startDate.clone();
+ int daysBetween = 0;
+ while (date.before(endDate)) {
+ date.add(Calendar.DAY_OF_MONTH, 1);
+ daysBetween++;
+ }
+ return daysBetween;
+ }
+
+ /**
+ * 获取当前月第一天
+ *
+ * @return
+ */
+ public static String getFirstDayOfMonthString() {
+ Calendar calendar = Calendar.getInstance();
+
+ calendar.add(Calendar.MONTH, 0);
+
+ calendar.set(Calendar.DAY_OF_MONTH, 1);
+ // 格式化日期
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ return sdf.format(calendar.getTime()) + " 00:00:00";
+ }
+
+ /**
+ * 获取当前月最后一天
+ *
+ * @return
+ */
+ public static String getLastDayOfMonthString() {
+ Calendar calendar = Calendar.getInstance();
+
+ calendar.add(Calendar.MONTH, 1);
+
+ calendar.set(Calendar.DAY_OF_MONTH, 0);
+ // 格式化日期
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ return sdf.format(calendar.getTime()) + " 23:59:59";
+ }
+ /**
+ * 获取当前月最后一天
+ *
+ * @return
+ */
+ public static Date getLastDayOfMonth() {
+ Calendar calendar = Calendar.getInstance();
+
+ calendar.add(Calendar.MONTH, 1);
+
+ calendar.set(Calendar.DAY_OF_MONTH, 0);
+ // 格式化日期
+
+ return calendar.getTime();
+ }
+
+ /**
+ * 获取当前时间（年月日）
+ *
+ * @return
+ */
+ public static String getDayOfMonthString() {
+ Calendar today = Calendar.getInstance();
+ today.set(Calendar.HOUR, 0);
+ today.set(Calendar.MINUTE, 0);
+ today.set(Calendar.SECOND, 0);
+ today.set(Calendar.MILLISECOND, 0);
+ // 格式化日期
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ return sdf.format(today.getTime());
+ }
+
+ /**
+ * 日期转周
+ *
+ * @param datetime
+ * @return
+ */
+ public static String dateToWeek(String datetime) {
+ SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd");
+ String[] weekDays = {"周日", "周一", "周二", "周三", "周四", "周五", "周六"};
+ Calendar cal = Calendar.getInstance(); // 获得一个日历
+ Date datet = null;
+ try {
+ if (StringUtils.isNotEmpty(datetime)) {
+ datet = f.parse(datetime);
+ cal.setTime(datet);
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ int w = cal.get(Calendar.DAY_OF_WEEK) - 1; // 指示一个周中的某天。
+ if (w < 0)
+ w = 0;
+ return weekDays[w];
+ }
+
+ public static void main(String[] args) throws Exception {
+// List<String> beforeDays = getBeforeDays(15);
+// System.out.println(beforeDays);
+ List<String> yearMonths = getYearMonths();
+ System.out.println(yearMonths);
+ List<String> latest12Month = getLatest12Month(LocalDate.now(), 10);
+ System.out.println(latest12Month);
+
+ }
+
+ /**
+ * 获取当前年月字符串
+ * @return 年月字符串
+ */
+ public static String getCurrentDateString_YYYY_MM() {
+ String nowtime = getCurrentDate().format(format_yms);
+ return nowtime;
+ }
+
+ /**
+ * 获取当前年字符串
+ * @return
+ */
+ public static String getCurrentDateString_YYYY() {
+ String nowtime = getCurrentDate().format(format_y);
+ return nowtime;
+ }
+
+ /**
+ * 获取当前年第一天
+ * @return 当前年第一天时间
+ */
+ public static Date getFirstDayOfYear() {
+ Calendar currCal=Calendar.getInstance();
+ int currentYear = currCal.get(Calendar.YEAR);
+ return getYearFirst(currentYear);
+ }
+
+ /**
+ * 获取某年第一天日期
+ * @param year 年份
+ * @return Date
+ */
+ public static Date getYearFirst(int year){
+ Calendar calendar = Calendar.getInstance();
+ calendar.clear();
+ calendar.set(Calendar.YEAR, year);
+ Date currYearFirst = calendar.getTime();
+ return currYearFirst;
+ }
+
+ /**
+ * 获取上月第一天时间
+ * @return 上月第一天时间
+ */
+ public static Date getLastMonthFirst(){
+ // 上月起始
+ Calendar lastMonthFirstDateCal = Calendar.getInstance();
+ lastMonthFirstDateCal.add(Calendar.MONTH,-1);
+ lastMonthFirstDateCal.set(Calendar.DAY_OF_MONTH, 1);
+ String lastMonthFirstTime = yyyyMMdd_format.format(lastMonthFirstDateCal.getTime()) + " 00:00:00";
+ return stringToDateStandard(lastMonthFirstTime);
+ }
+
+ /**
+ * 获取上月最后一天时间
+ * @return 最后一天时间
+ */
+ public static Date getLastMonthEnd(){
+ // 上月末尾
+ Calendar lastMonthEndDateCal = Calendar.getInstance();
+ lastMonthEndDateCal.add(Calendar.MONTH,-1);
+ lastMonthEndDateCal.set(Calendar.DAY_OF_MONTH, lastMonthEndDateCal.getActualMaximum(Calendar.DAY_OF_MONTH));
+ String lastMonthEndTime = yyyyMMdd_format.format(lastMonthEndDateCal.getTime()) + " 23:59:59";
+ return stringToDateStandard(lastMonthEndTime);
+ }
+
+ /**
+ * 获取近20天日期
+ * @return 近20天日期
+ */
+ public static List<Date> getOldDays() {
+ List<Date> dates = new ArrayList<>();
+ Date date = new Date();
+ for (int i = 19; i >= 0; i--) {
+ Date date1 = DateUtils.addDay(date, -i);
+ dates.add(date1);
+ }
+ return dates;
+ }
+
+ /**
+ * 获取上月最后一天时间
+ * @return 上月最后一天时间
+ */
+ public static String getOldMonthLastDay(){
+ Calendar calendar=Calendar.getInstance();
+ int month=calendar.get(Calendar.MONTH);
+ calendar.set(Calendar.MONTH, month-1);
+ calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+ return format_yyymmdd.format(calendar.getTime());
+ }
+
+ /**
+ * 获取上月第一天时间
+ * @return 上月第一天时间
+ */
+ public static String getOldMonthFirstDay(){
+ Calendar calendar=Calendar.getInstance();
+ calendar.add(Calendar.MONTH, -1);
+ calendar.set(Calendar.DAY_OF_MONTH, 1);
+ return format_yyymmdd.format(calendar.getTime());
+ }
+
+ /**
+ * 获取某年的月份最后一天时间
+ * @param year 年份
+ * @return 月份list
+ */
+ public static List<String> getYearLastMonths(Integer year){
+ List<String> list = new ArrayList<>();
+ list.add(getLastDayOfMonth(year,1));
+ list.add(getLastDayOfMonth(year,2));
+ list.add(getLastDayOfMonth(year,3));
+ list.add(getLastDayOfMonth(year,4));
+ list.add(getLastDayOfMonth(year,5));
+ list.add(getLastDayOfMonth(year,6));
+ list.add(getLastDayOfMonth(year,7));
+ list.add(getLastDayOfMonth(year,8));
+ list.add(getLastDayOfMonth(year,9));
+ list.add(getLastDayOfMonth(year,10));
+ list.add(getLastDayOfMonth(year,11));
+ list.add(getLastDayOfMonth(year,12));
+ return list;
+ }
+
+ /**
+ * 获取某年的月份第一天时间
+ * @param year 年份
+ * @return 月份list
+ */
+ public static List<String> getYearFirstMonths(Integer year){
+ List<String> list = new ArrayList<>();
+ list.add(getFirstDayOfMonth(year,1));
+ list.add(getFirstDayOfMonth(year,2));
+ list.add(getFirstDayOfMonth(year,3));
+ list.add(getFirstDayOfMonth(year,4));
+ list.add(getFirstDayOfMonth(year,5));
+ list.add(getFirstDayOfMonth(year,6));
+ list.add(getFirstDayOfMonth(year,7));
+ list.add(getFirstDayOfMonth(year,8));
+ list.add(getFirstDayOfMonth(year,9));
+ list.add(getFirstDayOfMonth(year,10));
+ list.add(getFirstDayOfMonth(year,11));
+ list.add(getFirstDayOfMonth(year,12));
+ return list;
+ }
+
+ /**
+ * 获取某年某月最后一天
+ * @param year 年份
+ * @param month 月份
+ * @return 某年某月最后一天
+ */
+ public static String getLastDayOfMonth(int year,int month)
+ {
+ Calendar cal = Calendar.getInstance();
+ //设置年份
+ cal.set(Calendar.YEAR,year);
+ //设置月份
+ cal.set(Calendar.MONTH, month-1);
+ //获取某月最大天数
+ int lastDay = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
+ //设置日历中月份的最大天数
+ cal.set(Calendar.DAY_OF_MONTH, lastDay);
+ //格式化日期
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String lastDayOfMonth = sdf.format(cal.getTime());
+ return lastDayOfMonth;
+ }
+
+ /**
+ * 获取某年某月的第一天
+ * @param year 年份
+ * @param month 月份
+ * @return 某年某月第一天
+ */
+ public static String getFirstDayOfMonth(int year,int month)
+ {
+ Calendar cal = Calendar.getInstance();
+ //设置年份
+ cal.set(Calendar.YEAR,year);
+ //设置月份
+ cal.set(Calendar.MONTH, month-1);
+ //获取某月最小天数
+ int firstDay = cal.getActualMinimum(Calendar.DAY_OF_MONTH);
+ //设置日历中月份的最小天数
+ cal.set(Calendar.DAY_OF_MONTH, firstDay);
+ //格式化日期
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String firstDayOfMonth = sdf.format(cal.getTime());
+
+ return firstDayOfMonth;
+ }
+
+ /**
+ * 获取20天前那天时间
+ *
+ * @return
+ */
+ public static String getTwentyDay() {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(new Date());
+ cal.add(Calendar.DATE, -20);
+
+ return DateUtil.format(cal.getTime(),"yyyy-MM-dd");
+ }
+
+ /**
+ * 获取之前的日期
+ *
+ * @return
+ */
+ public static String getBeforeDay(Integer amount) {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(new Date());
+ cal.add(Calendar.DATE, -amount);
+ return DateUtil.format(cal.getTime(),"yyyy-MM-dd");
+ }
+
+ /**
+ * 获取最近本月20天数据
+ *
+ * @return
+ */
+ public static String getMonthTwentyDay() {
+ Date date = new Date();
+ Long offset = DateUtil.between(new Date(), DateUtil.beginOfMonth(date), DateUnit.DAY);
+ if (offset >= 20) {
+ return getTwentyDay();
+ } else {
+ //距离月初不足20天
+ Calendar calendar = new GregorianCalendar();
+ calendar.setTime(date);
+ //获得本月第一天
+ calendar.add(Calendar.MONTH, 0);
+ calendar.set(Calendar.DAY_OF_MONTH, 1);
+ return DateUtil.format(calendar.getTime(),"yyyy-MM-dd");
+ }
+
+ }
+
+ public static List<String> getBeforeDays(int before) {
+ List<String> dates = new ArrayList<>();
+ for (int i = before; i >= 0; i--) {
+ dates.add(getBeforeDay(i));
+ }
+ return dates;
+ }
+
+ /**
+ * 获取当年所有月份
+ *
+ * @return
+ */
+ public static List<String> getYearMonths() {
+ Calendar instance = Calendar.getInstance();
+ int year = instance.get(Calendar.YEAR);
+ List<String> months = new ArrayList<>();
+ for (int i = 1; i <= 12; i++) {
+ String result = String.valueOf(year);
+ if (i < 10) {
+ result = result + "-0" +i;
+ } else {
+ result = result + "-"+i;
+ }
+ months.add(result);
+ }
+ return months;
+ }
+
+ //获取当前12个月
+ public static List<String> getLatest12Month(LocalDate date,int num){
+ List<String> monthList = new ArrayList<>();
+ for(int i = 0;i <= num-1; i++){
+ LocalDate localDate = date.minusMonths(i);
+ String month = localDate.toString().substring(0,7);
+ monthList.add(month);
+ }
+ return monthList;
+ }
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DifferentLongListUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DifferentLongListUtil.java
new file mode 100644
index 0000000..36dcba8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DifferentLongListUtil.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.utlis;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: llming
+ * @Description: 获取不同两个list不同元素
+ */
+public class DifferentLongListUtil {
+ public static List<Long> getDiffrent(List<Long> list1, List<Long> list2) {
+ Map<Long, Integer> map = new HashMap<Long, Integer>(list1.size() + list2.size());
+ List<Long> diff = new ArrayList<Long>();
+ List<Long> maxList = list1;
+ List<Long> minList = list2;
+ if (list2.size() > list1.size()) {
+ maxList = list2;
+ minList = list1;
+ }
+
+ for (Long Long : maxList) {
+ map.put(Long, 1);
+ }
+
+ for (Long Long : minList) {
+ Integer cc = map.get(Long);
+ if (cc != null) {
+ map.put(Long, ++cc);
+ continue;
+ }
+ map.put(Long, 1);
+ }
+
+ for (Map.Entry<Long, Integer> entry : map.entrySet()) {
+ if (entry.getValue() == 1) {
+ diff.add(entry.getKey());
+ }
+ }
+ return diff;
+ }
+
+ public static void main(Long[] args) {
+ // List<Long> Longs1 = Arrays.asList(1L, 2L, 2L, 3L, 4L);
+ // List<Long> Longs2 = Arrays.asList(1L, 2L, 5L, 6L, 4L);
+ // List<Long> diffrent = getDiffrent(Longs1, Longs2);
+ // System.out.println(diffrent);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/EasyExcel.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/EasyExcel.java
new file mode 100644
index 0000000..d21efdc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/EasyExcel.java
@@ -0,0 +1,84 @@
+package com.panzhihua.common.utlis;
+
+import com.alibaba.excel.support.ExcelTypeEnum;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.List;
+
+@Slf4j
+public class EasyExcel {
+
+ /**
+ * 导出Excel(07版.xlsx)到指定路径下
+ *
+ * @param path 路径
+ * @param excelName Excel名称
+ * @param sheetName sheet页名称
+ * @param clazz Excel要转换的类型
+ * @param data 要导出的数据
+ */
+ public static void export2File(String path, String excelName, String sheetName, Class clazz, List data) {
+ String fileName = path.concat(excelName).concat(ExcelTypeEnum.XLSX.getValue());
+ com.alibaba.excel.EasyExcel.write(fileName, clazz).sheet(sheetName).doWrite(data);
+ }
+
+ /**
+ * 导出Excel(07版.xlsx)到web
+ *
+ * @param response 响应
+ * @param excelName Excel名称
+ * @param sheetName sheet页名称
+ * @param clazz Excel要转换的类型
+ * @param data 要导出的数据
+ * @throws Exception
+ */
+ public static void export2Web(HttpServletResponse response, String excelName, String sheetName, Class clazz, List data) throws Exception {
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ // 这里URLEncoder.encode可以防止中文乱码
+ excelName = URLEncoder.encode(excelName, "UTF-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + excelName + ExcelTypeEnum.XLSX.getValue());
+ com.alibaba.excel.EasyExcel.write(response.getOutputStream(), clazz).sheet(sheetName).doWrite(data);
+ }
+
+ /**
+ * 将指定位置指定名称的Excel导出到web
+ *
+ * @param response 响应
+ * @param path 文件路径
+ * @param excelName 文件名称
+ * @return
+ * @throws UnsupportedEncodingException
+ */
+ public static String export2Web4File(HttpServletResponse response, String path, String excelName) throws UnsupportedEncodingException {
+ File file = new File(path.concat(excelName).concat(ExcelTypeEnum.XLSX.getValue()));
+ if (!file.exists()) {
+ return "文件不存在！";
+ }
+
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ // 这里URLEncoder.encode可以防止中文乱码
+ excelName = URLEncoder.encode(excelName, "UTF-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + excelName + ExcelTypeEnum.XLSX.getValue());
+
+ try (
+ FileInputStream in = new FileInputStream(file);
+ ServletOutputStream out = response.getOutputStream();
+ ) {
+ IOUtils.copy(in, out);
+ return "导出成功！";
+ } catch (Exception e) {
+ log.error("导出文件异常：", e);
+ }
+
+ return "导出失败！";
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/EscapeUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/EscapeUtil.java
new file mode 100644
index 0000000..c3688b9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/EscapeUtil.java
@@ -0,0 +1,133 @@
+package com.panzhihua.common.utlis;
+
+/**
+ * 转义和反转义工具类
+ *
+ * @author ruoyi
+ */
+public class EscapeUtil {
+ public static final String RE_HTML_MARK = "(<[^<]*?>)|(<[\\s]*?/[^<]*?>)|(<[^<]*?/[\\s]*?>)";
+
+ private static final char[][] TEXT = new char[64][];
+
+ static {
+ for (int i = 0; i < 64; i++) {
+ TEXT[i] = new char[] {(char)i};
+ }
+
+ // special HTML characters
+ TEXT['\''] = "'".toCharArray(); // 单引号
+ TEXT['"'] = """.toCharArray(); // 单引号
+ TEXT['&'] = "&".toCharArray(); // &符
+ TEXT['<'] = "<".toCharArray(); // 小于号
+ TEXT['>'] = ">".toCharArray(); // 大于号
+ }
+
+ /**
+ * 转义文本中的HTML字符为安全的字符
+ *
+ * @param text
+ * 被转义的文本
+ * @return 转义后的文本
+ */
+ public static String escape(String text) {
+ return encode(text);
+ }
+
+ /**
+ * 还原被转义的HTML特殊字符
+ *
+ * @param content
+ * 包含转义符的HTML内容
+ * @return 转换后的字符串
+ */
+ public static String unescape(String content) {
+ return decode(content);
+ }
+
+ /**
+ * 清除所有HTML标签，但是不删除标签内的内容
+ *
+ * @param content
+ * 文本
+ * @return 清除标签后的文本
+ */
+ public static String clean(String content) {
+ return new HTMLFilter().filter(content);
+ }
+
+ /**
+ * Escape编码
+ *
+ * @param text
+ * 被编码的文本
+ * @return 编码后的字符
+ */
+ private static String encode(String text) {
+ int len;
+ if ((text == null) || ((len = text.length()) == 0)) {
+ return StringUtils.EMPTY;
+ }
+ StringBuilder buffer = new StringBuilder(len + (len >> 2));
+ char c;
+ for (int i = 0; i < len; i++) {
+ c = text.charAt(i);
+ if (c < 64) {
+ buffer.append(TEXT[c]);
+ } else {
+ buffer.append(c);
+ }
+ }
+ return buffer.toString();
+ }
+
+ /**
+ * Escape解码
+ *
+ * @param content
+ * 被转义的内容
+ * @return 解码后的字符串
+ */
+ public static String decode(String content) {
+ if (StringUtils.isEmpty(content)) {
+ return content;
+ }
+
+ StringBuilder tmp = new StringBuilder(content.length());
+ int lastPos = 0, pos = 0;
+ char ch;
+ while (lastPos < content.length()) {
+ pos = content.indexOf("%", lastPos);
+ if (pos == lastPos) {
+ if (content.charAt(pos + 1) == 'u') {
+ ch = (char)Integer.parseInt(content.substring(pos + 2, pos + 6), 16);
+ tmp.append(ch);
+ lastPos = pos + 6;
+ } else {
+ ch = (char)Integer.parseInt(content.substring(pos + 1, pos + 3), 16);
+ tmp.append(ch);
+ lastPos = pos + 3;
+ }
+ } else {
+ if (pos == -1) {
+ tmp.append(content.substring(lastPos));
+ lastPos = content.length();
+ } else {
+ tmp.append(content, lastPos, pos);
+ lastPos = pos;
+ }
+ }
+ }
+ return tmp.toString();
+ }
+
+ public static void main(String[] args) {
+ String html = "<script>alert(1);</script>";
+ // String html = "<scr<script>ipt>alert(\"XSS\")</scr<script>ipt>";
+ // String html = "<123";
+ // String html = "123>";
+ System.out.println(EscapeUtil.clean(html));
+ System.out.println(EscapeUtil.escape(html));
+ System.out.println(EscapeUtil.unescape(html));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ExcelSelectListUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ExcelSelectListUtil.java
new file mode 100644
index 0000000..5957f55
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ExcelSelectListUtil.java
@@ -0,0 +1,64 @@
+package com.panzhihua.common.utlis;
+
+import org.apache.poi.hssf.usermodel.DVConstraint;
+import org.apache.poi.hssf.usermodel.HSSFDataValidation;
+import org.apache.poi.ss.usermodel.Name;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.util.CellRangeAddressList;
+
+public final class ExcelSelectListUtil {
+ private ExcelSelectListUtil() {
+ throw new IllegalStateException("Utility class");
+ }
+
+ /**
+ * firstRow 開始行號 根据此项目，默认为2(下标0开始) lastRow 根据此项目，默认为最大65535 firstCol 区域中第一个单元格的列号 (下标0开始) lastCol 区域中最后一个单元格的列号
+ * strings 下拉内容
+ */
+ public static void selectList(Workbook workbook, int firstCol, int lastCol, String[] strings) {
+ int charLenth = stringArrayLength(strings);
+ int arraylLenth = strings.length;
+ if (charLenth + arraylLenth >= 255) {
+ Sheet sheet = workbook.getSheetAt(0);
+ // 解决下拉超过255个字符的问题
+ String hiddenSheet = "hidden" + firstCol;
+ Sheet category1Hidden = workbook.createSheet(hiddenSheet);
+ for (int i = 0, length = strings.length; i < length; i++) {
+ // 循环赋值（为了防止下拉框的行数与隐藏域的行数相对应来获取>=选中行数的数组，将隐藏域加到结束行之后）
+ category1Hidden.createRow(i).createCell(0).setCellValue(strings[i]);
+ }
+ Name category1Name = workbook.createName();
+ category1Name.setNameName(hiddenSheet);
+ category1Name.setRefersToFormula(hiddenSheet + "!$A$1:$A$" + strings.length);
+ // A1:A代表隐藏域创建第?列createCell(?)时。以A1列开始A行数据获取下拉数组
+ // 生成下拉列表
+ // 只对(x，x)单元格有效
+ CellRangeAddressList cellRangeAddressList = new CellRangeAddressList(2, 65535, firstCol, lastCol);
+ // 生成下拉框内容
+ DVConstraint dvConstraint = DVConstraint.createFormulaListConstraint(hiddenSheet);
+ HSSFDataValidation dataValidation = new HSSFDataValidation(cellRangeAddressList, dvConstraint);
+ // 对sheet页生效
+ workbook.setSheetHidden(1, true);
+ sheet.addValidationData(dataValidation);
+ } else {
+ Sheet sheet = workbook.getSheetAt(0);
+ // 生成下拉列表
+ // 只对(x，x)单元格有效
+ CellRangeAddressList cellRangeAddressList = new CellRangeAddressList(2, 65535, firstCol, lastCol);
+ // 生成下拉框内容
+ DVConstraint dvConstraint = DVConstraint.createExplicitListConstraint(strings);
+ HSSFDataValidation dataValidation = new HSSFDataValidation(cellRangeAddressList, dvConstraint);
+ // 对sheet页生效
+ sheet.addValidationData(dataValidation);
+ }
+ }
+
+ private static int stringArrayLength(String[] args) {
+ int rs = 0;
+ for (int i = 0; i < args.length; i++) {
+ rs += args[i].length();
+ }
+ return rs;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ExcelSelectObject.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ExcelSelectObject.java
new file mode 100644
index 0000000..e5c615c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ExcelSelectObject.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.utlis;
+
+import lombok.Data;
+
+/**
+ * description ExcelSelectObject Excel 下拉类别传递对象
+ *
+ * @author manailin
+ * @date 2019/7/10 10:03
+ */
+@Data
+public class ExcelSelectObject {
+
+ /**
+ * firstCol 区域中第一个单元格的列号 (下标0开始)
+ */
+ private int firstCol;
+ /**
+ * lastCol 区域中最后一个单元格的列号
+ */
+ private int lastCol;
+ /**
+ * strings 下拉内容
+ */
+ private String[] strings;
+
+ public ExcelSelectObject(final int firstCol, final int lastCol, final String[] strings) {
+ this.firstCol = firstCol;
+ this.lastCol = lastCol;
+ this.strings = strings;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ExcelUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ExcelUtil.java
new file mode 100644
index 0000000..1045404
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ExcelUtil.java
@@ -0,0 +1,177 @@
+package com.panzhihua.common.utlis;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * Excel工具类
+ *
+ * @author manailin
+ * @date 2019/1/6
+ */
+@Slf4j
+public class ExcelUtil {
+ private ExcelUtil() {
+ throw new IllegalStateException("Utility class");
+ }
+
+ /**
+ * 导出
+ *
+ * @param list
+ * 数据列表
+ * @param title
+ * 标题
+ * @param sheetName
+ * sheet名称
+ * @param pojoClass
+ * 元素类型
+ * @param fileName
+ * 文件名
+ * @param isCreateHeader
+ * 是否创建列头
+ * @param response
+ * @throws IOException
+ */
+ public static void exportExcel(List<?> list, String title, String sheetName, Class<?> pojoClass, String fileName,
+ boolean isCreateHeader, HttpServletResponse response) throws IOException {
+ ExportParams exportParams = new ExportParams(title, sheetName);
+ exportParams.setCreateHeadRows(isCreateHeader);
+ defaultExport(list, pojoClass, fileName, response, exportParams);
+
+ }
+
+ /**
+ * 导出
+ *
+ * @param list
+ * 数据列表
+ * @param title
+ * 标题
+ * @param sheetName
+ * sheet名称
+ * @param pojoClass
+ * 元素类型
+ * @param fileName
+ * 文件名
+ * @param response
+ * @throws IOException
+ */
+ public static void exportExcel(List<?> list, String title, String sheetName, Class<?> pojoClass, String fileName,
+ HttpServletResponse response) throws IOException {
+ defaultExport(list, pojoClass, fileName, response, new ExportParams(title, sheetName));
+ }
+
+ /**
+ * 导出excel 带下拉列表的
+ *
+ * @param list
+ * 数据列表
+ * @param title
+ * 标题
+ * @param sheetName
+ * sheet名称
+ * @param pojoClass
+ * 元素类型
+ * @param fileName
+ * 文件名
+ * @param response
+ * @throws IOException
+ */
+ public static void exportExcelForSelectList(List<?> list, String title, String sheetName, Class<?> pojoClass,
+ String fileName, List<ExcelSelectObject> selectListObject, HttpServletResponse response) throws IOException {
+ Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(title, sheetName), pojoClass, list);
+ // 这里是自己加的 带下拉框的代码
+ selectListObject.forEach(selectList -> ExcelSelectListUtil.selectList(workbook, selectList.getFirstCol(),
+ selectList.getLastCol(), selectList.getStrings()));
+ for (int i = 2; i < selectListObject.size(); i++) {
+ Sheet sheet = workbook.getSheetAt(0);
+ Row row = sheet.createRow(i);
+ CellStyle style = workbook.createCellStyle();
+ DataFormat format = workbook.createDataFormat();
+ style.setDataFormat(format.getFormat("@"));
+ row.setRowStyle(style);
+ }
+ if (workbook != null) {
+ downLoadExcel(fileName, response, workbook);
+ }
+ }
+
+ /**
+ * 导出
+ *
+ * @param list
+ * 数据列表(元素是Map)
+ * @param fileName
+ * 文件名
+ * @param response
+ * @throws IOException
+ */
+ public static void exportExcel(List<Map<String, Object>> list, String fileName, HttpServletResponse response)
+ throws IOException {
+ defaultExport(list, fileName, response);
+ }
+
+ private static void defaultExport(List<?> list, Class<?> pojoClass, String fileName, HttpServletResponse response,
+ ExportParams exportParams) throws IOException {
+ Workbook workbook = ExcelExportUtil.exportExcel(exportParams, pojoClass, list);
+ if (workbook != null) {
+ downLoadExcel(fileName, response, workbook);
+ }
+ }
+
+ private static void defaultExport(List<Map<String, Object>> list, String fileName, HttpServletResponse response)
+ throws IOException {
+ Workbook workbook = ExcelExportUtil.exportExcel(list, ExcelType.XSSF);
+ if (workbook != null) {
+ downLoadExcel(fileName, response, workbook);
+ }
+ }
+
+ private static void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook)
+ throws IOException {
+ response.setCharacterEncoding("UTF-8");
+ response.setHeader("content-Type", "application/vnd.ms-excel");
+ response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
+ workbook.write(response.getOutputStream());
+ }
+
+ public static <T> List<T> importExcel(String filePath, Integer titleRows, Integer headerRows, Class<T> pojoClass) {
+ if (StringUtils.isBlank(filePath)) {
+ return Collections.emptyList();
+ }
+ ImportParams params = new ImportParams();
+ params.setTitleRows(titleRows);
+ params.setHeadRows(headerRows);
+ return ExcelImportUtil.importExcel(new File(filePath), pojoClass, params);
+ }
+
+ public static <T> List<T> importExcel(MultipartFile file, Integer titleRows, Integer headerRows, Class<T> pojoClass)
+ throws Exception {
+ if (file == null) {
+ return Collections.emptyList();
+ }
+ ImportParams params = new ImportParams();
+ params.setTitleRows(titleRows);
+ params.setHeadRows(headerRows);
+ return ExcelImportUtil.importExcel(file.getInputStream(), pojoClass, params);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ExcelUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ExcelUtils.java
new file mode 100644
index 0000000..b8aeb94
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ExcelUtils.java
@@ -0,0 +1,79 @@
+package com.panzhihua.common.utlis;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.metadata.style.WriteCellStyle;
+import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.panzhihua.common.excel.CustomSheetWriteHandler;
+import com.panzhihua.common.model.dtos.FtpConfig;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.List;
+
+/**
+ * @author lyq
+ * excel工具类
+ */
+@Slf4j
+public class ExcelUtils {
+
+ public static String adminExport(FtpConfig config, String name, List<List<String>> headList
+ , List<List<Object>> datalist, String sheetName, Object obj) {
+ String ftpUrl = "/mnt/data/web/excel/";
+ try {
+ SFTPUtil sftp = new SFTPUtil(config.getUserName(), config.getPassword(), config.getHost(), config.getPort());
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ WriteCellStyle headWriteCellStyle = new WriteCellStyle();
+ WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
+
+ contentWriteCellStyle.setWrapped(true);
+ HorizontalCellStyleStrategy horizontalCellStyleStrategy =
+ new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
+ LongestMatchColumnWidthStyleStrategy longestMatchColumnWidthStyleStrategy = new LongestMatchColumnWidthStyleStrategy();
+
+ excelWriter = EasyExcel.write(fileName, Object.class)
+ .registerWriteHandler(horizontalCellStyleStrategy)
+ .registerWriteHandler(longestMatchColumnWidthStyleStrategy)
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet(sheetName).head(headList).build();
+ excelWriter.write(datalist, writeSheet);
+ excelWriter.finish();
+ File file = new File(fileName);
+ inputStream = new FileInputStream(file);
+ sftp.uploadMore(ftpUrl, name, inputStream);
+ sftp.logout();
+ inputStream.close();
+ String absolutePath = file.getAbsolutePath();
+ boolean delete = file.delete();
+ log.info("删除excel【{}】结果【{}】", absolutePath, delete);
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ return config.getExcelUrl() + name;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return null;
+ }
+ return null;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FeignConfig.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FeignConfig.java
new file mode 100644
index 0000000..7029497
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FeignConfig.java
@@ -0,0 +1,47 @@
+package com.panzhihua.common.utlis;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Enumeration;
+
+/**
+ * @author zzj
+ */
+@Configuration
+public class FeignConfig {
+ //配置feign拦截器，解决请求头问题
+ @Bean("requestInterceptor")
+ public RequestInterceptor requestInterceptor() {
+ return new RequestInterceptor() {
+ //获取所有浏览器发送的请求属性，请求头赋值到feign
+ @Override
+ public void apply(RequestTemplate requestTemplate) {
+ //请求属性
+ ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+ if (attributes != null) {
+ HttpServletRequest request = attributes.getRequest();
+ //获取浏览器发起的请求头
+ Enumeration<String> headerNames = request.getHeaderNames();
+ if (headerNames != null) {
+ while (headerNames.hasMoreElements()) {
+ String name = headerNames.nextElement(); //请求头名称 Authorization
+ String value = request.getHeader(name);//请求头数据 "Bearer b1dbb4cf-7de6-41e5-99e2-0e8b7e8fe6ee"
+ // 跳过 content-length，解决too many bites written的问题
+ if (name.equalsIgnoreCase("content-length")){
+ continue;
+ }
+ requestTemplate.header(name, value);
+ }
+ }
+ }
+
+ }
+ };
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FeignHystrixConcurrencyStrategy.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FeignHystrixConcurrencyStrategy.java
new file mode 100644
index 0000000..3b145f9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FeignHystrixConcurrencyStrategy.java
@@ -0,0 +1,128 @@
+package com.panzhihua.common.utlis;
+
+import com.netflix.hystrix.HystrixThreadPoolKey;
+import com.netflix.hystrix.HystrixThreadPoolProperties;
+import com.netflix.hystrix.strategy.HystrixPlugins;
+import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy;
+import com.netflix.hystrix.strategy.concurrency.HystrixRequestVariable;
+import com.netflix.hystrix.strategy.concurrency.HystrixRequestVariableLifecycle;
+import com.netflix.hystrix.strategy.eventnotifier.HystrixEventNotifier;
+import com.netflix.hystrix.strategy.executionhook.HystrixCommandExecutionHook;
+import com.netflix.hystrix.strategy.metrics.HystrixMetricsPublisher;
+import com.netflix.hystrix.strategy.properties.HystrixPropertiesStrategy;
+import com.netflix.hystrix.strategy.properties.HystrixProperty;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+@Component
+public class FeignHystrixConcurrencyStrategy extends HystrixConcurrencyStrategy {
+
+ private static final Logger log = LoggerFactory.getLogger(FeignHystrixConcurrencyStrategy.class);
+
+ private HystrixConcurrencyStrategy delegate;
+
+ public FeignHystrixConcurrencyStrategy() {
+ try {
+ this.delegate = HystrixPlugins.getInstance().getConcurrencyStrategy();
+ if (this.delegate instanceof FeignHystrixConcurrencyStrategy) {
+ // Welcome to singleton hell...
+ return;
+ }
+ HystrixCommandExecutionHook commandExecutionHook = HystrixPlugins
+ .getInstance().getCommandExecutionHook();
+ HystrixEventNotifier eventNotifier = HystrixPlugins.getInstance()
+ .getEventNotifier();
+ HystrixMetricsPublisher metricsPublisher = HystrixPlugins.getInstance()
+ .getMetricsPublisher();
+ HystrixPropertiesStrategy propertiesStrategy = HystrixPlugins.getInstance()
+ .getPropertiesStrategy();
+ this.logCurrentStateOfHystrixPlugins(eventNotifier, metricsPublisher,
+ propertiesStrategy);
+ HystrixPlugins.reset();
+ HystrixPlugins.getInstance().registerConcurrencyStrategy(this);
+ HystrixPlugins.getInstance()
+ .registerCommandExecutionHook(commandExecutionHook);
+ HystrixPlugins.getInstance().registerEventNotifier(eventNotifier);
+ HystrixPlugins.getInstance().registerMetricsPublisher(metricsPublisher);
+ HystrixPlugins.getInstance().registerPropertiesStrategy(propertiesStrategy);
+ }
+ catch (Exception e) {
+ log.error("Failed to register Sleuth Hystrix Concurrency Strategy", e);
+ }
+ }
+
+ private void logCurrentStateOfHystrixPlugins(HystrixEventNotifier eventNotifier,
+ HystrixMetricsPublisher metricsPublisher,
+ HystrixPropertiesStrategy propertiesStrategy) {
+ if (log.isDebugEnabled()) {
+ log.debug("Current Hystrix plugins configuration is ["
+ + "concurrencyStrategy [" + this.delegate + "]," + "eventNotifier ["
+ + eventNotifier + "]," + "metricPublisher [" + metricsPublisher + "],"
+ + "propertiesStrategy [" + propertiesStrategy + "]," + "]");
+ log.debug("Registering Sleuth Hystrix Concurrency Strategy.");
+ }
+ }
+
+ @Override
+ public <T> Callable<T> wrapCallable(Callable<T> callable) {
+ RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+ return new WrappedCallable<>(callable, requestAttributes);
+ }
+
+ @Override
+ public ThreadPoolExecutor getThreadPool(HystrixThreadPoolKey threadPoolKey,
+ HystrixProperty<Integer> corePoolSize,
+ HystrixProperty<Integer> maximumPoolSize,
+ HystrixProperty<Integer> keepAliveTime, TimeUnit unit,
+ BlockingQueue<Runnable> workQueue) {
+ return this.delegate.getThreadPool(threadPoolKey, corePoolSize, maximumPoolSize,
+ keepAliveTime, unit, workQueue);
+ }
+
+ @Override
+ public ThreadPoolExecutor getThreadPool(HystrixThreadPoolKey threadPoolKey,
+ HystrixThreadPoolProperties threadPoolProperties) {
+ return this.delegate.getThreadPool(threadPoolKey, threadPoolProperties);
+ }
+
+ @Override
+ public BlockingQueue<Runnable> getBlockingQueue(int maxQueueSize) {
+ return this.delegate.getBlockingQueue(maxQueueSize);
+ }
+
+ @Override
+ public <T> HystrixRequestVariable<T> getRequestVariable(
+ HystrixRequestVariableLifecycle<T> rv) {
+ return this.delegate.getRequestVariable(rv);
+ }
+
+ static class WrappedCallable<T> implements Callable<T> {
+
+ private final Callable<T> target;
+ private final RequestAttributes requestAttributes;
+
+ public WrappedCallable(Callable<T> target, RequestAttributes requestAttributes) {
+ this.target = target;
+ this.requestAttributes = requestAttributes;
+ }
+
+ @Override
+ public T call() throws Exception {
+ try {
+ RequestContextHolder.setRequestAttributes(requestAttributes);
+ return target.call();
+ }
+ finally {
+ RequestContextHolder.resetRequestAttributes();
+ }
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileType.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileType.java
new file mode 100644
index 0000000..accda4e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileType.java
@@ -0,0 +1,91 @@
+package com.panzhihua.common.utlis;
+
+import java.io.FileInputStream;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * FileType 应用模块名称
+ * <p>
+ * 代码描述 文件类型判断工具类
+ * <p>
+ * Copyright: Copyright (C) 2021 XXX, Inc. All rights reserved.
+ * <p>
+ * Company: 成都呐喊信息技术有限公司
+ * <p>
+ *
+ * @author manailin
+ * @since 2021/10/8 10:52
+ */
+@Slf4j
+public class FileType {
+
+ private static final String NOT_IMAGE_FILE_TYPE = "0000";
+
+ private static String bytesToHexString(byte[] src) {
+ StringBuilder stringBuilder = new StringBuilder();
+ if (src == null || src.length <= 0) {
+ return null;
+ }
+ for (int i = 0; i < src.length; i++) {
+ int v = src[i] & 0xFF;
+ String hv = Integer.toHexString(v);
+ if (hv.length() < 2) {
+ stringBuilder.append(0);
+ }
+ stringBuilder.append(hv);
+ }
+ return stringBuilder.toString();
+ }
+
+ /**
+ * [方法描述] 判断上传的文件是否是规定的文件文件，通过文件头标识确定
+ *
+ * @param is
+ * @return boolean
+ * @author manailin
+ * @date 2021/10/28 16:50
+ */
+ public static Boolean checkFileType(FileInputStream is) throws Exception {
+ byte[] b = new byte[3];
+ is.read(b, 0, b.length);
+ String photo = bytesToHexString(b);
+ photo = photo.toUpperCase();
+ String fileHeadCode = TypeDict.checkFileType(photo);
+ log.info("上传的文件类型{}", fileHeadCode);
+ return !fileHeadCode.equals(NOT_IMAGE_FILE_TYPE);
+ }
+
+ /**
+ * [方法描述] 判断上传的文件是否是图片文件，通过文件头标识确定
+ *
+ * @param is
+ * @return boolean
+ * @author manailin
+ * @date 2021/10/28 16:50
+ */
+ public static Boolean checkImageType(FileInputStream is) throws Exception {
+ byte[] b = new byte[3];
+ is.read(b, 0, b.length);
+ String photo = bytesToHexString(b);
+ photo = photo.toUpperCase();
+ String fileHeadCode = TypeDict.checkImageType(photo);
+ log.info("上传的文件类型{}", fileHeadCode);
+ return !fileHeadCode.equals(NOT_IMAGE_FILE_TYPE);
+ }
+ /**
+ * [方法描述] 方法参照流程
+ *
+ * @param args
+ */
+// public static void main(String[] args) throws Exception {
+// FileInputStream is = new FileInputStream("D:\\Pictures\\3.mp4");
+// byte[] b = new byte[3];
+// is.read(b, 0, b.length);
+// String photo = bytesToHexString(b);
+// photo = photo.toUpperCase();
+// System.out.println("头文件是：" + photo);
+// String ooo = TypeDict.checkFileType(photo);
+// System.out.println("后缀名是：" + ooo);
+// }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileTypeUploadUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileTypeUploadUtils.java
new file mode 100644
index 0000000..8765a6e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileTypeUploadUtils.java
@@ -0,0 +1,94 @@
+package com.panzhihua.common.utlis;
+
+import com.panzhihua.common.exceptions.FileSizeLimitExceededException;
+import com.panzhihua.common.exceptions.InvalidExtensionException;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Objects;
+
+/**
+ * 文件上传工具类
+ *
+ * @author
+ */
+public class FileTypeUploadUtils {
+ /**
+ * 默认大小 50M
+ */
+ public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+
+ /**
+ * 默认的文件名最大长度 100
+ */
+ public static final int DEFAULT_FILE_NAME_LENGTH = 100;
+
+
+ /**
+ * 文件大小校验
+ *
+ * @param file 上传的文件
+ * @return
+ * @throws FileSizeLimitExceededException 如果超出最大大小
+ * @throws InvalidExtensionException
+ */
+ public static final void assertAllowed(MultipartFile file, String[] allowedExtension)
+ throws FileSizeLimitExceededException, InvalidExtensionException {
+ long size = file.getSize();
+ if (size > DEFAULT_MAX_SIZE) {
+ throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
+ }
+
+ String fileName = file.getOriginalFilename();
+ String extension = getExtension(file);
+ if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension)) {
+ if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION) {
+ throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension,
+ fileName);
+ } else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION) {
+ throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension,
+ fileName);
+ } else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION) {
+ throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension,
+ fileName);
+ } else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION) {
+ throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension,
+ fileName);
+ } else {
+ throw new InvalidExtensionException(allowedExtension, extension, fileName);
+ }
+ }
+
+ }
+
+ /**
+ * 判断MIME类型是否是允许的MIME类型
+ *
+ * @param extension
+ * @param allowedExtension
+ * @return
+ */
+ public static final boolean isAllowedExtension(String extension, String[] allowedExtension) {
+ for (String str : allowedExtension) {
+ if (str.equalsIgnoreCase(extension)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 获取文件名的后缀
+ *
+ * @param file 表单文件
+ * @return 后缀名
+ */
+ public static final String getExtension(MultipartFile file) {
+ String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+ if (StringUtils.isEmpty(extension)) {
+ extension = MimeTypeUtils.getExtension(Objects.requireNonNull(file.getContentType()));
+ }
+ return extension;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileUtil.java
new file mode 100644
index 0000000..f7690d1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/FileUtil.java
@@ -0,0 +1,115 @@
+package com.panzhihua.common.utlis;
+
+import java.io.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+public class FileUtil {
+
+ public static InputStream getResourcesFileInputStream(String fileName) {
+ return Thread.currentThread().getContextClassLoader().getResourceAsStream("" + fileName);
+ }
+
+ public static String getPath() {
+ return FileUtil.class.getResource("/").getPath();
+ }
+
+ public static File createNewFile(String pathName) {
+ File file = new File(getPath() + pathName);
+ if (file.exists()) {
+ file.delete();
+ } else {
+ if (!file.getParentFile().exists()) {
+ file.getParentFile().mkdirs();
+ }
+ }
+ return file;
+ }
+
+ public static File readFile(String pathName) {
+ return new File(getPath() + pathName);
+ }
+
+ public static File readUserHomeFile(String pathName) {
+ return new File(System.getProperty("user.home") + File.separator + pathName);
+ }
+
+ /**
+ * 压缩文件
+ *
+ * @param sourceFilePath 源文件路径
+ * @param zipFilePath 压缩后文件存储路径
+ * @param zipFilename 压缩文件名
+ */
+ public static void compressToZip(String sourceFilePath, String zipFilePath, String zipFilename) {
+ File sourceFile = new File(sourceFilePath);
+ File zipPath = new File(zipFilePath);
+ if (!zipPath.exists()) {
+ zipPath.mkdirs();
+ }
+ File zipFile = new File(zipPath + File.separator + zipFilename);
+ try (ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile))) {
+ writeZip(sourceFile, "", zos);
+ //文件压缩完成后，删除被压缩文件
+ boolean flag = deleteDir(sourceFile);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException(e.getMessage(), e.getCause());
+ }
+ }
+
+ /**
+ * 遍历所有文件，压缩
+ *
+ * @param file 源文件目录
+ * @param parentPath 压缩文件目录
+ * @param zos 文件流
+ */
+ private static void writeZip(File file, String parentPath, ZipOutputStream zos) {
+ if (file.isDirectory()) {
+ //目录
+ parentPath += file.getName() + File.separator;
+ File[] files = file.listFiles();
+ for (File f : files) {
+ writeZip(f, parentPath, zos);
+ }
+ } else {
+ //文件
+ try (BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file))) {
+ //指定zip文件夹
+ ZipEntry zipEntry = new ZipEntry(parentPath + file.getName());
+ zos.putNextEntry(zipEntry);
+ int len;
+ byte[] buffer = new byte[1024 * 10];
+ while ((len = bis.read(buffer, 0, buffer.length)) != -1) {
+ zos.write(buffer, 0, len);
+ zos.flush();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException(e.getMessage(), e.getCause());
+ }
+ }
+
+ /**
+ * 删除文件夹
+ *
+ * @param dir
+ * @return
+ */
+
+ }
+ private static boolean deleteDir (File dir){
+ if (dir.isDirectory()) {
+ String[] children = dir.list();
+ for (int i = 0; i < children.length; i++) {
+ boolean success = deleteDir(new File(dir, children[i]));
+ if (!success) {
+ return false;
+ }
+ }
+ }
+ //删除空文件夹
+ return dir.delete();
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ForEachUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ForEachUtils.java
new file mode 100644
index 0000000..92af70b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ForEachUtils.java
@@ -0,0 +1,52 @@
+package com.panzhihua.common.utlis;
+
+/**
+ * 应用模块名称
+ * <p>
+ * 代码描述
+ * <p>
+ * Copyright: Copyright (C) 2022 XXX, Inc. All rights reserved.
+ * <p>
+ * Company: 成都呐喊信息技术有限公司
+ * <p>
+ *
+ * @author manailin
+ * @since 2022/2/17 14:33
+ */
+import java.util.Objects;
+import java.util.function.BiConsumer;
+
+/**
+ *
+ * @author yangzhilong
+ * @date 7/15/2019
+ */
+public class ForEachUtils {
+
+ /**
+ *
+ * @param <T>
+ * @param startIndex
+ * 开始遍历的索引
+ * @param elements
+ * 集合
+ * @param action
+ */
+ public static <T> void forEach(int startIndex, Iterable<? extends T> elements,
+ BiConsumer<Integer, ? super T> action) {
+ Objects.requireNonNull(elements);
+ Objects.requireNonNull(action);
+ if (startIndex < 0) {
+ startIndex = 0;
+ }
+ int index = 0;
+ for (T element : elements) {
+ index++;
+ if (index <= startIndex) {
+ continue;
+ }
+
+ action.accept(index - 1, element);
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/GisPointUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/GisPointUtil.java
new file mode 100644
index 0000000..bc737fe
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/GisPointUtil.java
@@ -0,0 +1,123 @@
+package com.panzhihua.common.utlis;
+
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenDrawLngLatDTO;
+
+/**
+ * 判断坐标点位置状态
+ */
+public class GisPointUtil {
+
+ private static double EARTH_RADIUS = 6378137d;
+
+ private static double rad(double d) {
+ return d * Math.PI / 180.0;
+ }
+
+ /**
+ * 通过经纬度获取距离(单位：米)
+ *
+ * @param lat1
+ * @param lng1
+ * @param lat2
+ * @param lng2
+ * @return
+ */
+ public static double getDistance(double lat1, double lng1, double lat2, double lng2) {
+ double radLat1 = rad(lat1);
+ double radLat2 = rad(lat2);
+ double a = radLat1 - radLat2;
+ double b = rad(lng1) - rad(lng2);
+ double s = 2 * Math.asin(Math
+ .sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
+ s = s * EARTH_RADIUS;
+ s = Math.round(s * 10000d) / 10000d;
+ return s;
+ }
+
+ /**
+ * 判断一个点是否在圆形区域内
+ *
+ * @param radius
+ * 半径
+ * @param lat1
+ * 圆心纬度
+ * @param lng1
+ * 圆心经度
+ * @param lat2
+ * 坐标纬度
+ * @param lng2
+ * 坐标经度
+ */
+ public static boolean isInCircle(double lng1, double lat1, double lng2, double lat2, String radius) {
+ return getDistance(lat1, lng1, lat2, lng2) < Double.parseDouble(radius);
+ }
+
+ /**
+ * 判断是否在多边形区域内
+ *
+ * @param pointLon
+ * 要判断的点的纵坐标
+ * @param pointLat
+ * 要判断的点的横坐标 // * @param lon 区域各顶点的纵坐标数组 // * @param lat 区域各顶点的横坐标数组
+ * @return
+ */
+ public static boolean isInPolygon(double pointLon, double pointLat, List<ScreenDrawLngLatDTO> lngLatList) {
+ // 将要判断的横纵坐标组成一个点
+ Point2D.Double point = new Point.Double(pointLon, pointLat);
+ // 将区域各顶点的横纵坐标放到一个点集合里面
+ List<Point2D.Double> pointList = new ArrayList<Point2D.Double>();
+ double polygonPoint_x = 0.0, polygonPoint_y = 0.0;
+ int len = lngLatList.size();
+ for (int i = 0; i < len; i++) {
+ polygonPoint_x = lngLatList.get(i).getLng();
+ polygonPoint_y = lngLatList.get(i).getLat();
+ Point2D.Double polygonPoint = new Point2D.Double(polygonPoint_x, polygonPoint_y);
+ pointList.add(polygonPoint);
+ }
+ return check(point, pointList);
+ }
+
+ /**
+ * 一个点是否在多边形内
+ *
+ * @param point
+ * 要判断的点的横纵坐标
+ * @param polygon
+ * 组成的顶点坐标集合
+ * @return
+ */
+ private static boolean check(Point2D.Double point, List<Point2D.Double> polygon) {
+ java.awt.geom.GeneralPath peneralPath = new java.awt.geom.GeneralPath();
+
+ Point2D.Double first = polygon.get(0);
+ // 通过移动到指定坐标（以双精度指定），将一个点添加到路径中
+ peneralPath.moveTo(first.x, first.y);
+ polygon.remove(0);
+ for (Point2D.Double d : polygon) {
+ // 通过绘制一条从当前坐标到新指定坐标（以双精度指定）的直线，将一个点添加到路径中。
+ peneralPath.lineTo(d.x, d.y);
+ }
+ // 将几何多边形封闭
+ peneralPath.lineTo(first.x, first.y);
+ peneralPath.closePath();
+ // 测试指定的 Point2D 是否在 Shape 的边界内。
+ return peneralPath.contains(point);
+ }
+
+ public static void main(String[] args) {
+ // String points =
+ // "[{\"sets\":[{\"name\":\"sswg\",\"value\":\"402881f6681232c00168129b896e0078\"}],\"where\":[{\"name\":\"id\",\"value\":3231735,\"type\":\"=\"}]},{\"sets\":[{\"name\":\"sswg\",\"value\":\"000000006817dd6f0168313b9b89049a\"}],\"where\":[{\"name\":\"id\",\"value\":3231735,\"type\":\"=\"}]}]";
+ // JSONArray pointArray = (JSONArray)JSONArray.parse(points);
+ // System.out.println(isInPolygon(120.636514,31.341752, pointArray));
+ // String points =
+ // "[{\"x\":120.61123416,\"y\":31.32889074,\"z\":137.05},{\"x\":120.61312695,\"y\":31.31892631,\"z\":128.61},{\"x\":120.61455616,\"y\":31.30808702,\"z\":43.66},{\"x\":120.62127327,\"y\":31.30899876,\"z\":62.21},{\"x\":120.63003506,\"y\":31.31057071,\"z\":29.43},{\"x\":120.63726235,\"y\":31.31203339,\"z\":92.90},{\"x\":120.64536616,\"y\":31.31334188,\"z\":78.36},{\"x\":120.64402082,\"y\":31.31947999,\"z\":13.19},{\"x\":120.64136126,\"y\":31.32757908,\"z\":87.36},{\"x\":120.63689776,\"y\":31.33287239,\"z\":60.62},{\"x\":120.63502091,\"y\":31.33742080,\"z\":114.21},{\"x\":120.63071787,\"y\":31.33793104,\"z\":32.99},{\"x\":120.62952446,\"y\":31.34483170,\"z\":164.79},{\"x\":120.62710968,\"y\":31.34801804,\"z\":164.15},{\"x\":120.62731359,\"y\":31.34823458,\"z\":189.53},{\"x\":120.62700980,\"y\":31.34894193,\"z\":194.24},{\"x\":120.62700980,\"y\":31.34894193,\"z\":194.24},{\"x\":120.62700980,\"y\":31.34894193,\"z\":194.24},{\"x\":120.62665860,\"y\":31.34861797,\"z\":155.41},{\"x\":120.61706620,\"y\":31.34846463,\"z\":200.05},{\"x\":120.61854348,\"y\":31.34267516,\"z\":138.68},{\"x\":120.62111689,\"y\":31.33313042,\"z\":154.61}]";
+ // JSONArray pointArray = (JSONArray)JSONArray.parse(points);
+ // System.out.println(isInPolygon(120.66615036,31.33525453, pointArray));//不在范围内
+ // System.out.println(isInPolygon(120.62171413,31.32044689, pointArray));//在范围内
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HTMLFilter.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HTMLFilter.java
new file mode 100644
index 0000000..0d05739
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HTMLFilter.java
@@ -0,0 +1,499 @@
+package com.panzhihua.common.utlis;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * HTML过滤器，用于去除XSS漏洞隐患。
+ *
+ * @author ruoyi
+ */
+public final class HTMLFilter {
+ /**
+ * regex flag union representing /si modifiers in php
+ **/
+ private static final int REGEX_FLAGS_SI = Pattern.CASE_INSENSITIVE | Pattern.DOTALL;
+ private static final Pattern P_COMMENTS = Pattern.compile("<!--(.*?)-->", Pattern.DOTALL);
+ private static final Pattern P_COMMENT = Pattern.compile("^!--(.*)--$", REGEX_FLAGS_SI);
+ private static final Pattern P_TAGS = Pattern.compile("<(.*?)>", Pattern.DOTALL);
+ private static final Pattern P_END_TAG = Pattern.compile("^/([a-z0-9]+)", REGEX_FLAGS_SI);
+ private static final Pattern P_START_TAG = Pattern.compile("^([a-z0-9]+)(.*?)(/?)$", REGEX_FLAGS_SI);
+ private static final Pattern P_QUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)=([\"'])(.*?)\\2", REGEX_FLAGS_SI);
+ private static final Pattern P_UNQUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)(=)([^\"\\s']+)", REGEX_FLAGS_SI);
+ private static final Pattern P_PROTOCOL = Pattern.compile("^([^:]+):", REGEX_FLAGS_SI);
+ private static final Pattern P_ENTITY = Pattern.compile("&#(\\d+);?");
+ private static final Pattern P_ENTITY_UNICODE = Pattern.compile("&#x([0-9a-f]+);?");
+ private static final Pattern P_ENCODE = Pattern.compile("%([0-9a-f]{2});?");
+ private static final Pattern P_VALID_ENTITIES = Pattern.compile("&([^&;]*)(?=(;|&|$))");
+ private static final Pattern P_VALID_QUOTES = Pattern.compile("(>|^)([^<]+?)(<|$)", Pattern.DOTALL);
+ private static final Pattern P_END_ARROW = Pattern.compile("^>");
+ private static final Pattern P_BODY_TO_END = Pattern.compile("<([^>]*?)(?=<|$)");
+ private static final Pattern P_XML_CONTENT = Pattern.compile("(^|>)([^<]*?)(?=>)");
+ private static final Pattern P_STRAY_LEFT_ARROW = Pattern.compile("<([^>]*?)(?=<|$)");
+ private static final Pattern P_STRAY_RIGHT_ARROW = Pattern.compile("(^|>)([^<]*?)(?=>)");
+ private static final Pattern P_AMP = Pattern.compile("&");
+ private static final Pattern P_QUOTE = Pattern.compile("\"");
+ private static final Pattern P_LEFT_ARROW = Pattern.compile("<");
+ private static final Pattern P_RIGHT_ARROW = Pattern.compile(">");
+ private static final Pattern P_BOTH_ARROWS = Pattern.compile("<>");
+
+ // @xxx could grow large... maybe use sesat's ReferenceMap
+ private static final ConcurrentMap<String, Pattern> P_REMOVE_PAIR_BLANKS = new ConcurrentHashMap<>();
+ private static final ConcurrentMap<String, Pattern> P_REMOVE_SELF_BLANKS = new ConcurrentHashMap<>();
+
+ /**
+ * set of allowed html elements, along with allowed attributes for each element
+ **/
+ private final Map<String, List<String>> vAllowed;
+ /**
+ * counts of open tags for each (allowable) html element
+ **/
+ private final Map<String, Integer> vTagCounts = new HashMap<>();
+
+ /**
+ * html elements which must always be self-closing (e.g. "<img />")
+ **/
+ private final String[] vSelfClosingTags;
+ /**
+ * html elements which must always have separate opening and closing tags (e.g. "<b></b>")
+ **/
+ private final String[] vNeedClosingTags;
+ /**
+ * set of disallowed html elements
+ **/
+ private final String[] vDisallowed;
+ /**
+ * attributes which should be checked for valid protocols
+ **/
+ private final String[] vProtocolAtts;
+ /**
+ * allowed protocols
+ **/
+ private final String[] vAllowedProtocols;
+ /**
+ * tags which should be removed if they contain no content (e.g. "<b></b>" or "<b />")
+ **/
+ private final String[] vRemoveBlanks;
+ /**
+ * entities allowed within html markup
+ **/
+ private final String[] vAllowedEntities;
+ /**
+ * flag determining whether comments are allowed in input String.
+ */
+ private final boolean stripComment;
+ private final boolean encodeQuotes;
+ /**
+ * flag determining whether to try to make tags when presented with "unbalanced" angle brackets (e.g. "<b text </b>"
+ * becomes "<b> text </b>"). If set to false, unbalanced angle brackets will be html escaped.
+ */
+ private final boolean alwaysMakeTags;
+
+ /**
+ * Default constructor.
+ */
+ public HTMLFilter() {
+ vAllowed = new HashMap<>();
+
+ final ArrayList<String> a_atts = new ArrayList<>();
+ a_atts.add("href");
+ a_atts.add("target");
+ vAllowed.put("a", a_atts);
+
+ final ArrayList<String> img_atts = new ArrayList<>();
+ img_atts.add("src");
+ img_atts.add("width");
+ img_atts.add("height");
+ img_atts.add("alt");
+ vAllowed.put("img", img_atts);
+
+ final ArrayList<String> no_atts = new ArrayList<>();
+ vAllowed.put("b", no_atts);
+ vAllowed.put("strong", no_atts);
+ vAllowed.put("i", no_atts);
+ vAllowed.put("em", no_atts);
+
+ vSelfClosingTags = new String[] {"img"};
+ vNeedClosingTags = new String[] {"a", "b", "strong", "i", "em"};
+ vDisallowed = new String[] {};
+ vAllowedProtocols = new String[] {"http", "mailto", "https"}; // no ftp.
+ vProtocolAtts = new String[] {"src", "href"};
+ vRemoveBlanks = new String[] {"a", "b", "strong", "i", "em"};
+ vAllowedEntities = new String[] {"amp", "gt", "lt", "quot"};
+ stripComment = true;
+ encodeQuotes = true;
+ alwaysMakeTags = false;
+ }
+
+ /**
+ * Map-parameter configurable constructor.
+ *
+ * @param conf
+ * map containing configuration. keys match field names.
+ */
+ @SuppressWarnings("unchecked")
+ public HTMLFilter(final Map<String, Object> conf) {
+
+ assert conf.containsKey("vAllowed") : "configuration requires vAllowed";
+ assert conf.containsKey("vSelfClosingTags") : "configuration requires vSelfClosingTags";
+ assert conf.containsKey("vNeedClosingTags") : "configuration requires vNeedClosingTags";
+ assert conf.containsKey("vDisallowed") : "configuration requires vDisallowed";
+ assert conf.containsKey("vAllowedProtocols") : "configuration requires vAllowedProtocols";
+ assert conf.containsKey("vProtocolAtts") : "configuration requires vProtocolAtts";
+ assert conf.containsKey("vRemoveBlanks") : "configuration requires vRemoveBlanks";
+ assert conf.containsKey("vAllowedEntities") : "configuration requires vAllowedEntities";
+
+ vAllowed = Collections.unmodifiableMap((HashMap<String, List<String>>)conf.get("vAllowed"));
+ vSelfClosingTags = (String[])conf.get("vSelfClosingTags");
+ vNeedClosingTags = (String[])conf.get("vNeedClosingTags");
+ vDisallowed = (String[])conf.get("vDisallowed");
+ vAllowedProtocols = (String[])conf.get("vAllowedProtocols");
+ vProtocolAtts = (String[])conf.get("vProtocolAtts");
+ vRemoveBlanks = (String[])conf.get("vRemoveBlanks");
+ vAllowedEntities = (String[])conf.get("vAllowedEntities");
+ stripComment = conf.containsKey("stripComment") ? (Boolean)conf.get("stripComment") : true;
+ encodeQuotes = conf.containsKey("encodeQuotes") ? (Boolean)conf.get("encodeQuotes") : true;
+ alwaysMakeTags = conf.containsKey("alwaysMakeTags") ? (Boolean)conf.get("alwaysMakeTags") : true;
+ }
+
+ // ---------------------------------------------------------------
+ // my versions of some PHP library functions
+ public static String chr(final int decimal) {
+ return String.valueOf((char)decimal);
+ }
+
+ public static String htmlSpecialChars(final String s) {
+ String result = s;
+ result = regexReplace(P_AMP, "&", result);
+ result = regexReplace(P_QUOTE, """, result);
+ result = regexReplace(P_LEFT_ARROW, "<", result);
+ result = regexReplace(P_RIGHT_ARROW, ">", result);
+ return result;
+ }
+
+ private static String regexReplace(final Pattern regex_pattern, final String replacement, final String s) {
+ Matcher m = regex_pattern.matcher(s);
+ return m.replaceAll(replacement);
+ }
+
+ // ---------------------------------------------------------------
+
+ private static boolean inArray(final String s, final String[] array) {
+ for (String item : array) {
+ if (item != null && item.equals(s)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private void reset() {
+ vTagCounts.clear();
+ }
+
+ /**
+ * given a user submitted input String, filter out any invalid or restricted html.
+ *
+ * @param input
+ * text (i.e. submitted by a user) than may contain html
+ * @return "clean" version of input, with only valid, whitelisted html elements allowed
+ */
+ public String filter(final String input) {
+ reset();
+ String s = input;
+
+ s = escapeComments(s);
+
+ s = balanceHTML(s);
+
+ s = checkTags(s);
+
+ s = processRemoveBlanks(s);
+
+ // s = validateEntities(s);
+
+ return s;
+ }
+
+ public boolean isAlwaysMakeTags() {
+ return alwaysMakeTags;
+ }
+
+ public boolean isStripComments() {
+ return stripComment;
+ }
+
+ private String escapeComments(final String s) {
+ final Matcher m = P_COMMENTS.matcher(s);
+ final StringBuffer buf = new StringBuffer();
+ if (m.find()) {
+ final String match = m.group(1); // (.*?)
+ m.appendReplacement(buf, Matcher.quoteReplacement("<!--" + htmlSpecialChars(match) + "-->"));
+ }
+ m.appendTail(buf);
+
+ return buf.toString();
+ }
+
+ private String balanceHTML(String s) {
+ if (alwaysMakeTags) {
+ //
+ // try and form html
+ //
+ s = regexReplace(P_END_ARROW, "", s);
+ // 不追加结束标签
+ s = regexReplace(P_BODY_TO_END, "<$1>", s);
+ s = regexReplace(P_XML_CONTENT, "$1<$2", s);
+
+ } else {
+ //
+ // escape stray brackets
+ //
+ s = regexReplace(P_STRAY_LEFT_ARROW, "<$1", s);
+ s = regexReplace(P_STRAY_RIGHT_ARROW, "$1$2><", s);
+
+ //
+ // the last regexp causes '<>' entities to appear
+ // (we need to do a lookahead assertion so that the last bracket can
+ // be used in the next pass of the regexp)
+ //
+ s = regexReplace(P_BOTH_ARROWS, "", s);
+ }
+
+ return s;
+ }
+
+ private String checkTags(String s) {
+ Matcher m = P_TAGS.matcher(s);
+
+ final StringBuffer buf = new StringBuffer();
+ while (m.find()) {
+ String replaceStr = m.group(1);
+ replaceStr = processTag(replaceStr);
+ m.appendReplacement(buf, Matcher.quoteReplacement(replaceStr));
+ }
+ m.appendTail(buf);
+
+ // these get tallied in processTag
+ // (remember to reset before subsequent calls to filter method)
+ final StringBuilder sBuilder = new StringBuilder(buf.toString());
+ for (String key : vTagCounts.keySet()) {
+ for (int ii = 0; ii < vTagCounts.get(key); ii++) {
+ sBuilder.append("</").append(key).append(">");
+ }
+ }
+ s = sBuilder.toString();
+
+ return s;
+ }
+
+ private String processRemoveBlanks(final String s) {
+ String result = s;
+ for (String tag : vRemoveBlanks) {
+ if (!P_REMOVE_PAIR_BLANKS.containsKey(tag)) {
+ P_REMOVE_PAIR_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?></" + tag + ">"));
+ }
+ result = regexReplace(P_REMOVE_PAIR_BLANKS.get(tag), "", result);
+ if (!P_REMOVE_SELF_BLANKS.containsKey(tag)) {
+ P_REMOVE_SELF_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?/>"));
+ }
+ result = regexReplace(P_REMOVE_SELF_BLANKS.get(tag), "", result);
+ }
+
+ return result;
+ }
+
+ private String processTag(final String s) {
+ // ending tags
+ Matcher m = P_END_TAG.matcher(s);
+ if (m.find()) {
+ final String name = m.group(1).toLowerCase();
+ if (allowed(name)) {
+ if (false == inArray(name, vSelfClosingTags)) {
+ if (vTagCounts.containsKey(name)) {
+ vTagCounts.put(name, vTagCounts.get(name) - 1);
+ return "</" + name + ">";
+ }
+ }
+ }
+ }
+
+ // starting tags
+ m = P_START_TAG.matcher(s);
+ if (m.find()) {
+ final String name = m.group(1).toLowerCase();
+ final String body = m.group(2);
+ String ending = m.group(3);
+
+ // debug( "in a starting tag, name='" + name + "'; body='" + body + "'; ending='" + ending + "'" );
+ if (allowed(name)) {
+ final StringBuilder params = new StringBuilder();
+
+ final Matcher m2 = P_QUOTED_ATTRIBUTES.matcher(body);
+ final Matcher m3 = P_UNQUOTED_ATTRIBUTES.matcher(body);
+ final List<String> paramNames = new ArrayList<>();
+ final List<String> paramValues = new ArrayList<>();
+ while (m2.find()) {
+ paramNames.add(m2.group(1)); // ([a-z0-9]+)
+ paramValues.add(m2.group(3)); // (.*?)
+ }
+ while (m3.find()) {
+ paramNames.add(m3.group(1)); // ([a-z0-9]+)
+ paramValues.add(m3.group(3)); // ([^\"\\s']+)
+ }
+
+ String paramName, paramValue;
+ for (int ii = 0; ii < paramNames.size(); ii++) {
+ paramName = paramNames.get(ii).toLowerCase();
+ paramValue = paramValues.get(ii);
+
+ // debug( "paramName='" + paramName + "'" );
+ // debug( "paramValue='" + paramValue + "'" );
+ // debug( "allowed? " + vAllowed.get( name ).contains( paramName ) );
+
+ if (allowedAttribute(name, paramName)) {
+ if (inArray(paramName, vProtocolAtts)) {
+ paramValue = processParamProtocol(paramValue);
+ }
+ params.append(' ').append(paramName).append("=\"").append(paramValue).append("\"");
+ }
+ }
+
+ if (inArray(name, vSelfClosingTags)) {
+ ending = " /";
+ }
+
+ if (inArray(name, vNeedClosingTags)) {
+ ending = "";
+ }
+
+ if (ending == null || ending.length() < 1) {
+ if (vTagCounts.containsKey(name)) {
+ vTagCounts.put(name, vTagCounts.get(name) + 1);
+ } else {
+ vTagCounts.put(name, 1);
+ }
+ } else {
+ ending = " /";
+ }
+ return "<" + name + params + ending + ">";
+ } else {
+ return "";
+ }
+ }
+
+ // comments
+ m = P_COMMENT.matcher(s);
+ if (!stripComment && m.find()) {
+ return "<" + m.group() + ">";
+ }
+
+ return "";
+ }
+
+ private String processParamProtocol(String s) {
+ s = decodeEntities(s);
+ final Matcher m = P_PROTOCOL.matcher(s);
+ if (m.find()) {
+ final String protocol = m.group(1);
+ if (!inArray(protocol, vAllowedProtocols)) {
+ // bad protocol, turn into local anchor link instead
+ s = "#" + s.substring(protocol.length() + 1);
+ if (s.startsWith("#//")) {
+ s = "#" + s.substring(3);
+ }
+ }
+ }
+
+ return s;
+ }
+
+ private String decodeEntities(String s) {
+ StringBuffer buf = new StringBuffer();
+
+ Matcher m = P_ENTITY.matcher(s);
+ while (m.find()) {
+ final String match = m.group(1);
+ final int decimal = Integer.decode(match).intValue();
+ m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
+ }
+ m.appendTail(buf);
+ s = buf.toString();
+
+ buf = new StringBuffer();
+ m = P_ENTITY_UNICODE.matcher(s);
+ while (m.find()) {
+ final String match = m.group(1);
+ final int decimal = Integer.valueOf(match, 16).intValue();
+ m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
+ }
+ m.appendTail(buf);
+ s = buf.toString();
+
+ buf = new StringBuffer();
+ m = P_ENCODE.matcher(s);
+ while (m.find()) {
+ final String match = m.group(1);
+ final int decimal = Integer.valueOf(match, 16).intValue();
+ m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
+ }
+ m.appendTail(buf);
+ s = buf.toString();
+
+ s = validateEntities(s);
+ return s;
+ }
+
+ private String validateEntities(final String s) {
+ StringBuffer buf = new StringBuffer();
+
+ // validate entities throughout the string
+ Matcher m = P_VALID_ENTITIES.matcher(s);
+ while (m.find()) {
+ final String one = m.group(1); // ([^&;]*)
+ final String two = m.group(2); // (?=(;|&|$))
+ m.appendReplacement(buf, Matcher.quoteReplacement(checkEntity(one, two)));
+ }
+ m.appendTail(buf);
+
+ return encodeQuotes(buf.toString());
+ }
+
+ private String encodeQuotes(final String s) {
+ if (encodeQuotes) {
+ StringBuffer buf = new StringBuffer();
+ Matcher m = P_VALID_QUOTES.matcher(s);
+ while (m.find()) {
+ final String one = m.group(1); // (>|^)
+ final String two = m.group(2); // ([^<]+?)
+ final String three = m.group(3); // (<|$)
+ // 不替换双引号为"，防止json格式无效 regexReplace(P_QUOTE, """, two)
+ m.appendReplacement(buf, Matcher.quoteReplacement(one + two + three));
+ }
+ m.appendTail(buf);
+ return buf.toString();
+ } else {
+ return s;
+ }
+ }
+
+ private String checkEntity(final String preamble, final String term) {
+
+ return ";".equals(term) && isValidEntity(preamble) ? '&' + preamble : "&" + preamble;
+ }
+
+ private boolean isValidEntity(final String entity) {
+ return inArray(entity, vAllowedEntities);
+ }
+
+ private boolean allowed(final String name) {
+ return (vAllowed.isEmpty() || vAllowed.containsKey(name)) && !inArray(name, vDisallowed);
+ }
+
+ private boolean allowedAttribute(final String name, final String paramName) {
+ return allowed(name) && (vAllowed.isEmpty() || vAllowed.get(name).contains(paramName));
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HomeQuarantineUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HomeQuarantineUtil.java
new file mode 100644
index 0000000..47a4947
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HomeQuarantineUtil.java
@@ -0,0 +1,220 @@
+package com.panzhihua.common.utlis;
+
+import cn.hutool.core.date.DateUtil;
+import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.xml.bind.DatatypeConverter;
+import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Slf4j
+public class HomeQuarantineUtil {
+ /**
+ * 数据转换--登记明细用户填写答案导出数据格式转换
+ *
+ * @param answerContentVOList 用户答题记录
+ * @return 用户填写答案数据
+ */
+ public static List<List<Object>> ReserveData(List<ComActQuestnaireAnswerContentVO> answerContentVOList) {
+ //结果数据集合
+ List<List<Object>> resultList = new ArrayList<>();
+ //构建单个用户数据
+ List<Object> userData = new ArrayList<>();
+
+ String noExport = "以上信息仅用于";
+ //遍历答案列表
+ Long reserveRecordId = 0L;
+ Long reserveSubId = 0L;
+ Integer count=0;
+ StringBuffer conditions=new StringBuffer();
+ Boolean isOldDuo = false;
+ StringBuffer sb = new StringBuffer();
+ if (answerContentVOList != null && answerContentVOList.size() > 0) {
+ for (ComActQuestnaireAnswerContentVO userAnswers : answerContentVOList) {
+ if(count%16==0){
+ conditions.append(DateUtils.format(userAnswers.getTime(),new SimpleDateFormat("yyyy-MM-dd")) +" "+"上午体温"+userAnswers.getAnswerContent()+"℃"+"\n");
+ count++;
+ continue;
+ }
+ if(count%16==1){
+ conditions.append(DateUtils.format(userAnswers.getTime(),new SimpleDateFormat("yyyy-MM-dd"))+" "+"下午体温"+userAnswers.getAnswerContent()+"℃"+"\n");
+ count++;
+ continue;
+ }
+ if(count%16==2){
+ conditions.append(DateUtils.format(userAnswers.getTime(),new SimpleDateFormat("yyyy-MM-dd"))+" "+"当日隔离情况："+userAnswers.getAnswerContent()+"\n");
+ conditions.append("————————"+"\n");
+ count++;
+ continue;
+ }
+ count++;
+ //判断是文字描述直接跳过
+ if (userAnswers.getOptionType().equals(5) || userAnswers.getOptionType().equals(11)
+ || (StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport))) {
+ continue;
+ }
+ //判断reserveRecordId为空则为第一条记录,默认加上昵称和灯谜是
+ if (reserveRecordId.equals(0L)) {
+ reserveRecordId = userAnswers.getReserveRecordId();
+ userData.add(userAnswers.getNickName());
+ userData.add(DateUtils.format(userAnswers.getTime(), DateUtils.ymdhms_format));
+ }
+ //根据reserveRecordId判断是否是第二条填报记录
+ if (!reserveRecordId.equals(userAnswers.getReserveRecordId())) {
+ reserveSubId = 0L;
+
+ if(isOldDuo){
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ isOldDuo = false;
+ }
+ for(List<Object> result:resultList){
+ if(result.get(4).equals(userData.get(4))){
+ String condition=result.get(result.size()-1)+userData.get(userData.size()-1).toString();
+ result.set(result.size()-1,condition);
+ userData.set(userData.size()-1,null);
+ break;
+ }
+ }
+ if(userData.get(userData.size()-1)!=null){
+ resultList.add(userData);
+ }
+ userData = new ArrayList<>();
+ reserveRecordId = userAnswers.getReserveRecordId();
+ userData.add(userAnswers.getNickName());
+ userData.add(DateUtils.format(userAnswers.getTime(), DateUtils.ymdhms_format));
+ if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
+ userData.add(userAnswers.getAnswerContent());
+ }else{
+ userData.add(" ");
+ }
+
+ }else{
+ if(reserveSubId.equals(0L)){
+ reserveSubId = userAnswers.getReserveSubId();
+ }
+
+ if(!reserveSubId.equals(userAnswers.getReserveSubId())){
+ reserveSubId = userAnswers.getReserveSubId();
+
+ //如果是承诺字段则不导出
+ if(StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport)){
+ continue;
+ }
+
+ //判断当前的组件类型是否是图片上传，导出时需要导出图片
+ if(userAnswers.getOptionType().equals(11)){
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ userData.add(new URL(userAnswers.getAnswerContent()));
+ }catch (Exception e){
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
+ //判断当前组件类型是否签名
+ if(userAnswers.getOptionType().equals(12)){
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
+ }catch (Exception e){
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
+
+ if(userAnswers.getOptionType().equals(1)){
+ isOldDuo = true;
+ sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
+ continue;
+ }else{
+ if(isOldDuo){
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }
+ isOldDuo = false;
+ }
+ sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }else{
+ //如果是承诺字段则不导出
+ if(StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport)){
+ continue;
+ }
+ //判断当前的组件类型是否是图片上传，导出时需要导出图片
+ if(userAnswers.getOptionType().equals(11)){
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ userData.add(new URL(userAnswers.getAnswerContent()));
+ }catch (Exception e){
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
+ //判断当前组件类型是否签名
+ if(userAnswers.getOptionType().equals(12)){
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ //userData.add(new URL("http://image.panzhihua.nhys.cdnhxx.com//idcard/967dbdef3ef3465a9169fbea204f9aa7.jpg"));
+ userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
+ }catch (Exception e){
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
+ if(userAnswers.getOptionType().equals(1)){
+ isOldDuo = true;
+ sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
+ continue;
+ }else{
+ if(isOldDuo){
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }
+ isOldDuo = false;
+ }
+ sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }
+ }
+ if(count%16==0){
+ userData.add(conditions.toString());
+ conditions=new StringBuffer();
+ }
+ }
+ if(isOldDuo){
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ }
+ for(List<Object> result:resultList){
+ if(result.get(4).equals(userData.get(4))){
+ String condition=result.get(result.size()-1)+userData.get(userData.size()-1).toString();
+ result.set(result.size()-1,condition);
+ userData.set(userData.size()-1,null);
+ break;
+ }
+ }
+ if(userData.get(userData.size()-1)!=null){
+ resultList.add(userData);
+ }
+ }
+ return resultList;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpClientFactory.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpClientFactory.java
new file mode 100644
index 0000000..aef2799
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpClientFactory.java
@@ -0,0 +1,116 @@
+package com.panzhihua.common.utlis;
+
+import java.security.NoSuchAlgorithmException;
+
+import javax.net.ssl.SSLContext;
+
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.config.Registry;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+
+import com.panzhihua.common.constants.HttpConstant;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description:
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-08 10:26
+ **/
+public class HttpClientFactory {
+
+ private static HttpClientFactory instance = null;
+
+ private HttpClientFactory() {}
+
+ public synchronized static HttpClientFactory getInstance() {
+ if (instance == null) {
+ instance = new HttpClientFactory();
+ }
+ return instance;
+ }
+
+ public synchronized HttpClient getHttpClient() {
+ HttpClient httpClient = null;
+ if (HttpConstant.IS_KEEP_ALIVE) {
+ // 获取长连接
+ httpClient = new KeepAliveHttpClientBuilder().getKeepAliveHttpClient();
+ } else {
+ // 获取短连接
+ httpClient = new HttpClientBuilder().getHttpClient();
+ }
+ return httpClient;
+ }
+
+ public HttpPost httpPost(String httpUrl) {
+ HttpPost httpPost = null;
+ httpPost = new HttpPost(httpUrl);
+ if (HttpConstant.IS_KEEP_ALIVE) {
+ // 设置为长连接，服务端判断有此参数就不关闭连接。
+ httpPost.setHeader("Connection", "Keep-Alive");
+ }
+ return httpPost;
+ }
+
+ private static class KeepAliveHttpClientBuilder {
+
+ private static HttpClient httpClient;
+
+ /**
+ * 获取http长连接
+ */
+ private synchronized HttpClient getKeepAliveHttpClient() {
+ if (httpClient == null) {
+ LayeredConnectionSocketFactory sslsf = null;
+ try {
+ sslsf = new SSLConnectionSocketFactory(SSLContext.getDefault());
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ }
+
+ Registry<ConnectionSocketFactory> socketFactoryRegistry =
+ RegistryBuilder.<ConnectionSocketFactory>create().register("https", sslsf)
+ .register("http", new PlainConnectionSocketFactory()).build();
+ PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager(socketFactoryRegistry);
+ cm.setMaxTotal(HttpConstant.MAX_TOTAL);
+ cm.setDefaultMaxPerRoute(HttpConstant.MAX_CONN_PER_ROUTE);
+
+ RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(HttpConstant.CONNECT_TIMEOUT)
+ .setSocketTimeout(HttpConstant.SOCKET_TIMEOUT).build();
+ // 创建连接
+ httpClient =
+ HttpClients.custom().setDefaultRequestConfig(requestConfig).setConnectionManager(cm).build();
+ }
+
+ return httpClient;
+ }
+ }
+
+ private static class HttpClientBuilder {
+ private HttpClient httpClient;
+
+ /**
+ * 获取http短连接
+ */
+ private synchronized HttpClient getHttpClient() {
+ if (httpClient == null) {
+ RequestConfig requestConfig = RequestConfig.custom()
+ // 设置请求超时时间
+ .setConnectTimeout(HttpConstant.CONNECT_TIMEOUT)
+ // 设置响应超时时间
+ .setSocketTimeout(HttpConstant.SOCKET_TIMEOUT).build();
+ // 创建连接
+ httpClient = HttpClients.custom().setDefaultRequestConfig(requestConfig).build();
+ }
+ return httpClient;
+ }
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpClientUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpClientUtil.java
new file mode 100644
index 0000000..0472925
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpClientUtil.java
@@ -0,0 +1,580 @@
+package com.panzhihua.common.utlis;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicHeader;
+import org.apache.http.ssl.SSLContexts;
+import org.apache.http.util.EntityUtils;
+import org.springframework.util.ObjectUtils;
+
+import com.panzhihua.common.constants.HttpConstant;
+
+import lombok.extern.slf4j.Slf4j;
+
+import javax.net.ssl.SSLContext;
+
+import static com.panzhihua.common.utlis.wx.WXPayConstants.USER_AGENT;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description:
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-08 10:23
+ **/
+@Slf4j
+public class HttpClientUtil {
+ /**
+ * 通过post方式调用http接口
+ *
+ * @param url
+ * url路径
+ * @param jsonParam
+ * json格式的参数
+ * @param reSend
+ * 重发次数
+ * @param headerKey
+ * header键值
+ * @param headerValue
+ * headervalue
+ * @return
+ * @throws Exception
+ */
+ public static String sendPostByJson(String url, String jsonParam, int reSend, String headerKey,
+ String headerValue) {
+ // 声明返回结果
+ String result = "";
+ // 开始请求API接口时间
+ long startTime = System.currentTimeMillis();
+ // 请求API接口的响应时间
+ long endTime = 0L;
+ HttpEntity httpEntity = null;
+ HttpResponse httpResponse = null;
+ HttpClient httpClient = null;
+ try {
+ // 创建连接
+ httpClient = HttpClientFactory.getInstance().getHttpClient();
+ // 设置请求头和报文
+ HttpPost httpPost = HttpClientFactory.getInstance().httpPost(url);
+ Header header = new BasicHeader("Accept-Encoding", null);
+ httpPost.setHeader(header);
+ if (!ObjectUtils.isEmpty(headerKey)) {
+ httpPost.setHeader(headerKey, headerValue);
+ }
+ // 设置报文和通讯格式
+ StringEntity stringEntity = new StringEntity(jsonParam, HttpConstant.UTF8_ENCODE);
+ stringEntity.setContentEncoding(HttpConstant.UTF8_ENCODE);
+ stringEntity.setContentType(HttpConstant.APPLICATION_JSON);
+ httpPost.setEntity(stringEntity);
+// log.info("请求{}接口的参数为{}", url, jsonParam);
+ // 执行发送，获取相应结果
+ httpResponse = httpClient.execute(httpPost);
+ httpEntity = httpResponse.getEntity();
+ result = EntityUtils.toString(httpEntity);
+ } catch (Exception e) {
+ log.error("请求{}接口出现异常", url, e);
+ if (reSend > 0) {
+ log.info("请求{}出现异常:{}，进行重发。进行第{}次重发", url, e.getMessage(), (HttpConstant.REQ_TIMES - reSend + 1));
+ result = sendPostByJson(url, jsonParam, reSend - 1, headerKey, headerValue);
+ if (result != null && !"".equals(result)) {
+ return result;
+ }
+ }
+ } finally {
+ try {
+ EntityUtils.consume(httpEntity);
+ } catch (IOException e) {
+ log.error("http请求释放资源异常", e);
+ }
+ }
+ // 请求接口的响应时间
+ endTime = System.currentTimeMillis();
+// log.info("请求{}接口的响应报文内容为{},本次请求API接口的响应时间为:{}毫秒", url, result, (endTime - startTime));
+ return result;
+
+ }
+
+ /**
+ * 使用http请求调用接口，参数类型为xml
+ *
+ * @param urlStr
+ * 请求地址
+ * @param data
+ * 请求参数
+ * @return 调用结果
+ */
+ public static String httpsRequest(String urlStr, String data) {
+ try {
+ URL url = new URL(urlStr);
+ URLConnection con = url.openConnection();
+ con.setDoOutput(true);
+ // con.setRequestProperty("Pragma:", "no-cache");
+ con.setRequestProperty("Cache-Control", "no-cache");
+ con.setRequestProperty("Content-Type", "text/xml");
+
+ OutputStreamWriter out = new OutputStreamWriter(con.getOutputStream());
+ log.info("urlStr=" + urlStr);
+ log.info("xmlInfo=" + data);
+ out.write(new String(data.getBytes("UTF-8")));
+ out.flush();
+ out.close();
+ BufferedReader br = new BufferedReader(new InputStreamReader(con.getInputStream()));
+ String line = "";
+ StringBuffer sb = new StringBuffer();
+ for (line = br.readLine(); line != null; line = br.readLine()) {
+ sb.append(line);
+ }
+ return sb.toString();
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return "";
+ }
+
+ /**
+ * http请求工具类，get请求
+ *
+ * @param url
+ * @param params
+ * @param resonseCharSet
+ * @return
+ * @throws Exception
+ */
+ public static String httpGet(String url, Map<String, Object> params, String... resonseCharSet) throws Exception {
+ DefaultHttpClient defaultHttpClient = null;
+ BufferedReader bufferedReader = null;
+ try {
+ defaultHttpClient = new DefaultHttpClient();
+ if (params != null) {
+ StringBuilder stringBuilder = new StringBuilder();
+ Iterator<String> iterator = params.keySet().iterator();
+ String key;
+ while (iterator.hasNext()) {
+ key = iterator.next();
+ Object val = params.get(key);
+ if (val instanceof List) {
+ List v = (List)val;
+ for (Object o : v) {
+ stringBuilder.append(key).append("=").append(o.toString()).append("&");
+ }
+ } else {
+ stringBuilder.append(key).append("=").append(val.toString()).append("&");
+ }
+ }
+ stringBuilder.deleteCharAt(stringBuilder.length() - 1);
+ url = url + "?" + stringBuilder.toString();
+ log.info("url:{}", url);
+ }
+ HttpGet httpGet = new HttpGet(url);
+ httpGet.setHeader("Content-Type", "application/json;charset=ut-8");
+ HttpResponse httpResponse = defaultHttpClient.execute(httpGet);
+ if (httpResponse.getStatusLine().getStatusCode() != 200) {
+ String errorLog = "请求失败，errorCode:" + httpResponse.getStatusLine().getStatusCode();
+ log.info("errorLog:{}"+errorLog);
+ throw new Exception(url + errorLog);
+ }
+ // 读取返回信息
+ String charSet = "utf-8";
+ if (resonseCharSet != null && resonseCharSet.length > 0)
+ charSet = resonseCharSet[0];
+ String output;
+ bufferedReader = new BufferedReader(new InputStreamReader(httpResponse.getEntity().getContent(), charSet));
+
+ StringBuilder dataBuilder = new StringBuilder();
+ while ((output = bufferedReader.readLine()) != null) {
+ dataBuilder.append(output);
+ }
+ return dataBuilder.toString();
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw e;
+ } finally {
+ if (defaultHttpClient != null)
+ defaultHttpClient.getConnectionManager().shutdown();
+ if (bufferedReader != null)
+ bufferedReader.close();
+ }
+ }
+
+
+
+ /**
+ * http请求工具类，post请求
+ *
+ * @param url
+ * url
+ * @param param
+ * 参数值 仅支持String
+ * @return
+ * @throws Exception
+ */
+ public static String httpPost(String url, String param) throws Exception {
+ DefaultHttpClient defaultHttpClient = null;
+ BufferedReader bufferedReader = null;
+ try {
+ defaultHttpClient = new DefaultHttpClient();
+ HttpPost httpPost = new HttpPost(url);
+ httpPost.setHeader("Content-Type", "application/json;charset=utf-8");
+ if (StringUtils.isNotBlank(param)) {
+ log.info("参数值：{}", param);
+ HttpEntity httpEntity = new StringEntity(param, "utf-8");
+ httpPost.setEntity(httpEntity);
+ }
+ HttpResponse httpResponse = defaultHttpClient.execute(httpPost);
+ if (httpResponse.getStatusLine().getStatusCode() != 200) {
+ String errorLog = "请求失败，errorCode:" + httpResponse.getStatusLine().getStatusCode();
+ log.info(errorLog);
+ throw new Exception(url + errorLog);
+ }
+ // 读取返回信息
+ String output;
+ bufferedReader = new BufferedReader(new InputStreamReader(httpResponse.getEntity().getContent(), "utf-8"));
+ StringBuilder stringBuilder = new StringBuilder();
+ while ((output = bufferedReader.readLine()) != null) {
+ stringBuilder.append(output);
+ }
+ log.info("调用微信接口返回的参数：" + stringBuilder.toString());
+ return stringBuilder.toString();
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw e;
+ } finally {
+ if (defaultHttpClient != null)
+ defaultHttpClient.getConnectionManager().shutdown();
+ if (bufferedReader != null)
+ bufferedReader.close();
+ }
+ }
+
+
+
+ // HTTP GET请求
+ public static String sendGet(String url) throws Exception {
+ URL obj = new URL(url);
+ HttpURLConnection con = (HttpURLConnection) obj.openConnection();
+ //默认值GET
+ con.setRequestMethod("GET");
+ //添加请求头
+ con.setRequestProperty("User-Agent", USER_AGENT);
+ int responseCode = con.getResponseCode();
+ log.info("发送 'GET' 请求到 URL:{}" + url);
+ log.info("Response Code:{}" + responseCode);
+ BufferedReader in = new BufferedReader(
+ new InputStreamReader(con.getInputStream()));
+ String inputLine;
+ StringBuffer response = new StringBuffer();
+ while ((inputLine = in.readLine()) != null) {
+ response.append(inputLine);
+ }
+ in.close();
+ //打印结果
+ log.info("uu洗车返回:{}"+response.toString());
+ return response.toString();
+ }
+
+ /**
+ * http请求工具类，post请求
+ *
+ * @param url
+ * url
+ * @param param
+ * 参数值 仅支持String
+ * @return
+ * @throws Exception
+ */
+ public static String httpPostAndToken(String url, String param,Map headerMap) throws Exception {
+ DefaultHttpClient defaultHttpClient = null;
+ BufferedReader bufferedReader = null;
+ try {
+ defaultHttpClient = new DefaultHttpClient();
+ HttpPost httpPost = new HttpPost(url);
+ httpPost.setHeader("Content-Type", "application/json;charset=utf-8");
+// httpPost.setHeader("Authorization", headerMap.get("Authorization").toString());
+// httpPost.setHeader("Host", headerMap.get("Host").toString());
+
+ for (Object key : headerMap.keySet()) {
+ httpPost.setHeader(key.toString(), headerMap.get(key).toString());
+ }
+ if (StringUtils.isNotBlank(param)) {
+ log.info("参数值：{}", param);
+ HttpEntity httpEntity = new StringEntity(param, "utf-8");
+ httpPost.setEntity(httpEntity);
+// httpPost.setHeader("Content-Length", String.valueOf(httpEntity.getContentLength()));
+ }
+ HttpResponse httpResponse = defaultHttpClient.execute(httpPost);
+ if (httpResponse.getStatusLine().getStatusCode() != 200) {
+ int statusCode = httpResponse.getStatusLine().getStatusCode();
+ String errorLog = "请求失败，errorCode:" + httpResponse.getStatusLine().getStatusCode();
+ log.info(errorLog);
+ throw new Exception(url + errorLog);
+ }
+ // 读取返回信息
+ String output;
+ bufferedReader = new BufferedReader(new InputStreamReader(httpResponse.getEntity().getContent(), "utf-8"));
+ StringBuilder stringBuilder = new StringBuilder();
+ while ((output = bufferedReader.readLine()) != null) {
+ stringBuilder.append(output);
+ }
+ log.info("调用接口返回的参数：" + stringBuilder.toString());
+ return stringBuilder.toString();
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw e;
+ } finally {
+ if (defaultHttpClient != null)
+ defaultHttpClient.getConnectionManager().shutdown();
+ if (bufferedReader != null)
+ bufferedReader.close();
+ }
+ }
+
+ public static void main(String[] args) throws IOException {
+ DefaultHttpClient defaultHttpClient = new DefaultHttpClient();
+ HttpPost httpPost = new HttpPost("https://dptest.d-power.com.cn:14404/v1/face");
+// httpPost.setHeader("Content-Type", "application/json;charset=utf-8");
+ httpPost.setHeader("Authorization", "DpToken P3JHgjLbyljfLrFnS9OZbATRJmacdt4b");
+ httpPost.setHeader("Host", "123.60.2.66");
+// httpPost.setHeader("Content-Length", String.valueOf(entity.getContentLength()));
+
+// httpPost.setHeader("User-Agent", "Apache-HttpClient/4.5.12 (Java/1.8.0_162)[\\r][\\n]");
+ httpPost.setEntity(new StringEntity("{\"positions\":[{\"role\":\"occupant\",\"communityId\":\"64f99b2ed26106d4f0fe93f4\",\"unitId\":\"64f99b2ed26106d4f0fe93f7\"}],\"tel\":\"15696695118\",\"name\":\"四月里3\",\"timeout\":10,\"image\":\"fsdfsdfsdf\"}", "utf-8"));
+// httpPost.setHeader("Content-Length", String.valueOf(entity.getContentLength()));
+ HttpResponse httpResponse = defaultHttpClient.execute(httpPost);
+ System.out.println(httpResponse.getEntity());
+ }
+
+ /**
+ * get请求
+ *
+ * @param url
+ * 请求地址（get请求时参数自己组装到url上）
+ * @param headerMap
+ * 请求头
+ * @return 响应文本
+ */
+ public static String get(String url, Map<String, String> headerMap, String param) {
+ // 请求地址，以及参数设置
+ HttpPost post = new HttpPost(url);
+ if (headerMap != null) {
+ for (Map.Entry<String, String> entry : headerMap.entrySet()) {
+ post.setHeader(entry.getKey(), entry.getValue());
+ }
+ }
+ if (StringUtils.isNotBlank(param)) {
+ log.info("参数值：{}", param);
+ HttpEntity httpEntity = new StringEntity(param, "utf-8");
+ post.setEntity(httpEntity);
+ }
+ // 执行请求，获取相应
+ return getRespString(post);
+ }
+
+ /**
+ * get请求
+ *
+ * @param url
+ * 请求地址（get请求时参数自己组装到url上）
+ * @param headerMap
+ * 请求头
+ * @return 响应文本
+ */
+ public static String getUU(String url, Map<String, String> headerMap, String param) {
+ // 请求地址，以及参数设置
+ HttpPost post = new HttpPost(url);
+
+ SSLContext sslContext = null;
+ try {
+ sslContext = SSLContexts.custom().loadTrustMaterial(null, new TrustStrategy() {
+ @Override
+ public boolean isTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+ return true;
+ }
+ }).build();
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ } catch (KeyManagementException e) {
+ e.printStackTrace();
+ } catch (KeyStoreException e) {
+ e.printStackTrace();
+ }
+
+ CloseableHttpClient client = HttpClients.custom().setSslcontext(sslContext).
+ setSSLHostnameVerifier(new NoopHostnameVerifier()).build();
+
+
+ //请求超时时间设置
+ post.setConfig(RequestConfig.custom()// 连接超时时间
+ .setConnectTimeout(5000)
+ // 请求超时时间
+ .setConnectionRequestTimeout(5000)
+ // Socket读取超时时间
+ .setSocketTimeout(5000)
+ // 是否允许重定向
+ .setRedirectsEnabled(false)
+ .build());
+
+ //发送请求
+ CloseableHttpResponse response = null;
+ try {
+ response = client.execute(post);
+ } catch (IOException e) {
+ e.printStackTrace();
+ log.error("request error. ");
+
+ }
+ HttpEntity entity = response.getEntity();
+ try {
+ if (entity != null) {
+ //按指定编码转换结果实体为String类型
+ return EntityUtils.toString(entity, "UTF-8");
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return null;
+ }
+
+
+
+ /**
+ * 获取响应信息（String）
+ */
+ public static String getRespString(HttpUriRequest request) {
+ // 获取响应流
+ InputStream in = getRespInputStream(request);
+
+ StringBuilder sb = new StringBuilder();
+ String line;
+
+ BufferedReader br = new BufferedReader(new InputStreamReader(in));
+ try {
+ while ((line = br.readLine()) != null) {
+ sb.append(line);
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ String str = sb.toString();
+ return str;
+ }
+
+ /**
+ * 获取响应信息（InputStream）
+ */
+ public static InputStream getRespInputStream(HttpUriRequest request) {
+ // 获取响应对象
+ HttpResponse response = null;
+ try {
+ response = HttpClients.createDefault().execute(request);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ if (response == null) {
+ return null;
+ }
+ // 获取Entity对象
+ HttpEntity entity = response.getEntity();
+ // 获取响应信息流
+ InputStream in = null;
+ if (entity != null) {
+ try {
+ in = entity.getContent();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return in;
+ }
+
+ /**
+ * 退款请求微信
+ * @param url 请求地址
+ * @param data 请求数据
+ * @param mchId 商户id
+ * @param isTest 是否是测试
+ * @return 退款结果
+ * @throws Exception 抛出异常
+ */
+ public static String doRefund(String url, String data,String mchId,Boolean isTest) throws Exception{
+ KeyStore keyStore = KeyStore.getInstance("PKCS12");
+ //P12文件目录 证书路径，这里需要你自己修改，linux下还是windows下的根路径
+ String filepath = "/mnt/data/refund/huacheng/";
+
+ System.out.println("filepath->"+filepath);
+ FileInputStream instream = new FileInputStream(filepath+"apiclient_cert.p12");
+ try {
+ keyStore.load(instream, mchId.toCharArray());//这里写密码..默认是你的MCHID
+ } finally {
+ instream.close();
+ }
+
+ // Trust own CA and all self-signed certs
+ SSLContext sslcontext = SSLContexts.custom()
+ .loadKeyMaterial(keyStore, mchId.toCharArray())//这里也是写密码的
+ .build();
+ // Allow TLSv1 protocol only
+ SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(
+ sslcontext,
+ SSLConnectionSocketFactory.getDefaultHostnameVerifier());
+ CloseableHttpClient httpclient = HttpClients.custom()
+ .setSSLSocketFactory(sslsf)
+ .build();
+ try {
+ HttpPost httpost = new HttpPost(url); // 设置响应头信息
+ httpost.addHeader("Connection", "keep-alive");
+ httpost.addHeader("Accept", "*/*");
+ httpost.addHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
+ httpost.addHeader("Host", "api.mch.weixin.qq.com");
+ httpost.addHeader("X-Requested-With", "XMLHttpRequest");
+ httpost.addHeader("Cache-Control", "max-age=0");
+ httpost.addHeader("User-Agent", "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0) ");
+ httpost.setEntity(new StringEntity(data, "UTF-8"));
+ CloseableHttpResponse response = httpclient.execute(httpost);
+ try {
+ HttpEntity entity = response.getEntity();
+
+ String jsonStr = EntityUtils.toString(response.getEntity(), "UTF-8");
+ log.info("请求微信退款接口返回结果：" + JSONObject.toJSONString(jsonStr));
+ EntityUtils.consume(entity);
+ return jsonStr;
+ } finally {
+ response.close();
+ }
+ } finally {
+ httpclient.close();
+ }
+
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpHelper.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpHelper.java
new file mode 100644
index 0000000..130a39b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpHelper.java
@@ -0,0 +1,45 @@
+package com.panzhihua.common.utlis;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+
+import javax.servlet.ServletRequest;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 通用http工具封装
+ *
+ * @author huanghongfa
+ */
+public class HttpHelper {
+ private static final Logger LOGGER = LoggerFactory.getLogger(HttpHelper.class);
+
+ public static String getBodyString(ServletRequest request) {
+ StringBuilder sb = new StringBuilder();
+ BufferedReader reader = null;
+ try (InputStream inputStream = request.getInputStream()) {
+ reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
+ String line = "";
+ while ((line = reader.readLine()) != null) {
+ sb.append(line);
+ }
+ } catch (IOException e) {
+ LOGGER.warn("getBodyString出现问题！");
+ } finally {
+ if (reader != null) {
+ try {
+ reader.close();
+ } catch (IOException e) {
+ LOGGER.error(ExceptionUtils.getMessage(e));
+ }
+ }
+ }
+ return sb.toString();
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpUtils.java
new file mode 100644
index 0000000..f009376
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/HttpUtils.java
@@ -0,0 +1,160 @@
+package com.panzhihua.common.utlis;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.ConnectException;
+import java.net.SocketTimeoutException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.*;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.model.dtos.wx.WxSubscribeDTO;
+
+/**
+ * 通用http发送方法
+ *
+ * @author ruoyi
+ */
+public class HttpUtils {
+ private static final Logger log = LoggerFactory.getLogger(HttpUtils.class);
+
+ /**
+ * 向指定 URL 发送GET方法的请求
+ *
+ * @param url
+ * 发送请求的 URL
+ * @param param
+ * 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
+ * @return 所代表远程资源的响应结果
+ */
+ public static String sendGet(String url, String param) {
+ return sendGet(url, param, Constants.UTF8);
+ }
+
+ /**
+ * 向指定 URL 发送GET方法的请求
+ *
+ * @param url
+ * 发送请求的 URL
+ * @param param
+ * 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
+ * @param contentType
+ * 编码类型
+ * @return 所代表远程资源的响应结果
+ */
+ public static String sendGet(String url, String param, String contentType) {
+ StringBuilder result = new StringBuilder();
+ BufferedReader in = null;
+ try {
+ String urlNameString = url + "?" + param;
+// log.info("sendGet - {}", urlNameString);
+ URL realUrl = new URL(urlNameString);
+ URLConnection connection = realUrl.openConnection();
+ connection.setRequestProperty("accept", "*/*");
+ connection.setRequestProperty("connection", "Keep-Alive");
+ connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+ connection.connect();
+ in = new BufferedReader(new InputStreamReader(connection.getInputStream(), contentType));
+ String line;
+ while ((line = in.readLine()) != null) {
+ result.append(line);
+ }
+// log.info("recv - {}", result);
+ } catch (ConnectException e) {
+ log.error("调用HttpUtils.sendGet ConnectException, url=" + url + ",param=" + param, e);
+ } catch (SocketTimeoutException e) {
+ log.error("调用HttpUtils.sendGet SocketTimeoutException, url=" + url + ",param=" + param, e);
+ } catch (IOException e) {
+ log.error("调用HttpUtils.sendGet IOException, url=" + url + ",param=" + param, e);
+ } catch (Exception e) {
+ log.error("调用HttpsUtil.sendGet Exception, url=" + url + ",param=" + param, e);
+ } finally {
+ try {
+ if (in != null) {
+ in.close();
+ }
+ } catch (Exception ex) {
+ log.error("调用in.close Exception, url=" + url + ",param=" + param, ex);
+ }
+ }
+ return result.toString();
+ }
+
+ public static String wxMessageModeSendUrl(String token, WxSubscribeDTO subscribeDTO) throws Exception {
+ String tmpurl = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=ACCESS_TOKEN";
+ String url = tmpurl.replace("ACCESS_TOKEN", token);
+ return HttpClientUtil.httpPost(url, subscribeDTO.toJSON());
+ }
+
+ public static String sendSSLPost(String url, String param) {
+ StringBuilder result = new StringBuilder();
+ String urlNameString = url + "?" + param;
+ try {
+ log.info("sendSSLPost - {}", urlNameString);
+ SSLContext sc = SSLContext.getInstance("SSL");
+ sc.init(null, new TrustManager[] {new TrustAnyTrustManager()}, new java.security.SecureRandom());
+ URL console = new URL(urlNameString);
+ HttpsURLConnection conn = (HttpsURLConnection)console.openConnection();
+ conn.setRequestProperty("accept", "*/*");
+ conn.setRequestProperty("connection", "Keep-Alive");
+ conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+ conn.setRequestProperty("Accept-Charset", "utf-8");
+ conn.setRequestProperty("contentType", "utf-8");
+ conn.setDoOutput(true);
+ conn.setDoInput(true);
+
+ conn.setSSLSocketFactory(sc.getSocketFactory());
+ conn.setHostnameVerifier(new TrustAnyHostnameVerifier());
+ conn.connect();
+ InputStream is = conn.getInputStream();
+ BufferedReader br = new BufferedReader(new InputStreamReader(is));
+ String ret = "";
+ while ((ret = br.readLine()) != null) {
+ if (ret != null && !"".equals(ret.trim())) {
+ result.append(new String(ret.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8));
+ }
+ }
+ log.info("recv - {}", result);
+ conn.disconnect();
+ br.close();
+ } catch (ConnectException e) {
+ log.error("调用HttpUtils.sendSSLPost ConnectException, url=" + url + ",param=" + param, e);
+ } catch (SocketTimeoutException e) {
+ log.error("调用HttpUtils.sendSSLPost SocketTimeoutException, url=" + url + ",param=" + param, e);
+ } catch (IOException e) {
+ log.error("调用HttpUtils.sendSSLPost IOException, url=" + url + ",param=" + param, e);
+ } catch (Exception e) {
+ log.error("调用HttpsUtil.sendSSLPost Exception, url=" + url + ",param=" + param, e);
+ }
+ return result.toString();
+ }
+
+ private static class TrustAnyTrustManager implements X509TrustManager {
+ @Override
+ public void checkClientTrusted(X509Certificate[] chain, String authType) {}
+
+ @Override
+ public void checkServerTrusted(X509Certificate[] chain, String authType) {}
+
+ @Override
+ public X509Certificate[] getAcceptedIssuers() {
+ return new X509Certificate[] {};
+ }
+ }
+
+ private static class TrustAnyHostnameVerifier implements HostnameVerifier {
+ @Override
+ public boolean verify(String hostname, SSLSession session) {
+ return true;
+ }
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IPUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IPUtil.java
new file mode 100644
index 0000000..1ae4e98
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IPUtil.java
@@ -0,0 +1,170 @@
+package com.panzhihua.common.utlis;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+/**
+ * @author huaping hu
+ * @version 1.0
+ * @ClassName: IPUtil
+ * @Desc: Ip工具类
+ * @date 2016年6月1日下午5:26:56
+ * @history v1.0
+ */
+@Slf4j
+public class IPUtil {
+
+ /**
+ * 描述：获取IP地址
+ *
+ * @param request
+ * @return
+ * @author huaping hu
+ * @date 2016年6月1日下午5:25:44
+ */
+ public static String getIpAddress(HttpServletRequest request) {
+ if (request == null) {
+ return "unknown";
+ }
+ String ip = request.getHeader("x-forwarded-for");
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("Proxy-Client-IP");
+ }
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("X-Forwarded-For");
+ }
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("WL-Proxy-Client-IP");
+ }
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("X-Real-IP");
+ }
+
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getRemoteAddr();
+ }
+
+ return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : ip;
+ }
+
+
+ /**
+ * 描述：获取IP+[IP所属地址]
+ *
+ * @param request
+ * @return
+ * @author huaping hu
+ * @date 2016年6月1日下午6:01:09
+ */
+ public static String getIpBelongAddress(HttpServletRequest request) {
+
+ String ip = getIpAddress(request);
+ String belongIp = getIPbelongAddress(ip);
+
+ return ip + belongIp;
+ }
+
+ /**
+ * 描述：获取IP所属地址
+ *
+ * @param ip
+ * @return
+ * @author huaping hu
+ * @date 2016年6月1日下午5:59:43
+ */
+ public static String getIPbelongAddress(String ip) {
+
+ String ipAddress = "[]";
+ try {
+ // 淘宝提供的服务地址
+ String context = call("http://ip.taobao.com/service/getIpInfo.php?ip=" + ip);
+ JSONObject fromObject = JSONObject.parseObject(context);
+ String code = fromObject.getString("code");
+ if (code.equals("0")) {
+ JSONObject jsonObject = fromObject.getJSONObject("data");
+ ipAddress = "[" + jsonObject.get("country") + "/" + jsonObject.get("city") + "]";
+ }
+ } catch (Exception e) {
+ log.error("获取IP所属地址出错");
+ // e.printStackTrace();
+ }
+ return ipAddress;
+ }
+
+ /**
+ * 描述：获取Ip所属地址
+ *
+ * @param urlStr
+ * @return
+ * @author huaping hu
+ * @date 2016年6月1日下午5:38:55
+ */
+ public static String call(String urlStr) {
+
+ try {
+
+ URL url = new URL(urlStr);
+ HttpURLConnection httpCon = (HttpURLConnection) url.openConnection();
+
+ httpCon.setConnectTimeout(3000);
+ httpCon.setDoInput(true);
+ httpCon.setRequestMethod("GET");
+
+ int code = httpCon.getResponseCode();
+
+ if (code == 200) {
+ return streamConvertToSting(httpCon.getInputStream());
+ }
+ } catch (Exception e) {
+ log.error("获取IP所属地址出错", e);
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ /**
+ * 描述：将InputStream转换成String
+ *
+ * @param is
+ * @return
+ * @author huaping hu
+ * @date 2016年6月1日下午5:51:53
+ */
+ public static String streamConvertToSting(InputStream is) {
+
+ String tempStr = "";
+ try {
+
+ if (is == null)
+ return null;
+ ByteArrayOutputStream arrayOut = new ByteArrayOutputStream();
+ byte[] by = new byte[1024];
+ int len = 0;
+ while ((len = is.read(by)) != -1) {
+ arrayOut.write(by, 0, len);
+ }
+ tempStr = new String(arrayOut.toByteArray());
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return tempStr;
+ }
+
+ public static void main(String[] args) {
+
+ String context = call("http://ip.taobao.com/service/getIpInfo.php?ip=120.192.182.1");
+
+ JSONObject fromObject = JSONObject.parseObject(context);
+ JSONObject jsonObject = fromObject.getJSONObject("data");
+ System.out.println(fromObject);
+ System.err.println(jsonObject.get("city"));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IdCard.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IdCard.java
new file mode 100644
index 0000000..1b49c03
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IdCard.java
@@ -0,0 +1,64 @@
+package com.panzhihua.common.utlis;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 年龄
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-02-06 17:27
+ **/
+public class IdCard {
+
+ public static int IdNOToAge(String IdNO) {
+ int leh = IdNO.length();
+ String dates = "";
+ int age = 0;
+ if (leh == 18) {
+ dates = IdNO.substring(6, 10);
+ SimpleDateFormat df = new SimpleDateFormat("yyyy");
+ String year = df.format(new Date());
+ age = Integer.parseInt(year) - Integer.parseInt(dates);
+ } else {
+ System.out.println("出错！身份证长度不是18位！");
+ }
+ return age;
+ }
+
+ public static Date birthDay(String Id) {
+ /*从身份证截取生日信息
+
+ * author:huangjy 2016-07-15 Date转换成String,只需将parse方法换成format方法
+ * */
+ String year = Id.substring(6, 10);// 调用substring方法返回相关字段，注意索引从0开始
+ String month = Id.substring(10, 12);
+ String day = Id.substring(12, 14);
+ String birthday = year + "-" + month + "-" + day;
+ DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");// 定义一个时间转换格式“年-月-日”
+ Date date = null;
+ try { // 捕获类型转换（解析）异常
+ date = fmt.parse(birthday);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return date;
+ }
+
+ public static Integer sex(String id) {
+ Integer sex;
+ if (Integer.parseInt(id.substring(16).substring(0, 1)) % 2 == 0) {// 判断性别
+ sex = 2;
+ } else {
+ sex = 1;
+ }
+ return sex;
+ }
+
+ public static void main(String[] args) {
+ System.out.println(birthDay("120000197802150561"));
+ System.out.println(birthDay("32000019951110538X"));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IdCardUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IdCardUtil.java
new file mode 100644
index 0000000..893e74d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IdCardUtil.java
@@ -0,0 +1,168 @@
+package com.panzhihua.common.utlis;
+
+import java.util.HashSet;
+import java.util.regex.Pattern;
+
+/**
+ * 身份证正则校验工具类
+ */
+public class IdCardUtil {
+ /** 大陆地区地域编码最大值 **/
+ public static final int MAX_MAINLAND_AREACODE = 659004;
+ /** 大陆地区地域编码最小值 **/
+ public static final int MIN_MAINLAND_AREACODE = 110000;
+ /** 香港地域编码值 **/
+ public static final int HONGKONG_AREACODE = 810000; // 香港地域编码值
+ /** 台湾地域编码值 **/
+ public static final int TAIWAN_AREACODE = 710000;
+ /** 澳门地域编码值 **/
+ public static final int MACAO_AREACODE = 820000;
+
+ /** 数字正则 **/
+ public static final String regexNum = "^[0-9]*$";
+ /** 闰年生日正则 **/
+ public static final String regexBirthdayInLeapYear =
+ "^((19[0-9]{2})|(200[0-9])|(201[0-5]))((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|3[0-1])|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|[1-2][0-9]))$";
+ /** 平年生日正则 **/
+ public static final String regexBirthdayInCommonYear =
+ "^((19[0-9]{2})|(200[0-9])|(201[0-5]))((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|3[0-1])|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|1[0-9]|2[0-8]))$";
+
+ private static final HashSet<String> BLACK_SET = new HashSet<String>() {
+
+ private static final long serialVersionUID = 48136604486603324L;
+ {
+ add("111111111111111");
+ }
+ };
+
+ /**
+ * <p>
+ * 身份证格式强校验
+ * </p>
+ * <p>
+ * 1、号码的结构 公民身份号码是特征组合码，由十七位数字本体码和一位校验码组成。排列顺序从左至右依次为：六位数字地址码， 八位数字出生日期码，三位数字顺序码和一位数字校验码。
+ * </p>
+ * <p>
+ * 2、地址码(前六位数）表示编码对象常住户口所在县(市、旗、区)的行政区划代码，按GB/T2260的规定执行。
+ * </p>
+ * <p>
+ * 3、出生日期码（第七位至十四位）表示编码对象出生的年、月、日，按GB/T7408的规定执行，年、月、日代码之间不用分隔符。
+ * </p>
+ * <p>
+ * 4、顺序码（第十五位至十七位）表示在同一地址码所标识的区域范围内，对同年、同月、同日出生的人编定的顺序号， 顺序码的奇数分配给男性，偶数分配给女性。
+ * </p>
+ * <p>
+ * 5、校验码（第十八位数） （1）十七位数字本体码加权求和公式 S = Sum(Ai * Wi), i = 0, ... , 16 ，先对前17位数字的权求和 Ai:表示第i位置上的身份证号码数字值
+ * Wi:表示第i位置上的加权因子 Wi: 7 9 10 5 8 4 2 1 6 3 7 9 10 5 8 4 2 （2）计算模 Y = mod(S, 11) （3）通过模得到对应的校验码 Y: 0 1 2 3 4 5 6 7 8
+ * 9 10 校验码: 1 0 X 9 8 7 6 5 4 3 2
+ * </p>
+ */
+ public static final boolean strongVerifyIdNumber(String idNumber) {
+ if (StringUtils.isBlank(idNumber)) {
+ return false;
+ }
+ idNumber = idNumber.trim();
+
+ if (BLACK_SET.contains(idNumber)) {
+ return false;
+ }
+ if (!checkIdNumberRegex(idNumber)) {
+ return false;
+ }
+ if (!checkIdNumberArea(idNumber.substring(0, 6))) {
+ return false;
+ }
+ idNumber = convertFifteenToEighteen(idNumber);
+ if (!checkBirthday(idNumber.substring(6, 14))) {
+ return false;
+ }
+ return checkIdNumberVerifyCode(idNumber);
+ }
+
+ /**
+ * 身份证正则校验
+ */
+ private static boolean checkIdNumberRegex(String idNumber) {
+ return Pattern.matches("^([0-9]{17}[0-9Xx])|([0-9]{15})$", idNumber);
+ }
+
+ /**
+ * 身份证地区码检查
+ */
+ private static boolean checkIdNumberArea(String idNumberArea) {
+ int areaCode = Integer.parseInt(idNumberArea);
+ if (areaCode == HONGKONG_AREACODE || areaCode == MACAO_AREACODE || areaCode == TAIWAN_AREACODE) {
+ return true;
+ }
+ return areaCode <= MAX_MAINLAND_AREACODE && areaCode >= MIN_MAINLAND_AREACODE;
+ }
+
+ /**
+ * 将15位身份证转换为18位
+ */
+ private static String convertFifteenToEighteen(String idNumber) {
+ if (15 != idNumber.length()) {
+ return idNumber;
+ }
+ idNumber = idNumber.substring(0, 6) + "19" + idNumber.substring(6, 15);
+ idNumber = idNumber + getVerifyCode(idNumber);
+ return idNumber;
+ }
+
+ /**
+ * 根据身份证前17位计算身份证校验码
+ */
+ private static String getVerifyCode(String idNumber) {
+ if (!Pattern.matches(regexNum, idNumber.substring(0, 17))) {
+ return null;
+ }
+ String[] ValCodeArr = {"1", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2"};
+ String[] Wi = {"7", "9", "10", "5", "8", "4", "2", "1", "6", "3", "7", "9", "10", "5", "8", "4", "2"};
+
+ int sum = 0;
+ for (int i = 0; i < 17; i++) {
+ sum = sum + Integer.parseInt(String.valueOf(idNumber.charAt(i))) * Integer.parseInt(Wi[i]);
+ }
+ return ValCodeArr[sum % 11];
+ }
+
+ /**
+ * 身份证出生日期嘛检查
+ */
+ private static boolean checkBirthday(String idNumberBirthdayStr) {
+ Integer year = null;
+ try {
+ year = Integer.valueOf(idNumberBirthdayStr.substring(0, 4));
+ } catch (Exception e) {
+ }
+ if (null == year) {
+ return false;
+ }
+ if (isLeapYear(year)) {
+ return Pattern.matches(regexBirthdayInLeapYear, idNumberBirthdayStr);
+ } else {
+ return Pattern.matches(regexBirthdayInCommonYear, idNumberBirthdayStr);
+ }
+ }
+
+ /**
+ * 判断是否为闰年
+ */
+ private static boolean isLeapYear(int year) {
+ return (year % 400 == 0) || (year % 100 != 0 && year % 4 == 0);
+ }
+
+ /**
+ * 身份证校验码检查
+ */
+ private static boolean checkIdNumberVerifyCode(String idNumber) {
+ return getVerifyCode(idNumber).equalsIgnoreCase(idNumber.substring(17));
+ }
+
+ public static void main(String[] args) {
+ String cardNo = "510403201602230324";
+ Boolean isok = strongVerifyIdNumber(cardNo);
+ System.out.println();
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IpUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IpUtils.java
new file mode 100644
index 0000000..2789a49
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IpUtils.java
@@ -0,0 +1,165 @@
+package com.panzhihua.common.utlis;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 获取IP方法
+ *
+ * @author huanghongfa
+ */
+public class IpUtils {
+ public static String getIpAddr(HttpServletRequest request) {
+ if (request == null) {
+ return "unknown";
+ }
+ String ip = request.getHeader("x-forwarded-for");
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("Proxy-Client-IP");
+ }
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("X-Forwarded-For");
+ }
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("WL-Proxy-Client-IP");
+ }
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("X-Real-IP");
+ }
+
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getRemoteAddr();
+ }
+ return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : EscapeUtil.clean(ip);
+ }
+
+ public static boolean internalIp(String ip) {
+ byte[] addr = textToNumericFormatV4(ip);
+ return internalIp(addr) || "127.0.0.1".equals(ip);
+ }
+
+ private static boolean internalIp(byte[] addr) {
+ if (StringUtils.isNull(addr) || addr.length < 2) {
+ return true;
+ }
+ final byte b0 = addr[0];
+ final byte b1 = addr[1];
+ // 10.x.x.x/8
+ final byte SECTION_1 = 0x0A;
+ // 172.16.x.x/12
+ final byte SECTION_2 = (byte)0xAC;
+ final byte SECTION_3 = (byte)0x10;
+ final byte SECTION_4 = (byte)0x1F;
+ // 192.168.x.x/16
+ final byte SECTION_5 = (byte)0xC0;
+ final byte SECTION_6 = (byte)0xA8;
+ switch (b0) {
+ case SECTION_1:
+ return true;
+ case SECTION_2:
+ if (b1 >= SECTION_3 && b1 <= SECTION_4) {
+ return true;
+ }
+ case SECTION_5:
+ switch (b1) {
+ case SECTION_6:
+ return true;
+ }
+ default:
+ return false;
+ }
+ }
+
+ /**
+ * 将IPv4地址转换成字节
+ *
+ * @param text
+ * IPv4地址
+ * @return byte 字节
+ */
+ public static byte[] textToNumericFormatV4(String text) {
+ if (text.length() == 0) {
+ return null;
+ }
+
+ byte[] bytes = new byte[4];
+ String[] elements = text.split("\\.", -1);
+ try {
+ long l;
+ int i;
+ switch (elements.length) {
+ case 1:
+ l = Long.parseLong(elements[0]);
+ if ((l < 0L) || (l > 4294967295L)) {
+ return null;
+ }
+ bytes[0] = (byte)(int)(l >> 24 & 0xFF);
+ bytes[1] = (byte)(int)((l & 0xFFFFFF) >> 16 & 0xFF);
+ bytes[2] = (byte)(int)((l & 0xFFFF) >> 8 & 0xFF);
+ bytes[3] = (byte)(int)(l & 0xFF);
+ break;
+ case 2:
+ l = Integer.parseInt(elements[0]);
+ if ((l < 0L) || (l > 255L)) {
+ return null;
+ }
+ bytes[0] = (byte)(int)(l & 0xFF);
+ l = Integer.parseInt(elements[1]);
+ if ((l < 0L) || (l > 16777215L)) {
+ return null;
+ }
+ bytes[1] = (byte)(int)(l >> 16 & 0xFF);
+ bytes[2] = (byte)(int)((l & 0xFFFF) >> 8 & 0xFF);
+ bytes[3] = (byte)(int)(l & 0xFF);
+ break;
+ case 3:
+ for (i = 0; i < 2; ++i) {
+ l = Integer.parseInt(elements[i]);
+ if ((l < 0L) || (l > 255L)) {
+ return null;
+ }
+ bytes[i] = (byte)(int)(l & 0xFF);
+ }
+ l = Integer.parseInt(elements[2]);
+ if ((l < 0L) || (l > 65535L)) {
+ return null;
+ }
+ bytes[2] = (byte)(int)(l >> 8 & 0xFF);
+ bytes[3] = (byte)(int)(l & 0xFF);
+ break;
+ case 4:
+ for (i = 0; i < 4; ++i) {
+ l = Integer.parseInt(elements[i]);
+ if ((l < 0L) || (l > 255L)) {
+ return null;
+ }
+ bytes[i] = (byte)(int)(l & 0xFF);
+ }
+ break;
+ default:
+ return null;
+ }
+ } catch (NumberFormatException e) {
+ return null;
+ }
+ return bytes;
+ }
+
+ public static String getHostIp() {
+ try {
+ return InetAddress.getLocalHost().getHostAddress();
+ } catch (UnknownHostException e) {
+ }
+ return "127.0.0.1";
+ }
+
+ public static String getHostName() {
+ try {
+ return InetAddress.getLocalHost().getHostName();
+ } catch (UnknownHostException e) {
+ }
+ return "未知";
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/JWTTokenUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/JWTTokenUtil.java
new file mode 100644
index 0000000..73fd123
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/JWTTokenUtil.java
@@ -0,0 +1,173 @@
+package com.panzhihua.common.utlis;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.stereotype.Component;
+
+import com.panzhihua.common.constants.TokenConstant;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+
+/**
+ * token验证处理
+ *
+ * @author ruoyi
+ */
+@Component
+public class JWTTokenUtil implements Serializable {
+ /**
+ * 从数据声明生成令牌
+ *
+ * @param claims
+ * 数据声明
+ * @return 令牌
+ */
+ private static String generateToken(Map<String, Object> claims) {
+ Date expirationDate = new Date(System.currentTimeMillis() + TokenConstant.EXPIRETIME_LONG * 60 * 1000 * 72);
+ return Jwts.builder().setClaims(claims).setExpiration(expirationDate)
+ .signWith(SignatureAlgorithm.HS512, TokenConstant.SECRET).compact();
+ }
+
+ /**
+ * 生成刷新token
+ *
+ * @param claims
+ * tokenbody
+ * @return refreshtoken
+ */
+ private static String generateTokenRefreshToken(Map<String, Object> claims) {
+ Date expirationDate = new Date(System.currentTimeMillis() + TokenConstant.EXPIRETIME_REFRESH * 60 * 60 * 1000);
+ return Jwts.builder().setClaims(claims).setExpiration(expirationDate)
+ .signWith(SignatureAlgorithm.HS512, TokenConstant.SECRET).compact();
+ }
+
+ /**
+ * 从令牌中获取数据声明
+ *
+ * @param token
+ * 令牌
+ * @return 数据声明
+ */
+ public static Claims getClaimsFromToken(String token) {
+ Claims claims;
+ try {
+ claims = Jwts.parser().setSigningKey(TokenConstant.SECRET).parseClaimsJws(token).getBody();
+ } catch (Exception e) {
+ claims = null;
+ }
+ return claims;
+ }
+
+ /**
+ * 生成令牌
+ *
+ * @param loginUserInfoVO
+ * 用户
+ * @return 令牌
+ */
+ public static String generateToken(LoginUserInfoVO loginUserInfoVO) {
+ Map<String, Object> claims = new HashMap<>(2);
+ claims.put("sub", loginUserInfoVO.getUserId());
+ claims.put("created", new Date());
+ claims.put("type", loginUserInfoVO.getType());
+ return generateToken(claims);
+ }
+
+ /**
+ * 从令牌中获取用户名
+ *
+ * @param token
+ * 令牌
+ * @return 用户名
+ */
+ public static String getUsernameFromToken(String token) {
+ String username;
+ try {
+ Claims claims = getClaimsFromToken(token);
+ username = claims.getSubject();
+ } catch (Exception e) {
+ username = null;
+ }
+ return username;
+ }
+
+ /**
+ * 判断令牌是否过期
+ *
+ * @param token
+ * 令牌
+ * @return 是否过期
+ */
+ public static Boolean isTokenExpired(String token) {
+ try {
+ Claims claims = getClaimsFromToken(token);
+ Date expiration = claims.getExpiration();
+ return expiration.before(new Date());
+ } catch (Exception e) {
+ return true;
+ }
+ }
+
+ /**
+ * 刷新令牌
+ *
+ * @param token
+ * 原令牌
+ * @return 新令牌
+ */
+ public static String refreshToken(String token) {
+ String refreshedToken;
+ try {
+ Claims claims = getClaimsFromToken(token);
+ claims.put("created", new Date());
+ refreshedToken = generateToken(claims);
+ } catch (Exception e) {
+ refreshedToken = null;
+ }
+ return refreshedToken;
+ }
+
+ /**
+ * 验证令牌
+ *
+ * @param token
+ * 令牌
+ * @param loginUserInfoVO
+ * 用户
+ * @return 是否有效
+ */
+ public static Boolean validateToken(String token, LoginUserInfoVO loginUserInfoVO) {
+ String username = getUsernameFromToken(token);
+ return (username.equals(loginUserInfoVO.getUserId()) && !isTokenExpired(token));
+ }
+
+ public static void main(String[] args) {
+ Claims claims = JWTTokenUtil.getClaimsFromToken(
+ "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOjIsInR5cGUiOjEsImV4cCI6MTYwNjM1NzkzOSwiY3JlYXRlZCI6MTYwNjM1NjEzOTEzN30.zIj31TLHk4B9F45OszrJWfOlhZL5CWviP2RgsFP6LZuci6MlPn0iVbekioP01DRsu59mWd5FMyhd9WLvMtfxMg");
+ Boolean tokenExpired = JWTTokenUtil.isTokenExpired(
+ "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOjIsInR5cGUiOjEsImV4cCI6MTYwNjM2MDQzNSwiY3JlYXRlZCI6MTYwNjM1ODYzNTI3MX0.7R3SG6hu-sr_KiPpgepubl_1FdaooCNJ0URHWv6Jynr7m8JIar2kUAnhHfWOfHrNILQb5Q-nqxceXdavcuVOXg");
+ System.out.println(claims);
+ }
+
+ /**
+ * 生成刷新token
+ *
+ * @param loginUserInfoVO
+ * 登录用户基本信息
+ * @return refreshtoken
+ */
+ public static String generateRefeshToken(LoginUserInfoVO loginUserInfoVO) {
+ Map<String, Object> claims = new HashMap<>(2);
+ claims.put("sub", loginUserInfoVO.getUserId());
+ claims.put("created", new Date());
+ claims.put("type", loginUserInfoVO.getType());
+ return generateTokenRefreshToken(claims);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/LabelUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/LabelUtils.java
new file mode 100644
index 0000000..45efa5f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/LabelUtils.java
@@ -0,0 +1,35 @@
+package com.panzhihua.common.utlis;
+
+import com.panzhihua.common.model.vos.community.ComMngPopulationCommunityTagsVo;
+
+import java.util.List;
+
+/**
+ * @author lyq
+ * 社区标签工具类
+ */
+public class LabelUtils {
+
+ /**
+ * 社区标签转换
+ * @param communityTagsList 社区标签列表
+ * @return 社区标签
+ */
+ public static String assembleLabel(List<ComMngPopulationCommunityTagsVo> communityTagsList){
+ //创建用户拼接字符串
+ StringBuilder sb = new StringBuilder();
+ communityTagsList.forEach(tag -> {
+ if(StringUtils.isNotEmpty(tag.getLabel())){
+ sb.append(tag.getCommunityName());
+ sb.append("：");
+ sb.append(tag.getLabel());
+ sb.append("；");
+ }
+ });
+ String result = sb.toString();
+ if(StringUtils.isNotEmpty(result)){
+ result = result.substring(0,result.length() - 1);
+ }
+ return result;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ListUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ListUtils.java
new file mode 100644
index 0000000..5fd33bd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ListUtils.java
@@ -0,0 +1,14 @@
+package com.panzhihua.common.utlis;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+public class ListUtils {
+
+ public static <T> Predicate<T> distinctByKey(Function<? super T, Object> keyExtractor) {
+ Map<Object, Boolean> seen = new ConcurrentHashMap<>();
+ return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/LngLatUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/LngLatUtils.java
new file mode 100644
index 0000000..56eec9c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/LngLatUtils.java
@@ -0,0 +1,74 @@
+package com.panzhihua.common.utlis;
+
+import java.awt.geom.Point2D;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.panzhihua.common.model.vos.grid.LatLngVO;
+
+public class LngLatUtils {
+
+ public static boolean check(Point2D.Double _point, List<Point2D.Double> polygon) {
+ java.awt.geom.GeneralPath peneralPath = new java.awt.geom.GeneralPath();
+
+ Point2D.Double first = polygon.get(0);
+ peneralPath.moveTo(first.x, first.y);
+ polygon.remove(0);
+
+ for (Point2D.Double d : polygon) {
+ peneralPath.lineTo(d.x, d.y);
+ }
+
+ peneralPath.lineTo(first.x, first.y);
+ peneralPath.closePath();
+
+ return peneralPath.contains(_point);
+ }
+
+ /**
+ *
+ * @param bound
+ * 经纬度数组
+ * @param pointlng
+ * 短
+ * @param pointLat
+ * 长
+ * @return
+ */
+ public static boolean isInPolygon(List<LatLngVO> bound, double pointlng, double pointLat) {
+ Point2D.Double point = new Point2D.Double(pointlng, pointLat);
+ List<Point2D.Double> pointList = new ArrayList<>();
+ for (int i = 0; i < bound.size(); i++) {
+ pointList.add(new Point2D.Double(bound.get(i).getLng(), bound.get(i).getLat()));
+ }
+ return check(point, pointList);
+ }
+
+ /**
+ * 从txt数据中获取经纬度
+ *
+ * @param lngLatTxt
+ * @return
+ */
+ public static List<LatLngVO> getLatLngFromText(String lngLatTxt) {
+ List<LatLngVO> rtResult = new ArrayList<>();
+ String str = lngLatTxt.replace("[[", "");
+
+ str = str.replace("]]", "");
+ String[] loca = str.split("],\\[");
+ for (int i = 0; i < loca.length; i++) {
+ String[] loca1 = loca[i].split(",");
+ rtResult.add(new LatLngVO(Double.valueOf(loca1[0]), Double.valueOf(loca1[1])));
+ }
+ return rtResult;
+ }
+
+ public static void main(String[] args) {
+ String latLngTxt =
+ "[[104.066974,30.660293],[104.053394,30.658114],[104.059921,30.657076],[104.065231,30.657086]]";
+ List<LatLngVO> latLngList = getLatLngFromText(latLngTxt);
+
+ System.out.println(isInPolygon(latLngList, 104.063398, 30.657929));
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/LogUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/LogUtils.java
new file mode 100644
index 0000000..bfd6dbc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/LogUtils.java
@@ -0,0 +1,15 @@
+package com.panzhihua.common.utlis;
+
+/**
+ * 处理并记录日志文件
+ *
+ * @author huanghongfa
+ */
+public class LogUtils {
+ public static String getBlock(Object msg) {
+ if (msg == null) {
+ msg = "";
+ }
+ return "[" + msg.toString() + "]";
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/MathUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/MathUtils.java
new file mode 100644
index 0000000..4b58fd8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/MathUtils.java
@@ -0,0 +1,24 @@
+package com.panzhihua.common.utlis;
+
+import java.math.BigDecimal;
+
+/**
+ * @author lyq
+ * 数学计算公式工具类
+ */
+public class MathUtils {
+
+ /**
+ * 生成区间随机数
+ * @param max 最大值
+ * @param min 最小值
+ * @return 随机数
+ */
+ public static BigDecimal getRandomNumber(BigDecimal max, BigDecimal min){
+ float minF = min.floatValue();
+ float maxF = max.floatValue();
+ //生成随机数
+ BigDecimal db = new BigDecimal(Math.random() * (maxF - minF) + minF);
+ return db.setScale(2,BigDecimal.ROUND_DOWN);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/MessageUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/MessageUtils.java
new file mode 100644
index 0000000..9e63c85
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/MessageUtils.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.utlis;
+
+import org.springframework.context.MessageSource;
+import org.springframework.context.i18n.LocaleContextHolder;
+
+/**
+ * 获取i18n资源文件
+ *
+ * @author ruoyi
+ */
+public class MessageUtils {
+ /**
+ * 根据消息键和参数 获取消息 委托给spring messageSource
+ *
+ * @param code
+ * 消息键
+ * @param args
+ * 参数
+ * @return 获取国际化翻译值
+ */
+ public static String message(String code, Object... args) {
+ MessageSource messageSource = SpringUtils.getBean(MessageSource.class);
+ return messageSource.getMessage(code, args, LocaleContextHolder.getLocale());
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/MimeTypeUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/MimeTypeUtils.java
new file mode 100644
index 0000000..34e1a5a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/MimeTypeUtils.java
@@ -0,0 +1,59 @@
+package com.panzhihua.common.utlis;
+
+/**
+ * 媒体类型工具类
+ *
+ * @author
+ */
+public class MimeTypeUtils
+{
+ public static final String IMAGE_PNG = "image/png";
+
+ public static final String IMAGE_JPG = "image/jpg";
+
+ public static final String IMAGE_JPEG = "image/jpeg";
+
+ public static final String IMAGE_BMP = "image/bmp";
+
+ public static final String IMAGE_GIF = "image/gif";
+
+ public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" };
+
+ public static final String[] FLASH_EXTENSION = { "swf", "flv" };
+
+ public static final String[] MEDIA_EXTENSION = { "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg",
+ "asf", "rm", "rmvb" };
+
+ public static final String[] VIDEO_EXTENSION = { "mp4", "avi", "rmvb" };
+
+ public static final String[] DEFAULT_ALLOWED_EXTENSION = {
+ // 图片
+ "bmp", "gif", "jpg", "jpeg", "png",
+ // word excel powerpoint
+ "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
+ // 压缩文件
+ "rar", "zip", "gz", "bz2",
+ // 视频格式
+ "mp4", "avi", "rmvb",
+ // pdf
+ "pdf" };
+
+ public static String getExtension(String prefix)
+ {
+ switch (prefix)
+ {
+ case IMAGE_PNG:
+ return "png";
+ case IMAGE_JPG:
+ return "jpg";
+ case IMAGE_JPEG:
+ return "jpeg";
+ case IMAGE_BMP:
+ return "bmp";
+ case IMAGE_GIF:
+ return "gif";
+ default:
+ return "";
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/OrderNoUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/OrderNoUtils.java
new file mode 100644
index 0000000..dcc28a9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/OrderNoUtils.java
@@ -0,0 +1,76 @@
+package com.panzhihua.common.utlis;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class OrderNoUtils {
+ private static int sn = 0;
+
+ // 防止创建类的实例
+ private OrderNoUtils() {
+ }
+
+ public static String NextOrderNo(Long userId) {
+ if (sn == 999)
+ sn = 0;
+ else
+ sn++;
+ DateFormat df = new SimpleDateFormat("MMddHHmmss");
+ return df.format(new Date()) + padRight(String.valueOf(userId), 5, '0') + padRight(String.valueOf(sn), 3, '0')
+ + getRandomNumber();
+ }
+
+ public static String NextOrderNoFlower(Long userId) {
+ DateFormat df = new SimpleDateFormat("MMddHHmmss");
+ return df.format(new Date()) + padRight(String.valueOf(userId), 3, '0')
+ + getRandomNumber();
+ }
+
+ public static String nextDeliveryNo() {
+ if (sn == 999)
+ sn = 0;
+ else
+ sn++;
+ DateFormat df = new SimpleDateFormat("MMddHHmmss");
+ return "PS" + df.format(new Date()) + padRight(String.valueOf(sn), 3, '0')
+ + getRandomNumber();
+ }
+
+ public static String padLeft(String src, int len, char ch) {
+ int diff = len - src.length();
+ if (diff <= 0) {
+ return src;
+ }
+
+ char[] charr = new char[len];
+ System.arraycopy(src.toCharArray(), 0, charr, 0, src.length());
+ for (int i = src.length(); i < len; i++) {
+ charr[i] = ch;
+ }
+ return new String(charr);
+ }
+
+ public static String padRight(String src, int len, char ch) {
+ int diff = len - src.length();
+ if (diff <= 0) {
+ return src;
+ }
+
+ char[] charr = new char[len];
+ System.arraycopy(src.toCharArray(), 0, charr, diff, src.length());
+ for (int i = 0; i < diff; i++) {
+ charr[i] = ch;
+ }
+ return new String(charr);
+ }
+
+ /**
+ * 获取三位随机数
+ *
+ * @return 三位随机数
+ */
+ private static String getRandomNumber() {
+ return String.valueOf(new Double((Math.random() * 9 + 1) * (Math.pow(10, 3 - 1))).intValue());
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ParamRegularUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ParamRegularUtil.java
new file mode 100644
index 0000000..bd39ffb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ParamRegularUtil.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.utlis;
+
+import java.util.regex.Pattern;
+
+/**
+ * @Author: llming
+ * @Description:参数正则匹配工具类
+ */
+public class ParamRegularUtil {
+ /**
+ * 车牌号校验
+ *
+ * @param carNum
+ */
+ public static boolean carNumRegular(String carNum) {
+ String pattern =
+ "([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼]{1}(([A-HJ-Z]{1}[A-HJ-NP-Z0-9]{5})|([A-HJ-Z]{1}(([DF]{1}[A-HJ-NP-Z0-9]{1}[0-9]{4})|([0-9]{5}[DF]{1})))|([A-HJ-Z]{1}[A-D0-9]{1}[0-9]{3}警)))|([0-9]{6}使)|((([沪粤川云桂鄂陕蒙藏黑辽渝]{1}A)|鲁B|闽D|蒙E|蒙H)[0-9]{4}领)|(WJ[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼·•]{1}[0-9]{4}[TDSHBXJ0-9]{1})|([VKHBSLJNGCE]{1}[A-DJ-PR-TVY]{1}[0-9]{5})";
+ return Pattern.matches(pattern, carNum);
+ }
+
+ public static void main(String[] args) {
+ boolean cdsaf = carNumRegular("粤B12345");
+ System.out.println(cdsaf);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/PayUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/PayUtil.java
new file mode 100644
index 0000000..152b4b9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/PayUtil.java
@@ -0,0 +1,202 @@
+package com.panzhihua.common.utlis;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import org.jdom2.input.SAXBuilder;
+
+public class PayUtil {
+
+ /**
+ * 获取当前机器的ip
+ */
+ public static String getLocalIp() {
+ InetAddress ia = null;
+ String localip = null;
+ try {
+ ia = InetAddress.getLocalHost();
+ localip = ia.getHostAddress();
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ }
+ return localip;
+ }
+
+ @SuppressWarnings("rawtypes")
+ public static String getRequestXml(SortedMap<Object, Object> parameters) {
+ StringBuffer sb = new StringBuffer();
+ sb.append("<xml>");
+ Set es = parameters.entrySet();
+ Iterator it = es.iterator();
+ while (it.hasNext()) {
+ Map.Entry entry = (Map.Entry)it.next();
+ String k = (String)entry.getKey();
+ String v = (String)entry.getValue();
+ if ("attach".equalsIgnoreCase(k) || "body".equalsIgnoreCase(k) || "sign".equalsIgnoreCase(k)) {
+ sb.append("<" + k + ">" + "<![CDATA[" + v + "]]></" + k + ">");
+ } else {
+ sb.append("<" + k + ">" + v + "</" + k + ">");
+ }
+ }
+ sb.append("</xml>");
+ return sb.toString();
+ }
+
+ /**
+ * 创建签名Sign
+ */
+ @SuppressWarnings("rawtypes")
+ public static String createSign(String characterEncoding, SortedMap<Object, Object> parameters, String key) {
+ StringBuffer sb = new StringBuffer();
+ Set es = parameters.entrySet();
+ Iterator<?> it = es.iterator();
+ while (it.hasNext()) {
+ Map.Entry entry = (Map.Entry)it.next();
+ String k = (String)entry.getKey();
+ if (entry.getValue() != null || !"".equals(entry.getValue())) {
+ String v = String.valueOf(entry.getValue());
+ if (null != v && !"".equals(v) && !"sign".equals(k) && !"key".equals(k)) {
+ sb.append(k + "=" + v + "&");
+ }
+ }
+ }
+ sb.append("key=" + key);
+ String sign = "";
+ try {
+ sign = MD5(sb.toString());
+ } catch (Exception e) {
+ return e.getMessage();
+ }
+ return sign;
+ }
+
+ /**
+ * 生成随机数
+ */
+ public static String makeUUID(int len) {
+ return UUID.randomUUID().toString().replaceAll("-", "").substring(0, len);
+ }
+
+ /**
+ * 生成订单号
+ */
+ public static String generateOrderNo() {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd");
+ return sdf.format(new Date()) + makeUUID(16);
+ }
+
+ /**
+ * 解析xml
+ */
+ public static Map doXMLParse(String strxml) throws Exception {
+ strxml = strxml.replaceFirst("encoding=\".*\"", "encoding=\"UTF-8\"");
+ if (StringUtils.isNotEmpty(strxml)) {
+ return null;
+ }
+ Map m = new HashMap();
+ InputStream in = new ByteArrayInputStream(strxml.getBytes(StandardCharsets.UTF_8));
+ SAXBuilder builder = new SAXBuilder();
+ org.jdom2.Document doc = builder.build(in);
+ org.jdom2.Element root = doc.getRootElement();
+ List list = root.getChildren();
+ Iterator it = list.iterator();
+ while (it.hasNext()) {
+ org.jdom2.Element e = (org.jdom2.Element)it.next();
+ String k = e.getName();
+ String v = "";
+ List children = e.getChildren();
+ if (children.isEmpty()) {
+ v = e.getTextNormalize();
+ } else {
+ v = getChildrenText(children);
+ }
+ m.put(k, v);
+ }
+ // 关闭流
+ in.close();
+ return m;
+ }
+
+ /**
+ * 获取子节点的xml
+ */
+ public static String getChildrenText(List children) {
+ StringBuffer sb = new StringBuffer();
+ if (!children.isEmpty()) {
+ Iterator it = children.iterator();
+ while (it.hasNext()) {
+ org.jdom2.Element e = (org.jdom2.Element)it.next();
+ String name = e.getName();
+ String value = e.getTextNormalize();
+ List list = e.getChildren();
+ sb.append("<" + name + ">");
+ if (!list.isEmpty()) {
+ sb.append(getChildrenText(list));
+ }
+ sb.append(value);
+ sb.append("</" + name + ">");
+ }
+ }
+ return sb.toString();
+ }
+
+ /**
+ * 转换金额到整型
+ */
+ public static String moneyToIntegerStr(BigDecimal money) {
+ int amount = money.multiply(new BigDecimal((100))).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
+ return String.valueOf(amount);
+ }
+
+ /**
+ * 微信下单，map to xml
+ *
+ * @param params
+ * 参数
+ * @return String
+ */
+ public static String mapToXml(Map<String, String> params) {
+ StringBuilder xml = new StringBuilder();
+ xml.append("<xml>");
+ for (Map.Entry<String, String> entry : params.entrySet()) {
+ String key = entry.getKey();
+ String value = entry.getValue();
+ // 略过空值
+ if (StringUtils.isEmpty(value))
+ continue;
+ xml.append("<").append(key).append("><![CDATA[");
+ xml.append(entry.getValue());
+ xml.append("]]></").append(key).append(">");
+ }
+ xml.append("</xml>");
+ return xml.toString();
+ }
+
+ /**
+ * 生成 MD5
+ *
+ * @param data
+ * 待处理数据
+ * @return MD5结果
+ */
+ public static String MD5(String data) throws Exception {
+ java.security.MessageDigest md = MessageDigest.getInstance("MD5");
+ byte[] array = md.digest(data.getBytes(StandardCharsets.UTF_8));
+ StringBuilder sb = new StringBuilder();
+ for (byte item : array) {
+ sb.append(Integer.toHexString((item & 0xFF) | 0x100), 1, 3);
+ }
+ return sb.toString().toUpperCase();
+ }
+
+ public static String create_timestamp() {
+ return Long.toString(System.currentTimeMillis() / 1000);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/QRCodeUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/QRCodeUtils.java
new file mode 100644
index 0000000..fb808cf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/QRCodeUtils.java
@@ -0,0 +1,264 @@
+package com.panzhihua.common.utlis;
+
+import java.awt.BasicStroke;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Shape;
+import java.awt.geom.RoundRectangle2D;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.OutputStream;
+import java.util.Hashtable;
+import java.util.Random;
+
+import javax.imageio.ImageIO;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.BinaryBitmap;
+import com.google.zxing.DecodeHintType;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.MultiFormatReader;
+import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.Result;
+import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.HybridBinarizer;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+
+public class QRCodeUtils {
+ private static final String CHARSET = "utf-8";
+ private static final String FORMAT_NAME = "JPG";
+ // 二维码尺寸
+ private static final int QRCODE_SIZE = 300;
+ // LOGO宽度
+ private static final int WIDTH = 60;
+ // LOGO高度
+ private static final int HEIGHT = 60;
+
+ private static BufferedImage createImage(String content, String imgPath,
+ boolean needCompress) throws Exception {
+ Hashtable<EncodeHintType, Object> hints = new Hashtable<EncodeHintType, Object>();
+ hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
+ hints.put(EncodeHintType.CHARACTER_SET, CHARSET);
+ hints.put(EncodeHintType.MARGIN, 1);
+ BitMatrix bitMatrix = new MultiFormatWriter().encode(content,
+ BarcodeFormat.QR_CODE, QRCODE_SIZE, QRCODE_SIZE, hints);
+ int width = bitMatrix.getWidth();
+ int height = bitMatrix.getHeight();
+ BufferedImage image = new BufferedImage(width, height,
+ BufferedImage.TYPE_INT_RGB);
+ for (int x = 0; x < width; x++) {
+ for (int y = 0; y < height; y++) {
+ image.setRGB(x, y, bitMatrix.get(x, y) ? 0xFF000000
+ : 0xFFFFFFFF);
+ }
+ }
+ if (imgPath == null || "".equals(imgPath)) {
+ return image;
+ }
+ // 插入图片
+ QRCodeUtils.insertImage(image, imgPath, needCompress);
+ return image;
+ }
+
+ /**
+ * 插入LOGO
+ *
+ * @param source
+ * 二维码图片
+ * @param imgPath
+ * LOGO图片地址
+ * @param needCompress
+ * 是否压缩
+ * @throws Exception
+ */
+ private static void insertImage(BufferedImage source, String imgPath,
+ boolean needCompress) throws Exception {
+ File file = new File(imgPath);
+ if (!file.exists()) {
+ System.err.println(""+imgPath+" 该文件不存在！");
+ return;
+ }
+ Image src = ImageIO.read(new File(imgPath));
+ int width = src.getWidth(null);
+ int height = src.getHeight(null);
+ if (needCompress) { // 压缩LOGO
+ if (width > WIDTH) {
+ width = WIDTH;
+ }
+ if (height > HEIGHT) {
+ height = HEIGHT;
+ }
+ Image image = src.getScaledInstance(width, height,
+ Image.SCALE_SMOOTH);
+ BufferedImage tag = new BufferedImage(width, height,
+ BufferedImage.TYPE_INT_RGB);
+ Graphics g = tag.getGraphics();
+ g.drawImage(image, 0, 0, null); // 绘制缩小后的图
+ g.dispose();
+ src = image;
+ }
+ // 插入LOGO
+ Graphics2D graph = source.createGraphics();
+ int x = (QRCODE_SIZE - width) / 2;
+ int y = (QRCODE_SIZE - height) / 2;
+ graph.drawImage(src, x, y, width, height, null);
+ Shape shape = new RoundRectangle2D.Float(x, y, width, width, 6, 6);
+ graph.setStroke(new BasicStroke(3f));
+ graph.draw(shape);
+ graph.dispose();
+ }
+
+ /**
+ * 生成二维码(内嵌LOGO)
+ *
+ * @param content
+ * 内容
+ * @param imgPath
+ * LOGO地址
+ * @param destPath
+ * 存放目录
+ * @param needCompress
+ * 是否压缩LOGO
+ * @throws Exception
+ */
+ public static String encode(String content, String imgPath, String destPath,
+ boolean needCompress) throws Exception {
+ BufferedImage image = QRCodeUtils.createImage(content, imgPath,
+ needCompress);
+ mkdirs(destPath);
+ String file = Snowflake.getId() + ".jpg";
+ ImageIO.write(image, FORMAT_NAME, new File(destPath+"/"+file));
+ return file;
+ }
+
+ /**
+ * 当文件夹不存在时，mkdirs会自动创建多层目录，区别于mkdir．(mkdir如果父目录不存在则会抛出异常)
+ * @date 2013-12-11 上午10:16:36
+ * @param destPath 存放目录
+ */
+ public static void mkdirs(String destPath) {
+ File file =new File(destPath);
+ //当文件夹不存在时，mkdirs会自动创建多层目录，区别于mkdir．(mkdir如果父目录不存在则会抛出异常)
+ if (!file.exists() && !file.isDirectory()) {
+ file.mkdirs();
+ }
+ }
+
+ /**
+ * 生成二维码(内嵌LOGO)
+ *
+ * @param content
+ * 内容
+ * @param imgPath
+ * LOGO地址
+ * @param destPath
+ * 存储地址
+ * @throws Exception
+ */
+ public static void encode(String content, String imgPath, String destPath)
+ throws Exception {
+ QRCodeUtils.encode(content, imgPath, destPath, false);
+ }
+
+ /**
+ * 生成二维码
+ *
+ * @param content
+ * 内容
+ * @param destPath
+ * 存储地址
+ * @param needCompress
+ * 是否压缩LOGO
+ * @throws Exception
+ */
+ public static void encode(String content, String destPath,
+ boolean needCompress) throws Exception {
+ QRCodeUtils.encode(content, null, destPath, needCompress);
+ }
+
+ /**
+ * 生成二维码
+ *
+ * @param content
+ * 内容
+ * @param destPath
+ * 存储地址
+ * @throws Exception
+ */
+ public static void encode(String content, String destPath) throws Exception {
+ QRCodeUtils.encode(content, null, destPath, false);
+ }
+
+ /**
+ * 生成二维码(内嵌LOGO)
+ *
+ * @param content
+ * 内容
+ * @param imgPath
+ * LOGO地址
+ * @param output
+ * 输出流
+ * @param needCompress
+ * 是否压缩LOGO
+ * @throws Exception
+ */
+ public static void encode(String content, String imgPath,
+ OutputStream output, boolean needCompress) throws Exception {
+ BufferedImage image = QRCodeUtils.createImage(content, imgPath,
+ needCompress);
+ ImageIO.write(image, FORMAT_NAME, output);
+ }
+
+ /**
+ * 生成二维码
+ *
+ * @param content
+ * 内容
+ * @param output
+ * 输出流
+ * @throws Exception
+ */
+ public static void encode(String content, OutputStream output)
+ throws Exception {
+ QRCodeUtils.encode(content, null, output, false);
+ }
+
+ /**
+ * 解析二维码
+ *
+ * @param file
+ * 二维码图片
+ * @return
+ * @throws Exception
+ */
+ public static String decode(File file) throws Exception {
+ BufferedImage image;
+ image = ImageIO.read(file);
+ if (image == null) {
+ return null;
+ }
+ BufferedImageLuminanceSource source = new BufferedImageLuminanceSource(
+ image);
+ BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
+ Result result;
+ Hashtable<DecodeHintType, Object> hints = new Hashtable<DecodeHintType, Object>();
+ hints.put(DecodeHintType.CHARACTER_SET, CHARSET);
+ result = new MultiFormatReader().decode(bitmap, hints);
+ String resultStr = result.getText();
+ return resultStr;
+ }
+
+ /**
+ * 解析二维码
+ *
+ * @param path
+ * 二维码图片地址
+ * @return
+ * @throws Exception
+ */
+ public static String decode(String path) throws Exception {
+ return QRCodeUtils.decode(new File(path));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RSAUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RSAUtils.java
new file mode 100644
index 0000000..6ea45b0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RSAUtils.java
@@ -0,0 +1,153 @@
+package com.panzhihua.common.utlis;
+
+import org.apache.commons.codec.binary.Base64;
+import org.jsoup.internal.StringUtil;
+
+import javax.crypto.Cipher;
+import java.security.*;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPublicKey;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+
+public class RSAUtils {
+
+ private static Map<Integer, String> keyMap = new HashMap<Integer, String>(); // 用于封装随机产生的公钥与私钥
+
+
+ /**
+ * 随机生成密钥对
+ *
+ * @throws NoSuchAlgorithmException
+ */
+ public static void genKeyPair() throws NoSuchAlgorithmException {
+ // KeyPairGenerator类用于生成公钥和私钥对，基于RSA算法生成对象
+ KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance("RSA");
+ // 初始化密钥对生成器，密钥大小为96-1024位
+ keyPairGen.initialize(1024, new SecureRandom());
+ // 生成一个密钥对，保存在keyPair中
+ KeyPair keyPair = keyPairGen.generateKeyPair();
+ RSAPrivateKey privateKey = (RSAPrivateKey) keyPair.getPrivate(); // 得到私钥
+ RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic(); // 得到公钥
+ String publicKeyString = new String(Base64.encodeBase64(publicKey.getEncoded()));
+ // 得到私钥字符串
+ String privateKeyString = new String(Base64.encodeBase64((privateKey.getEncoded())));
+ // 将公钥和私钥保存到Map
+ System.out.println("publicKeyString:" + publicKeyString);
+ System.out.println("privateKeyString:" + privateKeyString);
+ keyMap.put(0, publicKeyString); // 0表示公钥
+ keyMap.put(1, privateKeyString); // 1表示私钥
+ }
+
+ /**
+ * RSA公钥加密
+ *
+ * @param str 加密字符串
+ * @param publicKey 公钥
+ * @return 密文
+ * @throws Exception 加密过程中的异常信息
+ */
+ public static String encrypt(String str, String publicKey) throws Exception {
+ if (StringUtil.isBlank(str)) {
+ return "";
+ }
+ // base64编码的公钥
+ byte[] decoded = Base64.decodeBase64(publicKey);
+ RSAPublicKey pubKey = (RSAPublicKey) KeyFactory.getInstance("RSA")
+ .generatePublic(new X509EncodedKeySpec(decoded));
+ // RSA加密
+ Cipher cipher = Cipher.getInstance("RSA");
+ cipher.init(Cipher.ENCRYPT_MODE, pubKey);
+ String outStr = Base64.encodeBase64String(cipher.doFinal(str.getBytes("UTF-8")));
+ return outStr;
+ }
+
+ /**
+ * RSA私钥解密
+ *
+ * @param str 加密字符串
+ * @param privateKey 私钥
+ * @return 铭文
+ * @throws Exception 解密过程中的异常信息
+ */
+ public static String decrypt(String str, String privateKey) throws Exception {
+ // 64位解码加密后的字符串
+ byte[] inputByte = Base64.decodeBase64(str.getBytes("UTF-8"));
+ // base64编码的私钥
+ byte[] decoded = Base64.decodeBase64(privateKey);
+ RSAPrivateKey priKey = (RSAPrivateKey) KeyFactory.getInstance("RSA")
+ .generatePrivate(new PKCS8EncodedKeySpec(decoded));
+ // RSA解密
+ Cipher cipher = Cipher.getInstance("RSA");
+ cipher.init(Cipher.DECRYPT_MODE, priKey);
+ String outStr = new String(cipher.doFinal(inputByte));
+ return outStr;
+ }
+
+ /**
+ * RSA私钥解密
+ *
+ * @param str 加密字符串
+ * @param privateKey 私钥
+ * @return 铭文
+ * @throws Exception 解密过程中的异常信息
+ */
+ public static String decrypt2(String str, String privateKey) throws Exception {
+ str = str.replace(" ", "+");
+ // 64位解码加密后的字符串
+ byte[] inputByte = Base64.decodeBase64(str.getBytes("UTF-8"));
+ // base64编码的私钥
+ byte[] decoded = Base64.decodeBase64(privateKey);
+ RSAPrivateKey priKey = (RSAPrivateKey) KeyFactory.getInstance("RSA")
+ .generatePrivate(new PKCS8EncodedKeySpec(decoded));
+ // RSA解密
+ Cipher cipher = Cipher.getInstance("RSA");
+ cipher.init(Cipher.DECRYPT_MODE, priKey);
+ String outStr = new String(cipher.doFinal(inputByte));
+ return outStr;
+ }
+
+ public static String rsaEncrypt(String input, String rsaPublicKey) {
+ String result = "";
+ try {
+ // 将Base64编码后的公钥转换成PublicKey对象
+ byte[] buffer = Base64.decodeBase64(rsaPublicKey);
+ KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+ X509EncodedKeySpec keySpec = new X509EncodedKeySpec(buffer);
+ PublicKey publicKey = keyFactory.generatePublic(keySpec);
+ // 加密
+ Cipher cipher = Cipher.getInstance("RSA");
+ cipher.init(Cipher.ENCRYPT_MODE, publicKey);// ubli
+ byte[] inputArray = input.getBytes();
+ int inputLength = inputArray.length;
+ // System.out.println("加密字节数：" + inputLength);
+ // 最大加密字节数，超出最大字节数需要分组加密
+ int MAX_ENCRYPT_BLOCK = 117;
+ // 标识
+ int offSet = 0;
+ byte[] resultBytes = {};
+ byte[] cache = {};
+ while (inputLength - offSet > 0) {
+ if (inputLength - offSet > MAX_ENCRYPT_BLOCK) {
+ cache = cipher.doFinal(inputArray, offSet, MAX_ENCRYPT_BLOCK);
+ offSet += MAX_ENCRYPT_BLOCK;
+ } else {
+ cache = cipher.doFinal(inputArray, offSet, inputLength - offSet);
+ offSet = inputLength;
+ }
+ resultBytes = Arrays.copyOf(resultBytes, resultBytes.length + cache.length);
+ System.arraycopy(cache, 0, resultBytes, resultBytes.length - cache.length, cache.length);
+ }
+ result = Base64.encodeBase64String(resultBytes);
+ } catch (Exception e) {
+ System.out.println("rsaEncrypt error:" + e.getMessage());
+ }
+ // System.out.println("加密的结果：" + result);
+ return result;
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RealNameUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RealNameUtil.java
new file mode 100644
index 0000000..0a350fa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RealNameUtil.java
@@ -0,0 +1,65 @@
+package com.panzhihua.common.utlis;
+
+import java.util.Base64;
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.exceptions.ServiceException;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 实名认证工具
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-08 09:45
+ **/
+@Slf4j
+public class RealNameUtil {
+ private static final String CLIENT_ID = "2092261934651932672";
+ private static final String SECRET = "de1c0dbb-9197-4724-9cc2-aa94e30a072f";
+ private static final String URL = "http://118.121.56.56:18080/users/auth/policeMatch";
+
+ /**
+ * 实名认证
+ *
+ * @param idcard
+ * 身份证
+ * @param name
+ * 名字
+ * @return 认证结果 true false
+ */
+ public static boolean authentication(String idcard, String name) {
+ boolean result = false;
+ String headerkey = "Authorization";
+ String headervalue = "Basic ";
+ String basicStr = CLIENT_ID + ":" + SECRET + ":" + System.currentTimeMillis();
+ String encodeToString = Base64.getEncoder().encodeToString(basicStr.getBytes());
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("idNumber", idcard);
+ jsonObject.put("realName", name);
+ String param = jsonObject.toJSONString();
+ log.info("请求公安实名认证接口，请求地址：" + URL);
+ log.info("请求公安实名认证接口，请求参数：" + param);
+ log.info("请求公安实名认证接口，请求头参数：" + headervalue + encodeToString);
+ String postByJson = HttpClientUtil.sendPostByJson(URL, param, 2, headerkey, headervalue + encodeToString);
+ log.info("请求公安实名认证接口，返回参数：" + postByJson);
+ if (postByJson != null && StringUtils.isNotEmpty(postByJson)) {
+ JSONObject obj = JSONObject.parseObject(postByJson);
+ if (obj != null) {
+ int code = JSONObject.parseObject(postByJson).getIntValue("code");
+ if (0 == code) {
+ result = true;
+ }
+ }
+ } else {
+ throw new ServiceException("公安实名认证接口超时，请重试");
+ }
+ return result;
+ }
+
+ public static void main(String[] args) {
+ boolean b = RealNameUtil.authentication("340823199112282557", "黄宏发");
+ System.out.println(b);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ResultUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ResultUtil.java
new file mode 100644
index 0000000..32b41a0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ResultUtil.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.utlis;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 返回json
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-11-24 16:03
+ **/
+@Slf4j
+public class ResultUtil {
+
+ public static void responseJson(HttpServletResponse httpServletResponse, Object object) {
+ try {
+ httpServletResponse.setContentType("application/json;charset=utf-8");
+ httpServletResponse.getWriter().write(JSONObject.toJSONString(object));
+ } catch (IOException e) {
+ e.printStackTrace();
+ log.error("返回数据到前端失败");
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RichTextUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RichTextUtil.java
new file mode 100644
index 0000000..03a029c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/RichTextUtil.java
@@ -0,0 +1,55 @@
+package com.panzhihua.common.utlis;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 富文本提取
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2021-01-26 11:18
+ **/
+public class RichTextUtil {
+ private static Pattern p_image = Pattern.compile("<img.*src\\s*=\\s*(.*?)[^>]*?>", Pattern.CASE_INSENSITIVE);
+ private static Pattern r_image = Pattern.compile("src\\s*=\\s*\"?(.*?)(\"|>|\\s+)");
+
+ /**
+ * 提取富文本中纯文本
+ */
+ public static String getText(String richText) {
+ String regx = "(<.+?>)|(</.+?>)";
+ Matcher matcher = Pattern.compile(regx).matcher(richText);
+ while (matcher.find()) {
+ // 替换图片
+ richText = matcher.replaceAll("").replace(" ", "");
+ }
+ return richText;
+ }
+
+ /**
+ * 提取富文本中图片地址
+ */
+ public static List<String> getImgStr(String richText) {
+ List<String> list = new ArrayList<>();
+ Matcher pMatcher = p_image.matcher(richText);
+ while (pMatcher.find()) {
+ // 得到<img />数据
+ String img = pMatcher.group();
+ // 匹配<img>中的src数据
+ Matcher rMatcher = r_image.matcher(img);
+ while (rMatcher.find()) {
+ list.add(rMatcher.group(1));
+ }
+ }
+ return list;
+ }
+
+ public static void main(String[] args) {
+ String s =
+ "<p class=\"ql-align-justify\">新年伊始，兴华办湖东社区党委开展了新年送福活动。2020年是不平凡的一年，一场突如其来的新冠肺炎开启了新年的第一天。在经历了疫情、双城创建、人口普查、疫情......更加彰显了党组织的凝聚力和战斗力。辖区党员在疫情防控阻击战中无私奉献、积极捐款、双城创建广大党员积极投身到创建一线、协助人口普查员入户走访、引导广大市民按时参加集中核酸检测......每一个战斗的场面都有共产党员的身影。湖东社区党委为了表达党组织对广大党员积极参与的感谢，激励广大党员不忘初心、牢记使命，为实现新时代党的历史使命不谢奋斗，在新年来临之际以“碗净福至”的含义为辖区党员送上新年祝福。此次送祝福活动共为辖区270名党员送去精美纪念品，收到纪念品的党员激动地说“2020年是我们共同的考验，感谢党组织的认可，我们也会继续发挥党员先锋模范作用。”</p><p class=\"ql-align-justify\"><img src=\"http://image.panzhihua.nhys.cdnhxx.com//idcard/f31fbe096b63f624ebcdee7a844009ff1b4ca3c7.jpg\"></p><p><br></p>";
+ String text = RichTextUtil.getText(s);
+ System.out.println(text);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SFTPUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SFTPUtil.java
new file mode 100644
index 0000000..890157d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SFTPUtil.java
@@ -0,0 +1,376 @@
+package com.panzhihua.common.utlis;
+
+import java.io.*;
+import java.util.Properties;
+import java.util.Vector;
+
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.jcraft.jsch.*;
+import com.panzhihua.common.constants.FtpConstants;
+
+/**
+ * @version 1.0.0
+ * @ClassName: SFTPUtil
+ * @Description: sftp连接工具类
+ */
+public class SFTPUtil {
+ private transient Logger log = LoggerFactory.getLogger(this.getClass());
+
+ private ChannelSftp sftp;
+
+ private Session session;
+
+ // FTP 登录用户名
+ private String userName;
+ // FTP 登录密码
+ private String password;
+ // FTP 服务器地址IP地址
+ private String host;
+ // FTP 端口
+ private int port;
+
+ /**
+ * 构造基于密码认证的sftp对象
+ *
+ * @param userName
+ * @param password
+ * @param host
+ * @param port
+ */
+ public SFTPUtil(String userName, String password, String host, int port) {
+ this.userName = userName;
+ this.password = password;
+ this.host = host;
+ this.port = port;
+ }
+
+ public SFTPUtil() {
+ this.userName = FtpConstants.FTPUSERNAME;
+ this.password = FtpConstants.FTPPASSWORD;
+ this.host = FtpConstants.FTPHOST;
+ this.port = FtpConstants.FTPPORT;
+ }
+ public static void main(String[] args) throws SftpException, IOException {
+// SFTPUtil sftp = new SFTPUtil("root", "evanN7F2K5M6", "47.104.148.185", 22);
+ SFTPUtil sftp = new SFTPUtil("root", "Wpkl#&%!698", "172.192.3.2", 22);
+ sftp.login();
+ File file = new File("F:\\settings.xml");
+ InputStream is = new FileInputStream(file);
+ // 多级目录创建并上传
+ sftp.uploadMore("/mnt/data/ftp/ss", "settings.xml", is);
+ sftp.logout();
+ }
+
+ /**
+ * 连接sftp服务器
+ *
+ * @throws Exception
+ */
+ public void login() {
+ try {
+ JSch jsch = new JSch();
+ log.info("sftp connect by host:{} username:{}", host, userName);
+
+ session = jsch.getSession(userName, host, port);
+ log.info("Session is build");
+ if (password != null) {
+ session.setPassword(password);
+ }
+ Properties config = new Properties();
+ config.put("StrictHostKeyChecking", "no");
+
+ session.setConfig(config);
+ session.connect();
+ log.info("Session is connected");
+
+ Channel channel = session.openChannel("sftp");
+ channel.connect();
+ log.info("channel is connected");
+
+ sftp = (ChannelSftp)channel;
+ log.info(String.format("sftp server host:[%s] port:[%s] is connect successfull", host, port));
+ } catch (JSchException e) {
+ log.error("Cannot connect to specified sftp server : {}:{} \n Exception message is: {}", host, port,
+ e.getMessage());
+ }
+ }
+
+ /**
+ * 关闭连接 server
+ */
+ public void logout() {
+ if (sftp != null) {
+ if (sftp.isConnected()) {
+ sftp.disconnect();
+ log.info("sftp is closed already");
+ }
+ }
+ if (session != null) {
+ if (session.isConnected()) {
+ session.disconnect();
+ log.info("sshSession is closed already");
+ }
+ }
+ }
+
+ /**
+ * 递归根据路径创建文件夹
+ *
+ * @param dirs
+ * 根据 / 分隔后的数组文件夹名称
+ * @param tempPath
+ * 拼接路径
+ * @param length
+ * 文件夹的格式
+ * @param index
+ * 数组下标
+ * @return
+ */
+ public void mkdirDir(String[] dirs, String tempPath, int length, int index) {
+ // 以"/a/b/c/d"为例按"/"分隔后,第0位是"";顾下标从1开始
+ index++;
+ if (index < length) {
+ // 目录不存在，则创建文件夹
+ tempPath += "/" + dirs[index];
+ }
+ try {
+ log.info("检测目录[" + tempPath + "]");
+ sftp.cd(tempPath);
+ if (index < length) {
+ mkdirDir(dirs, tempPath, length, index);
+ }
+ } catch (SftpException ex) {
+ log.warn("创建目录[" + tempPath + "]");
+ try {
+ sftp.mkdir(tempPath);
+ sftp.cd(tempPath);
+ } catch (SftpException e) {
+ e.printStackTrace();
+ log.error("创建目录[" + tempPath + "]失败,异常信息[" + e.getMessage() + "]");
+
+ }
+ log.info("进入目录[" + tempPath + "]");
+ mkdirDir(dirs, tempPath, length, index);
+ }
+ }
+
+ /**
+ * 将输入流的数据上传到sftp作为文件（多层目录）
+ *
+ * @param directory
+ * 上传到该目录(多层目录)
+ * @param sftpFileName
+ * sftp端文件名
+ * @param input
+ * 输入流
+ * @throws SftpException
+ * @throws Exception
+ */
+ public void uploadMore(String directory, String sftpFileName, InputStream input) throws SftpException {
+ try {
+ sftp.cd(directory);
+ } catch (SftpException e) {
+ // 目录不存在，则创建文件夹
+ String[] dirs = directory.split("/");
+ String tempPath = "";
+ int index = 0;
+ mkdirDir(dirs, tempPath, dirs.length, index);
+ }
+ sftp.put(input, sftpFileName);// 上传文件
+ }
+
+ /**
+ * 将输入流的数据上传到sftp作为文件
+ *
+ * @param directory
+ * 上传到该目录(单层目录)
+ * @param sftpFileName
+ * sftp端文件名
+ * @param input
+ * 输入流
+ * @throws SftpException
+ * @throws Exception
+ */
+ public void upload(String directory, String sftpFileName, InputStream input) throws SftpException {
+ try {
+ sftp.cd(directory);
+ } catch (SftpException e) {
+ log.warn("directory is not exist");
+ sftp.mkdir(directory);
+ sftp.cd(directory);
+ }
+ sftp.put(input, sftpFileName);
+ log.info("file:{} is upload successful", sftpFileName);
+ }
+
+ /**
+ * 上传单个文件
+ *
+ * @param directory
+ * 上传到sftp目录
+ * @param uploadFile
+ * 要上传的文件,包括路径
+ * @throws FileNotFoundException
+ * @throws SftpException
+ * @throws Exception
+ */
+ public void upload(String directory, String uploadFile) throws FileNotFoundException, SftpException {
+ File file = new File(uploadFile);
+ upload(directory, file.getName(), new FileInputStream(file));
+ }
+
+ /**
+ * 将byte[]上传到sftp，作为文件。注意:从String生成byte[]是，要指定字符集。
+ *
+ * @param directory
+ * 上传到sftp目录
+ * @param sftpFileName
+ * 文件在sftp端的命名
+ * @param byteArr
+ * 要上传的字节数组
+ * @throws SftpException
+ * @throws Exception
+ */
+ public void upload(String directory, String sftpFileName, byte[] byteArr) throws SftpException {
+ upload(directory, sftpFileName, new ByteArrayInputStream(byteArr));
+ }
+
+ /**
+ * 将字符串按照指定的字符编码上传到sftp
+ *
+ * @param directory
+ * 上传到sftp目录
+ * @param sftpFileName
+ * 文件在sftp端的命名
+ * @param dataStr
+ * 待上传的数据
+ * @param charsetName
+ * sftp上的文件，按该字符编码保存
+ * @throws UnsupportedEncodingException
+ * @throws SftpException
+ * @throws Exception
+ */
+ public void upload(String directory, String sftpFileName, String dataStr, String charsetName)
+ throws UnsupportedEncodingException, SftpException {
+ upload(directory, sftpFileName, new ByteArrayInputStream(dataStr.getBytes(charsetName)));
+ }
+
+ /**
+ * 下载文件
+ *
+ * @param directory
+ * 下载目录
+ * @param downloadFile
+ * 下载的文件
+ * @param saveFile
+ * 存在本地的路径
+ * @throws SftpException
+ * @throws FileNotFoundException
+ * @throws Exception
+ */
+ public void download(String directory, String downloadFile, String saveFile)
+ throws SftpException, FileNotFoundException {
+ if (directory != null && !"".equals(directory)) {
+ sftp.cd(directory);
+ }
+ File file = new File(saveFile);
+ sftp.get(downloadFile, new FileOutputStream(file));
+ log.info("file:{} is download successful", downloadFile);
+ }
+
+ /**
+ * 下载文件
+ *
+ * @param directory
+ * 下载目录
+ * @param downloadFile
+ * 下载的文件名
+ * @return 字节数组
+ * @throws SftpException
+ * @throws IOException
+ * @throws Exception
+ */
+ public byte[] download(String directory, String downloadFile) throws SftpException, IOException {
+ if (directory != null && !"".equals(directory)) {
+ sftp.cd(directory);
+ }
+ InputStream is = sftp.get(downloadFile);
+ byte[] fileData = IOUtils.toByteArray(is);
+ log.info("file:{} is download successful", downloadFile);
+ return fileData;
+ }
+
+ /**
+ * 下载文件
+ *
+ * @param directory
+ * 下载目录
+ * @param downloadFile
+ * 下载的文件名
+ * @return 字节数组
+ * @throws SftpException
+ * @throws IOException
+ * @throws Exception
+ */
+ public InputStream downloadInputStream(String directory, String downloadFile) throws SftpException, IOException {
+ if (directory != null && !"".equals(directory)) {
+ sftp.cd(directory);
+ }
+ InputStream is = sftp.get(downloadFile);
+ // byte[] fileData = IOUtils.toByteArray(is);
+ // log.info("file:{} is download successful", downloadFile);
+ return is;
+ }
+
+ /**
+ * 删除文件
+ *
+ * @param directory
+ * 要删除文件所在目录
+ * @param deleteFile
+ * 要删除的文件
+ * @throws SftpException
+ * @throws Exception
+ */
+ public void delete(String directory, String deleteFile) throws SftpException {
+ sftp.cd(directory);
+ sftp.rm(deleteFile);
+ }
+
+ /**
+ * 列出目录下的文件
+ *
+ * @param directory
+ * 要列出的目录
+ * @return
+ * @throws SftpException
+ */
+ public Vector<?> listFiles(String directory) throws SftpException {
+ return sftp.ls(directory);
+ }
+
+ /**
+ * 判断文件或者目录是否存在
+ *
+ * @param path
+ * 目录或者文件的路径
+ * @return 存在结果
+ */
+ public boolean isExistDir(String path) {
+ boolean isExist = false;
+ try {
+ SftpATTRS sftpATTRS = sftp.lstat(path);
+ isExist = true;
+ return sftpATTRS.isDir();
+ } catch (Exception e) {
+ if (e.getMessage().toLowerCase().equals("no such file")) {
+ isExist = false;
+ }
+ }
+ return isExist;
+
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SensitiveUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SensitiveUtil.java
new file mode 100644
index 0000000..f6278fb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SensitiveUtil.java
@@ -0,0 +1,56 @@
+package com.panzhihua.common.utlis;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @description: 身份证手机号脱敏处理
+ * @author: Null
+ * @date: 2021/3/16 15:53
+ */
+public class SensitiveUtil {
+
+ /**
+ * 手机号码脱敏处理
+ *
+ * @param phoneNumber
+ * @return
+ */
+ public static String desensitizedPhoneNumber(String phoneNumber) {
+ if (StringUtils.isNotEmpty(phoneNumber)) {
+ phoneNumber = phoneNumber.replaceAll("(\\w{3})\\w*(\\w{4})", "$1****$2");
+ }
+ return phoneNumber;
+ }
+
+ /**
+ * 身份证号码脱敏处理
+ *
+ * @param idNumber
+ * @return
+ */
+ public static String desensitizedIdNumber(String idNumber) {
+ if (!StringUtils.isEmpty(idNumber)) {
+ if (idNumber.length() == 15) {
+ idNumber = idNumber.replaceAll("(\\w{6})\\w*(\\w{3})", "$1******$2");
+ }
+ if (idNumber.length() == 18) {
+ idNumber = idNumber.replaceAll("(\\w{6})\\w*(\\w{4})", "$1********$2");
+ }
+ }
+ return idNumber;
+ }
+
+
+ public static String replaceName(String str) {
+ if(StringUtils.isNotEmpty(str)){
+ if(str.length()==2){
+ str=str.replace(str.substring(1),"*");
+ }
+ if(str.length()>2) {
+ str=str.replace(str.substring(1,str.length()-1),"*");
+ }
+ }
+ return str;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ServletUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ServletUtils.java
new file mode 100644
index 0000000..1d559ef
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ServletUtils.java
@@ -0,0 +1,118 @@
+package com.panzhihua.common.utlis;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+/**
+ * 客户端工具类
+ *
+ * @author huanghongfa
+ */
+public class ServletUtils {
+ /**
+ * 获取String参数
+ */
+ public static String getParameter(String name) {
+ return getRequest().getParameter(name);
+ }
+
+ /**
+ * 获取String参数
+ */
+ public static String getParameter(String name, String defaultValue) {
+ return Convert.toStr(getRequest().getParameter(name), defaultValue);
+ }
+
+ /**
+ * 获取Integer参数
+ */
+ public static Integer getParameterToInt(String name) {
+ return Convert.toInt(getRequest().getParameter(name));
+ }
+
+ /**
+ * 获取Integer参数
+ */
+ public static Integer getParameterToInt(String name, Integer defaultValue) {
+ return Convert.toInt(getRequest().getParameter(name), defaultValue);
+ }
+
+ /**
+ * 获取request
+ */
+ public static HttpServletRequest getRequest() {
+ return getRequestAttributes().getRequest();
+ }
+
+ /**
+ * 获取response
+ */
+ public static HttpServletResponse getResponse() {
+ return getRequestAttributes().getResponse();
+ }
+
+ /**
+ * 获取session
+ */
+ public static HttpSession getSession() {
+ return getRequest().getSession();
+ }
+
+ public static ServletRequestAttributes getRequestAttributes() {
+ RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
+ return (ServletRequestAttributes)attributes;
+ }
+
+ /**
+ * 将字符串渲染到客户端
+ *
+ * @param response
+ * 渲染对象
+ * @param string
+ * 待渲染的字符串
+ * @return null
+ */
+ public static String renderString(HttpServletResponse response, String string) {
+ try {
+ response.setStatus(200);
+ response.setContentType("application/json");
+ response.setCharacterEncoding("utf-8");
+ response.getWriter().print(string);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ /**
+ * 是否是Ajax异步请求
+ *
+ * @param request
+ */
+ public static boolean isAjaxRequest(HttpServletRequest request) {
+ String accept = request.getHeader("accept");
+ if (accept != null && accept.indexOf("application/json") != -1) {
+ return true;
+ }
+
+ String xRequestedWith = request.getHeader("X-Requested-With");
+ if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1) {
+ return true;
+ }
+
+ String uri = request.getRequestURI();
+ if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml")) {
+ return true;
+ }
+
+ String ajax = request.getParameter("__ajax");
+ return StringUtils.inStringIgnoreCase(ajax, "json", "xml");
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SmsUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SmsUtil.java
new file mode 100644
index 0000000..8c95ef1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SmsUtil.java
@@ -0,0 +1,44 @@
+package com.panzhihua.common.utlis;
+
+import org.json.JSONObject;
+import org.json.XML;
+public class SmsUtil {
+
+ private final static String URL = "https://106.ihuyi.com/webservice/sms.php?method=Submit";
+ private final static String ACCOUNT="C87595580";
+ private final static String PASSWORD="b66d918a598ad126b85b13e82a38e165";
+ private final static String CONTENT="您有一笔订单还未付款，超时未付款订单将自动取消。";
+ public static int sendCode(String mobile, String code){
+ try {
+ String requestUrl=URL+"&account="+ACCOUNT+"&password="+PayUtil.MD5(PASSWORD)+"&mobile="+mobile+"&content="+"您的验证码是："+code+"。请不要把验证码泄露给其他人。";
+ String res=HttpClientUtil.httpGet(requestUrl, null,null);
+ JSONObject jsonObject=XML.toJSONObject(res);
+ if(jsonObject.get("SubmitResult")!=null){
+ JSONObject result= (JSONObject) jsonObject.get("SubmitResult");
+ if(result.get("code").equals(2)){
+ return 1;
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return 0;
+ }
+
+ public int sendContent(String mobile){
+ try {
+ String requestUrl=URL+"&account="+ACCOUNT+"&password="+PayUtil.MD5(PASSWORD)+"&mobile="+mobile+"&content="+CONTENT;
+ String res=HttpClientUtil.httpGet(requestUrl, null,null);
+ JSONObject jsonObject=XML.toJSONObject(res);
+ if(jsonObject.get("SubmitResult")!=null){
+ JSONObject result= (JSONObject) jsonObject.get("SubmitResult");
+ if(result.get("code").equals(2)){
+ return 1;
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return 0;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/Snowflake.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/Snowflake.java
new file mode 100644
index 0000000..fb2990b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/Snowflake.java
@@ -0,0 +1,15 @@
+package com.panzhihua.common.utlis;
+
+import cn.hutool.core.util.IdUtil;
+
+/**
+ * @author xyh
+ * @date 2021/6/10 15:29
+ */
+public class Snowflake {
+ public static long getId() {
+ cn.hutool.core.lang.Snowflake snowflake = IdUtil.getSnowflake(1, 1);
+ long id = snowflake.nextId();
+ return id;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SpringUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SpringUtils.java
new file mode 100644
index 0000000..52a5da4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/SpringUtils.java
@@ -0,0 +1,137 @@
+package com.panzhihua.common.utlis;
+
+import org.springframework.aop.framework.AopContext;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * spring工具类 方便在非spring管理环境中获取bean
+ *
+ * @author huanghongfa
+ */
+@Slf4j
+@Component
+public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware {
+ /** Spring应用上下文环境 */
+ private static ConfigurableListableBeanFactory beanFactory;
+
+ private static ApplicationContext applicationContext;
+
+ /**
+ * 获取对象
+ *
+ * @param name
+ * @return Object 一个以所给名字注册的bean的实例
+ * @throws org.springframework.beans.BeansException
+ *
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> T getBean(String name) throws BeansException {
+ return (T)beanFactory.getBean(name);
+ }
+
+ /**
+ * 获取类型为requiredType的对象
+ *
+ * @param clz
+ * @return
+ * @throws org.springframework.beans.BeansException
+ *
+ */
+ public static <T> T getBean(Class<T> clz) throws BeansException {
+ T result = beanFactory.getBean(clz);
+ return result;
+ }
+
+ /**
+ * 如果BeanFactory包含一个与所给名称匹配的bean定义，则返回true
+ *
+ * @param name
+ * @return boolean
+ */
+ public static boolean containsBean(String name) {
+ return beanFactory.containsBean(name);
+ }
+
+ /**
+ * 判断以给定名字注册的bean定义是一个singleton还是一个prototype。 如果与给定名字相应的bean定义没有被找到，将会抛出一个异常（NoSuchBeanDefinitionException）
+ *
+ * @param name
+ * @return boolean
+ * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
+ *
+ */
+ public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
+ return beanFactory.isSingleton(name);
+ }
+
+ /**
+ * @param name
+ * @return Class 注册对象的类型
+ * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
+ *
+ */
+ public static Class<?> getType(String name) throws NoSuchBeanDefinitionException {
+ return beanFactory.getType(name);
+ }
+
+ /**
+ * 如果给定的bean名字在bean定义中有别名，则返回这些别名
+ *
+ * @param name
+ * @return
+ * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
+ *
+ */
+ public static String[] getAliases(String name) throws NoSuchBeanDefinitionException {
+ return beanFactory.getAliases(name);
+ }
+
+ /**
+ * 获取aop代理对象
+ *
+ * @param invoker
+ * @return
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> T getAopProxy(T invoker) {
+ return (T)AopContext.currentProxy();
+ }
+
+ /**
+ * 获取当前的环境配置，无配置返回null
+ *
+ * @return 当前的环境配置
+ */
+ public static String[] getActiveProfiles() {
+ return applicationContext.getEnvironment().getActiveProfiles();
+ }
+
+ /**
+ * 获取当前的环境配置，当有多个环境配置时，只获取第一个
+ *
+ * @return 当前的环境配置
+ */
+ public static String getActiveProfile() {
+ final String[] activeProfiles = getActiveProfiles();
+ return !ObjectUtils.isEmpty(activeProfiles) ? activeProfiles[0] : null;
+ }
+
+ @Override
+ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
+ SpringUtils.beanFactory = beanFactory;
+ }
+
+ @Override
+ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+ SpringUtils.applicationContext = applicationContext;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/StrFormatter.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/StrFormatter.java
new file mode 100644
index 0000000..ebda6fc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/StrFormatter.java
@@ -0,0 +1,76 @@
+package com.panzhihua.common.utlis;
+
+/**
+ * 字符串格式化
+ *
+ * @author ruoyi
+ */
+public class StrFormatter {
+ public static final String EMPTY_JSON = "{}";
+ public static final char C_BACKSLASH = '\\';
+ public static final char C_DELIM_START = '{';
+ public static final char C_DELIM_END = '}';
+
+ /**
+ * 格式化字符串<br>
+ * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
+ * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
+ * 例：<br>
+ * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
+ * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
+ * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
+ *
+ * @param strPattern
+ * 字符串模板
+ * @param argArray
+ * 参数列表
+ * @return 结果
+ */
+ public static String format(final String strPattern, final Object... argArray) {
+ if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray)) {
+ return strPattern;
+ }
+ final int strPatternLength = strPattern.length();
+
+ // 初始化定义好的长度以获得更好的性能
+ StringBuilder sbuf = new StringBuilder(strPatternLength + 50);
+
+ int handledPosition = 0;
+ int delimIndex;// 占位符所在位置
+ for (int argIndex = 0; argIndex < argArray.length; argIndex++) {
+ delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition);
+ if (delimIndex == -1) {
+ if (handledPosition == 0) {
+ return strPattern;
+ } else { // 字符串模板剩余部分不再包含占位符，加入剩余部分后返回结果
+ sbuf.append(strPattern, handledPosition, strPatternLength);
+ return sbuf.toString();
+ }
+ } else {
+ if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH) {
+ if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH) {
+ // 转义符之前还有一个转义符，占位符依旧有效
+ sbuf.append(strPattern, handledPosition, delimIndex - 1);
+ sbuf.append(Convert.utf8Str(argArray[argIndex]));
+ handledPosition = delimIndex + 2;
+ } else {
+ // 占位符被转义
+ argIndex--;
+ sbuf.append(strPattern, handledPosition, delimIndex - 1);
+ sbuf.append(C_DELIM_START);
+ handledPosition = delimIndex + 1;
+ }
+ } else {
+ // 正常占位符
+ sbuf.append(strPattern, handledPosition, delimIndex);
+ sbuf.append(Convert.utf8Str(argArray[argIndex]));
+ handledPosition = delimIndex + 2;
+ }
+ }
+ }
+ // 加入最后一个占位符后所有的字符
+ sbuf.append(strPattern, handledPosition, strPattern.length());
+
+ return sbuf.toString();
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/StringUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/StringUtils.java
new file mode 100644
index 0000000..cb0209e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/StringUtils.java
@@ -0,0 +1,428 @@
+package com.panzhihua.common.utlis;
+
+import java.util.*;
+import java.util.regex.Pattern;
+
+/**
+ * 字符串工具类
+ *
+ * @author ruoyi
+ */
+public class StringUtils extends org.apache.commons.lang3.StringUtils {
+ /** 空字符串 */
+ private static final String NULLSTR = "";
+
+ /** 下划线 */
+ private static final char SEPARATOR = '_';
+
+ /**
+ * 获取参数不为空值
+ *
+ * @param value
+ * defaultValue 要判断的value
+ * @return value 返回值
+ */
+ public static <T> T nvl(T value, T defaultValue) {
+ return value != null ? value : defaultValue;
+ }
+
+ /**
+ * * 判断一个Collection是否为空， 包含List，Set，Queue
+ *
+ * @param coll
+ * 要判断的Collection
+ * @return true：为空 false：非空
+ */
+ public static boolean isEmpty(Collection<?> coll) {
+ return isNull(coll) || coll.isEmpty();
+ }
+
+ /**
+ * * 判断一个Collection是否非空，包含List，Set，Queue
+ *
+ * @param coll
+ * 要判断的Collection
+ * @return true：非空 false：空
+ */
+ public static boolean isNotEmpty(Collection<?> coll) {
+ return !isEmpty(coll);
+ }
+
+ /**
+ * * 判断一个对象数组是否为空
+ *
+ * @param objects
+ * 要判断的对象数组
+ ** @return true：为空 false：非空
+ */
+ public static boolean isEmpty(Object[] objects) {
+ return isNull(objects) || (objects.length == 0);
+ }
+
+ /**
+ * * 判断一个对象数组是否非空
+ *
+ * @param objects
+ * 要判断的对象数组
+ * @return true：非空 false：空
+ */
+ public static boolean isNotEmpty(Object[] objects) {
+ return !isEmpty(objects);
+ }
+
+ /**
+ * * 判断一个Map是否为空
+ *
+ * @param map
+ * 要判断的Map
+ * @return true：为空 false：非空
+ */
+ public static boolean isEmpty(Map<?, ?> map) {
+ return isNull(map) || map.isEmpty();
+ }
+
+ /**
+ * * 判断一个Map是否为空
+ *
+ * @param map
+ * 要判断的Map
+ * @return true：非空 false：空
+ */
+ public static boolean isNotEmpty(Map<?, ?> map) {
+ return !isEmpty(map);
+ }
+
+ /**
+ * * 判断一个字符串是否为空串
+ *
+ * @param str
+ * String
+ * @return true：为空 false：非空
+ */
+ public static boolean isEmpty(String str) {
+ return isNull(str) || NULLSTR.equals(str.trim());
+ }
+
+ /**
+ * * 判断一个字符串是否为非空串
+ *
+ * @param str
+ * String
+ * @return true：非空串 false：空串
+ */
+ public static boolean isNotEmpty(String str) {
+ return !isEmpty(str);
+ }
+
+ /**
+ * * 判断一个对象是否为空
+ *
+ * @param object
+ * Object
+ * @return true：为空 false：非空
+ */
+ public static boolean isNull(Object object) {
+ return object == null;
+ }
+
+ /**
+ * * 判断一个对象是否非空
+ *
+ * @param object
+ * Object
+ * @return true：非空 false：空
+ */
+ public static boolean isNotNull(Object object) {
+ return !isNull(object);
+ }
+
+ /**
+ * * 判断一个对象是否是数组类型（Java基本型别的数组）
+ *
+ * @param object
+ * 对象
+ * @return true：是数组 false：不是数组
+ */
+ public static boolean isArray(Object object) {
+ return isNotNull(object) && object.getClass().isArray();
+ }
+
+ /**
+ * 去空格
+ */
+ public static String trim(String str) {
+ return (str == null ? "" : str.trim());
+ }
+
+ /**
+ * 截取字符串
+ *
+ * @param str
+ * 字符串
+ * @param start
+ * 开始
+ * @return 结果
+ */
+ public static String substring(final String str, int start) {
+ if (str == null) {
+ return NULLSTR;
+ }
+
+ if (start < 0) {
+ start = str.length() + start;
+ }
+
+ if (start < 0) {
+ start = 0;
+ }
+ if (start > str.length()) {
+ return NULLSTR;
+ }
+
+ return str.substring(start);
+ }
+
+ /**
+ * 截取字符串
+ *
+ * @param str
+ * 字符串
+ * @param start
+ * 开始
+ * @param end
+ * 结束
+ * @return 结果
+ */
+ public static String substring(final String str, int start, int end) {
+ if (str == null) {
+ return NULLSTR;
+ }
+
+ if (end < 0) {
+ end = str.length() + end;
+ }
+ if (start < 0) {
+ start = str.length() + start;
+ }
+
+ if (end > str.length()) {
+ end = str.length();
+ }
+
+ if (start > end) {
+ return NULLSTR;
+ }
+
+ if (start < 0) {
+ start = 0;
+ }
+ if (end < 0) {
+ end = 0;
+ }
+
+ return str.substring(start, end);
+ }
+
+ /**
+ * 格式化文本, {} 表示占位符<br>
+ * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
+ * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
+ * 例：<br>
+ * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
+ * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
+ * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
+ *
+ * @param template
+ * 文本模板，被替换的部分用 {} 表示
+ * @param params
+ * 参数值
+ * @return 格式化后的文本
+ */
+ public static String format(String template, Object... params) {
+ if (isEmpty(params) || isEmpty(template)) {
+ return template;
+ }
+ return StrFormatter.format(template, params);
+ }
+
+ /**
+ * 字符串转set
+ *
+ * @param str
+ * 字符串
+ * @param sep
+ * 分隔符
+ * @return set集合
+ */
+ public static final Set<String> str2Set(String str, String sep) {
+ return new HashSet<String>(str2List(str, sep, true, false));
+ }
+
+ /**
+ * 字符串转list
+ *
+ * @param str
+ * 字符串
+ * @param sep
+ * 分隔符
+ * @param filterBlank
+ * 过滤纯空白
+ * @param trim
+ * 去掉首尾空白
+ * @return list集合
+ */
+ public static final List<String> str2List(String str, String sep, boolean filterBlank, boolean trim) {
+ List<String> list = new ArrayList<String>();
+ if (StringUtils.isEmpty(str)) {
+ return list;
+ }
+
+ // 过滤空白字符串
+ if (filterBlank && StringUtils.isBlank(str)) {
+ return list;
+ }
+ String[] split = str.split(sep);
+ for (String string : split) {
+ if (filterBlank && StringUtils.isBlank(string)) {
+ continue;
+ }
+ if (trim) {
+ string = string.trim();
+ }
+ list.add(string);
+ }
+
+ return list;
+ }
+
+ /**
+ * 下划线转驼峰命名
+ */
+ public static String toUnderScoreCase(String str) {
+ if (str == null) {
+ return null;
+ }
+ StringBuilder sb = new StringBuilder();
+ // 前置字符是否大写
+ boolean preCharIsUpperCase = true;
+ // 当前字符是否大写
+ boolean curreCharIsUpperCase = true;
+ // 下一字符是否大写
+ boolean nexteCharIsUpperCase = true;
+ for (int i = 0; i < str.length(); i++) {
+ char c = str.charAt(i);
+ if (i > 0) {
+ preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1));
+ } else {
+ preCharIsUpperCase = false;
+ }
+
+ curreCharIsUpperCase = Character.isUpperCase(c);
+
+ if (i < (str.length() - 1)) {
+ nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1));
+ }
+
+ if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase) {
+ sb.append(SEPARATOR);
+ } else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase) {
+ sb.append(SEPARATOR);
+ }
+ sb.append(Character.toLowerCase(c));
+ }
+
+ return sb.toString();
+ }
+
+ /**
+ * 是否包含字符串
+ *
+ * @param str
+ * 验证字符串
+ * @param strs
+ * 字符串组
+ * @return 包含返回true
+ */
+ public static boolean inStringIgnoreCase(String str, String... strs) {
+ if (str != null && strs != null) {
+ for (String s : strs) {
+ if (str.equalsIgnoreCase(trim(s))) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
+ *
+ * @param name
+ * 转换前的下划线大写方式命名的字符串
+ * @return 转换后的驼峰式命名的字符串
+ */
+ public static String convertToCamelCase(String name) {
+ StringBuilder result = new StringBuilder();
+ // 快速检查
+ if (name == null || name.isEmpty()) {
+ // 没必要转换
+ return "";
+ } else if (!name.contains("_")) {
+ // 不含下划线，仅将首字母大写
+ return name.substring(0, 1).toUpperCase() + name.substring(1);
+ }
+ // 用下划线将原始字符串分割
+ String[] camels = name.split("_");
+ for (String camel : camels) {
+ // 跳过原始字符串中开头、结尾的下换线或双重下划线
+ if (camel.isEmpty()) {
+ continue;
+ }
+ // 首字母大写
+ result.append(camel.substring(0, 1).toUpperCase());
+ result.append(camel.substring(1).toLowerCase());
+ }
+ return result.toString();
+ }
+
+ /**
+ * 驼峰式命名法 例如：user_name->userName
+ */
+ public static String toCamelCase(String s) {
+ if (s == null) {
+ return null;
+ }
+ s = s.toLowerCase();
+ StringBuilder sb = new StringBuilder(s.length());
+ boolean upperCase = false;
+ for (int i = 0; i < s.length(); i++) {
+ char c = s.charAt(i);
+
+ if (c == SEPARATOR) {
+ upperCase = true;
+ } else if (upperCase) {
+ sb.append(Character.toUpperCase(c));
+ upperCase = false;
+ } else {
+ sb.append(c);
+ }
+ }
+ return sb.toString();
+ }
+
+ @SuppressWarnings("unchecked")
+ public static <T> T cast(Object obj) {
+ return (T)obj;
+ }
+
+ /**
+ * 判断是否为数字格式不限制位数
+ *
+ * @param o
+ * 待校验参数
+ * @return 如果全为数字，返回true；否则，返回false
+ */
+ public static boolean isNumber(Object o) {
+ return (Pattern.compile("[0-9]*")).matcher(String.valueOf(o)).matches();
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/TencentUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/TencentUtils.java
new file mode 100644
index 0000000..8d48cba
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/TencentUtils.java
@@ -0,0 +1,88 @@
+package com.panzhihua.common.utlis;
+
+import com.tencentcloudapi.common.Credential;
+import com.tencentcloudapi.common.exception.TencentCloudSDKException;
+import com.tencentcloudapi.common.profile.ClientProfile;
+import com.tencentcloudapi.common.profile.HttpProfile;
+import com.tencentcloudapi.faceid.v20180301.FaceidClient;
+import com.tencentcloudapi.faceid.v20180301.models.*;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class TencentUtils {
+
+ private static final String secretId = "AKIDCG5h4EArJVTCesseAQQCiyzlIZicHgpk";
+ private static final String secretKey = "jCPM5appZ4KK4YrvjHaeS0JNCl5C4g5E";
+ /**
+ * 商户id
+ */
+ private static final String merchantId = "0NSJ2106041331155797";
+ /**
+ * 请求地址
+ */
+ private static final String url = "faceid.tencentcloudapi.com";
+
+ /**
+ * 获取用户EidToken接口
+ *
+ * @param name
+ * 姓名
+ * @param idCard
+ * 身份证号
+ * @return 调用结果
+ */
+ public static String getEidToken(String name, String idCard) {
+ try {
+ Credential cred = new Credential(secretId, secretKey);
+
+ HttpProfile httpProfile = new HttpProfile();
+ httpProfile.setEndpoint(url);
+
+ ClientProfile clientProfile = new ClientProfile();
+ clientProfile.setHttpProfile(httpProfile);
+
+ FaceidClient client = new FaceidClient(cred, "", clientProfile);
+
+ GetEidTokenRequest req = new GetEidTokenRequest();
+ req.setIdCard(idCard);
+ req.setName(name);
+ GetEidTokenConfig getEidTokenConfig1 = new GetEidTokenConfig();
+ getEidTokenConfig1.setInputType("4");
+ req.setConfig(getEidTokenConfig1);
+
+ req.setMerchantId(merchantId);
+ GetEidTokenResponse resp = client.GetEidToken(req);
+ return GetEidTokenResponse.toJsonString(resp);
+ } catch (TencentCloudSDKException e) {
+ log.error("人脸核身获取Token接口调用失败，错误信息：" + e.toString());
+ }
+ return "";
+ }
+
+ /**
+ * 获取用户核身结果接口
+ *
+ * @param eidToken
+ * 用户token
+ * @return 调用结果
+ */
+ public static String getEidResult(String eidToken) {
+ try {
+ Credential cred = new Credential(secretId, secretKey);
+ HttpProfile httpProfile = new HttpProfile();
+ httpProfile.setEndpoint(url);
+ ClientProfile clientProfile = new ClientProfile();
+ clientProfile.setHttpProfile(httpProfile);
+ FaceidClient client = new FaceidClient(cred, "", clientProfile);
+ GetEidResultRequest req = new GetEidResultRequest();
+ req.setEidToken(eidToken);
+ GetEidResultResponse resp = client.GetEidResult(req);
+ return GetEidTokenResponse.toJsonString(resp);
+ } catch (TencentCloudSDKException e) {
+ log.error("人脸核身获取结果接口调用失败，错误信息：" + e.toString());
+ }
+ return "";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/Threads.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/Threads.java
new file mode 100644
index 0000000..2e87dfe
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/Threads.java
@@ -0,0 +1,69 @@
+package com.panzhihua.common.utlis;
+
+import java.util.concurrent.*;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 线程相关工具类.
+ *
+ * @author huanghongfa
+ */
+@Slf4j
+public class Threads {
+ /**
+ * sleep等待,单位为毫秒
+ */
+ public static void sleep(long milliseconds) {
+ try {
+ Thread.sleep(milliseconds);
+ } catch (InterruptedException e) {
+ return;
+ }
+ }
+
+ /**
+ * 停止线程池 先使用shutdown, 停止接收新任务并尝试完成所有已存在任务. 如果超时, 则调用shutdownNow, 取消在workQueue中Pending的任务,并中断所有阻塞函数. 如果仍人超時，則強制退出.
+ * 另对在shutdown时线程本身被调用中断做了处理.
+ */
+ public static void shutdownAndAwaitTermination(ExecutorService pool) {
+ if (pool != null && !pool.isShutdown()) {
+ pool.shutdown();
+ try {
+ if (!pool.awaitTermination(120, TimeUnit.SECONDS)) {
+ pool.shutdownNow();
+ if (!pool.awaitTermination(120, TimeUnit.SECONDS)) {
+ // log.info("Pool did not terminate");
+
+ }
+ }
+ } catch (InterruptedException ie) {
+ pool.shutdownNow();
+ Thread.currentThread().interrupt();
+ }
+ }
+ }
+
+ /**
+ * 打印线程异常信息
+ */
+ public static void printException(Runnable r, Throwable t) {
+ if (t == null && r instanceof Future<?>) {
+ try {
+ Future<?> future = (Future<?>)r;
+ if (future.isDone()) {
+ future.get();
+ }
+ } catch (CancellationException ce) {
+ t = ce;
+ } catch (ExecutionException ee) {
+ t = ee.getCause();
+ } catch (InterruptedException ie) {
+ Thread.currentThread().interrupt();
+ }
+ }
+ if (t != null) {
+ // log.error(t.getMessage(), t);
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/TypeDict.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/TypeDict.java
new file mode 100644
index 0000000..0e13ab1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/TypeDict.java
@@ -0,0 +1,64 @@
+package com.panzhihua.common.utlis;
+
+/**
+ * 应用模块名称
+ * <p>
+ * 代码描述
+ * <p>
+ * Copyright: Copyright (C) 2021 XXX, Inc. All rights reserved.
+ * <p>
+ * Company: 成都呐喊信息技术有限公司
+ * <p>
+ *
+ * @author manailin
+ * @since 2021/10/8 10:51
+ */
+public class TypeDict {
+ /**
+ * 常用文件的文件头如下：(以前六位为准) JPEG (jpg)，文件头：FFD8FF PNG (png)，文件头：89504E47 GIF (gif)，文件头：47494638 TIFF (tif)，文件头：49492A00
+ * Windows Bitmap (bmp)，文件头：424D CAD (dwg)，文件头：41433130 Adobe Photoshop (psd)，文件头：38425053 Rich Text Format
+ * (rtf)，文件头：7B5C727466 XML (xml)，文件头：3C3F786D6C HTML (html)，文件头：68746D6C3E Email [thorough only]
+ * (eml)，文件头：44656C69766572792D646174653A Outlook Express (dbx)，文件头：CFAD12FEC5FD746F Outlook (pst)，文件头：2142444E MS
+ * Word/Excel (xls.or.doc)，文件头：D0CF11E0 MS Access (mdb)，文件头：5374616E64617264204A WordPerfect (wpd)，文件头：FF575043
+ * Postscript (eps.or.ps)，文件头：252150532D41646F6265 Adobe Acrobat (pdf)，文件头：255044462D312E Quicken (qdf)，文件头：AC9EBD8F
+ * Windows Password (pwl)，文件头：E3828596 ZIP Archive (zip)，文件头：504B0304 RAR Archive (rar)，文件头：52617221 Wave
+ * (wav)，文件头：57415645 AVI (avi)，文件头：41564920 Real Audio (ram)，文件头：2E7261FD Real Media (rm)，文件头：2E524D46 MPEG
+ * (mpg)，文件头：000001BA MPEG (mpg)，文件头：000001B3 Quicktime (mov)，文件头：6D6F6F76 Windows Media (asf)，文件头：3026B2758E66CF11
+ * MIDI (mid)，文件头：4D546864,文件头：FFF328（满添加mp3），文件头：000000（满添加mp4）
+ */
+ public static String checkImageType(String type) {
+
+ switch (type) {
+ case "FFD8FF":
+ return "jpg";
+ case "89504E":
+ return "png";
+ case "474946":
+ return "gif";
+ default:
+ return "0000";
+ }
+ }
+
+ public static String checkFileType(String fileType) {
+
+ switch (fileType) {
+ case "FFD8FF":
+ return "jpg";
+ case "89504E":
+ return "png";
+ case "474946":
+ return "gif";
+ case "574156":
+ return "wav";
+ case "415649":
+ return "avi";
+ case "FFF328":
+ return "mp3";
+ case "000000":
+ return "mp4";
+ default:
+ return "0000";
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ValidableList.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ValidableList.java
new file mode 100644
index 0000000..dc5e183
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ValidableList.java
@@ -0,0 +1,132 @@
+package com.panzhihua.common.utlis;
+
+import java.util.*;
+
+import javax.validation.Valid;
+
+import lombok.Data;
+
+/**
+ * @author manailin
+ */
+@Data
+public class ValidableList<E> implements List<E> {
+
+ @Valid
+ private List<E> list = new LinkedList<>();
+
+ @Override
+ public int size() {
+ return list.size();
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return list.isEmpty();
+ }
+
+ @Override
+ public boolean contains(Object o) {
+ return list.contains(o);
+ }
+
+ @Override
+ public Iterator<E> iterator() {
+ return list.iterator();
+ }
+
+ @Override
+ public Object[] toArray() {
+ return list.toArray();
+ }
+
+ @Override
+ public <T> T[] toArray(T[] a) {
+ return list.toArray(a);
+ }
+
+ @Override
+ public boolean add(E e) {
+ return list.add(e);
+ }
+
+ @Override
+ public boolean remove(Object o) {
+ return list.remove(o);
+ }
+
+ @Override
+ public boolean containsAll(Collection<?> c) {
+ return list.containsAll(c);
+ }
+
+ @Override
+ public boolean addAll(Collection<? extends E> c) {
+ return list.addAll(c);
+ }
+
+ @Override
+ public boolean addAll(int index, Collection<? extends E> c) {
+ return list.addAll(index, c);
+ }
+
+ @Override
+ public boolean removeAll(Collection<?> c) {
+ return list.removeAll(c);
+ }
+
+ @Override
+ public boolean retainAll(Collection<?> c) {
+ return list.retainAll(c);
+ }
+
+ @Override
+ public void clear() {
+ list.clear();
+ }
+
+ @Override
+ public E get(int index) {
+ return list.get(index);
+ }
+
+ @Override
+ public E set(int index, E element) {
+ return list.set(index, element);
+ }
+
+ @Override
+ public void add(int index, E element) {
+ list.add(index, element);
+ }
+
+ @Override
+ public E remove(int index) {
+ return list.remove(index);
+ }
+
+ @Override
+ public int indexOf(Object o) {
+ return list.indexOf(o);
+ }
+
+ @Override
+ public int lastIndexOf(Object o) {
+ return list.lastIndexOf(o);
+ }
+
+ @Override
+ public ListIterator<E> listIterator() {
+ return list.listIterator();
+ }
+
+ @Override
+ public ListIterator<E> listIterator(int index) {
+ return list.listIterator(index);
+ }
+
+ @Override
+ public List<E> subList(int fromIndex, int toIndex) {
+ return list.subList(fromIndex, toIndex);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ValidateUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ValidateUtils.java
new file mode 100644
index 0000000..e0f6380
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ValidateUtils.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.utlis;
+
+import java.util.regex.Pattern;
+
+/**
+ * @title: ValidateUtils
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 验证相关工具类
+ * @author: hans
+ * @date: 2022/02/11 15:16
+ */
+public class ValidateUtils {
+
+ private static final String PHONE_REGEX = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$";
+
+ public static Boolean assertPhoneIsValid(String phone) {
+ return Pattern.matches(PHONE_REGEX, phone);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxPayUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxPayUtils.java
new file mode 100644
index 0000000..9cade45
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxPayUtils.java
@@ -0,0 +1,161 @@
+package com.panzhihua.common.utlis;
+
+import java.math.BigDecimal;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+import com.panzhihua.common.utlis.wx.WXPayUtil;
+import org.json.XML;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.constants.PayCpmstant;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class WxPayUtils {
+
+ public static String getUnifiedorder(String appid, String mchId, String payKey, String notifyUrl, String body,
+ String openid, String outTradeNo, BigDecimal money,String attach) {
+ String nonceStr = PayUtil.makeUUID(32);
+ SortedMap<Object, Object> params = new TreeMap<>();
+ params.put("appid", appid);
+ params.put("body", body);
+ params.put("mch_id", mchId);
+ params.put("nonce_str", nonceStr);
+ params.put("notify_url", notifyUrl);
+ params.put("openid", openid);
+ //附加数据
+ if(StringUtils.isNotEmpty(attach)){
+ params.put("attach", attach);
+ }
+ params.put("out_trade_no", outTradeNo);// 商品订单号
+ params.put("spbill_create_ip", PayUtil.getLocalIp());// 服务部署的ip
+ params.put("total_fee", PayUtil.moneyToIntegerStr(money));// 费用的参数转型
+ params.put("trade_type", "JSAPI");// 对接类型
+ params.put("sign", PayUtil.createSign(PayCpmstant.DEFAULT_ENCODING, params, payKey));// MD5签名
+ // 转换成xml
+ String xmlData = PayUtil.getRequestXml(params);
+ // 请求微信后台，获取支付id
+ String resXml = HttpClientUtil.httpsRequest(PayCpmstant.UNIFIEDORDER_URL, xmlData);
+ log.info("请求微信支付返回参数：" + resXml);
+
+ org.json.JSONObject resultData = XML.toJSONObject(resXml);
+ JSONObject data = JSON.parseObject(resultData.get("xml").toString());
+ JSONObject result = new JSONObject();
+ if (data.get("return_msg").equals(PayCpmstant.RETURN_MSG)
+ && data.get("return_code").equals(PayCpmstant.RETURN_CODE)) {
+ // 将微信统一下单成功的参数拼接再签名
+ // 统一下单返回prepay_id
+ String prepayId = "prepay_id=" + data.getString("prepay_id");
+ // 时间戳
+ Long timeStamp = System.currentTimeMillis() / 1000;
+ // 封装需要签名的字段
+ SortedMap<Object, Object> payParams = new TreeMap<>();
+ payParams.put("appId", appid);
+ payParams.put("nonceStr", nonceStr);
+ payParams.put("package", prepayId);
+ payParams.put("signType", PayCpmstant.SIGN_TYPE);
+ payParams.put("timeStamp", timeStamp);
+ // 将参数以及签名计算完成封装返回给前端
+ result.put("timeStamp", timeStamp);
+ result.put("nonceStr", nonceStr);
+ result.put("package", prepayId);
+ result.put("signType", PayCpmstant.SIGN_TYPE);
+ result.put("paySign", PayUtil.createSign(PayCpmstant.DEFAULT_ENCODING, payParams, payKey));
+ }
+ return result.toJSONString();
+ }
+
+ public static SortedMap<Object, Object> prepayId(Map<String, String> map) {
+ SortedMap<Object, Object> parameters = new TreeMap<>();
+ parameters.put("appId", "");
+ parameters.put("timeStamp", PayUtil.create_timestamp());
+ parameters.put("nonceStr", map.get("nonce_str"));
+ parameters.put("package", "prepay_id=" + map.get("prepay_id"));
+ parameters.put("signType", "MD5");
+ String sign = PayUtil.createSign("UTF-8", parameters, "商户秘钥");
+ parameters.put("prepay_id", "prepay_id=" + map.get("prepay_id"));
+ parameters.put("paySign", sign);
+ return parameters;
+ }
+ public static String h5pay(String appid, String mchId, String payKey, String notifyUrl, String body,
+ String openid, String outTradeNo, BigDecimal money, String tradeType, String clientIp) {
+ String nonceStr = PayUtil.makeUUID(32);
+ SortedMap<Object, Object> params = new TreeMap<>();
+ params.put("appid", appid);
+ params.put("body", body);
+ params.put("mch_id", mchId);
+ params.put("nonce_str", nonceStr);
+ params.put("notify_url", notifyUrl);
+ params.put("openid", openid);
+ params.put("out_trade_no", outTradeNo);// 商品订单号
+ params.put("spbill_create_ip", clientIp);// 用户真实ip
+ params.put("total_fee", PayUtil.moneyToIntegerStr(money));// 费用的参数转型
+ params.put("trade_type", tradeType);// 对接类型
+ params.put("sign", PayUtil.createSign(PayCpmstant.DEFAULT_ENCODING, params, payKey));// MD5签名
+ // 转换成xml
+ String xmlData = PayUtil.getRequestXml(params);
+ // 请求微信后台，获取支付id
+ String resXml = HttpClientUtil.httpsRequest(PayCpmstant.UNIFIEDORDER_URL, xmlData);
+ log.info("请求微信支付返回参数：" + resXml);
+
+ org.json.JSONObject resultData = XML.toJSONObject(resXml);
+ JSONObject data = JSON.parseObject(resultData.get("xml").toString());
+ JSONObject result = new JSONObject();
+
+ if (data.get("return_msg").equals(PayCpmstant.RETURN_MSG)
+ && data.get("return_code").equals(PayCpmstant.RETURN_CODE)) {
+ // 将微信统一下单成功的参数拼接再签名
+ // 统一下单返回prepay_id
+ if(tradeType.equals("JSAPI")) {
+ String prepayId = "prepay_id=" + data.getString("prepay_id");
+ // 时间戳
+ Long timeStamp = System.currentTimeMillis() / 1000;
+ // 封装需要签名的字段
+ SortedMap<Object, Object> payParams = new TreeMap<>();
+ payParams.put("appId", appid);
+ payParams.put("nonceStr", nonceStr);
+ payParams.put("package", prepayId);
+ payParams.put("signType", PayCpmstant.SIGN_TYPE);
+ payParams.put("timeStamp", timeStamp);
+ // 将参数以及签名计算完成封装返回给前端
+ result.put("timeStamp", timeStamp);
+ result.put("nonceStr", nonceStr);
+ result.put("package", prepayId);
+ result.put("signType", PayCpmstant.SIGN_TYPE);
+ result.put("paySign", PayUtil.createSign(PayCpmstant.DEFAULT_ENCODING, payParams, payKey));
+ }
+ else if(tradeType.equals("NATIVE")) {
+ result.put("codeUrl",data.getString("code_url"));
+ } else if(tradeType.equals("MWEB")) {
+ result.put("mWebUrl",data.getString("mweb_url"));
+ }
+ }
+
+
+
+ return result.toJSONString();
+ }
+
+ public static String refund(String appid,String mchId,String orderNo,BigDecimal totalFee,BigDecimal refundFee,String refundNo,Boolean isTest) throws Exception {
+ //创建请求地址
+ String url = PayCpmstant.REFUND_URL;
+ Map<String, String> paramMap = new LinkedHashMap<>();
+ paramMap.put("appid",appid);
+ paramMap.put("mch_id",mchId);
+ paramMap.put("nonce_str", WXPayUtil.generateNonceStr());
+ paramMap.put("out_refund_no",refundNo);
+ paramMap.put("out_trade_no",orderNo);
+ paramMap.put("refund_fee",String.valueOf(refundFee.multiply(BigDecimal.valueOf(100)).longValue()));
+ paramMap.put("total_fee",String.valueOf(totalFee.multiply(BigDecimal.valueOf(100)).longValue()));
+ paramMap.put("sign",WXPayUtil.generateSignature(paramMap,PayCpmstant.REFUND_KEY));
+ log.info("微信退款请求参数：{},{},{},{}",url,WXPayUtil.mapToXml(paramMap),mchId,isTest);
+ //接收请求返回值
+ return HttpClientUtil.doRefund(url,WXPayUtil.mapToXml(paramMap),mchId,isTest);
+
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxUtil.java
new file mode 100644
index 0000000..9c55423
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxUtil.java
@@ -0,0 +1,839 @@
+package com.panzhihua.common.utlis;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.constants.WxSubscribeConstants;
+import com.panzhihua.common.model.dtos.wx.TemplateParam;
+import com.panzhihua.common.model.dtos.wx.WxSubscribeDTO;
+
+import com.panzhihua.common.model.vos.community.acid.ComActAcidDangerMemberVO;
+import com.panzhihua.common.model.vos.community.reserve.FiveCount;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class WxUtil {
+
+ // 客服消息推送地址
+ public final static String kf_url = "https://api.weixin.qq.com/cgi-bin/message/custom/send";
+
+ public static String sendKfLinkMessage(String openid, String url, String thumbUrl, String access_token)
+ throws Exception {
+ Map<String, Object> map_content = new HashMap<>();
+ map_content.put("title", "社区福利一分购");
+ map_content.put("description", "点击参与社区一分钱抢购活动");
+ map_content.put("url", url);// 跳转地址
+ map_content.put("thumb_url", thumbUrl);// 图片地址
+ Map<String, Object> map = new HashMap<>();
+ map.put("touser", openid);
+ map.put("msgtype", "link");
+ map.put("link", map_content);
+ String content = JSON.toJSONString(map);
+ return HttpClientUtil.httpPost(kf_url + "?access_token=" + access_token, content);
+ }
+
+ public static String sendKfConetntMessage(String openid, String access_token) throws Exception {
+ Map<String, Object> map_content = new HashMap<>();
+ map_content.put("content", "社区福利一分购");
+ Map<String, Object> map = new HashMap<>();
+ map.put("touser", openid);
+ map.put("msgtype", "text");
+ map.put("text", map_content);
+ String content = JSON.toJSONString(map);
+ return HttpClientUtil.httpPost(kf_url + "?access_token=" + access_token, content);
+ }
+
+ public static String sendKfImagesMessage(String openid, String access_token, String mediaId) throws Exception {
+ Map<String, Object> map_content = new HashMap<>();
+ map_content.put("media_id", mediaId);
+ Map<String, Object> map = new HashMap<>();
+ map.put("touser", openid);
+ map.put("msgtype", "image");
+ map.put("image", map_content);
+ String content = JSON.toJSONString(map);
+ return HttpClientUtil.httpPost(kf_url + "?access_token=" + access_token, content);
+ }
+
+ /**
+ * 订阅消息推送
+ *
+ * @param accessToken
+ * 获取会话token
+ * @return 消息推送结果
+ */
+ static void sendSubscribe(String accessToken, WxSubscribeDTO subscribeDTO) throws Exception {
+ String resultString = HttpUtils.wxMessageModeSendUrl(accessToken, subscribeDTO);
+ JSONObject jsonResult = JSON.parseObject(resultString);
+ if (jsonResult != null) {
+ log.info("订阅消息推送返回参数" + jsonResult.toJSONString());
+ int errorCode = jsonResult.getIntValue("errcode");
+ String errorMessage = jsonResult.getString("errmsg");
+ if (errorCode == 0) {
+ log.info("订阅消息推送成功，openId：" + subscribeDTO.getTouser());
+ } else {
+ log.error(
+ "订阅消息发送失败，错误码：" + errorCode + ",错误信息：" + errorMessage + "用户openid：" + subscribeDTO.getTouser());
+ }
+ }
+ }
+
+ /**
+ * 随手拍奖励到账订阅消息推送
+ *
+ * @param openId
+ * 用户openid
+ * @param accessToken
+ * token会话标识
+ * @param name
+ * 随手拍活动标题
+ * @param amount
+ * 奖励金额
+ * @param remark
+ * 备注说明
+ */
+ public static void sendSubscribeJLDZ(String openId, String accessToken, String name, BigDecimal amount,
+ String remark,String templateId) {
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ List<TemplateParam> paras = new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing1", name));// 活动名称
+ paras.add(new TemplateParam("amount3", amount.toString()));// 奖励金额
+ paras.add(new TemplateParam("thing7", remark));// 备注说明
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken, subscribeDTO);
+ } catch (Exception e) {
+ log.error("随手拍奖励到账订阅消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+
+ /**
+ * 活动报名成功订阅消息推送
+ *
+ * @param openId
+ * 用户openid
+ * @param accessToken
+ * token会话标识
+ * @param name
+ * 活动名称
+ * @param address
+ * 活动地址
+ * @param activityTime
+ * 活动时间
+ * @param signTime
+ * 报名时间
+ */
+ public static void sendSubscribeSQHD(String openId, String accessToken, String name, String address,
+ String activityTime, String signTime) {
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(WxSubscribeConstants.BMCG_ID);
+ List<TemplateParam> paras = new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing1", name));// 活动名称
+ paras.add(new TemplateParam("thing2", address));// 活动地址
+ paras.add(new TemplateParam("date3", activityTime));// 活动时间
+ paras.add(new TemplateParam("time8", signTime));// 报名时间
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken, subscribeDTO);
+ } catch (Exception e) {
+ log.error("活动报名成功订阅消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+
+ /**
+ * 新问卷调查订阅消息通知
+ *
+ * @param openId
+ * 用户openid
+ * @param accessToken
+ * token会话标识
+ * @param name
+ * 活动名称
+ * @param questionnaireName
+ * 问卷名称
+ */
+ public static void sendSubscribeDYWJ(String openId, String accessToken, String name, String questionnaireName) {
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(WxSubscribeConstants.DYWJ_ID);
+ List<TemplateParam> paras = new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing1", name));// 活动名称
+ paras.add(new TemplateParam("thing2", questionnaireName));// 问卷名称
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken, subscribeDTO);
+ } catch (Exception e) {
+ log.error("新问卷调查订阅消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+
+ /**
+ * 认证审核订阅消息通知
+ *
+ * @param openId
+ * 用户openid
+ * @param accessToken
+ * token会话标识
+ * @param name
+ * 认证内容
+ * @param applyTime
+ * 申请时间
+ * @param result
+ * 审核结果
+ */
+ public static void sendSubscribeRZSH(String openId, String accessToken, String name, String applyTime,
+ String result,String templateId) {
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ List<TemplateParam> paras = new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing2", name));// 认证内容
+ paras.add(new TemplateParam("phrase1", result));// 审核结果
+ paras.add(new TemplateParam("date3", applyTime));// 申请时间
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken, subscribeDTO);
+ } catch (Exception e) {
+ log.error("认证审核订阅消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+
+ /**
+ * 随手拍、邻里圈、微心愿、房源审核状态进度通知
+ *
+ * @param openId
+ * 用户openid
+ * @param accessToken
+ * token会话标识
+ * @param name
+ * 审核项目
+ * @param applyTime
+ * 审核状态
+ * @param result
+ * 审核时间
+ */
+ public static void sendSubscribeSHZT(String openId, String accessToken, String name, String applyTime,
+ String result,String templateId) {
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ List<TemplateParam> paras = new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing1", name));// 审核项目
+ paras.add(new TemplateParam("phrase2", result));// 审核状态
+ paras.add(new TemplateParam("time3", applyTime));// 审核时间
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken, subscribeDTO);
+ } catch (Exception e) {
+ log.error("审核状态订阅消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+
+ /**
+ * 社区活动取消通知
+ *
+ * @param openId
+ * 用户openid
+ * @param accessToken
+ * token会话标识
+ * @param name
+ * 活动名称
+ * @param time
+ * 活动时间
+ */
+ public static void sendSubscribeHDQX(String openId, String accessToken, String name, String time,String templateId) {
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ List<TemplateParam> paras = new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing1", name));// 活动标题
+ paras.add(new TemplateParam("date2", time));// 活动时间
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken, subscribeDTO);
+ } catch (Exception e) {
+ log.error("活动取消订阅消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+
+ /**
+ * 留言回复订阅消息通知
+ *
+ * @param openId
+ * 用户openid
+ * @param accessToken
+ * token会话标识
+ * @param name
+ * 回复人名称
+ * @param time
+ * 回复时间
+ * @param content
+ * 回复内容
+ */
+ public static void sendSubscribeLYHF(String openId, String accessToken, String name, String time, String content,String templateId) {
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ List<TemplateParam> paras = new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing3", content));// 回复内容
+ paras.add(new TemplateParam("name1", name));// 回复者
+ paras.add(new TemplateParam("date2", time));// 回复时间
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken, subscribeDTO);
+ } catch (Exception e) {
+ log.error("留言回复订阅消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+
+ /**
+ * 活动变更订阅消息通知
+ *
+ * @param openId
+ * 用户openid
+ * @param accessToken
+ * token会话标识
+ * @param name
+ * 活动名称
+ * @param changeTime
+ * 活动时间变更
+ * @param changeAddress
+ * 活动地点变更
+ * @param time
+ * 活动时间
+ * @param address
+ * 活动地点
+ */
+ public static void sendSubscribeHDBG(String openId, String accessToken, String name, String changeTime,
+ String changeAddress, String time, String address,String templateId) {
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ List<TemplateParam> paras = new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing1", name));// 活动名称
+ paras.add(new TemplateParam("time2", changeTime));// 活动时间变更
+ paras.add(new TemplateParam("thing3", changeAddress));// 地址变更
+ paras.add(new TemplateParam("time5", time));// 活动时间
+ paras.add(new TemplateParam("thing6", address));// 活动地点
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken, subscribeDTO);
+ } catch (Exception e) {
+ log.error("留言回复订阅消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+
+ /**
+ * 活动即将开始订阅消息通知
+ *
+ * @param openId
+ * 用户openid
+ * @param accessToken
+ * token会话标识
+ * @param name
+ * 活动名称
+ * @param time
+ * 活动时间
+ * @param address
+ * 活动地点
+ * @param num
+ * 活动参加人数
+ */
+ public static void sendSubscribeHDJJKS(String openId, String accessToken, String name, String time, String address,
+ String num,String templateId) {
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ List<TemplateParam> paras = new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing1", name));// 活动名称
+ paras.add(new TemplateParam("date2", time));// 活动时间
+ paras.add(new TemplateParam("number3", num));// 参与人数
+ paras.add(new TemplateParam("thing4", address));// 活动地点
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken, subscribeDTO);
+ } catch (Exception e) {
+ log.error("活动即将开始订阅消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+
+ /**
+ * 预约提醒订阅消息通知
+ * @param openId 用户openid
+ * @param accessToken token会话标识
+ * @param result 预约结果
+ * @param title 预约主题
+ * @param name 预约人
+ * @param time 预约时间
+ */
+ public static void sendSubscribeYYTX(String openId, String accessToken, String result, String title, String name,String time,String templateId){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("phrase8",result));//预约结果
+ paras.add(new TemplateParam("thing23",title));//预约主题
+ paras.add(new TemplateParam("name5",name));//预约人
+ paras.add(new TemplateParam("date7",time));//预约时间
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error("预约提醒订阅消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+
+ /**
+ * 预约提醒订阅消息通知
+ * @param openId 用户openid
+ * @param accessToken token会话标识
+ */
+ public static void sendSubscribeTXTZ(String openId, String accessToken, String templateId){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("time2",DateUtils.getCurrentDateStr()));
+ paras.add(new TemplateParam("thing3","请尽快完善返攀报备，填报当前居住地。"));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error("预约提醒订阅消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+
+ /**
+ * 推送危险人员订阅消息通知
+ * @param openId 用户openid
+ * @param accessToken token会话标识
+ * @param dangerMember 风险人员
+ */
+ public static void sendSubscribeDanger(String openId, String accessToken, ComActAcidDangerMemberVO dangerMember, String templateId){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ Integer type = dangerMember.getType();
+ paras.add(new TemplateParam("thing2", (type == 1 ? "当前风险人员 " : "当前未填住址人员 ") + dangerMember.getName()));
+ paras.add(new TemplateParam("time3", DateUtils.getCurrentDateStr()));
+ paras.add(new TemplateParam("thing1","新冠疫情"));
+ paras.add(new TemplateParam("thing4", type == 1 ? "新增风险人员" : "新增未填住址人员"));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error("危险人员订阅消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+
+
+ /**
+ * 推送危险人员订阅消息通知
+ * @param openId 用户openid
+ * @param accessToken token会话标识
+ * @param fiveCount 统计数据
+ */
+ public static void sendSubscribeStatics(String openId, String accessToken, FiveCount fiveCount, String templateId){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ subscribeDTO.setPage("/packageB/pages/register/reportingStatistics/reportingStatistics");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing2", "报备总数"+fiveCount.getAllCount()+";"+"风险人员"+fiveCount.getDangerCount()));
+ paras.add(new TemplateParam("time3", DateUtils.getDateFormatString(DateUtils.addDay(new Date(),-1),"yyyy-MM-dd")+"0点到24点"));
+ paras.add(new TemplateParam("thing1","新冠疫情"));
+ paras.add(new TemplateParam("thing4", "社区报备数据统计"));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error("危险人员订阅消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+
+ /**
+ * uu洗车订单状态更改
+ * @param openId
+ * @param accessToken
+ * @param status
+ * @param washerName
+ * @param washerMobile
+ * @param phone
+ * @param templateId
+ */
+ public static void sendUuWash(String openId, String accessToken, String status,String washerName,String washerMobile,String phone,String templateId){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ subscribeDTO.setPage("packageD/pages/washer/order/index");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing1", "上门洗车"));
+ paras.add(new TemplateParam("thing4", phone));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error(e.getMessage());
+ }
+ }
+
+ /**
+ * ws洗车订单状态更改
+ * @param openId
+ * @param accessToken
+ * @param status
+ * @param washerName
+ * @param washerMobile
+ * @param phone
+ * @param templateId
+ */
+ public static void sendWsWash(String openId, String accessToken, String status,String washerName,String washerMobile,String phone,String templateId){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ subscribeDTO.setPage("pages/washer/order/index");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing2", "上门洗车"));
+ paras.add(new TemplateParam("thing5", phone));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ log.info(subscribeDTO.toString());
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error(e.getMessage());
+ }
+ }
+ /**
+ * uu洗车订单状态更改
+ * @param openId
+ * @param accessToken
+ * @param status
+ * @param washerName
+ * @param washerMobile
+ * @param phone
+ * @param templateId
+ */
+ public static void sendUuWash3(String openId, String accessToken, String status,String washerName,String washerMobile,String phone,String templateId){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ subscribeDTO.setPage("packageD/pages/washer/order/index");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing9", StrUtil.isBlank(washerName) ? "无":washerName));
+ paras.add(new TemplateParam("phone_number10",StrUtil.isBlank(washerMobile) ? "0":washerMobile));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error(e.getMessage());
+ }
+ }
+ /**
+ * ws洗车订单状态更改
+ * @param openId
+ * @param accessToken
+ * @param status
+ * @param washerName
+ * @param washerMobile
+ * @param phone
+ * @param templateId
+ */
+ public static void sendWsWash3(String openId, String accessToken, String status,String washerName,String washerMobile,String phone,String templateId){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ subscribeDTO.setPage("pages/washer/order/index");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing9", StrUtil.isBlank(washerName) ? "无":washerName));
+ paras.add(new TemplateParam("phone_number10",StrUtil.isBlank(washerMobile) ? "0" :washerMobile));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error(e.getMessage());
+ }
+ }
+ /**
+ * uu洗车订单状态更改
+ * @param openId
+ * @param accessToken
+ * @param status
+ * @param washerName
+ * @param washerMobile
+ * @param phone
+ * @param templateId
+ */
+ public static void sendUuWash4(String openId, String accessToken, String status,String washerName,String washerMobile,String phone,String templateId){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ subscribeDTO.setPage("packageD/pages/washer/order/index");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing4", status));
+ paras.add(new TemplateParam("thing3", StrUtil.isBlank(washerName) ? "无":washerName));
+ paras.add(new TemplateParam("thing6",StrUtil.isBlank(washerMobile) ? "无":washerMobile));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error(e.getMessage());
+ }
+ }
+ /**
+ * ws洗车订单状态更改
+ * @param openId
+ * @param accessToken
+ * @param status
+ * @param washerName
+ * @param washerMobile
+ * @param phone
+ * @param templateId
+ */
+ public static void sendWsWash4(String openId, String accessToken, String status,String washerName,String washerMobile,String phone,String templateId){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ subscribeDTO.setPage("pages/washer/order/index");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing4", status));
+ paras.add(new TemplateParam("thing3", StrUtil.isBlank(washerName) ? "无":washerName));
+ paras.add(new TemplateParam("thing6",StrUtil.isBlank(washerMobile) ? "无":washerMobile));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error(e.getMessage());
+ }
+ }
+ /**
+ * uu洗车订单状态更改
+ * @param openId
+ * @param accessToken
+ * @param status
+ * @param washerName
+ * @param washerMobile
+ * @param phone
+ * @param templateId
+ */
+ public static void sendUuWash6(String openId, String accessToken, String status,String washerName,String washerMobile,String phone,String templateId){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ subscribeDTO.setPage("packageD/pages/washer/order/index");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("phrase14", status));
+ paras.add(new TemplateParam("name3", StrUtil.isBlank(washerName) ? "无":washerName));
+ paras.add(new TemplateParam("thing5",StrUtil.isBlank(washerMobile) ? "无":washerMobile));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error(e.getMessage());
+ }
+ }
+ /**
+ * ws洗车订单状态更改
+ * @param openId
+ * @param accessToken
+ * @param status
+ * @param washerName
+ * @param washerMobile
+ * @param phone
+ * @param templateId
+ */
+ public static void sendWsWash6(String openId, String accessToken, String status,String washerName,String washerMobile,String phone,String templateId){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id(templateId);
+ subscribeDTO.setPage("pages/washer/order/index");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("phrase14", status));
+ paras.add(new TemplateParam("name3", StrUtil.isBlank(washerName) ? "无":washerName));
+ paras.add(new TemplateParam("thing5",StrUtil.isBlank(washerMobile) ? "无":washerMobile));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error(e.getMessage());
+ }
+ }
+ /**
+ * 长期订阅模板消息推送
+ * @param openId
+ * @param accessToken
+ */
+ public static void sendLongTimeTemplate(String openId, String accessToken, String word,String content,String page) {
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id("5f-xcy4lrWy_0kc5H4dj5bgBM-MwsvTwPApA-u3fqsQ");
+ subscribeDTO.setPage(page);
+ List<TemplateParam> paras = new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing3", word));
+ paras.add(new TemplateParam("thing6", content));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken, subscribeDTO);
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ }
+ }
+
+ /**
+ * 推送 商家开始配送后 订单配送通知
+ * @param openId 用户openid
+ * @param accessToken token会话标识
+ */
+ public static void sendStartShipping(String openId, String accessToken, String orderNo){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id("ezwzGs3R5DMuKxTyW8xOIQOIsLpW2sS61ZXsfyll7rw");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("character_string2", orderNo));
+ paras.add(new TemplateParam("phrase5", "配送中"));
+ paras.add(new TemplateParam("thing8","您的订单已开始配送"));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error("商家开始配送后订阅消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+
+ /**
+ * 推送 商家送达后 用取货通知
+ * @param openId 用户openid
+ * @param accessToken token会话标识
+ */
+ public static void sendService(String openId, String accessToken, String pointName){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id("6RGbNmRrmGNWyeK7UDodYTItNqEnIIdtlgyzeGLI2w8");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("phrase3", "待收货"));
+ paras.add(new TemplateParam("thing7", "您有一个订单已到达自提点，请及时取货"));
+ paras.add(new TemplateParam("thing5",pointName));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error("取货通知订阅消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+ /**
+ * 推送 商家发货后 发货通知
+ * @param openId 用户openid
+ * @param accessToken token会话标识
+ */
+ public static void sendDeliverGoodsNotice(String openId, String accessToken, String logisticsCompany , String logisticsNo, String orderNo,String deliverTime){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id("PuE0cYU9xUW7Y6XpW-wqz4Hlj1w2mnI_LprsUByJnGg");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing2", "您有一个订单已发货"));
+ paras.add(new TemplateParam("thing3", logisticsCompany));
+ paras.add(new TemplateParam("character_string4",logisticsNo));
+ paras.add(new TemplateParam("character_string5",orderNo));
+ paras.add(new TemplateParam("time6",deliverTime));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error("商家发货后订阅消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+
+ /**
+ * 推送 商家处理完退款申请后 订单退款通知
+ * @param openId 用户openid
+ * @param accessToken token会话标识
+ */
+ public static void sendRefundNotice(String openId, String accessToken, String refundNo , String refundAmount, String result){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id("GxFV_Oj1Pri4NnPkvKGPIPJsPryG8M6DW9mTHTbIrjE");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("character_string6", refundNo));
+ paras.add(new TemplateParam("amount9", refundAmount));
+ paras.add(new TemplateParam("phrase11",result));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error("订单退款通知 订阅消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+
+ /**
+ * 推送 新订单提醒 商家收到一个新的订单
+ * @param openId 用户openid
+ * @param accessToken token会话标识
+ */
+ public static void sendNewOrderNotice(String openId, String accessToken, String orderNo , String type, String goodsName,String amount,String orderTime){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id("3EwAKLw2Xe2o-GDnH-NUGa4nNwqPXsn01hBX8Xp2PbU");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("character_string1", orderNo));
+ paras.add(new TemplateParam("thing5", type));
+ paras.add(new TemplateParam("thing3",goodsName));
+ paras.add(new TemplateParam("amount4",amount));
+ paras.add(new TemplateParam("time2",orderTime));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error("新订单提醒 订阅消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+
+ /**
+ * 推送 退款申请通知 商家收到一个退款申请
+ * @param openId 用户openid
+ * @param accessToken token会话标识
+ */
+ public static void sendNewRefundOrderNotice(String openId, String accessToken, String refundNo , String refundAmount,String orderTime){
+ WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
+ subscribeDTO.setTouser(openId);
+ subscribeDTO.setTemplate_id("3EwAKLw2Xe2o-GDnH-NUGa4nNwqPXsn01hBX8Xp2PbU");
+ List<TemplateParam> paras=new ArrayList<TemplateParam>();
+ paras.add(new TemplateParam("thing5", "您有一个退款订单"));
+ paras.add(new TemplateParam("character_string2", refundNo));
+ paras.add(new TemplateParam("amount3",refundAmount));
+ paras.add(new TemplateParam("time4",orderTime));
+ subscribeDTO.setTemplateParamList(paras);
+ try {
+ sendSubscribe(accessToken,subscribeDTO);
+ }catch (Exception e){
+ log.error("退款申请通知 订阅消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
+
+
+
+ public static void main(String[] args) {
+
+ WxXCXTempSend util = new WxXCXTempSend();
+ try {
+ // String openId = "oMIR-5S9rpsWAVUUrNKoVDQbn5Mw";//zj的openid
+ String openId = "oMIR-5dWyNyWCCKMl7-kYzvyHOjs";// lyq的openid
+ String accessToken = util.getAccessToken();
+ // sendSubscribeHDJJKS(openId,accessToken,"测试活动即将开始标题","2021-08-04 13:00:00","成都市","50");//活动即将开始
+ // sendSubscribeHDQX(openId,accessToken,"取消活动测试标题","2021-08-04 13:00:00");//活动取消
+ // sendSubscribeHDBG(openId,accessToken,"活动名称","2021-08-05","活动变更地址","2021-08-06","活动地址");//活动变更
+ // sendSubscribeRZSH(openId,accessToken,"用户认证审核通知","2021-08-04","通过");//认证审核
+ // sendSubscribeJLDZ(openId,accessToken,"随手拍活动DDD",BigDecimal.TEN,"用户参加随手拍活动奖励");//奖励到账
+ // sendSubscribeLYHF(openId,accessToken,"社区管理员","2021-08-04 11:26:20","勇敢牛牛 不怕困难！");//留言回复
+ // sendSubscribeSHZT(openId,accessToken,"随手拍审核！！","2021-08-04 11:20:00","通过了");//审核状态
+ } catch (Exception e) {
+ System.out.println("错误错误！！！");
+ }
+ }
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxXCXTempSend.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxXCXTempSend.java
new file mode 100644
index 0000000..904c51c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxXCXTempSend.java
@@ -0,0 +1,328 @@
+package com.panzhihua.common.utlis;
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.constants.SecurityConstants;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.redis.RedisUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.http.entity.ContentType;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+@Slf4j
+@Component
+public class WxXCXTempSend extends BaseController {
+
+ public static final String APP_ID = "wx118de8a734d269f0";
+ private static final String APP_SECRET = "0264342daefde5cd70a6adada09ee5b1";
+ private static String ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential";
+ private static String APP_IMAGE_URL = "https://www.psciio.com//idcard/8fa82cfba258498eab2fa818220fb592.jpg";
+ private static String APP_IMAGE_NAME = "5.jpg";
+ private static String WX_CALL_BACK = "https://api.weixin.qq.com/cgi-bin/getcallbackip?access_token=";
+ //2小时
+ private static final Long EXPIRE_TIME = 2L;
+ @Resource
+ private RedisTemplate redisTemplate;
+ @Resource
+ private StringRedisTemplate stringRedisTemplate;
+ @Resource
+ private RedisUtils redisUtils;
+
+ private static WxXCXTempSend wxXCXTempSend;
+
+ /**
+ * url转变为 MultipartFile对象
+ *
+ * @param url
+ * @param fileName
+ * @return
+ * @throws Exception
+ */
+ private static MultipartFile createFileItem(String url, String fileName) throws Exception {
+ FileItem item = null;
+ try {
+ HttpURLConnection conn = (HttpURLConnection) new URL(url).openConnection();
+ conn.setReadTimeout(30000);
+ conn.setConnectTimeout(30000);
+ // 设置应用程序要从网络连接读取数据
+ conn.setDoInput(true);
+ conn.setRequestMethod("GET");
+ if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
+ InputStream is = conn.getInputStream();
+
+ FileItemFactory factory = new DiskFileItemFactory(16, null);
+ String textFieldName = "uploadfile";
+ item =
+ factory.createItem(textFieldName, ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName);
+ OutputStream os = item.getOutputStream();
+
+ int bytesRead = 0;
+ byte[] buffer = new byte[8192];
+ while ((bytesRead = is.read(buffer, 0, 8192)) != -1) {
+ os.write(buffer, 0, bytesRead);
+ }
+ os.close();
+ is.close();
+ }
+ } catch (IOException e) {
+ throw new RuntimeException("文件下载失败", e);
+ }
+
+ return new CommonsMultipartFile(item);
+ }
+
+ /**
+ * 获取小程序token，（ps:0=token获取失败）
+ *
+ * @return
+ */
+ public String getAccessToken() throws Exception {
+ String accessToken = "";
+ String appId = this.getAppId();
+ accessToken = wxXCXTempSend.stringRedisTemplate.boundValueOps("access_token:access_token:" + appId).get();
+ return accessToken;
+ }
+
+
+ public String getAccessToken(String appId) throws Exception {
+ String accessToken = "";
+ accessToken = wxXCXTempSend.stringRedisTemplate.boundValueOps("access_token:access_token:" + appId).get();
+ return accessToken;
+ }
+
+ private String validAccessToken(String accessToken, String appId, String appSecret) throws Exception {
+ if (StrUtil.isEmpty(accessToken)) {
+ //重新获取并设置到缓存 该方法暂时只用在花城
+ accessToken = getAppAccessToken(appId, appSecret);
+ wxXCXTempSend.stringRedisTemplate.opsForValue().set("access_token:access_token:" + appId, accessToken, EXPIRE_TIME, TimeUnit.HOURS);
+ } else {
+ String accessTokenUrl = WX_CALL_BACK + accessToken;
+ String result = HttpClientUtil.httpGet(accessTokenUrl, null, null);
+ Map<String, Object> resultMap = JSON.parseObject(result, Map.class);
+ //如果Access_token过期也重新获取
+ if (resultMap.containsKey("errcode")) {
+ accessToken = getAppAccessToken(appId, appSecret);
+ wxXCXTempSend.stringRedisTemplate.opsForValue().set("access_token:access_token:" + appId, accessToken, EXPIRE_TIME, TimeUnit.HOURS);
+ }
+ }
+ return accessToken;
+ }
+
+ public String getAppAccessToken(String appId, String appSecret) throws Exception {
+ String accessToken = "0";
+ try {
+ log.info("获取微信token参数：appid=" + appId + "，appSecret=" + appSecret);
+ String accessTokenUrl = ACCESS_TOKEN_URL + "&appid=" + appId + "&secret=" + appSecret;
+ String result = HttpClientUtil.httpGet(accessTokenUrl, null, null);
+ Map<String, Object> resultMap = JSON.parseObject(result, Map.class);
+ StringRedisTemplate redisTemplate = wxXCXTempSend.stringRedisTemplate;
+ if (resultMap.containsKey("access_token")) {
+ accessToken = resultMap.get("access_token").toString();
+ redisTemplate.opsForValue().set("access_token:access_token:" + appId, accessToken);
+ }
+ HttpServletRequest request = ServletUtils.getRequest();
+ String requestURI = request.getRequestURI();
+ //加上时间戳
+ String datetime = new SimpleDateFormat("yyyyMMdd").format(new Date());
+ //这里是 Redis key的前缀，如: sys:tabieId:表名 如果不需要去掉表名也可以
+ String key = MessageFormat.format("{0}:{1}:{2}", "access_token_request_incr",datetime,requestURI);
+ //查询 key 是否存在， 不存在返回 1 ，存在的话则自增加1
+ redisTemplate.opsForValue().increment(key, 1);
+
+ } catch (IOException ioe) {
+ log.error("小程序http请求异常");
+ ioe.printStackTrace();
+ }
+ return accessToken;
+ }
+
+ public String getWsAccessToken() throws Exception {
+ String accessToken = "0";
+ try {
+// log.info("获取微信token参数：appid=" + APP_ID + "，appSecret=" + APP_SECRET);
+ String accessTokenUrl = ACCESS_TOKEN_URL + "&appid=wx98d62711dfbd8425" + "&secret=97a2a10b990c2774ed279724337b5337";
+ String result = HttpClientUtil.httpGet(accessTokenUrl, null, null);
+ Map<String, Object> resultMap = JSON.parseObject(result, Map.class);
+ if (resultMap.containsKey("access_token")) {
+ accessToken = resultMap.get("access_token").toString();
+ }
+ } catch (IOException ioe) {
+ log.error("小程序http请求异常");
+ ioe.printStackTrace();
+ }
+ return accessToken;
+ }
+
+ /**
+ * 获取西区社区通微信token
+ *
+ * @return 西区社区通微信token
+ * @throws Exception 异常
+ */
+ public String getXQAppAccessToken() throws Exception {
+ String accessToken = "0";
+ try {
+ // 此处APP_ID APP_SECRET 在微信小程序后端可见
+ // String accessTokenUrl = String.format(TEMP_URL, APP_ID, APP_SECRET);
+ String accessTokenUrl = ACCESS_TOKEN_URL + "&appid=" + APP_ID + "&secret=" + APP_SECRET;
+ String result = HttpClientUtil.httpGet(accessTokenUrl, null, null);
+ Map<String, Object> resultMap = JSON.parseObject(result, Map.class);
+ if (resultMap.containsKey("access_token")) {
+ accessToken = resultMap.get("access_token").toString();
+ }
+ } catch (IOException ioe) {
+ log.error("小程序http请求异常");
+ ioe.printStackTrace();
+ }
+ return accessToken;
+ }
+
+ public String getMediaId(String accessToken) {
+ String mediaId = "";
+ Boolean aBoolean = redisTemplate.hasKey(SecurityConstants.APPLETS_ACCESS_MEDIA_ID);
+ ValueOperations<String, String> valueOperations = redisTemplate.opsForValue();
+ if (aBoolean) {
+ Long expireTime = Long.parseLong(valueOperations.get(SecurityConstants.APPLETS_ACCESS_MEDIA_ID_TIME));
+ if (expireTime <= System.currentTimeMillis()) {
+ redisTemplate.delete(SecurityConstants.APPLETS_ACCESS_MEDIA_ID);// 如果过期则删除
+ redisTemplate.delete(SecurityConstants.APPLETS_ACCESS_MEDIA_ID_TIME);// 如果过期则删除
+ mediaId = getAppMediaId(accessToken);
+ valueOperations.set(SecurityConstants.APPLETS_ACCESS_MEDIA_ID, mediaId);
+ valueOperations.set(SecurityConstants.APPLETS_ACCESS_MEDIA_ID_TIME,
+ System.currentTimeMillis() + 259000000 + "");
+ } else {
+ mediaId = valueOperations.get(SecurityConstants.APPLETS_ACCESS_MEDIA_ID);
+ }
+ } else {
+ mediaId = getAppMediaId(accessToken);
+ valueOperations.set(SecurityConstants.APPLETS_ACCESS_MEDIA_ID, mediaId);
+ valueOperations.set(SecurityConstants.APPLETS_ACCESS_MEDIA_ID_TIME,
+ System.currentTimeMillis() + 259000000 + "");
+ }
+ return mediaId;
+ }
+
+ private String getAppMediaId(String accessToken) {
+ String appMediaId = "";
+ try {
+ MultipartFile file = createFileItem(APP_IMAGE_URL, APP_IMAGE_NAME);
+ appMediaId = uploadFile(file, accessToken);
+ } catch (Exception e) {
+ log.error("上传临时图片素材失败,错误原因：" + e.getMessage());
+ }
+ return appMediaId;
+ }
+
+ /**
+ * 微信小程序临时素材上传
+ *
+ * @param file
+ * @return
+ * @throws Exception
+ * @author yixiu
+ */
+ public String uploadFile(MultipartFile file, String access_token) throws Exception {
+ String url = "https://api.weixin.qq.com/cgi-bin/media/upload?access_token=" + access_token + "&type=image";
+ String result = null;
+ String fileName = file.getOriginalFilename();
+ URL urlObj = new URL(url);
+ HttpURLConnection con = (HttpURLConnection) urlObj.openConnection();
+ con.setRequestMethod("POST");
+ con.setDoInput(true);
+ con.setDoOutput(true);
+ con.setUseCaches(false);
+ // 设置请求头信息
+ con.setRequestProperty("Connection", "Keep-Alive");
+ con.setRequestProperty("Charset", "UTF-8");
+ // 设置边界
+ String BOUNDARY = "----------" + System.currentTimeMillis();
+ con.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + BOUNDARY);
+ // 请求正文信息
+ // 第一部分：
+ StringBuilder sb = new StringBuilder();
+ sb.append("--"); // 必须多两道线
+ sb.append(BOUNDARY);
+ sb.append("\r\n");
+ sb.append("Content-Disposition: form-data;name=\"media\";filename=\"" + fileName + "\"\r\n");
+ sb.append("Content-Type:application/octet-stream\r\n\r\n");
+ byte[] head = sb.toString().getBytes(StandardCharsets.UTF_8);
+ // 获得输出流
+ OutputStream out = new DataOutputStream(con.getOutputStream());
+ // 输出表头
+ out.write(head);
+ // 文件正文部分
+ // 把文件已流文件的方式 推入到url中
+ DataInputStream in = new DataInputStream(file.getInputStream());
+ int bytes = 0;
+ byte[] bufferOut = new byte[1024];
+ while ((bytes = in.read(bufferOut)) != -1) {
+ out.write(bufferOut, 0, bytes);
+ }
+ in.close();
+ // 结尾部分
+ byte[] foot = ("\r\n--" + BOUNDARY + "--\r\n").getBytes(StandardCharsets.UTF_8);// 定义最后数据分隔线
+ out.write(foot);
+ out.flush();
+ out.close();
+ StringBuffer buffer = new StringBuffer();
+ BufferedReader reader = null;
+ try {
+ // 定义BufferedReader输入流来读取URL的响应
+ reader = new BufferedReader(new InputStreamReader(con.getInputStream()));
+ String line = null;
+ while ((line = reader.readLine()) != null) {
+ buffer.append(line);
+ }
+ if (result == null) {
+ result = buffer.toString();
+ }
+ } catch (IOException e) {
+ System.out.println("发送POST请求出现异常！ {}");
+ e.printStackTrace();
+ throw new IOException("数据读取异常");
+ } finally {
+ if (reader != null) {
+ reader.close();
+ }
+ }
+ // 获取到返回HTTP结果
+ Map<String, Object> map = JSONObject.parseObject(result, Map.class);
+ if (map.containsKey("media_id")) {
+ return map.get("media_id").toString();
+ }
+ System.out.println("小程序上传临时素材出错，返回信息为： " + result);
+ return null;
+ }
+
+ @PostConstruct
+ public void init() {
+ wxXCXTempSend = this;
+ wxXCXTempSend.redisTemplate = this.redisTemplate;
+ wxXCXTempSend.stringRedisTemplate = this.stringRedisTemplate;
+ wxXCXTempSend.redisUtils = this.redisUtils;
+
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/wx/WXPayConstants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/wx/WXPayConstants.java
new file mode 100644
index 0000000..ba798dd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/wx/WXPayConstants.java
@@ -0,0 +1,59 @@
+package com.panzhihua.common.utlis.wx;
+
+import org.apache.http.client.HttpClient;
+
+/**
+ * 常量
+ */
+public class WXPayConstants {
+
+ public enum SignType {
+ MD5, HMACSHA256
+ }
+
+ public static final String DOMAIN_API = "api.mch.weixin.qq.com";
+ public static final String DOMAIN_API2 = "api2.mch.weixin.qq.com";
+ public static final String DOMAIN_APIHK = "apihk.mch.weixin.qq.com";
+ public static final String DOMAIN_APIUS = "apius.mch.weixin.qq.com";
+
+
+ public static final String FAIL = "FAIL";
+ public static final String SUCCESS = "SUCCESS";
+ public static final String HMACSHA256 = "HMAC-SHA256";
+ public static final String MD5 = "MD5";
+
+ public static final String FIELD_SIGN = "sign";
+ public static final String FIELD_SIGN_TYPE = "sign_type";
+
+ public static final String WXPAYSDK_VERSION = "WXPaySDK/3.0.9";
+ public static final String USER_AGENT = WXPAYSDK_VERSION +
+ " (" + System.getProperty("os.arch") + " " + System.getProperty("os.name") + " " + System.getProperty("os.version") +
+ ") Java/" + System.getProperty("java.version") + " HttpClient/" + HttpClient.class.getPackage().getImplementationVersion();
+
+ public static final String MICROPAY_URL_SUFFIX = "/pay/micropay";
+ public static final String UNIFIEDORDER_URL_SUFFIX = "/pay/unifiedorder";
+ public static final String ORDERQUERY_URL_SUFFIX = "/pay/orderquery";
+ public static final String REVERSE_URL_SUFFIX = "/secapi/pay/reverse";
+ public static final String CLOSEORDER_URL_SUFFIX = "/pay/closeorder";
+ public static final String REFUND_URL_SUFFIX = "/secapi/pay/refund";
+ public static final String REFUNDQUERY_URL_SUFFIX = "/pay/refundquery";
+ public static final String DOWNLOADBILL_URL_SUFFIX = "/pay/downloadbill";
+ public static final String REPORT_URL_SUFFIX = "/payitil/report";
+ public static final String SHORTURL_URL_SUFFIX = "/tools/shorturl";
+ public static final String AUTHCODETOOPENID_URL_SUFFIX = "/tools/authcodetoopenid";
+
+ // sandbox
+ public static final String SANDBOX_MICROPAY_URL_SUFFIX = "/sandboxnew/pay/micropay";
+ public static final String SANDBOX_UNIFIEDORDER_URL_SUFFIX = "/sandboxnew/pay/unifiedorder";
+ public static final String SANDBOX_ORDERQUERY_URL_SUFFIX = "/sandboxnew/pay/orderquery";
+ public static final String SANDBOX_REVERSE_URL_SUFFIX = "/sandboxnew/secapi/pay/reverse";
+ public static final String SANDBOX_CLOSEORDER_URL_SUFFIX = "/sandboxnew/pay/closeorder";
+ public static final String SANDBOX_REFUND_URL_SUFFIX = "/sandboxnew/secapi/pay/refund";
+ public static final String SANDBOX_REFUNDQUERY_URL_SUFFIX = "/sandboxnew/pay/refundquery";
+ public static final String SANDBOX_DOWNLOADBILL_URL_SUFFIX = "/sandboxnew/pay/downloadbill";
+ public static final String SANDBOX_REPORT_URL_SUFFIX = "/sandboxnew/payitil/report";
+ public static final String SANDBOX_SHORTURL_URL_SUFFIX = "/sandboxnew/tools/shorturl";
+ public static final String SANDBOX_AUTHCODETOOPENID_URL_SUFFIX = "/sandboxnew/tools/authcodetoopenid";
+
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/wx/WXPayUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/wx/WXPayUtil.java
new file mode 100644
index 0000000..c5e33c6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/wx/WXPayUtil.java
@@ -0,0 +1,297 @@
+package com.panzhihua.common.utlis.wx;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.security.MessageDigest;
+import java.security.SecureRandom;
+import java.util.*;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import com.panzhihua.common.utlis.wx.WXPayConstants.SignType;
+
+
+public class WXPayUtil {
+
+ private static final String SYMBOLS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+ private static final Random RANDOM = new SecureRandom();
+
+ /**
+ * XML格式字符串转换为Map
+ *
+ * @param strXML XML字符串
+ * @return XML数据转换后的Map
+ * @throws Exception
+ */
+ public static Map<String, String> xmlToMap(String strXML) throws Exception {
+ try {
+ Map<String, String> data = new HashMap<String, String>();
+ DocumentBuilder documentBuilder = WXPayXmlUtil.newDocumentBuilder();
+ InputStream stream = new ByteArrayInputStream(strXML.getBytes("UTF-8"));
+ org.w3c.dom.Document doc = documentBuilder.parse(stream);
+ doc.getDocumentElement().normalize();
+ NodeList nodeList = doc.getDocumentElement().getChildNodes();
+ for (int idx = 0; idx < nodeList.getLength(); ++idx) {
+ Node node = nodeList.item(idx);
+ if (node.getNodeType() == Node.ELEMENT_NODE) {
+ org.w3c.dom.Element element = (org.w3c.dom.Element) node;
+ data.put(element.getNodeName(), element.getTextContent());
+ }
+ }
+ try {
+ stream.close();
+ } catch (Exception ex) {
+ // do nothing
+ }
+ return data;
+ } catch (Exception ex) {
+ WXPayUtil.getLogger().warn("Invalid XML, can not convert to map. Error message: {}. XML content: {}", ex.getMessage(), strXML);
+ throw ex;
+ }
+
+ }
+
+ /**
+ * 将Map转换为XML格式的字符串
+ *
+ * @param data Map类型数据
+ * @return XML格式的字符串
+ * @throws Exception
+ */
+ public static String mapToXml(Map<String, String> data) throws Exception {
+ org.w3c.dom.Document document = WXPayXmlUtil.newDocument();
+ org.w3c.dom.Element root = document.createElement("xml");
+ document.appendChild(root);
+ for (String key: data.keySet()) {
+ String value = data.get(key);
+ if (value == null) {
+ value = "";
+ }
+ value = value.trim();
+ org.w3c.dom.Element filed = document.createElement(key);
+ filed.appendChild(document.createTextNode(value));
+ root.appendChild(filed);
+ }
+ TransformerFactory tf = TransformerFactory.newInstance();
+ Transformer transformer = tf.newTransformer();
+ DOMSource source = new DOMSource(document);
+ transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+ transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+ StringWriter writer = new StringWriter();
+ StreamResult result = new StreamResult(writer);
+ transformer.transform(source, result);
+ String output = writer.getBuffer().toString(); //.replaceAll("\n|\r", "");
+ try {
+ writer.close();
+ }
+ catch (Exception ex) {
+ }
+ return output;
+ }
+
+
+ /**
+ * 生成带有 sign 的 XML 格式字符串
+ *
+ * @param data Map类型数据
+ * @param key API密钥
+ * @return 含有sign字段的XML
+ */
+ public static String generateSignedXml(final Map<String, String> data, String key) throws Exception {
+ return generateSignedXml(data, key, SignType.MD5);
+ }
+
+ /**
+ * 生成带有 sign 的 XML 格式字符串
+ *
+ * @param data Map类型数据
+ * @param key API密钥
+ * @param signType 签名类型
+ * @return 含有sign字段的XML
+ */
+ public static String generateSignedXml(final Map<String, String> data, String key, SignType signType) throws Exception {
+ String sign = generateSignature(data, key, signType);
+ data.put(WXPayConstants.FIELD_SIGN, sign);
+ return mapToXml(data);
+ }
+
+
+ /**
+ * 判断签名是否正确
+ *
+ * @param xmlStr XML格式数据
+ * @param key API密钥
+ * @return 签名是否正确
+ * @throws Exception
+ */
+ public static boolean isSignatureValid(String xmlStr, String key) throws Exception {
+ Map<String, String> data = xmlToMap(xmlStr);
+ if (!data.containsKey(WXPayConstants.FIELD_SIGN) ) {
+ return false;
+ }
+ String sign = data.get(WXPayConstants.FIELD_SIGN);
+ return generateSignature(data, key).equals(sign);
+ }
+
+ /**
+ * 判断签名是否正确，必须包含sign字段，否则返回false。使用MD5签名。
+ *
+ * @param data Map类型数据
+ * @param key API密钥
+ * @return 签名是否正确
+ * @throws Exception
+ */
+ public static boolean isSignatureValid(Map<String, String> data, String key) throws Exception {
+ return isSignatureValid(data, key, SignType.MD5);
+ }
+
+ /**
+ * 判断签名是否正确，必须包含sign字段，否则返回false。
+ *
+ * @param data Map类型数据
+ * @param key API密钥
+ * @param signType 签名方式
+ * @return 签名是否正确
+ * @throws Exception
+ */
+ public static boolean isSignatureValid(Map<String, String> data, String key, SignType signType) throws Exception {
+ if (!data.containsKey(WXPayConstants.FIELD_SIGN) ) {
+ return false;
+ }
+ String sign = data.get(WXPayConstants.FIELD_SIGN);
+ return generateSignature(data, key, signType).equals(sign);
+ }
+
+ /**
+ * 生成签名
+ *
+ * @param data 待签名数据
+ * @param key API密钥
+ * @return 签名
+ */
+ public static String generateSignature(final Map<String, String> data, String key) throws Exception {
+ return generateSignature(data, key, SignType.MD5);
+ }
+
+ /**
+ * 生成签名. 注意，若含有sign_type字段，必须和signType参数保持一致。
+ *
+ * @param data 待签名数据
+ * @param key API密钥
+ * @param signType 签名方式
+ * @return 签名
+ */
+ public static String generateSignature(final Map<String, String> data, String key, SignType signType) throws Exception {
+ Set<String> keySet = data.keySet();
+ String[] keyArray = keySet.toArray(new String[keySet.size()]);
+ Arrays.sort(keyArray);
+ StringBuilder sb = new StringBuilder();
+ for (String k : keyArray) {
+ if (k.equals(WXPayConstants.FIELD_SIGN)) {
+ continue;
+ }
+ if (data.get(k).trim().length() > 0) // 参数值为空，则不参与签名
+ sb.append(k).append("=").append(data.get(k).trim()).append("&");
+ }
+ sb.append("key=").append(key);
+ if (SignType.MD5.equals(signType)) {
+ return MD5(sb.toString()).toUpperCase();
+ }
+ else if (SignType.HMACSHA256.equals(signType)) {
+ return HMACSHA256(sb.toString(), key);
+ }
+ else {
+ throw new Exception(String.format("Invalid sign_type: %s", signType));
+ }
+ }
+
+
+ /**
+ * 获取随机字符串 Nonce Str
+ *
+ * @return String 随机字符串
+ */
+ public static String generateNonceStr() {
+ char[] nonceChars = new char[32];
+ for (int index = 0; index < nonceChars.length; ++index) {
+ nonceChars[index] = SYMBOLS.charAt(RANDOM.nextInt(SYMBOLS.length()));
+ }
+ return new String(nonceChars);
+ }
+
+
+ /**
+ * 生成 MD5
+ *
+ * @param data 待处理数据
+ * @return MD5结果
+ */
+ public static String MD5(String data) throws Exception {
+ MessageDigest md = MessageDigest.getInstance("MD5");
+ byte[] array = md.digest(data.getBytes("UTF-8"));
+ StringBuilder sb = new StringBuilder();
+ for (byte item : array) {
+ sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
+ }
+ return sb.toString().toUpperCase();
+ }
+
+ /**
+ * 生成 HMACSHA256
+ * @param data 待处理数据
+ * @param key 密钥
+ * @return 加密结果
+ * @throws Exception
+ */
+ public static String HMACSHA256(String data, String key) throws Exception {
+ Mac sha256_HMAC = Mac.getInstance("HmacSHA256");
+ SecretKeySpec secret_key = new SecretKeySpec(key.getBytes("UTF-8"), "HmacSHA256");
+ sha256_HMAC.init(secret_key);
+ byte[] array = sha256_HMAC.doFinal(data.getBytes("UTF-8"));
+ StringBuilder sb = new StringBuilder();
+ for (byte item : array) {
+ sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
+ }
+ return sb.toString().toUpperCase();
+ }
+
+ /**
+ * 日志
+ * @return
+ */
+ public static Logger getLogger() {
+ Logger logger = LoggerFactory.getLogger("wxpay java sdk");
+ return logger;
+ }
+
+ /**
+ * 获取当前时间戳，单位秒
+ * @return
+ */
+ public static long getCurrentTimestamp() {
+ return System.currentTimeMillis()/1000;
+ }
+
+ /**
+ * 获取当前时间戳，单位毫秒
+ * @return
+ */
+ public static long getCurrentTimestampMs() {
+ return System.currentTimeMillis();
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/wx/WXPayXmlUtil.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/wx/WXPayXmlUtil.java
new file mode 100644
index 0000000..a2e34bd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/wx/WXPayXmlUtil.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.utlis.wx;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.w3c.dom.Document;
+
+/**
+ * 2018/7/3
+ */
+public final class WXPayXmlUtil {
+ public static DocumentBuilder newDocumentBuilder() throws ParserConfigurationException {
+ DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+ documentBuilderFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+ documentBuilderFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+ documentBuilderFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+ documentBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+ documentBuilderFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+ documentBuilderFactory.setXIncludeAware(false);
+ documentBuilderFactory.setExpandEntityReferences(false);
+
+ return documentBuilderFactory.newDocumentBuilder();
+ }
+
+ public static Document newDocument() throws ParserConfigurationException {
+ return newDocumentBuilder().newDocument();
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/validated/AddGroup.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/validated/AddGroup.java
new file mode 100644
index 0000000..f903244
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/validated/AddGroup.java
@@ -0,0 +1,9 @@
+package com.panzhihua.common.validated;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 新增校验组
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-18 17:35
+ **/
+public interface AddGroup {}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/validated/PageGroup.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/validated/PageGroup.java
new file mode 100644
index 0000000..4bc32fb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/validated/PageGroup.java
@@ -0,0 +1,9 @@
+package com.panzhihua.common.validated;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 分页校验
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-30 13:47
+ **/
+public interface PageGroup {}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/validated/PutGroup.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/validated/PutGroup.java
new file mode 100644
index 0000000..9f72a66
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/validated/PutGroup.java
@@ -0,0 +1,9 @@
+package com.panzhihua.common.validated;
+
+/**
+ * @program: springcloud_k8s_panzhihuazhihuishequ
+ * @description: 修改
+ * @author: huang.hongfa weixin hhf9596 qq 959656820
+ * @create: 2020-12-23 15:02
+ **/
+public interface PutGroup {}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/.gitignore b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/.mvn/wrapper/MavenWrapperDownloader.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 0000000..a45eb6b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+ private static final String WRAPPER_VERSION = "0.5.6";
+ /**
+ * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+ */
+ private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+ + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+ /**
+ * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+ * use instead of the default one.
+ */
+ private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+ ".mvn/wrapper/maven-wrapper.properties";
+
+ /**
+ * Path where the maven-wrapper.jar will be saved to.
+ */
+ private static final String MAVEN_WRAPPER_JAR_PATH =
+ ".mvn/wrapper/maven-wrapper.jar";
+
+ /**
+ * Name of the property which should be used to override the default download url for the wrapper.
+ */
+ private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+ public static void main(String args[]) {
+ System.out.println("- Downloader started");
+ File baseDirectory = new File(args[0]);
+ System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+ // If the maven-wrapper.properties exists, read it and check if it contains a custom
+ // wrapperUrl parameter.
+ File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+ String url = DEFAULT_DOWNLOAD_URL;
+ if (mavenWrapperPropertyFile.exists()) {
+ FileInputStream mavenWrapperPropertyFileInputStream = null;
+ try {
+ mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+ Properties mavenWrapperProperties = new Properties();
+ mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+ url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+ } catch (IOException e) {
+ System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+ } finally {
+ try {
+ if (mavenWrapperPropertyFileInputStream != null) {
+ mavenWrapperPropertyFileInputStream.close();
+ }
+ } catch (IOException e) {
+ // Ignore ...
+ }
+ }
+ }
+ System.out.println("- Downloading from: " + url);
+
+ File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+ if (!outputFile.getParentFile().exists()) {
+ if (!outputFile.getParentFile().mkdirs()) {
+ System.out.println(
+ "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+ }
+ }
+ System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+ try {
+ downloadFileFromURL(url, outputFile);
+ System.out.println("Done");
+ System.exit(0);
+ } catch (Throwable e) {
+ System.out.println("- Error downloading");
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+ private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+ if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+ String username = System.getenv("MVNW_USERNAME");
+ char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+ Authenticator.setDefault(new Authenticator() {
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(username, password);
+ }
+ });
+ }
+ URL website = new URL(urlString);
+ ReadableByteChannel rbc;
+ rbc = Channels.newChannel(website.openStream());
+ FileOutputStream fos = new FileOutputStream(destination);
+ fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+ fos.close();
+ rbc.close();
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/.mvn/wrapper/maven-wrapper.jar b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..2cc7d4a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/.mvn/wrapper/maven-wrapper.jar
Binary files differ
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/.mvn/wrapper/maven-wrapper.properties b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..642d572
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/mvnw b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/mvnw
new file mode 100644
index 0000000..a16b543
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/mvnw
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ -n "$MVNW_REPOURL" ]; then
+ jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ else
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+ fi
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+ fi
+
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/mvnw.cmd b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/mvnw.cmd
new file mode 100644
index 0000000..c8d4337
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/mvnw.cmd
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/pom.xml b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/pom.xml
new file mode 100644
index 0000000..27f0c0e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/pom.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.panzhihua</groupId>
+ <artifactId>zhihuishequ</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <groupId>com.panzhihua</groupId>
+ <artifactId>community_backstage</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>community_backstage</name>
+ <description>社区后台</description>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-config</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-openfeign</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.panzhihua</groupId>
+ <artifactId>common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.netflix.hystrix</groupId>
+ <artifactId>hystrix-javanica</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>swagger-bootstrap-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.github.kmood</groupId>
+ <artifactId>officeexport-java</artifactId>
+ <version>1.0.1.6-RELEASE</version>
+ </dependency>
+ <!--添加监控依赖包-->
+ <dependency>
+ <groupId>io.micrometer</groupId>
+ <artifactId>micrometer-registry-prometheus</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+ <!--minio文件存储-->
+ <dependency>
+ <groupId>io.minio</groupId>
+ <artifactId>minio</artifactId>
+ <version>6.0.8</version>
+ </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.jxls</groupId>-->
+<!-- <artifactId>jxls</artifactId>-->
+<!-- <version>2.6.0</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.jxls</groupId>-->
+<!-- <artifactId>jxls-poi</artifactId>-->
+<!-- <version>1.1.0</version>-->
+<!-- </dependency>-->
+ <!-- 图片验证码 -->
+ <dependency>
+ <groupId>com.github.penggle</groupId>
+ <artifactId>kaptcha</artifactId>
+ <version>2.3.2</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>2.5.0</version>
+ <configuration>
+ <mainClass>com.panzhihua.community_backstage.CommunityBackstageApplication</mainClass>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>1.2.0</version>
+ <configuration>
+ <imageName>registry.cn-chengdu.aliyuncs.com/panzhihua/community_backstage:v1</imageName>
+ <serverId></serverId>
+ <baseImage>java</baseImage>
+ <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
+ <resources>
+ <resource>
+ <targetPath>/</targetPath>
+ <directory>${project.build.directory}</directory>
+ <include>${project.build.finalName}.jar</include>
+ </resource>
+ </resources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>spring-snapshots</id>
+ <name>Spring Snapshots</name>
+ <url>https://repo.spring.io/snapshot</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>spring-milestones</id>
+ <name>Spring Milestones</name>
+ <url>https://repo.spring.io/milestone</url>
+ </repository>
+ </repositories>
+
+</project>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/CommunityBackstageApplication.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/CommunityBackstageApplication.java
new file mode 100644
index 0000000..8397884
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/CommunityBackstageApplication.java
@@ -0,0 +1,28 @@
+package com.panzhihua.community_backstage;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+
+import org.springframework.scheduling.annotation.EnableAsync;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@EnableCaching
+@EnableSwagger2
+@SpringCloudApplication
+@EnableCircuitBreaker
+@EnableEurekaClient
+@EnableFeignClients(basePackages = {"com.panzhihua.common.service"})
+@ComponentScan({"com.panzhihua.community_backstage", "com.panzhihua.common"})
+@EnableAsync
+public class CommunityBackstageApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(CommunityBackstageApplication.class, args);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/aop/OperLogAspect.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/aop/OperLogAspect.java
new file mode 100644
index 0000000..9072a12
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/aop/OperLogAspect.java
@@ -0,0 +1,308 @@
+package com.panzhihua.community_backstage.aop;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.constants.TokenConstant;
+import com.panzhihua.common.interfaces.OperLog;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.user.SysOperLogVO;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.AES;
+import com.panzhihua.common.utlis.IPUtil;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 切面处理类，操作日志异常日志记录处理
+ *
+ * @author wu
+ * @date 2019/03/21
+ */
+@Slf4j
+@Aspect
+@Component
+public class OperLogAspect {
+
+ @Resource
+ private UserService userService;
+
+ /**
+ * 设置操作日志切入点 记录操作日志 在注解的位置切入代码
+ */
+ @Pointcut("@annotation(com.panzhihua.common.interfaces.OperLog)")
+ public void operLogPoinCut() {}
+
+ // /**
+ // * 设置操作异常切入点记录异常日志 扫描所有controller包下操作
+ // */
+ // @Pointcut("execution(* com.hyd.zcar.cms.controller..*.*(..))")
+ // public void operExceptionLogPoinCut() {
+ // }
+
+ /**
+ * 正常返回通知，拦截用户操作日志，连接点正常执行完成后执行， 如果连接点抛出异常，则不会执行
+ *
+ * @param joinPoint
+ * 切入点
+ * @param keys
+ * 返回结果
+ */
+ @AfterReturning(value = "operLogPoinCut()", returning = "keys")
+ public void saveOperLog(JoinPoint joinPoint, Object keys) {
+ log.info("进入切面");
+ // 获取RequestAttributes
+ RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+ // 从获取RequestAttributes中获取HttpServletRequest的信息
+ HttpServletRequest request =
+ (HttpServletRequest)requestAttributes.resolveReference(RequestAttributes.REFERENCE_REQUEST);
+ // 登录对象信息
+ String userInfo = request.getHeader(TokenConstant.TOKEN_USERINFO);
+ boolean empty = ObjectUtils.isEmpty(userInfo);
+ if (empty) {
+ log.error("操作日志获取登录用户信息失败【{}】", joinPoint);
+ return;
+ }
+ byte[] bytes = AES.parseHexStr2Byte(userInfo);
+ byte[] decrypt = AES.decrypt(bytes, Constants.AES_KEY);
+ userInfo = new String(decrypt);
+ LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(userInfo, LoginUserInfoVO.class);
+ SysOperLogVO operlog = new SysOperLogVO();
+ try {
+
+ // 从切面织入点处通过反射机制获取织入点处的方法
+ MethodSignature signature = (MethodSignature)joinPoint.getSignature();
+ // 获取切入点所在的方法
+ Method method = signature.getMethod();
+ // 获取操作
+ OperLog opLog = method.getAnnotation(OperLog.class);
+ if (opLog != null) {
+ String operModul = opLog.operModul();
+ int operType = opLog.operType();
+ operlog.setTitle(operModul); // 操作模块
+ operlog.setBusinessType(operType); // 操作类型
+ }
+ // 获取请求的类名
+ String className = joinPoint.getTarget().getClass().getName();
+ // 获取请求的方法名
+ String methodName = method.getName();
+ methodName = className + "." + methodName;
+
+ operlog.setMethod(methodName); // 请求方法
+
+ if (joinPoint.getArgs().length > 0) {
+ for (Object o : joinPoint.getArgs()) {
+ if (o instanceof HttpServletRequest || o instanceof HttpServletResponse|| o instanceof MultipartFile) {
+ continue;
+ }
+ operlog.setOperParam(JSONObject.toJSONString(o)); // 请求参数
+ }
+ }
+
+ operlog.setJsonResult(JSONObject.toJSONString(keys)); // 返回结果
+ operlog.setAccount(loginUserInfoVO.getAccount());
+ operlog.setOperName(loginUserInfoVO.getName()); // 请求用户名称
+ operlog.setOperIp(IPUtil.getIpAddress(request)); // 请求IP
+ operlog.setOperUrl(request.getRequestURI()); // 请求URI
+ operlog.setRequestMethod(request.getMethod());
+ operlog.setOperLocation(IPUtil.getIpBelongAddress(request));
+ operlog.setOperTime(new Date()); // 创建时间
+ operlog.setAccount(loginUserInfoVO.getAccount());
+ Long communityId = loginUserInfoVO.getCommunityId();
+ operlog.setCommunityId(null == communityId ? 0 : communityId);
+ userService.addOperLog(operlog);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ // /**
+ // * 异常返回通知，用于拦截异常日志信息 连接点抛出异常后执行
+ // *
+ // * @param joinPoint 切入点
+ // * @param e 异常信息
+ // */
+ // @AfterThrowing(pointcut = "operExceptionLogPoinCut()", throwing = "e")
+ // public void saveExceptionLog(JoinPoint joinPoint, Throwable e) {
+ // // 获取RequestAttributes
+ // RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+ // // 从获取RequestAttributes中获取HttpServletRequest的信息
+ // HttpServletRequest request = (HttpServletRequest) requestAttributes
+ // .resolveReference(RequestAttributes.REFERENCE_REQUEST);
+ //
+ // ExceptionLog excepLog = new ExceptionLog();
+ // try {
+ // // 从切面织入点处通过反射机制获取织入点处的方法
+ // MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+ // // 获取切入点所在的方法
+ // Method method = signature.getMethod();
+ // excepLog.setExcId(UuidUtil.get32UUID());
+ // // 获取请求的类名
+ // String className = joinPoint.getTarget().getClass().getName();
+ // // 获取请求的方法名
+ // String methodName = method.getName();
+ // methodName = className + "." + methodName;
+ // // 请求的参数
+ // Map<String, String> rtnMap = converMap(request.getParameterMap());
+ // // 将参数所在的数组转换成json
+ // String params = JSON.toJSONString(rtnMap);
+ // excepLog.setExcRequParam(params); // 请求参数
+ // excepLog.setOperMethod(methodName); // 请求方法名
+ // excepLog.setExcName(e.getClass().getName()); // 异常名称
+ // excepLog.setExcMessage(stackTraceToString(e.getClass().getName(), e.getMessage(), e.getStackTrace())); // 异常信息
+ // excepLog.setOperUserId(UserShiroUtil.getCurrentUserLoginName()); // 操作员ID
+ // excepLog.setOperUserName(UserShiroUtil.getCurrentUserName()); // 操作员名称
+ // excepLog.setOperUri(request.getRequestURI()); // 操作URI
+ // excepLog.setOperIp(IPUtil.getRemortIP(request)); // 操作员IP
+ // excepLog.setOperVer(operVer); // 操作版本号
+ // excepLog.setOperCreateTime(new Date()); // 发生异常时间
+ //
+ // exceptionLogService.insert(excepLog);
+ //
+ // } catch (Exception e2) {
+ // e2.printStackTrace();
+ // }
+ //
+ // }
+
+ /**
+ * 转换request 请求参数
+ *
+ * @param paramMap
+ * request获取的参数数组
+ */
+ public Map<String, String> converMap(Map<String, String[]> paramMap) {
+ Map<String, String> rtnMap = new HashMap<String, String>();
+ for (String key : paramMap.keySet()) {
+ rtnMap.put(key, paramMap.get(key)[0]);
+ }
+ return rtnMap;
+ }
+
+ private String getPostData(HttpServletRequest request) {
+ StringBuffer data = new StringBuffer();
+ String line = null;
+ BufferedReader reader = null;
+ try {
+ reader = request.getReader();
+ while (null != (line = reader.readLine()))
+ data.append(line);
+ } catch (IOException e) {
+ } finally {
+ }
+ return data.toString();
+ }
+
+ /**
+ * 转换异常信息为字符串
+ *
+ * @param exceptionName
+ * 异常名称
+ * @param exceptionMessage
+ * 异常信息
+ * @param elements
+ * 堆栈信息
+ */
+ public String stackTraceToString(String exceptionName, String exceptionMessage, StackTraceElement[] elements) {
+ StringBuffer strbuff = new StringBuffer();
+ for (StackTraceElement stet : elements) {
+ strbuff.append(stet + "\n");
+ }
+ String message = exceptionName + ":" + exceptionMessage + "\n\t" + strbuff.toString();
+ return message;
+ }
+
+ /**
+ * 前置通知，仅在修改防疫相关数据时生成日志记录
+ * */
+ @Before(value = "operLogPoinCut()")
+ public void saveUpdateOperLog(JoinPoint joinPoint){
+ log.info("进入切面---前置通知");
+ // 获取RequestAttributes
+ RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+ // 从获取RequestAttributes中获取HttpServletRequest的信息
+ HttpServletRequest request =
+ (HttpServletRequest)requestAttributes.resolveReference(RequestAttributes.REFERENCE_REQUEST);
+ // 登录对象信息
+ String userInfo = request.getHeader(TokenConstant.TOKEN_USERINFO);
+ boolean empty = ObjectUtils.isEmpty(userInfo);
+ if (empty) {
+ log.error("操作日志获取登录用户信息失败【{}】", joinPoint);
+ return;
+ }
+ byte[] bytes = AES.parseHexStr2Byte(userInfo);
+ byte[] decrypt = AES.decrypt(bytes, Constants.AES_KEY);
+ userInfo = new String(decrypt);
+ LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(userInfo, LoginUserInfoVO.class);
+ SysOperLogVO operlog = new SysOperLogVO();
+ try {
+ // 从切面织入点处通过反射机制获取织入点处的方法
+ MethodSignature signature = (MethodSignature)joinPoint.getSignature();
+ // 获取切入点所在的方法
+ Method method = signature.getMethod();
+ OperLog opLog = method.getAnnotation(OperLog.class);
+ // 获取操作
+ if (opLog != null) {
+ if (opLog.businessType().equals("")){
+ return;
+ }
+ String operModul = opLog.operModul();
+ int operType = opLog.operType();
+ operlog.setTitle(operModul); // 操作模块
+ operlog.setBusinessType(operType); // 操作类型
+ }
+ // 获取请求的类名
+ String className = joinPoint.getTarget().getClass().getName();
+ // 获取请求的方法名
+ String methodName = method.getName();
+ methodName = className + "." + methodName;
+
+ operlog.setMethod(methodName); // 请求方法
+
+ if (joinPoint.getArgs().length > 0) {
+ for (Object o : joinPoint.getArgs()) {
+ if (o instanceof HttpServletRequest || o instanceof HttpServletResponse || o instanceof MultipartFile) {
+ continue;
+ }
+ operlog.setOperParam(JSONObject.toJSONString(o)); // 请求参数
+ }
+ }
+ //operlog.setJsonResult(JSONObject.toJSONString(keys)); // 返回结果
+ operlog.setAccount(loginUserInfoVO.getAccount());
+ operlog.setOperName(loginUserInfoVO.getName()); // 请求用户名称
+ operlog.setOperIp(IPUtil.getIpAddress(request)); // 请求IP
+ operlog.setOperUrl(request.getRequestURI()); // 请求URI
+ operlog.setRequestMethod(request.getMethod());
+ operlog.setOperLocation(IPUtil.getIpBelongAddress(request));
+ operlog.setOperTime(new Date()); // 创建时间
+ operlog.setAccount(loginUserInfoVO.getAccount());
+ Long communityId = loginUserInfoVO.getCommunityId();
+ operlog.setCommunityId(null == communityId ? 0 : communityId);
+ userService.addOperLog(operlog);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/aop/RenheAssemblyUtils.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/aop/RenheAssemblyUtils.java
new file mode 100644
index 0000000..5d9f019
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/aop/RenheAssemblyUtils.java
@@ -0,0 +1,275 @@
+package com.panzhihua.community_backstage.aop;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.DatatypeConverter;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.StringUtils;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author lyq 前端H5组件库工具类
+ */
+@Slf4j
+@Component
+public class RenheAssemblyUtils {
+
+ @Autowired
+ private CommunityService communityService;
+
+ private static List<String> automaticDataCompletion(List<String> chooseList, String selected) {
+ if (chooseList == null) {
+ chooseList = new ArrayList<>();
+ chooseList.add("是");
+ chooseList.add("否");
+ }
+ List<String> list = new ArrayList<>();
+ for (String item : chooseList) {
+ if (item.equals(selected)) {
+ list.add("√");
+ } else {
+ list.add("");
+ }
+ }
+ return list;
+ }
+
+ /**
+ * 数据转换--登记明细用户填写答案导出数据格式转换
+ *
+ * @param answerContentVOList
+ * 用户答题记录
+ * @return 用户填写答案数据
+ */
+ public List<List<Object>> ReserveData(List<ComActQuestnaireAnswerContentVO> answerContentVOList) {
+ // 结果数据集合
+ List<List<Object>> resultList = new ArrayList<>();
+ // 构建单个用户数据
+ List<Object> userData = new ArrayList<>();
+
+ String noExport = "以上信息仅用于";
+ // 遍历答案列表
+ Long reserveRecordId = 0L;
+ Long reserveSubId = 0L;
+ Boolean isOldDuo = false;
+ StringBuffer sb = new StringBuffer();
+ if (answerContentVOList != null && answerContentVOList.size() > 0) {
+ int a = 0;
+ for (ComActQuestnaireAnswerContentVO userAnswers : answerContentVOList) {
+ a++;
+ if (answerContentVOList.size() == 26 && a == 9) {
+ userData.add(" ");
+ }
+ // 判断是文字描述直接跳过
+ if (userAnswers.getOptionType().equals(5) || (StringUtils.isNotEmpty(userAnswers.getAnswerContent())
+ && userAnswers.getAnswerContent().contains(noExport))) {
+ continue;
+ }
+ // 判断reserveRecordId为空则为第一条记录,默认加上昵称和灯谜是
+ if (reserveRecordId.equals(0L)) {
+ reserveRecordId = userAnswers.getReserveRecordId();
+ // userData.add(userAnswers.getNickName());
+ // userData.add(DateUtils.format(userAnswers.getTime(), DateUtils.ymdhms_format));
+ }
+ // 根据reserveRecordId判断是否是第二条填报记录
+ if (!reserveRecordId.equals(userAnswers.getReserveRecordId())) {
+ reserveSubId = 0L;
+
+ if (isOldDuo) {
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ isOldDuo = false;
+ }
+ userData.add(0, " ");
+ userData.add(1, " ");
+ userData.add(2, " ");
+ userData.add(28, " ");
+ resultList.add(userData);
+ userData = new ArrayList<>();
+ reserveRecordId = userAnswers.getReserveRecordId();
+ // userData.add(userAnswers.getNickName());
+ // userData.add(DateUtils.format(userAnswers.getTime(), DateUtils.ymdhms_format));
+ if (StringUtils.isNotEmpty(userAnswers.getAnswerContent())) {
+ userData.add(userAnswers.getAnswerContent());
+ } else {
+ userData.add(" ");
+ }
+ } else {
+ if (reserveSubId.equals(0L)) {
+ reserveSubId = userAnswers.getReserveSubId();
+ }
+
+ if (!reserveSubId.equals(userAnswers.getReserveSubId())) {
+ reserveSubId = userAnswers.getReserveSubId();
+
+ // 如果是承诺字段则不导出
+ if (StringUtils.isNotEmpty(userAnswers.getAnswerContent())
+ && userAnswers.getAnswerContent().contains(noExport)) {
+ continue;
+ }
+
+ // 判断当前的组件类型是否是图片上传，导出时需要导出图片
+ if (userAnswers.getOptionType().equals(11)) {
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ if (StringUtils.isNotEmpty(userAnswers.getAnswerContent())) {
+ userData.add(new URL(userAnswers.getAnswerContent()));
+ // userData.add(new
+ // File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6)));
+ } else {
+ userData.add(" ");
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ userData.add(" ");
+ log.error("导出转换图片失败！" + "/workspace/minio/data/files/" + userAnswers.getAnswerContent()
+ .substring(userAnswers.getAnswerContent().indexOf("files/") + 6));
+ }
+ continue;
+ }
+ // 如果是多选
+ if (userAnswers.getOptionType().equals(1)) {
+ List<String> selectionList =
+ communityService.subjectSelectionListAdmin(userAnswers.getReserveSubId());
+ List<String> completionList =
+ automaticDataCompletion(selectionList, userAnswers.getAnswerContent());
+ userData.addAll(completionList);
+ continue;
+ }
+ // 如果是单选
+ if (userAnswers.getOptionType().equals(0)) {
+ if (userAnswers.getAnswerContent().equals("男")
+ || userAnswers.getAnswerContent().equals("女")) {
+
+ } else {
+ List<String> completionList =
+ automaticDataCompletion(null, userAnswers.getAnswerContent());
+ userData.addAll(completionList);
+ continue;
+ }
+ }
+ // 判断当前组件类型是否签名
+ if (userAnswers.getOptionType().equals(12)) {
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent()
+ .substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
+ } catch (Exception e) {
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
+
+ if (userAnswers.getOptionType().equals(1)) {
+ isOldDuo = true;
+ sb.append(
+ userAnswers.getAnswerContent() == null ? "无" : userAnswers.getAnswerContent() + ",");
+ continue;
+ } else {
+ if (isOldDuo) {
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }
+ isOldDuo = false;
+ }
+ sb.append(userAnswers.getAnswerContent() == null ? "无" : userAnswers.getAnswerContent() + ",");
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ } else {
+ // 如果是承诺字段则不导出
+ if (StringUtils.isNotEmpty(userAnswers.getAnswerContent())
+ && userAnswers.getAnswerContent().contains(noExport)) {
+ continue;
+ }
+ // 判断当前的组件类型是否是图片上传，导出时需要导出图片
+ if (userAnswers.getOptionType().equals(11)) {
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ userData.add(new URL(userAnswers.getAnswerContent()));
+ } catch (Exception e) {
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
+ // 如果是多选
+ if (userAnswers.getOptionType().equals(1)) {
+ List<String> selectionList =
+ communityService.subjectSelectionListAdmin(userAnswers.getReserveSubId());
+ List<String> completionList =
+ automaticDataCompletion(selectionList, userAnswers.getAnswerContent());
+ userData.addAll(completionList);
+ continue;
+ }
+ // 如果是单选
+ if (userAnswers.getOptionType().equals(0)) {
+ if (userAnswers.getAnswerContent().equals("男")
+ || userAnswers.getAnswerContent().equals("女")) {
+
+ } else {
+ List<String> completionList =
+ automaticDataCompletion(null, userAnswers.getAnswerContent());
+ userData.addAll(completionList);
+ continue;
+ }
+ }
+ // 判断当前组件类型是否签名
+ if (userAnswers.getOptionType().equals(12)) {
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ // userData.add(new
+ // URL("http://image.panzhihua.nhys.cdnhxx.com//idcard/967dbdef3ef3465a9169fbea204f9aa7.jpg"));
+ userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent()
+ .substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
+ } catch (Exception e) {
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
+ if (userAnswers.getOptionType().equals(1)) {
+ isOldDuo = true;
+ sb.append(
+ userAnswers.getAnswerContent() == null ? "无" : userAnswers.getAnswerContent() + ",");
+ continue;
+ } else {
+ if (isOldDuo) {
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }
+ isOldDuo = false;
+ }
+ sb.append(userAnswers.getAnswerContent() == null ? "无" : userAnswers.getAnswerContent() + ",");
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }
+ }
+ }
+ if (isOldDuo) {
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ }
+
+ userData.add(0, " ");
+ userData.add(1, " ");
+ userData.add(2, " ");
+ userData.add(28, " ");
+ resultList.add(userData);
+ }
+ return resultList;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ActDynTypeApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ActDynTypeApi.java
new file mode 100644
index 0000000..6a87c46
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ActDynTypeApi.java
@@ -0,0 +1,86 @@
+package com.panzhihua.community_backstage.api;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.validation.annotation.Validated;
+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 com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
+import com.panzhihua.common.model.dtos.community.EditComActDynTypeDTO;
+import com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActDynTypeVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+import static java.util.Objects.isNull;
+
+@Slf4j
+@Api(tags = {"社区动态分类模块"})
+@RestController
+@RequestMapping("/dyn/type/")
+public class ActDynTypeApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "分页查询社区动态列表", response = ComActDynTypeVO.class)
+ @PostMapping("/page")
+ public R page(@RequestBody PageComActDynTypeDTO comActDynTypeDTO) {
+ if (isNull(comActDynTypeDTO.getCommunityId())) {
+ comActDynTypeDTO.setCommunityId(this.getCommunityId()+"");
+ }
+
+ return communityService.pageDynTypeByAdmin(comActDynTypeDTO);
+ }
+
+ @ApiOperation(value = "查询社区动态分类列表", response = ComActDynTypeVO.class)
+ @PostMapping("/list")
+ public R list(@RequestBody PageComActDynTypeDTO comActDynTypeDTO)
+ {
+ if(StringUtils.isEmpty(comActDynTypeDTO.getCommunityId()))
+ {
+ Long communityId = this.getCommunityId();
+ comActDynTypeDTO.setCommunityId(communityId+"");
+ }
+ return communityService.getDynTypeListByAdmin(comActDynTypeDTO);
+ }
+
+ @ApiOperation(value = "新增社区动态分类")
+ @PostMapping("/add")
+ public R add(@Validated @RequestBody AddComActDynTypeDTO comActDynTypeDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ comActDynTypeDTO.setCommunityId(loginUserInfo.getCommunityId());
+ comActDynTypeDTO.setUserId(loginUserInfo.getUserId());
+ return communityService.addDynTypeByAdmin(comActDynTypeDTO);
+ }
+
+ @ApiOperation(value = "编辑社区动态分类")
+ @PostMapping("/edit")
+ public R add(@Validated @RequestBody EditComActDynTypeDTO comActDynTypeDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ comActDynTypeDTO.setUserId(loginUserInfo.getUserId());
+ return communityService.editDynTypeByAdmin(comActDynTypeDTO);
+ }
+
+ @ApiOperation(value = "删除社区动态分类")
+ @PostMapping("/delete")
+ public R delete(@RequestBody List<Long> ids) {
+ if (ids == null || ids.size() <= 0) {
+ return R.fail("参数错误");
+ }
+ return communityService.deleteDynTypeByAdmin(ids);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BasicScreenApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BasicScreenApi.java
new file mode 100644
index 0000000..5896939
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BasicScreenApi.java
@@ -0,0 +1,166 @@
+package com.panzhihua.community_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
+import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidColorChartsVO;
+import com.panzhihua.common.model.vos.neighbor.ActivityAnalysisVO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentByAdminVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @ClasssName BasicScreenApi
+ * @Description TODO
+ * @Author yh
+ * @Date 2022-11-08 17:25:45
+ * @Version 1.0
+ **/
+@Slf4j
+@RestController
+@RequestMapping("/basicScreen")
+@Api(tags = {"攀枝花市可视化大屏"})
+public class BasicScreenApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+
+ /**
+ * 查询统计基础数据
+ *
+ * @return
+ */
+ @GetMapping("selectBasicData")
+ @ApiOperation(value = "统计基础数据", response = ComBasicDataVo.class)
+ public R selectBasicData() {
+ return communityService.selectBasicData();
+ }
+
+ /**
+ * 统计在职干部特长
+ *
+ * @return
+ */
+ @GetMapping("statisticsPbMemberType")
+ @ApiOperation(value = "在职干部特长")
+ public R statisticsPbMemberType() {
+ return communityService.statisticsPbMemberType();
+ }
+
+
+ /**
+ * 统计大屏查询清单列表
+ *
+ * @param comActNeighborCircleAdminDTO 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("pageNeighborByAdmin")
+ @ApiOperation(value = "清单列表分页", response = ComActNeighborCircleAdminVO.class)
+ public R pageNeighborByBigScreen(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO) {
+ return communityService.pageNeighborByBigScreen(comActNeighborCircleAdminDTO);
+ }
+
+ /**
+ * 单位统计
+ *
+ * @return
+ */
+ @GetMapping("selectUnitByNatureName")
+ @ApiOperation(value = "单位统计")
+ public R selectUnitByNatureName() {
+ return communityService.selectUnitByNatureName();
+ }
+
+ /**
+ * 大屏-社区活动分页
+ *
+ * @return
+ */
+ @PostMapping("pageActivityBigScreen")
+ @ApiOperation(value = "大屏-社区活动分页", response = ComActActivityBigScreenVO.class)
+ public R pageActivityBigScreen(@RequestBody PageBaseDTO pageBaseDTO) {
+ return communityService.pageActivityBigScreen(pageBaseDTO);
+ }
+
+ @ApiOperation(value = "单位活动统计 range,year", response = ActivityAnalysisVO.class)
+ @GetMapping("activity/analysis")
+ public R activityUnitAnalysis(@RequestParam(value = "year", required = false) Integer year,
+ @RequestParam(value = "type", required = false) Integer type,
+ @RequestParam(value = "range", required = false) Integer range,
+ @RequestParam(value = "communityId", required = false) Long communityId,
+ @RequestParam(value = "page", required = false) Integer page,
+ @RequestParam(value = "size", required = false) Integer size,
+ @RequestParam(value = "belongTo", required = false) String belongTo,
+ @RequestParam(value = "unitId", required = false) Long unitId,
+ @RequestParam(value = "searchContent", required = false) String searchContent
+ ) {
+ return communityService.institutionalUnitServiceAnalysis(year, type, range, communityId, page, size, belongTo,
+ unitId, null,searchContent);
+ }
+
+ /**
+ * 疫情防控 健康码统计
+ *
+ * @return
+ */
+ @GetMapping("selectColorMarkGroup")
+ @ApiOperation(value = "疫情防控 健康码统计", response = ComActAcidColorChartsVO.class)
+ public R selectColorMarkGroup() {
+ return communityService.selectColorMarkGroup();
+ }
+
+ @ApiOperation(value = "清单详情接口", response = ComActNeighborCircleAdminVO.class)
+ @GetMapping("/neighbor/detail")
+ public R neighborDetail(@RequestParam("id") Long id) {
+ return communityService.detailNeighborByAdmin(id);
+ }
+
+ @ApiOperation(value = "清单详情的所有评论接口", response = ComActNeighborCommentByAdminVO.class)
+ @PostMapping("/neighbor/detail/comment")
+ public R detailNeighborAllCommentByAdmin(@RequestBody DetailNeighborAllCommentByAdminDTO dto) {
+ return communityService.detailNeighborAllCommentByAdmin(dto);
+ }
+
+ @ApiOperation(value = "活动详情", response = ComActActivityVO.class)
+ @GetMapping("detailactivity")
+ public R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "pageNum", required = false) Long pageNum, @RequestParam(value = "pageSize", required = false) Long pageSize) {
+ return communityService.detailActivity(id, null, pageNum, pageSize);
+ }
+
+ @ApiOperation(value = "网格治理", response = StatisticsPhotoVO.class)
+ @GetMapping("easyphoto/selectStatisticsPhoto")
+ public R selectStatisticsPhoto() {
+ return communityService.selectStatisticsPhoto();
+ }
+
+ @ApiOperation(value = "分页展示社区随手拍", response = ComActEasyPhotoVO.class)
+ @PostMapping("pageeasyphoto")
+ public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ comActEasyPhotoVO.setCommunityId(loginUserInfo.getCommunityId());
+ comActEasyPhotoVO.setLogInUserId(loginUserInfo.getUserId());
+ comActEasyPhotoVO.setIsDpcMember(loginUserInfo.getIsDpcMember());
+ }
+ return communityService.pageEasyPhotoApplets(comActEasyPhotoVO);
+ }
+
+ @ApiOperation(value = "随手拍详情", response = ComActEasyPhotoVO.class)
+ @GetMapping("easyphoto")
+ public R detailEasyPhoto(@RequestParam("id") Long id) {
+// Long userId = this.getUserId();
+ return communityService.detailEasyPhoto(id, 0L);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BcRegionApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BcRegionApi.java
new file mode 100644
index 0000000..cd4259c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BcRegionApi.java
@@ -0,0 +1,39 @@
+package com.panzhihua.community_backstage.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 行政区划表(BcRegion)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 行政区划表相关功能
+ *
+ * @author zzj
+ * @since 2022-04-20 14:26:14
+ */
+@Api(tags = {"行政区划"})
+@RestController
+@RequestMapping("bcRegion")
+public class BcRegionApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation("四级联动接口")
+ @GetMapping("levelList")
+ public R levelList(){
+ return this.communityService.levelListBackstage();
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenApi.java
new file mode 100644
index 0000000..a6b3ecf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenApi.java
@@ -0,0 +1,159 @@
+package com.panzhihua.community_backstage.api;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.bigscreen.*;
+import com.panzhihua.common.model.vos.partybuilding.PagePartyOrganizationVO;
+import com.panzhihua.common.model.vos.partybuilding.PartyBuildingComPbDynVO;
+import com.panzhihua.common.model.vos.partybuilding.PartyCommitteeVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.partybuilding.PartyBuildingService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @ClasssName BigScreenApi
+ * @Description TODO
+ * @Author cedoo
+ * @Date 2021/6/15
+ * @Version 1.0
+ **/
+@Slf4j
+@RestController
+@RequestMapping("/bigscreen/party")
+@Api(tags = {"网格大屏/党建"})
+public class BigScreenApi extends BaseController {
+ @Resource
+ private PartyBuildingService partyBuildingService;
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "党员党支部统计信息", response = BigScreenStatisticPartyOrg.class)
+ @PostMapping("/orgmembers")
+ public R<BigScreenStatisticPartyOrg>
+ orgmembers(@Validated @RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg) {
+ Long id = this.getCommunityId();
+ if (id == null) {
+ return R.fail(401, "请先登录");
+ }
+ pageBigScreenStatisticPartyOrg.setCommunityId(id);
+ return communityService.bigscreenPartyOrgmembers(pageBigScreenStatisticPartyOrg);
+ }
+
+ @ApiOperation(value = "党员年龄占比、男女占比", response = BigScreenStatisticAgeGender.class)
+ @GetMapping("/agegender")
+ public R<BigScreenStatisticAgeGender> agegender() {
+ BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO = new BigScreenStatisticAgeGenderDTO();
+ Long id = this.getCommunityId();
+ if (id == null) {
+ return R.fail(401, "请先登录");
+ }
+ bigScreenStatisticAgeGenderDTO.setCommunityId(id);
+ return communityService.ageGender(bigScreenStatisticAgeGenderDTO);
+ }
+
+ @ApiOperation(value = "党建数据概览", response = BigScreenStatisticPartyBuild.class)
+ @GetMapping("/partybuild")
+ public R<BigScreenStatisticPartyBuild> partybuild() {
+ Long id = this.getCommunityId();
+ if (id == null) {
+ return R.fail(401, "请先登录");
+ }
+ return communityService.bigscreenPartybuild(id);
+ }
+
+ @ApiOperation(value = "党员活动(按月-最近12个月)", response = BigScreenStatisticPartyActivity.class)
+ @PostMapping("/partyactivity")
+ public R<List<BigScreenStatisticPartyActivity>>
+ partyactivity(@Validated @RequestBody BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO) {
+ Long id = this.getCommunityId();
+ if (id == null) {
+ return R.fail(401, "请先登录");
+ }
+ bigScreenStatisticPartyActivityDTO.setCommunityId(id);
+ return communityService.bigscreenPartyactivity(bigScreenStatisticPartyActivityDTO);
+ }
+
+ @ApiOperation(value = "党员活动参加用户排行榜-TOP3", response = PartyBuildingMemberVO.class)
+ @GetMapping("/partyactivitytopuser")
+ public R<List<PartyBuildingMemberVO>> partyactivitytopuser() {
+ Long id = this.getCommunityId();
+ if (id == null) {
+ return R.fail(401, "请先登录");
+ }
+ return communityService.bigscreenPartyactivitytopuser(id);
+ }
+
+ @ApiOperation(value = "党建动态", response = BigScreenStatisticPartyOrg.class)
+ @PostMapping("/partydyn")
+ public R<BigScreenStatisticPartyOrg> partydyn(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
+ // Integer type = 1;
+ // Long communityId = 2L;
+ Long id = this.getCommunityId();
+ if (id == null) {
+ return R.fail(401, "请先登录");
+ }
+ partyBuildingComPbDynVO.setType(1);
+ partyBuildingComPbDynVO.setCommunityId(id);
+ return partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
+ }
+
+ @ApiOperation(value = "社区党委", response = BigScreenStatisticPartyMemeber.class)
+ @PostMapping("/pagePartyCommittee")
+ public R<BigScreenStatisticPartyMemeber> pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
+ Long id = this.getCommunityId();
+ if (id == null) {
+ return R.fail(401, "请先登录");
+ }
+ partyCommitteeVO.setCommunityId(id);
+ return partyBuildingService.pagePartyCommittee(partyCommitteeVO);
+ }
+
+ @ApiOperation(value = "党员分页查询", response = com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO.class)
+ @PostMapping("/pagepartyorganization")
+ public R pagePartyOrganization(@RequestBody PagePartyOrganizationMemberVO pagePartyOrganizationMemberVO) {
+ Long id = this.getCommunityId();
+ if (id == null) {
+ return R.fail(401, "请先登录");
+ }
+ PagePartyOrganizationVO pagePartyOrganizationVO = new PagePartyOrganizationVO();
+ BeanUtils.copyProperties(pagePartyOrganizationMemberVO, pagePartyOrganizationVO);
+ pagePartyOrganizationVO.setCommunityId(id);
+ pagePartyOrganizationVO.setAreaCode(this.getAreaCode());
+ return partyBuildingService.pagePartyOrganization(pagePartyOrganizationVO);
+ }
+
+ /**
+ * 党员活动折线图
+ * @return
+ */
+ @ApiOperation(value = "党员活动折线图", response = BigScreenActivityLine.class)
+ @GetMapping("/partyActivityLine")
+ public R partyActivityLine(){
+ return communityService.partyActivityLine(this.getCommunityId());
+ }
+
+ /**
+ * 党员积分前3
+ * @return
+ */
+ @ApiOperation(value = "党员积分前3", response = BigScreenActivityTop.class)
+ @PostMapping("/partyActivityTop")
+ public R partyActivityTop(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg){
+ pageBigScreenStatisticPartyOrg.setCommunityId(this.getCommunityId());
+ return communityService.partyActivityTop(pageBigScreenStatisticPartyOrg);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
new file mode 100644
index 0000000..4dcb6ce
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
@@ -0,0 +1,815 @@
+package com.panzhihua.community_backstage.api;
+
+import static java.util.Objects.isNull;
+
+import javax.annotation.Resource;
+
+import com.panzhihua.common.model.dtos.community.building.BuildingDto;
+import com.panzhihua.common.model.dtos.community.large.AreaStreetDetail;
+import com.panzhihua.common.model.dtos.community.large.SumAreaStreetResp;
+import com.panzhihua.common.model.dtos.partybuilding.QryReportResp;
+import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCourtyardStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenDpcStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFiveAssociationsStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHatchStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.EquipmentPointMapDataVO;
+import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
+import com.panzhihua.common.model.vos.partybuilding.PartyBuildingComPbDynVO;
+import com.panzhihua.common.service.partybuilding.PartyBuildingWestService;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.constants.HttpConstant;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenDrawEventListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
+import com.panzhihua.common.model.dtos.community.integral.ComActIntegralCommunityRankDTO;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActActivityVO;
+import com.panzhihua.common.model.vos.community.ComActDiscussVO;
+import com.panzhihua.common.model.vos.community.ComActDynVO;
+import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
+import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
+import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityLine;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenAlarmStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCommunityStatisticsVO;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenDynStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenEasyPhotoStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFmsStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFourMemberStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkBaseInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMerchantStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMicroWishStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenNeighborStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenPartyBuildIngStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenQuestionnaireStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenResidentActStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenServiceData;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenServiceUser;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyOrg;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenVolunteerActStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenVolunteerStatisticsInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.GridsGovernanceStatisticsVO;
+import com.panzhihua.common.model.vos.community.bigscreen.IndexInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.ResidentAutonomyStatisticsVO;
+import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import com.panzhihua.common.model.vos.community.fms.ComFmsTeamVO;
+import com.panzhihua.common.model.vos.community.integral.ComActIntegralCommunityRankVO;
+import com.panzhihua.common.model.vos.community.screen.civil.CivilStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.event.EventComprehensiveGovernanceStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.event.EventGridIncidentStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.event.EventGridMemberVO;
+import com.panzhihua.common.model.vos.community.screen.event.EventGridStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.event.EventListVO;
+import com.panzhihua.common.model.vos.community.screen.event.EventNewStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.event.EventPopulationStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.event.EventPopulationStreetVO;
+import com.panzhihua.common.model.vos.community.screen.event.EventStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.index.IndexStatisticsVO;
+import com.panzhihua.common.model.vos.community.switchs.StreetAllAppletsVO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO;
+import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO;
+import com.panzhihua.common.model.vos.property.ComPropertyAlarmVO;
+import com.panzhihua.common.model.vos.screen.ScreenDrawEventPopulationTotalVO;
+import com.panzhihua.common.model.vos.screen.ScreenDrawEventVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.grid.GridService;
+import com.panzhihua.common.service.partybuilding.PartyBuildingService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.HttpClientUtil;
+import com.panzhihua.common.utlis.HttpUtils;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
+@Slf4j
+@Api(tags = {"大屏统计数据模块"})
+@RestController
+@RequestMapping("/screen/")
+public class BigScreenStatisticsApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private GridService gridService;
+ @Resource
+ private UserService userService;
+ @Resource
+ private PartyBuildingService partyBuildingService;
+ @Resource
+ private PartyBuildingWestService partyBuildingWestService;
+
+ @ApiOperation(value = "大屏测试接口")
+ @GetMapping("/test/noToken")
+ public R test(@RequestParam("communityId") Long communityId) {
+ return R.ok("测试,测试社区id" + communityId);
+ }
+
+ @ApiOperation(value = "首页大屏统计接口@lyq", response = IndexStatisticsVO.class)
+ @GetMapping("/index")
+ public R index(@RequestParam("communityId") Long communityId) {
+ Long id = this.getCommunityId();
+ if (id == null) {
+ return R.fail(401, "请先登录");
+ }
+ return communityService.getScreenIndex(id);
+ }
+
+ @ApiOperation(value = "事件大屏统计接口@lyq", response = EventStatisticsVO.class)
+ @PostMapping("/event")
+ public R event(@RequestBody BigScreenEventDTO screenEventDTO) {
+ Long id = this.getCommunityId();
+ if (id == null) {
+ return R.fail(401, "请先登录");
+ }
+ screenEventDTO.setCommunityId(id);
+ return communityService.getScreenEvent(screenEventDTO);
+ }
+
+ @ApiOperation(value = "事件大屏详情接口@lyq", response = EventNewStatisticsVO.class)
+ @PostMapping("/event/detail")
+ public R eventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO) {
+ if (eventDetailDTO.getEventId() == null || eventDetailDTO.getType() == null) {
+ return R.fail("参数错误");
+ }
+ return communityService.getScreenEventDetail(eventDetailDTO);
+ }
+
+ @ApiOperation(value = "民生大屏统计接口@lyq", response = CivilStatisticsVO.class)
+ @GetMapping("/civil")
+ public R civil(@RequestParam("communityId") Long communityId) {
+ Long id = this.getCommunityId();
+ if (id == null) {
+ return R.fail(401, "请先登录");
+ }
+ return communityService.getScreenCivil(id);
+ }
+
+ @ApiOperation(value = "获取社区网格接口@lyq", response = EventGridStatisticsVO.class)
+ @GetMapping("/event/grids")
+ public R grids(@RequestParam("communityId") Long communityId) {
+ Long id = this.getCommunityId();
+ if (id == null) {
+ return R.fail(401, "请先登录");
+ }
+ return communityService.getScreenGirds(id);
+ }
+
+ @ApiOperation(value = "事件大屏事件列表接口@lyq", response = EventListVO.class)
+ @PostMapping("/civil/list")
+ public R eventList(@RequestBody ScreenEventListDTO eventListDTO) {
+// if(eventListDTO.getCommunityId() == null){
+// return R.fail("参数错误");
+// }
+
+// Long id = this.getCommunityId();
+// if (id == null) {
+// return R.fail(401, "请先登录");
+// }
+// eventListDTO.setCommunityId(id);
+ if(eventListDTO.getCommunityId()==2)
+ {
+ eventListDTO.setCommunityId(null);
+ }
+ return gridService.getScreenEventList(eventListDTO);
+ }
+
+ @ApiOperation(value = "事件大屏画圈展示事件坐标点接口@lyq", response = ScreenDrawEventVO.class)
+ @PostMapping("/civil/draw/list")
+ public R civilDrawList(@RequestBody ScreenDrawEventListDTO eventListDTO) {
+ // if(eventListDTO.getCommunityId() == null){
+ // return R.fail("参数错误");
+ // }
+ Long id = this.getCommunityId();
+ if (id == null) {
+ return R.fail(401, "请先登录");
+ }
+ eventListDTO.setCommunityId(id);
+ return gridService.getCivilDrawList(eventListDTO);
+ }
+
+ @ApiOperation(value = "根据小区id获取小区信息@lyq", response = ScreenDrawEventPopulationTotalVO.class)
+ @GetMapping("/civil/village/statistics")
+ public R civilVillageStatistics(@RequestParam("villageId") Long villageId) {
+ if (villageId == null) {
+ return R.fail("参数错误");
+ }
+ return gridService.civilVillageStatistics(villageId);
+ }
+
+ @ApiOperation(value = "获取社区网格员列表接口@lyq", response = EventGridMemberVO.class)
+ @GetMapping("/grids/member")
+ public R getGridsMemberList(@RequestParam("communityId") Long communityId) {
+ // if(communityId == null){
+ // return R.fail("参数错误");
+ // }
+ Long id = this.getCommunityId();
+ if (id == null) {
+ return R.fail(401, "请先登录");
+ }
+ return userService.getGridsMemberList(id);
+ }
+
+ @ApiOperation(value = "民生大屏出入记录接口@lyq")
+ @GetMapping("/event/inAndOut/record")
+ public R inAndOutRecord(@RequestParam("pageNum") Long pageNum,@RequestParam("pageSize") Long pageSize,@RequestParam("areaId") Long areaId) {
+ if (pageNum == null || pageNum == null || areaId == null) {
+ return R.fail("参数错误");
+ }
+ String param = "page=" + pageNum + "&size=" + pageSize + "&areaId=" + areaId;
+ String resultJson = HttpUtils.sendGet(HttpConstant.NEIJIANG_URL ,param);
+ JSONObject result = JSON.parseObject(resultJson);
+ return R.ok(result.getString("data"));
+ }
+
+ @ApiOperation(value = "民生大屏报警记录接口@lyq")
+ @PostMapping("/event/callThePolice/record")
+ public R callThePoliceRecord(@RequestBody CommonPage commonPage) {
+ if (commonPage == null) {
+ return R.fail("参数错误");
+ }
+ String resultJson = HttpClientUtil.sendPostByJson(HttpConstant.CALL_THE_POLICE_URL,JSON.toJSONString(commonPage),0,null,null);
+ JSONObject result = JSON.parseObject(resultJson);
+ return R.ok(result.getString("data"));
+ }
+
+ @ApiOperation(value = "获取社区网格员移动轨迹接口@lyq", response = EventGridMemberVO.class)
+ @GetMapping("/grids/member/trajectory")
+ public R getGridsMemberTrajectory() {
+ Long communityId = this.getCommunityId();
+ if (communityId == null) {
+ return R.fail(401, "请先登录");
+ }
+ return gridService.getGridsMemberTrajectory(communityId);
+ }
+
+ /**
+ * 西区大屏治理数据
+ */
+ @ApiOperation(value = "西区大屏治理数据@lyq", response = WestScreenStatics.class)
+ @GetMapping("/getWestScreenStatics")
+ public R westScreenStatics(){
+ return communityService.westScreenStatics();
+ }
+
+
+ @ApiOperation(value = "西区大数据分析平台-综合治理栏", response = EventComprehensiveGovernanceStatisticsVO.class)
+ @GetMapping("/comprehensive/governance")
+ public R getComprehensiveGovernanceStatics() {
+ return gridService.getComprehensiveGovernanceStatics();
+ }
+
+ @ApiOperation(value = "西区大数据分析平台-一标三实栏", response = EventPopulationStatisticsVO.class)
+ @GetMapping("/comprehensive/population")
+ public R getComprehensivePopulationStatics(@RequestParam(value = "streetId",required = false,defaultValue = "0") Long streetId) {
+ return communityService.getComprehensivePopulationStatics(streetId);
+ }
+ /**
+ * 新版大屏首页接口
+ */
+ @ApiOperation(value = "新版大屏首页接口", response = IndexInfo.class)
+ @GetMapping("/indexInfo")
+ public R indexInfo(){
+ return communityService.indexInfo(this.getCommunityId());
+ }
+
+ /**
+ * 首页二级页面-微心愿
+ */
+ @ApiOperation(value = "首页二级页面-微心愿", response = BigScreenMicroWishStatisticsInfo.class)
+ @GetMapping("/index/microWish")
+ public R indexMicroWish() {
+ return communityService.indexMicroWish(this.getCommunityId());
+ }
+
+ /**
+ * 首页二级页面-微心愿展示列表
+ */
+ @ApiOperation(value = "首页二级页面-微心愿展示列表", response = ComActMicroWishVO.class)
+ @PostMapping("/index/microWishList")
+ public R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.indexMicroWishList(pageBaseDTO);
+ }
+
+ /**
+ * 首页二级页面-随手拍
+ */
+ @ApiOperation(value = "首页二级页面-随手拍", response = BigScreenEasyPhotoStatisticsInfo.class)
+ @GetMapping("/index/easyPhoto")
+ public R indexEasyPhoto() {
+ return communityService.indexEasyPhoto(this.getCommunityId());
+ }
+
+ /**
+ * 首页二级页面-随手拍展示列表
+ */
+ @ApiOperation(value = "首页二级页面-随手拍展示列表", response = ComActEasyPhotoVO.class)
+ @PostMapping("/index/easyPhotoList")
+ public R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.indexEasyPhotoList(pageBaseDTO);
+ }
+
+ /**
+ * 首页二级页面-社区问卷
+ */
+ @ApiOperation(value = "首页二级页面-社区问卷", response = BigScreenQuestionnaireStatisticsInfo.class)
+ @GetMapping("/index/questionnaire")
+ public R indexQuestionnaire() {
+ return communityService.indexQuestionnaire(this.getCommunityId());
+ }
+
+ /**
+ * 首页二级页面-社区问卷展示列表
+ */
+ @ApiOperation(value = "首页二级页面-社区问卷展示列表", response = ComActQuestnaireVO.class)
+ @PostMapping("/index/questionnaireList")
+ public R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.indexQuestionnaireList(pageBaseDTO);
+ }
+
+ /**
+ * 首页二级页面-社区动态
+ */
+ @ApiOperation(value = "首页二级页面-社区动态", response = BigScreenDynStatisticsInfo.class)
+ @GetMapping("/index/dyn")
+ public R indexDyn() {
+ return communityService.indexDyn(this.getCommunityId());
+ }
+
+ /**
+ * 首页二级页面-社区动态展示列表
+ */
+ @ApiOperation(value = "首页二级页面-社区动态展示列表", response = ComActDynVO.class)
+ @PostMapping("/index/dynList")
+ public R indexDynList(@RequestBody PageBaseDTO pageBaseDTO) {
+ if (isNull(pageBaseDTO.getCommunityId())) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ }
+ return communityService.indexDynList(pageBaseDTO);
+ }
+
+ /**
+ * 首页二级页面-邻里圈
+ */
+ @ApiOperation(value = "首页二级页面-邻里圈", response = BigScreenNeighborStatisticsInfo.class)
+ @GetMapping("/index/neighbor")
+ public R indexNeighbor() {
+ return communityService.indexNeighbor(this.getCommunityId());
+ }
+
+ @ApiOperation(value = "西区大数据分析平台-西区街道列表", response = EventPopulationStreetVO.class)
+ @GetMapping("/comprehensive/street/list")
+ public R getComprehensiveStreetList() {
+ return communityService.getComprehensiveStreetList();
+ }
+ /**
+ * 首页二级页面-邻里圈展示列表
+ */
+ @ApiOperation(value = "首页二级页面-邻里圈展示列表", response = ComActNeighborCircleAdminVO.class)
+ @PostMapping("/index/neighborList")
+ public R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO) {
+ if (isNull(pageBaseDTO.getCommunityId())) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ }
+ return communityService.indexNeighborList(pageBaseDTO);
+ }
+
+ @ApiOperation(value = "分页获取党建动态", response = BigScreenStatisticPartyOrg.class)
+ @PostMapping("/comprehensive/partydyn")
+ public R<BigScreenStatisticPartyOrg> partydyn(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
+ partyBuildingComPbDynVO.setType(1);
+ partyBuildingComPbDynVO.setAppId(this.getAppId());
+ return partyBuildingWestService.pageYnamic(partyBuildingComPbDynVO);
+ }
+ /**
+ * 首页二级页面-便民商家
+ */
+ @ApiOperation(value = "首页二级页面-便民商家", response = BigScreenMerchantStatisticsInfo.class)
+ @GetMapping("/index/merchant")
+ public R indexMerchant() {
+ return communityService.indexMerchant(this.getCommunityId());
+ }
+
+ @ApiOperation(value = "分页获取社区动态", response = ComActDynVO.class)
+ @PostMapping("/comprehensive/pagedynamic")
+ public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
+ comActDynVO.setIsTopping(null);
+ comActDynVO.setStatus(1);
+ return communityService.pageDynamic(comActDynVO);
+ }
+
+ @ApiOperation(value = "通过社区id查询社区账号密码")
+ @PostMapping("/get/community/password")
+ public R getCommunityPassword(@RequestParam("communityId") Long communityId) {
+ if(communityId == null){
+ return R.fail("参数错误");
+ }
+ return communityService.getCommunityPassword(communityId);
+ }
+ /**
+ * 首页二级页面-商家展示列表
+ */
+ @ApiOperation(value = "首页二级页面-商家展示列表", response = ConvenientMerchantVO.class)
+ @PostMapping("/index/merchantList")
+ public R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.indexMerchantList(pageBaseDTO);
+ }
+
+ /**
+ * 社区服务大屏数据分析接口
+ */
+ @ApiOperation(value = "社区服务大屏数据分析接口", response = BigScreenServiceData.class)
+ @GetMapping("/serviceData")
+ public R serviceData(){
+ return this.communityService.serviceData(this.getCommunityId());
+ }
+
+ /**
+ * 服务居民接口
+ */
+ @ApiOperation(value = "社区服务大屏服务居民接口", response = BigScreenServiceUser.class)
+ @GetMapping("/serviceUser")
+ public R serviceUser(){
+ return this.communityService.serviceUser(this.getCommunityId());
+ }
+
+ @ApiOperation(value = "大数据分析平台-居民自治", response = ResidentAutonomyStatisticsVO.class)
+ @GetMapping("/resident/autonomy")
+ public R getResidentAutonomy() {
+ Long communityId = this.getCommunityId();
+ if (communityId == null) {
+ return R.fail(401, "请先登录");
+ }
+ return communityService.getResidentAutonomy(communityId);
+ }
+
+ @ApiOperation(value = "大数据分析平台-清网治格", response = GridsGovernanceStatisticsVO.class)
+ @GetMapping("/grids/governance")
+ public R getGridsGovernance() {
+ Long communityId = this.getCommunityId();
+ if (communityId == null) {
+ return R.fail(401, "请先登录");
+ }
+ return communityService.getGridsGovernance(communityId);
+ }
+
+ @ApiOperation(value = "新版事件大屏画圈展示事件坐标点接口", response = GridsGovernanceStatisticsVO.class)
+ @PostMapping("/civil/draw/list-new")
+ public R civilDrawListNew(@RequestBody ScreenDrawEventListDTO eventListDTO) {
+ Long id = this.getCommunityId();
+ if (id == null) {
+ return R.fail(401, "请先登录");
+ }
+ eventListDTO.setCommunityId(id);
+ return gridService.getCivilDrawListNew(eventListDTO);
+ }
+
+ @ApiOperation(value = "新版根据小区id获取小区信息", response = GridsGovernanceStatisticsVO.class)
+ @GetMapping("/civil/village/statistics-new")
+ public R civilVillageStatisticsNew(@RequestParam("villageId") Long villageId) {
+ if (villageId == null) {
+ return R.fail("参数错误");
+ }
+ return gridService.civilVillageStatisticsNew(villageId);
+ }
+
+ @ApiOperation(value = "大数据分析平台-社区服务", response = BigScreenCommunityStatisticsVO.class)
+ @GetMapping("/community/service")
+ public R getCommunityServiceStatistics() {
+ Long communityId = this.getCommunityId();
+ if (communityId == null) {
+ return R.fail(401, "请先登录");
+ }
+ return communityService.getCommunityServiceStatistics(communityId);
+ }
+
+ @ApiOperation(value = "分页获取热度排行商家", response = ConvenientMerchantVO.class)
+ @PostMapping("/merchant/popular")
+ public R getScreenPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO) {
+ Long communityId = this.getCommunityId();
+ if (communityId == null) {
+ return R.fail(401, "请先登录");
+ }
+ pagePopularMerchantDTO.setCommunityId(communityId);
+ pagePopularMerchantDTO.setAreaCode(this.getAreaCode());
+ return communityService.getScreenPopularMerchants(pagePopularMerchantDTO);
+ }
+
+ /**
+ * 首页二级页面-居民活动
+ */
+ @ApiOperation(value = "首页二级页面-居民活动", response = BigScreenResidentActStatisticsInfo.class)
+ @GetMapping("/index/residentAct")
+ public R indexResidentAct() {
+ return communityService.indexResidentAct(this.getCommunityId());
+ }
+
+ /**
+ * 首页二级页面-居民活动展示列表
+ */
+ @ApiOperation(value = "首页二级页面-居民活动展示列表", response = ComActActivityVO.class)
+ @PostMapping("/index/residentActList")
+ public R indexResidentActList(@RequestBody PageBaseDTO pageBaseDTO) {
+ if (isNull(pageBaseDTO.getCommunityId())) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ }
+ return communityService.indexResidentActList(pageBaseDTO);
+ }
+
+ /**
+ * 首页二级页面-志愿者活动
+ */
+ @ApiOperation(value = "首页二级页面-志愿者活动", response = BigScreenVolunteerActStatisticsInfo.class)
+ @GetMapping("/index/volunteerAct")
+ public R indexVolunteerAct() {
+ return communityService.indexVolunteerAct(this.getCommunityId());
+ }
+
+ /**
+ * 首页二级页面-志愿者活动展示列表
+ */
+ @ApiOperation(value = "首页二级页面-志愿者活动展示列表", response = ComActActivityVO.class)
+ @PostMapping("/index/volunteerActList")
+ public R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO) {
+ if (isNull(pageBaseDTO.getCommunityId())) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ }
+ return communityService.indexVolunteerActList(pageBaseDTO);
+ }
+
+ @ApiOperation(value = "查询所有社区", response = StreetAllAppletsVO.class)
+ @GetMapping("/list/act")
+ public R list() {
+ return communityService.communitySwitchList(this.getAppId());
+ }
+
+ @ApiOperation(value = "清网治格-根据事件分类获取近1月的社区事件数据", response = EventGridIncidentStatisticsVO.class)
+ @ApiImplicitParam(name = "type", value = "事件状态(1治安防控、2民生服务、3矛盾劝解、4不稳定因素、5突发事件报告、6特殊人群服务、9防灾减灾、10其他", required = true)
+ @GetMapping("/event/list")
+ public R getEventList(@RequestParam(value = "type") Integer type) {
+ return communityService.getEventList(type, this.getCommunityId());
+ }
+
+ @ApiOperation(value = "清网治格-社区事件数据分页", response = EventGridIncidentStatisticsVO.class)
+ @PostMapping("/event/page")
+ public R pageEventList(@RequestBody PageBaseDTO pageBaseDTO) {
+ if (isNull(pageBaseDTO.getCommunityId())) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ }
+ return communityService.pageEventList(pageBaseDTO);
+ }
+ @ApiOperation(value = "河门口大屏首页", response = BigScreenHmkBaseInfo.class)
+ @PostMapping("/hmk/baseInfo")
+ public R getHmkBaseInfo(@RequestBody CommonPage commonPage){
+ return communityService.hmkBaseInfo(commonPage);
+ }
+
+ @ApiOperation(value = "河门口大屏折线图", response = BigScreenActivityLine.class)
+ @GetMapping("/hmk/partyProjectActivityLine")
+ public R partyActivityLine(){
+ return communityService.partyProjectActivityLine();
+ }
+ @ApiOperation(value = "河门口活动积分排行", response = ComActActivityVO.class)
+ @PostMapping("/hmk/projectActivityTop")
+ public R projectActivityTop(@RequestBody CommonPage commonPage){
+ return communityService.projectActivityProject(commonPage);
+ }
+
+ @ApiOperation(value = "金沙定制页面-党建引领基础数据", response = BigScreenPartyBuildIngStatisticsInfo.class)
+ @GetMapping("/partyBuildIng/base")
+ public R getPartyBuildIngBaseData() {
+ return communityService.getPartyBuildIngBaseData(this.getCommunityId());
+ }
+
+ @ApiOperation(value = "金沙定制页面-党员活动展示列表", response = PartyBuildingActivityVO.class)
+ @PostMapping("/partyBuildIng/partyAct")
+ public R pagePartyAct(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.pagePartyBuildIngAct(pageBaseDTO);
+ }
+
+ @ApiOperation(value = "金沙定制页面-议事投票展示列表", response = ComActDiscussVO.class)
+ @PostMapping("/partyBuildIng/discuss")
+ public R pageDiscuss(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.pagePartyBuildIngDiscuss(pageBaseDTO);
+ }
+
+ @ApiOperation(value = "金沙定制页面-志愿线展示列表", response = ComActMicroWishVO.class)
+ @PostMapping("/partyBuildIng/microWish")
+ public R pagePartyBuildIngMicroWish(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.pagePartyBuildIngMicroWish(pageBaseDTO);
+ }
+
+ @ApiOperation(value = "金沙定制页面-四长四员", response = BigScreenFourMemberStatisticsInfo.class)
+ @GetMapping("/fourMember/base")
+ public R getFourMemberBaseData() {
+ return communityService.getFourMemberBaseData(this.getCommunityId());
+ }
+
+ @ApiOperation(value = "金沙定制页面-四长四员解决问题展示列表", response = ComActMicroWishVO.class)
+ @PostMapping("/fourMember/resolve")
+ public R pageFourMemberResolve(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.pageFourMemberResolve(pageBaseDTO);
+ }
+
+ @ApiOperation(value = "杨家坪定制页面-五微服务", response = BigScreenFmsStatisticsInfo.class)
+ @GetMapping("/fms/base")
+ public R getFmsBaseData() {
+ return communityService.getFmsBaseData(this.getCommunityId());
+ }
+
+ @ApiOperation(value = "杨家坪定制页面-微团队展示列表", response = ComFmsTeamVO.class)
+ @PostMapping("/fms/team")
+ public R pageFmsTeam(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.pageFmsTeam(pageBaseDTO);
+ }
+
+ @ApiOperation(value = "杨家坪定制页面-居家养老", response = BigScreenAlarmStatisticsInfo.class)
+ @GetMapping("/alarm/base")
+ public R getAlarmBaseData() {
+ return communityService.getAlarmBaseData(this.getCommunityId());
+ }
+
+ @ApiOperation(value = "杨家坪定制页面-报警记录展示列表，参数param3（1.待处理异常 2.已处理 3.待服务 4.已服务）", response = ComPropertyAlarmVO.class)
+ @PostMapping("/alarm/record")
+ public R pageAlarmRecord(@RequestBody PageBaseDTO pageBaseDTO) {
+ if (isNull(pageBaseDTO.getParam3())) {
+ return R.fail("缺少参数");
+ }
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.pageAlarmRecord(pageBaseDTO);
+ }
+
+ @ApiOperation(value = "杨家坪定制页面-报警设备点位图", response = EquipmentPointMapDataVO.class)
+ @GetMapping("/alarm/pointMap")
+ public R getAlarmPointMap() {
+ return communityService.getAlarmPointMap(this.getCommunityId());
+ }
+
+ @ApiOperation(value = "杨家坪定制页面-志愿服务", response = BigScreenVolunteerStatisticsInfo.class)
+ @GetMapping("/volunteer/base")
+ public R getVolunteerBaseData() {
+ return communityService.getVolunteerBaseData(this.getCommunityId());
+ }
+
+ @ApiOperation(value = "杨家坪定制页面-志愿者积分排行榜", response = ComActIntegralCommunityRankVO.class)
+ @PostMapping("/volunteer/rank")
+ public R getIntegralCommunityRank(@RequestBody ComActIntegralCommunityRankDTO communityRankDTO) {
+ communityRankDTO.setType(3);
+ communityRankDTO.setCommunityId(this.getCommunityId());
+ return communityService.getIntegralCommunityRankApplets(communityRankDTO);
+ }
+
+ @ApiOperation(value = "金沙定制页面-四长四员院落议事展示列表,param3（1.议事 2.投票）", response = ComActDiscussVO.class)
+ @PostMapping("/courtyard/list")
+ public R pageCourtyardDiscuss(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.pageCourtyardDiscuss(pageBaseDTO);
+ }
+
+ @ApiOperation(value = "金沙定制页面-院落议事", response = BigScreenCourtyardStatisticsInfo.class)
+ @GetMapping("/courtyard/base")
+ public R getCourtyardBaseData() {
+ return communityService.getCourtyardBaseData(this.getCommunityId());
+ }
+
+ @ApiOperation(value = "孵化中心-基础数据", response = BigScreenHatchStatisticsInfo.class)
+ @GetMapping("/hatch/base")
+ public R getHatchBaseData() {
+ return communityService.getHatchBaseData(this.getCommunityId());
+ }
+
+ @ApiOperation(value = "孵化中心-孵化成果展示列表", response = ComActSocialOrgVO.class)
+ @PostMapping("/hatchResult/list")
+ public R pageHatchResult(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.pageHatchResult(pageBaseDTO);
+ }
+
+ @ApiOperation(value = "孵化中心-孵化进度展示列表", response = ComActSocialOrgVO.class)
+ @PostMapping("/hatchSchedule/list")
+ public R pageHatchSchedule(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.pageHatchSchedule(pageBaseDTO);
+ }
+
+ @ApiOperation(value = "五社联动基础数据", response = BigScreenFiveAssociationsStatisticsInfo.class)
+ @GetMapping("/fiveAssociations/base")
+ public R getFiveAssociationsBaseData() {
+ return communityService.getFiveAssociationsBaseData(this.getCommunityId());
+ }
+
+ @ApiOperation(value = "五社联动项目展示列表", response = SocialProjectVO.class)
+ @PostMapping("/socialProject/list")
+ public R pageSocialProjectList(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.pageSocialProjectList(pageBaseDTO);
+ }
+
+ @ApiOperation(value = "五社联动社会组织展示列表", response = ComActSocialOrgVO.class)
+ @PostMapping("/socialOrg/list")
+ public R pageSocialOrgList(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.pageSocialOrgList(pageBaseDTO);
+ }
+
+ @ApiOperation(value = "人大代表", response = BigScreenDpcStatisticsInfo.class)
+ @GetMapping("/dpc/base")
+ public R dpcBase() {
+ return communityService.dpcBase(this.getCommunityId());
+ }
+
+ @ApiOperation(value = "人大代表-随手拍展示列表", response = ComActEasyPhotoVO.class)
+ @PostMapping("/dpc/easyPhotoList")
+ public R dpcEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.dpcEasyPhotoList(pageBaseDTO);
+ }
+
+ @GetMapping("/panzhihuaMap")
+ public R panzhihuaMap(@RequestParam("areaCode")String areaCode){
+ return communityService.panzhihuaMap(areaCode);
+ }
+
+ @GetMapping("/oneTagThreeReal")
+ public R oneTagThreeReal(@RequestParam("streetId") Long streetId){
+ return communityService.oneTagThreeReal(streetId);
+ }
+
+ @PostMapping("/searchStreet")
+ public R searchStreet(@RequestBody BuildingDto buildingDto){
+ return communityService.searchStreet(buildingDto);
+ }
+
+ @PostMapping("/huachengDyn")
+ public R huachengDyn(@RequestBody ComActDynVO comActDynVO){
+ return communityService.huachengDyn(comActDynVO);
+ }
+
+ @GetMapping("/getScreenStatics")
+ public R getScreenStatics(){
+ return communityService.getScreenStatics();
+ }
+
+ @GetMapping("/populationStatics")
+ public R populationStatics(@RequestParam("streetId") Long streetId){
+ return communityService.populationStatics(streetId);
+ }
+
+ @GetMapping("/probably")
+ public R probably(@RequestParam("year") Integer year,@RequestParam("belongTo") String belongTo){
+ return communityService.probably(year,belongTo);
+ }
+ /**
+ * 查询 一标三实 数据
+ */
+ @GetMapping("/sumAreaStreet")
+ public R<SumAreaStreetResp> sumAreaStreet(){
+ return communityService.sumAreaStreet();
+ }
+
+ /**
+ * 下拉 明细
+ */
+ @GetMapping(("/areaStreetDetail"))
+ private R<AreaStreetDetail> areaStreetDetail(@RequestParam("code") String code,
+ @RequestParam("type") String type){
+ return communityService.areaStreetDetail(code, type);
+ }
+
+ /**
+ * 双报到双服务
+ */
+ @GetMapping("/qryReport")
+ public R<List<QryReportResp>> qryReport(@RequestParam(value = "yearTime",required = false) String yearTime){
+ return communityService.qryReport(yearTime);
+ }
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BraceletApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BraceletApi.java
new file mode 100644
index 0000000..4e5d0ec
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BraceletApi.java
@@ -0,0 +1,377 @@
+package com.panzhihua.community_backstage.api;
+
+/**
+ * 西区手环接口
+ */
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.model.dtos.bracelet.BraceletEarlyWarningDO;
+import com.panzhihua.common.model.dtos.bracelet.BraceletUserDataDO;
+import com.panzhihua.common.model.dtos.bracelet.SetSOS;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.bracelet.CommunityBraceletService;
+import com.panzhihua.common.utlis.HttpClientUtil;
+import com.panzhihua.community_backstage.model.vos.PutmessageBody;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Api(tags = {"西区手环接口"})
+@RestController
+@RequestMapping("/braceletApi/")
+public class BraceletApi
+{
+
+ @Resource
+ private CommunityBraceletService communityBraceletService;
+
+
+ /**
+ * 用户手环参数变化 更新数据
+ * @param putmessageBody
+ * @return
+ */
+ @ApiOperation(value = "用户手环推送信息接口", response = PutmessageBody.class)
+ @PostMapping("putmessage")
+ public R putmessage(@RequestBody PutmessageBody putmessageBody)
+ {
+ BraceletUserDataDO dataDO=new BraceletUserDataDO();
+ dataDO.setDeviceType(putmessageBody.getDeviceType());
+ dataDO.setDeviceModel(putmessageBody.getDeviceModel());
+ dataDO.setDeviceId(putmessageBody.getDeviceID());
+ dataDO.setMobile(putmessageBody.getMobile());
+ dataDO.setDataType(putmessageBody.getDataType());
+ if(putmessageBody.getDataInfo()!=null)
+ {
+ dataDO.setDataId(putmessageBody.getDataInfo().getId());
+ dataDO.setTime(putmessageBody.getDataInfo().getTime());
+ dataDO.setPm(putmessageBody.getDataInfo().getPm());
+ dataDO.setPcp(putmessageBody.getDataInfo().getPcp());
+ dataDO.setPdp(putmessageBody.getDataInfo().getPdp());
+ dataDO.setEtg(putmessageBody.getDataInfo().getEtg());
+ dataDO.setStep(putmessageBody.getDataInfo().getStep());
+ dataDO.setLng(putmessageBody.getDataInfo().getLng());
+ dataDO.setLat(putmessageBody.getDataInfo().getLat());
+ dataDO.setMode(putmessageBody.getDataInfo().getMode());
+ dataDO.setElec(putmessageBody.getDataInfo().getElec());
+ dataDO.setOnoff(putmessageBody.getDataInfo().getOnoff());
+ }
+
+ log.info("用户手环 putmessage : "+putmessageBody.toString());
+ return communityBraceletService.addBracelet(dataDO);
+// return R.ok(dataDO);
+ }
+
+ /**
+ * 手环数据获取
+ * @param pageNum
+ * @param pageSize
+ * @param communityId
+ * @return
+ */
+ @ApiOperation(value = "手环数据获取")
+ @GetMapping("getData")
+ public R getData(@RequestParam("pageNum") Integer pageNum,
+ @RequestParam("pageSize") Integer pageSize,
+ @RequestParam(value = "communityId",required = false) String communityId,
+ @RequestParam(value = "userName",required = false) String userName,
+ @RequestParam(value = "phone",required = false) String phone)
+ {
+ return communityBraceletService.getData(pageNum,pageSize,communityId,userName,phone);
+ }
+
+
+ /**
+ * 手环数据编辑接口
+ * @return
+ */
+ @ApiOperation(value = "手环数据编辑接口")
+ @PostMapping("upBracelet")
+ public R upBracelet(@RequestBody BraceletUserDataDO braceletUserDataDO)
+ {
+ if(StringUtils.isEmpty(braceletUserDataDO.getDeviceId()))
+ {
+ return R.fail("设备id不能为空");
+ }
+ return communityBraceletService.upBracelet(braceletUserDataDO);
+ }
+
+ /**
+ * 删除设备
+ * @param id 设备id
+ * @return
+ */
+ @ApiOperation(value = "删除设备")
+ @DeleteMapping("delectData")
+ public R delectData(@RequestParam("id") String id)
+ {
+ return communityBraceletService.delectData(id);
+ }
+
+ /**
+ * 用户手环参数变化 新增数据
+ * @param braceletUserDataDO
+ * @return
+ */
+ @ApiOperation(value = "用户手环新增用户接口")
+ @PostMapping("addBraceletUser")
+ public R addBraceletUser(@RequestBody BraceletUserDataDO braceletUserDataDO)
+ {
+ if(braceletUserDataDO==null)
+ {
+ return R.fail("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(braceletUserDataDO.getDeviceId()))
+ {
+ return R.fail("设备ID 不能为空");
+ }
+
+// log.info("用户手环 putmessage : "+braceletUserDataDO.toString());
+ return communityBraceletService.addBracelet(braceletUserDataDO);
+ }
+
+
+ /**
+ * 用户手环参数变化 更新数据
+ * @return
+ */
+ @ApiOperation(value = "手环设置SOS联系人")
+ @PostMapping("setSOS")
+ public R setSOS(@RequestBody SetSOS setSOS)
+ {
+ if(setSOS==null)
+ {
+ return R.fail("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(setSOS.getDeviceId()))
+ {
+ return R.fail("设备ID 不能为空");
+ }
+
+ if(StringUtils.isEmpty(setSOS.getEmergencyContact1()) && StringUtils.isEmpty(setSOS.getEmergencyContact2())
+ && StringUtils.isEmpty(setSOS.getEmergencyContact3()))
+ {
+ return R.fail("联系人不能全部为空");
+ }
+
+
+// 3 W11 智能手表
+// 2 W5 智能手环
+// 1 W6 智能手表
+ Map allMap=new HashMap();
+ Map phone=new HashMap();
+
+// if(StringUtils.equals(braceletUserDataDO.getDeviceModel(),"W11"))
+// {
+// allMap.put("deviceModelId",3);
+// }
+// else if(StringUtils.equals(braceletUserDataDO.getDeviceModel(),"W5"))
+// {
+// allMap.put("deviceModelId",2);
+// }
+// else
+// {
+// allMap.put("deviceModelId",1);
+// }
+ allMap.put("deviceModelId",3);
+
+
+ BraceletUserDataDO dataDO=new BraceletUserDataDO();
+ dataDO.setDeviceId(setSOS.getDeviceId());
+ dataDO.setOnoff("1");
+ phone.put("sgtel1",setSOS.getEmergencyContact1());
+ dataDO.setSgtel1(setSOS.getEmergencyContact1());
+
+ phone.put("sgtel2",setSOS.getEmergencyContact2());
+ dataDO.setSgtel2(setSOS.getEmergencyContact2());
+
+ phone.put("sgtel3",setSOS.getEmergencyContact3());
+ dataDO.setSgtel3(setSOS.getEmergencyContact3());
+
+
+ allMap.put("deviceID",setSOS.getDeviceId());
+ allMap.put("apiKey","C71584EDE98983A1976AAE8DBCF6B9CF");
+ allMap.put("type",1);
+ allMap.put("dataInfo",phone);
+
+
+// String resultJson = HttpClientUtil.sendPostByJson("http://apps.jkez.net/openapi/mobile/saveDeviceSet", JSON.toJSONString(allMap),
+ String resultJson = HttpClientUtil.sendPostByJson("http://v3frame.jkez.cn/v3openapi/mobile/saveDeviceSet", JSON.toJSONString(allMap),
+ 0,null,null);
+ JSONObject result = JSON.parseObject(resultJson);
+
+
+ if(!StringUtils.isEmpty(dataDO.getSgtel1()) || !StringUtils.isEmpty(dataDO.getSgtel2()) ||
+ !StringUtils.isEmpty(dataDO.getSgtel3()))
+ {
+ communityBraceletService.upBracelet(dataDO);
+ }
+
+ R r=new R();
+ int code=result.getIntValue("code");
+ if(code==400)
+ {
+ dataDO.setOnoff("0");
+ }
+ communityBraceletService.upBracelet(dataDO);
+ r.setCode(code);
+ r.setMsg(result.getString("message"));
+ return r;
+ }
+
+
+ /**
+ * 获取用户 手环数据详情
+ * @param deviceID
+ * @return
+ */
+ @ApiOperation(value = "获取用户 手环数据详情")
+ @GetMapping("getDetails")
+ public R getDetails(@RequestParam("deviceID") String deviceID)
+ {
+ return communityBraceletService.getDetails(deviceID);
+ }
+
+
+
+
+
+ /**
+ * 编辑手环预警数据
+ * @param braceletEarlyWarningDO
+ * @return
+ */
+ @ApiOperation(value = "编辑手环预警数据")
+ @PostMapping("upEarlyWarning")
+ public R upEarlyWarning(@RequestBody BraceletEarlyWarningDO braceletEarlyWarningDO) {
+ return communityBraceletService.upEarlyWarning(braceletEarlyWarningDO);
+ }
+
+ /**
+ * 删除预警数据
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "删除预警数据")
+ @DeleteMapping("delectEarlyWarning")
+ public R delectEarlyWarning(@RequestParam("id") String id) {
+ return communityBraceletService.delectEarlyWarning(id);
+ }
+
+ /**
+ * 获取预警数据
+ * @param communityId
+ * @return
+ */
+ @ApiOperation(value = "获取预警数据")
+ @GetMapping("getEarlyWarningList")
+ public R getList(@RequestParam("pageNum") Integer pageNum,
+ @RequestParam("pageSize") Integer pageSize,
+ @RequestParam(value = "communityId",required = false) String communityId,
+ @RequestParam(value = "equipmentNumber",required = false) String equipmentNumber,
+ @RequestParam(value = "type",required = false) String type,
+ @RequestParam(value = "userName",required = false) String userName,
+ @RequestParam(value = "phone",required = false) String phone)
+ {
+ return communityBraceletService.getList(pageNum,pageSize,communityId,equipmentNumber,"",type,userName,phone);
+ }
+
+ /**
+ * 获取单个预警信息详情
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "获取单个预警信息详情")
+ @GetMapping("getEarlyWarningDetails")
+ public R getEarlyWarningDetails(@RequestParam("id") String id)
+ {
+ return communityBraceletService.getEarlyWarningDetails(id);
+ }
+
+ /**
+ * 处理接口
+ * @return
+ */
+ @ApiOperation(value = "处理接口")
+ @PostMapping("dispose")
+ public R dispose(@RequestBody BraceletEarlyWarningDO braceletEarlyWarningDO)
+ {
+ return communityBraceletService.dispose(braceletEarlyWarningDO);
+ }
+
+
+ /**
+ * 处理人
+ * @param communityId
+ * @return
+ */
+ @ApiOperation(value = "处理人")
+ @GetMapping("conductorList")
+ public R conductorList(@RequestParam("communityId") String communityId)
+ {
+ return communityBraceletService.conductorList(communityId);
+ }
+
+
+ /**********************************************************************************************************************************************
+ *
+ * 大屏居家养老
+ *
+ **********************************************************************************************************************************************/
+
+ /**
+ * 手环人数
+ * @return
+ */
+ @ApiOperation(value = "手环人数")
+ @GetMapping("/getUserNum")
+ public R getUserNum(@RequestParam("communityId") String communityId)
+ {
+ return communityBraceletService.getUserNum(communityId);
+ }
+
+
+ /**
+ * 手环定位数据
+ */
+ @ApiOperation(value = "手环定位数据")
+ @GetMapping("/getUserList")
+ public R getUserList(@RequestParam("communityId") String communityId)
+ {
+ return communityBraceletService.getUserList(communityId);
+ }
+
+
+
+ /**
+ * 获取手环预警次数
+ * @return
+ */
+ @ApiOperation(value = "获取手环预警次数")
+ @GetMapping("/getWarningNum")
+ public R getWarningNum(@RequestParam("communityId") String communityId,
+ @RequestParam(value = "disposeType",required = false) String disposeType)
+ {
+ return communityBraceletService.getWarningNum(communityId,disposeType);
+ }
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BuildingApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BuildingApi.java
new file mode 100644
index 0000000..645df9c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BuildingApi.java
@@ -0,0 +1,343 @@
+package com.panzhihua.community_backstage.api;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.alibaba.fastjson.JSONArray;
+import com.panzhihua.common.interfaces.OperLog;
+import com.panzhihua.common.model.dtos.community.building.admin.*;
+import com.panzhihua.common.model.vos.community.ComMngPopulationImportErrorVO;
+import com.panzhihua.common.model.vos.community.ComMngVillageVO;
+import com.panzhihua.common.model.vos.community.building.admin.BuildingDetailAdminVo;
+import com.panzhihua.common.model.vos.community.building.admin.BuildingListHeaderStatisticsAdminVo;
+import com.panzhihua.common.model.vos.community.building.admin.BuildingUnitHouseListAdminVo;
+import com.panzhihua.common.model.vos.community.building.admin.PageBuildingListAdminVo;
+import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingHouseDetailVO;
+import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingVO;
+import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.utlis.SFTPUtil;
+import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.listen.ComMngBuildingExcelListen;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author xyh
+ * @date 2021/6/10 12:34
+ */
+@Slf4j
+@Api(tags = {"楼栋管理"})
+@RestController
+@RequestMapping("/building")
+public class BuildingApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private StringRedisTemplate stringRedisTemplate;
+
+ // FTP 登录用户名
+ @Value("${ftp.username}")
+ private String userName;
+ // FTP 登录密码
+ @Value("${ftp.password}")
+ private String password;
+ // FTP 服务器地址IP地址
+ @Value("${ftp.host}")
+ private String host;
+ // FTP 端口
+ @Value("${ftp.port}")
+ private int port;
+ @Value("${excel.userurl}")
+ private String excelUrl;
+
+ @ApiOperation(value = "excel导入楼栋信息--注：以前的接口，不需要对接")
+ @PostMapping(value = "/import", consumes = "multipart/*", headers = "content-type=multipart/form-date")
+ @OperLog(operModul = "房屋信息管理-导入楼栋信息", operType = 0, businessType = "导入楼栋信息")
+ public R downloadPopulationTemplate(@RequestParam MultipartFile file) {
+ InputStream inputStream;
+ try {
+ inputStream = file.getInputStream();
+ ComMngBuildingExcelListen comMngBuildingExcelListen =
+ new ComMngBuildingExcelListen(communityService, this.getCommunityId(),stringRedisTemplate);
+ EasyExcel.read(inputStream, null, comMngBuildingExcelListen).sheet().doRead();
+ } catch (IOException e) {
+ log.error("导入模板失败【{}】", e.getMessage());
+ e.printStackTrace();
+ }
+ return R.ok();
+ }
+
+ @ApiOperation(value = "分页查询楼栋列表", response = PageBuildingListAdminVo.class)
+ @PostMapping("/page")
+ public R page(@RequestBody PageBuildingListDto pageBuildingListDto) {
+ // 获取登陆用户绑定社区id
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ pageBuildingListDto.setCommunityId(communityId);
+ return communityService.pageBuildingAdmin(pageBuildingListDto);
+ }
+
+ @ApiOperation(value = "根据小区id查询楼栋列表")
+ @GetMapping("/getBuildList")
+ public R getBuildListByVillageId(@RequestParam(value = "villageId") Long villageId) {
+ return communityService.getBuildListByVillageId(villageId);
+ }
+
+ @ApiOperation(value = "楼栋列表表头统计", response = BuildingListHeaderStatisticsAdminVo.class)
+ @GetMapping("/header/statistics")
+ public R headerStatistics() {
+ // 获取登陆用户绑定社区id
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ return communityService.buildingListHeaderStatisticsAdmin(communityId);
+ }
+
+ @ApiOperation(value = "楼栋详情", response = BuildingDetailAdminVo.class)
+ @GetMapping("/detail")
+ public R detail(@RequestParam("id") Long id) {
+ return communityService.detailBuildAdmin(id);
+ }
+
+ @ApiOperation(value = "查询楼栋下单元列表", response = ComMngVillageBuildingVO.class)
+ @GetMapping("/unit/list")
+ public R unitList(@RequestParam("id") Long id) {
+ return communityService.buildingUnitListAdmin(id);
+ }
+
+ @ApiOperation(value = "查询单元下房屋列表", response = BuildingUnitHouseListAdminVo.class)
+ @PostMapping("/unit/house/list")
+ public R unitHouseList(@RequestBody PageBuildingUnitHouseListDto unitHouseListDto) {
+ return communityService.buildingUnitHouseListAdmin(unitHouseListDto);
+ }
+
+ @ApiOperation(value = "查询房屋详情", response = ComMngVillageBuildingHouseDetailVO.class)
+ @GetMapping("/unit/house/detail")
+ public R unitHouseDetail(@RequestParam("houseId") Long houseId) {
+ // 获取登陆用户绑定社区id
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ return communityService.unitHouseDetailAdmin(houseId,communityId);
+ }
+
+ @ApiOperation(value = "查询小区列表", response = ComMngVillageVO.class)
+ @GetMapping("/village/list")
+ public R villageList() {
+ // 获取登陆用户绑定社区id
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ return communityService.buildingVillageListAdmin(communityId);
+ }
+
+ @ApiOperation(value = "添加单元")
+ @PostMapping("/add/unit")
+ @OperLog(operModul = "房屋信息管理-添加单元", operType = 1, businessType = "添加单元")
+ public R addUnit(@RequestBody AddBuildingUnitDto addBuildingUnitDto) {
+ // 获取登陆用户绑定社区id
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ addBuildingUnitDto.setCommunityId(communityId);
+
+ if(addBuildingUnitDto.getId() == null || addBuildingUnitDto.getUnitNo() == null){
+ return R.fail("参数有误");
+ }
+ return communityService.addBuildingUnitAdmin(addBuildingUnitDto);
+ }
+
+ @ApiOperation(value = "修改单元")
+ @PostMapping("/edit/unit")
+ @OperLog(operModul = "房屋信息管理-修改单元", operType = 2, businessType = "修改单元")
+ public R editUnit(@RequestBody EditBuildingUnitDto editBuildingUnitDto) {
+ // 获取登陆用户绑定社区id
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ editBuildingUnitDto.setCommunityId(communityId);
+
+ if(editBuildingUnitDto.getId() == null || editBuildingUnitDto.getOldUnitNo() == null || editBuildingUnitDto.getNewUnitNo() == null){
+ return R.fail("参数有误");
+ }
+ return communityService.editBuildingUnitAdmin(editBuildingUnitDto);
+ }
+
+ @ApiOperation(value = "添加户室")
+ @PostMapping("/add/house")
+ public R addHouse(@RequestBody AddBuildingHouseDto addBuildingHouseDto) {
+ // 获取登陆用户绑定社区id
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ addBuildingHouseDto.setCommunityId(communityId);
+
+ if(addBuildingHouseDto.getId() == null || addBuildingHouseDto.getHouseNo() == null || addBuildingHouseDto.getUnitNo() == null){
+ return R.fail("参数有误");
+ }
+ return communityService.addBuildingHouseAdmin(addBuildingHouseDto);
+ }
+
+ @ApiOperation(value = "修改户室")
+ @PostMapping("/edit/house")
+ public R editHouse(@RequestBody EditBuildingHouseDto editBuildingHouseDto) {
+ // 获取登陆用户绑定社区id
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ editBuildingHouseDto.setCommunityId(communityId);
+
+ if(editBuildingHouseDto.getHouseId() == null || editBuildingHouseDto.getHouseNo() == null){
+ return R.fail("参数有误");
+ }
+ return communityService.editBuildingHouseAdmin(editBuildingHouseDto);
+ }
+
+ @ApiOperation(value = "删除户室下人员")
+ @PostMapping("/delete/population")
+ public R deletePopulation(@RequestBody DeleteBuildingHousePopulationDto housePopulationDto) {
+ // 获取登陆用户绑定社区id
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ housePopulationDto.setCommunityId(communityId);
+
+ if(housePopulationDto.getHouseId() == null || housePopulationDto.getPopulationId() == null || housePopulationDto.getType() == null){
+ return R.fail("参数有误");
+ }
+ return communityService.deleteBuildingHousePopulationAdmin(housePopulationDto);
+ }
+
+ @ApiOperation(value = "下载导入楼栋模板")
+ @GetMapping("/export/template")
+ public R exportTemplate() {
+ String ftpUrl = "/mnt/data/web/excel/";
+ String name = "楼栋导入模板.xlsx";
+ try {
+ SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ // 这里 需要指定写用哪个class去写
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ List<List<String>> list = headDrugDataFilling();
+// List<List<Object>> dataList = new ArrayList<>();
+
+ EasyExcel.write(fileName).head(list).sheet("楼栋导入模板").doWrite(null);
+ File file = new File(fileName);
+ inputStream = new FileInputStream(file);
+ sftp.uploadMore(ftpUrl, name, inputStream);
+ sftp.logout();
+ inputStream.close();
+ String absolutePath = file.getAbsolutePath();
+ boolean delete = file.delete();
+ log.info("删除excel【{}】结果【{}】", absolutePath, delete);
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ }
+ }
+ return R.ok(excelUrl + "楼栋导入模板.xlsx");
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+
+ /**
+ * 楼栋导入模板拼接
+ * @return 导入模板
+ */
+ private List<List<String>> headDrugDataFilling() {
+ List<List<String>> list = new ArrayList<List<String>>();
+ List<String> head2 = new ArrayList<String>();
+ head2.add("*街路巷");
+ List<String> head3 = new ArrayList<String>();
+ head3.add("小区名称");
+ List<String> head4 = new ArrayList<String>();
+ head4.add("*街路巷号");
+ List<String> head5 = new ArrayList<String>();
+ head5.add("*楼栋号");
+ list.add(head2);
+ list.add(head3);
+ list.add(head4);
+ list.add(head5);
+ return list;
+ }
+
+ @ApiOperation(value = "下载导入失败楼栋数据")
+ @PostMapping("/download/error")
+ public R downloadError(@RequestParam(value = "key") String key) {
+ List<ComMngPopulationImportErrorVO> list = new ArrayList<>();
+ Boolean isExits = stringRedisTemplate.hasKey(key);
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ if (isExits) {
+ String json = valueOperations.get(key);
+ list = JSONArray.parseArray(json, ComMngPopulationImportErrorVO.class);
+ }
+ String ftpUrl = "/mnt/data/web/excel/";
+ String nowDate = DateUtils.getCurrentDateString();
+ String name = "楼栋错误数据" + nowDate + ".xlsx";
+ try {
+ SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ // 这里 需要指定写用哪个class去写
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ excelWriter = EasyExcel.write(fileName, ComMngPopulationImportErrorVO.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet("楼栋错误数据").build();
+ excelWriter.write(list, writeSheet);
+ excelWriter.finish();
+ File file = new File(fileName);
+ inputStream = new FileInputStream(file);
+ sftp.uploadMore(ftpUrl, name, inputStream);
+ sftp.logout();
+ inputStream.close();
+ String absolutePath = file.getAbsolutePath();
+ boolean delete = file.delete();
+ log.info("删除excel【{}】结果【{}】", absolutePath, delete);
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ }
+ return R.ok(excelUrl + name);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+
+ @ApiOperation("删除楼栋")
+ @GetMapping("/delete")
+ @OperLog(operModul = "房屋信息管理-删除", operType = 3, businessType = "删除")
+ public R delete(@RequestParam("id")Long id){
+ return communityService.buildingDelete(id);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ClusterApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ClusterApi.java
new file mode 100644
index 0000000..6502b01
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ClusterApi.java
@@ -0,0 +1,291 @@
+package com.panzhihua.community_backstage.api;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.alibaba.fastjson.JSONArray;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.listen.ComClusterMemberExcelListen;
+import com.panzhihua.common.model.dtos.community.cluster.*;
+import com.panzhihua.common.model.dtos.community.cluster.admin.*;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.cluster.*;
+import com.panzhihua.common.model.vos.community.cluster.admin.*;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.utlis.SFTPUtil;
+import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * title: 群团组织接口类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 群团组织接口类
+ *
+ * @author lyq
+ * @date 2021/9/23 16:12
+ */
+@Slf4j
+@Api(tags = {"群团组织"})
+@RestController
+@RequestMapping("/cluster/")
+public class ClusterApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+ // FTP 登录用户名
+ @Value("${ftp.username}")
+ private String userName;
+ // FTP 登录密码
+ @Value("${ftp.password}")
+ private String password;
+ // FTP 服务器地址IP地址
+ @Value("${ftp.host}")
+ private String host;
+ // FTP 端口
+ @Value("${ftp.port}")
+ private int port;
+ @Value("${ftp.url}")
+ private String url;
+ @Value("${excel.userurl}")
+ private String excelUrl;
+ @Resource
+ private StringRedisTemplate stringRedisTemplate;
+
+ @ApiOperation(value = "群团组织列表",response = PageClusterVo.class)
+ @GetMapping("list")
+ public R listClusterApplets() {
+ return communityService.listClusterApplets(this.getCommunityId());
+ }
+
+ @ApiOperation(value = "分页查询群团组织列表",response = PageClusterAdminVo.class)
+ @PostMapping("/page")
+ public R pageClusterAdmin(@RequestBody PageClusterAdminDto pageClusterAdminDto) {
+ pageClusterAdminDto.setCommunityId(this.getCommunityId());
+ return communityService.pageClusterAdmin(pageClusterAdminDto);
+ }
+
+ @ApiOperation(value = "新增群团组织")
+ @PostMapping("/add")
+ public R addClusterAdmin(@RequestBody AddClusterAdminDto addClusterAdminDto) {
+ addClusterAdminDto.setCommunityId(this.getCommunityId());
+ return communityService.addClusterAdmin(addClusterAdminDto);
+ }
+
+ @ApiOperation(value = "编辑群团组织")
+ @PostMapping("/edit")
+ public R editClusterAdmin(@RequestBody EditClusterAdminDto editClusterAdminDto) {
+ editClusterAdminDto.setCommunityId(this.getCommunityId());
+ return communityService.editClusterAdmin(editClusterAdminDto);
+ }
+
+ @ApiOperation(value = "删除群团组织")
+ @GetMapping("/delete")
+ public R deleteClusterAdmin(@RequestParam("id") Long id) {
+ return communityService.deleteClusterAdmin(id);
+ }
+
+ @ApiOperation(value = "群团组织详情",response = ClusterDetailAdminVo.class)
+ @GetMapping("/detail")
+ public R detailClusterAdmin(@RequestParam("id") Long id) {
+ return communityService.detailClusterAdmin(id);
+ }
+
+ @ApiOperation(value = "分页查询群团组织成员列表",response = PageClusterMemberAdminVo.class)
+ @PostMapping("/member/page")
+ public R pageClusterMemberAdmin(@RequestBody PageClusterMemberAdminDto pageClusterMemberAdminDto) {
+ pageClusterMemberAdminDto.setCommunityId(this.getCommunityId());
+ return communityService.pageClusterMemberAdmin(pageClusterMemberAdminDto);
+ }
+
+ @ApiOperation(value = "新增群团组织成员")
+ @PostMapping("/member/add")
+ public R addClusterMemberAdmin(@RequestBody AddClusterMemberAdminDto addClusterMemberAdminDto) {
+ addClusterMemberAdminDto.setCommunityId(this.getCommunityId());
+ return communityService.addClusterMemberAdmin(addClusterMemberAdminDto);
+ }
+
+ @ApiOperation(value = "编辑群团组织成员")
+ @PostMapping("/member/edit")
+ public R editClusterMemberAdmin(@RequestBody EditClusterMemberAdminDto editClusterMemberAdminDto) {
+ editClusterMemberAdminDto.setCommunityId(this.getCommunityId());
+ return communityService.editClusterMemberAdmin(editClusterMemberAdminDto);
+ }
+
+ @ApiOperation(value = "删除群团组织成员")
+ @GetMapping("/member/delete")
+ public R deleteClusterMemberAdmin(@RequestParam("id") Long id) {
+ return communityService.deleteClusterMemberAdmin(id);
+ }
+
+ @ApiOperation(value = "群团组织成员详情",response = PageClusterMemberAdminVo.class)
+ @GetMapping("/member/detail")
+ public R detailClusterMemberAdmin(@RequestParam("id") Long id) {
+ return communityService.detailClusterMemberAdmin(id);
+ }
+
+ @ApiOperation(value = "群团组织民族列表",response = PageClusterVo.class)
+ @GetMapping("/member/nation/list")
+ public R memberNationListAdmin() {
+ return communityService.memberNationListAdmin();
+ }
+
+ @ApiOperation(value = "群团组织成员导入模板下载")
+ @GetMapping("/member/import/download")
+ public R clusterMemberDownload(){
+ return R.ok(this.excelUrl + "群团组织成员导入模板.xlsx");
+ }
+
+ @ApiOperation(value = "群团组织成员导入")
+ @PostMapping(value = "/member/import", consumes = "multipart/*", headers = "content-type=multipart/form-date")
+ public R importClusterMember(@RequestParam MultipartFile file, HttpServletRequest request) {
+ // 获取文件名
+ String fileName = file.getOriginalFilename();
+ log.info("传入文件名字【{}】", fileName);
+ InputStream inputStream = null;
+ try {
+ inputStream = file.getInputStream();
+ ComClusterMemberExcelListen clusterMemberExcelListen = new ComClusterMemberExcelListen(
+ communityService, this.getCommunityId(), this.getUserId(), stringRedisTemplate);
+ EasyExcel.read(inputStream, null, clusterMemberExcelListen).sheet().doRead();
+ } catch (IOException e) {
+ log.error("导入模板失败【{}】", e.getMessage());
+ e.printStackTrace();
+ }
+ return R.ok();
+ }
+
+ @ApiOperation(value = "下载导入失败群团组织成员数据")
+ @PostMapping("/member/download/error")
+ public R downloadErrorClusterMember(@RequestParam(value = "key") String key) {
+ List<ComClusterMemberExcelErrorVO> list = new ArrayList<>();
+ Boolean isExits = stringRedisTemplate.hasKey(key);
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ if (isExits) {
+ String json = valueOperations.get(key);
+ list = JSONArray.parseArray(json, ComClusterMemberExcelErrorVO.class);
+ }
+ String ftpUrl = "/mnt/data/web/excel/";
+ String nowDate = DateUtils.getCurrentDateString();
+ String name = "群团组织成员导入错误数据" + nowDate + ".xlsx";
+ try {
+ SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ // 这里 需要指定写用哪个class去写
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ excelWriter = EasyExcel.write(fileName, ComClusterMemberExcelErrorVO.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet("群团组织成员导入错误数据").build();
+ excelWriter.write(list, writeSheet);
+ excelWriter.finish();
+ File file = new File(fileName);
+ inputStream = new FileInputStream(file);
+ sftp.uploadMore(ftpUrl, name, inputStream);
+ sftp.logout();
+ inputStream.close();
+ String absolutePath = file.getAbsolutePath();
+ boolean delete = file.delete();
+ log.info("删除excel【{}】结果【{}】", absolutePath, delete);
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ }
+ return R.ok(excelUrl + name);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+
+ @ApiOperation(value = "群团组织成员数据导出")
+ @PostMapping("/member/export")
+ public R exportClusterMember(@RequestBody PageClusterMemberAdminDto pageClusterMemberAdminDto) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ pageClusterMemberAdminDto.setCommunityId(loginUserInfo.getCommunityId());
+ String name = "群团组织成员导出数据.xlsx";
+ String ftpUrl = "/mnt/data/web/excel/";
+ R r = communityService.exportClusterMember(pageClusterMemberAdminDto);
+ if (R.isOk(r)) {
+ List<ComClusterMemberExcelExportAdminVO> resultList = JSONArray.parseArray(
+ JSONArray.toJSONString(r.getData()), ComClusterMemberExcelExportAdminVO.class);
+ try {
+ SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ // 这里 需要指定写用哪个class去写
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ excelWriter = EasyExcel.write(fileName, ComClusterMemberExcelExportAdminVO.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet("群团组织成员导出数据").build();
+ excelWriter.write(resultList, writeSheet);
+ excelWriter.finish();
+ File file = new File(fileName);
+ inputStream = new FileInputStream(file);
+ sftp.uploadMore(ftpUrl, name, inputStream);
+ sftp.logout();
+ inputStream.close();
+ String absolutePath = file.getAbsolutePath();
+ boolean delete = file.delete();
+ log.info("删除excel【{}】结果【{}】", absolutePath, delete);
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ }
+ return R.ok(excelUrl + name);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+ return r;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidCheckRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidCheckRecordApi.java
new file mode 100644
index 0000000..d8be243
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidCheckRecordApi.java
@@ -0,0 +1,91 @@
+package com.panzhihua.community_backstage.api;
+
+
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.interfaces.OperLog;
+import com.panzhihua.common.model.dtos.community.acid.ComActAcidCheckRecordDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 排查跟进表(ComActAcidCheckRecord)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 排查跟进表相关功能
+ *
+ * @author zzj
+ * @since 2022-04-24 16:14:27
+ */
+@Api(tags = {"排查跟进"})
+@RestController
+@RequestMapping("comActAcidCheckRecord")
+public class ComActAcidCheckRecordApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 列表查询
+ *
+ * @param comActAcidCheckRecordDTO 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = ComActAcidCheckRecordVO.class)
+ //@OperLog(operModul = "分页查询排查数据",operType = 1)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody ComActAcidCheckRecordDTO comActAcidCheckRecordDTO) {
+ return this.communityService.selectAllComActAcidCheckRecord(comActAcidCheckRecordDTO);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ //@OperLog(operModul = "查询单条排查数据",operType = 1)
+ @ApiOperation(value = "通过主键查询单条数据",response = ComActAcidCheckRecordVO.class)
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.selectOneComActAcidCheckRecord(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActAcidCheckRecordVO 实体对象
+ * @return 新增结果
+ */
+ //@OperLog(operModul = "新增排查数据",operType = 1)
+ @ApiOperation(value = "新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO) {
+ comActAcidCheckRecordVO.setUsername(this.getLoginUserInfo().getName());
+ return this.communityService.insertComActAcidCheckRecord(comActAcidCheckRecordVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActAcidCheckRecordVO 实体对象
+ * @return 修改结果
+ */
+ //@OperLog(operModul = "修改排查数据",operType = 1,businessType = Constants.UPDATE)
+ @ApiOperation(value = "修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO) {
+ return this.communityService.updateComActAcidCheckRecord(comActAcidCheckRecordVO);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidDangerMemberApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidDangerMemberApi.java
new file mode 100644
index 0000000..11353e0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidDangerMemberApi.java
@@ -0,0 +1,51 @@
+package com.panzhihua.community_backstage.api;
+
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import com.panzhihua.common.interfaces.OperLog;
+import com.panzhihua.common.model.dtos.community.acid.ComActAcidDangerMemberDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+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 com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.acid.PageDangerMemberDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidDangerMemberVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @title: ComActAcidDangerMemberApi
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description:
+ * @author: hans
+ * @date: 2022/04/27 15:54
+ */
+@Slf4j
+@Api(tags = {"风险人员"})
+@RestController
+@RequestMapping("comActAcidDangerMember")
+public class ComActAcidDangerMemberApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ //@OperLog(operModul = "后台查询风险人员",operType = 1)
+ @ApiOperation(value = "后台分页查询风险人员", response = ComActAcidDangerMemberVO.class)
+ @PostMapping("/queryAll")
+ public R pageDangerMember(@RequestBody @Valid ComActAcidDangerMemberDTO pageDangerMemberDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ pageDangerMemberDTO.setRelationName(loginUserInfo.retrieveRelationName());
+ return communityService.pageDangerMemberAdmin(pageDangerMemberDTO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidMemberApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidMemberApi.java
new file mode 100644
index 0000000..9dfa4c4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidMemberApi.java
@@ -0,0 +1,106 @@
+package com.panzhihua.community_backstage.api;
+
+
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.interfaces.OperLog;
+import com.panzhihua.common.model.dtos.community.acid.ComActAcidMemberDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 防疫工作人员表(ComActAcidMember)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 防疫工作人员表相关功能
+ *
+ * @author zzj
+ * @since 2022-04-24 16:12:08
+ */
+@Slf4j
+@Api(tags = {"防疫工作人员"})
+@RestController
+@RequestMapping("comActAcidMember")
+public class ComActAcidMemberApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ //@OperLog(operModul = "分页查询防疫工作人员列表",operType = 1)
+ @ApiOperation(value = "分页查询列表",response = ComActAcidMemberVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody ComActAcidMemberDTO commonPage) {
+ commonPage.setRelationName(this.getLoginUserInfo().retrieveRelationName());
+ return this.communityService.selectAllComActAcidMember(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ //@OperLog(operModul = "查询单条防疫工作人员信息",operType = 1)
+ @ApiOperation("通过主键查询单条数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return communityService.selectOneComActAcidMember(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActAcidMemberVO 实体对象
+ * @return 新增结果
+ */
+ //@OperLog(operModul = "新增防疫工作人员记录",operType = 1)
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActAcidMemberVO comActAcidMemberVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ comActAcidMemberVO.setRelationName(loginUserInfo.retrieveRelationName());
+ return communityService.insertComActAcidMember(comActAcidMemberVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActAcidMemberVO 实体对象
+ * @return 修改结果
+ */
+ //@OperLog(operModul = "修改防疫工作人员信息",operType = 1,businessType = Constants.UPDATE)
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActAcidMemberVO comActAcidMemberVO) {
+ return communityService.updateComActAcidMember(comActAcidMemberVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ //@OperLog(operModul = "删除防疫工作人员信息",operType = 1)
+ @ApiOperation("删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return communityService.deleteComActAcidMember(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java
new file mode 100644
index 0000000..e961726
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java
@@ -0,0 +1,428 @@
+package com.panzhihua.community_backstage.api;
+
+
+import cn.hutool.core.util.ArrayUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.alibaba.fastjson.JSONArray;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.interfaces.OperLog;
+import com.panzhihua.common.model.dtos.community.acid.BatchCheckAcidRecordDTO;
+import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.acid.ComAcidStaticVO;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordExcelReturn;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordExcelVO;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
+import com.panzhihua.common.model.vos.community.reserve.FiveCount;
+import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.FileUtil;
+import com.panzhihua.common.utlis.SFTPUtil;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FileUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static org.apache.commons.lang3.ObjectUtils.isEmpty;
+
+/**
+ * (ComActAcidRecord)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 相关功能
+ *
+ * @author zzj
+ * @since 2022-04-12 15:29:59
+ */
+@Slf4j
+@Api(tags = {"防疫登记"})
+@RestController
+@RequestMapping("comActAcidRecord")
+public class ComActAcidRecordApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+ @Value("${excel.userurl}")
+ private String excelUrl;
+ @Value("${ftp.username}")
+ private String userName;
+ // FTP 登录密码
+ @Value("${ftp.password}")
+ private String password;
+ // FTP 服务器地址IP地址
+ @Value("${ftp.host}")
+ private String host;
+ // FTP 端口
+ @Value("${ftp.port}")
+ private int port;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param comActAcidRecordDTO 查询实体
+ * @return 所有数据
+ */
+ @OperLog(operModul = "查询防疫登记信息列表",operType = 1)
+ @ApiOperation(value = "分页查询",response = ComActAcidRecordVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO) {
+ if(StringUtils.isEmpty(comActAcidRecordDTO.getLocalCity())){
+ comActAcidRecordDTO.setLocalCity(this.getLoginUserInfo().getName());
+ }
+ else {
+ String[] area={"东区","西区","仁和区","米易县","盐边县","钒钛新区"};
+ if(!ArrayUtil.contains(area,comActAcidRecordDTO.getLocalCity())){
+ if(!comActAcidRecordDTO.getLocalCity().contains(",")&&this.getLoginUserInfo().getType()==9){
+ comActAcidRecordDTO.setLocalCity(this.getLoginUserInfo().getName()+","+comActAcidRecordDTO.getLocalCity());
+ }
+ }
+
+ }
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ comActAcidRecordDTO.setLoginAccount(loginUserInfo.getAccount());
+ return this.communityService.selectAllComActAcidRecord(comActAcidRecordDTO);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @OperLog(operModul = "查询单条防疫信息",operType = 1)
+ @ApiOperation(value = "通过主键查询单条数据",response = ComActAcidRecordVO.class)
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.selectOneComActAcidRecord(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActAcidRecordVO 实体对象
+ * @return 新增结果
+ */
+ @OperLog(operModul = "新增防疫信息数据",operType = 1)
+ @ApiOperation(value = "新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
+ return this.communityService.insertComActAcidRecord(comActAcidRecordVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActAcidRecordVO 实体对象
+ * @return 修改结果
+ */
+ @OperLog(operModul = "修改防疫信息数据",operType = 1,businessType = Constants.UPDATE)
+ @ApiOperation(value = "修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
+ comActAcidRecordVO.setUserId(this.getUserId());
+ return this.communityService.updateComActAcidRecord(comActAcidRecordVO);
+ }
+
+
+ @OperLog(operModul = "批量核对防疫信息数据", operType = 1)
+ @ApiOperation(value = "批量核对防疫信息数据")
+ @PostMapping("/batchCheck")
+ public R batchCheck(@RequestBody @Valid BatchCheckAcidRecordDTO batchCheckAcidRecordDTO) {
+ return this.communityService.batchCheck(batchCheckAcidRecordDTO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @OperLog(operModul = "删除防疫信息数据",operType = 1)
+ @ApiOperation(value = "删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.deleteComActAcidRecord(id);
+ }
+
+ @OperLog(operModul = "导出防疫信息",operType = 1)
+ @ApiOperation(value = "导出")
+ @PostMapping("/export")
+ public R export(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO) {
+ String name = "防疫登记信息导出"+System.currentTimeMillis()+".xlsx";
+ String property = System.getProperty("user.dir");
+ String sourceFile =property+File.separator+"acid"+File.separator+System.currentTimeMillis()+File.separator;
+ String zipFile=property+File.separator+"zip"+File.separator;
+ String ftpUrl = "/mnt/data/web/excel/";
+ // 用户搜索了就下载搜索的用户否则下载所有用户
+ if(StringUtils.isEmpty(comActAcidRecordDTO.getLocalCity())){
+ comActAcidRecordDTO.setLocalCity(this.getLoginUserInfo().getName());
+ }
+ R r = communityService.exportComActAcidRecord(comActAcidRecordDTO);
+ if (R.isOk(r)) {
+ File directory=new File(sourceFile);
+ if(!directory.exists()){
+ directory.mkdirs();
+ }
+ List<ComActAcidRecordExcelVO> excelVOS=new ArrayList<>();
+ List<ComActAcidRecordExcelReturn> list= JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActAcidRecordExcelReturn.class);
+ if(!CollectionUtils.isEmpty(list)){
+ list.forEach(li->{
+ ComActAcidRecordExcelVO comActAcidRecordExcelVO=new ComActAcidRecordExcelVO();
+ BeanUtils.copyProperties(li,comActAcidRecordExcelVO);
+ if(StringUtils.isNotEmpty(li.getTravelImage())){
+ try {
+ File image=new File(sourceFile+"/"+li.getName()+"行程码.jpg");
+ FileUtils.copyURLToFile(new URL(li.getTravelImage()),image);
+ //comActAcidRecordExcelVO.setAcidImage(new URL(li.getAcidImage()));
+ //comActAcidRecordExcelVO.setTravelImage(new URL(li.getTravelImage()));
+ //comActAcidRecordExcelVO.setVaccinationImage(new URL(li.getVaccinationImage()));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ if(StringUtils.isNotEmpty(li.getColorImage())){
+ try {
+ File image=new File(sourceFile+"/"+li.getName()+"健康码.jpg");
+ FileUtils.copyURLToFile(new URL(li.getColorImage()),image);
+ //comActAcidRecordExcelVO.setAcidImage(new URL(li.getAcidImage()));
+ //comActAcidRecordExcelVO.setColorImage(new URL(li.getColorImage()));
+ //comActAcidRecordExcelVO.setVaccinationImage(new URL(li.getVaccinationImage()));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ if(StringUtils.isNotEmpty(li.getAcidImage())&&li.getLocalCity().contains("仁和区")){
+ try {
+ File image=new File(sourceFile+"/"+li.getName()+"核酸截图.jpg");
+ FileUtils.copyURLToFile(new URL(li.getAcidImage()),image);
+ //comActAcidRecordExcelVO.setAcidImage(new URL(li.getAcidImage()));
+ //comActAcidRecordExcelVO.setColorImage(new URL(li.getColorImage()));
+ //comActAcidRecordExcelVO.setVaccinationImage(new URL(li.getVaccinationImage()));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ if(li.getCheckStatus()==0){
+ comActAcidRecordExcelVO.setCheckStatus("否");
+ }
+ else{
+ comActAcidRecordExcelVO.setCheckStatus("是");
+ }
+ excelVOS.add(comActAcidRecordExcelVO);
+ });
+ }
+ try {
+ SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String fileName = sourceFile + File.separator + name;
+ // 这里 需要指定写用哪个class去写
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ excelWriter = EasyExcel.write(fileName, ComActAcidRecordExcelVO.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet( "导出").build();
+ excelWriter.write(excelVOS, writeSheet);
+ excelWriter.finish();
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ }
+ FileUtil.compressToZip(sourceFile,zipFile,"防疫登记信息.zip");
+ String currentDateString = String.valueOf(System.currentTimeMillis());
+ String zipName = "防疫登记信息_"+ currentDateString+".zip";
+ InputStream input=new FileInputStream(zipFile+"防疫登记信息.zip");
+ sftp.uploadMore(ftpUrl, zipName , input);
+ sftp.logout();
+ input.close();
+ return R.ok(excelUrl + zipName);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+ return r;
+ }
+
+ @ApiOperation(value = "导出不带截图")
+ @PostMapping("/exportNoImage")
+ public R exportNoImage(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO) {
+ String name = "防疫登记信息导出"+System.currentTimeMillis()+".xlsx";
+ String property = System.getProperty("user.dir");
+ String sourceFile =property+File.separator+"acid"+File.separator+System.currentTimeMillis()+File.separator;
+ String zipFile=property+File.separator+"zip"+File.separator;
+ String ftpUrl = "/mnt/data/web/excel/";
+ // 用户搜索了就下载搜索的用户否则下载所有用户
+ if(StringUtils.isEmpty(comActAcidRecordDTO.getLocalCity())){
+ comActAcidRecordDTO.setLocalCity(this.getLoginUserInfo().getName());
+ }
+ R r = communityService.exportComActAcidRecord(comActAcidRecordDTO);
+ if (R.isOk(r)) {
+ File directory=new File(sourceFile);
+ if(!directory.exists()){
+ directory.mkdirs();
+ }
+ List<ComActAcidRecordExcelVO> excelVOS=new ArrayList<>();
+ List<ComActAcidRecordExcelReturn> list= JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActAcidRecordExcelReturn.class);
+ if(!CollectionUtils.isEmpty(list)){
+ list.forEach(li->{
+ ComActAcidRecordExcelVO comActAcidRecordExcelVO=new ComActAcidRecordExcelVO();
+ BeanUtils.copyProperties(li,comActAcidRecordExcelVO);
+// if(StringUtils.isNotEmpty(li.getTravelImage())){
+// try {
+// File image=new File(sourceFile+"/"+li.getName()+"行程码.jpg");
+// FileUtils.copyURLToFile(new URL(li.getTravelImage()),image);
+// //comActAcidRecordExcelVO.setAcidImage(new URL(li.getAcidImage()));
+// //comActAcidRecordExcelVO.setTravelImage(new URL(li.getTravelImage()));
+// //comActAcidRecordExcelVO.setVaccinationImage(new URL(li.getVaccinationImage()));
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
+// if(StringUtils.isNotEmpty(li.getColorImage())){
+// try {
+// File image=new File(sourceFile+"/"+li.getName()+"健康码.jpg");
+// FileUtils.copyURLToFile(new URL(li.getColorImage()),image);
+// //comActAcidRecordExcelVO.setAcidImage(new URL(li.getAcidImage()));
+// //comActAcidRecordExcelVO.setColorImage(new URL(li.getColorImage()));
+// //comActAcidRecordExcelVO.setVaccinationImage(new URL(li.getVaccinationImage()));
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
+// if(StringUtils.isNotEmpty(li.getAcidImage())&&li.getLocalCity().contains("仁和区")){
+// try {
+// File image=new File(sourceFile+"/"+li.getName()+"核酸截图.jpg");
+// FileUtils.copyURLToFile(new URL(li.getAcidImage()),image);
+// //comActAcidRecordExcelVO.setAcidImage(new URL(li.getAcidImage()));
+// //comActAcidRecordExcelVO.setColorImage(new URL(li.getColorImage()));
+// //comActAcidRecordExcelVO.setVaccinationImage(new URL(li.getVaccinationImage()));
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
+ if(li.getCheckStatus()==0){
+ comActAcidRecordExcelVO.setCheckStatus("否");
+ }
+ else{
+ comActAcidRecordExcelVO.setCheckStatus("是");
+ }
+ excelVOS.add(comActAcidRecordExcelVO);
+ });
+ }
+ try {
+ SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String fileName = sourceFile + File.separator + name;
+ // 这里 需要指定写用哪个class去写
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ excelWriter = EasyExcel.write(fileName, ComActAcidRecordExcelVO.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet( "导出").build();
+ excelWriter.write(excelVOS, writeSheet);
+ excelWriter.finish();
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ }
+ FileUtil.compressToZip(sourceFile,zipFile,"防疫登记信息.zip");
+ String currentDateString = String.valueOf(System.currentTimeMillis());
+ String zipName = "防疫登记信息_"+ currentDateString+".zip";
+ InputStream input=new FileInputStream(zipFile+"防疫登记信息.zip");
+ sftp.uploadMore(ftpUrl, zipName , input);
+ sftp.logout();
+ input.close();
+ return R.ok(excelUrl + zipName);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+ return r;
+ }
+
+
+ /**
+ * 5项常规统计
+ * @return
+ */
+ @OperLog(operModul = "防疫信息五项常规统计",operType = 1)
+ @ApiOperation(value = "5项常规统计",response = FiveCount.class)
+ @GetMapping("fiveCount")
+ public R fiveCount(@RequestParam("localCity")String localCity){
+ return this.communityService.comActAcidRecordFiveCount(localCity);
+ }
+
+ /**
+ * 5项常规统计
+ * @return
+ */
+ @OperLog(operModul = "防疫信息7项常规统计",operType = 1)
+ @ApiOperation(value = "7项常规统计",response = FiveCount.class)
+ @GetMapping("fiveCountPlus")
+ public R fiveCountPlus(@RequestParam("date")String date,@RequestParam(value = "localCity",required = false)String localCity){
+ if(StringUtils.isNotEmpty(localCity)){
+ return this.communityService.comActAcidRecordFiveCountPlus(date,localCity,this.getLoginUserInfo().getAccount());
+ }
+ return this.communityService.comActAcidRecordFiveCountPlus(date,this.getLoginUserInfo().getName(),this.getLoginUserInfo().getAccount());
+ }
+
+
+ @OperLog(operModul = "防疫信息报表统计",operType = 1)
+ @ApiOperation(value = "报表统计",response = ComAcidStaticVO.class)
+ @GetMapping("/statics")
+ public R statics(@RequestParam("date")String date){
+ return this.communityService.comActAcidRecordStatics(date);
+ }
+
+ @GetMapping("/test")
+ public R test(){
+ return this.communityService.test();
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActActivityCodeApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActActivityCodeApi.java
new file mode 100644
index 0000000..3928435
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActActivityCodeApi.java
@@ -0,0 +1,56 @@
+package com.panzhihua.community_backstage.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 签到二维码表(ComActActivityCode)表控制层
+ *
+ * @author makejava
+ * @since 2021-10-15 15:23:10
+ */
+@Slf4j
+@Api(tags = {"活动二维码"})
+@RestController
+@RequestMapping("comActActivityCode")
+public class ComActActivityCodeApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 查看二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @ApiOperation("查看二维码")
+ @PostMapping("/getQRCode")
+ public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO){
+ return this.communityService.getQRCode(qrCodeVO);
+ }
+
+ /**
+ * 重置二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @ApiOperation("重置二维码")
+ @PostMapping("/resetQRCode")
+ public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO){
+ return this.communityService.resetQRCode(qrCodeVO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAnnouncementApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAnnouncementApi.java
new file mode 100644
index 0000000..c980643
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAnnouncementApi.java
@@ -0,0 +1,133 @@
+package com.panzhihua.community_backstage.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * (ComActAnnouncement)表控制层
+ *
+ * @author makejava
+ * @since 2021-11-01 13:45:55
+ */
+@Slf4j
+@Api(tags = {"通知公告"})
+@RestController
+@RequestMapping("comActAnnouncement")
+public class ComActAnnouncementApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private UserService userService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询所有数据",response = ComActAnnouncementVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setCommunityId(this.getCommunityId());
+ return this.communityService.comActAnnouncementSelectAll(commonPage);
+ }
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询所有数据(物业公告)",response = ComActAnnouncementVO.class)
+ @PostMapping("queryAllProperty")
+ public R selectAllProperty(@RequestBody CommonPage commonPage) {
+ //commonPage.setCommunityId(this.getCommunityId());
+ commonPage.setPropertyId(userService.detailUser(this.getLoginUserInfo().getUserId()).getData().getPropertyId());
+ return this.communityService.comActAnnouncementSelectAll(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("通过主键查询单条数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.comActAnnouncementSelectOne(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActAnnouncementVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActAnnouncementVO comActAnnouncementVO) {
+ comActAnnouncementVO.setCreateTime(new Date());
+ comActAnnouncementVO.setCommunityId(this.getCommunityId());
+ comActAnnouncementVO.setUserId(this.getUserId());
+ return this.communityService.comActAnnouncementInsert(comActAnnouncementVO);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActAnnouncementVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增物业公告")
+ @PostMapping("/addPropertyAnnouncement")
+ public R insertProperty(@RequestBody ComActAnnouncementVO comActAnnouncementVO) {
+ comActAnnouncementVO.setCreateTime(new Date());
+ //comActAnnouncementVO.setCommunityId(this.getCommunityId());
+ comActAnnouncementVO.setUserId(this.getUserId());
+ comActAnnouncementVO.setPropertyId(userService.detailUser(this.getLoginUserInfo().getUserId()).getData().getPropertyId());
+ return this.communityService.comActAnnouncementInsert(comActAnnouncementVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActAnnouncementVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActAnnouncementVO comActAnnouncementVO) {
+ return this.communityService.comActAnnouncementUpdate(comActAnnouncementVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.comActAnnouncementDelete(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActColumnApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActColumnApi.java
new file mode 100644
index 0000000..fbc3b2e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActColumnApi.java
@@ -0,0 +1,134 @@
+package com.panzhihua.community_backstage.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActColumnVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * 分类列表(ComActColumn)表控制层
+ *
+ * @author makejava
+ * @since 2021-10-20 17:28:14
+ */
+@Slf4j
+@Api(tags = {"分类管理"})
+@RestController
+@RequestMapping("comActColumn")
+public class ComActColumnApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询所有数据",response = ComActColumnVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ if(this.getLoginUserInfo().getStreetId()!=null){
+ commonPage.setStreetId(this.getLoginUserInfo().getStreetId());
+ }
+ else {
+ commonPage.setCommunityId(this.getCommunityId());
+ }
+ return this.communityService.comActColumnSelectAll(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("通过主键查询单条数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.comActColumnSelectOne(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActColumnVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActColumnVO comActColumnVO) {
+ if(this.getLoginUserInfo().getStreetId()!=null){
+ comActColumnVO.setStreetId(this.getLoginUserInfo().getStreetId());
+ }
+ else {
+ comActColumnVO.setCommunityId(this.getCommunityId());
+ }
+ if(comActColumnVO.getStatus()==null){
+ comActColumnVO.setStatus(1);
+ }
+ comActColumnVO.setCreateTime(new Date());
+ if(StringUtils.isNotEmpty(this.getLoginUserInfo().getName())){
+ comActColumnVO.setCreateBy(this.getLoginUserInfo().getName());
+ }
+ return communityService.comActColumnInsert(comActColumnVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActColumnVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActColumnVO comActColumnVO) {
+ comActColumnVO.setUpdateTime(new Date());
+ if(StringUtils.isNotEmpty(this.getLoginUserInfo().getName())){
+ comActColumnVO.setUpdateBy(this.getLoginUserInfo().getName());
+ }
+ return this.communityService.comActColumnUpdate(comActColumnVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.comActColumnDelete(id);
+ }
+
+ /**
+ * 项目分类级联查询
+ */
+ @ApiOperation("项目分类级联查询")
+ @PostMapping("/queryLevel")
+ public R queryLevel(@RequestBody ComActColumnVO comActColumnVO){
+ if(this.getLoginUserInfo().getStreetId()!=null){
+ comActColumnVO.setStreetId(this.getLoginUserInfo().getStreetId());
+ }
+ else {
+ comActColumnVO.setCommunityId(this.getCommunityId());
+ }
+ return this.communityService.queryLevel(comActColumnVO);
+ }
+}
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActCommitteeApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActCommitteeApi.java
new file mode 100644
index 0000000..6af0bdf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActCommitteeApi.java
@@ -0,0 +1,75 @@
+package com.panzhihua.community_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
+import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zzj
+ */
+@Slf4j
+@Api(tags = {"业主委员会"})
+@RestController
+@RequestMapping("/comActCommittee")
+public class ComActCommitteeApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "业主委员会列表",response = ComActCommiteeVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setParamId(this.getCommunityId());
+ return this.communityService.comActCommitteeSelectAll(commonPage);
+ }
+ /**
+ * 新增数据
+ *
+ * @param comActCommiteeVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增业主委员会")
+ @PostMapping
+ public R insert(@RequestBody ComActCommiteeVO comActCommiteeVO) {
+ comActCommiteeVO.setCommunityId(this.getCommunityId());
+ return this.communityService.comActCommitteeInsert(comActCommiteeVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActCommiteeVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改业主委员会")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActCommiteeVO comActCommiteeVO) {
+ return this.communityService.comActCommitteeUpdate(comActCommiteeVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除业主委员会")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.comActCommitteeDelete(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActDpcApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActDpcApi.java
new file mode 100644
index 0000000..9d49495
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActDpcApi.java
@@ -0,0 +1,83 @@
+package com.panzhihua.community_backstage.api;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
+import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
+import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActDpcVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @title: ComActDpcApi
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 人大代表
+ * @author: hans
+ * @date: 2022/06/07 10:57
+ */
+@Slf4j
+@Api(tags = {"人大代表相关"})
+@RestController
+@RequestMapping("/dpc")
+public class ComActDpcApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation("新增人大代表")
+ @PostMapping("/add")
+ public R addDpc(@RequestBody @Valid AddDpcDTO addDpcDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ addDpcDTO.setCreatedBy(loginUserInfo.getUserId());
+ addDpcDTO.setUpdatedBy(loginUserInfo.getUserId());
+ addDpcDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.addDpc(addDpcDTO);
+ }
+
+ @ApiOperation("修改人大代表")
+ @PostMapping("/edit")
+ public R editDpc(@RequestBody @Valid EditDpcDTO editDpcDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ editDpcDTO.setUpdatedBy(loginUserInfo.getUserId());
+ return communityService.editDpc(editDpcDTO);
+ }
+
+ @ApiOperation("删除人大代表")
+ @ApiImplicitParam(name = "id", value = "人大代表id", required = true)
+ @DeleteMapping("/delete")
+ public R deleteDpc(@RequestParam("id") Long id) {
+ return communityService.deleteDpc(id);
+ }
+
+ @ApiOperation(value = "获取人大代表详情", response = ComActDpcVO.class)
+ @ApiImplicitParam(name = "id", value = "人大代表id", required = true)
+ @GetMapping("/detail")
+ public R detailDpc(@RequestParam("id") Long id) {
+ return communityService.detailDpc(id);
+ }
+
+ @ApiOperation(value = "分页查询人大代表", response = ComActDpcVO.class)
+ @PostMapping("/page")
+ public R pageDpc(@RequestBody @Valid PageDpcDTO pageDpcDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ pageDpcDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.pageDpc(pageDpcDTO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActEasyPhotoMemberApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActEasyPhotoMemberApi.java
new file mode 100644
index 0000000..7afb14a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActEasyPhotoMemberApi.java
@@ -0,0 +1,97 @@
+package com.panzhihua.community_backstage.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoMemberVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 随手拍网格员(ComActEasyPhotoMember)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 随手拍网格员相关功能
+ *
+ * @author zzj
+ * @since 2022-04-12 10:33:26
+ */
+@Slf4j
+@Api(tags = {"随手拍网格员"})
+@RestController
+@RequestMapping("comActEasyPhotoMember")
+public class ComActEasyPhotoMemberApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = ComActEasyPhotoMemberVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setCommunityId(this.getCommunityId());
+ return this.communityService.comActEasyPhotoMemberSelectAll(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation(value = "详情",response = ComActEasyPhotoMemberVO.class)
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return communityService.comActEasyPhotoMemberSelectOne(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActEasyPhotoMemberVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO) {
+ comActEasyPhotoMemberVO.setCommunityId(this.getCommunityId());
+ return communityService.comActEasyPhotoMemberInsert(comActEasyPhotoMemberVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActEasyPhotoMemberVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO) {
+ return communityService.comActEasyPhotoMemberUpdate(comActEasyPhotoMemberVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return communityService.comActEasyPhotoMemberDelete(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActEnterpriseApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActEnterpriseApi.java
new file mode 100644
index 0000000..9fb69f4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActEnterpriseApi.java
@@ -0,0 +1,93 @@
+package com.panzhihua.community_backstage.api;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseDTO;
+import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseDTO;
+import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseDTO;
+import com.panzhihua.common.model.vos.community.ComActEnterpriseVO;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.fms.AddTeamTypeDTO;
+import com.panzhihua.common.model.dtos.community.fms.EditTeamTypeDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageTeamMemberDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberVO;
+import com.panzhihua.common.model.vos.community.fms.ComFmsTeamTypeVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+import static java.util.Objects.nonNull;
+
+/**
+ * @title: ComActEnterpriseApi
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 社区企业管理
+ * @author: hans
+ * @date: 2022/05/31 10:22
+ */
+@Slf4j
+@Api(tags = {"社区企业管理"})
+@RestController
+@RequestMapping("/enterprise")
+public class ComActEnterpriseApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation("新增社区企业")
+ @PostMapping("/add")
+ public R addEnterprise(@RequestBody @Valid AddEnterpriseDTO addEnterpriseDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ addEnterpriseDTO.setCreatedBy(loginUserInfo.getUserId());
+ addEnterpriseDTO.setUpdatedBy(loginUserInfo.getUserId());
+ return communityService.addEnterprise(addEnterpriseDTO);
+ }
+
+ @ApiOperation("修改社区企业")
+ @PostMapping("/edit")
+ public R editEnterprise(@RequestBody @Valid EditEnterpriseDTO editEnterpriseDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ editEnterpriseDTO.setUpdatedBy(loginUserInfo.getUserId());
+ return communityService.editEnterprise(editEnterpriseDTO);
+ }
+
+ @ApiOperation("删除社区企业")
+ @ApiImplicitParam(name = "id", value = "社区企业id", required = true)
+ @DeleteMapping("/delete")
+ public R deleteEnterprise(@RequestParam("id") Long id) {
+ return communityService.deleteEnterprise(id);
+ }
+
+ @ApiOperation(value = "获取社区企业详情", response = ComActEnterpriseVO.class)
+ @ApiImplicitParam(name = "id", value = "社区企业id", required = true)
+ @GetMapping("/detail")
+ public R detailEnterprise(@RequestParam("id") Long id) {
+ return communityService.detailEnterprise(id);
+ }
+
+ @ApiOperation(value = "分页查询社区企业", response = ComActEnterpriseVO.class)
+ @PostMapping("/page")
+ public R pageEnterprise(@RequestBody @Valid PageEnterpriseDTO pageEnterpriseDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (nonNull(loginUserInfo.getStreetId())) {
+ pageEnterpriseDTO.setStreetId(loginUserInfo.getStreetId());
+ } else {
+ pageEnterpriseDTO.setCommunityId(loginUserInfo.getCommunityId());
+ }
+ return communityService.pageEnterprise(pageEnterpriseDTO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActEnterpriseTypeApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActEnterpriseTypeApi.java
new file mode 100644
index 0000000..edf9416
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActEnterpriseTypeApi.java
@@ -0,0 +1,97 @@
+package com.panzhihua.community_backstage.api;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseDTO;
+import com.panzhihua.common.model.dtos.community.enterprise.AddEnterpriseTypeDTO;
+import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseDTO;
+import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseTypeDTO;
+import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseTypeDTO;
+import com.panzhihua.common.model.vos.community.ComActEnterpriseTypeVO;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActEnterpriseVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @title: ComActEnterpriseTypeApi
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 社区企业服务分类管理
+ * @author: hans
+ * @date: 2022/06/06 15:47
+ */
+@Slf4j
+@Api(tags = {"社区企业服务分类管理"})
+@RestController
+@RequestMapping("/enterpriseType")
+public class ComActEnterpriseTypeApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation("新增服务分类")
+ @PostMapping("/add")
+ public R addEnterpriseType(@RequestBody @Valid AddEnterpriseTypeDTO addEnterpriseTypeDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ addEnterpriseTypeDTO.setCreatedBy(loginUserInfo.getUserId());
+ addEnterpriseTypeDTO.setUpdatedBy(loginUserInfo.getUserId());
+ addEnterpriseTypeDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.addEnterpriseType(addEnterpriseTypeDTO);
+ }
+
+ @ApiOperation("修改服务分类")
+ @PostMapping("/edit")
+ public R editEnterpriseType(@RequestBody @Valid EditEnterpriseTypeDTO enterpriseTypeDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ enterpriseTypeDTO.setUpdatedBy(loginUserInfo.getUserId());
+ enterpriseTypeDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.editEnterpriseType(enterpriseTypeDTO);
+ }
+
+ @ApiOperation("删除服务分类")
+ @ApiImplicitParam(name = "id", value = "服务分类id", required = true)
+ @DeleteMapping("/delete")
+ public R deleteEnterpriseType(@RequestParam("id") Long id) {
+ return communityService.deleteEnterpriseType(id);
+ }
+
+ @ApiOperation(value = "获取服务分类详情", response = ComActEnterpriseTypeVO.class)
+ @ApiImplicitParam(name = "id", value = "服务分类id", required = true)
+ @GetMapping("/detail")
+ public R detailEnterpriseType(@RequestParam("id") Long id) {
+ return communityService.detailEnterpriseType(id);
+ }
+
+ @ApiOperation(value = "分页查询服务分类", response = ComActEnterpriseTypeVO.class)
+ @PostMapping("/page")
+ public R pageEnterpriseType(@RequestBody @Valid PageEnterpriseTypeDTO pageEnterpriseTypeDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ pageEnterpriseTypeDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.pageEnterpriseType(pageEnterpriseTypeDTO);
+ }
+
+ @ApiOperation(value = "获取服务分类列表", response = ComActEnterpriseTypeVO.class)
+ @GetMapping("/list")
+ public R getEnterpriseTypeList() {
+ return communityService.getEnterpriseTypeList(this.getCommunityId());
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActFeedBackApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActFeedBackApi.java
new file mode 100644
index 0000000..35ca76c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActFeedBackApi.java
@@ -0,0 +1,68 @@
+package com.panzhihua.community_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
+import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.user.SysUserFeedbackVO;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.validated.PageGroup;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+import static java.util.Objects.nonNull;
+
+@RestController
+@RequestMapping("/feedBack")
+@Api(tags = "问题留言和投诉建议")
+public class ComActFeedBackApi extends BaseController {
+ @Resource
+ private UserService userService;
+
+ @ApiOperation(value = "分页查询用户意见反馈", response = SysUserFeedbackVO.class)
+ @PostMapping("pagefeedback")
+ public R pageFeedback(@RequestBody @Validated(PageGroup.class) PageFeedBackDTO pageFeedBackDTO) {
+ pageFeedBackDTO.setAreaCode(this.getAreaCode());
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ LoginUserInfoVO user = userService.detailUser(loginUserInfo.getUserId()).getData();
+ if(nonNull(user.getPropertyId())){
+ pageFeedBackDTO.setPropertyId(user.getPropertyId());
+ }
+ return userService.pageFeedback(pageFeedBackDTO);
+ }
+
+ @ApiOperation(value = "分页查询用户意见反馈", response = SysUserFeedbackVO.class)
+ @PostMapping("pagefeedbackProperty")
+ public R pageFeedbackProperty(@RequestBody @Validated(PageGroup.class) PageFeedBackDTO pageFeedBackDTO) {
+ //pageFeedBackDTO.setAreaCode(this.getAreaCode());
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ LoginUserInfoVO user = userService.detailUser(loginUserInfo.getUserId()).getData();
+ if(nonNull(user.getPropertyId())){
+ pageFeedBackDTO.setPropertyId(user.getPropertyId());
+ }
+ return userService.pageFeedback(pageFeedBackDTO);
+ }
+
+ @ApiOperation(value = "反馈意见详情", response = SysUserFeedbackVO.class)
+ @GetMapping("feedback")
+ public R detailFeedback(@RequestParam("id") Long id) {
+ return userService.detailFeedback(id);
+ }
+
+ @ApiOperation(value = "删除意见反馈")
+ @DeleteMapping("feedback")
+ public R deleteFeedback(@RequestParam("id") Long id) {
+ return userService.deleteFeedback(id);
+ }
+
+ @ApiOperation("回复意见反馈或修改意见反馈回复")
+ @PostMapping("feedback")
+ public R replyFeedBack(@RequestBody SysUserFeedbackVO sysUserFeedbackVO){
+ return userService.updateFeedBack(sysUserFeedbackVO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActFourMemberApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActFourMemberApi.java
new file mode 100644
index 0000000..be080e8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActFourMemberApi.java
@@ -0,0 +1,103 @@
+package com.panzhihua.community_backstage.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * (ComActFourMember)表控制层
+ *
+ * @author makejava
+ * @since 2021-09-23 10:13:31
+ */
+@Slf4j
+@Api(tags = {"四长四员"})
+@RestController
+@RequestMapping("comActFourMember")
+public class ComActFourMemberApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = ComActFourMemberVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setParamId(this.getCommunityId());
+ return this.communityService.comActFourMemberSelectAll(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation(value ="通过主键查询单条数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.comActFourMemberSelectOne(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActFourMember 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation(value ="新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActFourMemberVO comActFourMember) {
+ comActFourMember.setCommunityId(this.getCommunityId());
+ return this.communityService.comActFourMemberInsert(comActFourMember);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActFourMember 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation(value ="修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActFourMemberVO comActFourMember) {
+ return this.communityService.comActFourMemberUpdate(comActFourMember);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param comActFourMember 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation(value ="删除数据")
+ @PostMapping("del")
+ public R delete(@RequestBody ComActFourMemberVO comActFourMember) {
+ return this.communityService.comActFourMemberDelete(comActFourMember);
+ }
+
+ /**
+ * 楼栋列表
+ */
+ @ApiOperation("楼栋列表")
+ @GetMapping("/building")
+ public R building(){
+ return communityService.comActFourMemberQueryBuilding(this.getCommunityId());
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActIntegralUserApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActIntegralUserApi.java
new file mode 100644
index 0000000..6627042
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActIntegralUserApi.java
@@ -0,0 +1,61 @@
+package com.panzhihua.community_backstage.api;
+
+import javax.annotation.Resource;
+
+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 com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO;
+import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO;
+import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.integral.admin.ComActIntegralUserRuleAdminVO;
+import com.panzhihua.common.model.vos.community.integral.admin.ComActIntegralUserTradeAdminVO;
+import com.panzhihua.common.service.community.CommunityService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequestMapping("/integral/")
+@Api(tags = {"积分模块"})
+public class ComActIntegralUserApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "查询社区积分规则列表", response = ComActIntegralUserRuleAdminVO.class)
+ @PostMapping("/rule/list")
+ public R getIntegralRuleAdminList(@RequestBody PageComActIntegralRuleDTO integralRuleDTO) {
+ LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
+ if (userInfoVO == null) {
+ return R.fail("请先登录");
+ }
+ integralRuleDTO.setCommunityId(userInfoVO.getCommunityId());
+ return communityService.getIntegralRuleAdminList(integralRuleDTO);
+ }
+
+ @ApiOperation(value = "编辑社区积分规则")
+ @PostMapping("/rule/edit")
+ public R editIntegralRuleAdmin(@RequestBody EditComActIntegralRuleDTO integralRuleDTO) {
+ return communityService.editIntegralRuleAdmin(integralRuleDTO);
+ }
+
+ @ApiOperation(value = "分页查询社区积分明细", response = ComActIntegralUserTradeAdminVO.class)
+ @PostMapping("/user/trade/page")
+ public R getIntegralTradeListAdmin(@RequestBody PageComActIntegralTradeDTO integralRuleDTO) {
+ LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
+ if (userInfoVO == null) {
+ return R.fail("请先登录");
+ }
+ integralRuleDTO.setCommunityId(userInfoVO.getCommunityId());
+ return communityService.getIntegralTradeListAdmin(integralRuleDTO);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActPorceedingsApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActPorceedingsApi.java
new file mode 100644
index 0000000..ee3fe04
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActPorceedingsApi.java
@@ -0,0 +1,41 @@
+package com.panzhihua.community_backstage.api;
+
+import com.panzhihua.common.model.dtos.community.ComActProceedingsDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActProceedingsVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/proceedings")
+@Api(tags = {"议事委员会"})
+public class ComActPorceedingsApi {
+
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "分页查询议事委员会列表",response = ComActProceedingsVO.class)
+ @GetMapping
+ public R list(@RequestParam(value = "page",required = false) Integer page,
+ @RequestParam(value = "size",required = false) Integer size,
+ @RequestParam(value = "keyWord",required = false) String keyWord){
+ return communityService.proceedingsList(page, size, keyWord);
+ }
+
+ @ApiOperation("新增或修改议事委员会")
+ @PostMapping
+ public R addOrUpdate(@RequestBody ComActProceedingsDTO comActProceedingsDTO){
+ return communityService.addOrUpdateProceedings(comActProceedingsDTO);
+ }
+
+ @DeleteMapping("/{id}")
+ @ApiOperation("删除议事委员会")
+ public R remove(@PathVariable Long id){
+ return communityService.removeProceedings(id);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActRaffleApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActRaffleApi.java
new file mode 100644
index 0000000..e165748
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActRaffleApi.java
@@ -0,0 +1,97 @@
+package com.panzhihua.community_backstage.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 抽奖活动表(ComActRaffle)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:31:20
+ */
+@Slf4j
+@Api(tags = {"抽奖活动"})
+@RestController
+@RequestMapping("comActRaffle")
+public class ComActRaffleApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = ComActRaffleVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setCommunityId(this.getCommunityId());
+ return this.communityService.selectAllComActRaffle(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation(value = "详情",response = ComActRaffleVO.class)
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.selectOneComActRaffle(id,0L);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActRaffleVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation(value = "新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActRaffleVO comActRaffleVO) {
+ comActRaffleVO.setCommunityId(this.getCommunityId());
+ comActRaffleVO.setCreateBy(this.getUserId());
+ return this.communityService.insertComActRaffle(comActRaffleVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActRaffleVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation(value = "修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActRaffleVO comActRaffleVO) {
+ return this.communityService.updateComActRaffle(comActRaffleVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation(value = "删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.deleteComActRaffle(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActRaffleRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActRaffleRecordApi.java
new file mode 100644
index 0000000..63116d1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActRaffleRecordApi.java
@@ -0,0 +1,133 @@
+package com.panzhihua.community_backstage.api;
+
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.alibaba.fastjson.JSONArray;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordExcelVO;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
+import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.SFTPUtil;
+import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.Serializable;
+
+/**
+ * 抽奖活动中奖记录表(ComActRaffleRecord)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动中奖记录表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:32:02
+ */
+@Slf4j
+@Api(tags = {"获奖记录"})
+@RestController
+@RequestMapping("comActRaffleRecord")
+public class ComActRaffleRecordApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ @Value("${excel.userurl}")
+ private String excelUrl;
+ // FTP 登录用户名
+ @Value("${ftp.username}")
+ private String userName;
+ // FTP 登录密码
+ @Value("${ftp.password}")
+ private String password;
+ // FTP 服务器地址IP地址
+ @Value("${ftp.host}")
+ private String host;
+ // FTP 端口
+ @Value("${ftp.port}")
+ private int port;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = ComActRaffleRecordVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.communityService.selectAllComActRaffleRecord(commonPage);
+ }
+ @ApiOperation(value = "根据抽奖活动id获取奖品统计")
+ @GetMapping("/queryPrize")
+ public R queryPrize(@RequestParam("id")Long id){
+ return this.communityService.queryPrize(id);
+ }
+ @ApiOperation(value = "导出")
+ @PostMapping("/export")
+ public R export(@RequestBody CommonPage commonPage) {
+ String name = "获奖名单.xlsx";
+ String ftpUrl = "/mnt/data/web/excel/";
+ // 用户搜索了就下载搜索的用户否则下载所有用户
+ R r = communityService.exportComActRaffleRecord(commonPage);
+ if (R.isOk(r)) {
+ try {
+ SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ // 这里 需要指定写用哪个class去写
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ excelWriter = EasyExcel.write(fileName, ComActRaffleRecordExcelVO.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet( "导出").build();
+ excelWriter.write(JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActRaffleRecordExcelVO.class), writeSheet);
+
+
+ excelWriter.finish();
+ File file = new File(fileName);
+ inputStream = new FileInputStream(file);
+ sftp.uploadMore(ftpUrl, name, inputStream);
+ sftp.logout();
+ inputStream.close();
+ String absolutePath = file.getAbsolutePath();
+ boolean delete = file.delete();
+ log.info("删除excel【{}】结果【{}】", absolutePath, delete);
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ }
+ return R.ok(excelUrl + name);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+ return r;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
new file mode 100644
index 0000000..42474dc
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
@@ -0,0 +1,1076 @@
+package com.panzhihua.community_backstage.api;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.*;
+
+import javax.annotation.Resource;
+
+import com.panzhihua.common.utlis.StringUtils;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+import org.thymeleaf.TemplateEngine;
+import org.thymeleaf.context.Context;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.metadata.style.WriteCellStyle;
+import com.alibaba.excel.write.metadata.style.WriteFont;
+import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.enums.ReserveRecordStatusEnum;
+import com.panzhihua.common.model.dtos.community.QuestnaireAnswersDTO;
+import com.panzhihua.common.model.dtos.community.reserve.*;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActQuestnaireSubVO;
+import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
+import com.panzhihua.common.model.vos.community.reserve.*;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.AssemblyUtils;
+import com.panzhihua.common.utlis.ForEachUtils;
+import com.panzhihua.common.utlis.SFTPUtil;
+import com.panzhihua.community_backstage.aop.RenheAssemblyUtils;
+import com.panzhihua.community_backstage.config.SFTPConfig;
+import com.panzhihua.community_backstage.excel.CustemSecondhandler;
+import com.panzhihua.community_backstage.excel.Custemhandler;
+import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
+import com.panzhihua.community_backstage.util.HtmlToPdfUtil;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @description: 预约登记接口
+ * @author: lyq
+ * @date: 2021-8-23
+ */
+@Slf4j
+@Api(tags = {"预约登记"})
+@RestController
+@RequestMapping("/reserve")
+public class ComActReserveApi extends BaseController {
+ private static final String key = "nahankeji1234567";
+
+ @Value("${minio.url}")
+ private String minioUrl;
+
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private UserService userService;
+ @Resource
+ private SFTPConfig sftpConfig;
+ @Resource
+ private TemplateEngine templateEngine;
+ @Resource
+ private RenheAssemblyUtils assemblyUtils;
+
+ @ApiOperation(value = "分页查询预约登记列表", response = ComActReserveListAdminVO.class)
+ @PostMapping("/page")
+ public R page(@RequestBody PageReserveAdminDTO pageReserveDTO) {
+ if (pageReserveDTO.getCommunityId() == null) {
+ Long communityId = this.getCommunityId();
+ pageReserveDTO.setCommunityId(communityId);
+ }
+ pageReserveDTO.setAreaCode(this.getAreaCode());
+ return communityService.pageReserveAdmin(pageReserveDTO);
+ }
+
+ @ApiOperation(value = "新增预约登记记录")
+ @PostMapping("/add")
+ public R add(@RequestBody AddReserveAdminDTO addReserveDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ addReserveDTO.setCommunityId(loginUserInfo.getCommunityId());
+ addReserveDTO.setUserId(loginUserInfo.getUserId());
+ return communityService.addReserveAdmin(addReserveDTO);
+ }
+
+ @ApiOperation(value = "删除预约登记")
+ @PostMapping("/delete")
+ public R delete(@RequestParam("reserveId") Long reserveId) {
+ return communityService.deleteReserveAdmin(reserveId);
+ }
+
+ @ApiOperation(value = "查询社区所有预约登记列表")
+ @GetMapping("/list")
+ public R list() {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ return communityService.listReserveAdmin(loginUserInfo.getCommunityId());
+ }
+
+ @ApiOperation(value = "编辑预约登记记录")
+ @PostMapping("/edit")
+ public R edit(@RequestBody EditReserveAdminDTO editReserveDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ editReserveDTO.setCommunityId(loginUserInfo.getCommunityId());
+ editReserveDTO.setUserId(loginUserInfo.getUserId());
+ return communityService.editReserveAdmin(editReserveDTO);
+ }
+
+ @ApiOperation(value = "修改预约登记状态")
+ @PostMapping("/edit/status")
+ public R editStatus(@RequestBody EditComActReserveStatusDTO editReserveDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ editReserveDTO.setUserId(loginUserInfo.getUserId());
+ return communityService.editReserveStatusAdmin(editReserveDTO);
+ }
+
+ @ApiOperation(value = "点击继续预约登记")
+ @PostMapping("/edit/info")
+ public R editInfo(@RequestBody EditComActReserveInfoDTO editReserveDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ editReserveDTO.setUserId(loginUserInfo.getUserId());
+ return communityService.editReserveInfoAdmin(editReserveDTO);
+ }
+
+ @ApiOperation(value = "预约登记详情")
+ @PostMapping("/detail")
+ public R detail(@RequestParam("reserveId") Long reserveId) {
+ return communityService.detailReserveAdmin(reserveId);
+ }
+
+ @ApiOperation(value = "预约类统计汇总", response = ComActReserveMakeStatisticsAdminVO.class)
+ @PostMapping("/make/statistics")
+ public R makeStatistics(@RequestBody ComActReserveMakeStatisticsDTO makeStatisticsDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ makeStatisticsDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.makeStatisticsAdmin(makeStatisticsDTO);
+ }
+
+ @ApiOperation(value = "预约登记统计汇总导出")
+ @PostMapping("/make/statistics/export")
+ public R makeStatisticsExport(@RequestBody ComActReserveMakeStatisticsDTO makeStatisticsDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ makeStatisticsDTO.setCommunityId(loginUserInfo.getCommunityId());
+ String url = sftpConfig.getExcelUrl();
+ String name = "预约登记统计汇总导出数据.xlsx";
+ String ftpUrl = "/mnt/data/web/excel/";
+ R r = communityService.makeStatisticsExportAdmin(makeStatisticsDTO);
+ if (R.isOk(r)) {
+ List<ComActReserveMakeRightExcelAdminVO> resultList = new ArrayList<>();
+ List<ComActReserveMakeRightStatisticsAdminVO> rightStatisticsList = JSONArray
+ .parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeRightStatisticsAdminVO.class);
+ rightStatisticsList.forEach(rightStatistics -> {
+ ComActReserveMakeRightExcelAdminVO makeRightExcelAdminVO = new ComActReserveMakeRightExcelAdminVO();
+ BeanUtils.copyProperties(rightStatistics, makeRightExcelAdminVO);
+ resultList.add(makeRightExcelAdminVO);
+ });
+ try {
+ SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(),
+ sftpConfig.getPort());
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ // 这里 需要指定写用哪个class去写
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ excelWriter = EasyExcel.write(fileName, ComActReserveMakeRightExcelAdminVO.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet("预约登记统计汇总导出数据").build();
+ excelWriter.write(resultList, writeSheet);
+ excelWriter.finish();
+ File file = new File(fileName);
+ inputStream = new FileInputStream(file);
+ sftp.uploadMore(ftpUrl, name, inputStream);
+ sftp.logout();
+ inputStream.close();
+ String absolutePath = file.getAbsolutePath();
+ boolean delete = file.delete();
+ log.info("删除excel【{}】结果【{}】", absolutePath, delete);
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ }
+ return R.ok(url + name);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+ return r;
+ }
+
+ @ApiOperation(value = "分页查询预约明细列表", response = ComActReserveMakeListAdminVO.class)
+ @PostMapping("/make/page")
+ public R pageMake(@RequestBody PageReserveMakeAdminDTO pageMakeDTO) {
+ return communityService.pageMakeAdmin(pageMakeDTO);
+ }
+
+ @ApiOperation(value = "查询预约明细详情", response = ComActReserveMakeDetailAdminVO.class)
+ @GetMapping("/make/detail")
+ public R detailMake(@RequestParam("reserveRecordId") Long reserveRecordId) {
+ return communityService.detailMakeAdmin(reserveRecordId);
+ }
+
+ @ApiOperation(value = "取消预约记录", response = ComActReserveMakeDetailAdminVO.class)
+ @PostMapping("/make/cancel")
+ public R makeCancel(@RequestBody CancelReserveRecordDTO reserveRecordDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ reserveRecordDTO.setUserId(loginUserInfo.getUserId());
+ return communityService.makeCancelAdmin(reserveRecordDTO);
+ }
+
+ @ApiOperation(value = "预约明细导出")
+ @PostMapping("/make/list/export")
+ public R exportMake(@RequestBody PageReserveMakeAdminDTO pageMakeDTO) {
+ String url = sftpConfig.getExcelUrl();
+ String name = "预约明细导出数据.xlsx";
+ String ftpUrl = "/mnt/data/web/excel/";
+ R r = communityService.exportMakeAdmin(pageMakeDTO);
+ if (R.isOk(r)) {
+ List<ComActReserveMakeDetailedExcelAdminVO> resultList = new ArrayList<>();
+ List<ComActReserveMakeListAdminVO> rightStatisticsList =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeListAdminVO.class);
+ rightStatisticsList.forEach(rightStatistics -> {
+ ComActReserveMakeDetailedExcelAdminVO makeRightExcelAdminVO =
+ new ComActReserveMakeDetailedExcelAdminVO();
+ BeanUtils.copyProperties(rightStatistics, makeRightExcelAdminVO);
+ resultList.add(makeRightExcelAdminVO);
+ });
+ try {
+ SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(),
+ sftpConfig.getPort());
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ // 这里 需要指定写用哪个class去写
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ excelWriter = EasyExcel.write(fileName, ComActReserveMakeDetailedExcelAdminVO.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet("预约明细导出数据").build();
+ excelWriter.write(resultList, writeSheet);
+ excelWriter.finish();
+ File file = new File(fileName);
+ inputStream = new FileInputStream(file);
+ sftp.uploadMore(ftpUrl, name, inputStream);
+ sftp.logout();
+ inputStream.close();
+ String absolutePath = file.getAbsolutePath();
+ boolean delete = file.delete();
+ log.info("删除excel【{}】结果【{}】", absolutePath, delete);
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ }
+ return R.ok(url + name);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+ return r;
+ }
+
+ @ApiOperation(value = "登记类统计汇总", response = ComActReserveRegisterStatisticsAdminVO.class)
+ @PostMapping("/register/statistics")
+ public R registerStatistics(@RequestBody ComActReserveRegisterStatisticsDTO registerStatisticsDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ registerStatisticsDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.registerStatisticsAdmin(registerStatisticsDTO);
+ }
+
+ @ApiOperation(value = "登记类统计导出", response = ComActReserveRegisterStatisticsAdminVO.class)
+ @PostMapping("/register/statistics/export")
+ public R registerStatisticsExport(@RequestBody ComActReserveRegisterStatisticsDTO registerStatisticsDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ registerStatisticsDTO.setCommunityId(loginUserInfo.getCommunityId());
+ String url = sftpConfig.getExcelUrl();
+ String name = "登记统计汇总导出数据.xlsx";
+ String ftpUrl = "/mnt/data/web/excel/";
+ R r = communityService.registerStatisticsExportAdmin(registerStatisticsDTO);
+ if (R.isOk(r)) {
+ List<ComActReserveRegisterExcelAdminVO> resultList = new ArrayList<>();
+ List<ComActReserveRegisterStatisticsAdminVO> rightStatisticsList =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveRegisterStatisticsAdminVO.class);
+ rightStatisticsList.forEach(rightStatistics -> {
+ ComActReserveRegisterExcelAdminVO makeRightExcelAdminVO = new ComActReserveRegisterExcelAdminVO();
+ BeanUtils.copyProperties(rightStatistics, makeRightExcelAdminVO);
+ resultList.add(makeRightExcelAdminVO);
+ });
+ try {
+ SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(),
+ sftpConfig.getPort());
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ // 这里 需要指定写用哪个class去写
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ excelWriter = EasyExcel.write(fileName, ComActReserveRegisterExcelAdminVO.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet("登记统计汇总导出数据").build();
+ excelWriter.write(resultList, writeSheet);
+ excelWriter.finish();
+ File file = new File(fileName);
+ inputStream = new FileInputStream(file);
+ sftp.uploadMore(ftpUrl, name, inputStream);
+ sftp.logout();
+ inputStream.close();
+ String absolutePath = file.getAbsolutePath();
+ boolean delete = file.delete();
+ log.info("删除excel【{}】结果【{}】", absolutePath, delete);
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ }
+ return R.ok(url + name);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+ return r;
+ }
+
+ @ApiOperation(value = "分页查询预约处理列表", response = ComActReserveMakeHandleListAdminVO.class)
+ @PostMapping("/make/handle/page")
+ public R pageMakeHandle(@RequestBody PageReserveMakeHandleAdminDTO pageMakeHandleDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ pageMakeHandleDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.pageMakeHandleAdmin(pageMakeHandleDTO);
+ }
+
+ @ApiOperation(value = "批量处理预约记录")
+ @PostMapping("/make/handle")
+ public R makeHandle(@RequestBody MakeHandleAdminDTO makeHandleDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ makeHandleDTO.setUserId(loginUserInfo.getUserId());
+ makeHandleDTO.setAreaCode(this.getAreaCode());
+ return communityService.makeHandleAdmin(makeHandleDTO);
+ }
+
+ @ApiOperation(value = "预约处理列表导出")
+ @PostMapping("/make/handle/export")
+ public R exportMakeHandle(@RequestBody PageReserveMakeHandleAdminDTO pageMakeHandleDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ pageMakeHandleDTO.setCommunityId(loginUserInfo.getCommunityId());
+ String url = sftpConfig.getExcelUrl();
+ String name = "预约处理列表导出数据.xlsx";
+ String ftpUrl = "/mnt/data/web/excel/";
+ R r = communityService.exportMakeHandleAdmin(pageMakeHandleDTO);
+ if (R.isOk(r)) {
+ List<ComActReserveMakeHandleExcelAdminVO> resultList = new ArrayList<>();
+ List<ComActReserveMakeHandleListAdminVO> rightStatisticsList =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeHandleListAdminVO.class);
+ rightStatisticsList.forEach(rightStatistics -> {
+ ComActReserveMakeHandleExcelAdminVO makeRightExcelAdminVO = new ComActReserveMakeHandleExcelAdminVO();
+ BeanUtils.copyProperties(rightStatistics, makeRightExcelAdminVO);
+ makeRightExcelAdminVO.setStatus(ReserveRecordStatusEnum.getCnDescByName(rightStatistics.getStatus()));
+ resultList.add(makeRightExcelAdminVO);
+ });
+ try {
+ SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(),
+ sftpConfig.getPort());
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ // 这里 需要指定写用哪个class去写
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ excelWriter = EasyExcel.write(fileName, ComActReserveMakeHandleExcelAdminVO.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet("预约处理列表导出数据").build();
+ excelWriter.write(resultList, writeSheet);
+ excelWriter.finish();
+ File file = new File(fileName);
+ inputStream = new FileInputStream(file);
+ sftp.uploadMore(ftpUrl, name, inputStream);
+ sftp.logout();
+ inputStream.close();
+ String absolutePath = file.getAbsolutePath();
+ boolean delete = file.delete();
+ log.info("删除excel【{}】结果【{}】", absolutePath, delete);
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ }
+ return R.ok(url + name);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+ return r;
+ }
+
+ @ApiOperation(value = "导出登记明细")
+ @PostMapping("/register/list/export")
+ public R exportRegister(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+// String regionCode = communityService.getActBelongRegionCode(loginUserInfo.getCommunityId());
+// if (regionCode.equals("510411")) {
+// ComActReserveDetailAdminVO reserverRecord =
+// communityService.detailReserveAdmin(pageReserveRegisterDetailedAdminDTO.getReserveId()).getData();
+// if (reserverRecord.getTitle().equals("返攀登记")) {
+// return renheExportRegister(pageReserveRegisterDetailedAdminDTO);
+// }
+// }
+ String ftpUrl = "/mnt/data/web/excel/";
+ String name = "登记明细导出数据.xlsx";
+ String noHaed = "承诺";
+ try {
+ SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ /**
+ * 组合导出数据
+ * 用户问卷答案
+ */
+ R QuestnaireAnswersDTOR = communityService.exportRegisterAdmin(pageReserveRegisterDetailedAdminDTO);
+ QuestnaireAnswersDTO questnaireAnswersDTOS = JSON.parseObject(JSON.toJSONString(QuestnaireAnswersDTOR.getData()), QuestnaireAnswersDTO.class);
+
+ List<ComActQuestnaireSubVO> subVOList = questnaireAnswersDTOS.getSubs();
+ //构造表头
+ List<List<String>> headList = new ArrayList<List<String>>();
+ String firstRowContent = "登记明细";
+ List<String> head0 = new ArrayList<>();
+ head0.add(firstRowContent);
+ head0.add("登记人昵称");
+ headList.add(head0);
+ List<String> head1 = new ArrayList<>();
+ head1.add(firstRowContent);
+ head1.add("登记时间");
+ headList.add(head1);
+ subVOList.forEach(sub -> {
+ if (sub.getType() != 5) {
+ List<String> headn = new ArrayList<>();
+ headn.add(firstRowContent);
+ if(!sub.getContent().equals(noHaed)&& StringUtils.isNotEmpty(sub.getContent())){
+ if(sub.getType() == 11){
+ if(sub.getContent().contains("（")){
+ headn.add(sub.getContent().substring(0, sub.getContent().indexOf("（")));
+ }
+ else {
+ headn.add(sub.getContent());
+ }
+ }else{
+ headn.add(sub.getContent());
+ }
+ headList.add(headn);
+ }
+ }
+ });
+ //数据转换
+ List<List<Object>> datalist = AssemblyUtils.ReserveData(questnaireAnswersDTOS.getAnswers());
+
+ WriteCellStyle headWriteCellStyle = new WriteCellStyle();
+ //设置头居中
+ headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+ //设置头字体
+ WriteFont headWriteFont = new WriteFont();
+ headWriteFont.setFontHeightInPoints((short)6);
+ headWriteFont.setBold(true);
+ headWriteCellStyle.setWriteFont(headWriteFont);
+
+
+ WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
+ //设置表格内容字体
+ WriteFont writeFont = new WriteFont();
+ writeFont.setFontHeightInPoints((short)6);
+ //设置 水平居中
+ contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+ //设置 垂直居中
+ contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+ contentWriteCellStyle.setWriteFont(writeFont);
+
+ contentWriteCellStyle.setWrapped(true);
+ HorizontalCellStyleStrategy horizontalCellStyleStrategy =
+ new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
+
+
+ excelWriter = EasyExcel.write(fileName)
+ .registerWriteHandler(horizontalCellStyleStrategy).registerWriteHandler(new Custemhandler())
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet("登记明细导出数据").head(headList).build();
+ excelWriter.write(datalist, writeSheet);
+ excelWriter.finish();
+ File file = new File(fileName);
+ inputStream = new FileInputStream(file);
+ sftp.uploadMore(ftpUrl, name, inputStream);
+ sftp.logout();
+ inputStream.close();
+ String absolutePath = file.getAbsolutePath();
+ boolean delete = file.delete();
+ log.info("删除excel【{}】结果【{}】", absolutePath, delete);
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ }
+ return R.ok(sftpConfig.getExcelUrl() + name);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+
+ @ApiOperation(value = "导出登记明细不带图片")
+ @PostMapping("/register/list/exportNoImage")
+ public R exportRegisterNoImage(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ String regionCode = communityService.getActBelongRegionCode(loginUserInfo.getCommunityId());
+ if (regionCode.equals("510411")) {
+ ComActReserveDetailAdminVO reserverRecord =
+ communityService.detailReserveAdmin(pageReserveRegisterDetailedAdminDTO.getReserveId()).getData();
+ if (reserverRecord.getTitle().equals("返攀登记")) {
+ return renheExportRegister(pageReserveRegisterDetailedAdminDTO);
+ }
+ }
+ String ftpUrl = "/mnt/data/web/excel/";
+ String name = "登记明细导出数据.xlsx";
+ String noHaed = "承诺";
+ try {
+ SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ /**
+ * 组合导出数据
+ * 用户问卷答案
+ */
+ R QuestnaireAnswersDTOR = communityService.exportRegisterAdmin(pageReserveRegisterDetailedAdminDTO);
+ QuestnaireAnswersDTO questnaireAnswersDTOS = JSON.parseObject(JSON.toJSONString(QuestnaireAnswersDTOR.getData()), QuestnaireAnswersDTO.class);
+
+ List<ComActQuestnaireSubVO> subVOList = questnaireAnswersDTOS.getSubs();
+ //构造表头
+ List<List<String>> headList = new ArrayList<List<String>>();
+ String firstRowContent = "登记明细";
+ List<String> head0 = new ArrayList<>();
+ head0.add(firstRowContent);
+ head0.add("登记人昵称");
+ headList.add(head0);
+ List<String> head1 = new ArrayList<>();
+ head1.add(firstRowContent);
+ head1.add("登记时间");
+ headList.add(head1);
+ subVOList.forEach(sub -> {
+ if (sub.getType() != 5&&sub.getType() != 11) {
+ List<String> headn = new ArrayList<>();
+ headn.add(firstRowContent);
+ if(!sub.getContent().equals(noHaed)&& StringUtils.isNotEmpty(sub.getContent())){
+ if(sub.getType() == 11){
+ if(sub.getContent().contains("（")){
+ headn.add(sub.getContent().substring(0, sub.getContent().indexOf("（")));
+ }
+ else {
+ headn.add(sub.getContent());
+ }
+ }else{
+ headn.add(sub.getContent());
+ }
+ headList.add(headn);
+ }
+ }
+ });
+ //数据转换
+ List<List<Object>> datalist = AssemblyUtils.ReserveDataNoImage(questnaireAnswersDTOS.getAnswers());
+
+ WriteCellStyle headWriteCellStyle = new WriteCellStyle();
+ //设置头居中
+ headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+ //设置头字体
+ WriteFont headWriteFont = new WriteFont();
+ headWriteFont.setFontHeightInPoints((short)6);
+ headWriteFont.setBold(true);
+ headWriteCellStyle.setWriteFont(headWriteFont);
+
+
+ WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
+ //设置表格内容字体
+ WriteFont writeFont = new WriteFont();
+ writeFont.setFontHeightInPoints((short)6);
+ //设置 水平居中
+ contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+ //设置 垂直居中
+ contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+ contentWriteCellStyle.setWriteFont(writeFont);
+
+ contentWriteCellStyle.setWrapped(true);
+ HorizontalCellStyleStrategy horizontalCellStyleStrategy =
+ new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
+
+
+ excelWriter = EasyExcel.write(fileName)
+ .registerWriteHandler(horizontalCellStyleStrategy).registerWriteHandler(new Custemhandler())
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet("登记明细导出数据").head(headList).build();
+ excelWriter.write(datalist, writeSheet);
+ excelWriter.finish();
+ File file = new File(fileName);
+ inputStream = new FileInputStream(file);
+ sftp.uploadMore(ftpUrl, name, inputStream);
+ sftp.logout();
+ inputStream.close();
+ String absolutePath = file.getAbsolutePath();
+ boolean delete = file.delete();
+ log.info("删除excel【{}】结果【{}】", absolutePath, delete);
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ }
+ return R.ok(sftpConfig.getExcelUrl() + name);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+
+ /**
+ * 仁和区离攀返攀特别定制excel方法。对于其他区不适用。
+ *
+ * @param pageReserveRegisterDetailedAdminDTO
+ * @return
+ */
+ public R renheExportRegister(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO) {
+ String ftpUrl = "/mnt/data/web/excel/";
+ String name = "仁和区入攀返攀人员信息统计表模板.xlsx";
+ String noHaed = "承诺";
+ try {
+ SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(),
+ sftpConfig.getPort());
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ /**
+ * 组合导出数据 用户问卷答案new FileInputStream
+ */
+ R QuestnaireAnswersDTOR = communityService.exportRegisterAdmin(pageReserveRegisterDetailedAdminDTO);
+ QuestnaireAnswersDTO questnaireAnswersDTOS = JSON
+ .parseObject(JSON.toJSONString(QuestnaireAnswersDTOR.getData()), QuestnaireAnswersDTO.class);
+ // 数据转换
+ List<List<Object>> datalist = assemblyUtils.ReserveData(questnaireAnswersDTOS.getAnswers());
+ ForEachUtils.forEach(0, datalist, (index, data) -> {
+ data.set(0, index + 1);
+ ForEachUtils.forEach(1, data, (indexitem, item) -> {
+ if (indexitem == 18 && item.equals("√")) {
+ String number = "√ /"